diff options
35 files changed, 177 insertions, 129 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 0d3fa0e696e..6f79224bc84 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -1144,3 +1144,12 @@ version 4.30 (2020/04/28) - library 'poster': poster width and height caveats described in more detail (#98) +version 4.31 (2020/07/31) +- bug fix (#101): \tcbincludepdf did not work for lualatex +- bug fix (#103): Several tests had a missing \relax +- bug fix (#106): Breakable tcolorbox may overlap with following the text +- bug fix: 'space to' did not result in a stable value +- Internal change: all 'code 2 args' replaced by 'code n args={2}' +- documentation typo corrections (#102) +- library 'documentation': + * indention of <environment content> changed to \ttfamily (#100) diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index bf06996dfa4..9df1250c239 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2020 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 a88e74ad07b..777c531725e 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 5c52d044a4c..9b6514fdbaf 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 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% 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 e1de6b9fba9..1798c61235f 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 f1f61989b8c..8e682612b21 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 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% 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 f3e875a4013..b6c8a73e027 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 aca460f293d..3d12a3a6c10 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 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% 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 f053690e3f1..5f9d4acccbd 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -1915,7 +1915,7 @@ colframe=blue!75!black,colback=white,height=3cm} -\begin{docTcbKey}[][doc new=2015-02-15]{space to}{=\meta{macro}}{no default, initially unset} +\begin{docTcbKey}[][doc new and updated={2015-02-15}{2020-07-30}]{space to}{=\meta{macro}}{no default, initially unset} If the height of a |tcolorbox| is not the natural height, the space difference between the forced and the natural size is saved into the given local \meta{macro}. This \meta{macro} can and should be used inside diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex index 8479f88f41e..d1de4f3a151 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex @@ -553,7 +553,7 @@ a & This table is externalized as snippet. Obviously, \meta{env}! Otherwise, externalized and non-externalized version will have different spacings. \end{marker} - \refEnv{extcolorbox} is an example application for\refCom{newtcbexternalizetcolorbox}. + \refEnv{extcolorbox} is an example application for \refCom{newtcbexternalizetcolorbox}. \inputpreamblelisting{M} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex index 0be60d6e073..9a0a8ad1a62 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex @@ -1182,9 +1182,9 @@ For the examples, three environments |texexp|, |texexptitled|, and |texexptitledspec| are defined with automatic numbering. \begin{itemize} -\item |texexp| is used for untitled examles, -\item |texexptitled| is used for titled examles, -\item |texexptitledspec| is used for titled examles with special treatment. +\item |texexp| is used for untitled examples, +\item |texexptitled| is used for titled examples, +\item |texexptitledspec| is used for titled examples with special treatment. \end{itemize} \inputpreamblelisting{D} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex index 25875211324..85436abcd73 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex @@ -287,7 +287,7 @@ The \meta{option list} can contain any |tcolorbox| option. boxes = {sharp corners=downhill,arc=3mm,boxrule=1mm, colback=white,colframe=cyan, title style={left color=black,right color=cyan}, - fonttitle=\bfseries\scshape} + fonttitle=\bfseries} ] \posterbox[adjusted title=First]{column=1,row=1,span=2}{First box} \posterbox[adjusted title=Second]{column=1,row=2,span=2}{Second box} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty index cf10fbe2c02..80604e3d049 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty @@ -11,7 +11,7 @@ \RequirePackage[svgnames,table,hyperref]{xcolor} \RequirePackage{tikz} \RequirePackage{varioref} -\RequirePackage[makeindex]{imakeidx} +%\RequirePackage[makeindex]{imakeidx} \RequirePackage[pdftex,bookmarks,raiselinks,pageanchor,hyperindex,colorlinks]{hyperref} \RequirePackage{bookmark,varwidth,cleveref,incgraph} @@ -310,3 +310,23 @@ compilable listing, run pdflatex,#1 } + +\ExplSyntaxOn + +\cs_new:Npn \__tcobox_aux_mkdir:n #1 + { + \file_if_exist:nF { "#1"/dir.marker } + { + \sys_shell_now:x {mkdir~"#1"} + \iow_open:Nn \g_tmpa_iow {"#1"/dir.marker} + \iow_close:N \g_tmpa_iow + } + } + +\NewDocumentCommand{ \tcbAUXmkdir }{ m } + { + \__tcobox_aux_mkdir:n {#1} + } + +\ExplSyntaxOff + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_snippet.sty b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_snippet.sty index c33f924d01c..785b65b23cb 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_snippet.sty +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_snippet.sty @@ -177,7 +177,8 @@ colbacktitle=red!50!yellow,before skip=6pt,after skip=6pt, title={#2},#1} -\newtcbexternalizetcolorbox{exmyownlisting}{myownlisting}{minipage}% +\newtcbexternalizetcolorbox{exmyownlisting}{myownlisting}% + {minipage,environment with percent=false}% {before skip=6pt,after skip=6pt}% same values as for mylisting \end{tcbverbatimwrite} \input{\jobname_preamble_M.tex} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 79654b9ebb2..e9a5c9374d2 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 33791d48109..f159b971428 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 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -31,8 +31,8 @@ \tcbEXTERNALIZE \usepackage{tcolorbox.doc.s_snippet} %\tcbset{external/PassOptionsToPackage={cache=false}{minted}} -\ShellEscape{mkdir external} -\ShellEscape{mkdir solutions} +\tcbAUXmkdir{external} +\tcbAUXmkdir{solutions} \RequirePackage{csquotes} \RequirePackage[style=numeric-comp,sorting=nyt, @@ -43,8 +43,8 @@ \setlength{\bibitemsep}{\smallskipamount} \addbibresource{tcolorbox.doc.bib} -\def\version{4.30}% -\def\datum{2020/04/28}% +\def\version{4.31}% +\def\datum{2020/07/31}% \makeindex \hypersetup{ @@ -62,7 +62,7 @@ %\geometry{showframe} %\tcbset{draftmode} \tcbset{/tcb/external/-}% for final run -%\includeonly{tcolorbox.doc.picturecredits} +%\includeonly{tcolorbox.doc.external} %\hypersetup{colorlinks=false} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 0a3145d2150..4f3eb68f926 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,16 +17,16 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings % total height for boxes smaller than 0.4375\maxdimen and 0.4375\maxdimen else (ca 2.5m) \def\tcb@defToTotalHeightBreakable#1#2{% - \ifnum\ht#2<0 % + \ifnum\ht#2<0\relax% \edef#1{7168pt}% - \else\ifnum\ht#2<469762048 % + \else\ifnum\ht#2<469762048\relax% \tcbdimto#1{\ht#2+\dp#2}% \else% \edef#1{7168pt}% @@ -106,12 +106,12 @@ \ifdim\tcb@breakat@dim>0pt\relax% \tcbdimto\tcb@h@page{\tcb@breakat@dim-\kvtcb@shrinkbreakgoal}% \else% - \ifx\kvtcb@float\@empty% + \ifx\kvtcb@float\@empty\relax% \iftcb@multicol% \ifnum\c@tcbbreakpart>1\relax% \tcbdimto\tcb@h@page{\@colroom}% \else% - \ifdim\pagegoal=16383.99998pt + \ifdim\pagegoal=16383.99998pt\relax% \tcbdimto\tcb@h@page{\@colroom}% \else% \@tempdima\pagetotal% @@ -120,7 +120,7 @@ \fi% \fi% \else% - \ifdim\pagegoal=16383.99998pt + \ifdim\pagegoal=16383.99998pt\relax% \tcbdimto\tcb@h@page{\vsize}% detects floating objects \else% \tcb@comp@compress% @@ -162,7 +162,7 @@ } \def\tcb@following@title{% - \ifx\kvtcb@followingtitle\@empty% + \ifx\kvtcb@followingtitle\@empty\relax% \tcb@hasTitlefalse% \let\tcb@h@title=\tcb@zpt% \let\tcb@h@padtitle=\tcb@zpt% @@ -189,7 +189,7 @@ \def\tcb@enlbreak@next@scan#1/#2@{% \def\temp@a{#2}% \tcbdimto\tcb@enlbreak@dim{#1}% - \ifx\temp@a\@empty% + \ifx\temp@a\@empty\relax% \let\tcb@enlbreak@next=\tcb@enlbreak@next@final% \else% \edef\tcb@enlbreak@seq{\temp@a @}% @@ -212,7 +212,7 @@ \def\tcb@breakat@next@scan#1/#2@{% \def\temp@a{#2}% \tcbdimto\tcb@breakat@dim{#1}% - \ifx\temp@a\@empty% + \ifx\temp@a\@empty\relax% \let\tcb@breakat@next=\@empty% \else% \edef\tcb@breakat@seq{\temp@a @}% @@ -264,12 +264,12 @@ \setcounter{tcbbreakpart}{0}% \let\tcb@nobreak@warning\@empty% \@ifundefined{columnbreak}{\tcb@multicolfalse}{% - \ifnum\doublecol@number>\z@ % + \ifnum\doublecol@number>\z@\relax% \tcb@multicoltrue% \else% \tcb@multicolfalse% \fi}% - \ifx\kvtcb@float\@empty% + \ifx\kvtcb@float\@empty\relax% \iftcb@nobreak{% \let\tcb@nobreak@warning\tcb@do@nobreak@warning% \iftcb@ignorenobreak% @@ -318,7 +318,7 @@ \tcb@split@start% \endgroup% \color{.}% hack for some special cases - \ifx\kvtcb@float\@empty% + \ifx\kvtcb@float\@empty\relax% \aftergroup\tcb@use@after@lastbox% \fi% } @@ -514,7 +514,7 @@ \def\tcb@split@first{% \setcounter{tcbbreakpart}{1}% - \ifx\kvtcb@float\@empty% + \ifx\kvtcb@float\@empty\relax% \iftcb@vfillbeforefirst% \let\tcb@before@first=\vfill% \else% @@ -636,7 +636,8 @@ \def\tcb@split@force@last{% \tcb@split@setstate@last% - \ifdim\tcb@h@total>\tcb@h@page% + \ifdim\tcb@h@total>\tcb@h@page\relax% + \gdef\tcb@after@lastbox{\clearpage}% \tcbdimto\kvtcb@bbbottom{\kvtcb@bbbottom+\tcb@h@page-\tcb@h@total}% \fi% } @@ -978,7 +979,7 @@ compress page/all/.code={\def\tcb@comp@compress{\def\tcb@compress@height{\pageshrink-1sp}}},% compress page/none/.code={\def\tcb@comp@compress{\let\tcb@compress@height\tcb@zpt}},% compress page/baselineskip/.code={\def\tcb@comp@compress{% - \ifdim\pageshrink>\baselineskip% + \ifdim\pageshrink>\baselineskip\relax% \let\tcb@compress@height\baselineskip% \else% \def\tcb@compress@height{\pageshrink-1sp}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 49c70baefb5..819197e3b10 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \tcbuselibrary{listings,skins,xparse,external,raster} @@ -487,7 +487,7 @@ \seq_gput_left:NV \g__tcobox_label_seq \kvtcb@doc@label } {\ttfamily\kvtcb@doc@parameter}\par - \strut\nobreakspace\nobreakspace\meta{\kvtcb@text@envcontent}\par + \strut{\ttfamily\nobreakspace\nobreakspace}\meta{\kvtcb@text@envcontent}\par \strut\cs{end}\brackets{\__tcobox_print_environment:} \tcb@doc@do@description } @@ -808,7 +808,7 @@ \NewDocumentCommand\tcb@ref@doc{msm}{% \hyperref[#1:#3]{\texttt{\ref*{#1:#3}}% \IfBooleanTF{#2}{}{% - \ifnum\getpagerefnumber{#1:#3}=\thepage% + \ifnum\getpagerefnumber{#1:#3}=\thepage\relax% \else% \textsuperscript{\ding{213}\,\kvtcb@text@pageshort\,\pageref*{#1:#3}}% \fi}}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index ebf274f9b01..20a12548014 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \tcbuselibrary{pro@cessing} @@ -217,8 +217,8 @@ clear preamble/.code={\def\tcbexternal@preamble{}}, preclass/.code={\appto\tcbexternal@preclass{#1}}, clear preclass/.code={\def\tcbexternal@preclass{}}, - PassOptionsToPackage/.code 2 args={\appto\tcbexternal@preclass{\PassOptionsToPackage{#1}{#2}}}, - PassOptionsToClass/.code 2 args={\appto\tcbexternal@preclass{\PassOptionsToClass{#1}{#2}}}, + PassOptionsToPackage/.code n args={2}{\appto\tcbexternal@preclass{\PassOptionsToPackage{#1}{#2}}}, + PassOptionsToClass/.code n args={2}{\appto\tcbexternal@preclass{\PassOptionsToClass{#1}{#2}}}, externalize/.code={}, -/.style={/tcb/external/externalize=false}, % diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index cf641991bed..0808d0f4ef6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 135d78236e6..84720b1c852 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 aedb6eb1435..9ac64e3fd58 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 a241e3e3c18..1b76e30fbe3 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \tcbuselibrary{pro@cessing} @@ -178,11 +178,11 @@ \tcbset{% listing file/.store in=\kvtcb@listingfile,% comment/.store in=\kvtcb@listingcomment,% - listing@process@inside/.code 2 args={% + listing@process@inside/.code n args={2}{% \let\tcb@inputlisting\tcb@inputlisting@inside% \let\tcb@listing@process=#1% \let\tcb@use@listing@other=#2},% - listing@process@outside/.code 2 args={% + listing@process@outside/.code n args={2}{% \let\tcb@inputlisting=#1% \let\tcb@use@listing@other=#2},% listing only/.style={listing@process@inside={\tcb@listing@listing}{\tcbuselistingtext}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index fa62475ca16..99cdae4c73a 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 444c3867aae..e339447ada4 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 e5574ff6691..073e2c7bb65 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex index 712095687b0..c8bb522923d 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbposter.code.tex: Code for posters %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 522d1469ffa..c11451fe36e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 faf8c7cc31e..7492e2a677b 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -193,7 +193,7 @@ \color@vbox% \hsize=\tcb@raster@width% \let\tcb@end@raster\color@endbox% - \fi\fi%& + \fi\fi% \if@nobreak% \iftcb@ignorenobreak% {\par\nointerlineskip% @@ -206,7 +206,7 @@ \tcb@parfillskip@check\kvtcb@raster@halign\noindent% }{% \ifhmode\unskip\fi% - \ifnum\c@tcbrastercolumn>1 % + \ifnum\c@tcbrastercolumn>1\relax% \kern\tcb@raster@skip@right% \fi% \begingroup% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index cf0dc29e966..7297dc0e840 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \RequirePackage{tikz}[2010/10/13] @@ -29,7 +29,7 @@ \begin{scope}[every node/.style={line width=0mm,inner sep=0mm,outer sep=0mm,draw=none,fill=none,rectangle}] \node[name=frame,at={(0,0)},above right,minimum width=\tcb@width,minimum height=\tcb@height]{}; \node[name=interior,at={({\kvtcb@left@rule},{\kvtcb@bottom@rule})},above right,minimum width=\tcb@innerwidth,minimum height=\tcb@innerheight]{}; - \ifnum\tcbsegmentstate=1% + \ifnum\tcbsegmentstate=1\relax% \node[name=segmentation,at={({\kvtcb@left@rule},{\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep*2+\tcb@break@bottomsep+\kvtcb@bottom+\tcb@height@lower\relax})},above right, minimum width=\tcb@innerwidth,minimum height=\the\dimexpr\kvtcb@middle*2\relax]{}; \else\iftcb@sidebyside% @@ -652,7 +652,7 @@ frame engine=path,interior titled engine=empty,interior engine=empty,segmentation engine=empty,title engine=path,% interior titled code={% \iftcb@lowerseparated% - \ifnum\tcbsegmentstate=1% + \ifnum\tcbsegmentstate=1\relax% \tcb@spec{beamer@color}\tcb@drawspec@UT% \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@path}% @@ -663,7 +663,7 @@ \tcb@drawspec@T\tcb@spec{}}, interior code={% \iftcb@lowerseparated% - \ifnum\tcbsegmentstate=1 + \ifnum\tcbsegmentstate=1\relax% \tcb@spec{beamer@color}\tcb@drawspec@UR% \else% {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% @@ -680,7 +680,7 @@ frame engine=pathfirst,interior titled engine=empty,interior engine=empty,segmentation engine=empty,title engine=pathfirst,% interior titled code={% \iftcb@lowerseparated% - \ifnum\tcbsegmentstate=1% + \ifnum\tcbsegmentstate=1\relax% \tcb@spec{beamer@color}\tcb@drawspec@UT% \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% @@ -691,7 +691,7 @@ \tcb@drawspec@T\tcb@spec{}},% interior code={% \iftcb@lowerseparated% - \ifnum\tcbsegmentstate=1 + \ifnum\tcbsegmentstate=1\relax% \tcb@spec{beamer@color}\tcb@drawspec@UR% \else% {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% @@ -706,7 +706,7 @@ frame engine=pathmiddle,interior titled engine=empty,interior engine=empty,segmentation engine=empty,title engine=pathmiddle,% interior titled code={% \iftcb@lowerseparated% - \ifnum\tcbsegmentstate=1% + \ifnum\tcbsegmentstate=1\relax% \tcb@spec{beamer@color}\tcb@drawspec@UT% \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% @@ -717,7 +717,7 @@ \tcb@drawspec@T\tcb@spec{}},% interior code={% \iftcb@lowerseparated% - \ifnum\tcbsegmentstate=1 + \ifnum\tcbsegmentstate=1\relax% \tcb@spec{beamer@color}\tcb@drawspec@US% \else% {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% @@ -743,7 +743,7 @@ \tcb@drawspec@T\tcb@spec{}},% interior code={% \iftcb@lowerseparated% - \ifnum\tcbsegmentstate=1 + \ifnum\tcbsegmentstate=1\relax% \tcb@spec{beamer@color}\tcb@drawspec@US% \else% {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% @@ -1021,13 +1021,13 @@ \ifdim\dimexpr\kvtcb@yinnershift@boxedtitle<0pt\relax\let\kvtcb@yinnershift@boxedtitle\tcb@zpt\fi% }}, boxtitle/adapt@top/.code={% - \ifdim\dimexpr\tcboxedtitleheight+\kvtcb@yshift@boxedtitle>0pt\relax + \ifdim\dimexpr\tcboxedtitleheight+\kvtcb@yshift@boxedtitle>0pt\relax% \tcbdimto\kvtcb@bbtop@stand{\kvtcb@bbtop@stand+\tcboxedtitleheight+\kvtcb@yshift@boxedtitle}% \fi% \tcbdimto\kvtcb@top{\kvtcb@top-\kvtcb@yinnershift@boxedtitle}% }, boxtitle/adapt@bottom/.code={% - \ifdim\dimexpr\tcboxedtitleheight-\kvtcb@yshift@boxedtitle>0pt\relax + \ifdim\dimexpr\tcboxedtitleheight-\kvtcb@yshift@boxedtitle>0pt\relax% \tcbdimto\kvtcb@bbbottom@stand{\kvtcb@bbbottom@stand+\tcboxedtitleheight-\kvtcb@yshift@boxedtitle}% \fi% \tcbdimto\kvtcb@bottom{\kvtcb@bottom+\kvtcb@yinnershift@boxedtitle}% @@ -1103,7 +1103,7 @@ \def\tcb@setratio#1#2#3{\edef#1{\strip@pt\dimexpr\number\numexpr\number\dimexpr#2\relax*65536/\number\dimexpr#3\relax\relax sp\relax}} -\def\tcb@setratiorobust#1#2#3{\ifdim\dimexpr#3<1pt\tcb@setratio#1{#2}{1pt}\else\tcb@setratio#1{#2}{#3}\fi} +\def\tcb@setratiorobust#1#2#3{\ifdim\dimexpr#3<1pt\relax\tcb@setratio#1{#2}{1pt}\else\tcb@setratio#1{#2}{#3}\fi} \def\tcb@comp@waterbox@stretch#1#2#3{% \tcb@setratiorobust\tcb@scale@x{#1\dimexpr#2}{\wd\tcb@waterbox}% @@ -1288,10 +1288,10 @@ \pgfutil@loop% \pgfutil@loop% \pgftext[x=\pgf@xc,y=\pgf@yc,left,top]{\copy\tcb@waterbox}% - \ifdim\pgf@xc<\pgf@xb% + \ifdim\pgf@xc<\pgf@xb\relax% \advance\pgf@xc\tcb@ppbb@tilew% \pgfutil@repeat% - \ifdim\pgf@yc>\pgf@ya% + \ifdim\pgf@yc>\pgf@ya\relax% \advance\pgf@yc-\tcb@ppbb@tileh% \pgf@xc\pgf@xa% \pgfutil@repeat% @@ -1484,7 +1484,7 @@ \def\tcb@shadow@comp@ts@smart#1#2{% - \ifdim#2>0pt\relax\tcbdimto\tcb@shadow@ts{#1-#2/2}%% + \ifdim#2>0pt\relax\tcbdimto\tcb@shadow@ts{#1-#2/2}% \else\tcbdimto\tcb@shadow@ts{#1+#2/2}\fi% } @@ -1806,16 +1806,24 @@ \def\tcb@set@pdfpages#1#2{% \IfFileExists{#2}{% \ifdef{\pdfximage}{% + % pdftex \pdfximage{#2}% \edef#1{\the\pdflastximagepages}% }{% - \ifdef{\XeTeXpdfpagecount}{% - \edef#1{\the\XeTeXpdfpagecount #2 }% - \ifnum#1=0 % - \edef#1{1}% - \fi% - }{\tcb@error{For PDF support run pdflatex, xelatex, or lualatex}{% - Your compiler seems not to support PDF include files.}}% + \ifdef{\saveimageresource}{% + % luatex + \saveimageresource{#2}% + \edef#1{\the\lastsavedimageresourcepages}% + }{% + \ifdef{\XeTeXpdfpagecount}{% + % xetex + \edef#1{\the\XeTeXpdfpagecount #2 }% + \ifnum#1=0\relax% + \edef#1{1}% + \fi% + }{\tcb@error{For PDF support run pdflatex, xelatex, or lualatex}{% + Your compiler seems not to support PDF include files.}}% + }% }% }{\tcb@error{PDF file `#2' not found}{The PDF file `#2' was not found}}% \relax% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 6bcd0fef7e7..ca7f8688276 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 c158bdd77b0..ae26c751b7f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \RequirePackage{amsmath} @@ -106,7 +106,7 @@ terminator sign dash/.style={terminator sign={\ --}},% terminator sign none/.style={terminator sign=},% label separator/.store in=\kvtcb@label@sep,% - description delimiters/.code 2 args={\def\kvtcb@desc@delim@left{#1}\def\kvtcb@desc@delim@right{#2}},% + description delimiters/.code n args={2}{\def\kvtcb@desc@delim@left{#1}\def\kvtcb@desc@delim@right{#2}},% description delimiters parenthesis/.style={description delimiters=()}, description delimiters none/.style={description delimiters={}{}}, description color/.code={\def\temp@a{#1}\ifx\temp@a\@empty\relax% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex index dbc07bdf1ed..6dfef8c103d 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 13daf19c848..d2f9c1b0887 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.30} +\tcb@set@library@version{4.31} \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 5a0f6214f8a..2af5529755e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.30 (2020/04/28) +%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2020/04/28 version 4.30 text color boxes] -\def\tcb@version{4.30} +\ProvidesPackage{tcolorbox}[2020/07/31 version 4.31 text color boxes] +\def\tcb@version{4.31} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -666,11 +666,11 @@ void/.style={capture=v@@d,capture/.code=,options@for/.code=,code={\def\tcbinputlisting@core{}}}, nirvana/.code={\let\tcb@draw@color@box\@empty}, check odd page/.is if=tcb@checkpage, - if odd page/.code 2 args={% + if odd page/.code n args={2}{% \tcbset{check odd page}% \tcbifoddpage{\tcbset{#1}}{\tcbset{#2}}% }, - if odd page or oneside/.code 2 args={% + if odd page or oneside/.code n args={2}{% \tcbset{check odd page}% \tcbifoddpageoroneside{\tcbset{#1}}{\tcbset{#2}}% }, @@ -828,7 +828,7 @@ {\edef\ftype@tcbfloat{\the\c@float@type}% \addtocounter{float@type}{\value{float@type}}}% \def\c@tcbfloat{\c@float@type}% tricking the caption package -\ifdim\parskip>\z@% +\ifdim\parskip>\z@\relax% \tcbset{autoparskip/.style=parskip}% \else% \tcbset{autoparskip/.style=noparskip}% @@ -1043,7 +1043,7 @@ \newbox\tcb@temp% \cslet{tcb@footnote@\romannumeral\c@tcblayer}{\tcb@temp}% \tcbset{every box on layer \number\c@tcblayer/.style={reset,every box}} - \ifnum\c@tcblayer<#1\repeat% + \ifnum\c@tcblayer<#1 \repeat% \else% \fi% \xdef\tcb@managed@layers@max{#1}% @@ -1061,12 +1061,12 @@ \def\tcb@layer@inc{% \tcb@count@boxes% \stepcounter{tcblayer}% - \ifnum\c@tcblayer>1% + \ifnum\c@tcblayer>1\relax% \tcbset{breakable@true/.code=}% \else% \ifinner\ifhmode\tcbset{breakable@true/.code=}\fi\fi% \fi% - \ifnum\c@tcblayer>\tcb@managed@layers@max% + \ifnum\c@tcblayer>\tcb@managed@layers@max\relax% \tcbset{every box on higher layers}% \else% \expandafter\setbox\csname tcb@footnote@\romannumeral\c@tcblayer\endcsname\box\@mpfootins% @@ -1079,12 +1079,12 @@ \tcb@count@boxes% \global\advance\c@tcolorbox@number by -1\relax% \stepcounter{tcblayer}% - \ifnum\c@tcblayer>1% + \ifnum\c@tcblayer>1\relax% \tcbset{breakable@true/.code=}% \else% \ifinner\ifhmode\tcbset{breakable@true/.code=}\fi\fi% \fi% - \ifnum\c@tcblayer>\tcb@managed@layers@max% + \ifnum\c@tcblayer>\tcb@managed@layers@max\relax% \tcbset{every box on higher layers}% \tcbset{every box on higher layers/.code=}% \else% @@ -1095,7 +1095,7 @@ } \def\tcb@layer@dec{% - \ifnum\c@tcblayer>\tcb@managed@layers@max% + \ifnum\c@tcblayer>\tcb@managed@layers@max\relax% \else% \expandafter\global\setbox\@mpfootins\box\csname tcb@footnote@\romannumeral\c@tcblayer\endcsname% \setcounter{mpfootnote}{\csname tcb@footnote@cnt@\romannumeral\c@tcblayer\endcsname}% @@ -1179,22 +1179,31 @@ \immediate\write\@auxout{\string\csgdef{tcb@space@#1}{#2}}% } -\def\tcb@ch@fixed@spacesave{% - \tcbdimto\tcb@space{\tcb@space+\tcbheightspace}% - \ifdim\dimexpr\tcb@space<0pt\relax - \let\tcb@space\tcb@zpt% - \else% - \ifdim\dimexpr\tcb@space>\tcb@height\relax - \let\tcb@space\tcb@height% - \fi% - \fi% - \begingroup\edef\x{\endgroup\noexpand\tcb@savespace{\thetcolorboxnumber}{\tcb@space}}\x% - \tcbdimto\tcb@height@upper{\ht\tcb@upperbox+\dp\tcb@upperbox+\tcbheightspace}% - \let\tcbheightspace\tcb@zpt% - \iftcb@lowerspace% - \tcbdimto\tcb@height@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% - \fi% -} + +\ExplSyntaxOn +\def\tcb@ch@fixed@spacesave + { + \fp_set:Nn \l_tmpa_fp { \tcb@space+\tcbheightspace } + \fp_compare:nTF { \l_tmpa_fp < 0 } + { + \fp_zero_new:N \l_tmpa_fp + } + { + \fp_compare:nT { \l_tmpa_fp > \tcb@height } + { + \fp_set:Nn \l_tmpa_fp { \tcb@height } + } + } + \tcbdimto\tcb@space { \fp_to_dim:n { trunc(\l_tmpa_fp,2) } } + \use:x { \exp_not:N\tcb@savespace{\thetcolorboxnumber}{\tcb@space} } + \tcbdimto\tcb@height@upper{\ht\tcb@upperbox+\dp\tcb@upperbox+\tcbheightspace} + \let\tcbheightspace\tcb@zpt + \iftcb@lowerspace + \tcbdimto\tcb@height@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox} + \fi + } +\ExplSyntaxOff + \def\tcb@ch@fixed@split{% \tcbdimto\tcb@height@space{\tcbheightspace+\ht\tcb@upperbox+\dp\tcb@upperbox+\ht\tcb@lowerbox+\dp\tcb@lowerbox}% @@ -1859,8 +1868,8 @@ list type/.store in=\kvtcb@new@listtype, % init@hook@clear/.code={\def\kvtcb@init@hook{}}, - crefname/.code 2 args={\begingroup\edef\x{\endgroup\noexpand\crefname{\tcb@new@boxname}}\x{#1}{#2}\tcb@new@label@type}, - Crefname/.code 2 args={\begingroup\edef\x{\endgroup\noexpand\Crefname{\tcb@new@boxname}}\x{#1}{#2}\tcb@new@label@type}, + crefname/.code n args={2}{\begingroup\edef\x{\endgroup\noexpand\crefname{\tcb@new@boxname}}\x{#1}{#2}\tcb@new@label@type}, + 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}}}}},% |