summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-17 23:17:32 +0000
committerKarl Berry <karl@freefriends.org>2013-04-17 23:17:32 +0000
commit0c5f06400403c02946d916560fc5cea65e1abe4b (patch)
tree97a362e2e8566cd3ff4c84970d383ab4db17d2c9
parent349bac64b70fa1b4e88f05d28d2373e43e601c6a (diff)
tcolorbox (17apr13)
git-svn-id: svn://tug.org/texlive/trunk@30004 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/CHANGES24
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/README2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdfbin147400 -> 148406 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex23
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex196
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex38
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex13
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex147
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex122
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdfbin1780743 -> 1879312 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex35
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex19
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex91
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex98
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty93
19 files changed, 783 insertions, 130 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
index 52598a4266e..6b21d50de24 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 2.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -162,5 +162,27 @@ version 2.10 (2013/04/09)
'title code app', 'title code pre'
- colorization of source code snippets in the documentation
+version 2.20 (2013/04/17)
+- bug fix: problem with breaking boxes after headings
+- new feature: support for boxes with side by side content
+- new keys:
+ 'sidebyside', 'sidebyside align', 'sidebyside gap',
+ 'lefthand width', 'righthand width', 'lefthand ratio', 'righthand ratio'
+- key 'nofloat' documented
+- new keys for the 'listings' library:
+ 'listing side text', 'text side listing'
+ 'listing outside text', 'text outside listing'
+- new keys for the 'skins' library:
+ 'frame hidden', 'interior hidden', 'segmentation hidden', 'title hidden'
+- new environments for the 'documentation' library:
+ 'dispExample*', 'dispListing*'
+- the default style for 'highlight math' is changed to have no title
+- minor change of internal width computation
+- minor internal fixes
+- slight overhaul of the documentation
+
+
+
+
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README
index 03bcfc8e4bd..026ac798416 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 2.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2013 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 6c54a56761a..f1a94de86cf 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 f3b99f8ea71..3359233dee9 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 2.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
@@ -70,7 +70,18 @@
\begin{tcblisting}{colback=red!5!white,colframe=red!75!black}
This is a \LaTeX\ example:
-$\displaystyle\sum\limits_{i=1}^n i = \frac{n(n+1)}{2}$.
+\begin{equation}
+\sum\limits_{i=1}^n i = \frac{n(n+1)}{2}.
+\end{equation}
+\end{tcblisting}
+
+
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing side text,
+ title=Side by side,fonttitle=\bfseries}
+This is a \LaTeX\ example:
+\begin{equation}
+\sum\limits_{i=1}^n i = \frac{n(n+1)}{2}.
+\end{equation}
\end{tcblisting}
@@ -84,8 +95,10 @@ $\displaystyle\sum\limits_{i=1}^n i = \frac{n(n+1)}{2}$.
arc=0mm, colback=blue!5!white,colframe=blue!75!black}{mytheorem}{theorem}
\begin{theo}{Summation of Numbers}{summation}
- For all natural number $n$ it holds:\\[2mm]
- $\displaystyle\sum\limits_{i=1}^n i = \frac{n(n+1)}{2}$.
+ For all natural number $n$ it holds:
+ \begin{equation}
+ \tcbhighmath{\sum\limits_{i=1}^n i = \frac{n(n+1)}{2}.}
+ \end{equation}
\end{theo}
We have given Theorem \ref{theorem:summation} on page \pageref{theorem:summation}.
@@ -106,13 +119,11 @@ We have given Theorem \ref{theorem:summation} on page \pageref{theorem:summation
%----------------------------------------------------------
\section{Breakable Boxes}
-
\begin{tcolorbox}[enhanced,breakable,
colback=blue!5!white,colframe=blue!75!black,title=Breakable box,
watermark color=white,watermark text=\Roman{tcbbreakpart}]
\lipsum[1-18]
\end{tcolorbox}
-
\end{document}
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 f78733ea23a..88b534dda7b 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -12,11 +12,11 @@ starting from page \pageref{sec:latextutorial}.
\subsection{Title}
\begin{docTcbKey}{title}{=\meta{text}}{no default, initially empty}
Creates a heading line with \meta{text} as content.
-\begin{dispExample}
+\begin{dispExample*}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[title=My heading line]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
\begin{docTcbKey}{notitle}{}{no value, initially set}
@@ -127,74 +127,78 @@ Now, the saved part is used:
+\clearpage
\subsection{Colors and Fonts}
\begin{docTcbKey}{colback}{=\meta{color}}{no default, initially \texttt{black!5!white}}
Sets the background \meta{color} of the box.
-\begin{dispExample}
+\begin{dispExample*}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[colback=white]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
\begin{docTcbKey}{colframe}{=\meta{color}}{no default, initially \texttt{black!75!white}}
Sets the frame \meta{color} of the box.
-\begin{dispExample}
+\begin{dispExample*}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[colframe=red!50!yellow]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
-
\begin{docTcbKey}{colupper}{=\meta{color}}{no default, initially \texttt{black}}
Sets the text \meta{color} of the upper part.
-\begin{dispExample}
-\begin{tcolorbox}[colupper=yellow,colback=blue!50,colframe=blue]
+\begin{dispExample*}{sbs,lefthand ratio=0.6}
+\begin{tcolorbox}[colupper=yellow,
+ colback=blue!50,colframe=blue]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
\begin{docTcbKey}{collower}{=\meta{color}}{no default, initially \texttt{black}}
Sets the text \meta{color} of the lower part.
-\begin{dispExample}
-\begin{tcolorbox}[collower=yellow,colback=blue!50,colframe=blue]
+\begin{dispExample*}{sbs,lefthand ratio=0.6}
+\begin{tcolorbox}[collower=yellow,
+ colback=blue!50,colframe=blue]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
\begin{docTcbKey}{coltext}{=\meta{color}}{style, no default, initially \texttt{black}}
Sets the text \meta{color} of the box. This is an abbreviation for setting
|colupper| and |collower| to the same value.
-\begin{dispExample}
-\begin{tcolorbox}[coltext=yellow,colback=blue!50,colframe=blue]
+\begin{dispExample*}{sbs,lefthand ratio=0.6}
+\begin{tcolorbox}[coltext=yellow,
+ colback=blue!50,colframe=blue]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
\begin{docTcbKey}{coltitle}{=\meta{color}}{no default, initially \texttt{white}}
Sets the title text \meta{color} of the box.
-\begin{dispExample}
-\begin{tcolorbox}[coltitle=blue!50!black,colframe=blue!25,title=Test]
+\begin{dispExample*}{sbs,lefthand ratio=0.6}
+\begin{tcolorbox}[coltitle=blue!50!black,
+ colframe=blue!25,title=Test]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
-
+\clearpage
\begin{docTcbKey}{fontupper}{=\meta{text}}{no default, initially empty}
Sets \meta{text} before the content of the upper part (e.\,g.\ font settings).
\begin{dispExample}
@@ -986,14 +990,17 @@ One & Two & Three \\\hline\hline
\begin{dispExample}
% \usepackage{tikz}
% \usetikzlibrary{skins,listings}
-\tcbset{tikz lower,listing and text,fonttitle=\bfseries,
- bicolor,colback=LightBlue!50!white,colbacklower=white,colframe=black}
+\tcbset{tikz lower,listing side text,fonttitle=\bfseries,
+ bicolor,colback=LightBlue!50!white,colbacklower=white,colframe=black,
+ righthand width=3cm}
\begin{tcblisting}{title=TikZ drawing}
-\path[fill=yellow,draw=yellow!75!red] (0,0) circle (1cm);
+\path[fill=yellow,draw=yellow!75!red]
+ (0,0) circle (1cm);
\fill[red] (45:5mm) circle (1mm);
\fill[red] (135:5mm) circle (1mm);
-\draw[line width=1mm,red] (215:5mm) arc (215:325:5mm);
+\draw[line width=1mm,red]
+ (215:5mm) arc (215:325:5mm);
\end{tcblisting}
\end{dispExample}
\end{docTcbKey}
@@ -1144,6 +1151,147 @@ This is the lower part.
{\tcbusetemp}
+\begin{docTcbKey}{nofloat}{}{style, initially set}
+ Turns the floating behavior off.
+\end{docTcbKey}
+
+
+\clearpage
+\subsection{Side by Side}\label{subsec:sidebyside}
+\begin{marker}
+ Further side by side options for code examples are
+ \refKey{/tcb/listing side text},
+ \refKey{/tcb/text side listing},
+ \refKey{/tcb/listing outside text}, and
+ \refKey{/tcb/text outside listing}.
+\end{marker}
+
+\begin{docTcbKey}{sidebyside}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|}
+Normally, the upper part and the lower part of the box have their positions
+as their names suggest. If |sidebyside| is set to |true|, the upper part
+is drawn \emph{left-handed} and the lower part is drawn \emph{right-handed}.
+Both parts are drawn together with the geometry settings of the upper part but the
+space is divided horizontally according to the following options.
+Colors, fonts, and box content additions are used individually.
+The resulting box is unbreakable.
+
+\begin{dispExample}
+\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries}
+
+\begin{tcolorbox}[title=My title,sidebyside]
+This is the upper (\textit{left-handed}) part.
+\tcblower
+This is the lower (\textit{right-handed}) part.
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{sidebyside align}{=\meta{alignment value}}{no default, initially |center|}
+ Sets the vertical alignment for the left-handed and right-handed part.
+ Feasible values are |center|, |top|, and |bottom|.
+\begin{dispExample}
+\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries,nobeforeafter,
+ left=2mm,right=2mm,sidebyside,sidebyside gap=6mm,width=(\linewidth-2mm)/3}
+
+\begin{tcolorbox}[adjusted title=center,sidebyside align=center]
+This is a text which is too long for one line.
+\tcblower
+This is a short text.
+\end{tcolorbox}\hfill
+\begin{tcolorbox}[adjusted title=top,sidebyside align=top]
+This is a text which is too long for one line.
+\tcblower
+This is a short text.
+\end{tcolorbox}\hfill
+\begin{tcolorbox}[adjusted title=bottom,sidebyside align=bottom]
+This is a text which is too long for one line.
+\tcblower
+This is a short text.
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+\clearpage
+\begin{docTcbKey}{sidebyside gap}{=\meta{length}}{no default, initially |10mm|}
+Sets the horizontal distance between the left-handed and right-handed part to
+\meta{length}.
+\begin{dispExample}
+\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries,nobeforeafter,
+ sidebyside,width=(\linewidth-2mm)/2}
+
+\begin{tcolorbox}[adjusted title=Wide gap,sidebyside gap=30mm]
+This is a text which is too long for one line.
+\tcblower
+This is a short text.
+\end{tcolorbox}\hfill
+\begin{tcolorbox}[adjusted title=Narrow gap,sidebyside gap=1mm]
+This is a text which is too long for one line.
+\tcblower
+This is a short text.
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{lefthand width}{=\meta{length}}{no default, initially unset}
+Sets the width of the left-handed part to the given \meta{length}.
+\begin{dispExample}
+\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries}
+
+\begin{tcolorbox}[title=My title,sidebyside,lefthand width=3cm]
+This is the upper (\textit{left-handed}) part.
+\tcblower
+This is the lower (\textit{right-handed}) part.
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+\enlargethispage*{1cm}
+\begin{docTcbKey}{righthand width}{=\meta{length}}{no default, initially unset}
+Sets the width of the right-handed part to the given \meta{length}.
+\begin{dispExample}
+\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries}
+
+\begin{tcolorbox}[title=My title,sidebyside,righthand width=3cm]
+This is the upper (\textit{left-handed}) part.
+\tcblower
+This is the lower (\textit{right-handed}) part.
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+\clearpage
+\begin{docTcbKey}{lefthand ratio}{=\meta{fraction}}{no default, initially |0.5|}
+Sets the width of the left-handed part to the given \meta{fraction} of
+the available space. \meta{fraction} is a value between |0| and |1|.
+\begin{dispExample}
+\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries}
+
+\begin{tcolorbox}[title=My title,sidebyside,lefthand ratio=0.25]
+This is the upper (\textit{left-handed}) part.
+\tcblower
+This is the lower (\textit{right-handed}) part.
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{righthand ratio}{=\meta{fraction}}{no default, initially |0.5|}
+Sets the width of the right-handed part to the given \meta{fraction} of
+the available space. \meta{fraction} is a value between |0| and |1|.
+\begin{dispExample}
+\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries}
+
+\begin{tcolorbox}[title=My title,sidebyside,righthand ratio=0.25]
+This is the upper (\textit{left-handed}) part.
+\tcblower
+This is the lower (\textit{right-handed}) part.
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+
\clearpage
\subsection{Embedding into the Surroundings}\label{subsec:surroundings}
Typically, but not necessarily, a |tcolorbox| is put inside a separate paragraph
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 b6a9405acb0..456556d55d3 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
@@ -137,14 +137,32 @@ This is an optional \oarg{argument}.
The appearance is controlled by \refKey{/tcb/documentation listing style}
and the style \refKey{/tcb/docexample}. It may be
changed by redefining this style.
+{
+%\tcbset{before lower app={\tcbset{docexample/.style={docexample original}}}}
+%\tcbset{docexample/.style={docexample original}}%
\begin{xdispExample}
\begin{dispExample}
This is a \LaTeX\ example.
\end{dispExample}
\end{xdispExample}
+}
\end{docEnvironment}}
+{\let\xdispExample\dispExample
+ \let\endxdispExample\enddispExample
+\begin{docEnvironment}{dispExample*}{\marg{options}}
+ The starred version of \refEnv{dispExample} takes \refEnv{tcolorbox} \meta{options}
+ as parameter. These \meta{options} are executed after \refKey{/tcb/docexample}.
+\begin{xdispExample}
+\begin{dispExample*}{sidebyside}
+This is a \LaTeX\ example.
+\end{dispExample*}
+\end{xdispExample}
+\end{docEnvironment}}
+
+
+\clearpage
\begin{docEnvironment}{dispListing}{}
Creates a colored box based on a \refEnv{tcolorbox}.
It displays the environment content as source code.
@@ -158,7 +176,17 @@ This is a \LaTeX\ example.
\end{dispExample}
\end{docEnvironment}
-\clearpage
+\begin{docEnvironment}{dispListing*}{\marg{options}}
+ The starred version of \refEnv{dispListing} takes \refEnv{tcolorbox} \meta{options}
+ as parameter. These \meta{options} are executed after \refKey{/tcb/docexample}.
+\begin{dispExample}
+\begin{dispListing*}{title=My listing}
+This is a \LaTeX\ example.
+\end{dispListing*}
+\end{dispExample}
+\end{docEnvironment}
+
+
\begin{docEnvironment}{absquote}{}
Used to typeset an abstract as quoted and small text.
\begin{dispExample}
@@ -169,6 +197,7 @@ heading line. Optionally, such a box can be split in an upper and a lower part.
\end{dispExample}
\end{docEnvironment}
+\clearpage
\begin{docCommand}{tcbmakedocSubKey}{\marg{name}\marg{key path}}
Creates a new environment \meta{name} based on \refEnv{docKey} for the
documentation of keys with the given \meta{key path} as default.
@@ -206,7 +235,7 @@ We have created \refKey{/foo/footitle} as an example.
\end{dispExample}
\end{docCommand}
-\clearpage
+%
\begin{docCommand}{colDef}{\marg{text}}
Sets \meta{text} with the definition color, see \refKey{/tcb/color definition}.
\begin{dispExample}
@@ -222,12 +251,13 @@ This is my \colOpt{text}.
\end{docCommand}
+\clearpage
\subsection{Option Keys of the Library}
\begin{docTcbKey}{docexample}{}{style, no value}
Sets the style for \refEnv{dispExample} and \refEnv{dispListing}
with the colors |ExampleBack| and |ExampleFrame|.
- To change the appearance of the examples, this style could be
+ To change the appearance of the examples, this style can be
redefined.
\end{docTcbKey}
@@ -279,7 +309,6 @@ This is my \colOpt{text}.
\refKey{/tcb/index level}.
\end{docTcbKey}
-\clearpage
\begin{docTcbKey}{index german settings}{}{style, no value}
Sets the |makeindex| values recommended for German language texts.
This is identical to setting the following:
@@ -288,6 +317,7 @@ This is my \colOpt{text}.
\end{dispListing}
\end{docTcbKey}
+\clearpage
The following keys are provided for language specific settings.
The English language is predefined.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
index 88b99c5db49..ed4187f3518 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
@@ -21,6 +21,19 @@ $\varepsilon$-\TeX\ is assumed to be used by everybody (hopefully).
The breaking news for version 2.00 is the support for breakable boxes.
This new feature allows new applications of the package without
affecting the core package too much if you do not need boxes to break automatically.
+With version 2.20, the often requested 'side by side' mode for listings has been added.
+
+\begin{tcolorbox}[enhanced,boxrule=0mm,boxsep=0mm,frame hidden,interior hidden,
+ left=0mm,right=0mm,top=0mm,bottom=0mm,watermark opacity=0.25,watermark zoom=1.2,before=\par\smallskip,
+ watermark tikz={%
+ \path[fill=yellow,draw=yellow!75!red] (0,0) circle (1cm);
+ \fill[red] (45:5mm) circle (1mm);
+ \fill[red] (135:5mm) circle (1mm);
+ \draw[line width=1mm,red] (215:5mm) arc (215:325:5mm);}]
+Since the first public release in 2011, I received a lot of feedback from all over the world.
+I want to thank all who wrote me for supporting this package by sending bug reports
+and ideas for new or better features.
+\end{tcolorbox}
\subsection{Loading the Package}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
index 21fd295e39d..2edcab150f2 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
@@ -56,11 +56,11 @@ and in compiled form.
Saves the environment content to a file which is named by the key value of
|listing file|. Later, this file can be loaded by
|\tcbinputlisting| or |\tcbuselistingtext| or |\tcbuselistinglisting|.
-\begin{dispExample}
+\begin{dispListing}
\begin{tcboutputlisting}
This \textbf{text} is written to a standardized file for later usage.
\end{tcboutputlisting}
-\end{dispExample}
+\end{dispListing}
\end{docEnvironment}
@@ -74,7 +74,7 @@ This \textbf{text} is written to a standardized file for later usage.
\end{dispExample}
\end{docCommand}
-
+\clearpage
\begin{docCommand}{tcbuselistingtext}{}
Loads text from a file named by the key value of |listing file|.
\begin{dispExample}
@@ -90,7 +90,7 @@ This \textbf{text} is written to a standardized file for later usage.
\end{dispExample}
\end{docCommand}
-
+\enlargethispage*{5mm}
\begin{docCommand}{tcbusetemplisting}{}
Typesets text as listing from a temporary file which was written by
\refEnv{tcbwritetemp}.
@@ -233,6 +233,59 @@ This is a \LaTeX\ example.
\clearpage
+\begin{docTcbKey}{listing side text}{}{no value}
+Typesets the environment content side by side as listing in the left (upper)
+part and as compiled text in the right (lower) part.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing side text}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{text side listing}{}{no value}
+Typesets the environment content side by side as compiled text in the left (upper)
+part and as listing in the right (lower) part.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,text side listing}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{listing outside text}{}{no value}
+Typesets the environment content side by side as listing in a |tcolorbox|
+and as compiled text outside the box in the right part of the page.
+Nevertheless, the outside text is treated as \emph{lower} part of the
+|tcolorbox| and can be formatted with all lower part options.
+The space partitioning is done with the side by side options from
+Section \ref{subsec:sidebyside}, see page \pageref{subsec:sidebyside}.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing outside text}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{text outside listing}{}{no value}
+Typesets the environment content side by side as listing in a |tcolorbox|
+and as compiled text outside the box in the left part of the page.
+Nevertheless, the outside text is treated as \emph{lower} part of the
+|tcolorbox| and can be formatted with all lower part options.
+The space partitioning is done with the side by side options from
+Section \ref{subsec:sidebyside}, see page \pageref{subsec:sidebyside}.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,text outside listing}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\clearpage
\subsection{Creation of \LaTeX\ Tutorials}\label{sec:latextutorial}
The following source code gives a guideline for the creation of \LaTeX\ tutorials.
In the next section, a framework for \LaTeX\ exercises is described.
@@ -361,6 +414,92 @@ part of the box can be used uncoupled also.
\end{dispExample}
+The following series of examples demonstrate the application of
+\refEnv{tcolorbox} options for diversification.
+
+\begin{dispExample}
+\begin{texexptitled}{How to use options (1):\par The basic example}{options1}
+\begin{tikzpicture}
+\path[fill=yellow!50!white] (0,0) circle (11mm);
+\path[fill=white] (0,0) circle (9mm);
+\foreach \w/\c in {90/red,210/green,330/blue}
+{\path[shading=ball,ball color=\c] (\w:1cm) circle (7mm);}
+\end{tikzpicture}
+\end{texexptitled}
+\end{dispExample}
+
+
+\begin{dispExample}
+\begin{texexptitled}[center lower,enhanced,segmentation hidden,middle=0mm]
+ {How to use options (2):\par The text output is centered and the
+ segmentation line has vanished.}{options2}
+\begin{tikzpicture}
+\path[fill=yellow!50!white] (0,0) circle (11mm);
+\path[fill=white] (0,0) circle (9mm);
+\foreach \w/\c in {90/red,210/green,330/blue}
+{\path[shading=ball,ball color=\c] (\w:1cm) circle (7mm);}
+\end{tikzpicture}
+\end{texexptitled}
+\end{dispExample}
+
+\begin{dispExample}
+\begin{texexptitled}[tikz lower,bicolor,colbacklower=white]
+ {How to use options (3):\par Here, the |tikzpicture| is totally hidden.
+ The |bicolor| skin highlights the output.}{options3}
+\path[fill=yellow!50!white] (0,0) circle (11mm);
+\path[fill=white] (0,0) circle (9mm);
+\foreach \w/\c in {90/red,210/green,330/blue}
+{\path[shading=ball,ball color=\c] (\w:1cm) circle (7mm);}
+\end{texexptitled}
+\end{dispExample}
+
+\begin{dispExample}
+\begin{texexptitled}[center lower,listing side text,righthand width=3.5cm,
+ bicolor,colbacklower=white]
+ {How to use options (4):\par The |bicolor| skin also works with side
+ by side mode}{options4}
+\begin{tikzpicture}
+\path[fill=yellow!50!white] (0,0) circle (11mm);
+\path[fill=white] (0,0) circle (9mm);
+\foreach \w/\c in {90/red,210/green,330/blue}
+{\path[shading=ball,ball color=\c]
+ (\w:1cm) circle (7mm);}
+\end{tikzpicture}
+\end{texexptitled}
+\end{dispExample}
+
+
+\begin{dispExample}
+\begin{texexptitled}[center lower,listing outside text,righthand width=3.5cm]
+ {How to use options (5):\par Putting our picture outside is just
+ a matter of one word.}{options5}
+\begin{tikzpicture}
+\path[fill=yellow!50!white] (0,0) circle (11mm);
+\path[fill=white] (0,0) circle (9mm);
+\foreach \w/\c in {90/red,210/green,330/blue}
+{\path[shading=ball,ball color=\c]
+ (\w:1cm) circle (7mm);}
+\end{tikzpicture}
+\end{texexptitled}
+\end{dispExample}
+
+
+\begin{dispExample}
+\begin{texexptitled}[beamer,center lower,text outside listing,lefthand width=3.5cm]
+ {How to use options (6):\par Our style is easily transformed into
+ a beamerish one.}{options6}
+\begin{tikzpicture}
+\path[fill=yellow!50!white] (0,0) circle (11mm);
+\path[fill=white] (0,0) circle (9mm);
+\foreach \w/\c in {90/red,210/green,330/blue}
+{\path[shading=ball,ball color=\c]
+ (\w:1cm) circle (7mm);}
+\end{tikzpicture}
+\end{texexptitled}
+\end{dispExample}
+
+
+\clearpage
\subsection{Creation of \LaTeX\ Exercises}
In the following, a guideline is given for the creation of \LaTeX\ exercises
with solutions. These solutions are saved to disk for application at a place of
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
index 6b331cc9413..cb0feeb2f21 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
@@ -207,16 +207,35 @@ and \refSkin{standard} \emph{none}.
|path|, |pathfirst|, |pathmiddle|, or |pathlast|.
It is \emph{not} available for |standard| and it \emph{may} be
applicable for |freelance|.
-\begin{dispExample}
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
\tcbset{colback=red!5!white,fonttitle=\bfseries}
\begin{tcolorbox}[enhanced,title=My title,
- frame style={left color=red!75!black,right color=blue!75!black}]
+ frame style={left color=red!75!black,
+ right color=blue!75!black}]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{frame hidden}{}{style, no value}
+ This is a shortcut for |frame style={draw=none,fill=none}|.
+ Depending on the skin, this option switches off the drawing of the
+ frame.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\tcbset{colback=red!5!white,colframe=red!75!black,
+ fonttitle=\bfseries,coltitle=black}
+
+\begin{tcolorbox}[enhanced,title=My title,
+ frame hidden]
+This is a \textbf{tcolorbox}.
+\tcblower
+This is the lower part.
+\end{tcolorbox}
+\end{dispExample*}
\end{docTcbKey}
@@ -229,19 +248,40 @@ This is the lower part.
|path|, |pathfirst|, |pathmiddle|, or |pathlast|.
It is \emph{not} available for |standard| and it \emph{may} be
applicable for |freelance|.
-\begin{dispExample}
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
\tcbset{colframe=red!75!black,fonttitle=\bfseries}
\begin{tcolorbox}[enhanced,title=My title,
- interior style={left color=red!20!white,right color=yellow!50!white}]
+ interior style={left color=red!20!white,
+ right color=yellow!50!white}]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
\clearpage
+
+\begin{docTcbKey}{interior hidden}{}{style, no value}
+ This is a shortcut for |interior style={draw=none,fill=none}|.
+ Depending on the skin, this option switches off the drawing of the
+ interior.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\tcbset{frame style={top color=red!20!white,
+ bottom color=red!20!white!75!black},
+ fonttitle=\bfseries,coltitle=black}
+
+\begin{tcolorbox}[enhanced,title=My title,
+ interior hidden]
+This is a \textbf{tcolorbox}.
+\tcblower
+This is the lower part.
+\end{tcolorbox}
+\end{dispExample*}
+\end{docTcbKey}
+
+
\begin{docTcbKey}{segmentation style}{=\meta{\texttt{\upshape tikz} keys}}{style, no default}
The \meta{\texttt{\upshape tikz} keys} are used inside the |tikz| path command
for drawing the \emph{segmentation} line of the box.\\
@@ -249,19 +289,40 @@ This is the lower part.
is set to |path|.
It is \emph{not} available for |standard| and it \emph{may} be
applicable for |freelance|.
-\begin{dispExample}
-\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries}
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\tcbset{colback=red!5!white,colframe=red!75!black,
+ fonttitle=\bfseries}
\begin{tcolorbox}[enhanced,title=My title,
- segmentation style={double=white,draw=blue,double distance=1pt,solid}]
+ segmentation style={double=white,draw=blue,
+ double distance=1pt,solid}]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
+\begin{docTcbKey}{segmentation hidden}{}{style, no value}
+ This is a shortcut for |segmentation style={draw=none,fill=none}|.
+ Depending on the skin, this option switches off the drawing of the
+ segmentation line.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\tcbset{colback=red!5!white,colframe=red!75!black,
+ fonttitle=\bfseries}
+
+\begin{tcolorbox}[title=My title,
+ enhanced,segmentation hidden]
+This is a \textbf{tcolorbox}.
+\tcblower
+This is the lower part.
+\end{tcolorbox}
+\end{dispExample*}
+\end{docTcbKey}
+
+
+\clearpage
\begin{docTcbKey}{title style}{=\meta{\texttt{\upshape tikz} keys}}{style, no default}
The \meta{\texttt{\upshape tikz} keys} are used inside the |tikz| path command
for drawing the \emph{title area} of the box.\\
@@ -269,21 +330,21 @@ This is the lower part.
|path|, |pathfirst|, |pathmiddle|, or |pathlast|.
It is \emph{not} available for |standard| and it \emph{may} be
applicable for |freelance|.
-\begin{dispExample}
-\tcbset{colback=red!5!white,colframe=red!75!black,coltitle=blue!50!black,
- fonttitle=\bfseries}
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\tcbset{colback=red!5!white,colframe=red!75!black,
+ coltitle=blue!50!black,fonttitle=\bfseries}
\begin{tcolorbox}[enhanced,title=My title,
- title style={left color=blue!15!yellow,right color=red!85!black}]
+ title style={left color=blue!15!yellow,
+ right color=red!85!black}]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
-\clearpage
\begin{docTcbKey}{colbacktitle}{=\meta{color}}{style, no default, initially unset}
Abbreviation for setting \refKey{/tcb/title style} to |fill=|\meta{color}.
This fills the background of the title area with the given \meta{color}.\\
@@ -291,19 +352,38 @@ This is the lower part.
|path|, |pathfirst|, |pathmiddle|, or |pathlast|.
It is \emph{not} available for |standard| and it \emph{may} be
applicable for |freelance|.
-\begin{dispExample}
-\tcbset{colback=red!5!white,colframe=red!75!black,coltitle=blue!50!black,
- fonttitle=\bfseries}
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\tcbset{colback=red!5!white,colframe=red!75!black,
+ coltitle=blue!50!black,fonttitle=\bfseries}
-\begin{tcolorbox}[enhanced,title=My title,colbacktitle=yellow!50!white]
+\begin{tcolorbox}[enhanced,title=My title,
+ colbacktitle=yellow!50!white]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
\end{tcolorbox}
-\end{dispExample}
+\end{dispExample*}
\end{docTcbKey}
+\begin{docTcbKey}{title hidden}{}{style, no value}
+ This is a shortcut for |title style={draw=none,fill=none}|.
+ Depending on the skin, this option switches off the drawing of the
+ title background. This is the default behavior for \refSkin{standard} and
+ \refSkin{enhanced}.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\tcbset{colback=red!5!white,colframe=red!75!black,
+ fonttitle=\bfseries}
+
+\begin{tcolorbox}[title=My title,
+ enhanced,title hidden]
+This is a \textbf{tcolorbox}.
+\tcblower
+This is the lower part.
+\end{tcolorbox}
+\end{dispExample*}
+\end{docTcbKey}
+
\clearpage
\subsection{Code Option Keys}\label{subsec:addcodeoptions}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index 0143cbf750b..8ca73d17d90 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 fbd073bd790..b6128360346 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 2.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -82,8 +82,8 @@
pdfkeywords={colored boxes, LaTeX examples, theorems}
}
-\def\version{2.10}%
-\def\datum{2013/04/09}%
+\def\version{2.20}%
+\def\datum{2013/04/17}%
\makeindex
\newcounter{texexp}
@@ -122,20 +122,20 @@
keywordstyle=\color{Option}\bfseries,
% tcolorbox options
morekeywords={% core
- adjusted,adjust,after,arc,auto,autoparskip,
+ adjusted,adjust,after,arc,auto,autoparskip,align,
before,bottom,boxsep,boxrule,bottomtitle,bottomrule,broken,
collower,coltext,coltitle,colback,colframe,colupper,center,
equal,enlarge,enlargement,extrude,
fontupper,fontlower,fonttitle,first,floatplacement,float,
- group,
+ group,gap,
height,
- lowerbox,left,leftrule,lefttitle,leftupper,leftlower,lower,last,
+ lowerbox,left,leftrule,lefttitle,leftupper,leftlower,lower,last,lefthand,
middle,minimum,
- notitle,natural,noparskip,nobeforeafter,
+ notitle,natural,noparskip,nobeforeafter,nofloat,
parskip,parbox,
outer,oversize,overlay,
- right,rightrule,righttitle,rightupper,rightlower,
- savelowerto,savedelimiter,space,split,shrink,
+ right,rightrule,righttitle,rightupper,rightlower,righthand,ratio,
+ savelowerto,savedelimiter,space,split,shrink,sidebyside,
title,top,toptitle,toprule,titlerule,tabularx,tikz,toggle,tight,tempfile,text,
upper,unbroken,
valign,
@@ -145,8 +145,8 @@
file,
inputencoding,
listing,
- options,
- style,
+ options,outside,
+ style,side,
utf,
% theorems
ams,align,
@@ -177,6 +177,7 @@
enhanced,engine,
frame,freelance,
graphical,geometry,graphics,
+ hidden,
interior,
opacity,
nodes,
@@ -195,9 +196,17 @@
classoffset=0% restore default
}
-\tcbset{documentation listing style=mydocumentation}
+\tcbset{documentation listing style=mydocumentation,%
+ sbs/.style={sidebyside,before lower app={\tcbset{sidebyside=false}}},%
+ innerbox/.style={standard,frame style={},colback=black!5!white,colframe=black!75!white,coltext=black,coltitle=white,docexample/.style={docexample original},
+ frame code,interior code,interior titled code,segmentation code},
+ docexample/.style={colframe=Navy!50!ExampleFrame,colback=Navy!5!ExampleBack,fontlower=\footnotesize,
+ bicolor,colbacklower=ExampleBack!5!white,frame style={drop shadow},
+ before upper={\tcbset{innerbox}},before lower={\tcbset{innerbox}}},
+ docexample original/.style={colframe=ExampleFrame,colback=ExampleBack,fontlower=\footnotesize,frame style={}},
+}
-%\includeonly{tcolorbox.doc.hooks}
+%\includeonly{tcolorbox.doc.skins}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index 839e5139259..db889791249 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -73,7 +73,7 @@
\def\tcb@drawcolorbox@breakable{%
\ifx\kvtcb@float\@empty%
- {\parskip\z@\par}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list
+ {\parskip\z@\par\vskip\z@}\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}%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 2402acaffc9..890a5f349dd 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
@@ -125,26 +125,35 @@
% tcolorbox specific macros
\def\tcb@doc@usetemplisting{\lstinputlisting[style=\kvtcb@doclstsytle]{\kvtcb@tempfile}}
-\let\dispExample\tcbwritetemp
+\def\dispExample{\tcbset{docexample}\tcbwritetemp}
\def\enddispExample{%
\endtcbwritetemp%
- \kvtcb@beforeexample\begin{tcolorbox}[docexample]%
+ \kvtcb@beforeexample\begin{tcolorbox}%
\tcb@doc@usetemplisting%
\tcblower%
\tcbusetemp%
\end{tcolorbox}\kvtcb@afterexample%
}
-\let\dispListing\tcbwritetemp
+\newenvironment{dispExample*}[1]{%
+ \tcbset{docexample,#1}\tcbwritetemp%
+ }{\enddispExample}
+
+\def\dispListing{\tcbset{docexample}\tcbwritetemp}
\def\enddispListing{%
\endtcbwritetemp%
- \kvtcb@beforeexample\begin{tcolorbox}[docexample]%
+ \kvtcb@beforeexample\begin{tcolorbox}%
\tcb@doc@usetemplisting%
\end{tcolorbox}\kvtcb@afterexample%
}
+\newenvironment{dispListing*}[1]{%
+ \tcbset{docexample,#1}\tcbwritetemp%
+ }{\enddispListing}
+
+
% index auxiliary macros
\def\index@Col#1{\index{#1\idx@actual\texttt{#1} \kvtcb@text@color}\index{\kvtcb@text@colors\idx@level#1\idx@actual\texttt{#1}}}
\def\index@Com#1{\index{#1\idx@actual\cs{#1}}}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index d82a1cb7df7..eedab8df24e 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 2.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
index 678b9577190..18827d89ba8 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -61,18 +61,77 @@
\tcbuselistinglisting%
}
-\tcbset{
- listing file/.store in=\kvtcb@listingfile,
- listing options/.store in=\kvtcb@listingoptions,
- comment/.store in=\kvtcb@listingcomment,
- listing style/.style={listing options={style=#1}},
- listing and text/.code={\let\tcp@listing@process\tcb@listing@listingAndText},
- text and listing/.code={\let\tcp@listing@process\tcb@listing@textAndListing},
- listing and comment/.code={\let\tcp@listing@process\tcb@listing@listingAndComment},
- 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,
+\def\tcb@inputlisting@out@prepare{%
+ \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}%
+ \tcbset{breakable@false}%
+ \def\tcb@minipage{\csname tcb@minipage@\kvtcb@sbs@align\endcsname}%
+ \tcbdimto\tcb@w@upper@real{\tcb@w@upper}%
+ \tcbdimto\tcb@w@sbs{\tcb@w@upper@real-\kvtcb@sbs@gap}%
+ \tcb@sbs@quota%
+ \ifx\kvtcb@float\@empty%
+ \newenvironment{tcb@sbsfloat}{\kvtcb@beforebox}{\kvtcb@afterbox}%
+ \else%
+ \edef\float@start{\noexpand\@float{tcbfloat}[\kvtcb@float]}%
+ \newenvironment{tcb@sbsfloat}{\float@start}{\end@float}%
+ \fi%
+}
+
+\def\tcb@inputlisting@out@listingAndText{%
+ \tcb@inputlisting@out@prepare%
+ \tcbdimto\tcb@w@outside{\tcb@w@lower}%
+ \tcbdimto\tcb@w@inside{\tcb@width-\tcb@w@lower-\kvtcb@sbs@gap}%
+ \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}%
+ \tcb@minipage{\tcb@w@inside}%
+ \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}%
+ \endminipage\hfill%
+ \iftcb@lowervisible\tcb@minipage{\tcb@w@outside}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces%
+ \tcbuselistingtext\unskip\kvtcb@after@lower\endminipage\fi%
+ \end{minipage}\end{tcb@sbsfloat}%
+}
+
+\def\tcb@inputlisting@out@textAndListing{%
+ \tcb@inputlisting@out@prepare%
+ \tcbdimto\tcb@w@outside{\tcb@w@upper}%
+ \tcbdimto\tcb@w@inside{\tcb@width-\tcb@w@upper-\kvtcb@sbs@gap}%
+ \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}%
+ \iftcb@lowervisible\tcb@minipage{\tcb@w@outside}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces%
+ \tcbuselistingtext\unskip\kvtcb@after@lower\endminipage\fi\hfill%
+ \tcb@minipage{\tcb@w@inside}%
+ \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}%
+ \endminipage%
+ \end{minipage}\end{tcb@sbsfloat}%
+}
+
+\def\tcb@inputlisting@inside{%
+ \begin{tcolorbox}[]\tcb@listing@process\end{tcolorbox}%
+}
+
+\let\tcb@inputlisting\tcb@inputlisting@inside
+
+\def\tcb@set@listing@process#1{%
+ \let\tcb@inputlisting\tcb@inputlisting@inside%
+ \let\tcb@listing@process=#1%
+}
+
+\tcbset{%
+ listing file/.store in=\kvtcb@listingfile,%
+ listing options/.store in=\kvtcb@listingoptions,%
+ comment/.store in=\kvtcb@listingcomment,%
+ listing style/.style={listing options={style=#1}},%
+ listing and text/.code={\tcb@set@listing@process{\tcb@listing@listingAndText}},%
+ text and listing/.code={\tcb@set@listing@process{\tcb@listing@textAndListing}},%
+ listing and comment/.code={\tcb@set@listing@process{\tcb@listing@listingAndComment}},%
+ comment and listing/.code={\tcb@set@listing@process{\tcb@listing@commentAndListing}},%
+ listing only/.code={\tcb@set@listing@process{\tcbuselistinglisting}},%
+ text only/.code={\tcb@set@listing@process{\tcbuselistingtext}},%
+ listing inputencoding/.store in=\kvtcb@listingencoding,%
+ text side listing/.style={sidebyside,text and listing},%
+ listing side text/.style={sidebyside,listing and text},%
+ text outside listing/.code={\let\tcb@inputlisting\tcb@inputlisting@out@textAndListing},%
+ listing outside text/.code={\let\tcb@inputlisting\tcb@inputlisting@out@listingAndText},%
}
\tcbset{
@@ -84,14 +143,14 @@
}
\newenvironment{tcblisting}[1]{%
- \def\tcblisting@box{\begin{tcolorbox}[#1]\tcp@listing@process\end{tcolorbox}}%
+ \def\tcblisting@box{\tcbinputlisting{#1}}%
\begingroup\tcbverbatimwrite{\kvtcb@listingfile}%
}{\endtcbverbatimwrite\endgroup%
\tcblisting@box%
}
-\def\tcbinputlisting#1{%
- \begin{tcolorbox}[#1]\tcp@listing@process\end{tcolorbox}%
+\long\def\tcbinputlisting#1{%
+ \begingroup\tcbset{#1}\tcb@inputlisting\endgroup%
}
\newenvironment{tcboutputlisting}{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index 905ad4b8e38..7ef2d51ad74 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 2.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index 512da07b794..aab07bdf7bc 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -24,12 +24,15 @@
\def\tcb@creategeonodes@true{%
\begin{scope}[every node/.style={line width=0mm,inner sep=0mm,draw=none,fill=none,rectangle}]
- \node[name=frame,at={(0,0)},above right,minimum width=\kvtcb@width,minimum height=\tcb@height]{};
+ \node[name=frame,at={(0,0)},above right,minimum width=\tcb@width,minimum height=\tcb@height]{};
\node[name=interior,at={({\kvtcb@left@rule},{\kvtcb@bottom@rule})},above right,minimum width=\tcb@innerwidth,minimum height=\tcb@innerheight]{};
\ifnum\tcb@segment@state=1%
\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%
+ \else\iftcb@sidebyside%
+ \node[name=segmentation,at={({\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper+\tcb@w@upper\relax},{\the\dimexpr\kvtcb@bottom@rule\relax})},above right,
+ minimum width=\the\dimexpr\kvtcb@sbs@gap\relax,minimum height=\tcb@innerheight]{};
+ \fi\fi%
\iftcb@hasTitle%
\node[name=title,at={({\kvtcb@left@rule},{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight+\kvtcb@title@rule\relax})},above right,
minimum width=\tcb@innerwidth,minimum height=\the\dimexpr\tcb@h@title+\kvtcb@toptitle+\kvtcb@bottomtitle+\kvtcb@boxsep*2\relax]{};
@@ -105,8 +108,13 @@
% draw segmentation line
\def\tcb@drawlower@path{%
- \path[draw=\kvtcb@colframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
- (segmentation.west)--(segmentation.east);%
+ \iftcb@sidebyside%
+ \path[draw=\kvtcb@colframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
+ (segmentation.north)--(segmentation.south);%
+ \else%
+ \path[draw=\kvtcb@colframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
+ (segmentation.west)--(segmentation.east);%
+ \fi%
}
\long\def\tcb@pseudo@segmentation#1{%
@@ -171,6 +179,44 @@
([yshift=0.1mm]segmentation.east);%
}
+\def\tcb@drawspec@sbs@A#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south)--(segmentation.north)[rounded corners=\kvtcb@arc]
+ --(interior.north east)--(interior.south east)[sharp corners]
+ -- cycle;%
+}
+
+\def\tcb@drawspec@sbs@B#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south)--(segmentation.north)
+ --(interior.north east)[rounded corners=\kvtcb@arc]
+ --(interior.south east)[sharp corners] -- cycle;%
+}
+
+\def\tcb@drawspec@sbs@C#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south|-frame.south)--(segmentation.north)[rounded corners=\kvtcb@arc]
+ --(interior.north east)[sharp corners]--(interior.south east|-frame.south)
+ -- cycle;%
+}
+
+\def\tcb@drawspec@sbs@D#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south|-frame.south) rectangle (interior.north east);%
+}
+
+\def\tcb@drawspec@sbs@E#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south|-frame.south) rectangle (interior.north east|-frame.north);%
+}
+
+\def\tcb@drawspec@sbs@F#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south)--(segmentation.north|-frame.north)
+ --(interior.north east|-frame.north)[rounded corners=\kvtcb@arc]
+ --(interior.south east)[sharp corners] -- cycle;%
+}
+
\def\tcb@drawspec@T{%
\path[top color=\kvtcb@colframe,bottom color=\kvtcb@colback]
([yshift=-0.01pt]interior.north west) rectangle
@@ -185,17 +231,21 @@
\tcbset{%
frame style/.code={\tikzset{frame@style/.style={#1}}},%
+ frame hidden/.style={frame style={draw=none,fill=none}},
frame code/.code={\def\tcb@frame@code{#1}},%
frame code/.default=\tcb@drawframe@standard,%
interior style/.code={\tikzset{interior@style/.style={#1}}},%
+ interior hidden/.style={interior style={draw=none,fill=none}},
interior titled code/.code={\def\tcb@interiortitled@code{#1}},%
interior titled code/.default=\tcb@drawwithtitle@standard,%
interior code/.code={\def\tcb@interior@code{#1}},%
interior code/.default=\tcb@drawwithouttitle@standard,%
segmentation style/.code={\tikzset{segmentation@style/.style={#1}}},%
+ segmentation hidden/.style={segmentation style={draw=none,fill=none}},
segmentation code/.code={\def\tcb@segmentation@code{#1}},%
segmentation code/.default=\tcb@drawlower@standard,%
title style/.code={\tikzset{title@style/.style={#1}}},%
+ title hidden/.style={title style={draw=none,fill=none}},
colbacktitle/.style={title style={fill=#1}},
title code/.code={\def\tcb@title@code{#1}},%
title code/.default=\tcb@drawtitle@standard,%
@@ -273,7 +323,9 @@
\else%
{\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}%
\fi},
- segmentation code={\tcb@drawspec@LR{fill=\kvtcb@colbacklower}},%
+ segmentation code={\iftcb@sidebyside%
+ \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else%
+ \tcb@drawspec@sbs@A{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LR{fill=\kvtcb@colbacklower}\fi},%
skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolorlast},
bicolor/.style={skin=bicolor}}
@@ -297,7 +349,9 @@
\else%
{\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}%
\fi},
- segmentation code={\tcb@drawspec@LS{fill=\kvtcb@colbacklower}},
+ segmentation code={\iftcb@sidebyside%
+ \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else%
+ \tcb@drawspec@sbs@C{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LS{fill=\kvtcb@colbacklower}\fi},%
skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolormiddle
}}
@@ -321,7 +375,9 @@
\else%
{\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}%
\fi},
- segmentation code={\tcb@drawspec@LS{fill=\kvtcb@colbacklower}},
+ segmentation code={\iftcb@sidebyside%
+ \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else%
+ \tcb@drawspec@sbs@E{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LS{fill=\kvtcb@colbacklower}\fi},%
skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolormiddle
}}
@@ -345,7 +401,9 @@
\else
{\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}%
\fi},
- segmentation code={\tcb@drawspec@LR{fill=\kvtcb@colbacklower}},%
+ segmentation code={\iftcb@sidebyside%
+ \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else%
+ \tcb@drawspec@sbs@F{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LR{fill=\kvtcb@colbacklower}\fi},%
skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast
}}
@@ -370,7 +428,7 @@
\else%
{\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}%
\fi},
- segmentation code={\tcb@drawspec@LR{beamer@color}},%
+ segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},%
skin first=beamerfirst,skin middle=beamermiddle,skin last=beamerlast},
beamer/.style={skin=beamer,boxrule=0mm,titlerule=1mm,toptitle=0.5mm,arc=2mm,fonttitle=\bfseries,
frame style={fill=\kvtcb@colframe,drop shadow}},
@@ -393,7 +451,7 @@
\tcb@drawspec@UR{beamer@color}\else%
{\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}%
\fi},
- segmentation code={\tcb@drawspec@LS{beamer@color}},%
+ segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},%
skin first=beamerfirst,skin middle=beamermiddle,skin last=beamermiddle}}
\tcbset{%
@@ -414,7 +472,7 @@
\else%
{\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}%
\fi},
- segmentation code={\tcb@drawspec@LS{beamer@color}},%
+ segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},%
skin first=beamermiddle,skin middle=beamermiddle,skin last=beamermiddle}}
\tcbset{%
@@ -435,13 +493,17 @@
\else%
{\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}%
\fi},
- segmentation code={\tcb@drawspec@LR{beamer@color}},%
+ segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},%
skin first=beamermiddle,skin middle=beamermiddle,skin last=beamerlast}}
\def\tcb@drawspec@widgetsegment{%
+ \iftcb@sidebyside%
+ \tcb@drawlower@path%
+ \else%
\path[left color=\kvtcb@colframe!75!white,right color=\kvtcb@colframe!75!white!25!\kvtcb@colback,segmentation@style]
([yshift={-\kvtcb@middle/4}]segmentation.west) rectangle ([yshift={\kvtcb@middle/4}]segmentation.east);
+ \fi%
}
\tikzset{widget@color/.style={left color=\kvtcb@colframe!75!white,right color=\kvtcb@colframe!75!white!25!\kvtcb@colback}}
@@ -521,6 +583,12 @@
([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);
+ \iftcb@sidebyside%
+ \path[fill=green!20!white,draw=green!75!black,dashed]
+ ([yshift={\kvtcb@boxsep+\kvtcb@bottom+\tcb@break@bottomsep}]segmentation.south east)
+ rectangle node[font=\scriptsize] {lower: w=\tcb@w@lower, h=\tcb@height@upper}
+ +(\tcb@w@lower,\tcb@height@upper);
+ \fi%
\or%
\ifvoid\tcb@upperbox
\path[fill=white,draw,dotted]
@@ -549,13 +617,13 @@
([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+\tcb@break@bottomsep}]interior.south west)
- rectangle node[font=\scriptsize] {lower: w=\tcb@height@lower, h=\tcb@h@lower}
+ rectangle node[font=\scriptsize] {lower: w=\tcb@w@lower, h=\tcb@height@lower}
+(\tcb@w@lower,\tcb@height@lower);
\fi%
\path[draw=red,opacity=0.5] (interior.south west) rectangle (interior.north east);
\path[draw=red,opacity=0.5] (frame.south west) rectangle (frame.north east);
\node[above,font=\scriptsize,red!50!black] at (interior.south) {interior: w=\tcb@innerwidth, h=\tcb@innerheight};
- \node[above,font=\scriptsize,red!50!black] at (frame.north) {frame: w=\the\dimexpr\kvtcb@width\relax, h=\tcb@height};
+ \node[above,font=\scriptsize,red!50!black] at (frame.north) {frame: w=\the\dimexpr\tcb@width\relax, h=\tcb@height};
\path[draw=blue!10!white,double,line width=1pt,dashed,opacity=0.3] (current bounding box.south west) rectangle (current bounding box.north east);
\pgfsetfillopacity{0.3}
},
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
index 7f0fe32e54f..09cc57d8c8d 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -53,7 +53,7 @@
ams nodisplayskip lower/.style={before upper=\vskip-\abovedisplayskip},%
ams nodisplayskip/.style={ams nodisplayskip upper,ams nodisplayskip lower},%
highlight math style/.style={highlight math/.style={#1}},%
- highlight math style={colframe=red,colback=yellow!25!white},%
+ highlight math style={colframe=red,colback=yellow!25!white,notitle},%
}
\newcommand{\tcbmaketheorem}[5]{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index e8575f07f7d..9954b1f9a9c 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2013/04/09 version 2.10 text color boxes]
+\ProvidesPackage{tcolorbox}[2013/04/17 version 2.20 text color boxes]
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -29,6 +29,7 @@
\newif\iftcb@hasTitle
\newif\iftcb@hasLower
\newif\iftcb@lowerspace
+\newif\iftcb@sidebyside
\newbox\tcb@titlebox
\newbox\tcb@upperbox
@@ -66,6 +67,26 @@
\def\tcb@hack@currenvir{\edef\tcb@temp{\noexpand\def\noexpand\@currenvir{\kvtcb@savedelimiter}}\tcb@temp}
+\def\tcb@sbs@quota@leftwidth{%
+ \tcbdimto\tcb@w@upper{\kvtcb@sbs@ratio}%
+ \tcbdimto\tcb@w@lower{\tcb@w@sbs-\tcb@w@upper}%
+}
+
+\def\tcb@sbs@quota@rightwidth{%
+ \tcbdimto\tcb@w@lower{\kvtcb@sbs@ratio}%
+ \tcbdimto\tcb@w@upper{\tcb@w@sbs-\tcb@w@lower}%
+}
+
+\def\tcb@sbs@quota@leftratio{%
+ \tcbdimto\tcb@w@upper{\kvtcb@sbs@ratio\dimexpr\tcb@w@sbs}%
+ \tcbdimto\tcb@w@lower{\tcb@w@sbs-\tcb@w@upper}%
+}
+
+\def\tcb@sbs@quota@rightratio{%
+ \tcbdimto\tcb@w@lower{\kvtcb@sbs@ratio\dimexpr\tcb@w@sbs}%
+ \tcbdimto\tcb@w@upper{\tcb@w@sbs-\tcb@w@lower}%
+}
+
\tcbset{
title/.store in=\kvtcb@title,
notitle/.style={title=},
@@ -226,6 +247,13 @@
extrude top by/.code={\tcbdimto\kvtcb@top{\kvtcb@top+#1}\tcbdimto\kvtcb@bbtop@stand{\kvtcb@bbtop@stand-#1}},%
extrude bottom by/.code={\tcbdimto\kvtcb@bottom{\kvtcb@bottom+#1}\tcbdimto\kvtcb@bbbottom@stand{\kvtcb@bbbottom@stand-#1}},%
extrude by/.style={extrude left by=#1,extrude right by=#1,extrude top by=#1,extrude bottom by=#1},%
+ sidebyside/.is if=tcb@sidebyside,%
+ sidebyside align/.store in=\kvtcb@sbs@align,%
+ sidebyside gap/.store in=\kvtcb@sbs@gap,%
+ lefthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftwidth},
+ righthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightwidth},
+ lefthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftratio},
+ righthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightratio},
}
\tcbset{notitle,width=\linewidth,boxsep=1mm,boxrule=0.5mm,adjust text={\"Apgjy},
@@ -237,7 +265,8 @@
toggle enlargement=none,toptitle=0mm,bottomtitle=0mm,
standard,parbox,overlay=,auto outer arc,
before title=,after title=,before upper=,after upper=,before lower=,after lower=,
- tcbox raise=0pt,
+ tcbox raise=0pt,sidebyside=false,sidebyside align=center,sidebyside gap=10mm,
+ lefthand ratio=0.5,
}%
\let\tcb@parboxrestore=\@parboxrestore
@@ -248,6 +277,11 @@
\let\tcb@parbox@use@true\relax%
+\def\tcb@minipage@top{\minipage[t]}
+\let\tcb@minipage@center=\minipage
+\def\tcb@minipage@bottom{\minipage[b]}
+\let\tcb@minipage=\tcb@minipage@center
+
% lrbox with integrated minipage
\def\tcb@lrbox#1#2{%
\edef\reserved@a{%
@@ -260,7 +294,7 @@
\@endpefalse
\begingroup%
\csname tcb@parbox@use@\kvtcv@parbox\endcsname%
- \ignorespaces\minipage#2\ignorespaces}
+ \ignorespaces\tcb@minipage#2\ignorespaces}
\def\endtcb@lrbox{\unskip\endminipage\unskip\endgroup}
\let\tcb@savebox=\tcb@lrbox
@@ -296,9 +330,17 @@
\tcbset{#1}%
\tcb@hasLowerfalse%
% computation of text width
- \tcbdimto\tcb@innerwidth{\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule}%
+ \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}%
+ \iftcb@sidebyside%
+ \tcbset{breakable@false}%
+ \def\tcb@minipage{\csname tcb@minipage@\kvtcb@sbs@align\endcsname}%
+ \tcbdimto\tcb@w@upper@real{\tcb@w@upper}%
+ \tcbdimto\tcb@w@sbs{\tcb@w@upper@real-\kvtcb@sbs@gap}%
+ \tcb@sbs@quota%
+ \fi%
\ifx\kvtcb@title\@empty\tcb@hasTitlefalse\else%
\tcb@hasTitletrue%
\tcbdimto\tcb@w@title{\tcb@temp-\kvtcb@lefttitle-\kvtcb@righttitle}%
@@ -309,7 +351,9 @@
\def\tcblower{%
\unskip\tcb@after@box%
\end{tcb@savebox}%
- \tcbdimto\tcb@w@lower{\tcb@temp-\kvtcb@leftlower-\kvtcb@rightlower}%
+ \unless\iftcb@sidebyside%
+ \tcbdimto\tcb@w@lower{\tcb@temp-\kvtcb@leftlower-\kvtcb@rightlower}%
+ \fi%
\tcb@hasLowertrue%
\let\tcb@after@box=\kvtcb@after@lower%
\ifx\kvtcb@savelowerto\@empty%
@@ -406,7 +450,7 @@
\begin{pgfscope}%
\pgfsetcornersarced{\pgfpoint{\tcb@outer@arc}{\tcb@outer@arc}}%
\pgfsetfillcolor{\kvtcb@colframe}%
- \pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{\kvtcb@width}{\tcb@height}}%
+ \pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{\tcb@width}{\tcb@height}}%
\pgfusepath{fill}%
\end{pgfscope}%
}
@@ -417,9 +461,9 @@
\pgfsetcornersarced{\pgfpoint{0mm}{0mm}}%
\pgfmoveto{\pgfpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
\pgflineto{\pgfpoint{\kvtcb@left@rule}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
- \pgflineto{\pgfpoint{\the\dimexpr\kvtcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
+ \pgflineto{\pgfpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
\pgfsetcornersarced{\pgfpoint{\kvtcb@arc}{\kvtcb@arc}}%
- \pgflineto{\pgfpoint{\the\dimexpr\kvtcb@width-\kvtcb@right@rule\relax}{\kvtcb@bottom@rule}}%
+ \pgflineto{\pgfpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\kvtcb@bottom@rule}}%
\pgflineto{\pgfpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
\pgfpathclose%
\pgfsetfillcolor{\kvtcb@colback}%
@@ -433,7 +477,7 @@
\pgfsetcornersarced{\pgfpoint{\kvtcb@arc}{\kvtcb@arc}}%
\pgfsetfillcolor{\kvtcb@colback}%
\pgfpathrectangle{\pgfpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
- {\pgfpoint{\the\dimexpr\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule\relax}{\tcb@innerheight}}%
+ {\pgfpoint{\the\dimexpr\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule\relax}{\tcb@innerheight}}%
\pgfusepath{fill}%
\end{pgfscope}%
}
@@ -443,9 +487,15 @@
\begin{pgfscope}%
\pgfsetcolor{\kvtcb@colframe}%
\pgfsetdash{{1mm}{1mm}}{0.5mm}%
+ \iftcb@sidebyside%
+ \tcbdimto\tcb@seg@pos{\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper+\tcb@w@upper+\kvtcb@sbs@gap/2}%
+ \pgfpathmoveto{\pgfpoint{\tcb@seg@pos}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
+ \pgfpathlineto{\pgfpoint{\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{\pgfpoint{\kvtcb@left@rule}{\tcb@seg@pos}}%
- \pgfpathlineto{\pgfpoint{\the\dimexpr\kvtcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}%
+ \pgfpathlineto{\pgfpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}%
+ \fi%
\pgfusepath{stroke}%
\end{pgfscope}%
}
@@ -456,12 +506,12 @@
\def\tcb@setbb@toggle@none{%
\pgfpathrectanglecorners{\pgfpoint{\the\dimexpr0pt-\kvtcb@bbleft\relax}{\the\dimexpr0pt-\kvtcb@bbbottom\relax}}%
- {\pgfpoint{\the\dimexpr\kvtcb@width+\kvtcb@bbright\relax}{\the\dimexpr\tcb@height+\kvtcb@bbtop\relax}}%
+ {\pgfpoint{\the\dimexpr\tcb@width+\kvtcb@bbright\relax}{\the\dimexpr\tcb@height+\kvtcb@bbtop\relax}}%
}
\def\tcb@setbb@toggle@forced{%
\pgfpathrectanglecorners{\pgfpoint{\the\dimexpr0pt-\kvtcb@bbright\relax}{\the\dimexpr0pt-\kvtcb@bbbottom\relax}}%
- {\pgfpoint{\the\dimexpr\kvtcb@width+\kvtcb@bbleft\relax}{\the\dimexpr\tcb@height+\kvtcb@bbtop\relax}}%
+ {\pgfpoint{\the\dimexpr\tcb@width+\kvtcb@bbleft\relax}{\the\dimexpr\tcb@height+\kvtcb@bbtop\relax}}%
}
\def\tcb@setbb@toggle@evenpage{%
@@ -498,8 +548,21 @@
\fi%
}
+\def\tcb@sbs@mix{%
+ \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper@real}
+ \noindent\unhbox\tcb@upperbox\hfill%
+ \iftcb@hasLower%
+ \iftcb@lowervisible\unhbox\tcb@lowerbox%
+ \else%
+ \iftcb@lowerignored\else\rule[-\dp\tcb@lowerbox]{0pt}{\the\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox\relax}\fi%
+ \fi%
+ \fi%
+ \end{tcb@savebox}%
+ \tcb@hasLowerfalse%
+}
\def\tcb@draw@color@box{%
+ \iftcb@sidebyside\tcb@sbs@mix\fi%
\tcb@comp@arc%
\iftcb@hasTitle%
\tcbdimto\tcb@h@title{\ht\tcb@titlebox+\dp\tcb@titlebox}%
@@ -562,7 +625,9 @@
\fi%
\iftcb@lowerspace%
\csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname%
- \fi%
+ \else\iftcb@sidebyside%
+ \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname%
+ \fi\fi%
\iftcb@hasTitle%
\csname tcb@drawtitle@\kvtcb@engine@title\endcsname%
\fi%