From 96ae66c3ffba17421aa8dafe928f185b0b23e372 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 13 May 2014 22:09:49 +0000 Subject: tcolorbox (13may14) git-svn-id: svn://tug.org/texlive/trunk@34012 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tcolorbox/CHANGES | 9 +++++- Master/texmf-dist/doc/latex/tcolorbox/README | 2 +- .../doc/latex/tcolorbox/tcolorbox-example.pdf | Bin 361320 -> 361325 bytes .../doc/latex/tcolorbox/tcolorbox-example.tex | 2 +- .../latex/tcolorbox/tcolorbox.doc.coreoptions.tex | 36 +++++++++++---------- .../doc/latex/tcolorbox/tcolorbox.doc.skins.tex | 1 - .../latex/tcolorbox/tcolorbox.doc.technical.tex | 5 +++ .../texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf | Bin 4268812 -> 4270302 bytes .../texmf-dist/doc/latex/tcolorbox/tcolorbox.tex | 10 +++--- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 6 ++-- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbfitting.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbhooks.code.tex | 4 +-- .../tex/latex/tcolorbox/tcblistings.code.tex | 4 +-- .../tex/latex/tcolorbox/tcblistingscore.code.tex | 4 +-- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbminted.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbskins.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbxparse.code.tex | 6 ++-- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 17 +++++----- 22 files changed, 75 insertions(+), 59 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index af5d9d6bc49..b1e00580a22 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm @@ -517,3 +517,10 @@ version 3.00 (2014/05/08) * new options: 'description color', 'description font', 'description formatter' +version 3.01 (2014/05/13) +- bug fix: 'parbox=false' plus 'breakable' had an unwanted indent +- compatibility fix for tabularx 2014/04/22 v2.09 + +version 3.02 (2014/05/13) +- compatibility fix for tabularx 2014/04/22 v2.09 (again) + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 992e29b2d02..d4822960d37 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf index 02a0b4d8d19..623c460445b 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index b1ed837ee2c..bc32e551201 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex index 751b79b6f23..c57f8fc7925 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -1415,6 +1415,11 @@ This is the lower part. \clearpage +\begin{marker} +If \refKey{/tcb/tabularx} or \refKey{/tcb/tabularx*} are used, one cannot +have a lower part. +\end{marker} + \begin{docTcbKey}{tabularx}{=\meta{preamble}}{style} This style sets \refKey{/tcb/before upper} and \refKey{/tcb/after upper} and several geometry keys to support a |tabularx| with the @@ -1698,32 +1703,29 @@ are drawn by the codes given with \par\bigskip }} % Preamble: -%\usepackage{tikz,lipsum,calc} +%\usepackage{tikz,lipsum} %\tcbuselibrary{skins,breakable} %\newcounter{example} -%\newlength{\examlen} \colorlet{colexam}{red!75!black} \newtcolorbox[use counter=example]{myexample}{% - phantom={\settowidth{\global\examlen}{\Large\bfseries Example \thetcbcounter}},% - title={Example \thetcbcounter}, + empty,title={Example \thetcbcounter},attach boxed title to top left, + boxed title style={empty,size=minimal,toprule=2pt,top=4pt, + overlay={\draw[colexam,line width=2pt] + ([yshift=-1pt]frame.north west)--([yshift=-1pt]frame.north east);}}, coltitle=colexam,fonttitle=\Large\bfseries, - enhanced,breakable,before=\par\medskip,parbox=false, - frame hidden,interior hidden,segmentation hidden, - boxsep=0pt,left=0pt,right=3mm,toptitle=2mm,pad at break=0mm, - overlay unbroken={\draw[colexam,line width=1pt] (frame.north west) - --([xshift=-0.5pt]frame.north east)--([xshift=-0.5pt]frame.south east) - --(frame.south west); - \draw[colexam,line width=2pt] ([yshift=0.5pt]frame.north west) - -- +(\examlen,0pt);}, - overlay first={\draw[colexam,line width=1pt] (frame.north west) - --([xshift=-0.5pt]frame.north east)--([xshift=-0.5pt]frame.south east); - \draw[red!75!black,line width=2pt] ([yshift=0.5pt]frame.north west) - -- +(\examlen,0pt);}, + before=\par\medskip\noindent,parbox=false,boxsep=0pt,left=0pt,right=3mm,top=4pt, + breakable,pad at break=0mm, + overlay unbroken={\draw[colexam,line width=1pt] + ([yshift=-1pt]title.north east)--([xshift=-0.5pt,yshift=-1pt]title.north-|frame.east) + --([xshift=-0.5pt]frame.south east)--(frame.south west); }, + overlay first={\draw[colexam,line width=1pt] + ([yshift=-1pt]title.north east)--([xshift=-0.5pt,yshift=-1pt]title.north-|frame.east) + --([xshift=-0.5pt]frame.south east); }, overlay middle={\draw[colexam,line width=1pt] ([xshift=-0.5pt]frame.north east) --([xshift=-0.5pt]frame.south east); }, overlay last={\draw[colexam,line width=1pt] ([xshift=-0.5pt]frame.north east) - --([xshift=-0.5pt]frame.south east)--(frame.south west);}% + --([xshift=-0.5pt]frame.south east)--(frame.south west);},% } \begin{myexample} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex index b92c20b75bf..4d365bfeaed 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -3853,7 +3853,6 @@ are drawn by the codes given by \clearpage -\tcbinterruptdraftmode \subsection{Skin 'draft'}\label{subsec:draft} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex index b1bceb2a13c..8c84ce2318f 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex @@ -266,6 +266,7 @@ This is the lower part. \begin{docTcbKey}{frame empty}{}{style, no value} This is a shortcut for setting \refKey{/tcb/frame code} to empty. This option removes the drawing of the frame. + Alternatively, use \refKey{/tcb/frame hidden}. \end{docTcbKey} @@ -293,6 +294,7 @@ This is the lower part. \begin{docTcbKey}{interior titled empty}{}{style, no value} This is a shortcut for setting \refKey{/tcb/interior titled code} to empty. This option removes the drawing of the untitled interior. + Alternatively, use \refKey{/tcb/interior hidden}. \end{docTcbKey} @@ -321,6 +323,7 @@ This is the lower part. \begin{docTcbKey}{interior empty}{}{style, no value} This is a shortcut for setting \refKey{/tcb/interior code} to empty. This option removes the drawing of the interior. + Alternatively, use \refKey{/tcb/interior hidden}. \end{docTcbKey} @@ -345,6 +348,7 @@ This is the lower part. \begin{docTcbKey}{segmentation empty}{}{style, no value} This is a shortcut for setting \refKey{/tcb/segmentation code} to empty. This option removes the drawing of the segmentation line. + Alternatively, use \refKey{/tcb/segmentation hidden}. \end{docTcbKey} @@ -374,6 +378,7 @@ This is the lower part. \begin{docTcbKey}{title empty}{}{style, no value} This is a shortcut for setting \refKey{/tcb/title code} to empty. This option removes the drawing of the title area. + Alternatively, use \refKey{/tcb/title hidden}. \end{docTcbKey} \clearpage diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf index c88e5349385..12c8d69a627 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf differ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index 78e00a4e6fe..316962ee96f 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 3.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -100,8 +100,8 @@ \newtcolorbox{marker}[1][]{marker,#1} -\def\version{3.00}% -\def\datum{2014/05/08}% +\def\version{3.02}% +\def\datum{2014/05/13}% \makeindex \hypersetup{ @@ -300,8 +300,10 @@ \end{tcbverbatimwrite} \input{\jobname_preamble_J.tex} + %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.coremacros} +%\includeonly{tcolorbox.doc.coreoptions} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 921add99e7d..95852121c9d 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,10 +17,10 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.00} +\tcb@set@library@version{3.02} \let\tcb@parboxrestore@true=\tcb@parboxrestore -\def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize} +\def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} \def\tcb@vbox#1#2{% \edef\reserved@a{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 4c51dae1732..174b35f8ab7 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 2c7f30a9141..6970e2aea11 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 848c6a46a72..cb678536669 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 6104beb190e..f07bf5511de 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 c375c6d13ac..1e5dd8beaae 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 c0055ebee35..4bac8d91ac9 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 039a36bc4e8..29294c85d78 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 b4d63e464f1..ace422589a1 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 ce0396ab2ce..1d2b0ccf6bd 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 8247ab0e25b..b2d655804e4 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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 5797773f9de..f2fbbb5dd4f 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% 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.00} +\tcb@set@library@version{3.02} \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]}{\endtcolorbox}} + \tcb@newenvironment{#1}{#2}{\tcolorbox[#3,options@for=#1]}{\endtabularx\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 45551823a69..0d26e155c6d 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.00 (2014/05/08) +%% The LaTeX package tcolorbox - version 3.02 (2014/05/13) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/05/08 version 3.00 text color boxes] -\def\tcb@version{3.00} +\ProvidesPackage{tcolorbox}[2014/05/13 version 3.02 text color boxes] +\def\tcb@version{3.02} \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=\endtabularx\arrayrulecolor{black}}, + after upper=\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,8 +647,9 @@ \let\tcolorbox\tcb@colorbox +\let\endtabularx\relax \def\tcb@endboxanddraw{% - \unskip\tcb@after@box% + \endtabularx\unskip\tcb@after@box% \end{tcb@savebox}% \tcb@draw@color@box% \tcb@finalize@environment% @@ -1207,11 +1208,11 @@ \tcb@process@newtcolorbox{#2}{#1}% } -\long\def\tcb@newtcolorbox#1#2{\tcb@newenvironment{#1}{\tcolorbox[#2,options@for=#1]}{\endtcolorbox}} +\long\def\tcb@newtcolorbox#1#2{\tcb@newenvironment{#1}{\tcolorbox[#2,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{\tcb@newenvironment{#1}[#2]{\tcolorbox[#3,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@newtcolorbox@@#1[#2][#3]#4{\tcb@newenvironment{#1}[#2][#3]{\tcolorbox[#4,options@for=#1]}{\endtabularx\endtcolorbox}} \long\def\tcb@new@tcolorbox@#1[#2]{% \@ifnextchar[{\tcb@newtcolorbox@@{#1}[#2]}{\tcb@newtcolorbox@{#1}[#2]}} -- cgit v1.2.3