diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
19 files changed, 69 insertions, 45 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 224eed6ed67..f32bef367eb 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.21} +\tcb@set@library@version{4.22} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index a9475d0f860..79f32da93ea 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \tcbuselibrary{listings,skins,xparse,external} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index f16893e3c23..2697820f39f 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.21} +\tcb@set@library@version{4.22} \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 be49d57baba..5604168b28e 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 db0a3b5b2aa..b549b682923 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 11de76ad0d2..348cf2fe356 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 c70ac254adc..5d58c94dd19 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 d65e96e0699..984b402a463 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 16a92a74318..de09b64411b 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 a7de5a99900..7b040191804 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 de26989faeb..afab882a049 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% tcbposter.code.tex: Code for posters %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.21} +\tcb@set@library@version{4.22} \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 953c708d360..c1d54c06adb 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 2ea8a91eb5b..628afd55ae3 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -160,8 +160,8 @@ % sanitize \tcbdimto\tcb@raster@width{\kvtcb@raster@width}% \tcbdimto\tcb@raster@height{\kvtcb@raster@height}% - \tcbdimto\tcb@raster@skip@before{\kvtcb@raster@skip@before}% - \tcbdimto\tcb@raster@skip@after{\kvtcb@raster@skip@after}% + \tcbglueto\tcb@raster@skip@before{\kvtcb@raster@skip@before}% + \tcbglueto\tcb@raster@skip@after{\kvtcb@raster@skip@after}% \tcbdimto\tcb@raster@skip@left{\kvtcb@raster@skip@left}% \tcbdimto\tcb@raster@skip@right{\kvtcb@raster@skip@right}% \tcbdimto\tcb@raster@xskip{\kvtcb@raster@xskip}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index e530a07efd9..6b820a7e7b8 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 4fa98841d9c..fa78d3e006d 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 50a16801aa4..9bfcc7252c0 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 05f7b2685b4..127a24d4002 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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.21} +\tcb@set@library@version{4.22} \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 6126157d269..632c7a5cad5 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% 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{4.21} +\tcb@set@library@version{4.22} \RequirePackage{xparse}[2013/12/31] @@ -232,6 +232,19 @@ \def\tcb@sbs@content@right{\tcb@sbs@text@left\tcblower\box\tcb@lowerbox} \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% +} +\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% +} + \tcbset{% sidebyside adapt/.is choice, sidebyside adapt/none/.style={% @@ -241,19 +254,19 @@ }, sidebyside adapt/left/.style={% sidebyside@adapt@process/.style={% - code={\sbox{\tcb@upperbox}{\tcb@sbs@text@left}\let\tcb@sbs@content\tcb@sbs@content@left}, + code={\tcb@sbs@save@upper\let\tcb@sbs@content\tcb@sbs@content@left}, lefthand width=\wd\tcb@upperbox, }% }, sidebyside adapt/right/.style={% sidebyside@adapt@process/.style={% - code={\sbox{\tcb@lowerbox}{\tcb@sbs@text@right}\let\tcb@sbs@content\tcb@sbs@content@right}, + code={\tcb@sbs@save@lower\let\tcb@sbs@content\tcb@sbs@content@right}, righthand width=\wd\tcb@lowerbox, }% }, sidebyside adapt/both/.style={% sidebyside@adapt@process/.style={% - code={\sbox{\tcb@upperbox}{\tcb@sbs@text@left}\sbox{\tcb@lowerbox}{\tcb@sbs@text@right}\let\tcb@sbs@content\tcb@sbs@content@both}, + code={\tcb@sbs@save@upper\tcb@sbs@save@lower\let\tcb@sbs@content\tcb@sbs@content@both}, text width=\wd\tcb@upperbox+\kvtcb@sbs@gap+\wd\tcb@lowerbox, lefthand width=\wd\tcb@upperbox, }% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index e70df1e68b5..9c34ae6be03 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.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2019/09/19 version 4.21 text color boxes] -\def\tcb@version{4.21} +\ProvidesPackage{tcolorbox}[2019/11/15 version 4.22 text color boxes] +\def\tcb@version{4.22} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -41,6 +41,7 @@ \newif\iftcb@fixedheight \newif\iftcb@ignorenobreak \newif\iftcb@checkpage +\newif\iftcb@resetcounteronoverlays \newbox\tcb@titlebox \newbox\tcb@upperbox @@ -62,6 +63,7 @@ \def\tcb@dim@to#1#2{\def#1{\the\dimexpr#2\relax}} \def\tcbdimto#1#2{\edef#1{\the\dimexpr#2\relax}} +\def\tcbglueto#1#2{\edef#1{\the\glueexpr#2\relax}} \def\tcb@defToTotalHeightStandard#1#2{\tcbdimto#1{\ht#2+\dp#2}} \let\tcb@defToTotalHeight\tcb@defToTotalHeightStandard @@ -1844,6 +1846,7 @@ auto counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@auto}, use counter from/.code={\edef\kvtcb@new@counter{\csname tcb@cnt@#1\endcsname}\let\tcb@proc@counter=\tcb@proc@counter@from}, no counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@no}, + reset counter on overlays/.is if=tcb@resetcounteronoverlays, % number within/.store in=\kvtcb@new@numberwithin, number format/.store in=\kvtcb@new@format, @@ -1861,7 +1864,8 @@ blend into/tables/.style={use counter*=table,list inside=lot,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@table}}}}},% blend into/listings/.style={use counter*=lstlisting,list inside=lol,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\lstlistingname~\thetcbcounter}}}}},% % - reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,list inside=,list type=tcolorbox,init@hook@clear}, + reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=, + list inside=,list type=tcolorbox,init@hook@clear,reset counter on overlays=false}, } \def\tcb@proc@counter@autoanduse#1{% @@ -1904,6 +1908,13 @@ \long\def\tcb@proc@options@init#1#2{% \tcbset{new/.cd,reset@new,#1}% \tcb@proc@counter{#2}% + \iftcb@resetcounteronoverlays% + \ifcsname resetcounteronoverlays\endcsname% + \ifcsname tcb@cnt@#2\endcsname% + \resetcounteronoverlays{\csname tcb@cnt@#2\endcsname}% + \fi% + \fi% + \fi% \ifx\kvtcb@new@listof\@empty% \else% \csedef{tcb@lstof@#2}{\kvtcb@new@listof}% |