From 56b28b78401bc0acc968306eeed9a28b3fbd657d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Nov 2016 23:20:46 +0000 Subject: tcolorbox (18nov16) git-svn-id: svn://tug.org/texlive/trunk@42532 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tcolorbox/CHANGES | 14 ++++++- Master/texmf-dist/doc/latex/tcolorbox/README | 2 +- .../doc/latex/tcolorbox/tcolorbox-example.pdf | Bin 458032 -> 458032 bytes .../doc/latex/tcolorbox/tcolorbox-example.tex | 2 +- .../latex/tcolorbox/tcolorbox.doc.coreoptions.tex | 27 ++++++++++++- .../tcolorbox/tcolorbox.doc.documentation.tex | 8 +++- .../doc/latex/tcolorbox/tcolorbox.doc.theorems.tex | 10 ++++- .../texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf | Bin 6845440 -> 6855333 bytes .../texmf-dist/doc/latex/tcolorbox/tcolorbox.tex | 6 +-- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 5 ++- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 43 +++++++++++---------- .../tex/latex/tcolorbox/tcbexternal.code.tex | 4 +- .../tex/latex/tcolorbox/tcbfitting.code.tex | 4 +- .../tex/latex/tcolorbox/tcbhooks.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistings.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingscore.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 4 +- .../tex/latex/tcolorbox/tcbmagazine.code.tex | 4 +- .../tex/latex/tcolorbox/tcbminted.code.tex | 4 +- .../tex/latex/tcolorbox/tcbprocessing.code.tex | 4 +- .../tex/latex/tcolorbox/tcbraster.code.tex | 4 +- .../tex/latex/tcolorbox/tcbskins.code.tex | 4 +- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 4 +- .../tex/latex/tcolorbox/tcbvignette.code.tex | 4 +- .../tex/latex/tcolorbox/tcbxparse.code.tex | 4 +- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 37 +++++++++++++----- 27 files changed, 140 insertions(+), 74 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index f652f8f0301..4ead1edfae4 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm @@ -939,3 +939,15 @@ version 3.95 (2016/10/21) 'output-directory' and also locally. - library 'documentation': Language settings are not longer reset to English for embedded boxes. + +version 3.96 (2016/11/18) +- bug fix: unprotected definition of the 'nameref' option induced serious errors +- bug fix: nameref package was not detected if loaded after tcolorbox +- new macros: + '\tcbifoddpageoroneside' +- new options: + 'if odd page or oneside', 'if odd page or oneside*', +- library 'documentation': + * Documentation options are not longer reset to default values for embedded + boxes. User code may be affected by this change. + * marginnotes adapt to twosided documents now diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index e42973c5a98..8598f0f2a8f 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf index 112019c58b4..66ecbcc5982 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index 61ecb12e82a..484511c5315 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex index dde34abfeb1..bec89df1840 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -3672,7 +3672,7 @@ This issues:\\ \end{docTcbKey} -\begin{docTcbKey}[][doc new=2016-06-22]{nameref}{=\meta{text}}{no default, initially unset} +\begin{docTcbKey}[][doc new and updated={2016-06-22}{2016-11-18}]{nameref}{=\meta{text}}{no default, initially unset} If the |nameref| package is loaded, the given \meta{text} is used for corresponding |\nameref| makros. Typically, the \meta{text} will be chosen to be identical or nearly identical to the one for \refKey{/tcb/title}. @@ -3688,6 +3688,11 @@ This box is automatically numbered with \ref{mynamelabel} on page The box is titled '\nameref{mynamelabel}'. \end{dispExample} + +\begin{marker} +\refKey{/tcb/nameref} is used automatically inside \refCom{newtcbtheorem}. +\end{marker} + \end{docTcbKey} @@ -3737,6 +3742,13 @@ has to be set explicitely! Also see \refKey{/tcb/if odd page*}. \end{marker} \end{docTcbKey} + +\begin{docTcbKey}[][doc new=2016-11-18]{if odd page or oneside}{=\marg{odd options}\marg{even options}}{style, no default} + For onesided documents, the \meta{odd options} are applied always. + For twosided documents, this style is identical to \refKey{/tcb/if odd page}. +\end{docTcbKey} + + \clearpage \begin{docTcbKey}[][doc new=2015-11-13]{if odd page*}{=\marg{odd options}\marg{even options}}{style, no default} \begin{marker} @@ -3767,7 +3779,13 @@ packed into \refKey{/tcb/extras}. \end{docTcbKey} -\enlargethispage*{2cm} +\begin{docTcbKey}[][doc new=2016-11-18]{if odd page or oneside*}{=\marg{odd options}\marg{even options}}{style, no default} + For onesided documents, the \meta{odd options} are applied always. + For twosided documents, this style is identical to \refKey{/tcb/if odd page*}. +\end{docTcbKey} + + +\clearpage \begin{docCommand}[doc new=2015-11-13]{tcbifoddpage}{\marg{odd code}\marg{even code}} If the current box is on an odd page, the \meta{odd code} is executed. On an even page, the \meta{even code} is executed. @@ -3798,6 +3816,11 @@ the box \textbf{content text}. If needed, the methods from the packages \end{docCommand} +\begin{docCommand}[doc new=2016-11-18]{tcbifoddpageoroneside}{\marg{odd code}\marg{even code}} + For onesided documents, the \meta{odd code} is executed always. + For twosided documents, this macro is identical to \refCom{tcbifoddpage}. +\end{docCommand} + \clearpage \begin{docCommand}[doc new=2015-11-13]{thetcolorboxnumber}{} This is a unique identifier (arabic number) for a tcolorbox. It is locally diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex index 24db4b03d24..ac2bae49bb3 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex @@ -28,6 +28,12 @@ The package |makeidx| is loaded only, if \docAuxCommand*{printindex} is The package |marginnote| is loaded only, if \docAuxCommand*{marginnote} is \emph{not} already defined. \end{marker} +\begin{marker} +In contrast to other |tcolorbox| options, the option +settings for \mylib{documentation} are typically not +getting reset by \refKey{/tcb/reset}, i.e. they keep their +values for embedded boxes. +\end{marker} For UTF-8 support, load: \begin{dispListing} @@ -673,8 +679,6 @@ instead. Also see \refKey{/tcb/docexample}. The following keys are provided for language specific settings. The English language is predefined. -\refKey{/tcb/reset} does not reset these language settings.\tcbdocmarginnote{\tcbdocupdated{2016-10-21}} - \begin{docTcbKey}{english language}{}{style, no value} Sets all language specific settings to English. \end{docTcbKey} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex index a1f98a9f666..1181b9570f7 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex @@ -34,10 +34,12 @@ This also loads the package |amsmath|. %\enlargethispage*{20mm} \inputpreamblelisting{F} \begin{dispExample} +% usage of '\nameref' needs 'nameref' or 'hyperref' to be loaded \begin{mytheo}{This is my title}{theoexample} This is the text of the theorem. The counter is automatically assigned and, in this example, prefixed with the section number. This theorem is numbered with - \ref{th:theoexample} and is given on page \pageref{th:theoexample}. + \ref{th:theoexample}, it is given on page~\pageref{th:theoexample}, + and it is titled \flqq\nameref{th:theoexample}\frqq. \end{mytheo} \end{dispExample} @@ -66,6 +68,12 @@ This also loads the package |amsmath|. This theorem has no number and no title. \end{mytheo*} \end{dispExample} + +\begin{marker} +To switch off the \texttt{nameref} feature permanently, add +\mbox{\texttt{nameref/.style=\{\}}} inside the \meta{options} list. +\end{marker} + \end{docCommand} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf index e864984f19d..c0e14887e57 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf differ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index 24317856014..c5ee0e2c930 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -43,8 +43,8 @@ \setlength{\bibitemsep}{\smallskipamount} \addbibresource{tcolorbox.doc.bib} -\def\version{3.95}% -\def\datum{2016/10/21}% +\def\version{3.96}% +\def\datum{2016/11/18}% \makeindex \hypersetup{ diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 4f49995650a..67211033136 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings @@ -985,6 +985,7 @@ no extras last/.code={\let\tcb@extras@last\@empty},% no extras/.code={\let\tcb@extras@unbroken\@empty\let\tcb@extras@first\@empty\let\tcb@extras@middle\@empty\let\tcb@extras@last\@empty},% if odd page*/.style 2 args={check odd page,extras={if odd page={#1}{#2}}},% + if odd page or oneside*/.style 2 args={check odd page,extras={if odd page or oneside={#1}{#2}}},% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 2a22308c2bf..7cf0cf0bdf9 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{listings,skins,xparse,external} @@ -416,7 +416,8 @@ \begin{tcolorbox}[enhanced jigsaw,size=fbox,boxrule=1pt,leftrule=0pt,rightrule=0pt, arc=0pt,outer arc=1pt,boxsep=1pt,top=1pt,bottom=1pt, nobeforeafter,width=\marginparwidth, - colframe=red!50!white,colback=red!25!yellow!5!white,fontupper=\scriptsize,before upper=\flushright, + colframe=red!50!white,colback=red!25!yellow!5!white,fontupper=\scriptsize, + if odd page or oneside={flushright upper}{flushleft upper}, doc@marginnote,#1]#2\end{tcolorbox}}} \newcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1} @@ -468,27 +469,27 @@ \tcbset{% reset@documentation/.style={% - index command=\index,% - documentation listing style=tcbdocumentation, - index default settings, - color option=Option, - color definition=Definition, - color hyperlink=Hyperlink, - doc left=2em, - doc right=0pt, - doc left indent=-2em, - doc right indent=0pt, - doc head=, - before doc body=, - after doc body=, - doc description=, - doc into index=true, - index colorize=false, - index annotate=true, - doc marginnote=, }, + documentation listing style=tcbdocumentation, + doc left=2em, + doc right=0pt, + doc left indent=-2em, + doc right indent=0pt, + doc head=, + before doc body=, + after doc body=, + doc description=, + doc into index=true, + doc marginnote=, initialize@reset=reset@documentation, + color option=Option, + color definition=Definition, + color hyperlink=Hyperlink, + index command=\index,% index format=pgf, + index default settings, + index colorize=false, + index annotate=true, english language, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 1b8007ef0cb..6aa36f6dd11 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{pro@cessing} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 4e079ccef35..851f6efc721 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 09eebf59d18..d1927dd0840 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index 4e688db6918..6ea490dd3d2 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \RequirePackage{listings}[2007/02/22] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex index f35d49cc7e8..af797f4a2c2 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{pro@cessing} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 7d113e55432..99ebc70caa2 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex index 4fb8094aeaf..b474795b4d8 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{breakable} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 49d84486484..4f4afa02d21 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex index 581d1f243e1..f40501273d5 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \RequirePackage{pdftexcmds} \RequirePackage{shellesc} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 517ffdd74d7..bbd980ce483 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index db327334ec8..cdf2ed93b90 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \RequirePackage{tikz}[2010/10/13] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 5a606e2c145..2053c636601 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index cc03011904f..a5ef128dd8a 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex index 1f812319862..416d735cd5e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index be73677cf7c..12ff862f7ef 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \RequirePackage{xparse}[2013/12/31] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index aa7a56d80fb..daf0c19a377 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2016/10/21 version 3.95 text color boxes] -\def\tcb@version{3.95} +\ProvidesPackage{tcolorbox}[2016/11/18 version 3.96 text color boxes] +\def\tcb@version{3.96} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -149,12 +149,12 @@ \let\tcb@specialtitle@hook\@empty% } -\def\tcb@gettitle#1{\edef\@currentlabelname{#1}} +\def\tcb@gettitle#1{\protected@edef\@currentlabelname{#1}} -\AtBeginDocument{% - \@ifpackageloaded{nameref}{% +\AfterEndPreamble{% + \ifdefined\NR@gettitle% \let\tcb@gettitle\NR@gettitle% - }{}% + \fi% } % analog to plain.tex @@ -582,7 +582,11 @@ check odd page/.is if=tcb@checkpage, if odd page/.code 2 args={% \tcbset{check odd page}% - \ifodd\thetcolorboxpage\tcbset{#1}\else\tcbset{#2}\fi% + \tcbifoddpage{\tcbset{#1}}{\tcbset{#2}}% + }, + if odd page or oneside/.code 2 args={% + \tcbset{check odd page}% + \tcbifoddpageoroneside{\tcbset{#1}}{\tcbset{#2}}% }, phantom/.code={\appto\kvtcb@phantom{#1}}, step and label/.style 2 args={phantom={\refstepcounter{#1}\tcb@set@label{#2}}},% @@ -917,6 +921,19 @@ \fi% } +\def\tcbifoddpageoroneside{% + \if@twoside% + \ifodd\thetcolorboxpage\relax% + \let\reserved@a\@firstoftwo% + \else% + \let\reserved@a\@secondoftwo% + \fi% + \else% + \let\reserved@a\@firstoftwo% + \fi% + \expandafter\reserved@a% +} + \def\tcb@managed@layers@max{0} \def\tcbsetmanagedlayers#1{% \setcounter{tcblayer}{\tcb@managed@layers@max}% @@ -1394,7 +1411,7 @@ } \def\tcb@setbb@toggle@evenpage{% - \ifodd\thetcolorboxpage\tcb@setbb@toggle@none\else\tcb@setbb@toggle@forced\fi% + \tcbifoddpage{\tcb@setbb@toggle@none}{\tcb@setbb@toggle@forced}% } \def\tcb@creategeonodes@false{} @@ -1415,7 +1432,7 @@ } \def\tcb@lrtoggle@evenpage{% - \unless\ifodd\thetcolorboxpage\tcb@lrtoggle@forced\fi% + \tcbifoddpage{}{\tcb@lrtoggle@forced}% } \def\tcb@bbdraw{% -- cgit v1.2.3