From 18fbab4dfefa11b1996231dcacaa8238af1d02cc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Jun 2023 20:21:05 +0000 Subject: tcolorbox (19jun23) git-svn-id: svn://tug.org/texlive/trunk@67409 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 4 +- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 4 +- .../tex/latex/tcolorbox/tcbexternal.code.tex | 4 +- .../tex/latex/tcolorbox/tcbfitting.code.tex | 4 +- .../tex/latex/tcolorbox/tcbhooks.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistings.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingscore.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 4 +- .../tex/latex/tcolorbox/tcbmagazine.code.tex | 8 +-- .../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 | 8 +-- .../tex/latex/tcolorbox/tcbskins.code.tex | 4 +- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 4 +- .../tex/latex/tcolorbox/tcbvignette.code.tex | 4 +- .../tex/latex/tcolorbox/tcbxparse.code.tex | 4 +- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 77 ++++++++++++++-------- 19 files changed, 88 insertions(+), 69 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 490c57aeed4..ff40e8aeb25 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \RequirePackage{pdfcol} \pdfcolInitStack{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 db066ad327a..8bcbd53738e 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \tcbuselibrary{listings,skins,xparse,external,raster} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 98578e37498..4385fde3f37 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 e339093144f..50c23656166 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 fa0df2d86cc..2719bcdee54 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 266e626425d..029ae9dd7cf 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 0add00ba127..8e368cf5ef2 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 888a67402f1..92ac89148cd 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 72260838444..3f87d181a7e 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \tcbuselibrary{breakable} @@ -116,7 +116,7 @@ \newrobustcmd{\usetcboxarray}[3][default]{% \boxarraygetbox[#1]{\tcb@box@array@box}{#2}% \ifdefined\tcb@box@array@box% - \tcbox[#3]{\usebox{\tcb@box@array@box}}% + \tcbox[{#3}]{\usebox{\tcb@box@array@box}}% \fi% } @@ -130,7 +130,7 @@ \newrobustcmd{\consumetcboxarray}[3][default]{% \boxarraygetbox[#1]{\tcb@box@array@box}{#2}% \ifdefined\tcb@box@array@box% - \tcbox[#3]{\leavevmode\box\tcb@box@array@box\relax}% + \tcbox[{#3}]{\leavevmode\box\tcb@box@array@box\relax}% \fi% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 09a6e9c6c79..7982a675793 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 d5e32ab1d52..7cbfcc8e00b 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 7591e9e35be..e57b443469b 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 27d5e1e0718..a105b6c0148 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -244,9 +244,9 @@ }{\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 8ff3c2d4d14..371605cb6aa 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \RequirePackage{tikz}[2010/10/13] \RequirePackage{tikzfill.image} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 2fe95bae581..75e971229dc 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 abcf018183f..7f7f04e5f0f 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 257abe7d14a..d9346b8fb94 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 052c00dd788..0d5b4e9c997 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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.3} +\tcb@set@library@version{6.0.4} \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 85074afd257..82823ed2e8b 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.3 (2023/03/17) +%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) %% 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/03/17 version 6.0.3 text color boxes] -\def\tcb@version{6.0.3} +\ProvidesPackage{tcolorbox}[2023/06/19 version 6.0.4 text color boxes] +\def\tcb@version{6.0.4} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -710,8 +710,18 @@ box align/base/.style={baseline=\tcb@val@raisebase},% shrink tight/.style={boxsep=0mm,top=-\the\dimexpr\kvtcb@top@rule@stand\relax,bottom=-\the\dimexpr\kvtcb@bottom@rule@stand\relax,% left=-\the\dimexpr\kvtcb@left@rule\relax,right=-\the\dimexpr\kvtcb@right@rule\relax},% - extrude left by/.code={\tcbdimto\kvtcb@leftupper{\kvtcb@leftupper+#1}\tcbdimto\kvtcb@bbleft{\kvtcb@bbleft-(#1)}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},% - extrude right by/.code={\tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+#1}\tcbdimto\kvtcb@bbright{\kvtcb@bbright-(#1)}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},% + extrude left by/.code={% + \tcbdimto\kvtcb@leftupper{\kvtcb@leftupper+#1}% + \tcbdimto\kvtcb@leftlower{\kvtcb@leftlower+#1}% + \tcbdimto\kvtcb@lefttitle{\kvtcb@lefttitle+#1}% + \tcbdimto\kvtcb@bbleft{\kvtcb@bbleft-(#1)}% + \tcbdimto\kvtcb@width{\kvtcb@width+#1}},% + extrude right by/.code={% + \tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+#1}% + \tcbdimto\kvtcb@rightlower{\kvtcb@rightlower+#1}% + \tcbdimto\kvtcb@righttitle{\kvtcb@righttitle+#1}% + \tcbdimto\kvtcb@bbright{\kvtcb@bbright-(#1)}% + \tcbdimto\kvtcb@width{\kvtcb@width+#1}},% extrude top by/.code={\tcbdimto\kvtcb@top{\kvtcb@top+#1}\tcbdimto\kvtcb@bbtop@stand{\kvtcb@bbtop@stand-(#1)}},% extrude bottom by/.code={\tcbdimto\kvtcb@bottom{\kvtcb@bottom+#1}\tcbdimto\kvtcb@bbbottom@stand{\kvtcb@bbbottom@stand-(#1)}},% extrude by/.style={extrude left by=#1,extrude right by=#1,extrude top by=#1,extrude bottom by=#1},% @@ -887,28 +897,27 @@ } -\cs_new:Npn \__tcobox_zcsetup_countertype:nn #1#2 +\cs_new_protected:Npn \__tcobox_zcsetup_reftype:n #1 { \cs_if_exist:NT \zcsetup { - \zcsetup { countertype={#1={#2}} } + \zcsetup { reftype={#1} } } } -\cs_new:Npn \__tcobox_label_zlabel:n #1 +\cs_new_protected:Npn \__tcobox_label_zlabel:n #1 { + \group_begin: \quark_if_nil:NF \l__tcobox_kv_labeltype_tl { - \cs_if_exist:NT \tcbcounter - { - \exp_args:NVV \__tcobox_zcsetup_countertype:nn \tcbcounter \l__tcobox_kv_labeltype_tl - } + \exp_args:NV \__tcobox_zcsetup_reftype:n \l__tcobox_kv_labeltype_tl } \cs_if_exist:NT \zlabel { - \zlabel { #1 } + \zlabel {#1} } + \group_end: } @@ -953,10 +962,20 @@ \def\kvtcb@beforebox{} \def\kvtcb@afterbox{} -\def\tcb@set@parbox@indent@{% - \vspace{-\parskip}\noindent% - \let\tcb@set@parbox@indent\@empty% -} +\IfFormatAtLeastTF{2023-06-01} + { + \def\tcb@set@parbox@indent@{% + \noindent% + \let\tcb@set@parbox@indent\@empty% + } + } + { + % Note: To be removed in future + \def\tcb@set@parbox@indent@{% + \vspace{-\parskip}\noindent% + \let\tcb@set@parbox@indent\@empty% + } + } \def\tcb@parbox@true@indent{}% \def\tcb@parbox@false@indent{% @@ -2220,15 +2239,15 @@ \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } \tl_if_novalue:nTF { #4 } { - #1 { #3 }{ \tcolorbox[#6,options@for=#3] }{ \endtcolorbox } + #1 { #3 }{ \tcolorbox[{#6,options@for=#3}] }{ \endtcolorbox } } { \tl_if_novalue:nTF { #5 } { - #1 { #3 }[ #4 ]{ \tcolorbox[#6,options@for=#3] }{ \endtcolorbox } + #1 { #3 }[ #4 ]{ \tcolorbox[{#6,options@for=#3}] }{ \endtcolorbox } } { - #1 { #3 }[ #4 ][ #5 ]{ \tcolorbox[#6,options@for=#3] }{ \endtcolorbox } + #1 { #3 }[ #4 ][ #5 ]{ \tcolorbox[{#6,options@for=#3}] }{ \endtcolorbox } } } } @@ -2247,7 +2266,7 @@ \NewDocumentCommand \__tcobox_new_TColorBox:w { m +O{} >{\TrimSpaces} m +m +m } { \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } - #1 { #3 }{ #4 }{ \tcolorbox[#5,options@for=#3] }{ \endtcolorbox } + #1 { #3 }{ #4 }{ \tcolorbox[{#5,options@for=#3}] }{ \endtcolorbox } } \NewDocumentCommand \DeclareTColorBox { } { @@ -2274,7 +2293,7 @@ \cs_new:Npn \__tcobox_new_TotalTColorBox:Nnnnnn #1#2#3#4#5#6 { \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } - \exp_args:Nc #1 { #3 }{ #4 }{ \begin{tcolorbox}[#5,options@for=#3]#6\end{tcolorbox} } + \exp_args:Nc #1 { #3 }{ #4 }{ \begin{tcolorbox}[{#5,options@for=#3}]#6\end{tcolorbox} } } \NewDocumentCommand \__tcobox_new_TotalTColorBox:w { m +O{} m } { @@ -2308,15 +2327,15 @@ \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } \tl_if_novalue:nTF { #4 } { - \exp_args:Nc #1 { #3 }{ \tcbox[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }{ \tcbox[{#6,options@for=#3}] } } { \tl_if_novalue:nTF { #5 } { - \exp_args:Nc #1 { #3 }[ #4 ]{ \tcbox[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }[ #4 ]{ \tcbox[{#6,options@for=#3}] } } { - \exp_args:Nc #1 { #3 }[ #4 ][ #5 ]{ \tcbox[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }[ #4 ][ #5 ]{ \tcbox[{#6,options@for=#3}] } } } } @@ -2340,7 +2359,7 @@ \cs_new:Npn \__tcobox_new_TCBox:Nnnnn #1#2#3#4#5 { \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } - \exp_args:Nc #1 { #3 }{ #4 }{ \tcbox[#5,options@for=#3] } + \exp_args:Nc #1 { #3 }{ #4 }{ \tcbox[{#5,options@for=#3}] } } \NewDocumentCommand \__tcobox_new_TCBox:w { m +O{} m } { @@ -2372,7 +2391,7 @@ \cs_new:Npn \__tcobox_new_TotalTCBox:Nnnnnn #1#2#3#4#5#6 { \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } - \exp_args:Nc #1 { #3 }{ #4 }{ \tcbox[#5,options@for=#3]{#6} } + \exp_args:Nc #1 { #3 }{ #4 }{ \tcbox[{#5,options@for=#3}]{#6} } } \NewDocumentCommand \__tcobox_new_TotalTCBox:w { m +O{} m } { @@ -2406,8 +2425,8 @@ \newcommand{\tcolorboxenvironment}[2]{% \AddToHook{env/#1/before}{% - \begin{tcolorbox}[savedelimiter={#1},#2,wrap@environment,% - code={\def\tcb@end@tcolorboxenvironment{\end{tcolorbox}}}]% + \begin{tcolorbox}[{savedelimiter={#1},#2,wrap@environment,% + code={\def\tcb@end@tcolorboxenvironment{\end{tcolorbox}}}}]% }% \AddToHook{env/#1/after}{% \tcb@end@tcolorboxenvironment% -- cgit v1.2.3