diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tcolorbox')
19 files changed, 692 insertions, 528 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 543d767c67a..c5f982ebd7a 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \RequirePackage{pdfcol} \pdfcolInitStack{tcb@breakable} @@ -95,7 +95,6 @@ \@setminipage\tcb@hyph@fix% \let\tcb@drawcolorbox\tcb@drawcolorbox@standalone% \let\FN@pp@footnote\@empty% disable perpage mode of 'footmisc' package - \ignorespaces% } \def\endtcb@vbox{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 7a97196d346..ffa29fd17d4 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,11 +17,17 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \tcbuselibrary{listings,skins,xparse,external,raster} -\ifdefined\printindex\else\RequirePackage{makeidx}[2000/03/29]\fi +\ifdefined\printindex\else% + \RequirePackage{makeidx}[2000/03/29]% + \AddToHook{begindocument/before}{% + \@ifpackageloaded{imakeidx}{% + \tcb@warning{`imakeidx' package should be loaded before `documentation' library}% + }{}}% +\fi \RequirePackage{refcount}[2011/10/16] \RequirePackage{hyperref}[2012/02/06] \ifdefined\marginnote\else\RequirePackage{marginnote}[2012/03/29]\fi @@ -88,7 +94,6 @@ \colOpt{{\ttfamily[}\meta{#1}{\ttfamily]}}} \def\brackets#1{{\ttfamily\char`\{}#1{\ttfamily\char`\}}} -\newif\iftcb@doc@toindex \newif\iftcb@doc@colorize \newif\iftcb@doc@annotate @@ -102,6 +107,7 @@ environment content/.store in=\kvtcb@text@envcontent, environment/.store in=\kvtcb@text@env, environments/.store in=\kvtcb@text@envs, + commands/.store in=\kvtcb@text@coms, index/.store in=\kvtcb@text@index, key/.store in=\kvtcb@text@key, keys/.store in=\kvtcb@text@keys, @@ -182,7 +188,6 @@ after doc body/.style={after doc body command={#1},after doc body environment={#1} ,after doc body key={#1},after doc body path={#1}}, doc description/.store in=\kvtcb@doc@description,% - doc into index/.is if=tcb@doc@toindex,% doc no index/.style={doc into index=false}, doc updated/.style={before upper={\tcbdocmarginnote{\tcbdocupdated{#1}}}}, doc new/.style={before upper={\tcbdocmarginnote{\tcbdocnew{#1}}}}, @@ -210,6 +215,7 @@ counter=counter,counters=Counters, environment content=environment content, environment=environment,environments=Environments, + commands=Commands, path=path operation,paths=Path operations, index=Index, key=key,keys=Keys, @@ -277,28 +283,28 @@ \iftcb@doc@colorize\textcolor{#2}{\tcb@cs{#1}}\else\tcb@cs{#1}\fi% } -\newrobustcmd{\tcbIndexPrintComC}[1]{\tcb@Index@Print@ComC{#1}{\kvtcb@col@command}} +\NewDocumentCommand{\tcbIndexPrintComC}{m}{\tcb@Index@Print@ComC{#1}{\kvtcb@col@command}} -\newrobustcmd{\tcbIndexPrintEnvCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@environment}{\kvtcb@text@env}} -\newrobustcmd{\tcbIndexPrintEnvC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@environment}} +\NewDocumentCommand{\tcbIndexPrintEnvCA}{m}{\tcb@Index@Print@CA{#1}{\kvtcb@col@environment}{\kvtcb@text@env}} +\NewDocumentCommand{\tcbIndexPrintEnvC}{m}{\tcb@Index@Print@C{#1}{\kvtcb@col@environment}} -\newrobustcmd{\tcbIndexPrintKeyCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@key}{\kvtcb@text@key}} -\newrobustcmd{\tcbIndexPrintKeyC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@key}} +\NewDocumentCommand{\tcbIndexPrintKeyCA}{m}{\tcb@Index@Print@CA{#1}{\kvtcb@col@key}{\kvtcb@text@key}} +\NewDocumentCommand{\tcbIndexPrintKeyC}{m}{\tcb@Index@Print@C{#1}{\kvtcb@col@key}} -\newrobustcmd{\tcbIndexPrintPathCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@path}{\kvtcb@text@path}} -\newrobustcmd{\tcbIndexPrintPathC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@path}} +\NewDocumentCommand{\tcbIndexPrintPathCA}{m}{\tcb@Index@Print@CA{#1}{\kvtcb@col@path}{\kvtcb@text@path}} +\NewDocumentCommand{\tcbIndexPrintPathC}{m}{\tcb@Index@Print@C{#1}{\kvtcb@col@path}} -\newrobustcmd{\tcbIndexPrintValCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@value}{\kvtcb@text@value}} -\newrobustcmd{\tcbIndexPrintValC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@value}} +\NewDocumentCommand{\tcbIndexPrintValCA}{m}{\tcb@Index@Print@CA{#1}{\kvtcb@col@value}{\kvtcb@text@value}} +\NewDocumentCommand{\tcbIndexPrintValC}{m}{\tcb@Index@Print@C{#1}{\kvtcb@col@value}} -\newrobustcmd{\tcbIndexPrintColCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@color}{\kvtcb@text@color}} -\newrobustcmd{\tcbIndexPrintColC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@color}} +\NewDocumentCommand{\tcbIndexPrintColCA}{m}{\tcb@Index@Print@CA{#1}{\kvtcb@col@color}{\kvtcb@text@color}} +\NewDocumentCommand{\tcbIndexPrintColC}{m}{\tcb@Index@Print@C{#1}{\kvtcb@col@color}} -\newrobustcmd{\tcbIndexPrintCountCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@counter}{\kvtcb@text@counter}} -\newrobustcmd{\tcbIndexPrintCountC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@counter}} +\NewDocumentCommand{\tcbIndexPrintCountCA}{m}{\tcb@Index@Print@CA{#1}{\kvtcb@col@counter}{\kvtcb@text@counter}} +\NewDocumentCommand{\tcbIndexPrintCountC}{m}{\tcb@Index@Print@C{#1}{\kvtcb@col@counter}} -\newrobustcmd{\tcbIndexPrintLenCA}[1]{\tcb@Index@Print@ComCA{#1}{\kvtcb@col@length}{\kvtcb@text@length}} -\newrobustcmd{\tcbIndexPrintLenC}[1]{\tcb@Index@Print@ComC{#1}{\kvtcb@col@length}} +\NewDocumentCommand{\tcbIndexPrintLenCA}{m}{\tcb@Index@Print@ComCA{#1}{\kvtcb@col@length}{\kvtcb@text@length}} +\NewDocumentCommand{\tcbIndexPrintLenC}{m}{\tcb@Index@Print@ComC{#1}{\kvtcb@col@length}} \newenvironment{tcb@manual@entry}{\begin{list}{}{% @@ -326,6 +332,29 @@ \ExplSyntaxOn +\cs_new_nopar:Npn \__tcobox_new_bool_key:nn #1 #2 + { + \bool_new:N #1 + \tcbset + { + #2/.is~choice, + #2/true/.code = { \bool_set_true:N #1 }, + #2/false/.code = { \bool_set_false:N #1 }, + #2/.default = true, + } + } + +\__tcobox_new_bool_key:nn \l__tcobox_doc_toindex_bool { doc~into~index } +\__tcobox_new_bool_key:nn \l__tcobox_doc_gather_colors_bool { index~gather~colors } +\__tcobox_new_bool_key:nn \l__tcobox_doc_gather_commands_bool { index~gather~commands } +\__tcobox_new_bool_key:nn \l__tcobox_doc_gather_counters_bool { index~gather~counters } +\__tcobox_new_bool_key:nn \l__tcobox_doc_gather_environments_bool { index~gather~environments } +\__tcobox_new_bool_key:nn \l__tcobox_doc_gather_keys_bool { index~gather~keys } +\__tcobox_new_bool_key:nn \l__tcobox_doc_gather_lengths_bool { index~gather~lengths } +\__tcobox_new_bool_key:nn \l__tcobox_doc_gather_paths_bool { index~gather~paths } +\__tcobox_new_bool_key:nn \l__tcobox_doc_gather_values_bool { index~gather~values } + + \cs_new_nopar:Npn \__tcobox_sanitize_tl:n #1 { \group_begin: @@ -416,9 +445,14 @@ \cs_new_nopar:Npn \__tcobox_index_command: { - \iftcb@doc@toindex - \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintComC{\kvtcb@doc@index}} - \fi + \bool_if:NT \l__tcobox_doc_toindex_bool + { + \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintComC{\kvtcb@doc@index}} + \bool_if:NT \l__tcobox_doc_gather_commands_bool + { + \kvtcb@index@command{\kvtcb@text@coms\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintComC{\kvtcb@doc@index}} + } + } } \cs_new:Npn \__tcobox_doc_head_command: @@ -457,7 +491,7 @@ \NewDocumentEnvironment{docCommand*}{} { \group_begin: - \tcb@doc@toindexfalse + \bool_set_false:N \l__tcobox_doc_toindex_bool \begin{docCommand} } { @@ -473,10 +507,14 @@ \cs_new_nopar:Npn \__tcobox_index_environment: { - \iftcb@doc@toindex - \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvCA{\kvtcb@doc@index}} - \kvtcb@index@command{\kvtcb@text@envs\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvC{\kvtcb@doc@index}} - \fi + \bool_if:NT \l__tcobox_doc_toindex_bool + { + \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvCA{\kvtcb@doc@index}} + \bool_if:NT \l__tcobox_doc_gather_environments_bool + { + \kvtcb@index@command{\kvtcb@text@envs\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvC{\kvtcb@doc@index}} + } + } } \cs_new:Npn \__tcobox_doc_head_environment: @@ -517,7 +555,7 @@ \NewDocumentEnvironment{docEnvironment*}{} { \group_begin: - \tcb@doc@toindexfalse + \bool_set_false:N \l__tcobox_doc_toindex_bool \begin{docEnvironment} } { @@ -538,17 +576,21 @@ \cs_new_nopar:Npn \__tcobox_index_key: { - \iftcb@doc@toindex - \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintKeyCA{\kvtcb@doc@index}} - \tl_if_empty:NTF \kvtcb@doc@keypath - { - \kvtcb@index@command{\kvtcb@text@keys\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintKeyC{\kvtcb@doc@index}} - } - { - \kvtcb@index@command{\kvtcb@text@keys\idx@level\kvtcb@doc@keypath\idx@actual\tcbIndexPrintKeyC{/\kvtcb@doc@keypath/} - \idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintKeyC{\kvtcb@doc@index}} - } - \fi + \bool_if:NT \l__tcobox_doc_toindex_bool + { + \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintKeyCA{\kvtcb@doc@index}} + \bool_if:NT \l__tcobox_doc_gather_keys_bool + { + \tl_if_empty:NTF \kvtcb@doc@keypath + { + \kvtcb@index@command{\kvtcb@text@keys\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintKeyC{\kvtcb@doc@index}} + } + { + \kvtcb@index@command{\kvtcb@text@keys\idx@level\kvtcb@doc@keypath\idx@actual\tcbIndexPrintKeyC{/\kvtcb@doc@keypath/} + \idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintKeyC{\kvtcb@doc@index}} + } + } + } } \cs_new:Npn \__tcobox_doc_head_key: @@ -603,7 +645,7 @@ \NewDocumentEnvironment{docKey*}{} { \group_begin: - \tcb@doc@toindexfalse + \bool_set_false:N \l__tcobox_doc_toindex_bool \begin{docKey} } { @@ -633,7 +675,7 @@ \NewDocumentEnvironment{#1*}{} { \group_begin: - \tcb@doc@toindexfalse + \bool_set_false:N \l__tcobox_doc_toindex_bool \begin{#1} } { @@ -668,10 +710,14 @@ \cs_new_nopar:Npn \__tcobox_index_path: { - \iftcb@doc@toindex - \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintPathCA{\kvtcb@doc@index}} - \kvtcb@index@command{\kvtcb@text@paths\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintPathC{\kvtcb@doc@index}} - \fi + \bool_if:NT \l__tcobox_doc_toindex_bool + { + \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintPathCA{\kvtcb@doc@index}} + \bool_if:NT \l__tcobox_doc_gather_paths_bool + { + \kvtcb@index@command{\kvtcb@text@paths\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintPathC{\kvtcb@doc@index}} + } + } } \cs_new:Npn \__tcobox_doc_head_path: @@ -710,7 +756,7 @@ \NewDocumentEnvironment{docPathOperation*}{} { \group_begin: - \tcb@doc@toindexfalse + \bool_set_false:N \l__tcobox_doc_toindex_bool \begin{docPathOperation} } { @@ -756,7 +802,10 @@ \IfBooleanF{#1} { \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintValCA{\kvtcb@doc@index}} - \kvtcb@index@command{\kvtcb@text@values\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintValC{\kvtcb@doc@index}} + \bool_if:NT \l__tcobox_doc_gather_values_bool + { + \kvtcb@index@command{\kvtcb@text@values\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintValC{\kvtcb@doc@index}} + } } \group_end: } @@ -770,7 +819,10 @@ \IfBooleanF{#1} { \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintColCA{\kvtcb@doc@index}} - \kvtcb@index@command{\kvtcb@text@colors\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintColC{\kvtcb@doc@index}} + \bool_if:NT \l__tcobox_doc_gather_colors_bool + { + \kvtcb@index@command{\kvtcb@text@colors\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintColC{\kvtcb@doc@index}} + } } \group_end: } @@ -784,7 +836,10 @@ \IfBooleanF{#1} { \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintCountCA{\kvtcb@doc@index}} - \kvtcb@index@command{\kvtcb@text@counters\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintCountC{\kvtcb@doc@index}} + \bool_if:NT \l__tcobox_doc_gather_counters_bool + { + \kvtcb@index@command{\kvtcb@text@counters\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintCountC{\kvtcb@doc@index}} + } } \group_end: } @@ -798,7 +853,10 @@ \IfBooleanF{#1} { \kvtcb@index@command{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintLenCA{\kvtcb@doc@index}} - \kvtcb@index@command{\kvtcb@text@lengths\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintLenC{\kvtcb@doc@index}} + \bool_if:NT \l__tcobox_doc_gather_lengths_bool + { + \kvtcb@index@command{\kvtcb@text@lengths\idx@level\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintLenC{\kvtcb@doc@index}} + } } \group_end: } @@ -887,17 +945,19 @@ \ExplSyntaxOn \def\tcb@doc@index@doc{ - \def \__tcobox_index_command: + \cs_set_nopar:Npn \__tcobox_index_command: { - \iftcb@doc@toindex - \SpecialMainIndex{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintComC{\kvtcb@doc@index}} - \fi + \bool_if:NT \l__tcobox_doc_toindex_bool + { + \SpecialMainIndex{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintComC{\kvtcb@doc@index}} + } } - \def \__tcobox_index_environment: + \cs_set_nopar:Npn \__tcobox_index_environment: { - \iftcb@doc@toindex - \SpecialMainEnvIndex{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvC{\kvtcb@doc@index}} - \fi + \bool_if:NT \l__tcobox_doc_toindex_bool + { + \SpecialMainEnvIndex{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvC{\kvtcb@doc@index}} + } } \tcbset{index~german~settings} \EnableCrossrefs @@ -908,6 +968,28 @@ \def\tcb@doc@index@off{} \tcbset{% + index gather all/.style={% + index gather colors=true, + index gather commands=true, + index gather counters=true, + index gather environments=true, + index gather keys=true, + index gather lengths=true, + index gather paths=true, + index gather values=true}, + index gather none/.style={% + index gather colors=false, + index gather commands=false, + index gather counters=false, + index gather environments=false, + index gather keys=false, + index gather lengths=false, + index gather paths=false, + index gather values=false}, +} + + +\tcbset{% reset@documentation/.style={% }, initialize@reset=reset@documentation, @@ -921,6 +1003,7 @@ after doc body=, documentation listing style=tcbdocumentation, doc into index=true, + index gather all, doc marginnote=, color option=Option, color definition=Definition, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index cdc0c2b9e81..094a35e8cc5 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \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 1259be495c1..0c4f6368cdb 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -371,27 +371,100 @@ \tcb@ox{capture=fitbox,#1}{#2}% } -\long\def\tcb@newtcboxfit#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcboxfit[#2,options@for=#1]}} -\long\def\tcb@newtcboxfit@#1[#2]#3{\expandafter\tcb@newcommand\csname#1\endcsname[#2]{\tcboxfit[#3,options@for=#1]}} +\ExplSyntaxOn -\long\def\tcb@newtcboxfit@@#1[#2][#3]#4{\expandafter\tcb@newcommand\csname#1\endcsname[#2][#3]{\tcboxfit[#4,options@for=#1]}} -\long\def\tcb@new@tcboxfit@#1[#2]{% - \@ifnextchar[{\tcb@newtcboxfit@@{#1}[#2]}{\tcb@newtcboxfit@{#1}[#2]}} +\NewDocumentCommand \__tcobox_new_tcboxfit_ii:w { m +m m o +o +m } + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + \tl_if_novalue:nTF { #4 } + { + \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 ][ #5 ]{ \tcboxfit[#6,options@for=#3] } + } + } + } +\NewDocumentCommand \__tcobox_new_tcboxfit_i:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_tcboxfit_ii:w #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \newtcboxfit { } + { + \__tcobox_new_tcboxfit_i:w \newcommand + } +\NewDocumentCommand \renewtcboxfit { } + { + \__tcobox_new_tcboxfit_i:w \renewcommand + } -\long\def\tcb@new@tcboxfit#1{% - \@ifnextchar[{\tcb@new@tcboxfit@{#1}}{\tcb@newtcboxfit{#1}}} -\def\newtcboxfit{% - \let\tcb@newcommand\newcommand% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcboxfit% - \tcb@process@newcommand} +\cs_new:Npn \__tcobox_new_TCBoxFit:Nnnnn #1#2#3#4#5 + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + \exp_args:Nc #1 { #3 }{ #4 }{ \tcboxfit[#5,options@for=#3] } + } +\NewDocumentCommand \__tcobox_new_TCBoxFit:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_TCBoxFit:Nnnnn #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \DeclareTCBoxFit { } + { + \__tcobox_new_TCBoxFit:w \DeclareDocumentCommand + } +\NewDocumentCommand \NewTCBoxFit { } + { + \__tcobox_new_TCBoxFit:w \NewDocumentCommand + } +\NewDocumentCommand \RenewTCBoxFit { } + { + \__tcobox_new_TCBoxFit:w \RewewDocumentCommand + } +\NewDocumentCommand \ProvideTCBoxFit { } + { + \__tcobox_new_TCBoxFit:w \ProvideDocumentCommand + } + + +\cs_new:Npn \__tcobox_new_TotalTCBoxFit:Nnnnnn #1#2#3#4#5#6 + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + \exp_args:Nc #1 { #3 }{ #4 }{ \tcboxfit[#5,options@for=#3]{#6} } + } +\NewDocumentCommand \__tcobox_new_TotalTCBoxFit:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_TotalTCBoxFit:Nnnnnn #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \DeclareTotalTCBoxFit { } + { + \__tcobox_new_TotalTCBoxFit:w \DeclareDocumentCommand + } +\NewDocumentCommand \NewTotalTCBoxFit { } + { + \__tcobox_new_TotalTCBoxFit:w \NewDocumentCommand + } +\NewDocumentCommand \RenewTotalTCBoxFit { } + { + \__tcobox_new_TotalTCBoxFit:w \RewewDocumentCommand + } +\NewDocumentCommand \ProvideTotalTCBoxFit { } + { + \__tcobox_new_TotalTCBoxFit:w \ProvideDocumentCommand + } + + +\ExplSyntaxOff -\def\renewtcboxfit{% - \let\tcb@newcommand\renewcommand% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcboxfit% - \tcb@process@newcommand} \tcbset{% reset@fitting/.style={% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index f3197fbcf56..dd06324a65e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% @@ -40,6 +40,11 @@ after app/.code={\appto\kvtcb@afterbox{#1}},% after pre/.code={\preto\kvtcb@afterbox{#1}},% % + before float app/.code={\appto\kvtcb@beforefloat{#1}},% + before float pre/.code={\preto\kvtcb@beforefloat{#1}},% + after float app/.code={\appto\kvtcb@afterfloat{#1}},% + after float pre/.code={\preto\kvtcb@afterfloat{#1}},% + % overlay unbroken app/.code={\appto\tcb@overlay@unbroken{#1}},% overlay unbroken pre/.code={\preto\tcb@overlay@unbroken{#1}},% overlay first app/.code={\appto\tcb@overlay@first{#1}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index 7d74e9ad6e5..e66d95a375b 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.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 d461068fe21..a13d4ccbc9a 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \tcbuselibrary{pro@cessing} @@ -276,49 +276,122 @@ \begingroup\tcbverbatimwrite{\kvtcb@listingfile}% }{\endtcbverbatimwrite\endgroup} -\long\def\tcb@newtcblisting#1#2{\tcb@newenvironment{#1}{\tcblisting{#2,options@for=#1}}{\endtcblisting}} -\long\def\tcb@newtcblisting@#1[#2]#3{\tcb@newenvironment{#1}[#2]{\tcblisting{#3,options@for=#1}}{\endtcblisting}} +\ExplSyntaxOn + + +\NewDocumentCommand \__tcobox_new_tcblisting:w { m +o m o +o +m } + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + \tl_if_novalue:nTF { #4 } + { + #1 { #3 }{ \tcblisting{#6,options@for=#3} }{ \endtcblisting } + } + { + \tl_if_novalue:nTF { #5 } + { + #1 { #3 }[ #4 ]{ \tcblisting{#6,options@for=#3} }{ \endtcblisting } + } + { + #1 { #3 }[ #4 ][ #5 ]{ \tcblisting{#6,options@for=#3} }{ \endtcblisting } + } + } + } +\NewDocumentCommand \newtcblisting { } + { + \__tcobox_new_tcblisting:w \newenvironment + } +\NewDocumentCommand \renewtcblisting { } + { + \__tcobox_new_tcblisting:w \renewenvironment + } + + +\NewDocumentCommand \__tcobox_new_TCBListing:w { m +o m +m +m } + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + #1 { #3 }{ #4 }{ \tcblisting{#5,options@for=#3} }{ \endtcblisting } + } +\NewDocumentCommand \DeclareTCBListing { } + { + \__tcobox_new_TCBListing:w \DeclareDocumentEnvironment + } +\NewDocumentCommand \NewTCBListing { } + { + \__tcobox_new_TCBListing:w \NewDocumentEnvironment + } +\NewDocumentCommand \RenewTCBListing { } + { + \__tcobox_new_TCBListing:w \RenewDocumentEnvironment + } +\NewDocumentCommand \ProvideTCBListing { } + { + \__tcobox_new_TCBListing:w \ProvideDocumentEnvironment + } + + +\NewDocumentCommand \__tcobox_new_tcbinputlisting_ii:w { m +m m o +o +m } + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + \tl_if_novalue:nTF { #4 } + { + \exp_args:Nc #1 { #3 }{ \tcbinputlisting{#6,options@for=#3} } + } + { + \tl_if_novalue:nTF { #5 } + { + \exp_args:Nc #1 { #3 }[ #4 ]{ \tcbinputlisting{#6,options@for=#3} } + } + { + \exp_args:Nc #1 { #3 }[ #4 ][ #5 ]{ \tcbinputlisting{#6,options@for=#3} } + } + } + } +\NewDocumentCommand \__tcobox_new_tcbinputlisting_i:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_tcbinputlisting_ii:w #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \newtcbinputlisting { } + { + \__tcobox_new_tcbinputlisting_i:w \newcommand + } +\NewDocumentCommand \renewtcbinputlisting { } + { + \__tcobox_new_tcbinputlisting_i:w \renewcommand + } + + +\cs_new:Npn \__tcobox_new_TCBInputListing:Nnnnn #1#2#3#4#5 + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + \exp_args:Nc #1 { #3 }{ #4 }{ \tcbinputlisting{#5,options@for=#3} } + } +\NewDocumentCommand \__tcobox_new_TCBInputListing:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_TCBInputListing:Nnnnn #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \DeclareTCBInputListing { } + { + \__tcobox_new_TCBInputListing:w \DeclareDocumentCommand + } +\NewDocumentCommand \NewTCBInputListing { } + { + \__tcobox_new_TCBInputListing:w \NewDocumentCommand + } +\NewDocumentCommand \RenewTCBInputListing { } + { + \__tcobox_new_TCBInputListing:w \RewewDocumentCommand + } +\NewDocumentCommand \ProvideTCBInputListing { } + { + \__tcobox_new_TCBInputListing:w \ProvideDocumentCommand + } + + +\ExplSyntaxOff -\long\def\tcb@newtcblisting@@#1[#2][#3]#4{\tcb@newenvironment{#1}[#2][#3]{\tcblisting{#4,options@for=#1}}{\endtcblisting}} - -\long\def\tcb@new@tcblisting@#1[#2]{% - \@ifnextchar[{\tcb@newtcblisting@@{#1}[#2]}{\tcb@newtcblisting@{#1}[#2]}} - -\def\tcb@new@tcblisting#1{% - \@ifnextchar[{\tcb@new@tcblisting@{#1}}{\tcb@newtcblisting{#1}}} - -\def\newtcblisting{% - \let\tcb@newenvironment\newenvironment% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcblisting% - \tcb@process@newenvironment} - -\def\renewtcblisting{% - \let\tcb@newenvironment\renewenvironment% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcblisting% - \tcb@process@newenvironment} - -\long\def\tcb@newtcbinputlisting#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcbinputlisting{#2,options@for=#1}}} - -\long\def\tcb@newtcbinputlisting@#1[#2]#3{\expandafter\tcb@newcommand\csname#1\endcsname[#2]{\tcbinputlisting{#3,options@for=#1}}} - -\long\def\tcb@newtcbinputlisting@@#1[#2][#3]#4{\expandafter\tcb@newcommand\csname#1\endcsname[#2][#3]{\tcbinputlisting{#4,options@for=#1}}} - -\long\def\tcb@new@tcbinputlisting@#1[#2]{% - \@ifnextchar[{\tcb@newtcbinputlisting@@{#1}[#2]}{\tcb@newtcbinputlisting@{#1}[#2]}} - -\def\tcb@new@tcbinputlisting#1{% - \@ifnextchar[{\tcb@new@tcbinputlisting@{#1}}{\tcb@newtcbinputlisting{#1}}} - -\def\newtcbinputlisting{% - \let\tcb@newcommand\newcommand% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcbinputlisting% - \tcb@process@newcommand} - -\def\renewtcbinputlisting{% - \let\tcb@newcommand\renewcommand% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcbinputlisting% - \tcb@process@newcommand} \tcbset{% reset@listingscore/.style={% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 0946a01a81e..64ecfd73a36 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.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 0ba0c9f278c..f719cd19901 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.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 802f48e9029..37bcb4055f0 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.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 7a4ec1aa608..aaa2029f635 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbposter.code.tex: Code for posters %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \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 1575b8e9908..86dd5edc9d6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.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 78c1ba55058..b1ea20394d7 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 3d048c71c36..666a17e349c 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \RequirePackage{tikz}[2010/10/13] @@ -217,12 +217,12 @@ } \def\tcb@drawspec@LR#1{% - \tcb@pathbase{#1,segmentation@style}{interior.south west}{[yshift=0.1mm]segmentation.east}% + \tcb@pathbase{#1,segmentation@style}{interior.south west}{[yshift=\tcboverlaplower]segmentation.east}% {\tcb@arc@ins@SW}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@ins@SE}% } \def\tcb@drawspec@LS#1{% - \tcb@pathbase{#1,segmentation@style}{interior.west|-frame.south}{[yshift=0.1mm]segmentation.east}% + \tcb@pathbase{#1,segmentation@style}{interior.west|-frame.south}{[yshift=\tcboverlaplower]segmentation.east}% {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}% } @@ -409,6 +409,7 @@ \fi}},% colbacklower/.colorlet=tcbcolbacklower,% opacitybacklower/.store in=\kvtcb@opacitybacklower, + overlaplower/.dimstore in=\tcboverlaplower, clear@spec/.code={\tcb@spec{}},% tikz/.code={\appto\tcb@tikz@option@hook{,#1}},% tikz reset/.code={\let\tcb@tikz@option@hook\@empty},% @@ -2001,7 +2002,7 @@ \tcbset{% reset@skins/.style={% frame style=,interior style=,segmentation style=,@title style=,% - colbacklower=black!15!white,opacitybacklower=1.0,% + colbacklower=black!15!white,opacitybacklower=1.0,overlaplower=0.1mm,% extend freelance=,extend freelancefirst=,extend freelancemiddle=,extend freelancelast=,% clear@spec,% watermark opacity=1.00,watermark color=tcbcolback!85!tcbcolframe,% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 3fe250f2080..237625e9baf 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.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 f1b4820ebc7..22d65d0b657 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \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 f6da2fd7f62..5450aab75ea 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.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 f2fba3e0d89..8b98f909836 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,284 +18,6 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{5.0.2} +\tcb@set@library@version{5.1.0} \RequirePackage{xparse}[2013/12/31] - -\tcbset{% - IfNoValueTF/.code n args={3}{\IfNoValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, - IfNoValueT/.code n args={2}{\IfNoValueT{#1}{\pgfkeysalso{#2}}}, - IfNoValueF/.code n args={2}{\IfNoValueF{#1}{\pgfkeysalso{#2}}}, - IfValueTF/.code n args={3}{\IfValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, - IfValueT/.code n args={2}{\IfValueT{#1}{\pgfkeysalso{#2}}}, - IfValueF/.code n args={2}{\IfValueF{#1}{\pgfkeysalso{#2}}}, - IfBooleanTF/.code n args={3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, - IfBooleanT/.code n args={2}{\IfBooleanT{#1}{\pgfkeysalso{#2}}}, - IfBooleanF/.code n args={2}{\IfBooleanF{#1}{\pgfkeysalso{#2}}}, - verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm} -} - -%-- tcolorbox -- -\long\def\tcb@New@TColorBox#1#2#3{% - \tcb@newenvironment{#1}{#2}{\tcolorbox[#3,options@for=#1]}{\endtcolorbox}} - -\def\DeclareTColorBox{% - \let\tcb@newenvironment\DeclareDocumentEnvironment% - \let\tcb@process@newtcolorbox@continue\tcb@New@TColorBox% - \tcb@process@newenvironment} - -\def\NewTColorBox{% - \let\tcb@newenvironment\NewDocumentEnvironment% - \let\tcb@process@newtcolorbox@continue\tcb@New@TColorBox% - \tcb@process@newenvironment} - -\def\RenewTColorBox{% - \let\tcb@newenvironment\RenewDocumentEnvironment% - \let\tcb@process@newtcolorbox@continue\tcb@New@TColorBox% - \tcb@process@newenvironment} - -\def\ProvideTColorBox{% - \let\tcb@newenvironment\ProvideDocumentEnvironment% - \let\tcb@process@newtcolorbox@continue\tcb@New@TColorBox% - \tcb@process@newenvironment} - -%-- tcolorbox (total) -- -\long\def\tcb@New@TotalTColorBox#1#2#3#4{% - \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\begin{tcolorbox}[#3,options@for=#1]#4\end{tcolorbox}}} - -\def\DeclareTotalTColorBox{% - \let\tcb@newcommand\DeclareDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTColorBox% - \tcb@process@newcommand} - -\def\NewTotalTColorBox{% - \let\tcb@newcommand\NewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTColorBox% - \tcb@process@newcommand} - -\def\RenewTotalTColorBox{% - \let\tcb@newcommand\RenewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTColorBox% - \tcb@process@newcommand} - -\def\ProvideTotalTColorBox{% - \let\tcb@newcommand\ProvideDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTColorBox% - \tcb@process@newcommand} - -%-- tcbox -- -\long\def\tcb@New@TCBox#1#2#3{% - \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcbox[#3,options@for=#1]}} - -\def\DeclareTCBox{% - \let\tcb@newcommand\DeclareDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBox% - \tcb@process@newcommand} - -\def\NewTCBox{% - \let\tcb@newcommand\NewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBox% - \tcb@process@newcommand} - -\def\RenewTCBox{% - \let\tcb@newcommand\RenewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBox% - \tcb@process@newcommand} - -\def\ProvideTCBox{% - \let\tcb@newcommand\ProvideDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBox% - \tcb@process@newcommand} - -%-- tcbox (total) -- -\long\def\tcb@New@TotalTCBox#1#2#3#4{% - \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcbox[#3,options@for=#1]{#4}}} - -\def\DeclareTotalTCBox{% - \let\tcb@newcommand\DeclareDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBox% - \tcb@process@newcommand} - -\def\NewTotalTCBox{% - \let\tcb@newcommand\NewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBox% - \tcb@process@newcommand} - -\def\RenewTotalTCBox{% - \let\tcb@newcommand\RenewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBox% - \tcb@process@newcommand} - -\def\ProvideTotalTCBox{% - \let\tcb@newcommand\ProvideDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBox% - \tcb@process@newcommand} - -\DeclareTotalTCBox{\tcboxverb}{ O{} v }{verbatim,#1}{#2} - -%-- tcboxfit -- -\long\def\tcb@New@TCBoxFit#1#2#3{% - \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcboxfit[#3,options@for=#1]}} - -\def\DeclareTCBoxFit{% - \let\tcb@newcommand\DeclareDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBoxFit% - \tcb@process@newcommand} - -\def\NewTCBoxFit{% - \let\tcb@newcommand\NewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBoxFit% - \tcb@process@newcommand} - -\def\RenewTCBoxFit{% - \let\tcb@newcommand\RenewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBoxFit% - \tcb@process@newcommand} - -\def\ProvideTCBoxFit{% - \let\tcb@newcommand\ProvideDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBoxFit% - \tcb@process@newcommand} - -\long\def\tcb@New@TotalTCBoxFit#1#2#3#4{% - \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcboxfit[#3,options@for=#1]{#4}}} - -\def\DeclareTotalTCBoxFit{% - \let\tcb@newcommand\DeclareDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBoxFit% - \tcb@process@newcommand} - -\def\NewTotalTCBoxFit{% - \let\tcb@newcommand\NewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBoxFit% - \tcb@process@newcommand} - -\def\RenewTotalTCBoxFit{% - \let\tcb@newcommand\RenewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBoxFit% - \tcb@process@newcommand} - -\def\ProvideTotalTCBoxFit{% - \let\tcb@newcommand\ProvideDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBoxFit% - \tcb@process@newcommand} - - -%-- tcblisting -- -\long\def\tcb@New@TCBListing#1#2#3{% - \tcb@newenvironment{#1}{#2}{\tcblisting{#3,options@for=#1}}{\endtcblisting}} - -\def\DeclareTCBListing{% - \let\tcb@newenvironment\DeclareDocumentEnvironment% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBListing% - \tcb@process@newenvironment} - -\def\NewTCBListing{% - \let\tcb@newenvironment\NewDocumentEnvironment% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBListing% - \tcb@process@newenvironment} - -\def\RenewTCBListing{% - \let\tcb@newenvironment\RenewDocumentEnvironment% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBListing% - \tcb@process@newenvironment} - -\def\ProvideTCBListing{% - \let\tcb@newenvironment\ProvideDocumentEnvironment% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBListing% - \tcb@process@newenvironment} - -%-- tcbinputlisting -- -\long\def\tcb@New@TCBInputListing#1#2#3{% - \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcbinputlisting{#3,options@for=#1}}% -} - -\def\DeclareTCBInputListing{% - \let\tcb@newcommand\DeclareDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBInputListing% - \tcb@process@newcommand} - -\def\NewTCBInputListing{% - \let\tcb@newcommand\NewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBInputListing% - \tcb@process@newcommand} - -\def\RenewTCBInputListing{% - \let\tcb@newcommand\RenewDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBInputListing% - \tcb@process@newcommand} - -\def\ProvideTCBInputListing{% - \let\tcb@newcommand\ProvideDocumentCommand% - \let\tcb@process@newtcolorbox@continue\tcb@New@TCBInputListing% - \tcb@process@newcommand} - - -%-- sidebyside -- - -\def\tcb@sbs@content@none{\tcb@sbs@text@left\tcblower\tcb@sbs@text@right} -\def\tcb@sbs@content@left{\box\tcb@upperbox\tcblower\tcb@sbs@text@right} -\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{% - \sbox{\tcb@upperbox}{\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}% -} -\def\tcb@sbs@save@lower{% - \sbox{\tcb@lowerbox}{\color{tcbcollower}\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}% -} - -\tcbset{% - sidebyside adapt/.is choice, - sidebyside adapt/none/.style={% - sidebyside@adapt@process/.style={% - code={\let\tcb@sbs@content\tcb@sbs@content@none}, - }% - }, - sidebyside adapt/left/.style={% - sidebyside@adapt@process/.style={% - 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={\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={\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, - }% - }, - % - sidebyside switch/.is choice, - sidebyside switch/true/.style={% - sidebyside@switch/.code={% - \tcb@swap{\tcb@sbs@text@left}{\tcb@sbs@text@right} - }% - }, - sidebyside switch/false/.style={% - sidebyside@switch/.style=% - }, - sidebyside switch/.default=true -} - - -\DeclareTotalTColorBox{\tcbsidebyside}{ +O{} +m +m }{% - code={\long\def\tcb@sbs@text@left{#2}\long\def\tcb@sbs@text@right{#3}},% - #1,% - sidebyside,% - sidebyside@switch,sidebyside@adapt@process% -}{\tcb@sbs@content} - - -\tcbset{% - reset@xparse/.style={% - sidebyside adapt=none,sidebyside switch=false,% - }, - initialize@reset=reset@xparse, -} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index a836c92d464..70f5d5996d5 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 5.0.2 (2022/01/07) +%% The LaTeX package tcolorbox - version 5.1.0 (2022/06/22) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,9 +17,9 @@ %% %% This work consists of all files listed in README %% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2022/01/07 version 5.0.2 text color boxes] -\def\tcb@version{5.0.2} +\NeedsTeXFormat{LaTeX2e}[2020/10/01] +\ProvidesPackage{tcolorbox}[2022/06/22 version 5.1.0 text color boxes] +\def\tcb@version{5.1.0} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -378,6 +378,8 @@ }}, beforeafter skip/.style={before skip={#1},after skip={#1}}, before nobreak/.store in=\kvtcb@beforebox@nobreak, + before float/.store in=\kvtcb@beforefloat, + after float/.store in=\kvtcb@afterfloat, lowerbox/.is choice, lowerbox/visible/.code={\tcb@lowerignoredfalse\tcb@lowervisibletrue}, lowerbox/invisible/.code={\tcb@lowerignoredfalse\tcb@lowervisiblefalse}, @@ -591,7 +593,14 @@ skin first is subskin of/.style 2 args={skin@local@first/.style={skin@#1,#2},skin first=local@first},% skin middle is subskin of/.style 2 args={skin@local@middle/.style={skin@#1,#2},skin middle=local@middle},% skin last is subskin of/.style 2 args={skin@local@last/.style={skin@#1,#2},skin last=local@last},% - parbox/.store in=\kvtcb@parbox, + parbox/.is choice, + parbox/true/.code={% + \def\kvtcb@parbox{true}% + }, + parbox/false/.code={% + \def\kvtcb@parbox{false}% + \appto\tcb@lateoptions@hook{\csname tcb@parbox@\kvtcb@parbox @indent\endcsname}% + }, parbox/.default=true,% hyphenationfix/.is choice,% hyphenationfix/.default=true,% @@ -717,6 +726,41 @@ sidebyside align/center seam/.code={\def\kvtcb@sbs@align{center}\let\tcb@box@align\tcb@box@align@center},% sidebyside align/bottom seam/.code={\def\kvtcb@sbs@align{bottom}\let\tcb@box@align\tcb@box@align@bottom},% sidebyside gap/.dimstore in=\kvtcb@sbs@gap,% + sidebyside adapt/.is choice, + sidebyside adapt/none/.style={% + sidebyside@adapt@process/.style={% + code={\let\tcb@sbs@content\tcb@sbs@content@none}, + }% + }, + sidebyside adapt/left/.style={% + sidebyside@adapt@process/.style={% + 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={\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={\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, + }% + }, + sidebyside switch/.is choice, + sidebyside switch/true/.style={% + sidebyside@switch/.code={% + \tcb@swap{\tcb@sbs@text@left}{\tcb@sbs@text@right} + }% + }, + sidebyside switch/false/.style={% + sidebyside@switch/.style=% + }, + sidebyside switch/.default=true, lefthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftwidth}, righthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightwidth}, lefthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftratio}, @@ -824,9 +868,31 @@ verbatim ignore percent/true/.code={\def\tcb@verbatim@change@percent{\catcode`\^^e=9}}, verbatim ignore percent/false/.code={\let\tcb@verbatim@change@percent\@empty}, verbatim ignore percent/.default=true, + verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm}, wrap@environment/.is if=tcb@wrap@environment, } +\ExplSyntaxOn +\tcbset + { + IfBlankTF/.code~n~args={3}{\tl_if_blank:nTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfBlankT/.code~n~args={2}{\tl_if_blank:nT{#1}{\pgfkeysalso{#2}}}, + IfBlankF/.code~n~args={2}{\tl_if_blank:nF{#1}{\pgfkeysalso{#2}}}, + IfEmptyTF/.code~n~args={3}{\tl_if_empty:nTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfEmptyT/.code~n~args={2}{\tl_if_empty:nT{#1}{\pgfkeysalso{#2}}}, + IfEmptyF/.code~n~args={2}{\tl_if_empty:nF{#1}{\pgfkeysalso{#2}}}, + IfNoValueTF/.code~n~args={3}{\tl_if_novalue:nTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfNoValueT/.code~n~args={2}{\tl_if_novalue:nT{#1}{\pgfkeysalso{#2}}}, + IfNoValueF/.code~n~args={2}{\tl_if_novalue:nF{#1}{\pgfkeysalso{#2}}}, + IfValueTF/.code~n~args={3}{\tl_if_novalue:nTF{#1}{\pgfkeysalso{#3}}{\pgfkeysalso{#2}}}, + IfValueT/.code~n~args={2}{\tl_if_novalue:nF{#1}{\pgfkeysalso{#2}}}, + IfValueF/.code~n~args={2}{\tl_if_novalue:nT{#1}{\pgfkeysalso{#2}}}, + IfBooleanTF/.code~n~args={3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfBooleanT/.code~n~args={2}{\IfBooleanT{#1}{\pgfkeysalso{#2}}}, + IfBooleanF/.code~n~args={2}{\IfBooleanF{#1}{\pgfkeysalso{#2}}}, + } +\ExplSyntaxOff + \def\kvtcb@beforebox{} \def\kvtcb@afterbox{} @@ -838,10 +904,16 @@ \fi% } +\def\tcb@parbox@true@indent{}% +\def\tcb@parbox@false@indent{% + \preto\kvtcb@before@title{\noindent}% + \preto\kvtcb@before@upper{\noindent}% + \preto\kvtcb@before@lower{\noindent}% +}% + \let\tcb@parboxrestore=\@parboxrestore \def\tcb@parbox@false@settings{% - \noindent% \linewidth\hsize% \@totalleftmargin\z@% \leftskip\z@skip% @@ -926,7 +998,7 @@ \ifx\kvtcb@title\@empty\tcb@hasTitlefalse\tcb@specialtitle@hook\else% \tcb@hasTitletrue% \tcbdimto\tcb@w@title{\kvtcb@width-(\kvtcb@left@rule+\kvtcb@right@rule+(\kvtcb@boxsep)*2+\kvtcb@lefttitle+\kvtcb@righttitle)}% - \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcoltitle}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\tcb@lua@color{tcbcoltitle}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% \fi% } @@ -983,6 +1055,18 @@ \fi% } +\def\tcb@sbs@content@none{\tcb@sbs@text@left\tcblower\tcb@sbs@text@right} +\def\tcb@sbs@content@left{\box\tcb@upperbox\tcblower\tcb@sbs@text@right} +\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{% + \sbox{\tcb@upperbox}{\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}% +} +\def\tcb@sbs@save@lower{% + \sbox{\tcb@lowerbox}{\color{tcbcollower}\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}% +} + \def\tcb@set@color#1{% \edef\current@color{\@nameuse{\string\color@#1}}% \colorlet{.}{#1}% @@ -1829,8 +1913,8 @@ \ifx\kvtcb@float\@empty% \tcb@set@normal@unbroken@beforeafter% \else% - \edef\tcb@before@unbroken{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]\noexpand\kvtcb@everyfloat}% - \let\tcb@after@unbroken=\tcb@float@env@end% + \edef\tcb@before@unbroken{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]\noexpand\kvtcb@beforefloat\noexpand\kvtcb@everyfloat}% + \def\tcb@after@unbroken{\kvtcb@afterfloat\tcb@float@env@end}% \fi% \setcounter{tcbbreakpart}{1}% % computation of total height @@ -2048,44 +2132,198 @@ \kvtcb@init@hook% }% -\long\def\tcb@process@newtcolorbox#1#2{% - \edef\tcb@new@boxname{#1}% - \def\tcb@new@colopt{}% - \long\def\temp@a{#2}% - \ifx\temp@a\@empty\relax% - \else% - \tcb@proc@options@init{#2}{#1}% - \fi% - \preto\tcb@new@colopt{savedelimiter=#1}% - \cslet{tcb@opt@#1}{\tcb@new@colopt}% - \tcb@process@newtcolorbox@continue{#1}% -} -\newcommand\tcb@process@newenvironment[2][]{% - \tcb@process@newtcolorbox{#2}{#1}% -} +\ExplSyntaxOn + +\cs_new:Npn \__tcobox_process_newtcolorbox:nn #1#2 + { + \edef\tcb@new@boxname{#2} + \def\tcb@new@colopt{} + \tl_if_novalue:nF { #1 } + { + \tcb@proc@options@init{#1}{#2} + } + \preto\tcb@new@colopt{savedelimiter=#2} + \exp_args:Nc \cs_set_eq:NN { tcb@opt@#2 } \tcb@new@colopt + } -\long\def\tcb@newtcolorbox#1#2{\tcb@newenvironment{#1}{\tcolorbox[#2,options@for=#1]}{\endtcolorbox}} -\long\def\tcb@newtcolorbox@#1[#2]#3{\tcb@newenvironment{#1}[#2]{\tcolorbox[#3,options@for=#1]}{\endtcolorbox}} +\cs_new:Npn \__tcobox_set_backslash_removed:Nn #1#2 + { + \tl_set:Nn #1 { #2 } + \tl_trim_spaces:N #1 + \tl_set:Nx #1 { \exp_last_unbraced:NV \cs_to_str:N #1 } + } -\long\def\tcb@newtcolorbox@@#1[#2][#3]#4{\tcb@newenvironment{#1}[#2][#3]{\tcolorbox[#4,options@for=#1]}{\endtcolorbox}} -\long\def\tcb@new@tcolorbox@#1[#2]{% - \@ifnextchar[{\tcb@newtcolorbox@@{#1}[#2]}{\tcb@newtcolorbox@{#1}[#2]}} +\NewDocumentCommand \__tcobox_new_tcolorbox:w { m +o m o +o +m } + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + \tl_if_novalue:nTF { #4 } + { + #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 ][ #5 ]{ \tcolorbox[#6,options@for=#3] }{ \endtcolorbox } + } + } + } +\NewDocumentCommand \newtcolorbox { } + { + \__tcobox_new_tcolorbox:w \newenvironment + } +\NewDocumentCommand \renewtcolorbox { } + { + \__tcobox_new_tcolorbox:w \renewenvironment + } -\def\tcb@new@tcolorbox#1{% - \@ifnextchar[{\tcb@new@tcolorbox@{#1}}{\tcb@newtcolorbox{#1}}} -\def\newtcolorbox{% - \let\tcb@newenvironment\newenvironment% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcolorbox% - \tcb@process@newenvironment} +\NewDocumentCommand \__tcobox_new_TColorBox:w { m +o m +m +m } + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + #1 { #3 }{ #4 }{ \tcolorbox[#5,options@for=#3] }{ \endtcolorbox } + } +\NewDocumentCommand \DeclareTColorBox { } + { + \__tcobox_new_TColorBox:w \DeclareDocumentEnvironment + } +\NewDocumentCommand \NewTColorBox { } + { + \__tcobox_new_TColorBox:w \NewDocumentEnvironment + } +\NewDocumentCommand \RenewTColorBox { } + { + \__tcobox_new_TColorBox:w \RenewDocumentEnvironment + } +\NewDocumentCommand \ProvideTColorBox { } + { + \__tcobox_new_TColorBox:w \ProvideDocumentEnvironment + } + + +\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} } + } +\NewDocumentCommand \__tcobox_new_TotalTColorBox:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_TotalTColorBox:Nnnnnn #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \DeclareTotalTColorBox { } + { + \__tcobox_new_TotalTColorBox:w \DeclareDocumentCommand + } +\NewDocumentCommand \NewTotalTColorBox { } + { + \__tcobox_new_TotalTColorBox:w \NewDocumentCommand + } +\NewDocumentCommand \RenewTotalTColorBox { } + { + \__tcobox_new_TotalTColorBox:w \RenewDocumentCommand + } +\NewDocumentCommand \ProvideTotalTColorBox { } + { + \__tcobox_new_TotalTColorBox:w \ProvideDocumentCommand + } + + +\NewDocumentCommand \__tcobox_new_tcbox_ii:w { m +m m o +o +m } + { + \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } + \tl_if_novalue:nTF { #4 } + { + \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 ][ #5 ]{ \tcbox[#6,options@for=#3] } + } + } + } +\NewDocumentCommand \__tcobox_new_tcbox_i:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_tcbox_ii:w #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \newtcbox { } + { + \__tcobox_new_tcbox_i:w \newcommand + } +\NewDocumentCommand \renewtcbox { } + { + \__tcobox_new_tcbox_i:w \renewcommand + } + + +\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] } + } +\NewDocumentCommand \__tcobox_new_TCBox:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_TCBox:Nnnnn #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \DeclareTCBox { } + { + \__tcobox_new_TCBox:w \DeclareDocumentCommand + } +\NewDocumentCommand \NewTCBox { } + { + \__tcobox_new_TCBox:w \NewDocumentCommand + } +\NewDocumentCommand \RenewTCBox { } + { + \__tcobox_new_TCBox:w \RewewDocumentCommand + } +\NewDocumentCommand \ProvideTCBox { } + { + \__tcobox_new_TCBox:w \ProvideDocumentCommand + } + + +\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} } + } +\NewDocumentCommand \__tcobox_new_TotalTCBox:w { m +o m } + { + \__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 } + \exp_args:NNnV \__tcobox_new_TotalTCBox:Nnnnnn #1 {#2} \l_tmpa_tl + } +\NewDocumentCommand \DeclareTotalTCBox { } + { + \__tcobox_new_TotalTCBox:w \DeclareDocumentCommand + } +\NewDocumentCommand \NewTotalTCBox { } + { + \__tcobox_new_TotalTCBox:w \NewDocumentCommand + } +\NewDocumentCommand \RenewTotalTCBox { } + { + \__tcobox_new_TotalTCBox:w \RewewDocumentCommand + } +\NewDocumentCommand \ProvideTotalTCBox { } + { + \__tcobox_new_TotalTCBox:w \ProvideDocumentCommand + } + + +\ExplSyntaxOff -\def\renewtcolorbox{% - \let\tcb@newenvironment\renewenvironment% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcolorbox% - \tcb@process@newenvironment} \newcommand{\tcolorboxenvironment}[2]{% \AddToHook{env/#1/before}{% @@ -2097,46 +2335,14 @@ }% } -% auxiliary code to remove a leading backspace -\newcommand{\tcb@remove@bs}[1]{% - \ifcat\relax\noexpand#1% - \expandafter\tcb@remove@bs@aux@i% - \fi - #1} -\newcommand*{\tcb@remove@bs@aux@i}{% - \romannumeral% - \if\string\ \tcb@remove@bs@aux@ii\fi% - \expandafter\tcb@remove@bs@aux@iii\string} -\newcommand{\tcb@remove@bs@aux@ii}{} -\long\def\tcb@remove@bs@aux@ii#1\tcb@remove@bs@aux@iii{% - -\number\fi\expandafter\z@} -\newcommand{\tcb@remove@bs@aux@iii}[1]{\z@} - -\newcommand\tcb@process@newcommand[2][]{% - \begingroup\edef\x{\endgroup\noexpand\tcb@process@newtcolorbox{\tcb@remove@bs{#2}}}\x{#1}% -} - -\long\def\tcb@newtcbox#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcbox[#2,options@for=#1]}} - -\long\def\tcb@newtcbox@#1[#2]#3{\expandafter\tcb@newcommand\csname#1\endcsname[#2]{\tcbox[#3,options@for=#1]}} - -\long\def\tcb@newtcbox@@#1[#2][#3]#4{\expandafter\tcb@newcommand\csname#1\endcsname[#2][#3]{\tcbox[#4,options@for=#1]}} - -\long\def\tcb@new@tcbox@#1[#2]{% - \@ifnextchar[{\tcb@newtcbox@@{#1}[#2]}{\tcb@newtcbox@{#1}[#2]}} - -\def\tcb@new@tcbox#1{% - \@ifnextchar[{\tcb@new@tcbox@{#1}}{\tcb@newtcbox{#1}}} - -\def\newtcbox{% - \let\tcb@newcommand\newcommand% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcbox% - \tcb@process@newcommand} +\DeclareTotalTCBox{\tcboxverb}{ O{} v }{verbatim,#1}{#2} -\def\renewtcbox{% - \let\tcb@newcommand\renewcommand% - \let\tcb@process@newtcolorbox@continue\tcb@new@tcbox% - \tcb@process@newcommand} +\DeclareTotalTColorBox{\tcbsidebyside}{ +O{} +m +m }{% + code={\long\def\tcb@sbs@text@left{#2}\long\def\tcb@sbs@text@right{#3}},% + #1,% + sidebyside,% + sidebyside@switch,sidebyside@adapt@process% +}{\tcb@sbs@content} \def\tcb@addcontentsline#1#2{% @@ -2346,7 +2552,9 @@ standard,parbox,hyphenationfix=false,overlay=, halign=justify,halign lower=justify,halign title=justify, before title=,after title=,before upper=,after upper=,before lower=,after lower=, + before float=,after float=, sidebyside=false,sidebyside align=center,sidebyside gap=10mm, + sidebyside adapt=none,sidebyside switch=false,% lefthand ratio=0.5,check odd page=false,nophantom, list entry=,no label type, opacityupper=1.0,opacitylower=1.0,opacitytitle=1.0,opacityframe=1.0,opacityback=1.0,@opacitybacktitle=1.0, |