diff options
author | Karl Berry <karl@freefriends.org> | 2015-01-09 22:54:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-01-09 22:54:20 +0000 |
commit | a4011a650cc35bb1cf977438d566410c2f995b8e (patch) | |
tree | f54f84a9edc48d00bd39bb1c1bda9fa4ce2db2dd /Master/texmf-dist/tex | |
parent | 68d94357af9f1ad97052ca3e416f8f2e0c8c060f (diff) |
tcolorbox (9jan15)
git-svn-id: svn://tug.org/texlive/trunk@36008 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
14 files changed, 153 insertions, 77 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 01971c883f5..70e36b1c073 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 413eab39e2b..0ae88d8f606 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \tcbuselibrary{listings,skins,xparse} @@ -73,12 +73,16 @@ doclang/.cd, color/.store in=\kvtcb@text@color, colors/.store in=\kvtcb@text@colors, + counter/.store in=\kvtcb@text@counter, + counters/.store in=\kvtcb@text@counters, environment content/.store in=\kvtcb@text@envcontent, environment/.store in=\kvtcb@text@env, environments/.store in=\kvtcb@text@envs, + index/.store in=\kvtcb@text@index, key/.store in=\kvtcb@text@key, keys/.store in=\kvtcb@text@keys, - index/.store in=\kvtcb@text@index, + length/.store in=\kvtcb@text@length, + lengths/.store in=\kvtcb@text@lengths, new/.store in=\kvtcb@text@new, pageshort/.store in=\kvtcb@text@pageshort, updated/.store in=\kvtcb@text@updated, @@ -96,8 +100,11 @@ color environment/.store in=\kvtcb@col@environment, color key/.store in=\kvtcb@col@key, color value/.store in=\kvtcb@col@value, + color counter/.store in=\kvtcb@col@counter, + color length/.store in=\kvtcb@col@length, color color/.store in=\kvtcb@col@color, - color definition/.style={color command={#1},color environment={#1},color key={#1},color value={#1},color color={#1}}, + color definition/.style={color command={#1},color environment={#1},color key={#1}, + color value={#1},color color={#1},color counter={#1},color length={#1}}, color option/.store in=\kvtcb@col@opt, color hyperlink/.store in=\kvtcb@colhyper, color frame/.store in=\kvtcb@colhyper, @@ -109,6 +116,8 @@ index format/.store in=\idx@format, index colorize/.is if=tcb@doc@colorize,% index annotate/.is if=tcb@doc@annotate,% + index command/.code={\def\kvtcb@index@command##1{#1{##1}}},% + index command name/.code={\def\kvtcb@index@command##1{\index[#1]{##1}}},% doc left/.dimstore in=\kvtcb@doc@left, doc right/.dimstore in=\kvtcb@doc@right, doc left indent/.dimstore in=\kvtcb@doc@indentleft, @@ -135,10 +144,12 @@ index german settings/.style={index actual={=},index quote={!},index level={>}}, english language/.code={\tcbset{doclang/.cd, color=color,colors=Colors, + counter=counter,counters=Counters, environment content=environment content, environment=environment,environments=Environments, - key=key,keys=Keys, index=Index, + key=key,keys=Keys, + length=length,lengths=Lengths, new=New, pageshort={P.}, updated=Updated, @@ -193,6 +204,11 @@ \iftcb@doc@colorize\textcolor{#2}{\tcb@scantokens{#1}}\else\tcb@scantokens{#1}\fi% } +\def\tcb@Index@Print@ComCA#1#2#3{% + \iftcb@doc@colorize\textcolor{#2}{\tcb@cs{#1}}\else\tcb@cs{#1}\fi% + \iftcb@doc@annotate\ #3\fi% +} + \def\tcb@Index@Print@ComC#1#2{% \iftcb@doc@colorize\textcolor{#2}{\tcb@cs{#1}}\else\tcb@cs{#1}\fi% } @@ -216,12 +232,22 @@ \newrobustcmd{\tcbIndexPrintColC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@color}} \def\tcb@Print@Col#1{\textcolor{\kvtcb@col@color}{\bfseries\tcb@scantokens{#1}}} -\def\tcb@index@Com#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintComC{#1}}\fi} -\def\tcb@index@Env#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintEnvCA{#1}}\index{\kvtcb@text@envs\idx@level#1\idx@actual\tcbIndexPrintEnvC{#1}}\fi} -\def\tcb@index@Key#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintKeyCA{#1}}\index{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{#1}}\fi}% -\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\index{#2\idx@actual\tcbIndexPrintKeyCA{#2}}\index{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{/#1/}\idx@level#2\idx@actual\tcbIndexPrintKeyC{#2}}\fi}% -\def\tcb@index@Val#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintValCA{#1}}\index{\kvtcb@text@values\idx@level#1\idx@actual\tcbIndexPrintValC{#1}}\fi} -\def\tcb@index@Col#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintColCA{#1}}\index{\kvtcb@text@colors\idx@level#1\idx@actual\tcbIndexPrintColC{#1}}\fi} +\newrobustcmd{\tcbIndexPrintCountCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@counter}{\kvtcb@text@counter}} +\newrobustcmd{\tcbIndexPrintCountC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@counter}} +\def\tcb@Print@Count#1{\textcolor{\kvtcb@col@counter}{\bfseries\tcb@scantokens{#1}}} + +\newrobustcmd{\tcbIndexPrintLenCA}[1]{\tcb@Index@Print@ComCA{#1}{\kvtcb@col@length}{\kvtcb@text@length}} +\newrobustcmd{\tcbIndexPrintLenC}[1]{\tcb@Index@Print@ComC{#1}{\kvtcb@col@length}} +\def\tcb@Print@Len#1{\textcolor{\kvtcb@col@length}{\bfseries\tcb@cs{#1}}} + +\def\tcb@index@Com#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintComC{#1}}\fi} +\def\tcb@index@Env#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintEnvCA{#1}}\kvtcb@index@command{\kvtcb@text@envs\idx@level#1\idx@actual\tcbIndexPrintEnvC{#1}}\fi} +\def\tcb@index@Key#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintKeyCA{#1}}\kvtcb@index@command{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{#1}}\fi}% +\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\kvtcb@index@command{#2\idx@actual\tcbIndexPrintKeyCA{#2}}\kvtcb@index@command{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{/#1/}\idx@level#2\idx@actual\tcbIndexPrintKeyC{#2}}\fi}% +\def\tcb@index@Val#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintValCA{#1}}\kvtcb@index@command{\kvtcb@text@values\idx@level#1\idx@actual\tcbIndexPrintValC{#1}}\fi} +\def\tcb@index@Col#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintColCA{#1}}\kvtcb@index@command{\kvtcb@text@colors\idx@level#1\idx@actual\tcbIndexPrintColC{#1}}\fi} +\def\tcb@index@Count#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintCountCA{#1}}\kvtcb@index@command{\kvtcb@text@counters\idx@level#1\idx@actual\tcbIndexPrintCountC{#1}}\fi} +\def\tcb@index@Len#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintLenCA{#1}}\kvtcb@index@command{\kvtcb@text@lengths\idx@level#1\idx@actual\tcbIndexPrintLenC{#1}}\fi} \def\brackets#1{{\ttfamily\char`\{}#1{\ttfamily\char`\}}} @@ -319,6 +345,16 @@ \IfBooleanTF{#1}{}{\tcb@index@Col{#2}}% } +\DeclareDocumentCommand\docCounter{sm}{% + \tcb@Print@Count{#2}% + \IfBooleanTF{#1}{}{\tcb@index@Count{#2}}% +} + +\DeclareDocumentCommand\docLength{sm}{% + \tcb@Print@Len{#2}% + \IfBooleanTF{#1}{}{\tcb@index@Len{#2}}% +} + \DeclareDocumentCommand\docValue{sm}{% \tcb@Print@Val{#2}% \IfBooleanTF{#1}{}{\tcb@index@Val{#2}}% @@ -401,6 +437,7 @@ \tcbset{% reset@documentation/.style={% + index command=\index,% index format=pgf, english language, documentation listing style=tcbdocumentation, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 538600dbd0a..e1476cc29fe 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -224,21 +224,18 @@ } \def\tcb@fit@@box{% - \tcbdimto\tcb@fit@@line{\kvtcb@fit@skip\tcbfitdim}% - \tcbdimto\tcb@w@upper{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}% - \tcb@fit@@boxsave{\tcb@w@upper}% - \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% - \tcbdimto\tcb@fit@@target{\kvtcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand-\kvtcb@top-\kvtcb@bottom-\kvtcb@boxsep*2-\tcb@h@titletotal}% -}% - -\def\tcb@fit@@box@titled{% - \tcb@set@@dim@and@title% \iftcb@hasTitle% - \tcbdimto\tcb@h@titletotal{\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle}% + \tcbdimto\tcb@w@title{\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)}% + \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% + \tcbdimto\tcb@h@titletotal{\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+(\kvtcb@boxsep)*2+\kvtcb@toptitle+\kvtcb@bottomtitle}% \else% \let\tcb@h@titletotal=\tcb@zpt% \fi% - \tcb@fit@@box% + \tcbdimto\tcb@fit@@line{\kvtcb@fit@skip\tcbfitdim}% + \tcbdimto\tcb@w@upper{\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@leftupper)-(\kvtcb@rightupper)}% + \tcb@fit@@boxsave{\tcb@w@upper}% + \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% + \tcbdimto\tcb@fit@@target{\kvtcb@height@fixed-(\kvtcb@top@rule@stand)-(\kvtcb@bottom@rule@stand)-(\kvtcb@top)-(\kvtcb@bottom)-(\kvtcb@boxsep)*2-\tcb@h@titletotal}% }% \long\def\tcbox@inner@fitbox#1{% @@ -262,7 +259,9 @@ \advance\count@ 1\relax% }% % - \tcb@fit@@box@titled% + \tcb@set@@phantom% + \tcb@set@@title% + \tcb@fit@@box% % % height fit \ifdim\kvtcb@height@fixed@plus>0pt\relax% @@ -282,17 +281,17 @@ \ifdim\kvtcb@fit@plus@width>0pt\relax% \ifnum\count@<\kvtcb@fit@maxstep\relax% \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% - \tcb@lowerfitdim\kvtcb@width% + \tcb@lowerfitdim\dimexpr\kvtcb@width\relax% \tcb@upperfitdim\dimexpr\kvtcb@width+\kvtcb@fit@plus@width\relax% \tcbdimto\kvtcb@width{\tcb@upperfitdim}% - \tcb@fit@@box@titled% + \tcb@fit@@box% \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% \else% \ifnum\count@<\kvtcb@fit@maxstep\relax% \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}% \tcbdimto\kvtcb@width{(\tcb@lowerfitdim+\tcb@upperfitdim)/2}% \loop% - \tcb@fit@@box@titled% + \tcb@fit@@box% \tcb@continuetrue% \ifnum\count@<\kvtcb@fit@maxstep\relax% \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxwidthdiff\relax% @@ -309,17 +308,17 @@ \fi% \iftcb@continue% \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% - \tcb@lowerfitdim\kvtcb@width% + \tcb@lowerfitdim\dimexpr\kvtcb@width\relax% \tcbdimto\kvtcb@width{(\tcb@lowerfitdim+\tcb@upperfitdim)/2}% \else% - \tcb@upperfitdim\kvtcb@width% + \tcb@upperfitdim\dimexpr\kvtcb@width\relax% \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}% \tcbdimto\kvtcb@width{(\tcb@lowerfitdim+\tcb@upperfitdim)/2}% \fi% \else% \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% \tcbdimto\kvtcb@width{\tcb@upperfitdim}% - \tcb@fit@@box@titled% + \tcb@fit@@box% \fi% \fi% \iftcb@continue \repeat% @@ -350,6 +349,7 @@ \fi% % \edef\tcbfitsteps{\the\count@}% + \tcb@set@@dimensions% \tcb@draw@color@box% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 1bf90b5b9cc..4f7b4241c28 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \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 0e18b6bf493..f5b766a1857 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \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 101e5a29fb3..afc815f7052 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \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 1bec4c8e5c1..260f3ea0798 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index cb14df6edab..22c9c8afee4 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \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 b49a87afb6b..4672742f3e8 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -48,6 +48,9 @@ raster column skip/.store in=\kvtcb@raster@xskip, raster row skip/.store in=\kvtcb@raster@yskip, % + raster equal skip/.style={raster before skip=#1,raster after skip=#1, + raster column skip=#1,raster row skip=#1}, + % raster@halign/.store in=\kvtcb@raster@halign, raster halign/.is choice, raster halign/center/.style={raster@halign=\centering}, @@ -75,9 +78,8 @@ \tcbset{ raster reset/.style={ raster width=\linewidth,raster height=0pt, - raster before skip=2mm, raster after skip=2mm, + raster equal skip=2mm, raster columns=2,raster rows=2, - raster column skip=2mm,raster row skip=2mm, raster left skip=0pt,raster right skip=0pt, raster halign=left,raster valign=center, raster equal height=none, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index ff9cff075e8..311de930cd8 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \RequirePackage{tikz}[2010/10/13] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 40c7e0e9ff7..459b73a63cf 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 3.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \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 0ff43c63443..5f1eb1793c5 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \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 6aa5d0a7f52..82d0a53d48d 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% 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.35} +\tcb@set@library@version{3.36} \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 47d4d14f8ed..9951d150ca5 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.35 (2015/01/07) +%% The LaTeX package tcolorbox - version 3.36 (2015/01/09) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2015/01/07 version 3.35 text color boxes] -\def\tcb@version{3.35} +\ProvidesPackage{tcolorbox}[2015/01/09 version 3.36 text color boxes] +\def\tcb@version{3.36} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -77,7 +77,7 @@ } \def\tcb@comp@arc@fix{% - \let\tcb@outer@arc=\kvtcb@outerarc% + \tcbdimto\tcb@outer@arc{\kvtcb@outerarc}% } \def\tcb@use@auto@parskip{% @@ -160,7 +160,7 @@ attach title to upper/.style={detach title,before upper={\tcbtitle#1}}, attach title to upper/.default=, subtitle style/.store in=\kvtcb@subtitle@style,% - width/.dimstore in=\kvtcb@width, + width/.store in=\kvtcb@width, text width/.style={width={#1+\kvtcb@left@rule+\kvtcb@right@rule+\kvtcb@boxsep*2+\kvtcb@leftupper+\kvtcb@rightupper}},% add to width/.code={\tcbdimto\kvtcb@width{\kvtcb@width+(#1)}},% boxsep/.store in=\kvtcb@boxsep, @@ -184,7 +184,7 @@ \let\kvtcb@right@rule=\kvtcb@top@rule@stand% \let\kvtcb@title@rule=\kvtcb@top@rule@stand% }, - arc/.dimstore in=\kvtcb@arc, + arc/.store in=\kvtcb@arc, outer arc/.code={\def\kvtcb@outerarc{#1}\let\tcb@comp@arc=\tcb@comp@arc@fix}, auto outer arc/.code={\let\tcb@comp@arc=\tcb@comp@arc@auto}, sharpish corners/.style={arc=0pt,outer arc=0pt}, @@ -496,6 +496,7 @@ on line/.style={tcbox raise base,nobeforeafter}, shape@of@skin/.store in=\tcb@shapeofskin, ignore nobreak/.is if=tcb@ignorenobreak,% + only/.code args={<#1>#2}{\only<#1>{\tcbset{#2}}},% } \def\kvtcb@beforebox{} @@ -570,28 +571,58 @@ \long\def\tcb@colorbox{% \@ifnextchar[{\tcb@@icolorbox}{\tcb@@icolorbox[]}} -\def\tcb@set@@dim@and@title{% - % computation of text width - \tcbdimto\tcb@width{\kvtcb@width}% - \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}% + +\def\tcb@set@@phantom{% \ifx\kvtcb@phantom\@empty\tcb@hasPhantomfalse\else% \tcb@hasPhantomtrue% \sbox\tcb@phantombox{\kvtcb@phantom}% \fi% +} + +\def\tcb@set@@title{% \ifx\kvtcb@title\@empty\tcb@hasTitlefalse\tcb@specialtitle@hook\else% \tcb@hasTitletrue% - \tcbdimto\tcb@w@title{\tcb@temp-\kvtcb@lefttitle-\kvtcb@righttitle}% + \tcbdimto\tcb@w@title{\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)}% \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% \fi% } +\def\tcb@set@@dimensions{% + % sanitize + \tcbdimto\kvtcb@arc{\kvtcb@arc}% + \tcbdimto\kvtcb@left@rule{\kvtcb@left@rule}% + \tcbdimto\kvtcb@right@rule{\kvtcb@right@rule}% + \tcbdimto\kvtcb@title@rule{\kvtcb@title@rule}% + \tcbdimto\kvtcb@top@rule@stand{\kvtcb@top@rule@stand}% + \tcbdimto\kvtcb@top@rule@break{\kvtcb@top@rule@break}% + \tcbdimto\kvtcb@bottom@rule@stand{\kvtcb@bottom@rule@stand}% + \tcbdimto\kvtcb@bottom@rule@break{\kvtcb@bottom@rule@break}% + \tcbdimto\kvtcb@boxsep{\kvtcb@boxsep}% + \tcbdimto\kvtcb@lefttitle{\kvtcb@lefttitle}% + \tcbdimto\kvtcb@leftupper{\kvtcb@leftupper}% + \tcbdimto\kvtcb@leftlower{\kvtcb@leftlower}% + \tcbdimto\kvtcb@righttitle{\kvtcb@righttitle}% + \tcbdimto\kvtcb@rightupper{\kvtcb@rightupper}% + \tcbdimto\kvtcb@rightlower{\kvtcb@rightlower}% + \tcbdimto\kvtcb@top{\kvtcb@top}% + \tcbdimto\kvtcb@toptitle{\kvtcb@toptitle}% + \tcbdimto\kvtcb@bottom{\kvtcb@bottom}% + \tcbdimto\kvtcb@bottomtitle{\kvtcb@bottomtitle}% + \tcbdimto\kvtcb@middle{\kvtcb@middle}% + % computation of text width + \tcbdimto\tcb@width{\kvtcb@width}% + \tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}% + %\tcbdimto\tcb@temp{\tcb@innerwidth-\kvtcb@boxsep*2}% + \tcbdimto\tcb@w@upper{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}% + %\tcbdimto\tcb@w@upper{\tcb@temp-\kvtcb@leftupper-\kvtcb@rightupper}% +} + \def\tcb@set@@sidebyside{% \iftcb@sidebyside% \tcbset{breakable@false}% \def\tcb@minipage{\csname tcb@minipage@\kvtcb@sbs@align\endcsname}% \tcbdimto\tcb@w@upper@real{\tcb@w@upper}% + \tcbdimto\kvtcb@sbs@gap{\kvtcb@sbs@gap}% \tcbdimto\tcb@w@sbs{\tcb@w@upper@real-\kvtcb@sbs@gap}% \tcb@sbs@quota% \fi% @@ -606,7 +637,7 @@ \end{tcb@savebox}% \letcs{\current@color}{\string\color@tcbcol@lower}% \unless\iftcb@sidebyside% - \tcbdimto\tcb@w@lower{\tcb@temp-\kvtcb@leftlower-\kvtcb@rightlower}% + \tcbdimto\tcb@w@lower{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@leftlower-\kvtcb@rightlower}% \fi% \tcb@hasLowertrue% \let\tcb@after@box=\kvtcb@after@lower% @@ -627,7 +658,9 @@ \def\tcb@@capture@minipage{% \let\tcb@val@raisebase=\tcb@zpt% - \tcb@set@@dim@and@title% + \tcb@set@@phantom% + \tcb@set@@title% + \tcb@set@@dimensions% \tcb@set@@sidebyside% \tcb@set@@upper@and@lower% } @@ -1231,22 +1264,26 @@ \long\def\tcbox@inner@hbox#1{% \tcbset{breakable@false,sidebyside=false}% + \tcb@set@@phantom% \sbox\tcb@upperbox{\color{tcbcol@upper}\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}% + \tcbdimto\tcb@val@raisebase{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}% + \tcbdimto\kvtcb@width{\wd\tcb@upperbox+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}% \tcb@hasLowerfalse% - \tcb@set@@dim@and@title% + \tcb@set@@title% + \tcb@set@@dimensions% \tcb@draw@color@box% } \long\def\tcbox@inner@minipage#1{% \tcbset{breakable@false,sidebyside=false}% \let\tcb@val@raisebase=\tcb@zpt% - \tcb@set@@dim@and@title% + \tcb@set@@phantom% + \tcb@set@@title% + \tcb@set@@dimensions% \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{tcbcol@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}% - \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}% - \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}% + %\tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}% + %\tcbdimto\kvtcb@width{\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}% + %\let\tcb@width\kvtcb@width% \tcb@hasLowerfalse% \tcb@draw@color@box% } |