From 08adba3b71e8de03f7aa8b24b9c99f7b9fbd58f7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 Jul 2015 22:42:08 +0000 Subject: tcolorbox (16jul15) git-svn-id: svn://tug.org/texlive/trunk@37876 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 45 +++++- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 4 +- .../tex/latex/tcolorbox/tcbexternal.code.tex | 4 +- .../tex/latex/tcolorbox/tcbfitting.code.tex | 12 +- .../tex/latex/tcolorbox/tcbhooks.code.tex | 15 +- .../tex/latex/tcolorbox/tcblistings.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingscore.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 4 +- .../tex/latex/tcolorbox/tcbmagazine.code.tex | 174 +++++++++++++++++++++ .../tex/latex/tcolorbox/tcbminted.code.tex | 4 +- .../tex/latex/tcolorbox/tcbraster.code.tex | 8 +- .../tex/latex/tcolorbox/tcbskins.code.tex | 6 +- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 6 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 4 +- .../tex/latex/tcolorbox/tcbxparse.code.tex | 4 +- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 58 ++++++- 16 files changed, 310 insertions(+), 46 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex (limited to 'Master/texmf-dist/tex/latex/tcolorbox') diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 5f64cdc8db0..bea401b303e 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.61} +\tcb@set@library@version{3.70} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -248,6 +248,7 @@ } \def\tcb@prepare@break@operation{% + \setcounter{tcbbreakpart}{0}% \let\tcb@nobreak@warning\@empty% \@ifundefined{columnbreak}{\tcb@multicolfalse}{% \ifnum\doublecol@number>\z@ % @@ -731,7 +732,10 @@ \def\tcb@sdraw@USL{% - \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook% + \begingroup% + \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}% + \csuse{tcb@extras@\tcb@split@state}% + \tcb@afteroptions@hook% \def\tcb@segment@state{1}% \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower+\csname tcb@h@breaksep@\tcb@split@state\endcsname}% \csname tcb@break@ch@\tcb@split@state\endcsname% @@ -752,11 +756,15 @@ \tcb@tdraw@lower% \tcb@extensions@final% \tcb@drawing@env@end% + \endgroup% } \def\tcb@sdraw@U{% - \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook% + \begingroup% + \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}% + \csuse{tcb@extras@\tcb@split@state}% + \tcb@afteroptions@hook% \def\tcb@segment@state{0}% \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\csname tcb@h@breaksep@\tcb@split@state\endcsname}% \csname tcb@break@ch@\tcb@split@state\endcsname% @@ -773,11 +781,15 @@ \tcb@tdraw@upper% \tcb@extensions@final% \tcb@drawing@env@end% + \endgroup% } \def\tcb@sdraw@SL{% - \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook% + \begingroup% + \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}% + \csuse{tcb@extras@\tcb@split@state}% + \tcb@afteroptions@hook% \def\tcb@segment@state{1}% \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@bottom+\kvtcb@boxsep+\tcb@h@segment+\tcb@h@lower+\csname tcb@h@breaksep@\tcb@split@state\endcsname}% \csname tcb@break@ch@\tcb@split@state\endcsname% @@ -797,11 +809,15 @@ \tcb@tdraw@lower% \tcb@extensions@final% \tcb@drawing@env@end% + \endgroup% } \def\tcb@sdraw@L{% - \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook% + \begingroup% + \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}% + \csuse{tcb@extras@\tcb@split@state}% + \tcb@afteroptions@hook% \def\tcb@segment@state{2}% \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\ht\tcb@lowerbox+\dp\tcb@lowerbox+\csname tcb@h@breaksep@\tcb@split@state\endcsname}% \csname tcb@break@ch@\tcb@split@state\endcsname% @@ -818,6 +834,7 @@ \tcb@tdraw@lower% \tcb@extensions@final% \tcb@drawing@env@end% + \endgroup% } @@ -907,6 +924,21 @@ \fi}},% compress page/.default=all,% compress page=baselineskip,% global setting + extras unbroken/.code={\appto\tcb@extras@unbroken{\tcbset{#1}}},% + extras first/.code={\appto\tcb@extras@first{\tcbset{#1}}},% + extras middle/.code={\appto\tcb@extras@middle{\tcbset{#1}}},% + extras last/.code={\appto\tcb@extras@last{\tcbset{#1}}},% + extras/.style={extras unbroken={#1},extras first={#1},extras middle={#1},extras last={#1}},% + extras broken/.style={extras first={#1},extras middle={#1},extras last={#1}},% + extras unbroken and first/.style={extras unbroken={#1},extras first={#1}},% + extras unbroken and last/.style={extras unbroken={#1},extras last={#1}},% + extras middle and last/.style={extras middle={#1},extras last={#1}},% + extras first and middle/.style={extras first={#1},extras middle={#1}},% + no extras unbroken/.code={\let\tcb@extras@unbroken\@empty},% + no extras first/.code={\let\tcb@extras@first\@empty},% + no extras middle/.code={\let\tcb@extras@middle\@empty},% + no extras last/.code={\let\tcb@extras@last\@empty},% + no extras/.code={\let\tcb@extras@unbroken\@empty\let\tcb@extras@first\@empty\let\tcb@extras@middle\@empty\let\tcb@extras@last\@empty},% } @@ -921,6 +953,7 @@ break at=0pt, height fixed for=none, vfill before first=false, + no extras, }, 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 1e88e7ebc6f..21bcc5f157f 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.61} +\tcb@set@library@version{3.70} \tcbuselibrary{listings,skins,xparse,external} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 0c8879ef2d8..910d7137ca9 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.61} +\tcb@set@library@version{3.70} { \catcode`\"=12 diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 2278704e1bd..2885563e34f 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -147,7 +147,7 @@ \def\tcbox@fitalgorithm@fontsize@star{% \tcbox@fitalgorithm@fontsize% - \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@target}{\box\tcb@upperbox}}% + \tcb@resize@box{\tcb@upperbox}{\tcb@w@upper}{\tcb@fit@@target}% \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% } @@ -180,19 +180,19 @@ \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% \let\tcb@fit@@h=\tcb@fit@@target% \fi - \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@h}{\box\tcb@upperbox}}% + \tcb@resize@box{\tcb@upperbox}{\tcb@w@upper}{\tcb@fit@@h}% % \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% } \def\tcbox@fitalgorithm@areasize@star{% \tcbox@fitalgorithm@areasize@core% - \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@target}{\box\tcb@upperbox}}% + \tcb@resize@box{\tcb@upperbox}{\tcb@w@upper}{\tcb@fit@@target}% \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% } \def\tcbox@fitalgorithm@squeeze{% - \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@target}{\box\tcb@upperbox}}% + \tcb@resize@box{\tcb@upperbox}{\tcb@w@upper}{\tcb@fit@@target}% \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 1ab10750e15..353d08fb41f 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% @@ -74,6 +74,17 @@ title code app/.code={\appto\tcb@title@code{#1}},% title code pre/.code={\preto\tcb@title@code{#1}},% % + extras unbroken pre/.code={\preto\tcb@extras@unbroken{#1}},% + extras first pre/.code={\preto\tcb@extras@first{#1}},% + extras middle pre/.code={\preto\tcb@extras@middle{#1}},% + extras last pre/.code={\preto\tcb@extras@last{#1}},% + extras pre/.style={extras unbroken pre={#1},extras first pre={#1},extras middle pre={#1},extras last pre={#1}},% + extras broken pre/.style={extras first pre={#1},extras middle pre={#1},extras last pre={#1}},% + extras unbroken and first pre/.style={extras unbroken pre={#1},extras first pre={#1}},% + extras unbroken and last pre/.style={extras unbroken pre={#1},extras last pre={#1}},% + extras middle and last pre/.style={extras middle pre={#1},extras last pre={#1}},% + extras first and middle pre/.style={extras first pre={#1},extras middle pre={#1}},% + % underlay unbroken pre/.code={\preto\tcb@underlay@unbroken{#1}},% underlay first pre/.code={\preto\tcb@underlay@first{#1}},% underlay middle pre/.code={\preto\tcb@underlay@middle{#1}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index b5c0c49bc62..cb6c042fe99 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \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 790dc23e240..b4beafb6659 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \RequirePackage{pdftexcmds} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 0c77b8734ed..598e6a8710d 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex new file mode 100644 index 00000000000..02969dd8013 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex @@ -0,0 +1,174 @@ +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) +%% tcbmagazine.code.tex: Code for box sets and magazine styles +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm +%% ------------------------------------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of all files listed in README +%% +\tcb@set@library@version{3.70} + +\tcbuselibrary{breakable} + +\def\newboxarray#1{% + \ifcsdef{tcb@boxarray@#1@allocated}{% + \tcb@warning{box array '#1' is allocated again by \string\newboxarray. Memory and registers are wasted}% + }{}% + \global\csdef{tcb@boxarray@#1@size}{0}% + \global\csdef{tcb@boxarray@#1@allocated}{0}% +} + +\newboxarray{default} + +\newrobustcmd*{\boxarraygetsize}[2][default]{% + \letcs#2{tcb@boxarray@#1@size}% + \ifdef{#2}{}{% + \tcb@error{undefined box array '#1'}% + {You have to say \string\newboxarray{#1}, before '#1' can be used as box array.}% + }% +} + +\newrobustcmd*{\boxarrayreset}[1][default]{% + \boxarraygetsize[#1]\tcb@box@array@size% + \global\csdef{tcb@boxarray@#1@size}{0}% +} + +\newrobustcmd*{\boxarrayclear}[1][default]{% + \boxarraygetsize[#1]\tcb@box@array@size% + \global\csdef{tcb@boxarray@#1@size}{0}% + \letcs\tcb@box@array@allocated{tcb@boxarray@#1@allocated}% + \begingroup% + \count@=0% + \loop% + \ifnum\count@<\tcb@box@array@allocated\relax% + \advance\count@ 1\relax% + \letcs\tcb@box@array@box{tcb@boxarray@#1@\number\count@ @box}% + \setbox0=\box\tcb@box@array@box% + \repeat% + \endgroup% +} + +\newrobustcmd*{\boxarraygetbox}[3][default]{% + \boxarraygetsize[#1]\tcb@box@array@size% + \let#2\@undefined% + \ifnum\numexpr#3>0\relax% + \ifnum\numexpr#3>\tcb@box@array@size\relax% + \else% + \letcs#2{tcb@boxarray@#1@#3@box}% + \fi% + \fi% +} + +\newrobustcmd*{\boxarraygetwidth}[3][default]{% + \boxarraygetbox[#1]{\tcb@box@array@box}{#3}% + \ifdefined\tcb@box@array@box% + \tcbdimto#2{\wd\tcb@box@array@box}% + \else% + \let#2\tcb@zpt% + \fi% +} + +\newrobustcmd*{\boxarraygetheight}[3][default]{% + \boxarraygetbox[#1]{\tcb@box@array@box}{#3}% + \ifdefined\tcb@box@array@box% + \tcbdimto#2{\ht\tcb@box@array@box}% + \else% + \let#2\tcb@zpt% + \fi% +} + +\newrobustcmd*{\boxarraygetdepth}[3][default]{% + \boxarraygetbox[#1]{\tcb@box@array@box}{#3}% + \ifdefined\tcb@box@array@box% + \tcbdimto#2{\dp\tcb@box@array@box}% + \else% + \let#2\tcb@zpt% + \fi% +} + +\newrobustcmd*{\boxarraygettotalheight}[3][default]{% + \boxarraygetbox[#1]{\tcb@box@array@box}{#3}% + \ifdefined\tcb@box@array@box% + \tcbdimto#2{\ht\tcb@box@array@box+\dp\tcb@box@array@box}% + \else% + \let#2\tcb@zpt% + \fi% +} + +\newrobustcmd*{\useboxarray}[2][default]{% + \boxarraygetbox[#1]{\tcb@box@array@box}{#2}% + \ifdefined\tcb@box@array@box% + \usebox{\tcb@box@array@box}% + \fi% +} + +\newrobustcmd{\usetcboxarray}[3][default]{% + \boxarraygetbox[#1]{\tcb@box@array@box}{#2}% + \ifdefined\tcb@box@array@box% + \tcbox[#3]{\usebox{\tcb@box@array@box}}% + \fi% +} + +\newrobustcmd*{\consumeboxarray}[2][default]{% + \boxarraygetbox[#1]{\tcb@box@array@box}{#2}% + \ifdefined\tcb@box@array@box% + \leavevmode\box\tcb@box@array@box\relax% + \fi% +} + +\newrobustcmd{\consumetcboxarray}[3][default]{% + \boxarraygetbox[#1]{\tcb@box@array@box}{#2}% + \ifdefined\tcb@box@array@box% + \tcbox[#3]{\leavevmode\box\tcb@box@array@box\relax}% + \fi% +} + +\def\boxarraystore#1{% + \boxarraygetsize[#1]\tcb@box@array@size% + \numdef\tcb@box@array@size{\tcb@box@array@size+1}% + \global\cslet{tcb@boxarray@#1@size}{\tcb@box@array@size}% + \letcs\tcb@box@array@allocated{tcb@boxarray@#1@allocated}% + \ifnum\tcb@box@array@allocated<\tcb@box@array@size\relax% + \newbox\tcb@box@array@box\csxdef{tcb@boxarray@#1@\tcb@box@array@size @box}{\the\tcb@box@array@box}% + \global\cslet{tcb@boxarray@#1@allocated}{\tcb@box@array@size}% + \else% + \letcs\tcb@box@array@box{tcb@boxarray@#1@\tcb@box@array@size @box}% + \fi% + \edef\reserved@a{% + \endgroup + \global\setbox\tcb@box@array@box\hbox{% + \begingroup\aftergroup}% + \def\noexpand\@currenvir{\@currenvir}% + \def\noexpand\@currenvline{\on@line}}% + \reserved@a + \@endpefalse + \color@setgroup + \ignorespaces} + +\def\endboxarraystore{\unskip\color@endgroup} + +\def\tcb@storetoboxarray@begin#1#2[#3]{\begin{boxarraystore}{#1}} +\def\tcb@storetoboxarray@end{\end{boxarraystore}} + +\tcbset{ + store to box array/.code={% + \def\kvtcb@float{S}\def\tcb@float@env@begin{\tcb@storetoboxarray@begin{#1}}\def\tcb@float@env@end{\tcb@storetoboxarray@end}}, + store to box array/.default=default, + reset box array/.code={\boxarrayreset[#1]}, + reset box array/.default=default, + reset and store to box array/.style={reset box array={#1},store to box array={#1}},% + reset and store to box array/.default=default, + do not store to box array/.style={nofloat}, +} + diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 8915d284fc3..a297383e8c8 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 7fb7882b929..62ac347a6a1 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -127,7 +127,7 @@ }}% \tcbset{#1}% \tcbset@late@options{% - before={\unskip\ifnum\c@tcbrastercolumn>1 \kern\kvtcb@raster@xskip\else% + before={\ifhmode\unskip\fi\ifnum\c@tcbrastercolumn>1 \kern\kvtcb@raster@xskip\else% \ifnum\c@tcbrasterrow>1 \parindent\z@\parskip\z@\par\nointerlineskip\addvspace{\the\dimexpr\kvtcb@raster@yskip\relax}\noindent\fi% \kern\kvtcb@raster@skip@left\fi}, after={% @@ -167,7 +167,7 @@ \fi% \kvtcb@raster@halign\noindent% }{% - \unskip% + \ifhmode\unskip\fi% \ifnum\c@tcbrastercolumn>1 % \kern\kvtcb@raster@skip@right% \fi% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index e9631f3209b..8b8b865964a 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \RequirePackage{tikz}[2010/10/13] @@ -630,7 +630,7 @@ skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast} -\tikzset{beamer@color/.style={top color=tcbcol@back,bottom color=tcbcol@back!85!black}} +\tikzset{beamer@color/.style={fill=none,top color=tcbcol@back,bottom color=tcbcol@back!85!black}} \tcb@new@skin{beamer}{base@unbroken,% frame engine=path,interior titled engine=empty,interior engine=empty,segmentation engine=empty,title engine=path,% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 1ada60de63a..2a172ab5fce 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% 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{3.61} +\tcb@set@library@version{3.70} \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 4e383fe12c6..eecbc5124ea 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 661cdacc5ca..fba728f9a10 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% 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{3.61} +\tcb@set@library@version{3.70} \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 96cbddf15b6..25ece46948c 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 3.61 (2015/06/12) +%% The LaTeX package tcolorbox - version 3.70 (2015/07/16) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2015/06/12 version 3.61 text color boxes] -\def\tcb@version{3.61} +\ProvidesPackage{tcolorbox}[2015/07/16 version 3.70 text color boxes] +\def\tcb@version{3.70} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -168,7 +168,7 @@ squeezed title*/.style={squeezed title={#1\vphantom{\kvtcb@adjusttext}}},% detach title/.code=\tcb@detach@title@code,% attach title/.code=\tcb@attach@title@code,% - attach title to upper/.style={detach title,before upper={\tcbtitle#1}}, + attach title to upper/.style={detach title,before upper={\ifx\tcbtitletext\@empty\else\tcbtitle#1\fi}}, attach title to upper/.default=, subtitle style/.store in=\kvtcb@subtitle@style,% width/.store in=\kvtcb@width, @@ -329,15 +329,21 @@ halign title/center/.code={\let\kvtcb@haligntitle=\tcb@raggedcenter@plain}, halign title/justify/.code={\let\kvtcb@haligntitle=\@empty}, % + valign scale limit/.store in=\kvtcbv@valignscalelimit, + valign scale limit=1.1, valign/.is choice, valign/top/.code={\def\kvtcb@valignupper{top}}, valign/center/.code={\def\kvtcb@valignupper{center}}, valign/bottom/.code={\def\kvtcb@valignupper{bottom}}, + valign/scale/.code={\def\kvtcb@valignupper{resize}}, + valign/scale*/.code={\def\kvtcb@valignupper{resizelimited}}, valign upper/.style={valign=#1}, valign lower/.is choice, valign lower/top/.code={\def\kvtcb@valignlower{top}}, valign lower/center/.code={\def\kvtcb@valignlower{center}}, valign lower/bottom/.code={\def\kvtcb@valignlower{bottom}}, + valign lower/scale/.code={\def\kvtcb@valignlower{resize}}, + valign lower/scale*/.code={\def\kvtcb@valignlower{resizelimited}}, enlarge top initially by/.store in=\kvtcb@bbtop@stand,% enlarge top at break by/.store in=\kvtcb@bbtop@break,% enlarge top by/.style={enlarge top initially by={#1},enlarge top at break by={#1}},% @@ -478,6 +484,19 @@ varwidth upper/.style={before upper={\tcbdimto\tcb@w@upper{#1-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}% \begin{varwidth}{\tcb@w@upper}},after upper={\end{varwidth}}},% varwidth upper/.default=\kvtcb@width, + text fill/.style={before upper={% + \iftcb@fixedheight% + \tcbdimto\tcb@temp{\kvtcb@top@rule@stand+\kvtcb@bottom@rule@stand+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}% + \iftcb@hasTitle% + \tcbdimto\tcb@temp{\tcb@temp+\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle}% + \fi% + \tcbdimto\tcb@temp{\kvtcb@height@fixed-\tcb@temp}% + \edef\tcb@temp{\noexpand\minipage[c][\tcb@temp]}% + \else% + \let\tcb@temp\minipage% + \fi% + \tcb@temp{\linewidth}\kvtcb@halignupper}, + after upper=\endminipage}, oversize/.style={% 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,% @@ -977,6 +996,31 @@ \def\tcb@dbox@center#1#2#3#4#5{\pgftext[x=#1,y=#2+#3/2,left]{\color{#5}\box#4}}% +\def\tcb@resize@box#1#2#3{% + \setbox#1\hbox{\resizebox*{#2}{#3}{\box#1}}% + \wd#1=#2\relax% + \ht#1=\the\dimexpr#3-\dp#1\relax% +} + +\def\tcb@dbox@resize#1#2#3#4#5{% + \iftcb@fixedheight% + \tcbdimto\tcb@box@w@target{\wd#4}% + \tcbdimto\tcb@box@h@target{#3}% + \tcb@resize@box{#4}{\tcb@box@w@target}{\tcb@box@h@target}% + \fi% + \pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% + +\def\tcb@dbox@resizelimited#1#2#3#4#5{% + \iftcb@fixedheight% + \tcbdimto\tcb@box@w@target{\wd#4}% + \tcbdimto\tcb@box@h@target{\kvtcbv@valignresizelimit\dimexpr(\ht#4+\dp#4)}% + \ifdim\dimexpr\tcb@box@h@target>#3\relax% + \tcbdimto\tcb@box@h@target{#3}% + \fi% + \tcb@resize@box{#4}{\tcb@box@w@target}{\tcb@box@h@target}% + \fi% + \pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% + \let\tcb@pgfprocess@@specialround@orig=\pgfprocess@@specialround % patch for \pgfprocess@@specialround @@ -1396,6 +1440,7 @@ \def\tcb@drawcolorbox{% \edef\tcb@split@state{unbroken}% + \tcb@extras@unbroken% \let\kvtcb@top@rule=\kvtcb@top@rule@stand% \let\kvtcb@bottom@rule=\kvtcb@bottom@rule@stand% \let\kvtcb@bbtop=\kvtcb@bbtop@stand% @@ -1925,14 +1970,15 @@ \tcb@add@library{skins@jigsaw}{tcbskinsjigsaw.code.tex} \tcb@add@library{skins}{tcbskins.code.tex} \tcb@add@library{breakable}{tcbbreakable.code.tex} +\tcb@add@library{magazine}{tcbmagazine.code.tex} \tcb@add@library{hooks}{tcbhooks.code.tex} \tcb@add@library{fitting}{tcbfitting.code.tex} \tcb@add@library{xparse}{tcbxparse.code.tex} \tcb@add@library{external}{tcbexternal.code.tex} \tcb@add@library@style{many}{raster,skins,breakable,hooks,theorems,fitting,xparse} -\tcb@add@library@style{most}{many,listingsutf8,external} -\tcb@add@library@style{all}{many,minted,listingsutf8,external,documentation} +\tcb@add@library@style{most}{many,listingsutf8,external,magazine} +\tcb@add@library@style{all}{many,minted,listingsutf8,external,magazine,documentation} \ProcessOptions* \edef\tcb@temp{\noexpand\tcbuselibrary{\tcb@optionlist}} -- cgit v1.2.3