From bad81a00a2943d1fb7ff2de3d0ae48c049dac302 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 16 Nov 2019 03:00:48 +0000 Subject: CTAN sync 201911160300 --- macros/latex/contrib/tcolorbox/CHANGES | 10 ++++++++- macros/latex/contrib/tcolorbox/README | 2 +- .../latex/contrib/tcolorbox/tcbbreakable.code.tex | 4 ++-- .../contrib/tcolorbox/tcbdocumentation.code.tex | 4 ++-- .../latex/contrib/tcolorbox/tcbexternal.code.tex | 4 ++-- macros/latex/contrib/tcolorbox/tcbfitting.code.tex | 4 ++-- macros/latex/contrib/tcolorbox/tcbhooks.code.tex | 4 ++-- .../latex/contrib/tcolorbox/tcblistings.code.tex | 4 ++-- .../contrib/tcolorbox/tcblistingscore.code.tex | 4 ++-- .../contrib/tcolorbox/tcblistingsutf8.code.tex | 4 ++-- .../latex/contrib/tcolorbox/tcbmagazine.code.tex | 4 ++-- macros/latex/contrib/tcolorbox/tcbminted.code.tex | 4 ++-- macros/latex/contrib/tcolorbox/tcbposter.code.tex | 4 ++-- .../latex/contrib/tcolorbox/tcbprocessing.code.tex | 4 ++-- macros/latex/contrib/tcolorbox/tcbraster.code.tex | 8 +++---- macros/latex/contrib/tcolorbox/tcbskins.code.tex | 4 ++-- .../contrib/tcolorbox/tcbskinsjigsaw.code.tex | 4 ++-- .../latex/contrib/tcolorbox/tcbtheorems.code.tex | 4 ++-- .../latex/contrib/tcolorbox/tcbvignette.code.tex | 4 ++-- macros/latex/contrib/tcolorbox/tcbxparse.code.tex | 23 ++++++++++++++++----- .../contrib/tcolorbox/tcolorbox-example-poster.pdf | Bin 274152 -> 273844 bytes .../contrib/tcolorbox/tcolorbox-example-poster.tex | 2 +- .../latex/contrib/tcolorbox/tcolorbox-example.pdf | Bin 457694 -> 457482 bytes .../latex/contrib/tcolorbox/tcolorbox-example.tex | 2 +- .../tcolorbox/tcolorbox-tutorial-poster.pdf | Bin 442887 -> 442454 bytes .../tcolorbox/tcolorbox-tutorial-poster.tex | 2 +- .../tcolorbox/tcolorbox.doc.initoptions.tex | 9 ++++++++ macros/latex/contrib/tcolorbox/tcolorbox.pdf | Bin 7152247 -> 7054767 bytes macros/latex/contrib/tcolorbox/tcolorbox.sty | 19 +++++++++++++---- macros/latex/contrib/tcolorbox/tcolorbox.tex | 8 +++---- 30 files changed, 95 insertions(+), 54 deletions(-) (limited to 'macros/latex/contrib/tcolorbox') diff --git a/macros/latex/contrib/tcolorbox/CHANGES b/macros/latex/contrib/tcolorbox/CHANGES index 4775a12354..2a1b6dfb15 100644 --- a/macros/latex/contrib/tcolorbox/CHANGES +++ b/macros/latex/contrib/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2019 by Prof. Dr. Dr. Thomas F. Sturm @@ -1106,3 +1106,11 @@ version 4.21 (2019/09/19) 'before doc body path', 'after doc body path' * new language string: 'path', 'paths' - documentation: checkerbox for opacity examples was too dark + +version 4.22 (2019/11/15) +- bug fix (#79) in library 'xparse': + 'sidebyside adapt' did not respect color, font, and other options. +- bug fix (#85) in library 'raster': + 'raster before skip' and 'raster after skip' did not accept glue anymore. +- new initialization option (#80): 'reset counter on overlays' + diff --git a/macros/latex/contrib/tcolorbox/README b/macros/latex/contrib/tcolorbox/README index ad3735e664..a16ef87400 100644 --- a/macros/latex/contrib/tcolorbox/README +++ b/macros/latex/contrib/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2019 by Prof. Dr. Dr. Thomas F. Sturm diff --git a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex index 224eed6ed6..f32bef367e 100644 --- a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex index a9475d0f86..79f32da93e 100644 --- a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbexternal.code.tex b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex index f16893e3c2..2697820f39 100644 --- a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbfitting.code.tex b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex index be49d57bab..5604168b28 100644 --- a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbhooks.code.tex b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex index db0a3b5b2a..b549b68292 100644 --- a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcblistings.code.tex b/macros/latex/contrib/tcolorbox/tcblistings.code.tex index 11de76ad0d..348cf2fe35 100644 --- a/macros/latex/contrib/tcolorbox/tcblistings.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex index c70ac254ad..5d58c94dd1 100644 --- a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex index d65e96e069..984b402a46 100644 --- a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex index 16a92a7431..de09b64411 100644 --- a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbminted.code.tex b/macros/latex/contrib/tcolorbox/tcbminted.code.tex index a7de5a9990..7b04019180 100644 --- a/macros/latex/contrib/tcolorbox/tcbminted.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbposter.code.tex b/macros/latex/contrib/tcolorbox/tcbposter.code.tex index de26989fae..afab882a04 100644 --- a/macros/latex/contrib/tcolorbox/tcbposter.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex index 953c708d36..c1d54c06ad 100644 --- a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbraster.code.tex b/macros/latex/contrib/tcolorbox/tcbraster.code.tex index 2ea8a91eb5..628afd55ae 100644 --- a/macros/latex/contrib/tcolorbox/tcbraster.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbskins.code.tex b/macros/latex/contrib/tcolorbox/tcbskins.code.tex index e530a07efd..6b820a7e7b 100644 --- a/macros/latex/contrib/tcolorbox/tcbskins.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex index 4fa98841d9..fa78d3e006 100644 --- a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex index 50a16801aa..9bfcc7252c 100644 --- a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbvignette.code.tex b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex index 05f7b2685b..127a24d400 100644 --- a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbxparse.code.tex b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex index 6126157d26..632c7a5cad 100644 --- a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf index 3e10c42360..19b53e887f 100644 Binary files a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf and b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf differ diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex index 1f67a3c87b..633a3fee86 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.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) %% tcolorbox-example-poster.tex: a poster example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf index 0e99b2a539..8164207f0c 100644 Binary files a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf and b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf differ diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex index 5ed9ba9a67..7cf8a140ec 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.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) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf index b50b13514b..062efe05a1 100644 Binary files a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf and b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf differ diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex index 9c52b6c68c..fd1f0c51f3 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 4.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex index b2b742409c..4a41654264 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex @@ -106,6 +106,15 @@ The created boxes are not numbered. This is the default. The option may be used to overrule a previous option. \end{newTcbKey} + +\begin{newTcbKey}[][doc new=2019-10-18]{reset counter on overlays}{\colOpt{=true\textbar false}}{default |true|, initially |false|} +For |beamer| slides, this invokes the |\resetcounteronoverlays| command +for the box counter. The counter is automatically reset on subsequent +overlay slides of a frame. +Thereby, the counter will be the same on all slides of every frame. +\end{newTcbKey} + + \clearpage \begin{newTcbKey}{number within}{=\meta{counter}}{no default, initially unset} The automatic counter is set to zero, if \meta{counter} is increased. diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.pdf b/macros/latex/contrib/tcolorbox/tcolorbox.pdf index 4c995dd99f..4b4189edeb 100644 Binary files a/macros/latex/contrib/tcolorbox/tcolorbox.pdf and b/macros/latex/contrib/tcolorbox/tcolorbox.pdf differ diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.sty b/macros/latex/contrib/tcolorbox/tcolorbox.sty index e70df1e68b..9c34ae6be0 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.sty +++ b/macros/latex/contrib/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}% diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.tex b/macros/latex/contrib/tcolorbox/tcolorbox.tex index 8399ca7681..db8286bbb8 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 4.21 (2019/09/19) +%% The LaTeX package tcolorbox - version 4.22 (2019/11/15) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -43,8 +43,8 @@ \setlength{\bibitemsep}{\smallskipamount} \addbibresource{tcolorbox.doc.bib} -\def\version{4.21}% -\def\datum{2019/09/19}% +\def\version{4.22}% +\def\datum{2019/11/15}% \makeindex \hypersetup{ @@ -58,7 +58,7 @@ %\tcbset{draftmode} \tcbset{/tcb/external/-}% for final run -%\includeonly{tcolorbox.doc.coreoptions} +%\includeonly{tcolorbox.doc.initoptions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} -- cgit v1.2.3