summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-07 23:13:00 +0000
committerKarl Berry <karl@freefriends.org>2013-03-07 23:13:00 +0000
commit4e1f696f6b4ab551a453f61da79aa42f4b06d510 (patch)
tree75b4dfef3b0234553d20ccdec193c118c815d41f /Master/texmf-dist/tex
parent81b31d750e9806bfcd17916b130f77496b1ee9e3 (diff)
tcolorbox (7mar13)
git-svn-id: svn://tug.org/texlive/trunk@29309 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex68
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex30
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex26
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty27
7 files changed, 112 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index aba156be1c6..0764c048932 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 2.00 (2013/03/01)
+%% The LaTeX package tcolorbox - version 2.01 (2013/03/07)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -23,7 +23,6 @@
\let\tcb@drawcolorbox@standalone=\tcb@drawcolorbox
\let\tcb@parboxrestore@true=\tcb@parboxrestore
-%\def\tcb@parboxrestore@false{\vspace{-\parskip}}
\def\tcb@parboxrestore@false{\vskip-\parskip}
\def\tcb@vbox#1#2{%
@@ -45,7 +44,11 @@
% remaining height
\def\tcb@comp@h@page{%
\ifx\kvtcb@float\@empty%
- \tcbdimto\tcb@h@page{\pagegoal-\pagetotal-\pageshrink-\kvtcb@shrinkbreakgoal}%
+ \ifdim\pagegoal=16383.99998pt
+ \tcbdimto\tcb@h@page{\textheight-\kvtcb@shrinkbreakgoal}%
+ \else
+ \tcbdimto\tcb@h@page{\pagegoal-\pagetotal-\pageshrink-\kvtcb@shrinkbreakgoal}%
+ \fi%
\else%
\tcbdimto\tcb@h@page{\textheight-\kvtcb@shrinkbreakgoal}%
\fi%
@@ -70,8 +73,7 @@
\def\tcb@drawcolorbox@breakable{%
\ifx\kvtcb@float\@empty%
- \par\nointerlineskip{\topskip\z@\null}%
- \bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list
+ {\parskip\z@\par}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list
\setbox\z@=\vbox{\kvtcb@beforebox}%
\tcbdimto\tcb@h@before{\ht\z@+\dp\z@+\dimexpr\parskip\relax}%
\setbox\z@=\vbox{\kvtcb@afterbox}%
@@ -94,7 +96,7 @@
\else
\ifx\kvtcb@float\@empty%
\ifdim\dimexpr\tcb@h@page-\tcb@h@before-\tcb@h@padding-\tcb@h@padtitle<\kvtcb@breakminlines\baselineskip\relax%
- \pagebreak\null%
+ \pagebreak%
\tcb@comp@h@page%
\ifdim\tcb@h@total<\tcb@h@page\relax% no break!
\tcb@drawcolorbox@standalone%
@@ -133,6 +135,8 @@
\let\kvtcb@bottom@rule=\kvtcb@bottom@rule@break%
\let\kvtcb@bbtop=\kvtcb@bbtop@stand%
\let\kvtcb@bbbottom=\kvtcb@bbbottom@break%
+ \let\tcb@break@topsep=\tcb@zpt%
+ \let\tcb@break@bottomsep=\kvtcb@bottomsep%
}
\def\tcb@split@setstate@middle{%
@@ -141,6 +145,8 @@
\let\kvtcb@bottom@rule=\kvtcb@bottom@rule@break%
\let\kvtcb@bbtop=\kvtcb@bbtop@break%
\let\kvtcb@bbbottom=\kvtcb@bbbottom@break%
+ \let\tcb@break@topsep=\kvtcb@topsep%
+ \let\tcb@break@bottomsep=\kvtcb@bottomsep%
}
\def\tcb@split@setstate@last{%
@@ -149,6 +155,8 @@
\let\kvtcb@bottom@rule=\kvtcb@bottom@rule@stand%
\let\kvtcb@bbtop=\kvtcb@bbtop@break%
\let\kvtcb@bbbottom=\kvtcb@bbbottom@stand%
+ \let\tcb@break@topsep=\kvtcb@topsep%
+ \let\tcb@break@bottomsep=\tcb@zpt%
}
\def\tcb@split@first{%
@@ -174,9 +182,12 @@
\edef\kvtcb@skin@@middle{\kvtcb@skin@middle}%
\edef\kvtcb@skin@@last{\kvtcb@skin@last}%
%
- \tcbdimto\tcb@h@padding@first{\kvtcb@bbtop@stand+\kvtcb@bbbottom@break+\kvtcb@top@rule@stand+\kvtcb@bottom@rule@break+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}%
- \tcbdimto\tcb@h@padding@middle{\kvtcb@bbtop@break+\kvtcb@bbbottom@break+\kvtcb@top@rule@break+\kvtcb@bottom@rule@break+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}%
- \tcbdimto\tcb@h@padding@last{\kvtcb@bbtop@break+\kvtcb@bbbottom@stand+\kvtcb@top@rule@break+\kvtcb@bottom@rule@stand+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}%
+ \let\tcb@h@breaksep@first=\kvtcb@bottomsep%
+ \tcbdimto\tcb@h@breaksep@middle{\kvtcb@bottomsep+\kvtcb@topsep}%
+ \let\tcb@h@breaksep@last=\kvtcb@topsep%
+ \tcbdimto\tcb@h@padding@first{\kvtcb@bbtop@stand+\kvtcb@bbbottom@break+\kvtcb@top@rule@stand+\kvtcb@bottom@rule@break+\tcb@h@breaksep@first+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}%
+ \tcbdimto\tcb@h@padding@middle{\kvtcb@bbtop@break+\kvtcb@bbbottom@break+\kvtcb@top@rule@break+\kvtcb@bottom@rule@break+\tcb@h@breaksep@middle+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}%
+ \tcbdimto\tcb@h@padding@last{\kvtcb@bbtop@break+\kvtcb@bbbottom@stand+\kvtcb@top@rule@break+\kvtcb@bottom@rule@stand+\tcb@h@breaksep@last+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}%
%
\tcb@split@setstate@first%
%
@@ -256,7 +267,7 @@
\tcb@comp@h@page%
\edef\tcb@h@upper{0pt}%
\tcbdimto\tcb@h@lower{\ht\tcb@totallowerbox+\dp\tcb@totallowerbox}%
- \tcbdimto\tcb@h@total{\tcb@h@after+\tcb@h@padding@last-\kvtcb@top+\tcb@h@padtitle+\tcb@h@segment+\tcb@h@lower}%
+ \tcbdimto\tcb@h@total{\tcb@h@after+\tcb@h@padding@last-\kvtcb@top-\kvtcb@boxsep+\tcb@h@padtitle+\tcb@h@segment+\tcb@h@lower}%
%
\ifdim\tcb@h@total<\tcb@h@page\relax% no break
\tcb@split@setstate@last%
@@ -265,7 +276,7 @@
\let\tcb@split@next=\relax%
\else
\tcb@split@setstate@middle%
- \tcbdimto\tcb@split@dim{\tcb@h@page-\tcb@h@padding@middle+\kvtcb@top-\tcb@h@padtitle-\tcb@h@segment}%
+ \tcbdimto\tcb@split@dim{\tcb@h@page-\tcb@h@padding@middle+\kvtcb@top+\kvtcb@boxsep-\tcb@h@padtitle-\tcb@h@segment}%
\tcb@split@lower@box%
\tcb@sdraw@SL%
\let\tcb@split@next=\tcb@split@L%
@@ -301,7 +312,7 @@
\def\tcb@sdraw@USL{%
\tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}%
\def\tcb@segment@state{1}%
- \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower}%
+ \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\tcb@ch@natural%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\csname tcb@before@\tcb@split@state\endcsname%
@@ -331,7 +342,7 @@
\def\tcb@sdraw@U{%
\tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}%
\def\tcb@segment@state{0}%
- \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper}%
+ \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\tcb@ch@natural%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\csname tcb@before@\tcb@split@state\endcsname%
@@ -359,7 +370,7 @@
\def\tcb@sdraw@SL{%
\tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}%
\def\tcb@segment@state{1}%
- \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@bottom+\tcb@h@segment+\tcb@h@lower}%
+ \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@bottom+\kvtcb@boxsep+\tcb@h@segment+\tcb@h@lower+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\tcb@ch@natural%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\csname tcb@before@\tcb@split@state\endcsname%
@@ -388,7 +399,7 @@
\def\tcb@sdraw@L{%
\tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}%
\def\tcb@segment@state{2}%
- \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\ht\tcb@lowerbox+\dp\tcb@lowerbox}%
+ \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\ht\tcb@lowerbox+\dp\tcb@lowerbox+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\tcb@ch@natural%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\csname tcb@before@\tcb@split@state\endcsname%
@@ -425,17 +436,32 @@
\let\tcb@drawcolorbox=\tcb@drawcolorbox@standalone},
breakable/.style={breakable@#1},
breakable/.default=true,%
- unbreakable/.style={breakable=false},
- title after break/.store in=\kvtcb@followingtitle,
- notitle after break/.style={title after break=},
- adjusted title after break/.style={title after break={#1\vphantom{\kvtcb@adjusttext}}},
- lines before break/.store in=\kvtcb@breakminlines,
- shrink break goal/.store in=\kvtcb@shrinkbreakgoal,
+ unbreakable/.style={breakable=false},%
+ title after break/.store in=\kvtcb@followingtitle,%
+ notitle after break/.style={title after break=},%
+ adjusted title after break/.style={title after break={#1\vphantom{\kvtcb@adjusttext}}},%
+ lines before break/.store in=\kvtcb@breakminlines,%
+ shrink break goal/.store in=\kvtcb@shrinkbreakgoal,%
+%
+ toprule at break/.store in=\kvtcb@top@rule@break,
+ bottomrule at break/.store in=\kvtcb@bottom@rule@break,
+ enlarge top at break by/.store in=\kvtcb@bbtop@break,
+ enlarge bottom at break by/.store in=\kvtcb@bbbottom@break,
+%
+ topsep at break/.store in=\kvtcb@topsep,%
+ bottomsep at break/.store in=\kvtcb@bottomsep,%
+ pad before break/.code={\let\kvtcb@bottom@rule@break=\tcb@zpt%
+ \tcbdimto\kvtcb@bottomsep{#1-\kvtcb@bottom-\kvtcb@boxsep}},%
+ pad after break/.code={\let\kvtcb@top@rule@break=\tcb@zpt%
+ \tcbdimto\kvtcb@topsep{#1-\kvtcb@top-\kvtcb@boxsep}},%
+ pad at break/.style={pad before break={#1},pad after break={#1}},%
}
\tcbset{%
notitle after break,
shrink break goal=0pt,
lines before break=2,
+ topsep at break=0pt,
+ bottomsep at break=0pt,
}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 7a9734de709..fd4481c5abd 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 2.00 (2013/03/01)
+%% The LaTeX package tcolorbox - version 2.01 (2013/03/07)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
@@ -49,7 +49,7 @@
basicstyle=\ttfamily\footnotesize,
extendedchars=true,
moredelim={[is][\itshape\rmfamily]{§}{§}},
- nolol}
+ nolol,inputencoding=\kvtcb@listingencoding}
% The following macros are taken from ltxdoc
\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
index 4955eec9f6b..deca862db43 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 2.00 (2013/03/01)
+%% The LaTeX package tcolorbox - version 2.01 (2013/03/07)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -26,8 +26,8 @@
aboveskip={0\p@ \@plus 6\p@}, belowskip={0\p@ \@plus 6\p@},
columns=fullflexible, keepspaces=true,
breaklines=true, breakatwhitespace=true,
- basicstyle=\ttfamily\small, extendedchars=true, nolol
- }
+ basicstyle=\ttfamily\small, extendedchars=true, nolol,
+ inputencoding=\kvtcb@listingencoding}
\def\tcbuselistingtext{\input{\kvtcb@listingfile}}%
@@ -72,6 +72,7 @@
comment and listing/.code={\let\tcp@listing@process\tcb@listing@commentAndListing},
listing only/.code={\let\tcp@listing@process\tcbuselistinglisting},
text only/.code={\let\tcp@listing@process\tcbuselistingtext},
+ listing inputencoding/.store in=\kvtcb@listingencoding,
}
\tcbset{
@@ -79,6 +80,7 @@
listing style=tcblatex,
comment=,
listing and text,
+ listing inputencoding=\inputencodingname,
}
\newenvironment{tcblisting}[1]{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
new file mode 100644
index 00000000000..723fd1e6f3e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
@@ -0,0 +1,30 @@
+%% The LaTeX package tcolorbox - version 2.01 (2013/03/07)
+%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `author-maintained'.
+%%
+%% This work consists of all files listed in README
+%%
+\makeatletter
+\def\tcblibrary@listingsutf8@loaded{}
+
+\RequirePackage{listingsutf8}[2011/11/10]
+\tcbuselibrary{listings}
+
+\tcbset{
+ listing utf8/.style={listing inputencoding=utf8/#1},
+ listing utf8=latin1,
+}
+
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index 72bed16be68..408f0cda0e1 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 2.00 (2013/03/01)
+%% The LaTeX package tcolorbox - version 2.01 (2013/03/07)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -27,7 +27,7 @@
\node[name=frame,at={(0,0)},above right,minimum width=\kvtcb@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%
- \node[name=segmentation,at={({\kvtcb@left@rule},{\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@bottom+\tcb@height@lower\relax})},above right,
+ \node[name=segmentation,at={({\kvtcb@left@rule},{\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep*2+\tcb@break@bottomsep+\kvtcb@bottom+\tcb@height@lower\relax})},above right,
minimum width=\tcb@innerwidth,minimum height=\the\dimexpr\kvtcb@middle*2\relax]{};
\fi%
\iftcb@hasTitle%
@@ -499,40 +499,40 @@
\fi%
\ifcase\tcb@segment@state
\path[fill=white,draw,dotted]
- ([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep}]interior.south west) rectangle
- ([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep}]interior.north east);
+ ([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep+\tcb@break@bottomsep}]interior.south west) rectangle
+ ([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep-\tcb@break@topsep}]interior.north east);
\path[fill=green!20!white,draw=green!75!black,dashed]
- ([xshift={\kvtcb@boxsep+\kvtcb@leftupper},yshift={\kvtcb@boxsep+\kvtcb@bottom}]interior.south west)
+ ([xshift={\kvtcb@boxsep+\kvtcb@leftupper},yshift={\kvtcb@boxsep+\kvtcb@bottom+\tcb@break@bottomsep}]interior.south west)
rectangle node[font=\scriptsize] {upper: w=\tcb@w@upper, h=\tcb@height@upper}
+(\tcb@w@upper,\tcb@height@upper);
\or%
\ifvoid\tcb@upperbox
\path[fill=white,draw,dotted]
- ([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep}]interior.south west) rectangle
- ([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep}]interior.north east);
+ ([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep+\tcb@break@bottomsep}]interior.south west) rectangle
+ ([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep-\tcb@break@topsep}]interior.north east);
\else
\path[fill=white,draw,dotted]
- ([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep}]interior.south west) rectangle
+ ([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep+\tcb@break@bottomsep}]interior.south west) rectangle
([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep}]segmentation.east);
\path[fill=white,draw,dotted]
([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep}]segmentation.west)
- rectangle ([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep}]interior.north east);
+ rectangle ([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep-\tcb@break@topsep}]interior.north east);
\path[fill=green!20!white,draw=green!75!black,dashed]
([xshift={\kvtcb@boxsep+\kvtcb@leftupper},yshift={\kvtcb@boxsep}]segmentation.north west)
rectangle node[font=\scriptsize] {upper: w=\tcb@w@upper, h=\tcb@height@upper}
+(\tcb@w@upper,\tcb@height@upper);
\fi%
\path[fill=green!20!white,draw=green!75!black,dashed]
- ([xshift={\kvtcb@boxsep+\kvtcb@leftlower},yshift={\kvtcb@boxsep+\kvtcb@bottom}]interior.south west)
+ ([xshift={\kvtcb@boxsep+\kvtcb@leftlower},yshift={\kvtcb@boxsep+\kvtcb@bottom+\tcb@break@bottomsep}]interior.south west)
rectangle node[font=\scriptsize] {lower: w=\tcb@w@lower, h=\tcb@height@lower}
+(\tcb@w@lower,\tcb@height@lower);
\path[draw=red,opacity=0.5] (segmentation.south west) rectangle (segmentation.north east);
\else
\path[fill=white,draw,dotted]
- ([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep}]interior.south west) rectangle
- ([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep}]interior.north east);
+ ([xshift={\kvtcb@boxsep},yshift={\kvtcb@boxsep+\tcb@break@bottomsep}]interior.south west) rectangle
+ ([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep-\tcb@break@topsep}]interior.north east);
\path[fill=green!20!white,draw=green!75!black,dashed]
- ([xshift={\kvtcb@boxsep+\kvtcb@leftlower},yshift={\kvtcb@boxsep+\kvtcb@bottom}]interior.south west)
+ ([xshift={\kvtcb@boxsep+\kvtcb@leftlower},yshift={\kvtcb@boxsep+\kvtcb@bottom+\tcb@break@bottomsep}]interior.south west)
rectangle node[font=\scriptsize] {lower: w=\tcb@height@lower, h=\tcb@h@lower}
+(\tcb@w@lower,\tcb@height@lower);
\fi%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
index 1485b58a9fe..d1bad85009c 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 2.00 (2013/03/01)
+%% The LaTeX package tcolorbox - version 2.01 (2013/03/07)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index b9f4b18b411..a87b89d674c 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 2.00 (2013/03/01)
+%% The LaTeX package tcolorbox - version 2.01 (2013/03/07)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2013/03/01 version 2.00 text color boxes]
+\ProvidesPackage{tcolorbox}[2013/03/07 version 2.01 text color boxes]
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -43,6 +43,8 @@
\def\tcbdimto#1#2{\edef#1{\the\dimexpr#2\relax}}
+\def\tcb@zpt{0pt}
+
\def\tcb@comp@arc@auto{%
\let\tcb@outer@arc=\kvtcb@top@rule@stand%
\ifdim\kvtcb@bottom@rule@stand<\tcb@outer@arc\relax%
@@ -65,12 +67,10 @@
adjusted title/.style={title={#1\vphantom{\kvtcb@adjusttext}}},
width/.store in=\kvtcb@width,
boxsep/.store in=\kvtcb@boxsep,
- toprule at break/.store in=\kvtcb@top@rule@break,
toprule/.code={%
\def\kvtcb@top@rule@stand{#1}%
\let\kvtcb@top@rule@break=\kvtcb@top@rule@stand%
},
- bottomrule at break/.store in=\kvtcb@bottom@rule@break,
bottomrule/.code={%
\def\kvtcb@bottom@rule@stand{#1}%
\let\kvtcb@bottom@rule@break=\kvtcb@bottom@rule@stand%
@@ -138,12 +138,10 @@
split/.code={\def\tcb@height@fraction{#1}\let\tcb@ch@fixed@both=\tcb@ch@fixed@split},
valign/.store in=\kvtcb@valign,
valign lower/.store in=\kvtcb@valignlower,
- enlarge top at break by/.store in=\kvtcb@bbtop@break,
enlarge top by/.code={%
\def\kvtcb@bbtop@stand{#1}%
\let\kvtcb@bbtop@break=\kvtcb@bbtop@stand%
},
- enlarge bottom at break by/.store in=\kvtcb@bbbottom@break,
enlarge bottom by/.code={%
\def\kvtcb@bbbottom@stand{#1}%
\let\kvtcb@bbbottom@break=\kvtcb@bbbottom@stand%
@@ -395,7 +393,7 @@
\begin{pgfscope}%
\pgfsetcolor{\kvtcb@colframe}%
\pgfsetdash{{1mm}{1mm}}{0.5mm}%
- \tcbdimto\tcb@seg@pos{\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@middle+\kvtcb@bottom+\tcb@height@lower}%
+ \tcbdimto\tcb@seg@pos{\kvtcb@bottom@rule+\kvtcb@boxsep*2+\tcb@break@bottomsep+\kvtcb@middle+\kvtcb@bottom+\tcb@height@lower}%
\pgfpathmoveto{\pgfpoint{\kvtcb@left@rule}{\tcb@seg@pos}}%
\pgfpathlineto{\pgfpoint{\kvtcb@width-\kvtcb@right@rule}{\tcb@seg@pos}}%
\pgfusepath{stroke}%
@@ -438,14 +436,14 @@
\def\tcb@tdraw@upper{%
\csname tcb@dbox@\kvtcb@valign\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper\relax}%
- {\the\dimexpr\tcb@innerheight+\kvtcb@bottom@rule-\kvtcb@boxsep-\kvtcb@top-\tcb@height@upper\relax}%
+ {\the\dimexpr\tcb@innerheight+\kvtcb@bottom@rule-\kvtcb@boxsep-\tcb@break@topsep-\kvtcb@top-\tcb@height@upper\relax}%
{\tcb@height@upper}{\tcb@upperbox}%
}
\def\tcb@tdraw@lower{%
\iftcb@lowervisible%
\csname tcb@dbox@\kvtcb@valignlower\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftlower\relax}%
- {\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep+\kvtcb@bottom\relax}%
+ {\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep+\tcb@break@bottomsep+\kvtcb@bottom\relax}%
{\tcb@height@lower}{\tcb@lowerbox}%
\fi%
}
@@ -457,8 +455,8 @@
\tcbdimto\tcb@h@title{\ht\tcb@titlebox+\dp\tcb@titlebox}%
\tcbdimto\tcb@h@padtitle{\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle+\tcb@h@title}%
\else%
- \edef\tcb@h@title{0pt}%
- \edef\tcb@h@padtitle{0pt}%
+ \let\tcb@h@title=\tcb@zpt%
+ \let\tcb@h@padtitle=\tcb@zpt%
\fi%
%
\tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}%
@@ -470,8 +468,8 @@
\tcbdimto\tcb@h@segment{\kvtcb@boxsep*2+\kvtcb@middle*2}%
\tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}%
\else
- \edef\tcb@h@segment{0pt}%
- \edef\tcb@h@lower{0pt}%
+ \let\tcb@h@segment=\tcb@zpt%
+ \let\tcb@h@lower=\tcb@zpt%
\fi%
%
\tcb@drawcolorbox%
@@ -483,6 +481,8 @@
\let\kvtcb@bottom@rule=\kvtcb@bottom@rule@stand%
\let\kvtcb@bbtop=\kvtcb@bbtop@stand%
\let\kvtcb@bbbottom=\kvtcb@bbbottom@stand%
+ \let\tcb@break@topsep=\tcb@zpt%
+ \let\tcb@break@bottomsep=\tcb@zpt%
% floats
\ifx\kvtcb@float\@empty%
\newenvironment{tcb@float}{\kvtcb@beforebox}{\kvtcb@afterbox}%
@@ -584,6 +584,7 @@
}
\tcb@add@library{listings}{tcblistings.code.tex}
+\tcb@add@library{listingsutf8}{tcblistingsutf8.code.tex}
\tcb@add@library{theorems}{tcbtheorems.code.tex}
\tcb@add@library{documentation}{tcbdocumentation.code.tex}
\tcb@add@library{skins}{tcbskins.code.tex}