From df349982212d3f4ab44223f025a1decb7f9552e7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Sep 2020 21:20:28 +0000 Subject: tcolorbox (17sep20) git-svn-id: svn://tug.org/texlive/trunk@56368 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 39 +++++++----- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 23 +++---- .../tex/latex/tcolorbox/tcbexternal.code.tex | 4 +- .../tex/latex/tcolorbox/tcbfitting.code.tex | 9 +-- .../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/tcbposter.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 | 20 +++--- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 72 ++++++++++------------ 19 files changed, 108 insertions(+), 111 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tcolorbox') diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 4f3eb68f926..2405db4b60b 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,10 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} + +\RequirePackage{pdfcol} +\pdfcolInitStack{tcb@breakable} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings @@ -73,6 +76,7 @@ \reserved@a% \@endpefalse% \let\tcbbreak\tcb@@break% + \pdfcolSwitchStack{tcb@breakable}% \color@begingroup% \textwidth\hsize% \columnwidth\hsize% @@ -317,7 +321,6 @@ \tcb@parfillskip@check% \tcb@split@start% \endgroup% - \color{.}% hack for some special cases \ifx\kvtcb@float\@empty\relax% \aftergroup\tcb@use@after@lastbox% \fi% @@ -900,26 +903,32 @@ } +\def\tcb@init@breakability{% + \let\tcb@savebox=\tcb@vbox% + \let\endtcb@savebox=\endtcb@vbox% + \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable% + \pdfcolIfStackExists{tcb@breakable}{% + \appto\tcb@upperdraw@begin@hook{\pdfcolSetCurrent{tcb@breakable}}% + \appto\tcb@lowerdraw@begin@hook{\pdfcolSetCurrent{tcb@breakable}}% + }{% + \appto\tcb@upperdraw@begin@hook{\color{tcbcolupper}}% + \appto\tcb@lowerdraw@begin@hook{\color{tcbcollower}}% + }% +} \tcbset{% breakable@true/.code={% - \let\tcb@savebox=\tcb@vbox% - \let\endtcb@savebox=\endtcb@vbox% - \let\tcb@defToTotalHeight=\tcb@defToTotalHeightBreakable% - \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable}, + \tcb@init@breakability% + \let\tcb@defToTotalHeight=\tcb@defToTotalHeightBreakable}, breakable@unlimited/.code={% - \let\tcb@savebox=\tcb@vbox% - \let\endtcb@savebox=\endtcb@vbox% - \let\tcb@defToTotalHeight=\tcb@defToTotalHeightUnlimited% - \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable}, + \tcb@init@breakability% + \let\tcb@defToTotalHeight=\tcb@defToTotalHeightUnlimited}, breakable/.style={breakable@#1}, breakable/.default=true,% unbreakable/.style={breakable=false},% enforce breakable/.code={% - \let\tcb@savebox=\tcb@vbox% - \let\endtcb@savebox=\endtcb@vbox% - \let\tcb@defToTotalHeight=\tcb@defToTotalHeightBreakable% - \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable}, + \tcb@init@breakability% + \let\tcb@defToTotalHeight=\tcb@defToTotalHeightBreakable}, title after break/.store in=\kvtcb@followingtitle,% notitle after break/.style={title after break=},% adjusted title after break/.style={title after break={#1\vphantom{\kvtcb@adjusttext}}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 819197e3b10..2c69a26a060 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{listings,skins,xparse,external,raster} @@ -878,10 +878,11 @@ \tcb@doc@index@pgf@% } -\let\tcb@doc@index@pgf=\tcb@doc@index@pgfsection% +\let\tcb@doc@index@pgf=\tcb@doc@index@pgfsection -\def\tcb@doc@index@doc{% - \ExplSyntaxOn + +\ExplSyntaxOn +\def\tcb@doc@index@doc{ \def \__tcobox_index_command: { \iftcb@doc@toindex @@ -891,16 +892,16 @@ \def \__tcobox_index_environment: { \iftcb@doc@toindex - SpecialMainEnvIndex{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvC{\kvtcb@doc@index}} + \SpecialMainEnvIndex{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvC{\kvtcb@doc@index}} \fi } - \ExplSyntaxOff - \tcbset{index german settings}% - \EnableCrossrefs% - \PageIndex% + \tcbset{index~german~settings} + \EnableCrossrefs + \PageIndex } +\ExplSyntaxOff -\def\tcb@doc@index@off{}% +\def\tcb@doc@index@off{} \tcbset{% reset@documentation/.style={% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 20a12548014..b4dd73e40cc 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \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 0808d0f4ef6..2240147a9e0 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -253,13 +253,10 @@ % \def\tcb@fit@@boxsave##1{% \tcbdimto\tcb@innerwidth{\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule}% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcolupper}% \begin{tcb@savebox}{\tcb@upperbox}{##1}% - \kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% + \color{tcbcolupper}\kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% \kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper% \end{tcb@savebox}% - \tcb@reset@color% \advance\count@ 1\relax% }% % diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 84720b1c852..63f1cd944b3 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 9ac64e3fd58..8604e6896f9 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 1b76e30fbe3..c0460a3c1e6 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 99cdae4c73a..78eae82da93 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 e339447ada4..297ecf5cb06 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 073e2c7bb65..30a01ea7add 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex index c8bb522923d..64f96c02511 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbposter.code.tex: Code for posters %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{breakable,magazine,skins,fitting} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex index c11451fe36e..88169a0b870 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \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 7492e2a677b..e6abad21ec1 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 7297dc0e840..28cadb737af 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 ca7f8688276..b608e7c157c 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 ae26c751b7f..2ee69469f31 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% 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{4.31} +\tcb@set@library@version{4.32} \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 6dfef8c103d..71f6f5c32ea 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \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 d2f9c1b0887..7eaea506eef 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,14 +18,20 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \RequirePackage{xparse}[2013/12/31] \tcbset{% IfNoValueTF/.code n args={3}{\IfNoValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfNoValueT/.code n args={2}{\IfNoValueT{#1}{\pgfkeysalso{#2}}}, + IfNoValueF/.code n args={2}{\IfNoValueF{#1}{\pgfkeysalso{#2}}}, IfValueTF/.code n args={3}{\IfValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfValueT/.code n args={2}{\IfValueT{#1}{\pgfkeysalso{#2}}}, + IfValueF/.code n args={2}{\IfValueF{#1}{\pgfkeysalso{#2}}}, IfBooleanTF/.code n args={3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfBooleanT/.code n args={3}{\IfBooleanT{#1}{\pgfkeysalso{#2}}}, + IfBooleanF/.code n args={3}{\IfBooleanF{#1}{\pgfkeysalso{#2}}}, verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm} } @@ -233,16 +239,10 @@ \def\tcb@sbs@content@both{\box\tcb@upperbox\tcblower\box\tcb@lowerbox} \def\tcb@sbs@save@upper{% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcolupper}% - \sbox{\tcb@upperbox}{\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}% - \tcb@reset@color% + \sbox{\tcb@upperbox}{\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}% } \def\tcb@sbs@save@lower{% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcollower}% - \sbox{\tcb@lowerbox}{\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}% - \tcb@reset@color% + \sbox{\tcb@lowerbox}{\color{tcbcollower}\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}% } \tcbset{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 2af5529755e..a9347399084 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 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2020/07/31 version 4.31 text color boxes] -\def\tcb@version{4.31} +\ProvidesPackage{tcolorbox}[2020/09/17 version 4.32 text color boxes] +\def\tcb@version{4.32} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -400,7 +400,7 @@ halign title/center/.code={\let\kvtcb@haligntitle=\tcb@raggedcenter@plain}, halign title/justify/.code={\let\kvtcb@haligntitle=\@empty}, % - valign scale limit/.store in=\kvtcbv@valignscalelimit, + valign scale limit/.store in=\kvtcb@valignscalelimit, valign scale limit=1.1, valign/.is choice, valign/top/.code={\def\kvtcb@valignupper{top}}, @@ -815,10 +815,10 @@ \let\endtcb@savebox=\endtcb@lrbox \def\tcb@saveupperbox{% -\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper} +\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper} \def\tcb@savelowerbox{% -\begin{tcb@savebox}{\tcb@lowerbox}{\tcb@w@lower}\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower} +\begin{tcb@savebox}{\tcb@lowerbox}{\tcb@w@lower}\color{tcbcollower}\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower} % counter for float @@ -911,24 +911,12 @@ \fi% } -\def\tcb@set@color#1{% - \edef\current@color{\@nameuse{\string\color@#1}}% - \colorlet{.}{#1}% -} - -\def\tcb@reset@color{% - \colorlet{.}{tcbcol@origin}% - \edef\current@color{\@nameuse{\string\color@tcbcol@origin}}% -} - \def\tcb@set@@upper@and@lower{% - \colorlet{tcbcol@origin}{.}% \let\tcb@insert@after@part=\tcb@insert@after@upper% % switch for lower box \def\tcblower{% \tcb@insert@after@part% \end{tcb@savebox}% - \tcb@set@color{tcbcollower}% \unless\iftcb@sidebyside% \tcbdimto\tcb@w@lower{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@leftlower-\kvtcb@rightlower}% \fi% @@ -943,7 +931,6 @@ \fi% \tcb@startbox}% % start of upper box - \tcb@set@color{tcbcolupper}% \ifx\kvtcb@saveupperto\@empty% \let\tcb@startbox\tcb@saveupperbox% \let\endtcolorbox\tcb@endboxanddraw% @@ -1130,13 +1117,11 @@ \def\tcb@endboxanddraw{% \tcb@insert@after@part% \end{tcb@savebox}% - \tcb@reset@color% \tcb@draw@color@box% \tcb@finalize@environment% } \def\tcb@finalize@environment{% - %\color{.}% hack for some special cases \tcb@layer@dec% } @@ -1271,11 +1256,11 @@ \iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi% } -\def\tcb@dbox@top#1#2#3#4#5{\pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% +\def\tcb@dbox@top#1#2#3#4#5{\pgftext[x=#1,y=#2+#3,left,top]{#5}} -\def\tcb@dbox@bottom#1#2#3#4#5{\pgftext[x=#1,y=#2,left,bottom]{\color{#5}\box#4}}% +\def\tcb@dbox@bottom#1#2#3#4#5{\pgftext[x=#1,y=#2,left,bottom]{#5}} -\def\tcb@dbox@center#1#2#3#4#5{\pgftext[x=#1,y=#2+#3/2,left]{\color{#5}\box#4}}% +\def\tcb@dbox@center#1#2#3#4#5{\pgftext[x=#1,y=#2+#3/2,left]{#5}} \def\tcb@resize@box#1#2#3{% \setbox#1\hbox{\resizebox*{#2}{#3}{\box#1}}% @@ -1289,18 +1274,18 @@ \tcbdimto\tcb@box@h@target{#3}% \tcb@resize@box{#4}{\tcb@box@w@target}{\tcb@box@h@target}% \fi% - \pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% + \pgftext[x=#1,y=#2+#3,left,top]{#5}}% \def\tcb@dbox@resizelimited#1#2#3#4#5{% \iftcb@fixedheight% \tcbdimto\tcb@box@w@target{\wd#4}% - \tcbdimto\tcb@box@h@target{\kvtcbv@valignresizelimit\dimexpr(\ht#4+\dp#4)}% + \tcbdimto\tcb@box@h@target{\kvtcb@valignscalelimit\dimexpr(\ht#4+\dp#4)}% \ifdim\dimexpr\tcb@box@h@target>#3\relax% \tcbdimto\tcb@box@h@target{#3}% \fi% \tcb@resize@box{#4}{\tcb@box@w@target}{\tcb@box@h@target}% \fi% - \pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% + \pgftext[x=#1,y=#2+#3,left,top]{#5}}% \let\tcb@pgfprocess@@specialround@orig=\pgfprocess@@specialround @@ -1566,7 +1551,7 @@ \pgfsetfillopacity{\kvtcb@opacitytitle}% \pgftext[x=\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@lefttitle\relax, y=\the\dimexpr\tcb@height-\kvtcb@top@rule-\kvtcb@boxsep-\kvtcb@toptitle\relax, - left,top]{\color{tcbcoltitle}\box\tcb@titlebox}% + left,top]{\box\tcb@titlebox}% \end{pgfscope}% \fi\fi% } @@ -1578,7 +1563,9 @@ \pgfsetfillopacity{\kvtcb@opacityupper}% \csname tcb@dbox@\kvtcb@valignupper\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper\relax}% {\the\dimexpr\tcb@innerheight+\kvtcb@bottom@rule-\kvtcb@boxsep-\tcb@break@topsep-\kvtcb@top-\tcb@height@upper\relax}% - {\tcb@height@upper}{\tcb@upperbox}{tcbcolupper}% + {\tcb@height@upper}{\tcb@upperbox}{% + \color@begingroup\tcb@upperdraw@begin@hook\box\tcb@upperbox\tcb@upperdraw@end@hook\color@endgroup% + }% \end{pgfscope}% \fi% } @@ -1590,7 +1577,9 @@ \pgfsetfillopacity{\kvtcb@opacitylower}% \csname tcb@dbox@\kvtcb@valignlower\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftlower\relax}% {\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep+\tcb@break@bottomsep+\kvtcb@bottom\relax}% - {\tcb@height@lower}{\tcb@lowerbox}{tcbcollower}% + {\tcb@height@lower}{\tcb@lowerbox}{% + \color@begingroup\tcb@lowerdraw@begin@hook\box\tcb@lowerbox\tcb@lowerdraw@end@hook\color@endgroup% + }% \end{pgfscope}% \fi% } @@ -1621,7 +1610,7 @@ \fi% \iftcb@hasLower% \tcb@box@align{\tcb@lowerbox}% - \iftcb@lowervisible\leavevmode\color{tcbcollower}\unhbox\tcb@lowerbox% + \iftcb@lowervisible\leavevmode\unhbox\tcb@lowerbox% \else% \iftcb@lowerignored\else\rule[-\dp\tcb@lowerbox]{\z@}{\the\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox\relax}\fi% \fi% @@ -1763,10 +1752,7 @@ \long\def\tcbox@inner@hbox#1{% \tcbset{breakable@false,sidebyside=false}% \tcb@set@@phantom% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcolupper}% - \sbox\tcb@upperbox{\tcb@embed@tcbox{\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper}}% - \tcb@reset@color% + \sbox\tcb@upperbox{\tcb@embed@tcbox{\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper}}% \tcbdimto\tcb@val@raisebase{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}% \tcbdimto\kvtcb@width{\wd\tcb@upperbox+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}% \tcb@hasLowerfalse% @@ -1781,10 +1767,7 @@ \tcb@set@@phantom% \tcb@set@@title% \tcb@set@@dimensions% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcolupper}% - \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper\end{tcb@savebox}% - \tcb@reset@color% + \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper\end{tcb@savebox}% \tcb@hasLowerfalse% \tcb@draw@color@box% } @@ -2162,8 +2145,15 @@ \tcbset{% initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},% reset/.code={\tcb@reset},% - reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@% - \let\tcb@lateoptions@hook\@empty}, + reset@core/.style={code={% + \let\tcbtitletext\@empty% + \tcb@attach@title@code@% + \let\tcb@lateoptions@hook\@empty% + \let\tcb@upperdraw@begin@hook\@empty% + \let\tcb@upperdraw@end@hook\@empty% + \let\tcb@lowerdraw@begin@hook\@empty% + \let\tcb@lowerdraw@end@hook\@empty% + }, width=\linewidth,autoparskip,arc is curved, natural height,height plus=0pt,space to lower,valign=top,valign lower=top, size=normal,rounded corners,parfillskip restore, -- cgit v1.2.3