summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-18 21:50:35 +0000
committerKarl Berry <karl@freefriends.org>2014-05-18 21:50:35 +0000
commitac10a340d089015d4cd7cdb72910245f40a214ae (patch)
tree7f9990215f859ec09c6417ec427b408bd4b07bf2
parent8fd402b27e75f8bf30f914730e0862dad082bc3c (diff)
tcolorbox (18may14)
git-svn-id: svn://tug.org/texlive/trunk@34108 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/CHANGES9
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/README2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdfbin361325 -> 361334 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex68
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdfbin4294090 -> 4298125 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex5
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex25
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty17
21 files changed, 110 insertions, 70 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
index fe455d9a0fd..1f12bd7f91a 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.03 (2014/05/16)
+%% The LaTeX package tcolorbox - version 3.04 (2014/05/18)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -529,3 +529,10 @@ version 3.03 (2014/05/16)
- bug fix: boxed title shape 'title' was unknown in underlays
- more boxed title example documented
+version 3.04 (2014/05/18)
+- compatibility fix for tabularx removed; compatible with tabularx 2014/05/13 v2.10
+- boxed title improvements:
+ * the 'title' node is accessible now from inside 'frame code' and 'interior code'
+ * new keys 'underlay boxed title', 'no underlay boxed title', 'underlay boxed title pre'
+ * documentation example updated
+
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README
index b8b6f9e7cab..52531fedecd 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.03 (2014/05/16)
+%% The LaTeX package tcolorbox - version 3.04 (2014/05/18)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
index 5584e899437..380293fe52d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
index d543557fb3d..a1e29da8a7f 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.03 (2014/05/16)
+%% The LaTeX package tcolorbox - version 3.04 (2014/05/18)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex
index f645129006b..88d2ba4385d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex
@@ -394,6 +394,10 @@ There are no |app| type keys since underlays are stackable by default.
Prepends the given \meta{graphical code} to \refKey{/tcb/underlay last}.
\end{docTcbKey}
+\begin{docTcbKey}{underlay boxed title pre}{=\meta{graphical code}}{no default}
+ Prepends the given \meta{graphical code} to \refKey{/tcb/underlay boxed title}.
+\end{docTcbKey}
+
\begin{docTcbKey}{underlay broken pre}{=\meta{graphical code}}{no default}
Prepends the given \meta{graphical code} to \refKey{/tcb/underlay broken}.
\end{docTcbKey}
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 1afd53b3596..ac7c378897b 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
@@ -514,12 +514,21 @@ are \emph{not} automatically computed.
\end{marker}
\begin{marker}
- A \tikzname\ node |title| is produced by a boxed title. This node is accessible
- insided underlays, overlays and finishes, but \emph{not} inside
- \refKey{/tcb/frame code} or \refKey{/tcb/interior code}.
+ A \tikzname\ node |title| is produced by a boxed title which can be used
+ inside \refKey{/tcb/frame code}, \refKey{/tcb/interior code},
+ underlays, overlays, and finishes.
+\end{marker}
+
+\begin{marker}
+ A boxed title is almost always the first underlay. The only exceptions are
+ underlays defined by \refKey{/tcb/underlay boxed title} which are drawn
+ before. Additionally, underlays defined by \refKey{/tcb/underlay boxed title}
+ are only drawn, if a boxed title is actually set. They are ignored, if
+ there is no boxed title.
\end{marker}
+
\begin{docTcbKey}{boxed title style}{=\meta{options}}{style, initially empty}
By default, a boxed title is dimensioned with \refKey{/tcb/size}|=|\docValue*{title}
and inherits \refKey{/tcb/colframe} of the main box.
@@ -540,7 +549,7 @@ applicable here.
\end{tcolorbox}
\end{dispExample*}
-\enlargethispage*{2cm}
+
\begin{dispExample*}{sbs,lefthand ratio=0.66}
\begin{tcolorbox}[enhanced,title=My title,
colframe=red!50!black,colback=red!10!white,
@@ -563,8 +572,8 @@ applicable here.
fonttitle=\bfseries,coltitle=black,attach boxed title to top center=
{yshift=-0.25mm-\tcboxedtitleheight/2,yshifttext=2mm-\tcboxedtitleheight/2},
boxed title style={enhanced,boxrule=0.5mm,
- frame code={ \path[tcb fill frame] ([xshift=-4mm]frame.west) -- (frame.north west)
- -- (frame.north east) -- ([xshift=4mm]frame.east)
+ frame code={ \path[tcb fill frame] ([xshift=-4mm]frame.west)
+ -- (frame.north west) -- (frame.north east) -- ([xshift=4mm]frame.east)
-- (frame.south east) -- (frame.south west) -- cycle; },
interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
-- (interior.north west) -- (interior.north east)
@@ -577,17 +586,17 @@ applicable here.
\begin{dispExample}
% \usepackage{varwidth}
-\newtcolorbox{mybox}[2][]{enhanced,skin=enhancedlast,
+\newtcolorbox{mybox}[2][]{enhanced,skin=enhancedlast jigsaw,
attach boxed title to top left={xshift=-4mm,yshift=-0.5mm},
fonttitle=\bfseries\sffamily,varwidth boxed title=0.7\linewidth,
colbacktitle=blue!45!white,colframe=red!50!black,
interior style={top color=blue!10!white,bottom color=red!10!white},
- boxed title style={arc=0pt,outer arc=0pt,boxrule=0pt},
- underlay unbroken and first={
- \fill[blue!45!white] ([xshift=-0.1mm]title.north east) -- (title.north east)
+ boxed title style={empty,arc=0pt,outer arc=0pt,boxrule=0pt},
+ underlay boxed title={
+ \fill[blue!45!white] (title.north west) -- (title.north east)
-- +(\tcboxedtitleheight-1mm,-\tcboxedtitleheight+1mm)
-- ([xshift=4mm,yshift=0.5mm]frame.north east) -- +(0mm,-1mm)
- -- ([xshift=-0.1mm]title.south east) -- cycle;
+ -- (title.south west) -- cycle;
\fill[blue!45!white!50!black] ([yshift=-0.5mm]frame.north west)
-- +(-0.4,0) -- +(0,-0.3) -- cycle;
\fill[blue!45!white!50!black] ([yshift=-0.5mm]frame.north east)
@@ -623,25 +632,24 @@ applicable here.
\begin{dispExample}
% \usepackage{varwidth}
-\newtcolorbox{mybox}[2][]{empty,boxsep=0pt,top=0pt,
- attach boxed title to bottom center={},
- fonttitle=\bfseries\sffamily,varwidth boxed title=0.5\linewidth,
- coltitle=red!50!black,
- interior style={top color=yellow!10!white,bottom color=green!10!white},
- boxed title style={enhanced,skin=enhancedlast,boxrule=0.5mm,arc=0pt,outer arc=0pt,
- frame empty,interior style={top color=white,bottom color=red!50!white}},
- underlay unbroken and last={
- \draw[red,line width=0.5mm] ([xshift=.25mm]frame.north west)
- -- ([xshift=.25mm,yshift=0.25mm]frame.south west)
- -- ([xshift=0.25mm-\tcboxedtitleheight*2,yshift=0.25mm]title.north west)
+\newtcolorbox{mybox}[2][]{skin=enhancedlast jigsaw,interior hidden,
+ boxsep=0pt,top=0pt,colframe=red,coltitle=red!50!black,
+ fonttitle=\bfseries\sffamily,
+ attach boxed title to bottom center,
+ boxed title style={empty,boxrule=0.5mm},
+ varwidth boxed title=0.5\linewidth,
+ underlay boxed title={
+ \draw[white,line width=0.5mm]
+ ([xshift=0.3mm-\tcboxedtitleheight*2,yshift=0.3mm]title.north west)
+ --([xshift=-0.3mm+\tcboxedtitleheight*2,yshift=0.3mm]title.north east);
+ \path[draw=red,top color=white,bottom color=red!50!white,line width=0.5mm]
+ ([xshift=0.25mm-\tcboxedtitleheight*2,yshift=0.25mm]title.north west)
cos +(\tcboxedtitleheight,-\tcboxedtitleheight/2)
sin +(\tcboxedtitleheight,-\tcboxedtitleheight/2)
-- ([xshift=0.25mm,yshift=0.25mm]title.south west)
-- ([yshift=0.25mm]title.south east)
cos +(\tcboxedtitleheight,\tcboxedtitleheight/2)
- sin +(\tcboxedtitleheight,\tcboxedtitleheight/2)
- -- ([xshift=-.25mm,yshift=0.25mm]frame.south east)
- -- ([xshift=-.25mm]frame.north east); },
+ sin +(\tcboxedtitleheight,\tcboxedtitleheight/2); },
title={#2},#1}
\begin{mybox}{My title}
@@ -2002,6 +2010,16 @@ The differences between underlays and overlays are:
Removes the last underlay if set before.
\end{docTcbKey}
+\begin{docTcbKey}{underlay boxed title}{=\meta{graphical code}}{no default, initially unset}
+ If the box has a \emph{boxed title}, see \Vref{subsec:skinboxedtitle},
+ then the \meta{graphical code} is added to the box drawing process
+ \emph{before} the boxed title is drawn.
+\end{docTcbKey}
+
+\begin{docTcbKey}{no underlay boxed title}{}{style, no default, initially set}
+ Removes the boxed title underlay if set before.
+\end{docTcbKey}
+
\begin{docTcbKey}{underlay unbroken and first}{=\meta{graphical code}}{no default, initially unset}
This is an abbreviation for setting
\refKey{/tcb/underlay unbroken} and
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index ff40d257fd1..cc559935619 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
index 97d34da8a8d..2f63cd63b0c 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.03 (2014/05/16)
+%% The LaTeX package tcolorbox - version 3.04 (2014/05/18)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -100,8 +100,8 @@
\newtcolorbox{marker}[1][]{marker,#1}
-\def\version{3.03}%
-\def\datum{2014/05/16}%
+\def\version{3.04}%
+\def\datum{2014/05/18}%
\makeindex
\hypersetup{
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]}}