diff options
author | Karl Berry <karl@freefriends.org> | 2013-07-05 19:06:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-07-05 19:06:34 +0000 |
commit | c2719fb94b09699c39eda729b2baec0b4f8002a0 (patch) | |
tree | 1138cf7a8f329ce6b93ce9c7951a9e45534b14e5 /Master/texmf-dist/tex | |
parent | a4d341ae43329bb5bb112644ff349ca39fa5326b (diff) |
tcolorbox (4jul13)
git-svn-id: svn://tug.org/texlive/trunk@31101 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
9 files changed, 413 insertions, 203 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 455d18d6686..587368a99a4 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.32} +\tcb@set@library@version{2.33} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip} @@ -31,7 +31,7 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a% \@endpefalse% - \begingroup% + \color@begingroup% \csname tcb@parboxrestore@\kvtcv@parbox\endcsname% \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@% \let\@footnotetext\@mpfootnotetext% @@ -50,7 +50,7 @@ \unvbox\@mpfootins% \fi% \@minipagefalse% - \endgroup} + \color@endgroup} % remaining height \def\tcb@comp@h@page{% @@ -86,6 +86,34 @@ \newbox\tcb@totalupperbox \newbox\tcb@totallowerbox +\newif\iftcb@break@allowed + +\def\tcb@enlbreak@next@final{% + \ifdim\dimexpr\tcb@enlbreak@dim=0pt\relax + \else\enlargethispage{\tcb@enlbreak@dim}\fi% +} + +\def\tcb@enlbreak@next@scan#1/#2@{% + \def\temp@a{#2}% + \tcbdimto\tcb@enlbreak@dim{#1}% + \ifx\temp@a\@empty% + \let\tcb@enlbreak@next=\tcb@enlbreak@next@final% + \else% + \edef\tcb@enlbreak@seq{\temp@a @}% + \fi% + \tcb@enlbreak@next@final% +} + +\def\tcb@enlbreak@next@step{% + \edef\tcb@temp{\noexpand\tcb@enlbreak@next@scan\tcb@enlbreak@seq}% + \tcb@temp% +} + +\def\tcb@enlbreak@init{% + \edef\tcb@enlbreak@seq{\kvtcb@enlargepage/@}% + \let\tcb@enlbreak@next=\tcb@enlbreak@next@step% + \tcb@enlbreak@next% +} \def\tcb@drawcolorbox@breakable{% \ifx\kvtcb@float\@empty% @@ -94,11 +122,17 @@ \tcbdimto\tcb@h@before{\ht\z@+\dp\z@+\dimexpr\parskip\relax}% \setbox\z@=\vbox{\kvtcb@afterbox}% \tcbdimto\tcb@h@after{\ht\z@+\dp\z@}% - % + \tcb@break@allowedtrue% + \tcb@enlbreak@init% \else% \let\tcb@h@before=\tcb@zpt% \let\tcb@h@after=\tcb@zpt% + \tcb@break@allowedfalse% \fi% + \tcb@split@start% +} + +\def\tcb@split@start{% \tcb@comp@h@page% % % height calculation @@ -108,9 +142,9 @@ \ifdim\tcb@h@total<\tcb@h@page\relax% no break \tcb@drawcolorbox@standalone% \else - \ifx\kvtcb@float\@empty% + \iftcb@break@allowed% \ifdim\dimexpr\tcb@h@page-\tcb@h@before-\tcb@h@padding-\tcb@h@padtitle<\kvtcb@breakminlines\baselineskip\relax% - \pagebreak% + \pagebreak\tcb@enlbreak@init\tcb@break@allowedfalse% \tcb@comp@h@page% \ifdim\tcb@h@total<\tcb@h@page\relax% no break! \tcb@drawcolorbox@standalone% @@ -129,9 +163,9 @@ \def\tcb@setbox@upper#1#2{% - \setbox\tcb@upperbox=\vbox{\begingroup\color{\kvtcb@colupper}\unvbox#2\endgroup}% + \setbox\tcb@upperbox=\vbox{\color@begingroup\color{\kvtcb@colupper}\unvbox#2\color@endgroup}% \ifdim\dimexpr\ht\tcb@upperbox+\dp\tcb@upperbox>#1\relax% - \setbox\tcb@upperbox=\vbox to\the\dimexpr#1-\dp\tcb@upperbox\relax {\unvbox\tcb@upperbox}% + \setbox\tcb@upperbox=\vbox to\the\dimexpr#1-\dp\tcb@upperbox\relax {\color@begingroup\unvbox\tcb@upperbox\color@endgroup}% \fi% \tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}% } @@ -144,9 +178,9 @@ } \def\tcb@setbox@lower#1#2{% - \setbox\tcb@lowerbox=\vbox{\begingroup\color{\kvtcb@collower}\unvbox#2\endgroup}% + \setbox\tcb@lowerbox=\vbox{\color@begingroup\color{\kvtcb@collower}\unvbox#2\color@endgroup}% \ifdim\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox>#1\relax% - \setbox\tcb@lowerbox=\vbox to\the\dimexpr#1-\dp\tcb@lowerbox\relax {\unvbox\tcb@lowerbox}% + \setbox\tcb@lowerbox=\vbox to\the\dimexpr#1-\dp\tcb@lowerbox\relax {\color@begingroup\unvbox\tcb@lowerbox\color@endgroup}% \fi% \tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% } @@ -188,12 +222,6 @@ \let\tcb@break@bottomsep=\tcb@zpt% } -\def\tcb@swap#1#2{% - \let\tcb@temp=#1% - \let#1=#2% - \let#2=\tcb@temp% -} - \def\tcb@split@force@standalone{% \tcb@comp@h@total@standalone% @@ -209,7 +237,7 @@ \def\tcb@before@first{\nointerlineskip\kvtcb@beforebox}% \def\tcb@before@middle{\nointerlineskip\noindent}% \let\tcb@before@last=\tcb@before@middle% - \long\def\tcb@after@first{\parskip\z@\par\pagebreak\nointerlineskip{\topskip\z@\null}}% + \long\def\tcb@after@first{\parskip\z@\par\pagebreak\nointerlineskip{\topskip\z@\null}\tcb@enlbreak@next}% \let\tcb@after@middle=\tcb@after@first% \let\tcb@after@last=\kvtcb@afterbox% \else% @@ -256,8 +284,22 @@ \tcb@drawcolorbox@standalone% \fi% \else% - \tcb@sdraw@U% - \let\tcb@split@next=\tcb@split@USL% + \ifdim\dimexpr\tcb@h@upper=0pt\relax% + \iftcb@break@allowed + \tcb@swap{\tcb@totalupperbox}{\tcb@upperbox}% + \tcb@swap{\tcb@totallowerbox}{\tcb@lowerbox}% + \tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}% + \tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% + \pagebreak\tcb@enlbreak@init\tcb@break@allowedfalse% + \let\tcb@split@next=\tcb@split@start% + \else% + \tcb@sdraw@U% + \let\tcb@split@next=\tcb@split@USL% + \fi% + \else% + \tcb@sdraw@U% + \let\tcb@split@next=\tcb@split@USL% + \fi% \fi% \else% \tcb@swap{\tcb@totalupperbox}{\tcb@upperbox}% @@ -428,7 +470,9 @@ \else% \csname tcb@drawwithouttitle@\kvtcb@engine@interior\endcsname% \fi% - \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \iftcb@lowerseparated% + \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \fi% \iftcb@hasTitle% \csname tcb@drawtitle@\kvtcb@engine@title\endcsname% \fi% @@ -488,7 +532,9 @@ \else% \csname tcb@drawwithouttitle@\kvtcb@engine@interior\endcsname% \fi% - \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \iftcb@lowerseparated% + \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \fi% \iftcb@hasTitle% \csname tcb@drawtitle@\kvtcb@engine@title\endcsname% \fi% @@ -557,13 +603,19 @@ pad after break/.code={\let\kvtcb@top@rule@break=\tcb@zpt% \tcbdimto\kvtcb@topsep{#1-\kvtcb@top-\kvtcb@boxsep}},% pad at break/.style={pad before break={#1},pad after break={#1}},% + enlargepage/.store in=\kvtcb@enlargepage, } + \tcbset{% - notitle after break, - shrink break goal=0pt, - lines before break=2, - topsep at break=0pt, - bottomsep at break=0pt, + reset@breakable/.style={% + unbreakable,notitle after break, + shrink break goal=0pt, + lines before break=2, + topsep at break=0pt, + bottomsep at break=0pt, + enlargepage=0pt, + }, + initialize@reset=reset@breakable, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 2bd4ad3b087..1aaa04ff63d 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.32} +\tcb@set@library@version{2.33} \tcbuselibrary{listings} @@ -102,19 +102,6 @@ pageshort={P.}}}, } -% presets -\tcbset{ - index format=pgf, - english language, - documentation listing style=tcbdocumentation, - index default settings, - color option=Option, - color definition=Definition, - color hyperlink=Hyperlink, - before example=\par\smallskip, - after example=, -} - \AtBeginDocument{% \csname tcb@doc@index@\idx@format\endcsname% \hypersetup{ @@ -239,3 +226,18 @@ \PageIndex% } +\tcbset{% + reset@documentation/.style={% + index format=pgf, + english language, + documentation listing style=tcbdocumentation, + index default settings, + color option=Option, + color definition=Definition, + color hyperlink=Hyperlink, + before example=\par\smallskip, + after example=,}, + initialize@reset=reset@documentation, +} + + diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 174b062f093..0ce78004d7b 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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{2.32} +\tcb@set@library@version{2.33} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -53,19 +53,11 @@ fit maxwidthdiffgap/.store in=\kvtcb@fit@maxwidthdiffgap,% } -\tcbset{% - fit basedim=10pt,fit skip=1.2, - fit height plus=0pt,fit width plus=0pt, - fit maxstep=20,fit maxfontdiff=0.1pt,fit maxfontdiffgap=1pt, - fit maxwidthdiff=1pt,fit maxwidthdiffgap=10pt, -} - \def\tcb@@capture@fitbox{% \let\endtcolorbox=\relax% \Collect@Body\tcbox@inner@fitbox% } - \def\tcbfontsize#1{\fontsize{#1\tcbfitdim}{#1\dimexpr\kvtcb@fit@skip\tcbfitdim}\selectfont} \def\tcb@setfontsize#1#2{\@setfontsize#1{#2\tcbfitdim}{#2\dimexpr\kvtcb@fit@skip\tcbfitdim}} @@ -266,4 +258,13 @@ \long\def\newtcboxfit#1{% \@ifnextchar[{\new@tcboxfit{#1}}{\tcb@newtcboxfit{#1}}} +\tcbset{% + reset@fitting/.style={% + fit basedim=10pt,fit skip=1.2, + fit height plus=0pt,fit width plus=0pt, + fit maxstep=20,fit maxfontdiff=0.1pt,fit maxfontdiffgap=1pt, + fit maxwidthdiff=1pt,fit maxwidthdiffgap=10pt, + }, + initialize@reset=reset@fitting, +} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 1cc71312634..c1530e74ba5 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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{2.32} +\tcb@set@library@version{2.33} \tcbset{% before upper app/.code={\tcb@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 e3b5c89614e..c642a4583c7 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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{2.32} +\tcb@set@library@version{2.33} \RequirePackage{listings}[2007/02/22] @@ -135,14 +135,6 @@ listing outside text/.code={\let\tcb@inputlisting\tcb@inputlisting@out@listingAndText},% } -\tcbset{ - listing file=\jobname.listing, - listing style=tcblatex, - comment=, - listing and text, - listing inputencoding=\inputencodingname, -} - \newenvironment{tcblisting}[1]{% \def\tcblisting@box{\tcbinputlisting{#1}}% \begingroup\tcbverbatimwrite{\kvtcb@listingfile}% @@ -175,3 +167,15 @@ \long\def\newtcblisting#1{% \@ifnextchar[{\new@tcblisting{#1}}{\tcb@newtcblisting{#1}}} + +\tcbset{% + reset@listings/.style={% + listing file=\jobname.listing, + listing style=tcblatex, + comment=, + listing and text, + listing inputencoding=\inputencodingname, + }, + initialize@reset=reset@listings, +} + diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 9288f75428e..180a53d3801 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,13 +17,17 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.32} +\tcb@set@library@version{2.33} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} \tcbset{ listing utf8/.style={listing inputencoding=utf8/#1}, - listing utf8=latin1, +} + +\tcbset{% + reset@listingsutf8/.style={listing utf8=latin1}, + initialize@reset=reset@listingsutf8, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 0d585183416..07710cd7b4b 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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{2.32} +\tcb@set@library@version{2.33} \RequirePackage{tikz}[2010/10/13] @@ -118,7 +118,7 @@ \long\def\tcb@pseudo@segmentation#1{% {\parskip\z@\par\nointerlineskip\hfilneg\kern-\@totalleftmargin}\begingroup% -\begin{tikzpicture}% +\tcb@shield@externalize\begin{tikzpicture}% \path[use as bounding box] (0,{\the\dimexpr-\kvtcb@middle-\kvtcb@boxsep\relax}) rectangle (\linewidth,{\the\dimexpr\kvtcb@middle+\kvtcb@boxsep\relax}); \node[line width=0mm,inner sep=0mm,draw=none,fill=none,rectangle, @@ -254,21 +254,6 @@ } \tcbset{% - frame style=,% - interior style=,% - segmentation style=,% - frame code,% - interior titled code,% - interior code,% - segmentation code,% - title style=,% - title code,% - colbacklower=black!15!white,% - clear@spec% -} - - -\tcbset{% base@unbroken/.style={% clear@spec,graphical environment=tikzpicture,geometry nodes,% set@extensions@preframe={\tcb@draw@shadow@unbroken},% @@ -331,20 +316,28 @@ frame engine=path,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=path, interior titled code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% - \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% + \or% + \tcb@drawspec@UT{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@path}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@path}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% \fi}, interior code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% - \or% - \tcb@drawspec@UR{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% + \or% + \tcb@drawspec@UR{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% \fi}, segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else% @@ -356,20 +349,28 @@ frame engine=pathfirst,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathfirst, interior titled code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% - \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% + \or% + \tcb@drawspec@UT{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathfirst}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathfirst}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% \fi}, interior code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% - \or% - \tcb@drawspec@UR{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% + \or% + \tcb@drawspec@UR{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% \fi}, segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else% @@ -381,20 +382,28 @@ frame engine=pathmiddle,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathmiddle, interior titled code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% - \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% + \or% + \tcb@drawspec@UT{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathmiddle}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathmiddle}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% \fi}, interior code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% - \or% - \tcb@drawspec@US{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% + \or% + \tcb@drawspec@US{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% \fi}, segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else% @@ -406,20 +415,28 @@ frame engine=pathlast,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathlast, interior titled code={% - \ifcase\tcb@segment@state - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% - \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% + \or% + \tcb@drawspec@UT{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathlast}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathlast}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% \fi}, interior code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% - \or% - \tcb@drawspec@US{fill=\kvtcb@colback}% - \else - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% + \or% + \tcb@drawspec@US{fill=\kvtcb@colback}% + \else + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}% + \fi% + \else% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% \fi}, segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else% @@ -435,17 +452,25 @@ frame engine=path,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=path, interior titled code={% - \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1% + \tcb@drawspec@UT{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@path}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithtitle@path}% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@path}% \fi% \tcb@drawspec@T}, interior code={% - \ifnum\tcb@segment@state=1 - \tcb@drawspec@UR{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1 + \tcb@drawspec@UR{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},% skin first=beamerfirst,skin middle=beamermiddle,skin last=beamerlast}, @@ -459,16 +484,24 @@ frame engine=pathfirst,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathfirst, interior titled code={% - \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1% + \tcb@drawspec@UT{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% \fi% \tcb@drawspec@T}, interior code={% - \ifnum\tcb@segment@state=1 - \tcb@drawspec@UR{beamer@color}\else% - {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1 + \tcb@drawspec@UR{beamer@color}\else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% + \fi% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},% skin first=beamerfirst,skin middle=beamermiddle,skin last=beamermiddle}} @@ -478,17 +511,25 @@ frame engine=pathmiddle,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathmiddle, interior titled code={% - \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1% + \tcb@drawspec@UT{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% \fi% \tcb@drawspec@T}, interior code={% - \ifnum\tcb@segment@state=1 - \tcb@drawspec@US{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1 + \tcb@drawspec@US{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},% skin first=beamermiddle,skin middle=beamermiddle,skin last=beamermiddle}} @@ -498,17 +539,25 @@ frame engine=pathlast,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathlast, interior titled code={% - \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1% + \tcb@drawspec@UT{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathlast}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathlast}% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathlast}% \fi% \tcb@drawspec@T}, interior code={% - \ifnum\tcb@segment@state=1 - \tcb@drawspec@US{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1 + \tcb@drawspec@US{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},% skin first=beamermiddle,skin middle=beamermiddle,skin last=beamerlast}} @@ -749,11 +798,6 @@ clip watermark/true/.code={\let\tcb@drawspec@watermark=\tcb@drawspec@watermark@@clip}, clip watermark/false/.code={\let\tcb@drawspec@watermark=\tcb@drawspec@watermark@@noclip}, clip watermark/.default=true, - % - watermark opacity=1.00, - watermark color=\kvtcb@colback!85!\kvtcb@colframe, - watermark zoom=0.75, - clip watermark, } \def\tcb@tdraw@title@clip{% @@ -878,8 +922,6 @@ border@line app/.code={\tcb@appto\kvtcb@borderline{#1}},% borderline/.style args={#1#2#3}{border@line app={\tcb@border{#1}{#2}{#3}}},% no borderline/.code={\def\kvtcb@borderline{}},% - % - no borderline,% } \def\tcb@shadow@prepare#1#2{% @@ -972,9 +1014,22 @@ drop fuzzy shadow/.default={black!50!white},% fuzzy halo/.style args={#1 with #2}{fuzzy shadow={0mm}{0mm}{-#1}{0.12mm}{#2}}, fuzzy halo/.default={1.0mm with yellow},% - % - no shadow,% - % - % } + + +\tcbset{% + reset@skins/.style={% + frame style=,interior style=,segmentation style=,% + frame code,interior titled code,interior code,segmentation code,% + title style=,title code,colbacklower=black!15!white,% + clear@spec,% + watermark opacity=1.00,watermark color=\kvtcb@colback!85!\kvtcb@colframe,% + watermark zoom=0.75,clip watermark,% + clip title=false,clip upper=false,clip lower=false, + no borderline,no shadow,% + }, + initialize@reset=reset@skins, +} + + diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index b587416f7a6..9b18811f834 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,15 +18,16 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.32} +\tcb@set@library@version{2.33} \RequirePackage{amsmath} \def\tcb@hack@amsmath{\tcb@hack@currenvir\vskip-\abovedisplayskip} \tcbset{ - theorem/.code args={#1#2#3#4}{% - \pgfkeysalso{title={\refstepcounter{#2}\setbox\z@=\hbox{#1~\csname the#2\endcsname:\ }\hangindent\wd\z@\hangafter=1 \mbox{#1~\csname the#2\endcsname:\label{#4}\ }#3}}},% + theorem/.style args={#1#2#3#4}{% + step and label={#2}{#4},% + title={\setbox\z@=\hbox{#1~\csname the#2\endcsname:\ }\hangindent\wd\z@\hangafter=1 \mbox{#1~\csname the#2\endcsname:\ }#3}},% math upper/.style={before upper=$\displaystyle,after upper=$},% math lower/.style={before lower=$\displaystyle,after lower=$},% math/.style={math upper,math lower},% @@ -51,8 +52,7 @@ ams nodisplayskip upper/.style={before upper=\vskip-\abovedisplayskip},% ams nodisplayskip lower/.style={before lower=\vskip-\abovedisplayskip},% ams nodisplayskip/.style={ams nodisplayskip upper,ams nodisplayskip lower},% - highlight math style/.style={highlight math/.style={#1}},% - highlight math style={colframe=red,colback=yellow!25!white,notitle},% + highlight math style/.style={highlight math/.style={notitle,nophantom,#1}},% } \newcommand{\tcbmaketheorem}[5]{% @@ -60,5 +60,12 @@ } \newtcbox{\tcboxmath}[1][]{nobeforeafter,math upper,tcbox raise base,#1} -\newtcbox{\tcbhighmath}[1][]{nobeforeafter,math upper,tcbox raise base,highlight math,#1} +\newtcbox{\tcbhighmath}[1][]{highlight math,nobeforeafter,math upper,tcbox raise base,#1} + +\tcbset{% + reset@theorems/.style={% + highlight math style={colframe=red,colback=yellow!25!white},% + }, + initialize@reset=reset@theorems, +} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index a4f76aab89b..c9eb2f4b935 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2013/06/23 version 2.32 text color boxes] -\def\tcb@version{2.32} +\ProvidesPackage{tcolorbox}[2013/07/04 version 2.33 text color boxes] +\def\tcb@version{2.33} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -32,10 +32,13 @@ \newif\iftcb@hasLower \newif\iftcb@lowerspace \newif\iftcb@sidebyside +\newif\iftcb@hasPhantom +\newif\iftcb@lowerseparated \newbox\tcb@titlebox \newbox\tcb@upperbox \newbox\tcb@lowerbox +\newbox\tcb@phantombox \newcounter{tcbbreakpart} @@ -90,6 +93,14 @@ \tcbdimto\tcb@w@upper{\tcb@w@sbs-\tcb@w@lower}% } +\def\tcb@shield@@externalize{% + \ifdefined\tikzexternaldisable% + \ifdefined\pgfpictureid% + \else% + \tikzexternaldisable% + \fi% + \fi} + \pgfkeys{/handlers/.dimstore in/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\def#1{\the\dimexpr##1\relax}}} \tcbset{% @@ -182,7 +193,16 @@ }, enlarge left by/.store in=\kvtcb@bbleft, enlarge right by/.store in=\kvtcb@bbright, - toggle enlargement/.store in=\kvtcb@bbtoggle, + toggle enlargement/.is choice, + toggle enlargement/none/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@none}, + toggle enlargement/evenpage/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@evenpage}, + toggle enlargement/forced/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@forced}, + toggle enlargement/.default=evenpage, + toggle left and right/.is choice, + toggle left and right/none/.code={\let\tcb@lrtoggle=\tcb@lrtoggle@none}, + toggle left and right/evenpage/.code={\let\tcb@lrtoggle=\tcb@lrtoggle@evenpage}, + toggle left and right/forced/.code={\let\tcb@lrtoggle=\tcb@lrtoggle@forced}, + toggle left and right/.default=evenpage, graphical environment/.store in=\kvtcb@graphenv, frame engine/.store in=\kvtcb@engine@frame, interior titled engine/.store in=\kvtcb@engine@interiortitled, @@ -249,12 +269,13 @@ \tcb@hack@currenvir\tabularx{\linewidth}{#2}}, after upper=\endtabularx}, tabularx/.style={tabularx*={}{#1}}, - tikz upper/.style={before upper=\centering\tikzpicture[#1],after upper=\endtikzpicture},% - tikz lower/.style={before lower=\centering\tikzpicture[#1],after lower=\endtikzpicture},% + tikz upper/.style={before upper=\centering\tcb@shield@externalize\tikzpicture[#1],after upper=\endtikzpicture},% + tikz lower/.style={before lower=\centering\tcb@shield@externalize\tikzpicture[#1],after lower=\endtikzpicture},% oversize/.style={% - width=\the\dimexpr\dimexpr\linewidth\relax+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax,% - enlarge left by=\the\dimexpr-\kvtcb@left@rule-\kvtcb@leftupper-\kvtcb@boxsep\relax,% - enlarge right by=\the\dimexpr-\kvtcb@boxsep-\kvtcb@rightupper-\kvtcb@right@rule\relax},% + width=\the\dimexpr\dimexpr\linewidth+#1+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax,% + enlarge left by=\the\dimexpr-\kvtcb@left@rule-\kvtcb@leftupper-\kvtcb@boxsep-#1/2\relax,% + enlarge right by=\the\dimexpr-\kvtcb@boxsep-\kvtcb@rightupper-\kvtcb@right@rule-#1/2\relax},% + oversize/.default=0pt,% baseline/.store in=\kvtcb@baseline,% tcbox raise/.style={baseline=-#1},% tcbox raise base/.style={baseline=\tcb@val@raisebase},% @@ -281,23 +302,24 @@ minipage/.style={capture=minipage},% check odd page/.is choice, check odd page/true/.code={\let\tcb@checkoddpage=\checkoddpage% - \let\tcb@setbb@toggle@evenpage=\tcb@setbb@toggle@evenpage@strict}, + \def\tcb@evenoddmode{strict}% + }, check odd page/false/.code={\let\tcb@checkoddpage=\relax% - \let\tcb@setbb@toggle@evenpage=\tcb@setbb@toggle@evenpage@easy}, + \def\tcb@evenoddmode{easy}% + }, check odd page/.default=true, + phantom/.store in=\kvtcb@phantom, + step and label/.style 2 args={phantom={\refstepcounter{#1}\label{#2}}},% + nophantom/.style={phantom=},% + shield externalize/.is choice, + shield externalize/true/.code={\let\tcb@shield@externalize=\tcb@shield@@externalize}, + shield externalize/false/.code={\let\tcb@shield@externalize=\relax}, + shield externalize/.default=true, + lower separated/.is if=tcb@lowerseparated, } -\tcbset{notitle,width=\linewidth,boxsep=1mm,boxrule=0.5mm,adjust text={\"Apgjy}, - left=4mm,right=4mm,top=2mm,bottom=2mm,middle=2mm,arc=1mm,lowerbox=visible, - colback=black!5!white,colframe=black!75!white,coltext=black,coltitle=white, - fonttitle=,fontupper=,fontlower=,floatplacement=htb,nofloat,savelowerto=, - savedelimiter={tcolorbox},tempfile={\jobname.tcbtemp},autoparskip, - enlarge top by=0mm,enlarge bottom by=0mm,enlarge left by=0mm,enlarge right by=0mm, - toggle enlargement=none,toptitle=0mm,bottomtitle=0mm, - standard,parbox,overlay=,auto outer arc, - before title=,after title=,before upper=,after upper=,before lower=,after lower=, - baseline=0pt,sidebyside=false,sidebyside align=center,sidebyside gap=10mm, - lefthand ratio=0.5,capture=minipage,check odd page=false, +\tcbset{% + autoparskip,minipage,savedelimiter=tcolorbox,% set@extensions@preframe=,set@extensions@postframe=,% }% @@ -324,10 +346,10 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a \@endpefalse - \begingroup% + \color@setgroup% \csname tcb@parbox@use@\kvtcv@parbox\endcsname% \ignorespaces\tcb@minipage#2\ignorespaces} -\def\endtcb@lrbox{\unskip\endminipage\unskip\endgroup} +\def\endtcb@lrbox{\unskip\endminipage\unskip\color@endgroup} \let\tcb@savebox=\tcb@lrbox \let\endtcb@savebox=\endtcb@lrbox @@ -363,6 +385,10 @@ \tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}% \tcbdimto\tcb@temp{\tcb@innerwidth-\kvtcb@boxsep*2}% \tcbdimto\tcb@w@upper{\tcb@temp-\kvtcb@leftupper-\kvtcb@rightupper}% + \ifx\kvtcb@phantom\@empty\tcb@hasPhantomfalse\else% + \tcb@hasPhantomtrue% + \sbox\tcb@phantombox{\kvtcb@phantom}% + \fi% \ifx\kvtcb@title\@empty\tcb@hasTitlefalse\else% \tcb@hasTitletrue% \tcbdimto\tcb@w@title{\tcb@temp-\kvtcb@lefttitle-\kvtcb@righttitle}% @@ -498,7 +524,6 @@ \def\tcb@dbox@center#1#2#3#4{\pgftext[x=#1,y=#2+#3/2,left]{\box#4}}% -\tcbset{natural height,space to lower,valign=top,valign lower=top} % fill frame \def\tcb@drawframe@standard{% @@ -572,19 +597,53 @@ \def\tcb@setbb@toggle@evenpage@easy{% \ifodd\thepage\tcb@setbb@toggle@none\else\tcb@setbb@toggle@forced\fi% } -\let\tcb@setbb@toggle@evenpage=\tcb@setbb@toggle@evenpage@easy \def\tcb@setbb@toggle@evenpage@strict{% \ifoddpage\tcb@setbb@toggle@none\else\tcb@setbb@toggle@forced\fi% } +\def\tcb@setbb@toggle@evenpage{% + \csname tcb@setbb@toggle@evenpage@\tcb@evenoddmode\endcsname% +} \def\tcb@creategeonodes@false{} +\def\tcb@swap#1#2{% + \let\tcb@temp=#1% + \let#1=#2% + \let#2=\tcb@temp% +} + +\let\tcb@lrtoggle@none=\relax + +\def\tcb@lrtoggle@forced{% + \tcb@swap{\kvtcb@left@rule}{\kvtcb@right@rule}% + \tcb@swap{\kvtcb@lefttitle}{\kvtcb@righttitle}% + \tcb@swap{\kvtcb@leftupper}{\kvtcb@rightupper}% + \tcb@swap{\kvtcb@leftlower}{\kvtcb@rightlower}% +} + +\def\tcb@lrtoggle@evenpage@easy{% + \unless\ifodd\thepage\tcb@lrtoggle@forced\fi% +} + +\def\tcb@lrtoggle@evenpage@strict{% + \unless\ifoddpage\tcb@lrtoggle@forced\fi% +} + +\def\tcb@lrtoggle@evenpage{% + \csname tcb@lrtoggle@evenpage@\tcb@evenoddmode\endcsname% +} + \def\tcb@bbdraw{% \tcb@checkoddpage% - \csname tcb@setbb@toggle@\kvtcb@bbtoggle\endcsname% + \tcb@lrtoggle% + \tcb@setbb@toggle% \pgfusepath{use as bounding box}% + \iftcb@hasPhantom% + \pgftext[x=0pt,y=\tcb@height-\baselineskip,left,top]{\box\tcb@phantombox}% + \tcb@hasPhantomfalse% + \fi% \csname tcb@creategeonodes@\kvtcv@geonodes\endcsname% } @@ -650,6 +709,7 @@ \let\tcb@h@lower=\tcb@zpt% \fi% % + \tcb@shield@externalize% \tcb@drawcolorbox% } @@ -692,11 +752,13 @@ \else% \csname tcb@drawwithouttitle@\kvtcb@engine@interior\endcsname% \fi% - \iftcb@lowerspace% - \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% - \else\iftcb@sidebyside% - \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% - \fi\fi% + \iftcb@lowerseparated% + \iftcb@lowerspace% + \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \else\iftcb@sidebyside% + \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \fi\fi% + \fi% \iftcb@hasTitle% \csname tcb@drawtitle@\kvtcb@engine@title\endcsname% \fi% @@ -708,13 +770,13 @@ \end{\kvtcb@graphenv}\end{tcb@float}% } -\def\tcb@draw@border#1{} - \let\tcb@drawcolorbox@standalone=\tcb@drawcolorbox +\def\tcb@draw@border#1{} + \long\def\tcbox@inner@hbox#1{% \tcbset{breakable@false,sidebyside=false}% - \setbox\tcb@upperbox=\hbox{\begingroup\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\endgroup}% + \sbox\tcb@upperbox{\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}% \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}% \tcbdimto{\tcb@val@raisebase}{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}% \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}% @@ -838,6 +900,29 @@ \edef#1{\unexpanded{#2}\tcb@expandonce#1}% \fi} +\def\tcb@reset{}% +\tcbset{% + initialize@reset/.code={\tcbset{#1}\tcb@appto\tcb@reset{\tcbset{#1}}},% + reset/.code={\tcb@reset},% + reset@core/.style={notitle,width=\linewidth, + natural height,space to lower,valign=top,valign lower=top, + boxsep=1mm,boxrule=0.5mm, + left=4mm,right=4mm,top=2mm,bottom=2mm,middle=2mm,arc=1mm, + enlarge top by=0mm,enlarge bottom by=0mm,enlarge left by=0mm,enlarge right by=0mm, + toggle enlargement=none,toggle left and right=none,toptitle=0mm,bottomtitle=0mm, + baseline=0pt,adjust text={\"Apgjy},lowerbox=visible,lower separated, + colback=black!5!white,colframe=black!75!white,coltext=black,coltitle=white, + fonttitle=,fontupper=,fontlower=,floatplacement=htb,nofloat,savelowerto=, + tempfile={\jobname.tcbtemp}, + standard,parbox,overlay=,auto outer arc, + before title=,after title=,before upper=,after upper=,before lower=,after lower=, + sidebyside=false,sidebyside align=center,sidebyside gap=10mm, + lefthand ratio=0.5,check odd page=false,nophantom, + shield externalize=false, + }, + initialize@reset=reset@core, +} + % libraries \def\tcb@optionlist{} |