diff options
author | Karl Berry <karl@freefriends.org> | 2023-09-26 20:04:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-09-26 20:04:48 +0000 |
commit | c235a19b87bb41ec8d503d64173dfacfdea43c6e (patch) | |
tree | 26f55fd8b11cb0c4dd91e7f69089ff90e93de875 /Master | |
parent | d65f05e524b6dddf4c57dd93adda6b2cb57f1969 (diff) |
tcolorbox (26sep23)
git-svn-id: svn://tug.org/texlive/trunk@68375 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
31 files changed, 171 insertions, 98 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md index 0f745b9cf1a..dc5f00c2592 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md @@ -22,6 +22,25 @@ and this project adheres to +## [6.1.0] - 2023-09-26 + +### Added +- New option `redirectlowerto` (issue #240) + +### Changed +- Added braces to protect square brackets, mostly for key values (issue #234, issue #229 continued) +- Internal `\__tcobox_include_graphics:nn` refactored (issue #236) +- `blend into` now also adapts `list type` accordingly, + e.g. `blend into=figures` now sets `list type=figure` (issue #238) +- `every box`, `every box on layer <n>`, and `every box on higher layers` may contain + `capture` mode settings now (issue #246) + +### Fixed +- With parbox=false, `\par` was ignored in a `tcolorbox` that starts a list (issue #245) +- `varwidth upper` ignored horizontal alignment of upper part (issze #247) + + + ## [6.0.4] - 2023-06-19 ### Changed @@ -33,7 +52,7 @@ and this project adheres to The implementation is adapted to avoid such a need at several places (issue #229) ### Fixed -- The last version war inconsistently numbered 6.0.2 and/or 6.0.3 (issue #224) +- The last version was inconsistently numbered 6.0.2 and/or 6.0.3 (issue #224) - New LaTeX versions (from 2023-06-01) remove `\parskip` at top of `minipage`. Therefore, `parbox=false` has to be adapted (issue #232) diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README.md b/Master/texmf-dist/doc/latex/tcolorbox/README.md index f10bab15189..8700b6c322f 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README.md +++ b/Master/texmf-dist/doc/latex/tcolorbox/README.md @@ -1,4 +1,4 @@ -# The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +# The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) > Copyright (c) 2006-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf Binary files differindex 835856cf6c9..cd31a6eb528 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex index 173c6cec7dc..9c80fc806de 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox-example-poster.tex: a poster example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf Binary files differindex 6f6bee54407..a2ebd3ede78 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index e797fcb0a38..35a2e1de65c 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf Binary files differindex c2b0d9a9154..b9398ca2691 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex index 913509b21d7..cb97de9e580 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with 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 4be5dc76c8d..9144696d2cb 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -346,6 +346,31 @@ Now, we load the saved text:\\ \end{exdispExample} \end{docTcbKey} + +\clearpage +\begin{docTcbKey}[][doc new=2023-07-17]{redirectlowerto}{=\meta{file name}}{no default, initially empty} + This is a combination of \refKey{/tcb/savelowerto} and \refKey{/tcb/lowerbox}|=|\docValue{ignored} + \emph{and additionally} avoids typesetting the content of the lower part. + This can be useful, if the lower part contains counters or similar. +\begin{exdispExample}{redirectlowerto} + +\setcounter{enumi}{1} +Test counter: \theenumi + +\begin{tcolorbox}[redirectlowerto=\jobname_bspsave.tex,colback=white] +This is a \textbf{tcolorbox}. +\tcblower +This is the lower part.\stepcounter{enumi} +New value of test counter: \theenumi. +\end{tcolorbox} + +Now, we load the saved text:\\ +\input{\jobname_bspsave.tex} +\end{exdispExample} +\end{docTcbKey} + + + \clearpage \begin{docTcbKey}{lower separated}{\colOpt{=true\textbar false}}{default |true|, initially |true|} If set to |true|, the lower part is visually separated from the upper part. diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex index 1491edd0d62..b068d58eaf7 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex @@ -210,13 +210,14 @@ With \texttt{varioref}:\\ \clearpage -\begin{newTcbKey}[][doc new=2014-09-19]{blend into}{=\meta{name}}{style, no default, initially unset} +\begin{newTcbKey}[][doc new and updated={2014-09-19}{2023-07-03}]{blend into}{=\meta{name}}{style, no default, initially unset} Used to comfortably blend into an existing schema of naming and numbering for some selected cases. For example, a |tcolorbox| can be used to display and entitle an image pretending to be a standard |figure| environment. Here, \refKey{/tcb/title} is used instead of the standard |\caption| and \refKey{/tcb/list text} can be used instead of the optional parameter of the standard |\caption|. +Also, \refKey{/tcb/new/list type} is automatically adapted (changed with version 6.0.5). Feasible values for \meta{name} are: \begin{itemize} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 78d303ac4aa..f9e23664ce0 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index 6adbe6e8cf1..be4bd0afc75 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -51,8 +51,8 @@ \setlength{\bibitemsep}{\smallskipamount} \addbibresource{tcolorbox.doc.bib} -\def\version{6.0.4}% -\def\datum{2023/06/19}% +\def\version{6.1.0}% +\def\datum{2023/09/26}% \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 ff40e8aeb25..cd9e6961b27 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{pdfcol} \pdfcolInitStack{tcb@breakable} @@ -81,6 +81,7 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a% \@endpefalse% + \global\@newlistfalse% \let\tcbbreak\tcb@@break% \iftcb@usecolorstack% \pdfcolSwitchStack{tcb@breakable}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 8bcbd53738e..f0463342ced 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{listings,skins,xparse,external,raster} @@ -150,7 +150,7 @@ index colorize/.is if=tcb@doc@colorize,% index annotate/.is if=tcb@doc@annotate,% index command/.code={\def\kvtcb@index@command##1{#1{##1}}},% - index command name/.code={\def\kvtcb@index@command##1{\index[#1]{##1}}},% + index command name/.code={\def\kvtcb@index@command##1{\index[{#1}]{##1}}},% doc left/.dimstore in=\kvtcb@doc@left, doc right/.dimstore in=\kvtcb@doc@right, doc left indent/.dimstore in=\kvtcb@doc@indentleft, @@ -868,7 +868,7 @@ \setrefcountdefault{-1} \NewDocumentCommand\tcb@ref@doc{msm}{% - \hyperref[#1:#3]{\texttt{\ref*{#1:#3}}% + \hyperref[{#1:#3}]{\texttt{\ref*{#1:#3}}% \IfBooleanTF{#2}{}{% \ifnum\getpagerefnumber{#1:#3}=\thepage\relax% \else% @@ -899,12 +899,12 @@ \newcommand{\tcbdocmarginnote}[2][]{% \marginnote{% - \begin{tcolorbox}[enhanced jigsaw,size=fbox,boxrule=1pt,leftrule=0pt,rightrule=0pt, + \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, if odd page or oneside={flushright upper}{flushleft upper}, - doc@marginnote,#1]#2\end{tcolorbox}}} + doc@marginnote,#1}]#2\end{tcolorbox}}} \newcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1} \newcommand*{\tcbdocupdated}[1]{\kvtcb@text@updated: #1} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 4385fde3f37..c0159db83fa 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{pro@cessing} @@ -160,7 +160,7 @@ \tcb@newenvironment{#1}[2][]{% #4% \begingroup% - \tcbexternal[#3,##1,environment=#2]{##2}% + \tcbexternal[{#3,##1,environment=#2}]{##2}% }{% \endtcbexternal% \endgroup% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 50c23656166..118c77fb13d 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -368,7 +368,7 @@ } \newcommand{\tcboxfit}[2][]{% - \tcb@ox{capture=fitbox,#1}{#2}% + \tcb@ox{capture=fitbox}{#1}{#2}% } @@ -380,15 +380,15 @@ \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } \tl_if_novalue:nTF { #4 } { - \exp_args:Nc #1 { #3 }{ \tcboxfit[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }{ \tcboxfit[{#6,options@for=#3}] } } { \tl_if_novalue:nTF { #5 } { - \exp_args:Nc #1 { #3 }[ #4 ]{ \tcboxfit[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }[ #4 ]{ \tcboxfit[{#6,options@for=#3}] } } { - \exp_args:Nc #1 { #3 }[ #4 ][ #5 ]{ \tcboxfit[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }[ #4 ][ #5 ]{ \tcboxfit[{#6,options@for=#3}] } } } } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 2719bcdee54..bdf0a6c9f18 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \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 029ae9dd7cf..c1bc358d1b3 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \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 8e368cf5ef2..e95a98a8ed8 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \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 92ac89148cd..fa6f16bd1fc 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \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 3f87d181a7e..0e6efd9f713 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \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 7982a675793..2115bf2f4bc 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{minted}[2021/12/24] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex index 7cbfcc8e00b..b6a139fde7d 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbposter.code.tex: Code for posters %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{breakable,magazine,skins,fitting} @@ -131,9 +131,9 @@ \tcbdimto\tcb@poster@boxwidth{\tcb@poster@span\dimexpr\tcbpostercolwidth+\tcbpostercolspacing\relax-\tcbpostercolspacing}% \iftcb@posterbox@sequence% \begin{pgfinterruptpicture}% - \begin{tcolorbox}[tcb@poster@style,width=\tcb@poster@boxwidth,tcb@poster@boxheight, + \begin{tcolorbox}[{tcb@poster@style,width=\tcb@poster@boxwidth,tcb@poster@boxheight, height fixed for=all,#1, - enforce breakable,reset box array=tcb@poster,store to box array=tcb@poster]#3\end{tcolorbox}% + enforce breakable,reset box array=tcb@poster,store to box array=tcb@poster}]#3\end{tcolorbox}% \end{pgfinterruptpicture}% \def\tcb@poster@boxcount{0}% \renewcommand*{\do}[1]{\edef\tcb@poster@boxcount{\the\numexpr\tcb@poster@boxcount+1\relax}% @@ -153,8 +153,8 @@ \fi% \else% \begin{pgfinterruptpicture}% - \begin{tcolorbox}[tcb@poster@style,width=\tcb@poster@boxwidth,tcb@poster@boxheight,#1, - reset box array=tcb@poster,store to box array=tcb@poster]#3\end{tcolorbox}% + \begin{tcolorbox}[{tcb@poster@style,width=\tcb@poster@boxwidth,tcb@poster@boxheight,#1, + reset box array=tcb@poster,store to box array=tcb@poster}]#3\end{tcolorbox}% \end{pgfinterruptpicture}% \node[inner sep=0pt,outer sep=0,tcb@poster@node,name=\tcb@poster@prefix\tcb@poster@boxname] at (\tcb@poster@xpos|-\tcb@poster@ypos) {\consumeboxarray[tcb@poster]{1}};% @@ -166,7 +166,7 @@ } \newenvironment{tcb@poster@boxenv}[2][]{% - \newcommand{\tcb@poster@box@saved}{\posterbox[#1]{#2}{\tcbusetemp}}% + \newcommand{\tcb@poster@box@saved}{\posterbox[{#1}]{#2}{\tcbusetemp}}% \tcbwritetemp}% {\endtcbwritetemp\tcb@poster@box@saved} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex index e57b443469b..83f0ec2cb55 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \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 a105b6c0148..07f58e0c0bd 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -229,24 +229,24 @@ } \newcommand{\tcbitem@following}[1][]{% - \end{tcolorbox}\begin{tcolorbox}[#1]% + \end{tcolorbox}\begin{tcolorbox}[{#1}]% } \newcommand{\tcbitem@first}[1][]{% \let\tcbitem=\tcbitem@following% - \begin{tcolorbox}[#1]% + \begin{tcolorbox}[{#1}]% } \newenvironment{tcbitemize}[1][]{% - \begin{tcbraster}[#1]% + \begin{tcbraster}[{#1}]% \let\tcb@raster@change@fitbox=\tcb@raster@change@hbox% \let\tcbitem=\tcbitem@first% }{\end{tcolorbox}\end{tcbraster}} \newenvironment{tcboxedraster}[2][]{% - \tcolorbox[{#2}]\begin{tcbraster}[#1]}% + \tcolorbox[{#2}]\begin{tcbraster}[{#1}]}% {\end{tcbraster}\endtcolorbox} \newenvironment{tcboxeditemize}[2][]{% - \tcolorbox[{#2}]\tcbitemize[#1]}% + \tcolorbox[{#2}]\tcbitemize[{#1}]}% {\endtcbitemize\endtcolorbox} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 371605cb6aa..51a7722f779 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{tikz}[2010/10/13] \RequirePackage{tikzfill.image} @@ -1720,11 +1720,9 @@ \cs_new:Npn \__tcobox_include_graphics:nn #1#2 { - \tl_set:Nn \l_tmpa_tl { \includegraphics } - \tl_put_right:Nx \l_tmpa_tl { [#1] } - \l_tmpa_tl {#2} + \includegraphics [#1] {#2} } - +\cs_generate_variant:Nn \__tcobox_include_graphics:nn {en} \cs_new:Npn \__tcobox_include_graphics: { @@ -1734,7 +1732,7 @@ { \hbox_set:Nn \l_tmpa_box { - \__tcobox_include_graphics:nn { \l__tcobox_graphics_options_tl }{ \imagepath } + \__tcobox_include_graphics:en { \l__tcobox_graphics_options_tl }{ \imagepath } } \if_case:w \kvtcb@graphics@orientation \dim_compare:nNnT {\box_wd:N\l_tmpa_box} < {\box_ht_plus_dp:N \l_tmpa_box} @@ -1763,21 +1761,21 @@ { \tcbox { - \__tcobox_include_graphics:nn { \l__tcobox_graphics_options_tl }{ \imagepath } + \__tcobox_include_graphics:en { \l__tcobox_graphics_options_tl }{ \imagepath } } } { \legacy_if:nTF {tcb@fixedheight} { \begin{tcolorbox} - \__tcobox_include_graphics:nn { \l__tcobox_graphics_options_tl,width=\linewidth,height=\tcbtextheight,keepaspectratio }{ \imagepath } + \__tcobox_include_graphics:en { \l__tcobox_graphics_options_tl,width=\linewidth,height=\tcbtextheight,keepaspectratio }{ \imagepath } \end{tcolorbox} } { \tl_if_empty:NTF \tcb@height@adjust { \begin{tcolorbox} - \__tcobox_include_graphics:nn { \l__tcobox_graphics_options_tl,width=\linewidth }{ \imagepath } + \__tcobox_include_graphics:en { \l__tcobox_graphics_options_tl,width=\linewidth }{ \imagepath } \end{tcolorbox}% }{% height fill \begin{tcolorbox}[ @@ -1899,7 +1897,7 @@ }\fi} \tcbset{% - hyperref node/.style 2 args={finish={\tcbhypernode{\hyperref[#1]}{#2}}}, + hyperref node/.style 2 args={finish={\tcbhypernode{\hyperref[{#1}]}{#2}}}, hyperref/.style={hyperref node={#1}{frame}}, hyperref interior/.style={hyperref node={#1}{interior}}, hyperref title/.style={hyperref node={#1}{title}}, @@ -1911,7 +1909,7 @@ hyperurl/.style={hyperurl node={#1}{frame}}, hyperurl interior/.style={hyperurl node={#1}{interior}}, hyperurl title/.style={hyperurl node={#1}{title}}, - hyperurl* node/.style n args={3}{finish={\tcbhypernode{\href[#1]{#2}}{#3}}}, + hyperurl* node/.style n args={3}{finish={\tcbhypernode{\href[{#1}]{#2}}{#3}}}, hyperurl*/.style 2 args={hyperurl* node={#1}{#2}{frame}}, hyperurl* interior/.style 2 args={hyperurl* node={#1}{#2}{interior}}, hyperurl* title/.style 2 args={hyperurl* node={#1}{#2}{title}}, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 75e971229dc..2a0e642acbf 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \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 7f7f04e5f0f..7e93b7ddcd6 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% 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{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{amsmath} @@ -149,7 +149,7 @@ \NewDocumentCommand \__tcobox_new_tcbtheorem_x:w { m O{} m m +m m } { - #1 [auto~counter,#2] {#3} { +O{} +o +m m } + #1 [{auto~counter,#2}] {#3} { +O{} +o +m m } { #5, title = {\__tcobox_theo_title:nnn{#4}{\thetcbcounter}{##3}}, @@ -165,7 +165,7 @@ theo@label = {#6}{##4}, ##1 } - #1 [#2,no~counter,list~inside=] {#3*} { +O{} +m } + #1 [{#2,no~counter,list~inside=}] {#3*} { +O{} +m } { #5, title = {\__tcobox_theo_title:nnn{#4}{}{##2}}, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex index d9346b8fb94..c67a25d5c14 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \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 0d5b4e9c997..22587ac90f2 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,6 +18,6 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \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 82823ed2e8b..812b9dcc90e 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 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesPackage{tcolorbox}[2023/06/19 version 6.0.4 text color boxes] -\def\tcb@version{6.0.4} +\ProvidesPackage{tcolorbox}[2023/09/26 version 6.1.0 text color boxes] +\def\tcb@version{6.1.0} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -29,6 +29,7 @@ % register \newif\iftcb@lowerignored \newif\iftcb@lowervisible +\newif\iftcb@redirectlowerto \newif\iftcb@uppervisible \newif\iftcb@titlevisible \newif\iftcb@hasTitle @@ -285,7 +286,8 @@ fontupper/.store in=\kvtcb@fontupper, fontlower/.store in=\kvtcb@fontlower, tempfile/.store in=\kvtcb@tempfile, - savelowerto/.store in=\kvtcb@savelowerto, + savelowerto/.code={\tcb@redirectlowertofalse\def\kvtcb@savelowerto{#1}}, + redirectlowerto/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse\tcb@redirectlowertotrue\def\kvtcb@savelowerto{#1}}, saveto/.store in=\kvtcb@saveupperto, savedelimiter/.estore in=\kvtcb@savedelimiter, floatplacement/.store in=\kvtcb@floatplacement, @@ -681,8 +683,14 @@ tikznode upper/.style={before upper={\centering\tcb@shield@externalize\begin{tikzpicture}\node[{align=center,inner sep=\z@,outer sep=\z@,#1}]\bgroup},after upper={\egroup;\end{tikzpicture}}},% tikznode lower/.style={before lower={\centering\tcb@shield@externalize\begin{tikzpicture}\node[{align=center,inner sep=\z@,outer sep=\z@,#1}]\bgroup},after lower={\egroup;\end{tikzpicture}}},% tikznode/.style={tikznode upper={#1},tikznode lower={#1}},% - varwidth upper/.style={before upper={\tcbdimto\tcb@w@upper{#1-(\kvtcb@left@rule+\kvtcb@right@rule+(\kvtcb@boxsep)*2+\kvtcb@leftupper+\kvtcb@rightupper)}% - \begin{varwidth}{\tcb@w@upper}},after upper={\end{varwidth}}},% + varwidth upper/.style={% + before upper={% + \tcbdimto\tcb@w@upper{#1-(\kvtcb@left@rule+\kvtcb@right@rule+(\kvtcb@boxsep)*2+\kvtcb@leftupper+\kvtcb@rightupper)}% + \begin{varwidth}{\tcb@w@upper}% + \kvtcb@halignupper% + },% + after upper={\end{varwidth}}% + },% varwidth upper/.default=\kvtcb@width, text fill/.style={before upper={% \ifdim\dimexpr\tcbtextheight>\z@\relax% @@ -808,11 +816,11 @@ hypertarget/.style={phantom={\ifdefined\hypertarget\Hy@raisedlink{\hypertarget{#1}{}}\fi}}, bookmark*/.style 2 args={phantom={\ifdefined\bookmark% \Hy@raisedlink{\hypertarget{tcb@\thetcolorboxnumber}{}}% - \bookmark[dest=tcb@\thetcolorboxnumber,rellevel=1,keeplevel,#1]{#2}% + \bookmark[{dest=tcb@\thetcolorboxnumber,rellevel=1,keeplevel,#1}]{#2}% \fi}}, bookmark/.style={bookmark*={}{#1}}, index/.style={phantom={\index{#1}}},% - index*/.style 2 args={phantom={\index[#1]{#2}}},% + index*/.style 2 args={phantom={\index[{#1}]{#2}}},% add to list/.style 2 args={phantom={\tcb@addcontentsline{#1}{#2}}}, nophantom/.code={\def\kvtcb@phantom{}},% shield externalize/.is choice, @@ -987,6 +995,7 @@ \let\tcb@parboxrestore=\@parboxrestore \def\tcb@parbox@false@settings{% + \let\par\@@par% \linewidth\hsize% \@totalleftmargin\z@% \leftskip\z@skip% @@ -1022,7 +1031,8 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a \@endpefalse% - \let\tcbbreak\par% + \global\@newlistfalse% + \let\tcbbreak\@@par% \csname tcb@parbox@use@\kvtcb@parbox\endcsname% \tcb@minipage{#2}% \color{#3}% @@ -1388,8 +1398,9 @@ } \long\def\tcb@@icolorbox[#1]{% + \tcbset{capture=minipage}% \tcb@layer@inc% - \tcb@apply@box@options{capture=minipage,#1}\tcb@height@adjust% + \tcb@apply@box@options{#1}\tcb@height@adjust% \tcb@hasLowerfalse% \csname tcb@@capture@\kvtcb@capture\endcsname% } @@ -2059,17 +2070,18 @@ \long\def\tcbox@inner@v@@d#1{}% -\long\def\tcb@ox#1#2{% +\long\def\tcb@ox#1#2#3{% \begingroup% + \tcbset{#1}% \tcb@layer@inc% - \tcb@apply@box@options{#1,breakable@false,sidebyside@false}\tcb@height@adjust% - \csname tcbox@inner@\kvtcb@capture\endcsname{#2}% + \tcb@apply@box@options{#2,breakable@false,sidebyside@false}\tcb@height@adjust% + \csname tcbox@inner@\kvtcb@capture\endcsname{#3}% \tcb@layer@dec% \endgroup% } \newcommand{\tcbox}[2][]{% - \tcb@ox{capture=hbox,#1}{#2}% + \tcb@ox{capture=hbox}{#1}{#2}% } \newcommand{\tcbsubtitle}[2][]{% @@ -2089,14 +2101,14 @@ \let\tcb@trans@bottom\kvtcb@bottomtitle% \let\tcb@trans@rule\kvtcb@title@rule% \let\tcb@trans@style\kvtcb@subtitle@style% - \begin{tcolorbox}[sharp corners, + \begin{tcolorbox}[{sharp corners, before skip={0.5\baselineskip},after skip={0.5\baselineskip}, colframe=tcbtranscol@frame,colback=tcbtranscol@back, colupper=tcbtranscol@upper,fontupper=\tcb@trans@fontupper, boxsep=\tcb@trans@boxsep,left=\tcb@trans@left,right=\tcb@trans@right, top=\tcb@trans@top,bottom=\tcb@trans@bottom, boxrule=\tcb@trans@rule,leftrule=\z@,rightrule=\z@,oversize, - code={\pgfkeysalsofrom\tcb@trans@style},#1]% + code={\pgfkeysalsofrom\tcb@trans@style},#1}]% #2% \end{tcolorbox}% \endgroup% @@ -2140,9 +2152,24 @@ Crefname/.code n args={2}{\begingroup\edef\x{\endgroup\noexpand\Crefname{\tcb@new@boxname}}\x{#1}{#2}\tcb@new@label@type}, % blend into/.is choice,% - blend into/figures/.style={use counter*=figure,list inside=lof,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@figure}}}}},% - 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}}}}},% + blend into/figures/.style={% + use counter* = figure, + list inside = lof, + list type = figure, + /tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@figure}}}}% + },% + blend into/tables/.style={% + use counter* = table, + list inside = lot, + list type = table, + /tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@table}}}}% + },% + blend into/listings/.style={% + use counter* = lstlisting, + list inside = lol, + list type = lstlisting, + /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 counter on overlays=false}, @@ -2497,7 +2524,7 @@ #1{#4} } { - #1[#3]{#4} + #1[{#3}]{#4} } } \@starttoc{#2} @@ -2583,8 +2610,10 @@ \def\tcb@endlowerverbatimanddraw{% \endtcbverbatimwrite% \endgroup% - \IfFileExists{\kvtcb@savelowerto}{% - \tcb@savelowerbox\input{\kvtcb@savelowerto}\end{tcb@savebox}}{}% + \iftcb@redirectlowerto\else% + \IfFileExists{\kvtcb@savelowerto}{% + \tcb@savelowerbox\input{\kvtcb@savelowerto}\end{tcb@savebox}}{}% + \fi% \tcb@draw@color@box% \tcb@finalize@environment% } |