summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/CHANGES18
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/README2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdfbin361340 -> 361345 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex38
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex149
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex39
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex19
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdfbin5222148 -> 5275975 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex9
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex59
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex40
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex4
-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/tcbraster.code.tex10
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex4
-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.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty81
24 files changed, 375 insertions, 131 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
index 2e04c726bc6..07122cf9d68 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -706,3 +706,19 @@ version 3.35 (2015/01/07)
- text color implementation changed to fix some color problems
- new options: 'upperbox', 'visible', 'invisible'
- documentation complemented
+
+version 3.36 (2015/01/09)
+- bug fix: dimension settings with 'em' or 'ex' units were sometimes converted to 0pt
+- bug fix: 'boxed title' options and some algorithms of the 'fitting' library were not compatible
+- bug fix: 'fit width from' ('fitting' library) may have updated counter too often
+- new option: 'only'
+- library 'fitting': fit process can now also includes the title
+- library 'raster': new option 'raster equal skip'
+- library 'documentation':
+ * new macros and environments:
+ '\docCounter', '\docCounter*', '\docLength', '\docLength*'
+ * new options:
+ 'index command', 'index command name' (for imakeidx),
+ 'color counter', 'color length',
+ 'doclang/counter', 'doclang/counters', 'doclang/length', 'doclang/lengths'
+
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README
index 59d783cd45c..30adaaea12d 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%%
%% -------------------------------------------------------------------------------------------
%% 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 7ff3efd5b55..10da2a9d6b7 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 bb3b185249d..ee6e83eae74 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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 a4fe72836cf..e8f294be19d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -3423,3 +3423,41 @@ standard settings of the package are used (v2.40 and above), see
Section \ref{subsec:everybox} from page \pageref{subsec:everybox}.
%See \refCom{tcbhighmath} for an example.
\end{docTcbKey}
+
+\clearpage
+\begin{docTcbKey}[][doc new=2015-01-09]{only}{=\textless\meta{overlay specification}\textgreater\marg{options}}{style, no default, initially unset}
+Sets the given |tcolorbox| \meta{options} in dependency of
+a |beamer| \meta{overlay specification}. Note that this needs the |beamer| class.
+The \meta{options} will only be used on the specified |beamer| frames.
+
+\begin{dispListing}
+\documentclass{beamer}
+\usepackage[many]{tcolorbox}
+\begin{document}
+
+\begin{frame}
+ \begin{tcolorbox}[title=My title,fonttitle=\bfseries,
+ enhanced,colframe=red!50!black,colback=red!10,colbacktitle=red,
+ sidebyside,righthand width=3cm,
+ lowerbox=invisible,lower separated=false,
+ drop lifted shadow,
+ only=<1>{colbacktitle=yellow,coltitle=red!50!black,colframe=red},
+ only=<3>{colback=yellow!50,watermark text={Attention!}},
+ only=<3->{lowerbox=visible} ]
+ This is a test.
+ \begin{itemize}[<+->]
+ \item One
+ \item Two
+ \item \alert<3>{Three}
+ \item Four
+ \end{itemize}
+ \tcblower
+ \begin{equation*}
+ \int\limits_{1}^{x} \frac{1}{t}~dt = \ln(x).
+ \end{equation*}
+ \end{tcolorbox}
+\end{frame}
+
+\end{document}
+\end{dispListing}
+\end{docTcbKey}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
index 0cc49b12c16..27c4e505ded 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
@@ -172,6 +172,29 @@ The key \docAuxKey[foo]{fooaux} holds some interesting data.
\clearpage
+\begin{docCommand}[doc new=2015-01-08]{docCounter}{\marg{name}}
+ Documents a counter with given \meta{name}. The counter is automatically indexed.
+\begin{dispExample}
+The counter \docCounter{foocounter} can be used for computation.
+\end{dispExample}
+\end{docCommand}
+
+\begin{docCommand}[doc new=2015-01-08]{docCounter*}{\marg{name}}
+ Identical to \refCom{docCounter}, but without index entry.
+\end{docCommand}
+
+\begin{docCommand}[doc new=2015-01-08]{docLength}{\marg{name}}
+ Documents a counter with given \meta{name}. The counter is automatically indexed.
+\begin{dispExample}
+The length \docLength{foolength} can be used for computation.
+\end{dispExample}
+\end{docCommand}
+
+\begin{docCommand}[doc new=2015-01-08]{docLength*}{\marg{name}}
+ Identical to \refCom{docLength}, but without index entry.
+\end{docCommand}
+
+
\begin{docCommand}{docColor}{\marg{name}}
Documents a color with given \meta{name}. The color is automatically indexed.
\begin{dispExample}
@@ -184,6 +207,7 @@ The color \docColor{foocolor} is available.
\end{docCommand}
+\clearpage
\begin{docCommand}{cs}{\marg{name}}
Macro from |ltxdoc| \cite{carlisle:2007a} to typeset a command word \meta{name}
where the backslash is prefixed. The library overwrites the original macro.
@@ -209,7 +233,6 @@ This is a mandatory \marg{argument}.
\end{dispExample}
\end{docCommand}
-
\begin{docCommand}{oarg}{\marg{text}}
Macro from |ltxdoc| \cite{carlisle:2007a} to typeset a \meta{text} with
square brackets as an optional argument. The library overwrites the original macro.
@@ -487,48 +510,41 @@ with another note.
\end{docTcbKey}
-\begin{docTcbKey}{color command}{=\meta{color}}{no default, initially |Definition|}
- Sets the highlight color used by macro definitions.
-\end{docTcbKey}
-
-\begin{docTcbKey}{color environment}{=\meta{color}}{no default, initially |Definition|}
- Sets the highlight color used by environment definitions.
-\end{docTcbKey}
-
-\begin{docTcbKey}{color key}{=\meta{color}}{no default, initially |Definition|}
- Sets the highlight color used by key definitions.
+\begin{docTcbKey}{before example}{=\meta{macros}}{no default, initially \cs{par}\cs{smallskip}}
+ Sets the \meta{macros} which are executed before \refEnv{dispExample} and \refEnv{dispListing}
+ additional to \refKey{/tcb/before}.
\end{docTcbKey}
-\begin{docTcbKey}{color value}{=\meta{color}}{no default, initially |Definition|}
- Sets the highlight color used by value definitions.
+\begin{docTcbKey}{after example}{=\meta{macros}}{no default, initially empty}
+ Sets the \meta{macros} which are executed after \refEnv{dispExample} and \refEnv{dispListing}
+ additional to \refKey{/tcb/after}.
\end{docTcbKey}
-\begin{docTcbKey}{color color}{=\meta{color}}{no default, initially |Definition|}
- Sets the highlight color used by color definitions.
-\end{docTcbKey}
-\begin{docTcbKey}{color definition}{=\meta{color}}{no default, initially |Definition|}
- Sets the highlight color for \refKey{/tcb/color command}, \refKey{/tcb/color environment},
- \refKey{/tcb/color key}, \refKey{/tcb/color value}, and \refKey{/tcb/color color}.
+\clearpage
+\begin{docTcbKey}[][doc new=2015-01-09]{index command}{=\meta{macro}}{no default, initially \cs{index}}
+ Replaces the internally used \cs{index} macro by the given \meta{macro}.
+ The \meta{macro} has to take one mandatory argument like \cs{index}.
+ This option is mutually exclusive with \refKey{/tcb/index command name}.
+\begin{dispListing}
+\tcbset{index command=\myindexcommand}
+\end{dispListing}
\end{docTcbKey}
-\begin{docTcbKey}{color option}{=\meta{color}}{no default, initially |Option|}
- Sets the color used for optional arguments.
-\end{docTcbKey}
-\begin{docTcbKey}{color hyperlink}{=\meta{color}}{no default, initially |Hyperlink|}
- Sets the color for all hyper-links, i.\,e. all internal and external links.
+\begin{docTcbKey}[][doc new=2015-01-09]{index command name}{=\meta{name}}{no default, initially unset}
+ Replaces the internally used \cs{index} macro by
+ \mbox{\cs{index}\texttt{[\meta{name}]}}, i.e.\
+ \mbox{\cs{index}\texttt{\textbraceleft\ldots\textbraceright}} is replaced by
+ \mbox{\cs{index}\texttt{[\meta{name}]\textbraceleft\ldots\textbraceright}}.
+ This option is intended to be used with |imakeidx| and is
+ mutually exclusive with \refKey{/tcb/index command}.
+\begin{dispListing}
+\tcbset{index command name=mydoc}
+\end{dispListing}
\end{docTcbKey}
-\begin{docTcbKey}{before example}{=\meta{macros}}{no default, initially \cs{par}\cs{smallskip}}
- Sets the \meta{macros} which are executed before \refEnv{dispExample} and \refEnv{dispListing}
- additional to \refKey{/tcb/before}.
-\end{docTcbKey}
-\begin{docTcbKey}{after example}{=\meta{macros}}{no default, initially empty}
- Sets the \meta{macros} which are executed after \refEnv{dispExample} and \refEnv{dispListing}
- additional to \refKey{/tcb/after}.
-\end{docTcbKey}
\begin{docTcbKey}{index format}{=\meta{format}}{no default, initially |pgf|}
Determines the basic \meta{format} of the generated index.
@@ -540,7 +556,8 @@ with another note.
\item\docValue{doc}: The index is assumed to be formatted by |doc| or |ltxdoc|. The usage of |makeindex|
with |-s gind.ist| is assumed. The package |hypdoc| has to be loaded
\emph{before} |tcolorbox|.
- \item\docValue{off}: The index is not formatted by |tcolorbox|.
+ \item\docValue{off}: The index is not formatted by |tcolorbox|. Use this, if
+ the index is formatted by other package like |imakeidx|.
\end{itemize}
\end{docTcbKey}
@@ -573,6 +590,8 @@ with another note.
\end{dispListing}
\end{docTcbKey}
+\clearpage
+
\begin{docTcbKey}{index annotate}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
If set to |true|, the index entries are annotated with short descriptions
given by \refKey{/tcb/doclang/environment}, \refKey{/tcb/doclang/key},
@@ -585,6 +604,50 @@ with another note.
and others.
\end{docTcbKey}
+
+\begin{docTcbKey}{color command}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by macro definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color environment}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by environment definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color key}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by key definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color value}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by value definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new={2015-01-08}]{color counter}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by counter definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new={2015-01-08}]{color length}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by length definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color color}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by color definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color definition}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color for \refKey{/tcb/color command}, \refKey{/tcb/color environment},
+ \refKey{/tcb/color key}, \refKey{/tcb/color value}, \refKey{/tcb/color counter},
+ \refKey{/tcb/color length}, and \refKey{/tcb/color color}.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color option}{=\meta{color}}{no default, initially |Option|}
+ Sets the color used for optional arguments.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color hyperlink}{=\meta{color}}{no default, initially |Hyperlink|}
+ Sets the color for all hyper-links, i.\,e. all internal and external links.
+\end{docTcbKey}
+
+
\clearpage
The following keys are provided for language specific settings.
The English language is predefined.
@@ -601,6 +664,13 @@ The English language is predefined.
Heading text in the index for colors.
\end{langTcbKey}
+\begin{langTcbKey}[][doc new={2015-01-08}]{counter}{=\meta{text}}{no default, initially |counter|}
+ Text used in the index for counters.
+\end{langTcbKey}
+
+\begin{langTcbKey}[][doc new={2015-01-08}]{counters}{=\meta{text}}{no default, initially |Counters|}
+ Heading text in the index for counters.
+\end{langTcbKey}
\begin{langTcbKey}{environment}{=\meta{text}}{no default, initially |environment|}
Text used in the index for environments.
@@ -614,6 +684,10 @@ The English language is predefined.
Text used in \refEnv{docEnvironment}.
\end{langTcbKey}
+\begin{langTcbKey}{index}{=\meta{text}}{no default, initially |Index|}
+ Heading text for the index.
+\end{langTcbKey}
+
\begin{langTcbKey}{key}{=\meta{text}}{no default, initially |key|}
Text used in the index for keys.
\end{langTcbKey}
@@ -622,10 +696,15 @@ The English language is predefined.
Heading text used in the index for keys.
\end{langTcbKey}
-\begin{langTcbKey}{index}{=\meta{text}}{no default, initially |Index|}
- Heading text for the index.
+\begin{langTcbKey}[][doc new={2015-01-08}]{length}{=\meta{text}}{no default, initially |length|}
+ Text used in the index for lengths.
\end{langTcbKey}
+\begin{langTcbKey}[][doc new={2015-01-08}]{lengths}{=\meta{text}}{no default, initially |Lengths|}
+ Heading text in the index for lengths.
+\end{langTcbKey}
+
+
\begin{langTcbKey}[][doc new={2014-09-19}]{new}{=\meta{text}}{no default, initially |New|}
Announcement text for new content.
\end{langTcbKey}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex
index 642ec9b91f6..0c4b350e3cb 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex
@@ -19,19 +19,19 @@ The library is loaded by a package option or inside the preamble by:
\enlargethispage*{1cm}
\begin{dispExample}
-% \usepackage{lipsum}
+% \usepackage{lipsum} \tcbuselibrary{raster}
\tcbset{colframe=blue!50!black,colback=red!10!white,
- boxsep=0pt,top=1mm,bottom=1mm,left=1mm,right=1mm,
- nobeforeafter,width=(\linewidth-2mm)/3}
-
-\tcboxfit[height=8cm]{\lipsum[1]}\hfill
-\tcboxfit[height=4cm]{\lipsum[1]}\hfill
-\tcboxfit[height=2cm]{\lipsum[1]}
-
-\medskip
-\tcbset{width=(\linewidth-2mm)/2,colback=green!10!white,boxsep=1mm}
-\tcboxfit[height=4cm]{\lipsum[2]}\hfill
-\tcboxfit[height=4cm,title=With a title]{\lipsum[2]}
+ boxsep=0pt,top=1mm,bottom=1mm,left=1mm,right=1mm,
+ fit algorithm=hybrid*,raster equal skip=1mm}
+\begin{tcbraster}[raster columns=3,raster valign=bottom]
+ \tcboxfit[height=8cm]{\lipsum[1]}
+ \tcboxfit[height=4cm]{\lipsum[1]}
+ \tcboxfit[height=2cm]{\lipsum[1]}
+\end{tcbraster}
+\begin{tcbraster}[colback=green!10!white,boxsep=1mm]
+ \tcboxfit[height=4cm]{\lipsum[2]}
+ \tcboxfit[height=4cm,title=With a title]{\lipsum[2]}
+\end{tcbraster}
\end{dispExample}
\end{docCommand}
@@ -275,6 +275,19 @@ are also usable without the
\end{tcolorbox}
\end{dispExample*}
+
+
+\begin{dispExample*}{sbs,lefthand ratio=0.6}
+\tcbset{size=fbox,colback=red!5!white,
+ colframe=red!75!black}
+
+\tcboxfit[height=5cm,
+ fit fontsize macros,
+ fonttitle=\normalsize\bfseries,
+ title=Adapted title]
+{\lipsum[2]}
+
+\end{dispExample*}
\end{docTcbKey}
@@ -331,7 +344,7 @@ This is a tcolorbox.
\begin{marker}
-Typically, the optional title of a |tcolorbox| is not part of the fit operation.
+Typically but not necessarily, the optional title of a |tcolorbox| is not part of the fit operation.
If a \refKey{/tcb/fit width plus} is applied, the title is also adapted to
the new width. If counters are increased inside the title text, they may be
increased more than one time.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex
index 7a3264583c2..cf39926214d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex
@@ -257,6 +257,25 @@ If \refKey{/tcb/fit} should be used, turn over to \refEnv{tcbraster}.
\end{docTcbKey}
+\begin{docTcbKey}[][doc new=2015-01-08]{raster equal skip}{=\meta{length}}{style, no default}
+ Shortcut to set
+ \refKey{/tcb/raster before skip},
+ \refKey{/tcb/raster after skip},
+ \refKey{/tcb/raster column skip}, and
+ \refKey{/tcb/raster row skip}
+ to the same \meta{length} value.
+\begin{dispExample}
+\begin{tcbitemize}[raster equal skip=4mm,
+ size=small,colframe=red!50!black,colback=red!10!white]
+ \tcbitem One
+ \tcbitem Two
+ \tcbitem Three
+ \tcbitem Four
+\end{tcbitemize}
+\end{dispExample}
+\end{docTcbKey}
+
+
\clearpage
\begin{docTcbKey}[][doc new=2014-11-10]{raster left skip}{=\meta{length}}{no default, initially |0pt|}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index 4f3599d2ba6..b6c11367e9a 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 0387dcb2cb0..29b1323fc0e 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -78,6 +78,8 @@
color key=DarkViolet,
color value=Teal,
color color=Teal,
+ color counter=Orange!85!black,
+ color length=Orange!85!black,
index colorize,index annotate}
\urlstyle{sf}
@@ -107,8 +109,8 @@
\renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1}
\renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1}
-\def\version{3.35}%
-\def\datum{2015/01/07}%
+\def\version{3.36}%
+\def\datum{2015/01/09}%
\makeindex
\hypersetup{
@@ -151,6 +153,7 @@
brackets,
colDef,colOpt,cs,
docAuxCommand,docColor,docAuxEnvironment,docAuxKey,
+ docCounter,docLength,
meta,marg,
oarg,
refCom,refEnv,refKey,
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index 01971c883f5..70e36b1c073 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\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 413eab39e2b..0ae88d8f606 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\tcbuselibrary{listings,skins,xparse}
@@ -73,12 +73,16 @@
doclang/.cd,
color/.store in=\kvtcb@text@color,
colors/.store in=\kvtcb@text@colors,
+ counter/.store in=\kvtcb@text@counter,
+ counters/.store in=\kvtcb@text@counters,
environment content/.store in=\kvtcb@text@envcontent,
environment/.store in=\kvtcb@text@env,
environments/.store in=\kvtcb@text@envs,
+ index/.store in=\kvtcb@text@index,
key/.store in=\kvtcb@text@key,
keys/.store in=\kvtcb@text@keys,
- index/.store in=\kvtcb@text@index,
+ length/.store in=\kvtcb@text@length,
+ lengths/.store in=\kvtcb@text@lengths,
new/.store in=\kvtcb@text@new,
pageshort/.store in=\kvtcb@text@pageshort,
updated/.store in=\kvtcb@text@updated,
@@ -96,8 +100,11 @@
color environment/.store in=\kvtcb@col@environment,
color key/.store in=\kvtcb@col@key,
color value/.store in=\kvtcb@col@value,
+ color counter/.store in=\kvtcb@col@counter,
+ color length/.store in=\kvtcb@col@length,
color color/.store in=\kvtcb@col@color,
- color definition/.style={color command={#1},color environment={#1},color key={#1},color value={#1},color color={#1}},
+ color definition/.style={color command={#1},color environment={#1},color key={#1},
+ color value={#1},color color={#1},color counter={#1},color length={#1}},
color option/.store in=\kvtcb@col@opt,
color hyperlink/.store in=\kvtcb@colhyper,
color frame/.store in=\kvtcb@colhyper,
@@ -109,6 +116,8 @@
index format/.store in=\idx@format,
index colorize/.is if=tcb@doc@colorize,%
index annotate/.is if=tcb@doc@annotate,%
+ index command/.code={\def\kvtcb@index@command##1{#1{##1}}},%
+ index command name/.code={\def\kvtcb@index@command##1{\index[#1]{##1}}},%
doc left/.dimstore in=\kvtcb@doc@left,
doc right/.dimstore in=\kvtcb@doc@right,
doc left indent/.dimstore in=\kvtcb@doc@indentleft,
@@ -135,10 +144,12 @@
index german settings/.style={index actual={=},index quote={!},index level={>}},
english language/.code={\tcbset{doclang/.cd,
color=color,colors=Colors,
+ counter=counter,counters=Counters,
environment content=environment content,
environment=environment,environments=Environments,
- key=key,keys=Keys,
index=Index,
+ key=key,keys=Keys,
+ length=length,lengths=Lengths,
new=New,
pageshort={P.},
updated=Updated,
@@ -193,6 +204,11 @@
\iftcb@doc@colorize\textcolor{#2}{\tcb@scantokens{#1}}\else\tcb@scantokens{#1}\fi%
}
+\def\tcb@Index@Print@ComCA#1#2#3{%
+ \iftcb@doc@colorize\textcolor{#2}{\tcb@cs{#1}}\else\tcb@cs{#1}\fi%
+ \iftcb@doc@annotate\ #3\fi%
+}
+
\def\tcb@Index@Print@ComC#1#2{%
\iftcb@doc@colorize\textcolor{#2}{\tcb@cs{#1}}\else\tcb@cs{#1}\fi%
}
@@ -216,12 +232,22 @@
\newrobustcmd{\tcbIndexPrintColC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@color}}
\def\tcb@Print@Col#1{\textcolor{\kvtcb@col@color}{\bfseries\tcb@scantokens{#1}}}
-\def\tcb@index@Com#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintComC{#1}}\fi}
-\def\tcb@index@Env#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintEnvCA{#1}}\index{\kvtcb@text@envs\idx@level#1\idx@actual\tcbIndexPrintEnvC{#1}}\fi}
-\def\tcb@index@Key#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintKeyCA{#1}}\index{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{#1}}\fi}%
-\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\index{#2\idx@actual\tcbIndexPrintKeyCA{#2}}\index{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{/#1/}\idx@level#2\idx@actual\tcbIndexPrintKeyC{#2}}\fi}%
-\def\tcb@index@Val#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintValCA{#1}}\index{\kvtcb@text@values\idx@level#1\idx@actual\tcbIndexPrintValC{#1}}\fi}
-\def\tcb@index@Col#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintColCA{#1}}\index{\kvtcb@text@colors\idx@level#1\idx@actual\tcbIndexPrintColC{#1}}\fi}
+\newrobustcmd{\tcbIndexPrintCountCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@counter}{\kvtcb@text@counter}}
+\newrobustcmd{\tcbIndexPrintCountC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@counter}}
+\def\tcb@Print@Count#1{\textcolor{\kvtcb@col@counter}{\bfseries\tcb@scantokens{#1}}}
+
+\newrobustcmd{\tcbIndexPrintLenCA}[1]{\tcb@Index@Print@ComCA{#1}{\kvtcb@col@length}{\kvtcb@text@length}}
+\newrobustcmd{\tcbIndexPrintLenC}[1]{\tcb@Index@Print@ComC{#1}{\kvtcb@col@length}}
+\def\tcb@Print@Len#1{\textcolor{\kvtcb@col@length}{\bfseries\tcb@cs{#1}}}
+
+\def\tcb@index@Com#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintComC{#1}}\fi}
+\def\tcb@index@Env#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintEnvCA{#1}}\kvtcb@index@command{\kvtcb@text@envs\idx@level#1\idx@actual\tcbIndexPrintEnvC{#1}}\fi}
+\def\tcb@index@Key#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintKeyCA{#1}}\kvtcb@index@command{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{#1}}\fi}%
+\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\kvtcb@index@command{#2\idx@actual\tcbIndexPrintKeyCA{#2}}\kvtcb@index@command{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{/#1/}\idx@level#2\idx@actual\tcbIndexPrintKeyC{#2}}\fi}%
+\def\tcb@index@Val#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintValCA{#1}}\kvtcb@index@command{\kvtcb@text@values\idx@level#1\idx@actual\tcbIndexPrintValC{#1}}\fi}
+\def\tcb@index@Col#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintColCA{#1}}\kvtcb@index@command{\kvtcb@text@colors\idx@level#1\idx@actual\tcbIndexPrintColC{#1}}\fi}
+\def\tcb@index@Count#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintCountCA{#1}}\kvtcb@index@command{\kvtcb@text@counters\idx@level#1\idx@actual\tcbIndexPrintCountC{#1}}\fi}
+\def\tcb@index@Len#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintLenCA{#1}}\kvtcb@index@command{\kvtcb@text@lengths\idx@level#1\idx@actual\tcbIndexPrintLenC{#1}}\fi}
\def\brackets#1{{\ttfamily\char`\{}#1{\ttfamily\char`\}}}
@@ -319,6 +345,16 @@
\IfBooleanTF{#1}{}{\tcb@index@Col{#2}}%
}
+\DeclareDocumentCommand\docCounter{sm}{%
+ \tcb@Print@Count{#2}%
+ \IfBooleanTF{#1}{}{\tcb@index@Count{#2}}%
+}
+
+\DeclareDocumentCommand\docLength{sm}{%
+ \tcb@Print@Len{#2}%
+ \IfBooleanTF{#1}{}{\tcb@index@Len{#2}}%
+}
+
\DeclareDocumentCommand\docValue{sm}{%
\tcb@Print@Val{#2}%
\IfBooleanTF{#1}{}{\tcb@index@Val{#2}}%
@@ -401,6 +437,7 @@
\tcbset{%
reset@documentation/.style={%
+ index command=\index,%
index format=pgf,
english language,
documentation listing style=tcbdocumentation,
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index 538600dbd0a..e1476cc29fe 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
@@ -224,21 +224,18 @@
}
\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}%
+ \tcbdimto\tcb@w@title{\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)}%
+ \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}%
+ \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%
+ \tcbdimto\tcb@fit@@line{\kvtcb@fit@skip\tcbfitdim}%
+ \tcbdimto\tcb@w@upper{\kvtcb@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}%
}%
\long\def\tcbox@inner@fitbox#1{%
@@ -262,7 +259,9 @@
\advance\count@ 1\relax%
}%
%
- \tcb@fit@@box@titled%
+ \tcb@set@@phantom%
+ \tcb@set@@title%
+ \tcb@fit@@box%
%
% height fit
\ifdim\kvtcb@height@fixed@plus>0pt\relax%
@@ -282,17 +281,17 @@
\ifdim\kvtcb@fit@plus@width>0pt\relax%
\ifnum\count@<\kvtcb@fit@maxstep\relax%
\ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
- \tcb@lowerfitdim\kvtcb@width%
+ \tcb@lowerfitdim\dimexpr\kvtcb@width\relax%
\tcb@upperfitdim\dimexpr\kvtcb@width+\kvtcb@fit@plus@width\relax%
\tcbdimto\kvtcb@width{\tcb@upperfitdim}%
- \tcb@fit@@box@titled%
+ \tcb@fit@@box%
\ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
\else%
\ifnum\count@<\kvtcb@fit@maxstep\relax%
\tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}%
\tcbdimto\kvtcb@width{(\tcb@lowerfitdim+\tcb@upperfitdim)/2}%
\loop%
- \tcb@fit@@box@titled%
+ \tcb@fit@@box%
\tcb@continuetrue%
\ifnum\count@<\kvtcb@fit@maxstep\relax%
\ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxwidthdiff\relax%
@@ -309,17 +308,17 @@
\fi%
\iftcb@continue%
\ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
- \tcb@lowerfitdim\kvtcb@width%
+ \tcb@lowerfitdim\dimexpr\kvtcb@width\relax%
\tcbdimto\kvtcb@width{(\tcb@lowerfitdim+\tcb@upperfitdim)/2}%
\else%
- \tcb@upperfitdim\kvtcb@width%
+ \tcb@upperfitdim\dimexpr\kvtcb@width\relax%
\tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}%
\tcbdimto\kvtcb@width{(\tcb@lowerfitdim+\tcb@upperfitdim)/2}%
\fi%
\else%
\ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax%
\tcbdimto\kvtcb@width{\tcb@upperfitdim}%
- \tcb@fit@@box@titled%
+ \tcb@fit@@box%
\fi%
\fi%
\iftcb@continue \repeat%
@@ -350,6 +349,7 @@
\fi%
%
\edef\tcbfitsteps{\the\count@}%
+ \tcb@set@@dimensions%
\tcb@draw@color@box%
}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index 1bf90b5b9cc..4f7b4241c28 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\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 0e18b6bf493..f5b766a1857 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\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 101e5a29fb3..afc815f7052 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\RequirePackage{pdftexcmds}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index 1bec4c8e5c1..260f3ea0798 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\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 cb14df6edab..22c9c8afee4 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\RequirePackage{minted}[2011/09/17]
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
index b49a87afb6b..4672742f3e8 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 3.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\newcounter{tcbrastercolumn}
\newcounter{tcbrasterrow}
@@ -48,6 +48,9 @@
raster column skip/.store in=\kvtcb@raster@xskip,
raster row skip/.store in=\kvtcb@raster@yskip,
%
+ raster equal skip/.style={raster before skip=#1,raster after skip=#1,
+ raster column skip=#1,raster row skip=#1},
+ %
raster@halign/.store in=\kvtcb@raster@halign,
raster halign/.is choice,
raster halign/center/.style={raster@halign=\centering},
@@ -75,9 +78,8 @@
\tcbset{
raster reset/.style={
raster width=\linewidth,raster height=0pt,
- raster before skip=2mm, raster after skip=2mm,
+ raster equal skip=2mm,
raster columns=2,raster rows=2,
- raster column skip=2mm,raster row skip=2mm,
raster left skip=0pt,raster right skip=0pt,
raster halign=left,raster valign=center,
raster equal height=none,
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index ff9cff075e8..311de930cd8 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\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 40c7e0e9ff7..459b73a63cf 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\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 0ff43c63443..5f1eb1793c5 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\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 6aa5d0a7f52..82d0a53d48d 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% 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.35}
+\tcb@set@library@version{3.36}
\RequirePackage{xparse}[2013/12/31]
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index 47d4d14f8ed..9951d150ca5 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.35 (2015/01/07)
+%% The LaTeX package tcolorbox - version 3.36 (2015/01/09)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2015/01/07 version 3.35 text color boxes]
-\def\tcb@version{3.35}
+\ProvidesPackage{tcolorbox}[2015/01/09 version 3.36 text color boxes]
+\def\tcb@version{3.36}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -77,7 +77,7 @@
}
\def\tcb@comp@arc@fix{%
- \let\tcb@outer@arc=\kvtcb@outerarc%
+ \tcbdimto\tcb@outer@arc{\kvtcb@outerarc}%
}
\def\tcb@use@auto@parskip{%
@@ -160,7 +160,7 @@
attach title to upper/.style={detach title,before upper={\tcbtitle#1}},
attach title to upper/.default=,
subtitle style/.store in=\kvtcb@subtitle@style,%
- width/.dimstore in=\kvtcb@width,
+ width/.store in=\kvtcb@width,
text width/.style={width={#1+\kvtcb@left@rule+\kvtcb@right@rule+\kvtcb@boxsep*2+\kvtcb@leftupper+\kvtcb@rightupper}},%
add to width/.code={\tcbdimto\kvtcb@width{\kvtcb@width+(#1)}},%
boxsep/.store in=\kvtcb@boxsep,
@@ -184,7 +184,7 @@
\let\kvtcb@right@rule=\kvtcb@top@rule@stand%
\let\kvtcb@title@rule=\kvtcb@top@rule@stand%
},
- arc/.dimstore in=\kvtcb@arc,
+ arc/.store in=\kvtcb@arc,
outer arc/.code={\def\kvtcb@outerarc{#1}\let\tcb@comp@arc=\tcb@comp@arc@fix},
auto outer arc/.code={\let\tcb@comp@arc=\tcb@comp@arc@auto},
sharpish corners/.style={arc=0pt,outer arc=0pt},
@@ -496,6 +496,7 @@
on line/.style={tcbox raise base,nobeforeafter},
shape@of@skin/.store in=\tcb@shapeofskin,
ignore nobreak/.is if=tcb@ignorenobreak,%
+ only/.code args={<#1>#2}{\only<#1>{\tcbset{#2}}},%
}
\def\kvtcb@beforebox{}
@@ -570,28 +571,58 @@
\long\def\tcb@colorbox{%
\@ifnextchar[{\tcb@@icolorbox}{\tcb@@icolorbox[]}}
-\def\tcb@set@@dim@and@title{%
- % computation of text width
- \tcbdimto\tcb@width{\kvtcb@width}%
- \tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}%
- \tcbdimto\tcb@temp{\tcb@innerwidth-\kvtcb@boxsep*2}%
- \tcbdimto\tcb@w@upper{\tcb@temp-\kvtcb@leftupper-\kvtcb@rightupper}%
+
+\def\tcb@set@@phantom{%
\ifx\kvtcb@phantom\@empty\tcb@hasPhantomfalse\else%
\tcb@hasPhantomtrue%
\sbox\tcb@phantombox{\kvtcb@phantom}%
\fi%
+}
+
+\def\tcb@set@@title{%
\ifx\kvtcb@title\@empty\tcb@hasTitlefalse\tcb@specialtitle@hook\else%
\tcb@hasTitletrue%
- \tcbdimto\tcb@w@title{\tcb@temp-\kvtcb@lefttitle-\kvtcb@righttitle}%
+ \tcbdimto\tcb@w@title{\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)}%
\begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}%
\fi%
}
+\def\tcb@set@@dimensions{%
+ % sanitize
+ \tcbdimto\kvtcb@arc{\kvtcb@arc}%
+ \tcbdimto\kvtcb@left@rule{\kvtcb@left@rule}%
+ \tcbdimto\kvtcb@right@rule{\kvtcb@right@rule}%
+ \tcbdimto\kvtcb@title@rule{\kvtcb@title@rule}%
+ \tcbdimto\kvtcb@top@rule@stand{\kvtcb@top@rule@stand}%
+ \tcbdimto\kvtcb@top@rule@break{\kvtcb@top@rule@break}%
+ \tcbdimto\kvtcb@bottom@rule@stand{\kvtcb@bottom@rule@stand}%
+ \tcbdimto\kvtcb@bottom@rule@break{\kvtcb@bottom@rule@break}%
+ \tcbdimto\kvtcb@boxsep{\kvtcb@boxsep}%
+ \tcbdimto\kvtcb@lefttitle{\kvtcb@lefttitle}%
+ \tcbdimto\kvtcb@leftupper{\kvtcb@leftupper}%
+ \tcbdimto\kvtcb@leftlower{\kvtcb@leftlower}%
+ \tcbdimto\kvtcb@righttitle{\kvtcb@righttitle}%
+ \tcbdimto\kvtcb@rightupper{\kvtcb@rightupper}%
+ \tcbdimto\kvtcb@rightlower{\kvtcb@rightlower}%
+ \tcbdimto\kvtcb@top{\kvtcb@top}%
+ \tcbdimto\kvtcb@toptitle{\kvtcb@toptitle}%
+ \tcbdimto\kvtcb@bottom{\kvtcb@bottom}%
+ \tcbdimto\kvtcb@bottomtitle{\kvtcb@bottomtitle}%
+ \tcbdimto\kvtcb@middle{\kvtcb@middle}%
+ % computation of text width
+ \tcbdimto\tcb@width{\kvtcb@width}%
+ \tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}%
+ %\tcbdimto\tcb@temp{\tcb@innerwidth-\kvtcb@boxsep*2}%
+ \tcbdimto\tcb@w@upper{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}%
+ %\tcbdimto\tcb@w@upper{\tcb@temp-\kvtcb@leftupper-\kvtcb@rightupper}%
+}
+
\def\tcb@set@@sidebyside{%
\iftcb@sidebyside%
\tcbset{breakable@false}%
\def\tcb@minipage{\csname tcb@minipage@\kvtcb@sbs@align\endcsname}%
\tcbdimto\tcb@w@upper@real{\tcb@w@upper}%
+ \tcbdimto\kvtcb@sbs@gap{\kvtcb@sbs@gap}%
\tcbdimto\tcb@w@sbs{\tcb@w@upper@real-\kvtcb@sbs@gap}%
\tcb@sbs@quota%
\fi%
@@ -606,7 +637,7 @@
\end{tcb@savebox}%
\letcs{\current@color}{\string\color@tcbcol@lower}%
\unless\iftcb@sidebyside%
- \tcbdimto\tcb@w@lower{\tcb@temp-\kvtcb@leftlower-\kvtcb@rightlower}%
+ \tcbdimto\tcb@w@lower{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@leftlower-\kvtcb@rightlower}%
\fi%
\tcb@hasLowertrue%
\let\tcb@after@box=\kvtcb@after@lower%
@@ -627,7 +658,9 @@
\def\tcb@@capture@minipage{%
\let\tcb@val@raisebase=\tcb@zpt%
- \tcb@set@@dim@and@title%
+ \tcb@set@@phantom%
+ \tcb@set@@title%
+ \tcb@set@@dimensions%
\tcb@set@@sidebyside%
\tcb@set@@upper@and@lower%
}
@@ -1231,22 +1264,26 @@
\long\def\tcbox@inner@hbox#1{%
\tcbset{breakable@false,sidebyside=false}%
+ \tcb@set@@phantom%
\sbox\tcb@upperbox{\color{tcbcol@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}%
- \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}%
- \tcbdimto{\tcb@val@raisebase}{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}%
- \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}%
+ \tcbdimto\tcb@val@raisebase{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}%
+ \tcbdimto\kvtcb@width{\wd\tcb@upperbox+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}%
\tcb@hasLowerfalse%
- \tcb@set@@dim@and@title%
+ \tcb@set@@title%
+ \tcb@set@@dimensions%
\tcb@draw@color@box%
}
\long\def\tcbox@inner@minipage#1{%
\tcbset{breakable@false,sidebyside=false}%
\let\tcb@val@raisebase=\tcb@zpt%
- \tcb@set@@dim@and@title%
+ \tcb@set@@phantom%
+ \tcb@set@@title%
+ \tcb@set@@dimensions%
\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{tcbcol@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}%
- \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}%
- \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}%
+ %\tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}%
+ %\tcbdimto\kvtcb@width{\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}%
+ %\let\tcb@width\kvtcb@width%
\tcb@hasLowerfalse%
\tcb@draw@color@box%
}