diff options
author | Karl Berry <karl@freefriends.org> | 2014-05-18 21:50:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-05-18 21:50:35 +0000 |
commit | ac10a340d089015d4cd7cdb72910245f40a214ae (patch) | |
tree | 7f9990215f859ec09c6417ec427b408bd4b07bf2 /Master/texmf-dist/tex/latex | |
parent | 8fd402b27e75f8bf30f914730e0862dad082bc3c (diff) |
tcolorbox (18may14)
git-svn-id: svn://tug.org/texlive/trunk@34108 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
13 files changed, 50 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 03c6211b44d..22b7f4d7993 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \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 69ddf5f293a..1d1f1397f33 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \tcbuselibrary{listings,skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 4a34cd89ee9..18c04aaaf84 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 746940c0211..d0ebfb12c9c 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% @@ -76,6 +76,7 @@ underlay first pre/.code={\preto\tcb@underlay@first{#1}},% underlay middle pre/.code={\preto\tcb@underlay@middle{#1}},% underlay last pre/.code={\preto\tcb@underlay@last{#1}},% + underlay boxed title pre/.code={\preto\tcb@underlay@boxedtitle{#1}},% underlay pre/.style={underlay unbroken pre={#1},underlay first pre={#1},underlay middle pre={#1},underlay last pre={#1}},% underlay broken pre/.style={underlay first pre={#1},underlay middle pre={#1},underlay last pre={#1}},% underlay unbroken and first pre/.style={underlay unbroken pre={#1},underlay first pre={#1}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index 714bbb14bbd..061c3d7a2b0 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \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 e6a7e160943..63713ac5477 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% \def\tcbuselistingcomment{\kvtcb@listingcomment}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 6279c08f0a5..3b3d2ca715f 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \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 e9e66b89374..6a2af63f945 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 3bde9abe614..8b540e35bbe 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \RequirePackage{tikz}[2010/10/13] @@ -26,7 +26,7 @@ \tcb@tikzpicture@begin\tcb@tikz@begin@hook}{\tcb@tikz@end@hook\endtikzpicture} \def\tcb@creategeonodes@true{% - \begin{scope}[every node/.style={line width=0mm,inner sep=0mm,draw=none,fill=none,rectangle}] + \begin{scope}[every node/.style={line width=0mm,inner sep=0mm,outer sep=0mm,draw=none,fill=none,rectangle}] \node[name=frame,at={(0,0)},above right,minimum width=\tcb@width,minimum height=\tcb@height]{}; \node[name=interior,at={({\kvtcb@left@rule},{\kvtcb@bottom@rule})},above right,minimum width=\tcb@innerwidth,minimum height=\tcb@innerheight]{}; \ifnum\tcb@segment@state=1% @@ -40,6 +40,7 @@ \node[name=title,at={({\kvtcb@left@rule},{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight+\kvtcb@title@rule\relax})},above right, minimum width=\tcb@innerwidth,minimum height=\the\dimexpr\tcb@h@title+\kvtcb@toptitle+\kvtcb@bottomtitle+\kvtcb@boxsep*2\relax]{}; \fi% + \tcb@specialgeonodes@hook% \end{scope}% } @@ -881,6 +882,7 @@ underlay first/.code={\appto\tcb@underlay@first{#1}},% underlay middle/.code={\appto\tcb@underlay@middle{#1}},% underlay last/.code={\appto\tcb@underlay@last{#1}},% + underlay boxed title/.code={\appto\tcb@underlay@boxedtitle{#1}},% underlay/.style={underlay unbroken={#1},underlay first={#1},underlay middle={#1},underlay last={#1}},% underlay broken/.style={underlay first={#1},underlay middle={#1},underlay last={#1}},% underlay unbroken and first/.style={underlay unbroken={#1},underlay first={#1}},% @@ -890,7 +892,8 @@ no underlay first/.code={\let\tcb@underlay@first\@empty},% no underlay middle/.code={\let\tcb@underlay@middle\@empty},% no underlay last/.code={\let\tcb@underlay@last\@empty},% - no underlay/.style={no underlay unbroken,no underlay first,no underlay middle,no underlay last},% + no underlay boxed title/.code={\let\tcb@underlay@boxedtitle\@empty},% + no underlay/.style={no underlay unbroken,no underlay first,no underlay middle,no underlay last,no underlay boxed title},% finish unbroken/.code={\appto\tcb@finish@unbroken{#1}},% finish first/.code={\appto\tcb@finish@first{#1}},% finish middle/.code={\appto\tcb@finish@middle{#1}},% @@ -965,8 +968,16 @@ \tcbdimto\tcboxedtitleheight{\ht\tcb@titlebox+\dp\tcb@titlebox}% \tcbdimto\tcboxedtitlewidth{\wd\tcb@titlebox}% \tcbset{boxtitle/.cd,xshift=0pt,yshift=0pt,yshifttext=0pt,yshift*@#2,#1,adapt@#2}% - \preto\tcb@underlay@unbroken{\node[inner sep=0pt,outer sep=0pt,#4,name=title] at ([xshift=\kvtcb@xshift@boxedtitle,yshift=\kvtcb@yshift@boxedtitle]frame.#5) {\box\tcb@titlebox};}% - \cspreto{tcb@underlay@#3}{\node[inner sep=0pt,outer sep=0pt,#4,name=title] at ([xshift=\kvtcb@xshift@boxedtitle,yshift=\kvtcb@yshift@boxedtitle]frame.#5) {\box\tcb@titlebox};}% + \let\tcb@specialgeonodes@first\relax% + \let\tcb@specialgeonodes@middle\relax% + \let\tcb@specialgeonodes@last\relax% + \def\tcb@specialgeonodes@unbroken{% + \node[#4,name=title,at={([xshift=\kvtcb@xshift@boxedtitle,yshift=\kvtcb@yshift@boxedtitle]frame.#5)}, + minimum width=\tcboxedtitlewidth,minimum height=\tcboxedtitleheight]{};}% + \cslet{tcb@specialgeonodes@#3}{\tcb@specialgeonodes@unbroken}% + \def\tcb@specialgeonodes@hook{\csname tcb@specialgeonodes@\tcb@split@state\endcsname}% + \preto\tcb@underlay@unbroken{\tcb@underlay@boxedtitle\pgftext[at={\pgfpointanchor{title}{center}}]{\box\tcb@titlebox}}% + \cspreto{tcb@underlay@#3}{\tcb@underlay@boxedtitle\pgftext[at={\pgfpointanchor{title}{center}}]{\box\tcb@titlebox}}% \fi}}% }, attach@title@boxed@top/.style n args={3}{attach@title@boxed={#1}{top}{first}{#2}{#3}},% @@ -1452,7 +1463,7 @@ watermark zoom=0.75,clip watermark,% clip title=false,clip upper=false,clip lower=false,% no borderline,no shadow,no underlay,no finish,tikz reset,at begin tikz reset,at end tikz reset,% - boxed title style=,hbox boxed title,% + boxed title style=,hbox boxed title,code={\let\tcb@specialgeonodes@hook\relax}% }, initialize@reset=reset@skins, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 57580f4aeac..b118a4f6b6f 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \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 e224c51484f..0ffad0ef838 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \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 6641cb9c9b9..d9ed7cac2fc 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% 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.03} +\tcb@set@library@version{3.04} \RequirePackage{xparse}[2013/12/31] @@ -31,7 +31,7 @@ %-- tcolorbox -- \long\def\tcb@New@TColorBox#1#2#3{% - \tcb@newenvironment{#1}{#2}{\tcolorbox[#3,options@for=#1]}{\endtabularx\endtcolorbox}} + \tcb@newenvironment{#1}{#2}{\tcolorbox[#3,options@for=#1]}{\endtcolorbox}} \def\DeclareTColorBox{% \let\tcb@newenvironment\DeclareDocumentEnvironment% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index be86f18374d..9c19069ab56 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.03 (2014/05/16) +%% The LaTeX package tcolorbox - version 3.04 (2014/05/18) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/05/16 version 3.03 text color boxes] -\def\tcb@version{3.03} +\ProvidesPackage{tcolorbox}[2014/05/18 version 3.04 text color boxes] +\def\tcb@version{3.04} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -342,7 +342,7 @@ toptitle=1mm,bottomtitle=1mm,boxrule=0.5mm, before upper={\arrayrulecolor{\kvtcb@colframe}\def\arraystretch{1.1}#1% \tcb@hack@currenvir\tabularx{\linewidth}{#2}}, - after upper=\arrayrulecolor{black}}, + after upper=\endtabularx\arrayrulecolor{black}}, tabularx/.style={tabularx*={}{#1}}, tikz upper/.style={before upper=\centering\tcb@shield@externalize\begin{tikzpicture}[#1],after upper=\end{tikzpicture}},% tikz lower/.style={before lower=\centering\tcb@shield@externalize\begin{tikzpicture}[#1],after lower=\end{tikzpicture}},% @@ -647,9 +647,8 @@ \let\tcolorbox\tcb@colorbox -\let\endtabularx\relax \def\tcb@endboxanddraw{% - \endtabularx\unskip\tcb@after@box% + \unskip\tcb@after@box% \end{tcb@savebox}% \tcb@draw@color@box% \tcb@finalize@environment% @@ -1208,11 +1207,11 @@ \tcb@process@newtcolorbox{#2}{#1}% } -\long\def\tcb@newtcolorbox#1#2{\tcb@newenvironment{#1}{\tcolorbox[#2,options@for=#1]}{\endtabularx\endtcolorbox}} +\long\def\tcb@newtcolorbox#1#2{\tcb@newenvironment{#1}{\tcolorbox[#2,options@for=#1]}{\endtcolorbox}} -\long\def\tcb@newtcolorbox@#1[#2]#3{\tcb@newenvironment{#1}[#2]{\tcolorbox[#3,options@for=#1]}{\endtabularx\endtcolorbox}} +\long\def\tcb@newtcolorbox@#1[#2]#3{\tcb@newenvironment{#1}[#2]{\tcolorbox[#3,options@for=#1]}{\endtcolorbox}} -\long\def\tcb@newtcolorbox@@#1[#2][#3]#4{\tcb@newenvironment{#1}[#2][#3]{\tcolorbox[#4,options@for=#1]}{\endtabularx\endtcolorbox}} +\long\def\tcb@newtcolorbox@@#1[#2][#3]#4{\tcb@newenvironment{#1}[#2][#3]{\tcolorbox[#4,options@for=#1]}{\endtcolorbox}} \long\def\tcb@new@tcolorbox@#1[#2]{% \@ifnextchar[{\tcb@newtcolorbox@@{#1}[#2]}{\tcb@newtcolorbox@{#1}[#2]}} |