summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex12
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex229
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex92
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex10
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty43
12 files changed, 298 insertions, 130 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index 2f2843d08a0..b21bf39c727 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.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\let\tcb@parboxrestore@true=\tcb@parboxrestore
\def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize}
@@ -458,7 +458,7 @@
\def\tcb@sdraw@USL{%
- \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}%
+ \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook%
\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+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\tcb@ch@natural%
@@ -485,7 +485,7 @@
\def\tcb@sdraw@U{%
- \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}%
+ \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook%
\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+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\tcb@ch@natural%
@@ -508,7 +508,7 @@
\def\tcb@sdraw@SL{%
- \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}%
+ \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook%
\def\tcb@segment@state{1}%
\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%
@@ -534,7 +534,7 @@
\def\tcb@sdraw@L{%
- \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}%
+ \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook%
\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+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\tcb@ch@natural%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 38107a77327..c2d86c32e7d 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.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\tcbuselibrary{listings}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index 85ec5f60284..3a66d5d6d84 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcbfitting.code.tex: Code for fit boxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
@@ -58,6 +58,12 @@
\let\tcb@fit@warn@end=\@empty},
fit warning/final/.code={\tcb@cur@hbadness=\hbadness\def\tcb@fit@warn@begin{\hbadness=10000\relax}%
\def\tcb@fit@warn@end{\hbadness=\tcb@cur@hbadness\relax\tcb@fit@@box}},
+ fit algorithm/.is choice,
+ fit algorithm/fontsize/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@fontsize},
+ fit algorithm/areasize/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@areasize},
+ fit algorithm/hybrid/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@hybrid},
+ fit algorithm/squeeze/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@squeeze},
+ spartan@fit/.style={fit algorithm=squeeze},
}
\def\tcb@@capture@fitbox{%
@@ -76,6 +82,138 @@
\newcount\tcb@cur@hbadness
+\def\tcbox@fitalgorithm@fontsize{%
+ \tcb@continuetrue%
+ \loop%
+ \tcbfitdim.5\tcbfitdim%
+ \tcb@fit@@box%
+ \ifnum\count@=\kvtcb@fit@maxstep\relax%
+ \tcb@continuefalse%
+ \else%
+ \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
+ \ifdim\tcbfitdim<18000sp\relax%
+ \count@\kvtcb@fit@maxstep\relax%
+ \tcb@continuefalse%
+ \fi%
+ \else%
+ \tcb@continuefalse%
+ \fi%
+ \fi%
+ \iftcb@continue \repeat%
+ \ifnum\count@<\kvtcb@fit@maxstep\relax%
+ \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}%
+ \tcb@lowerfitdim\tcbfitdim%
+ \tcb@upperfitdim2\tcbfitdim%
+ \tcbfitdim1.5\tcbfitdim%
+ \loop%
+ \tcb@fit@@box%
+ \tcb@continuetrue%
+ \ifnum\count@<\kvtcb@fit@maxstep\relax%
+ \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxfontdiff\relax%
+ \tcb@continuefalse%
+ \else%
+ \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxfontdiffgap\relax%
+ \ifdim\dimexpr\tcb@fit@@gap<\tcb@fit@@line\relax%
+ \tcb@continuefalse%
+ \fi%
+ \fi%
+ \fi%
+ \else%
+ \tcb@continuefalse%
+ \fi%
+ \iftcb@continue%
+ \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
+ \tcb@upperfitdim\tcbfitdim%
+ \advance\tcbfitdim\tcb@lowerfitdim%
+ \tcbfitdim0.5\tcbfitdim%
+ \else%
+ \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}%
+ \tcb@lowerfitdim\tcbfitdim%
+ \advance\tcbfitdim\tcb@upperfitdim%
+ \tcbfitdim0.5\tcbfitdim%
+ \fi%
+ \else%
+ \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
+ \tcbfitdim\tcb@lowerfitdim%
+ \tcb@fit@@box%
+ \fi%
+ \fi%
+ \iftcb@continue \repeat%
+ \fi%
+}
+
+\def\tcbox@fitalgorithm@areasize{%
+ \pgfmathdivide{\tcb@fit@@h}{\tcb@fit@@target}%
+ \pgfmathsqrt{\pgfmathresult}%
+ \let\tcb@temp=\pgfmathresult%
+ \tcbdimto\tcb@w@upper@temp{\pgfmathresult\dimexpr\tcb@w@upper}%
+ \tcb@fit@@boxsave{\tcb@w@upper@temp}%
+ %
+ \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}%
+ \pgfmathdivide{\tcb@fit@@h}{\tcb@fit@@target}%
+ \pgfmathdivide{\pgfmathresult}{\tcb@temp}%
+ \pgfmathsqrt{\pgfmathresult}%
+ \ifdim\dimexpr\pgfmathresult pt<0.98pt\relax
+ \tcbdimto\tcb@w@upper@temp{\pgfmathresult\dimexpr\tcb@w@upper@temp}%
+ \tcb@fit@@boxsave{\tcb@w@upper@temp}%
+ \else\ifdim\dimexpr\pgfmathresult pt>1.02pt\relax
+ \tcbdimto\tcb@w@upper@temp{\pgfmathresult\dimexpr\tcb@w@upper@temp}%
+ \tcb@fit@@boxsave{\tcb@w@upper@temp}%
+ \fi\fi%
+ %
+ \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}%
+ \pgfmathdivide{\tcb@w@upper}{\tcb@w@upper@temp}%
+ \tcbdimto\tcb@fit@@h{\pgfmathresult\dimexpr\tcb@fit@@h}%
+ \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
+ \let\tcb@fit@@h=\tcb@fit@@target%
+ \fi
+ \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@h}{\box\tcb@upperbox}}%
+ %
+ \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}%
+}
+
+\def\tcbox@fitalgorithm@squeeze{%
+ \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@target}{\box\tcb@upperbox}}%
+ \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}%
+}
+
+\def\tcbox@fitalgorithm@hybrid{%
+ \pgfmathdivide{\tcb@fit@@target}{\tcb@fit@@h}%
+ \pgfmathsqrt{\pgfmathresult}%
+ \tcbfitdim=\pgfmathresult\tcbfitdim%
+ \tcb@fit@@box%
+ %
+ \pgfmathdivide{\tcb@fit@@target}{\tcb@fit@@h}%
+ \pgfmathsqrt{\pgfmathresult}%
+ \ifdim\dimexpr\pgfmathresult pt<0.85pt\relax
+ \tcbfitdim=\pgfmathresult\tcbfitdim%
+ \tcb@fit@@box%
+ \else\ifdim\dimexpr\pgfmathresult pt>1.15pt\relax
+ \tcbfitdim=\pgfmathresult\tcbfitdim%
+ \tcb@fit@@box%
+ \fi\fi%
+ %
+ \tcbox@fitalgorithm@areasize%
+}
+
+\def\tcb@fit@@box{%
+ \tcbdimto\tcb@fit@@line{\kvtcb@fit@skip\tcbfitdim}%
+ \tcbdimto\tcb@w@upper{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}%
+ \tcb@fit@@boxsave{\tcb@w@upper}%
+ \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}%
+ \tcbdimto\tcb@fit@@target{\kvtcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand-\kvtcb@top-\kvtcb@bottom-\kvtcb@boxsep*2-\tcb@h@titletotal}%
+}%
+
+\def\tcb@fit@@box@titled{%
+ \tcb@set@@dim@and@title%
+ \iftcb@hasTitle%
+ \tcbdimto\tcb@h@titletotal{\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle}%
+ \else%
+ \let\tcb@h@titletotal=\tcb@zpt%
+ \fi%
+ \tcb@fit@@box%
+}%
+
\long\def\tcbox@inner@fitbox#1{%
\tcbset{breakable@false,sidebyside=false}%
\let\tcb@val@raisebase=\tcb@zpt%
@@ -88,32 +226,14 @@
\tcbfitdim\kvtcb@fit@basedim%
\tcb@fit@warn@begin%
%
- \def\tcb@fit@@box{%
- \tcbdimto\tcb@fit@@line{\kvtcb@fit@skip\tcbfitdim}%
- \tcbdimto\tcb@w@upper{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}%
- \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}%
+ \def\tcb@fit@@boxsave##1{%
+ \begin{tcb@savebox}{\tcb@upperbox}{##1}%
\color{\kvtcb@colupper}%
\kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont%
\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper%
\end{tcb@savebox}%
- %
- \ifdim\wd\tcb@upperbox>\tcb@w@upper\relax
- \message{WARNING!!!!!}
- \fi
- %
- \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}%
- \tcbdimto\tcb@fit@@target{\kvtcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand-\kvtcb@top-\kvtcb@bottom-\kvtcb@boxsep*2-\tcb@h@titletotal}%
\advance\count@ 1\relax%
}%
- \def\tcb@fit@@box@titled{%
- \tcb@set@@dim@and@title%
- \iftcb@hasTitle%
- \tcbdimto\tcb@h@titletotal{\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle}%
- \else%
- \let\tcb@h@titletotal=\tcb@zpt%
- \fi%
- \tcb@fit@@box%
- }%
%
\tcb@fit@@box@titled%
%
@@ -182,66 +302,10 @@
\fi%
\fi%
%
- % font fit
+ % (font) fit
\ifnum\count@<\kvtcb@fit@maxstep\relax%
\ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
- \tcb@continuetrue%
- \loop%
- \tcbfitdim.5\tcbfitdim%
- \tcb@fit@@box%
- \ifnum\count@=\kvtcb@fit@maxstep\relax%
- \tcb@continuefalse%
- \else%
- \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
- \ifdim\tcbfitdim<18000sp\relax%
- \count@\kvtcb@fit@maxstep\relax%
- \tcb@continuefalse%
- \fi%
- \else%
- \tcb@continuefalse%
- \fi%
- \fi%
- \iftcb@continue \repeat%
- \ifnum\count@<\kvtcb@fit@maxstep\relax%
- \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}%
- \tcb@lowerfitdim\tcbfitdim%
- \tcb@upperfitdim2\tcbfitdim%
- \tcbfitdim1.5\tcbfitdim%
- \loop%
- \tcb@fit@@box%
- \tcb@continuetrue%
- \ifnum\count@<\kvtcb@fit@maxstep\relax%
- \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxfontdiff\relax%
- \tcb@continuefalse%
- \else%
- \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxfontdiffgap\relax%
- \ifdim\dimexpr\tcb@fit@@gap<\tcb@fit@@line\relax%
- \tcb@continuefalse%
- \fi%
- \fi%
- \fi%
- \else%
- \tcb@continuefalse%
- \fi%
- \iftcb@continue%
- \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
- \tcb@upperfitdim\tcbfitdim%
- \advance\tcbfitdim\tcb@lowerfitdim%
- \tcbfitdim0.5\tcbfitdim%
- \else%
- \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}%
- \tcb@lowerfitdim\tcbfitdim%
- \advance\tcbfitdim\tcb@upperfitdim%
- \tcbfitdim0.5\tcbfitdim%
- \fi%
- \else%
- \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
- \tcbfitdim\tcb@lowerfitdim%
- \tcb@fit@@box%
- \fi%
- \fi%
- \iftcb@continue \repeat%
- \fi%
+ \tcbox@fitalgorithm%
\fi%
\fi%
%
@@ -312,8 +376,9 @@
\tcbset{%
reset@fitting/.style={%
+ fit algorithm=fontsize,%
fit basedim=10pt,fit skip=1.2,
- fit height plus=0pt,fit width plus=0pt,
+ height plus=0pt,fit width plus=0pt,
fit maxstep=20,fit maxfontdiff=0.1pt,fit maxfontdiffgap=1pt,
fit maxwidthdiff=1pt,fit maxwidthdiffgap=10pt,
fit warning=off
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index 4726ccc8799..1fb7e50fdbe 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\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 a793223297f..9ecaf1366e4 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\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 5f8286aa7ff..7afca6e94ae 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\def\tcbuselistingtext{\input{\kvtcb@listingfile}}%
@@ -154,7 +154,7 @@
\long\def\tcbinputlisting#1{%
\begingroup%
\tcb@layer@pushup%
- \tcbset{capture=minipage,#1}%
+ \tcbset{capture=minipage,#1}\tcb@afteroptions@hook%
\let\tcb@listing@capture=\kvtcb@capture%
\tcb@inputlisting\endgroup%
}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index 7bc89405ca2..d077adad17e 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% 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>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\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 58c1ed0553b..0a2c0564d23 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcbminted.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\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 22242ee750a..0fa7982653a 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\RequirePackage{tikz}[2010/10/13]
@@ -233,6 +233,64 @@
\def\tcb@drawlower@freelance{\tcb@segmentation@code}
\def\tcb@drawtitle@freelance{\tcb@title@code}
+
+\def\tcb@drawframe@spartan{%
+ \begin{pgfscope}%
+ \pgfpathrectangle{\pgfpointorigin}{\pgfqpoint{\tcb@width}{\tcb@height}}%
+ \pgfsetfillcolor{\kvtcb@colframe}%
+ \pgfsetfillopacity{\kvtcb@opacityframe}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+}
+
+\def\tcb@drawwithtitle@spartan{%
+ \begin{pgfscope}%
+ \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
+ {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
+ \pgfsetfillcolor{\kvtcb@colback}%
+ \pgfsetfillopacity{\kvtcb@opacityback}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+}
+
+\def\tcb@drawwithouttitle@spartan{%
+ \begin{pgfscope}%
+ \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
+ {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\tcb@height-\kvtcb@top@rule\relax}}%
+ \pgfsetfillcolor{\kvtcb@colback}%
+ \pgfsetfillopacity{\kvtcb@opacityback}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+}
+
+\def\tcb@drawtitle@spartan{%
+ \begin{pgfscope}%
+ \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight+\kvtcb@title@rule\relax}}%
+ {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\tcb@height-\kvtcb@top@rule\relax}}%
+ \pgfsetfillcolor{\kvtcb@colbacktitle}%
+ \pgfsetfillopacity{\kvtcb@opacitybacktitle}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+}
+
+\def\tcb@drawlower@spartan{%
+ \begin{pgfscope}%
+ \iftcb@sidebyside%
+ \tcbdimto\tcb@seg@pos{\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper+\tcb@w@upper+\kvtcb@sbs@gap/2}%
+ \pgfpathmoveto{\pgfqpoint{\tcb@seg@pos}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
+ \pgfpathlineto{\pgfqpoint{\tcb@seg@pos}{\kvtcb@bottom@rule}}%
+ \else%
+ \tcbdimto\tcb@seg@pos{\kvtcb@bottom@rule+\kvtcb@boxsep*2+\tcb@break@bottomsep+\kvtcb@middle+\kvtcb@bottom+\tcb@height@lower}%
+ \pgfpathmoveto{\pgfqpoint{\kvtcb@left@rule}{\tcb@seg@pos}}%
+ \pgfpathlineto{\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}%
+ \fi%
+ \pgfsetcolor{\kvtcb@colframe}%
+ \pgfsetstrokeopacity{\kvtcb@opacityframe}%
+ \pgfusepath{stroke}%
+ \end{pgfscope}%
+}
+
+
\tcbset{%
frame style/.code={\tikzset{frame@style/.style={#1}}},%
frame hidden/.style={frame style={draw=none,fill=none}},
@@ -625,6 +683,14 @@
segmentation code={\tcb@drawspec@widgetsegment},%
skin first=widgetmiddle,skin middle=widgetmiddle,skin last=widgetlast}
+\tcb@new@skin{spartan}{graphical environment=tikzpicture@tcb@hooked,geometry nodes=false,
+ set@extensions@preframe=,set@extensions@postframe=,
+ frame engine=spartan,interior titled engine=spartan,interior engine=spartan,title engine=spartan,segmentation engine=spartan,%
+ set@outerboundary=\tcb@boundaryframe@standard,%
+ skin first=spartan,skin middle=spartan,skin last=spartan}
+
+\tcbset{spartan/.style={skin=spartan}}
+
\tcb@new@skin{draft}{clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,%
frame engine=freelance,interior titled engine=freelance,interior engine=freelance,segmentation engine=path,title engine=path,%
interior style=,frame style=,segmentation style={draw=black,dashed},
@@ -1073,6 +1139,26 @@
}
+\newif\iftcb@isindraft
+\def\tcb@draftmode{\tcbset{spartan,spartan@fit}}
+\def\tcbstartdraftmode{\let\tcb@afteroptions@hook=\tcb@draftmode\tcb@isindrafttrue}
+\def\tcbstopdraftmode{\let\tcb@afteroptions@hook=\@empty\tcb@isindraftfalse}
+
+\def\tcbinterruptdraftmode{%
+ \iftcb@isindraft%
+ \tcbstopdraftmode%
+ \let\tcbcontinuedraftmode=\tcbstartdraftmode%
+ \else%
+ \let\tcbcontinuedraftmode=\@empty%
+ \fi}
+
+\tcbset{%
+ draftmode/.is choice,%
+ draftmode/.default=true,%
+ draftmode/true/.code=\tcbstartdraftmode,%
+ draftmode/false/.code=\tcbstopdraftmode,%
+}
+
\tcbset{%
reset@skins/.style={%
frame style=,interior style=,segmentation style=,@title style=,%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
index 9e75fb0a731..4dfab320b3c 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\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 ece7cf5b1cd..1517e3fc6ab 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{2.60}
+\tcb@set@library@version{2.61}
\RequirePackage{amsmath}
@@ -38,7 +38,7 @@
}
\def\tcb@theo@listentry#1#2#3{%
- \def\kvtcb@listentry{\numberline{#2}#3}%
+ \def\kvtcb@listentry{\protect\numberline{#2}#3}%
}
\def\tcb@theo@label#1#2{%
@@ -86,7 +86,7 @@
\newcommand{\new@tcbtheorem}[5][]{%
\@@newtcolorbox[auto counter,#1]{#2}[3][]{#4,%
title={\tcb@theo@title{#3}{\thetcbcounter}{##2}},%
- list entry={\numberline{\thetcbcounter}##2},%
+ list entry={\protect\numberline{\thetcbcounter}##2},%
code={\tcb@theo@label{#5}{##3}},%
##1}%
\@@newtcolorbox[#1,no counter,list inside=]{#2*}[2][]{#4,%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index caabe86692a..4f57a3135cb 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 2.60 (2013/12/17)
+%% The LaTeX package tcolorbox - version 2.61 (2014/01/10)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2013/12/17 version 2.60 text color boxes]
-\def\tcb@version{2.60}
+\ProvidesPackage{tcolorbox}[2014/01/10 version 2.61 text color boxes]
+\def\tcb@version{2.61}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -348,6 +348,7 @@
opacitybacktitle/.style={title filled,@opacitybacktitle={#1}},
opacityfill/.style={opacityframe={#1},opacityback={#1},@opacitybacktitle={#1}},
opacitytext/.style={opacityupper={#1},opacitylower={#1}},
+ spartan@fit/.code={},%
}
\tcbset{%
@@ -369,6 +370,7 @@
\def\@parboxrestore{\noindent\linewidth\hsize\let\@parboxrestore=\tcb@parboxrestore\leavevmode}%
}
+\let\tcb@afteroptions@hook\@empty
\let\tcb@parbox@use@true\relax%
\def\tcb@minipage@top{\minipage[t]}
@@ -549,7 +551,7 @@
\long\def\tcb@@icolorbox[#1]{%
\tcb@layer@inc%
- \tcbset{capture=minipage,#1}%
+ \tcbset{capture=minipage,#1}\tcb@afteroptions@hook%
\tcb@hasLowerfalse%
\csname tcb@@capture@\kvtcb@capture\endcsname%
}
@@ -1005,7 +1007,7 @@
\long\def\tcb@ox#1#2{%
\begingroup%
\tcb@layer@inc%
- \tcbset{#1}%
+ \tcbset{#1}\tcb@afteroptions@hook%
\csname tcbox@inner@\kvtcb@capture\endcsname{#2}%
\tcb@layer@dec%
\endgroup%
@@ -1178,9 +1180,9 @@
\def\tcb@addcontentsline#1#2{%
\ifx\kvtcb@listentry\@empty%
\ifx\kvtcb@title\@empty%
- \addcontentsline{#1}{#2}{\numberline{\thetcbcounter}\kvtcb@savedelimiter}%
+ \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}\kvtcb@savedelimiter}%
\else%
- \addcontentsline{#1}{#2}{\numberline{\thetcbcounter}\kvtcb@title}%
+ \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}\kvtcb@title}%
\fi%
\else%
\addcontentsline{#1}{#2}{\kvtcb@listentry}%
@@ -1280,6 +1282,8 @@
initialize@reset=reset@core,
}
+\def\tcbsetforeverylayer#1{\tcbset{initialize@reset={#1}}}
+
% libraries
\def\tcb@optionlist{}
@@ -1300,16 +1304,28 @@
\providecommand{\tcbpkgprefix}{}
+\def\tcb@input@library@in#1{%
+ \input\tcbpkgprefix#1\relax%
+}
+
+\let\tcb@input@library=\tcb@input@library@in%
+
+\def\tcb@input@library@ex#1{%
+ \let\tcb@input@library=\tcb@input@library@in%
+ \edef\tcb@at@catcode{\the\catcode`@}%
+ \catcode`\@11\relax%
+ \tcb@input@library@in{#1}%
+ \catcode`\@\tcb@at@catcode\relax%
+ \let\tcb@input@library=\tcb@input@library@ex%
+}
+
\def\tcb@load@library#1#2{%
\pgfkeysifdefined{/tcb/libload/#1}{}{%
\pgfkeyssetvalue{/tcb/libload/#1}{}%
\def\tcb@library@inload{#2}%
\def\tcb@library@version{-}%
- \edef\tcb@at@catcode{\the\catcode`@}%
- \catcode`\@11\relax%
- \input\tcbpkgprefix#2\relax%
- \catcode`\@\tcb@at@catcode\relax%
- \tcb@check@library@version}{}%
+ \tcb@input@library{#2}%
+ \tcb@check@library@version}%
}
\def\tcb@add@library#1#2{%
@@ -1340,3 +1356,4 @@
\ProcessOptions*
\edef\tcb@temp{\noexpand\tcbuselibrary{\tcb@optionlist}}
\tcb@temp
+\let\tcb@input@library=\tcb@input@library@ex%