summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-01 00:53:37 +0000
committerKarl Berry <karl@freefriends.org>2016-03-01 00:53:37 +0000
commit384f9a0c9aed29686dd44edf6a48b6b17739297e (patch)
treef6733d56e05ae705bc53370f682126714b5777f3 /Master
parent6a2bf934fc548f066363cd953b7aaa6e5c38293a (diff)
tcolorbox
git-svn-id: svn://tug.org/texlive/trunk@39894 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/CHANGES31
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/README4
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdfbin361333 -> 448255 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex43
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex19
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex105
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex293
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty23
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex389
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex79
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdfbin6369898 -> 6581403 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex10
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex38
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex18
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex7
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex40
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex112
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty152
29 files changed, 1243 insertions, 182 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
index 7e680d82456..ca5fba5bc7d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
+++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
@@ -1,7 +1,7 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -848,3 +848,30 @@ version 3.80 (2015/11/27)
- library 'xparse':
* new macro: '\tcbsidebyside'
* new options: 'sidebyside adapt', 'sidebyside switch'
+
+version 3.90 (2016/02/29)
+- bug fix: 'height fill' after headings (nobreak) produced an error
+- implementation for 'before' and 'before skip' changed to avoid spacing
+ problems when there is a page break before breakable/unbreakable boxes
+- the 'height fill' option can be applied also for boxed inside a tcbraster
+- new options:
+ 'add to natural height', 'space to', 'use height from group' (new default)
+- new macros:
+ '\tcbheightspace', '\tcbtextwidth', '\tcbtextheight'
+- library 'skins':
+ * 'halign title' works with 'boxed title' now
+ * 'boxed title style' changed to be stackable
+ * better support for titles at the bottom of the box
+ * new skin: 'tile'
+ * new options:
+ 'blankest', 'tile', 'no boxed title style', 'boxed title size',
+ 'attach boxed title to bottom', 'attach boxed title to bottom*',
+ 'attach boxed title to top', 'attach boxed title to top*',
+ 'flip title'
+- library 'raster':
+ * new environment:
+ 'tcboxedraster'
+ * new options:
+ 'raster multicolumn', 'raster multirow'
+- library 'documentation':
+ removal of some unwanted blanks
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README
index e4e999d65cb..55be40956e3 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/README
+++ b/Master/texmf-dist/doc/latex/tcolorbox/README
@@ -1,7 +1,7 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
index d559c7d3c56..57d5ba6e149 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 f5c4a4e7175..ef72f3a4197 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -190,5 +190,44 @@ We have given Theorem \ref{theorem:summation} on page \pageref{theorem:summation
\lipsum[1-4]
\end{tcolorbox}
+%----------------------------------------------------------
+\clearpage
+\section{Rasters of Boxes}
+
+\begin{tcolorbox}[tile,size=fbox,boxsep=2mm,boxrule=0pt,
+ colback=blue!20!black,colbacktitle=yellow!50!black,
+ title=A Raster of Boxes,center title,
+ height fill]
+ \begin{tcbitemize}[raster columns=3,raster rows=4,raster equal skip=2mm,
+ raster height=\tcbtextheight,
+ title={Box~\thetcbrasternum},fonttitle=\bfseries,
+ enhanced,colframe=blue!50,colback=blue!5]
+ \tcbitem A
+ \tcbitem[flip title={interior hidden}] B
+ \tcbitem[colbacktitle=blue!40!black] C
+ \tcbitem[colbacktitle=blue!40!black,flip title] D
+ \tcbitem[beamer] E
+ \tcbitem[tile,colbacktitle=red!40!black] F
+ \tcbitem[tile,colbacktitle=red!40!black,flip title={sharp corners}] G
+ \tcbitem[blankest]
+ \begin{tcbitemize}[raster columns=2,raster rows=2,raster height=\tcbtextheight,
+ tile,halign=center,valign=center,fontupper=\bfseries\Huge,before upper=\strut,
+ colback=green!20]
+ \tcbitem a
+ \tcbitem b
+ \tcbitem c
+ \tcbitem d
+ \end{tcbitemize}
+ \tcbitem[widget] I
+ \tcbitem[frame style image=goldshade,opacityback=0.5,colback=white] J
+ \tcbitem[frame style image=blueshade,opacityback=0.5,colback=white,
+ center title,flip title={frame hidden,opacityback=0.25,colback=black}] K
+ \tcbitem[octogon arc,arc is angular,halign=center,valign=center,
+ detach title,watermark text={\tcbtitletext}] L
+ \end{tcbitemize}
+\end{tcolorbox}
+
+
+
\end{document}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
index e0d477e1e01..f3d8976d047 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
@@ -106,7 +106,7 @@ parameters. The differences are:
boxes are always unbreakable.\par
After all, in the unlikely case you really want to have the nested box to be breakable,
use \refKey{/tcb/enforce breakable} for the nested
- box\footnote{ \refKey{/tcb/enforce breakable} acts like \refKey{/tcb/breakable} until |tcolorbox| 3.04.}.
+ box\footnote{\refKey{/tcb/enforce breakable} acts like \refKey{/tcb/breakable} until |tcolorbox| 3.04.}.
\textbf{But, a breakable box inside a breakable box will usually give a mess.}
\item If your text content contains some text color changing commands,
your color will not survive the break to the next box.
@@ -118,6 +118,12 @@ parameters. The differences are:
The |perpage| option of the |footmisc| package is deliberately deactivated
inside a breakable box since all footnotes are placed at the end
of the box (possibly far away from the reference point).
+\item\tcbdocmarginnote{\tcbdocnew{2016-02-15}}
+ Making a box \refKey{/tcb/breakable} which actually is not broken creates
+ a box which acts \emph{almost} like an unbreakable box. Visual differences
+ are kept as indiscernible as possible, but can appear with certain
+ \refKey{/tcb/before} and \refKey{/tcb/after} settings, especially, if there
+ is an automatic page break before the box.
\end{itemize}
@@ -518,12 +524,10 @@ and \refKey{/tcb/enlarge bottom at break by}.
% \usetikzlibrary{decorations.pathmorphing}
% \tcbuselibrary{skins}
\newtcolorbox{mybox}[1][]{
- enhanced,frame hidden,
- colframe=yellow,
- sharp corners,
+ tile,
colback=green!7,coltitle=blue!50!black,colbacktitle=blue!5,
center title,
- boxrule=0pt,toprule=1.25mm,bottomrule=1.25mm,
+ toprule=1.25mm,bottomrule=1.25mm,
extras unbroken and first={
borderline north={0.25mm}{0.5mm}{blue,decoration={zigzag,amplitude=0.5mm},decorate}},
extras unbroken and last={
@@ -681,6 +685,11 @@ the \emph{break sequence} parts are displayed.
\tcbbreakskininto{bicolormiddle}{bicolormiddle}{bicolormiddle}{bicolormiddle}{bicolor}
\tcbbreakskininto{bicolorlast}{bicolormiddle}{bicolormiddle}{bicolorlast}{bicolor}
\clearpage
+\tcbbreakskininto{tile}{tilefirst}{tilemiddle}{tilelast}{tile,colbacktitle=Navy}
+\tcbbreakskininto{tilefirst}{tilefirst}{tilemiddle}{tilemiddle}{tile,colbacktitle=Navy}
+\tcbbreakskininto{tilemiddle}{tilemiddle}{tilemiddle}{tilemiddle}{tile,colbacktitle=Navy}
+\tcbbreakskininto{tilelast}{tilemiddle}{tilemiddle}{tilelast}{tile,colbacktitle=Navy}
+\clearpage
\tcbbreakskininto{beamer}{beamerfirst}{beamermiddle}{beamerlast}{beamer}
\tcbbreakskininto{beamerfirst}{beamerfirst}{beamermiddle}{beamermiddle}{beamer}
\tcbbreakskininto{beamermiddle}{beamermiddle}{beamermiddle}{beamermiddle}{beamer}
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 57a74eb85f2..09318e42bb5 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -1430,7 +1430,7 @@ This is a \textbf{tcolorbox}.
\begin{docTcbKey}{sharpish corners}{}{style, no value}
Shortcut for setting \refKey{/tcb/arc} and \refKey{/tcb/outer arc}
- to |0pt|. With this setting, rounded corners will appear als quasi-sharp,
+ to |0pt|. With this setting, rounded corners will appear as quasi-sharp,
but e.\,g.\ the shadow will be somewhat rounder than the shadow
of really sharp corners.
\begin{marker}
@@ -1683,6 +1683,8 @@ This is a \textbf{tcolorbox} where the text area has a height of 2cm.
\begin{docTcbKey}[][doc new=2014-11-07]{add to height}{=\meta{length}}{style, no default}
Adds \meta{length} to the current height of the colored box.
\refKey{/tcb/height} has to be set before this key is used!
+ If this option is used several times, then the \refKey{/tcb/height} is
+ also increased several times.
\begin{dispExample}
\tcbset{height=1cm,
valign=center,width=(\linewidth-2mm)/2,
@@ -1698,7 +1700,28 @@ This is a \textbf{tcolorbox} where the text area has a height of 2cm.
\end{docTcbKey}
-\begin{docTcbKey}[][doc new and updated={2014-09-22}{2014-12-15}]{height fill}{\colOpt{=true\textbar false\textbar maximum}}{default |true|, initially |false|}
+\begin{docTcbKey}[][doc new=2016-02-16]{add to natural height}{=\meta{length}}{style, no default}
+ The application of this option generates a box with natural height plus
+ the given \meta{length}. If this option is used several times, then the
+ last setting of \meta{length} wins. The resulting box is not considered
+ a fixed height box and the implementation is quite different to
+ \refKey{/tcb/add to height}.
+\begin{dispExample}
+\tcbset{valign=center,width=(\linewidth-2mm)/2,
+ before=,after=\hfill,colframe=blue!75!black,colback=white}
+
+\begin{tcolorbox}
+ This box has natural height.
+\end{tcolorbox}
+\begin{tcolorbox}[add to natural height=1cm]
+ This box has natural height plus 1 cm.
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\clearpage
+\begin{docTcbKey}[][doc new and updated={2014-09-22}{2016-02-17}]{height fill}{\colOpt{=true\textbar false\textbar maximum}}{default |true|, initially |false|}
If set to \docValue*{true}, the height of the |tcolorbox| is set to the rest of the
available vertical space of the current page.
If set to \docValue{maximum}, the page is compressed as much as possible.
@@ -1712,6 +1735,9 @@ This height control key is only applicable to unbreakable boxes but it
uses code from the library \mylib{breakable}.
The counterpart for breakable boxes is \refKey{/tcb/height fixed for}.
+This option can and should not be used for boxes in boxes, but it can be
+used for boxes inside a \refEnv{tcbraster}.
+
\begin{dispListing}
% \usepackage{lipsum}
% \tcbuselibrary{breakable}
@@ -1792,6 +1818,47 @@ colframe=blue!75!black,colback=white,height=3cm}
+\begin{docTcbKey}[][doc new=2015-02-15]{space to}{=\meta{macro}}{no default, initially unset}
+ If the height of a |tcolorbox| is not the natural height, the space
+ difference between the forced and the natural size is saved into the
+ given local \meta{macro}. This \meta{macro} can and should be used inside
+ the box content to add content which is vertically sized to match \meta{macro}.
+ \begin{marker}
+ \begin{itemize}
+ \item The actual length saved into \meta{macro} is adapted dynamically
+ during several compilations -- at least two, but maybe more.
+ \item Due to the adaption algorithm, objects can be sized with
+ \meta{macro} plus any offset length.
+ \item Never ever use \meta{macro} multiplied with a factor. The only
+ exception to this rule is that the space can be split into parts which
+ sum to \meta{macro}.
+ \item Never use this in combination with \refKey{/tcb/fit}.
+ \end{itemize}
+ \end{marker}
+\begin{dispExample}
+\begin{tcolorbox}[colframe=blue!75!black,colback=white,height=3cm,
+ space to=\myspace]
+ This is my box of height 3cm. The space is filled with a picture:\\[2mm]
+ \includegraphics[width=\linewidth,height=\myspace]{goldshade.png}\\[1mm]
+ This is some other text.
+\end{tcolorbox}
+\end{dispExample}
+
+\begin{dispExample}
+\begin{tcolorbox}[colframe=blue!75!black,colback=white,height=3cm,
+ space to=\myspace]
+ \includegraphics[width=\linewidth,
+ height=0.33\dimexpr\myspace]{blueshade.png}\\[1mm]
+ This is my box of height 3cm.\\[2mm]
+ \includegraphics[width=\linewidth,
+ height=0.67\dimexpr\myspace]{goldshade.png}
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+
+
+
\begin{docTcbKey}{split}{=\meta{fraction}}{no default}
If the height of a |tcolorbox| is not the natural height, the
\meta{fraction} with a value between 0 and 1 determines the positioning
@@ -1898,11 +1965,13 @@ with a listing.
\end{dispExample}
\end{docTcbKey}
-
-\begin{docTcbKey}[][doc new=2015-11-27]{use height from group}{=\meta{id}}{style, no default}
+\clearpage
+\begin{docTcbKey}[][doc new and updated={2015-11-27}{2016-02-22}]{use height from group}{\colOpt{=\meta{id}}}{style, default current group}
Sets the current box to a fixed \refKey{/tcb/height} which is copied from
an equal height group with the given \meta{id}. If this height is not
- available during the current compilation, no fixed height setting is used.\par
+ available during the current compilation, no fixed height setting is used.
+ If \meta{id} is omitted, the current equal height group is used which has
+ to be set before by \refKey{/tcb/equal height group}.\par
Note that the natural height of the current box is not considered for
computation of the group height. The main application for
\refKey{/tcb/use height from group} is that the height can be adapted
@@ -1914,9 +1983,25 @@ with a listing.
Height from group 'C' of the previous example, but reduced by 2cm.
\end{tcolorbox}%
\end{dispExample}
+
+\begin{dispExample}
+% \tcbuselibrary{raster}
+Every line is inside an equal height group:
+\begin{tcbraster}[raster equal height=rows,
+ title=Box \thetcbrasternum,
+ enhanced,size=small,colframe=red!50!black,colback=red!10!white]
+ \begin{tcolorbox}First line\\second line\\
+ The height of this box rules.\end{tcolorbox}
+ \begin{tcolorbox}[use height from group]Test\end{tcolorbox}
+ \begin{tcolorbox}[use height from group]
+ First line\\second line\end{tcolorbox}
+ \begin{tcolorbox}The height of this box rules.\end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
\end{docTcbKey}
-\enlargethispage*{1cm}
+
+
\begin{docCommand}[doc new=2015-11-27]{tcbheightfromgroup}{\marg{macro}\marg{id}}
Saves the height from an equal height group with the given \meta{id}
to a \meta{macro}. If this height is not available during the current compilation,
@@ -2510,19 +2595,19 @@ This behavior is controlled by the keys |before| and |after|.
\begin{docTcbKey}{parskip}{}{style, no value}
Sets the keys |before| and |after| to values which are
recommended, if the package |parskip| \emph{is} used and there is no better
- idea for |before| and |after|.
+ idea for |before| and |after|. This is similar to:
\begin{dispListing}
\tcbset{parskip/.style={before={\par\pagebreak[0]\parindent=0pt},
after={\par}}}
\end{dispListing}
\end{docTcbKey}
-\begin{docTcbKey}[][doc updated=2015-03-16]{noparskip}{}{style, no value}
+\begin{docTcbKey}[][doc updated=2016-02-14]{noparskip}{}{style, no value}
Sets the keys |before| and |after| to values which are
recommended, if the package |parskip| is \emph{not} used and there is no better
- idea for |before| and |after|.
+ idea for |before| and |after|. This is similar to:
\begin{dispListing}
-\tcbset{noparskip/.style={before={\par\smallskip\pagebreak[0]\parindent=0pt},
+\tcbset{noparskip/.style={before={\par\pagebreak[0]\smallskip\parindent=0pt},
after={\par\smallskip}}}
\end{dispListing}
\end{docTcbKey}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex
index 6545a51ef7d..925cb4f1691 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex
@@ -15,7 +15,7 @@ See \Vref{sec:skins} for the documentation of all other options of the \mylib{sk
\subsection{Macros}
-\begin{docCommand}[doc new and updated={2014-11-14}{2014-11-24}]{tcbincludegraphics}{\oarg{options}\marg{file name}}
+\begin{docCommand}[doc new and updated={2014-11-14}{2016-02-19}]{tcbincludegraphics}{\oarg{options}\marg{file name}}
In principle, this macro includes an image file denoted by \meta{file name}
using the standard |\includegraphics| and puts it into a \refEnv{tcolorbox}.
The \meta{options} are |tcolorbox| keys to set up the colored box.
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 8e54c49b658..009552f1a3b 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex
@@ -176,6 +176,48 @@ If \refKey{/tcb/fit} should be used, turn over to \refEnv{tcbraster}.
\clearpage
+\begin{docEnvironment}[doc new=2016-02-19]{tcboxedraster}{\oarg{raster options}\marg{box options}}
+ This is a convenience environment which combines a \refEnv{tcolorbox} with
+ an embedded \refEnv{tcbraster}. The \meta{box options} are given to the
+ outer \refEnv{tcolorbox}, while the \meta{raster options} are given to the
+ embedded \refEnv{tcbraster}.
+ This environment is especially useful for rasters inside rasters.
+
+\begin{dispExample}
+\begin{tcboxedraster}[raster columns=3, raster equal height,
+ size=small,colframe=red!50!black,colback=red!10!white,colbacktitle=red!50!white,
+ title={Box \# \thetcbrasternum}]
+ {colback=yellow!10,fonttitle=\bfseries,title=Boxed Raster}
+ \begin{tcolorbox}First box\end{tcolorbox}
+ \begin{tcolorbox}Second box\end{tcolorbox}
+ \begin{tcolorbox}This is a box\\with a second line\end{tcolorbox}
+ \begin{tcolorbox}Another box\end{tcolorbox}
+ \begin{tcolorbox}A box again\end{tcolorbox}
+\end{tcboxedraster}
+\end{dispExample}
+
+\begin{dispExample}
+% \tcbuselibrary{skins}
+\begin{tcbraster}[raster columns=2, raster equal height,
+ raster every box/.style={size=small,colframe=red!50!black,colback=red!10!white,
+ valign=center,halign=center}]
+ \begin{tcolorbox}One\end{tcolorbox}
+ \begin{tcolorbox}Two\end{tcolorbox}
+ \begin{tcboxedraster}{blankest}
+ \begin{tcolorbox}Three\end{tcolorbox}
+ \begin{tcolorbox}Four\end{tcolorbox}
+ \begin{tcolorbox}Five\end{tcolorbox}
+ \begin{tcolorbox}Six\end{tcolorbox}
+ \end{tcboxedraster}
+ \begin{tcolorbox}Seven\end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+
+
+\end{docEnvironment}
+
+
+\clearpage
\subsection{Option Keys of the Library}\label{subsec:raster_options}
\begin{docTcbKey}[][doc new=2014-11-10]{raster columns}{=\meta{number}}{no default, initially |2|}
@@ -574,4 +616,255 @@ This style is used for the box with number |n|.
\end{docTcbKey}
+\clearpage
+\subsection{Combining Columns or Rows}\label{subsec:raster_multicolrow}
+
+\begin{docTcbKey}[][doc new=2016-02-19]{raster multicolumn}{=\meta{number}}{no default, initially unset}
+ This option has to be set inside the option list of a \refEnv{tcolorbox}
+ inside a \refEnv{tcbraster} or inside \refCom{tcbitem} inside \refEnv{tcbitemize}.
+ It merges the given \meta{number} of boxes into one single box
+ on the same line. The resulting box gets the \docAuxCommand{thetcbrasternum}
+ of the first box.
+ If there are not enough boxes available on the current line, this option
+ is ignored and a warning is given.
+
+\begin{dispExample}
+\begin{tcbitemize}[raster equal height=rows,raster columns=3,
+ title=\thetcbrasternum,colframe=red!50!black,colback=red!10!white]
+\tcbitem[colframe=blue!50!black,colback=blue!10!white,raster multicolumn=1]
+ multicolumn=1
+\tcbitem
+\tcbitem
+\tcbitem[colframe=blue!50!black,colback=blue!10!white,raster multicolumn=2]
+ multicolumn=2
+\tcbitem
+\tcbitem[colframe=blue!50!black,colback=blue!10!white,raster multicolumn=3]
+ multicolumn=3
+\tcbitem
+\tcbitem[colframe=blue!50!black,colback=blue!10!white,raster multicolumn=2]
+ multicolumn=2
+\end{tcbitemize}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\clearpage
+\begin{docTcbKey}[][doc new=2016-02-19]{raster multirow}{=\meta{number}}{no default, initially unset}
+ This option has to be set inside the option list of a \refEnv{tcolorbox}
+ inside a \refEnv{tcbraster} or inside \refCom{tcbitem} inside \refEnv{tcbitemize}.
+ This option not really merges boxes, but simply sizes the current box to fit
+ the space of \meta{number} rows.
+
+ \begin{marker}
+ \refKey{/tcb/raster multirow} needs \refKey{/tcb/raster height} to be set.
+ How to achieve a similar result for boxes without fixed \refKey{/tcb/raster height}
+ is shown afterwards.
+ \end{marker}
+
+\begin{dispExample}
+\begin{tcbitemize}[raster rows=3,raster columns=3,raster height=6cm,
+ raster every box/.style={colframe=red!50!black,colback=red!10!white}]
+\tcbitem
+\tcbitem
+\tcbitem
+\tcbitem[colframe=blue!50!black,colback=blue!10!white,raster multirow=2]
+ multirow=2
+\tcbitem[raster multicolumn=2,raster multirow=2,blankest]
+ \begin{tcbitemize}[raster rows=2,raster columns=2,raster height=\tcbtextheight]
+ \tcbitem
+ \tcbitem
+ \tcbitem
+ \tcbitem
+ \end{tcbitemize}
+\end{tcbitemize}
+\end{dispExample}
+
+
+\clearpage
+For rasters without fixed \refKey{/tcb/raster height}, \refKey{/tcb/raster multirow}
+cannot be used. Note that \refCom{tcbtextheight} also cannot be used like
+in the previous example.
+
+But, with combination of \refKey{/tcb/raster equal height} and
+\refKey{/tcb/space to}, a similar effect can be created:
+
+\begin{dispExample}
+\begin{tcbitemize}[raster columns=3,raster equal height=rows,
+ raster every box/.style={colframe=red!50!black,colback=red!10!white}]
+\tcbitem
+\tcbitem
+\tcbitem
+\tcbitem[colframe=blue!50!black,colback=blue!10!white]
+ \lipsum[2]
+\tcbitem[raster multicolumn=2,blankest,space to=\myspace]
+ \begin{tcbitemize}[raster columns=2]
+ \tcbitem This is a box of the inner raster.
+ \tcbitem
+ \tcbitem[height=\myspace]
+ \tcbitem[height=\myspace]
+ \end{tcbitemize}
+\end{tcbitemize}
+\end{dispExample}
+
+\end{docTcbKey}
+
+
+
+\clearpage
+\subsection{Rasters inside Rasters}\label{subsec:raster_insideraster}
+
+A \emph{raster} inside a \emph{raster} cannot be used directly, because
+a \emph{raster} can only contain a \emph{tcolorbox} or something
+derived from a \emph{tcolorbox}. So, a \emph{raster} can be put inside
+a \emph{tcolorbox} inside a \emph{raster}.
+
+Some examples for such constructions can be found at \refEnv{tcboxedraster},
+\refKey{/tcb/raster multicolumn},
+\refKey{/tcb/raster multirow}.
+
+
+\subsubsection{Raster Setup}
+The intermediating \refEnv{tcolorbox} can be made invisible by using
+\refKey{/tcb/blankest}.
+
+\begin{dispExample}
+\begin{tcbraster}[raster equal height=rows,
+ raster every box/.style={colframe=red!50!black,colback=red!10!white}]
+ \begin{tcolorbox}[blankest]
+ \begin{tcbraster}[raster columns=1]
+ \begin{tcolorbox}One\end{tcolorbox}
+ \begin{tcolorbox}Two\end{tcolorbox}
+ \end{tcbraster}
+ \end{tcolorbox}
+ \begin{tcolorbox}raster+tcolorbox+raster\end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+
+\enlargethispage*{1cm}
+\begin{dispExample}
+\begin{tcbraster}[raster equal height=rows,
+ raster every box/.style={colframe=red!50!black,colback=red!10!white}]
+ \begin{tcboxedraster}[raster columns=1]{blankest}
+ \begin{tcolorbox}One\end{tcolorbox}
+ \begin{tcolorbox}Two\end{tcolorbox}
+ \end{tcboxedraster}
+ \begin{tcolorbox}raster+tcboxedraster\end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+
+
+\begin{dispExample}
+\begin{tcbitemize}[raster equal height=rows,
+ raster every box/.style={colframe=red!50!black,colback=red!10!white}]
+ \tcbitem[blankest]
+ \begin{tcbitemize}[raster columns=1]
+ \tcbitem One
+ \tcbitem Two
+ \end{tcbitemize}
+ \tcbitem tcbitemize+tcbitem+tcbitemize
+\end{tcbitemize}
+\end{dispExample}
+
+
+\subsubsection{Placing Spaces}
+If the heights of boxes inside staggered rasters should be matched, the
+space has to be distributed accordingly.
+
+\begin{itemize}
+\item For fixed height boxes/rasters using \refKey{/tcb/raster height},
+ the height of boxes is available by \refCom{tcbtextheight}. This can be
+ used to size deeper layered boxes/rasters.
+\item For boxes/rasters layed out using \refKey{/tcb/raster equal height},
+ space can be distributed by \refKey{/tcb/space to}.
+ It can take several compilations until all spaces are distributed correctly.
+\end{itemize}
+
+
+\begin{dispExample}
+\begin{tcbitemize}[raster rows=2,raster height=6cm,
+ raster every box/.style={colframe=red!50!black,colback=red!10!white}]
+ \tcbitem[blankest]
+ \begin{tcbitemize}[raster columns=1,raster rows=2,raster height=\tcbtextheight]
+ \tcbitem One
+ \tcbitem Two
+ \end{tcbitemize}
+ \tcbitem This is a fixed height box.
+ \tcbitem Three
+ \tcbitem Four
+\end{tcbitemize}
+\end{dispExample}
+
+
+\begin{dispExample}
+\begin{tcbitemize}[raster columns=4,raster rows=4,raster height=0.8\linewidth,
+ raster every box/.style={size=small,beamer,
+ colframe=blue!75!yellow,colback=red!75!yellow!20,
+ center title,title=Box}]
+ \tcbitem One
+ \tcbitem Two
+ \tcbitem Three
+ \tcbitem Four
+ \tcbitem[raster multirow=2,blankest]
+ \begin{tcbitemize}[raster columns=1,raster rows=2,raster height=\tcbtextheight]
+ \tcbitem Twelve
+ \tcbitem Eleven
+ \end{tcbitemize}
+ \tcbitem[raster multirow=2,raster multicolumn=2,
+ colframe=red!75!yellow,colback=blue!75!yellow!20]
+ This is an example with fixed height boxes.
+ \tcbitem[raster multirow=2,blankest]
+ \begin{tcbitemize}[raster columns=1,raster rows=2,raster height=\tcbtextheight]
+ \tcbitem Five
+ \tcbitem Six
+ \end{tcbitemize}
+ \tcbitem Ten
+ \tcbitem Nine
+ \tcbitem Eight
+ \tcbitem Seven
+\end{tcbitemize}
+\end{dispExample}
+
+
+\begin{dispExample}
+\begin{tcbitemize}[raster equal height=rows,
+ raster every box/.style={colframe=red!50!black,colback=red!10!white}]
+ \tcbitem[blankest,space to=\myspace]
+ \begin{tcbitemize}[raster columns=1]
+ \tcbitem One
+ \tcbitem[add to natural height=\myspace]
+ This box will adapt its height.
+ \end{tcbitemize}
+ \tcbitem This is a flexible height box.
+ \tcbitem \lipsum[4]
+ \tcbitem[blankest,space to=\myspace]
+ \begin{tcbitemize}[raster columns=1]
+ \tcbitem One
+ \tcbitem[add to natural height=\myspace]
+ This box will adapt its height.
+ \end{tcbitemize}
+\end{tcbitemize}
+\end{dispExample}
+
+
+
+\begin{dispExample}
+\begin{tcbitemize}[raster equal height=rows,
+ raster every box/.style={colframe=red!50!black,colback=red!10!white}]
+ \tcbitem[blankest,space to=\myspace]
+ \begin{tcbitemize}[raster columns=1]
+ \tcbitem One
+ \tcbitem[add to natural height=\myspace]
+ This box will adapt its height.
+ \tcbitem \lipsum[4]
+ \end{tcbitemize}
+ \tcbitem[blankest,space to=\myspace]
+ \begin{tcbitemize}[raster columns=1]
+ \tcbitem[blankest]\includegraphics[width=\linewidth]{goldshade.png}
+ \tcbitem[add to natural height=\myspace]
+ This box will adapt its height.
+ \end{tcbitemize}
+\end{tcbitemize}
+\end{dispExample}
+
+
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
index 5238fe00356..560b9b45b3e 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
@@ -1,5 +1,8 @@
% !TeX root = tcolorbox.tex
% include file (style) of tcolorbox.tex (manual of the LaTeX package tcolorbox)
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{4.2em}{3.2em}}
+
\RequirePackage[T1]{fontenc}
\RequirePackage[latin1]{inputenc}
\RequirePackage[english]{babel}
@@ -36,21 +39,16 @@
\RequirePackage{amsmath}
\RequirePackage{lipsum}
\RequirePackage{empheq}
-
-%\RequirePackage[cache]{minted}% minted 2.0
+\RequirePackage[extendedchars,encoding,filenameencoding=utf-8]{grffile}
\providecommand{\tcbpkgprefix}{}
\RequirePackage{\tcbpkgprefix tcolorbox}
\tcbuselibrary{most,documentation}
-\makeatletter
\tcbifexternal{}{%
\tcbuselibrary{minted}%
\tcbset{listing engine=listings,initialize@reset={listing engine=listings}}%
}
-\makeatother
-
-\RequirePackage[extendedchars,encoding,filenameencoding=utf-8]{grffile}
\tcbset{skin=enhanced,
doc head={colback=yellow!10!white,interior style=fill},
@@ -79,9 +77,9 @@
\newrobustcmd{\tcbIndexPrintSkinC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@key}}
\def\tcb@index@Skin#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintSkinCA{#1}}\index{Skins\idx@level#1\idx@actual\tcbIndexPrintSkinC{#1}}\fi}%
-\newenvironment{docSkin}[1]{\begin{tcb@manual@entry}%
- \begin{tcb@doc@head}{colback=magenta!5!white,interior style=fill}%
- \hypertarget{skin:#1}{\tcb@Print@Key{/tcb/skin=}\tcb@Print@Val{#1}\tcb@index@Skin{#1}\protected@edef\@currentlabel{#1}\label{skin:#1}\hfill(skin)}%
+\newenvironment{docSkin}[2][]{\begin{tcb@manual@entry}%
+ \begin{tcb@doc@head}{colback=magenta!5!white,interior style=fill,#1}%
+ \hypertarget{skin:#2}{\tcb@Print@Key{/tcb/skin=}\tcb@Print@Val{#2}\tcb@index@Skin{#2}\protected@edef\@currentlabel{#2}\label{skin:#2}\hfill(skin)}%
\end{tcb@doc@head}}%
{\end{tcb@manual@entry}}
\def\refSkin{\tcb@ref@doc{skin}}
@@ -126,7 +124,7 @@
tcblower,tcbox,tcboxfit,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite,tcbsetforeverylayer,tcbsubtitle,
tcolorboxenvironment,tcblistof,tcbstartrecording,tcbrecord,tcbstoprecording,tcbinputrecords,
tcbpatcharcangular,tcbpatcharcround,tcbifoddpage,thetcolorboxnumber,thetcolorboxpage,
- tcbheightfromgroup,
+ tcbheightfromgroup,tcbheightspace,tcbtextwidth,tcbtextheight,
% listings
endtcblisting,newtcblisting,newtcbinputlisting,
tcblisting,tcbinputlisting,tcbuselistingtext,tcbuselistinglisting,tcbusetemplisting,
@@ -172,11 +170,7 @@
classoffset=0% restore default
}
-
\definecolor{Green_Dark}{rgb}{0.078431,0.407843,0.176471}
-\definecolor{Blue_Dark}{rgb}{0.078431,0.188235,0.615686}
-
-
\definecolor{Blue_Dark}{rgb}{0.090196,0.211765,0.364706}
\definecolor{Blue_Bright}{rgb}{0.858824,0.898039,0.945098}
@@ -210,7 +204,6 @@
\newtcbexternalizetcolorbox{exdispExample*}{dispExample*}{environment with percent=false,minipage}{beforeafter example}
-
\newcommand{\inputpreamblelisting}[1]{%
\tcbinputlisting{title=Definition in the preamble:,
base example,coltitle=black,fonttitle=\itshape,titlerule=0pt,
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 dbac5e0cbe9..a7277ee892e 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
@@ -422,12 +422,13 @@ This is the lower part.
\clearpage
\subsection{Boxed Title Option Keys}\label{subsec:skinboxedtitle}
+\subsubsection{Boxed Title Placement}
The following options place the title text into an own \refCom{tcbox}.
This boxed title can be customized independently from the main box using
\refKey{/tcb/boxed title style}.
The placement can be influenced by \meta{boxtitle options}.
-\begin{docTcbKey}{attach boxed title to top left}{\colOpt{=\meta{boxtitle options}}}{style, default empty}
+\begin{docTcbKey}{attach boxed title to top left}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
The title is boxed with a \refCom{tcbox} and attached to
the top left corner of the main box.
\begin{exdispExample*}{attach_boxed_title_to_top_left}{sbs,lefthand ratio=0.66}
@@ -438,7 +439,7 @@ the top left corner of the main box.
\end{exdispExample*}
\end{docTcbKey}
-\begin{docTcbKey}{attach boxed title to top center}{\colOpt{=\meta{boxtitle options}}}{style, default empty}
+\begin{docTcbKey}{attach boxed title to top center}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
The title is boxed with a \refCom{tcbox} and attached to
the top of the main box.
\begin{exdispExample*}{attach_boxed_title_to_top_center}{sbs,lefthand ratio=0.66}
@@ -449,7 +450,7 @@ the top of the main box.
\end{exdispExample*}
\end{docTcbKey}
-\begin{docTcbKey}{attach boxed title to top right}{\colOpt{=\meta{boxtitle options}}}{style, default empty}
+\begin{docTcbKey}{attach boxed title to top right}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
The title is boxed with a \refCom{tcbox} and attached to
the top right corner of the main box.
\begin{exdispExample*}{attach_boxed_title_to_top_right}{sbs,lefthand ratio=0.66}
@@ -460,7 +461,7 @@ the top right corner of the main box.
\end{exdispExample*}
\end{docTcbKey}
-\begin{docTcbKey}{attach boxed title to bottom left}{\colOpt{=\meta{boxtitle options}}}{style, default empty}
+\begin{docTcbKey}{attach boxed title to bottom left}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
The title is boxed with a \refCom{tcbox} and attached to
the bottom left corner of the main box.
\begin{exdispExample*}{attach_boxed_title_to_bottom_left}{sbs,lefthand ratio=0.66}
@@ -471,7 +472,7 @@ the bottom left corner of the main box.
\end{exdispExample*}
\end{docTcbKey}
-\begin{docTcbKey}{attach boxed title to bottom center}{\colOpt{=\meta{boxtitle options}}}{style, default empty}
+\begin{docTcbKey}{attach boxed title to bottom center}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
The title is boxed with a \refCom{tcbox} and attached to
the bottom of the main box.
\begin{exdispExample*}{attach_boxed_title_to_bottom_center}{sbs,lefthand ratio=0.66}
@@ -482,7 +483,7 @@ the bottom of the main box.
\end{exdispExample*}
\end{docTcbKey}
-\begin{docTcbKey}{attach boxed title to bottom right}{\colOpt{=\meta{boxtitle options}}}{style, default empty}
+\begin{docTcbKey}{attach boxed title to bottom right}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
The title is boxed with a \refCom{tcbox} and attached to
the bottom right corner of the main box.
\begin{exdispExample*}{attach_boxed_title_to_bottom_right}{sbs,lefthand ratio=0.66}
@@ -493,8 +494,78 @@ the bottom right corner of the main box.
\end{exdispExample*}
\end{docTcbKey}
+
+\clearpage
+\begin{docTcbKey}[][doc new=2016-02-26]{attach boxed title to top}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
+ This is a convenient style to mimic a standard title.
+ It uses \refKey{/tcb/attach boxed title to top center},
+ \refKey{/tcb/minipage boxed title}, and sizes the boxed title to match
+ the base box.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\begin{tcolorbox}[enhanced,title=My title,
+ attach boxed title to top,
+ boxed title style={colframe=red}]
+ This is a \textbf{tcolorbox}.
+\end{tcolorbox}
+\end{dispExample*}
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2016-02-26]{attach boxed title to top*}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
+ In contrast to \refKey{/tcb/attach boxed title to top}, this style
+ uses smaller left and right rules to avoid previewer glitches.
+ Typically, one would not use different colors for the frame as in the
+ example below.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\begin{tcolorbox}[enhanced,title=My title,
+ attach boxed title to top*,
+ boxed title style={colframe=red}]
+ This is a \textbf{tcolorbox}.
+\end{tcolorbox}
+\end{dispExample*}
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2016-02-26]{attach boxed title to bottom}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
+ This is a convenient style to produce a standard-like title at the bottom
+ of the box.
+ It uses \refKey{/tcb/attach boxed title to bottom center},
+ \refKey{/tcb/minipage boxed title}, and sizes the boxed title to match
+ the base box.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\begin{tcolorbox}[enhanced,title=My title,
+ attach boxed title to bottom,
+ boxed title style={colframe=red}]
+ This is a \textbf{tcolorbox}.
+\end{tcolorbox}
+\end{dispExample*}
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2016-02-26]{attach boxed title to bottom*}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
+ In contrast to \refKey{/tcb/attach boxed title to top}, this style
+ uses smaller left and right rules to avoid previewer glitches.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\begin{tcolorbox}[enhanced,title=My title,
+ attach boxed title to bottom*]
+ This is a \textbf{tcolorbox}.
+\end{tcolorbox}
+\end{dispExample*}
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2016-02-26]{flip title}{\colOpt{=\marg{options}}}{style, default empty}
+ This style combines \refKey{/tcb/attach boxed title to bottom*}
+ with \refKey{/tcb/boxed title style}. The \meta{options} are given to
+ \refKey{/tcb/boxed title style}.
+\begin{dispExample*}{sbs,lefthand ratio=0.66}
+\begin{tcolorbox}[tile,flip title={sharp corners},
+ title=My title,colback=red!10,
+ colbacktitle=red!75!black]
+ This is a \textbf{tcolorbox}.
+\end{tcolorbox}
+\end{dispExample*}
+\end{docTcbKey}
+
\clearpage
+\subsubsection{Options for the Boxed Title Placement}
The \meta{boxtitle options} of the keys described above are shift values.
The dimensions of the boxed title are stored into two macros
\docAuxCommand{tcboxedtitleheight} and
@@ -568,6 +639,7 @@ are \emph{not} automatically computed.
\clearpage
+\subsubsection{Options for the Boxed Title Box}
\begin{marker}
The boxed title options are implemented as an underlay, see \Vref{subsec:skinunderlay}.
Therefore, a boxed title is not drawn, if a skin does not support underlays
@@ -591,14 +663,47 @@ are \emph{not} automatically computed.
-\begin{docTcbKey}{boxed title style}{=\meta{options}}{style, initially empty}
+\begin{docTcbKey}[][doc new=2016-02-26]{boxed title size}{=\meta{size}}{no default, initially |title|}
+ This setting defines the basic size for the title box. Further settings
+ can be applied using \refKey{/tcb/boxed title style}.
+ Feasible values for \meta{size} are:
+ \begin{itemize}
+ \item\docValue{title}: Sets the size according to \refKey{/tcb/size}|=|\docValue{title}.
+ \item\docValue{standard}: No size setting. Typically, this is identical to
+ \refKey{/tcb/size}|=|\docValue{normal}.
+ \item\docValue{copy}: The size values for a title of the base box are copied
+ for the title box.
+ \end{itemize}
+
+\begin{dispExample}
+% \tcbuselibrary{raster}
+\begin{tcbraster}[raster columns=3,enhanced,boxrule=0.4pt,
+ title=My title,attach boxed title to top center]
+ \begin{tcolorbox}[boxed title size=title]
+ This is a \textbf{tcolorbox}.
+ \end{tcolorbox}
+ \begin{tcolorbox}[boxed title size=standard]
+ This is a \textbf{tcolorbox}.
+ \end{tcolorbox}
+ \begin{tcolorbox}[boxed title size=copy]
+ This is a \textbf{tcolorbox}.
+ \end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+
+\end{docTcbKey}
+
+
+\clearpage
+\begin{docTcbKey}[][doc updated=2016-02-26]{boxed title style}{=\meta{options}}{style, initially empty}
By default, a boxed title is dimensioned with \refKey{/tcb/size}|=|\docValue*{title}
-and inherits \refKey{/tcb/colframe} of the main box.
+and inherits the \refKey{/tcb/skin} and \refKey{/tcb/colframe} of the main box.
Also, the \refKey{/tcb/colback} is inherited from the main \refKey{/tcb/colbacktitle}.
Font and color of the title text are set as usual.
-All other \meta{options} are set by the |boxed title style| key.
+All other \meta{options} are set by the \refKey{/tcb/boxed title style} key.
Since a boxed title is set by \refCom{tcbox}, all |tcolorbox| options are
-applicable here.
+applicable here. If \refKey{/tcb/boxed title style} is used several times,
+the \meta{options} are is appended.
\begin{exdispExample*}{boxed_title_style_1}{sbs,lefthand ratio=0.66}
\begin{tcolorbox}[enhanced,title=My title,
@@ -619,8 +724,7 @@ applicable here.
fonttitle=\bfseries,coltitle=red!50!black,
attach boxed title to top left=
{xshift=3.2mm,yshift=-0.50mm},
- boxed title style={enhanced,
- skin=enhancedfirst jigsaw,
+ boxed title style={skin=enhancedfirst jigsaw,
size=small,arc=1mm,bottom=-1mm,
interior style={fill=none,
top color=red!30!white,
@@ -634,7 +738,7 @@ applicable here.
colframe=blue!50!black,colback=blue!10!white,colbacktitle=blue!5!yellow!10!white,
fonttitle=\bfseries,coltitle=black,attach boxed title to top center=
{yshift=-0.25mm-\tcboxedtitleheight/2,yshifttext=2mm-\tcboxedtitleheight/2},
- boxed title style={enhanced,boxrule=0.5mm,
+ boxed title style={boxrule=0.5mm,
frame code={ \path[tcb fill frame] ([xshift=-4mm]frame.west)
-- (frame.north west) -- (frame.north east) -- ([xshift=4mm]frame.east)
-- (frame.south east) -- (frame.south west) -- cycle; },
@@ -679,7 +783,7 @@ applicable here.
fonttitle=\bfseries,varwidth boxed title=0.7\linewidth,
colbacktitle=green!45!white,coltitle=green!10!black,colframe=green!50!black,
interior style={top color=yellow!10!white,bottom color=green!10!white},
- boxed title style={enhanced,boxrule=0.75mm,colframe=white,
+ boxed title style={boxrule=0.75mm,colframe=white,
borderline={0.1mm}{0mm}{green!50!black},
borderline={0.1mm}{0.75mm}{green!50!black},
interior style={top color=green!10!white,bottom color=green!10!white,
@@ -695,12 +799,8 @@ applicable here.
\begin{exdispExample}{boxed_title_style_6}
\newtcolorbox{flipbox}[2][]{
- enhanced,sharp corners=south,
- attach boxed title to bottom center={yshift=0.5mm},
- minipage boxed title*,
- boxed title style={enhanced,size=normal,top=0pt,bottom=0pt,
- interior hidden,sharp corners=north},
- title={#2},#1}
+ enhanced,colframe=blue!50!black,colback=yellow!5,fonttitle=\bfseries,
+ flip title={interior hidden},title={#2},#1}
\begin{flipbox}{My title}
\lipsum[2]
@@ -734,6 +834,46 @@ applicable here.
\lipsum[2]
\end{mybox}
\end{exdispExample}
+
+
+\begin{exdispExample}{boxed_title_style_8}
+% \usepackage{varwidth}
+\newtcolorbox{mybox}[2][]{enhanced,
+ before skip=2mm,after skip=2mm,
+ colback=black!5,colframe=black!50,boxrule=0.2mm,
+ attach boxed title to top left={xshift=1cm,yshift*=1mm-\tcboxedtitleheight},
+ varwidth boxed title*=-3cm,
+ boxed title style={frame code={
+ \path[fill=tcbcol@back!30!black]
+ ([yshift=-1mm,xshift=-1mm]frame.north west)
+ arc[start angle=0,end angle=180,radius=1mm]
+ ([yshift=-1mm,xshift=1mm]frame.north east)
+ arc[start angle=180,end angle=0,radius=1mm];
+ \path[left color=tcbcol@back!60!black,right color=tcbcol@back!60!black,
+ middle color=tcbcol@back!80!black]
+ ([xshift=-2mm]frame.north west) -- ([xshift=2mm]frame.north east)
+ [rounded corners=1mm]-- ([xshift=1mm,yshift=-1mm]frame.north east)
+ -- (frame.south east) -- (frame.south west)
+ -- ([xshift=-1mm,yshift=-1mm]frame.north west)
+ [sharp corners]-- cycle;
+ },interior engine=empty,
+ },
+ fonttitle=\bfseries,
+ title={#2},#1}
+
+\begin{mybox}[colbacktitle=green]{My title}
+\lipsum[2]
+\end{mybox}
+\begin{mybox}[colbacktitle=red]{My title}
+\lipsum[3]
+\end{mybox}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+
+\begin{docTcbKey}[][doc new=2016-02-26]{no boxed title style}{}{style, initially set}
+ Removes all options which were set by \refKey{/tcb/boxed title style}.
\end{docTcbKey}
@@ -3521,6 +3661,189 @@ Nevertheless, this skin can be applied independently.
\clearpage
+\subsection{Skin Family 'tile'}
+\begin{docSkin}[doc new=2016-02-25]{tile}
+ This skin is a variant of skin \refSkin{bicolor}. Especially, the
+ optional lower part of the box is colored by \refKey{/tcb/colbacklower}.
+ The main difference to \refSkin{bicolor} is that \refSkin{tile} has no
+ frame.
+\begin{tcolorbox}[skintable=tile]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |path|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{docTcbKey}[][doc new=2016-02-25]{tile}{}{style, no value}
+ This is an abbreviation for setting |skin=tile|.
+ \begin{marker}It also changes the geometry and some style options.\end{marker}
+\end{docTcbKey}
+
+
+\begin{dispExample}
+\begin{tcbraster}[tile,raster equal height,raster columns=4,
+ colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
+ colbacktitle=LimeGreen!75!DarkGreen,
+ left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
+ \begin{tcolorbox}
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}[doc new=2016-02-25]{tilefirst}
+This is a flavor of \refSkin{tile} which is used as a \emph{first} part
+in a break sequence for \refSkin{tile}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=tilefirst]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathfirst|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{dispExample}
+\begin{tcbraster}[skin=tilefirst,raster equal height,raster columns=4,
+ colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
+ colbacktitle=LimeGreen!75!DarkGreen,
+ left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm,boxrule=0pt]
+ \begin{tcolorbox}
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}[doc new=2016-02-25]{tilemiddle}
+This is a flavor of \refSkin{tile} which is used as a \emph{middle} part
+in a break sequence for \refSkin{tile}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=tilemiddle]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathmiddle|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\begin{tcbraster}[skin=tilemiddle,raster equal height,raster columns=4,
+ colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
+ colbacktitle=LimeGreen!75!DarkGreen,
+ left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm,boxrule=0pt]
+ \begin{tcolorbox}
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}[doc new=2016-02-25]{tilelast}
+This is a flavor of \refSkin{tile} which is used as a \emph{last} part
+in a break sequence for \refSkin{tile}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=tilelast]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathlast|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\begin{tcbraster}[skin=tilelast,raster equal height,raster columns=4,
+ colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
+ colbacktitle=LimeGreen!75!DarkGreen,
+ left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm,boxrule=0pt]
+ \begin{tcolorbox}
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+
+
+
+\clearpage
\subsection{Skin Family 'beamer'}
\begin{docSkin}{beamer}
@@ -4009,6 +4332,32 @@ A & B & C\\\hline
\clearpage
+\begin{docTcbKey}{blankest}{}{style, initially unset}
+ This style extends \refKey{/tcb/blanker}.
+ All engines are set to empty and all margins are set to |0pt|.
+ In contrast to \refKey{/tcb/blanker}, also title, shadow, underlay,
+ overlay, finish and borderline are removed.
+
+\begin{dispExample}
+% \tcbuselibrary{raster}
+\begin{tcbraster}[raster columns=3,raster equal height,
+ title=Box \thetcbrasternum,
+ enhanced,size=small,colframe=red!50!black,colback=red!10!white,
+ coltitle=yellow!85!black,
+ drop fuzzy shadow,watermark text={Box \thetcbrasternum},
+ borderline={.25mm}{-0.5mm}{green!40!black},
+ finish={\begin{tcbclipframe}\draw[blue,opacity=0.1,line width=1cm]
+ (frame.south west) -- (frame.north east);\end{tcbclipframe}},
+ ]
+ \begin{tcolorbox}\lipsum[4]\end{tcolorbox}
+ \begin{tcolorbox}[blanker]\lipsum[4]\end{tcolorbox}
+ \begin{tcolorbox}[blankest]\lipsum[4]\end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\clearpage
\begin{docSkin}{emptyfirst}
This is a flavor of \refSkin{empty} which is used as a \emph{first} part
in a break sequence for \refSkin{empty}.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex
index b846a87231e..783306b6d79 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex
@@ -649,3 +649,82 @@ Lower part
\end{dispExample}
\egroup
+
+\clearpage
+\subsection{Useful Properties}\label{subsec:tech_properties}
+
+The following macros describe certain \textit{properties} which may be
+used for the drawing scheme, see \Fullref{subsec:tcolorboxdrawing}.
+Sometimes, they are even available inside the box content. All of them are
+considered to be \textit{read-only} and should never be redefined by the user.
+
+\begin{docCommand}[doc new=2016-02-16]{tcbheightspace}{}
+ If the height of a |tcolorbox| is not the natural height, the space
+ difference between the forced and the natural size is hold by
+ \refCom{tcbheightspace}.
+ This macro is not usable inside the box content, but for skins or
+ inside \refKey{/tcb/underlay}, \refKey{/tcb/overlay}, etc.
+
+ If such a space information is needed inside the box content, see
+ \refKey{/tcb/space to} instead.
+\begin{dispExample}
+% \tcbuselibrary{skins}
+\newtcolorbox{testbox}[2][]{enhanced,size=fbox,
+ colframe=blue!75!black,colback=white,height=#2,
+ underlay={\node[above,inner sep=3pt] at (interior.south){%
+ \includegraphics[width=\tcbtextwidth,height=\tcbheightspace-3pt]{goldshade.png}};
+ },
+ #1}
+\begin{testbox}{3cm}
+ This is my box. The space is filled with a picture.
+\end{testbox}
+\begin{testbox}{2cm}
+ This is my box. The space is filled with a picture.
+\end{testbox}
+\end{dispExample}
+\end{docCommand}
+
+
+\begin{docCommand}[doc new=2016-02-16]{tcbtextwidth}{}
+ This property describes the box content width.
+ \begin{itemize}
+ \item If there also is a lower part, it describes the width of the upper part.
+ \item For \refKey{/tcb/sidebyside} boxes, it describes the combined text
+ width plus segmentation.
+ \item This property can be used inside the box content text with exception
+ of \refKey{/tcb/fit} boxes.
+ \item \refCom{tcbtextwidth} can be used for all box types for skins or
+ inside \refKey{/tcb/underlay}, \refKey{/tcb/overlay}, etc.
+ \end{itemize}
+\begin{dispExample}
+\begin{tcolorbox}[colframe=blue!75!black]
+ Inside a box: \tcbtextwidth\ (=\the\linewidth).
+\end{tcolorbox}
+\end{dispExample}
+\end{docCommand}
+
+\pagebreak
+\begin{docCommand}[doc new=2016-02-16]{tcbtextheight}{}
+ This property describes the designated box content height. If the
+ box is larger than the natural height, the actual content will be smaller
+ than \refCom{tcbtextheight}.
+ \begin{itemize}
+ \item For boxes with a fixed \refKey{/tcb/height}, this property can
+ be used inside the box content text. For other boxes, it denotes |0pt|
+ inside the box content.
+ \item \refCom{tcbtextheight} can be used for all box types for skins or
+ inside \refKey{/tcb/underlay}, \refKey{/tcb/overlay}, etc.
+ \end{itemize}
+
+\begin{dispExample}
+% \tcbuselibrary{skins}
+\begin{tcolorbox}[enhanced,colframe=blue!75!black,
+ underlay={\node[left,red] at (frame.east) {Here: \tcbtextheight};}]
+ Inside a box with natural height: \tcbtextheight.
+\end{tcolorbox}
+\begin{tcolorbox}[enhanced,colframe=blue!75!black,height=1cm,
+ underlay={\node[left,red] at (frame.east) {Here: \tcbtextheight};}]
+ Inside a box with fixed height: \tcbtextheight.
+\end{tcolorbox}
+\end{dispExample}
+\end{docCommand}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index cc4559e9c78..b0c98874c31 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 44e1db33256..74d604ca65d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
@@ -1,9 +1,9 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -35,8 +35,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{3.80}%
-\def\datum{2015/11/27}%
+\def\version{3.90}%
+\def\datum{2016/02/29}%
\makeindex
\hypersetup{
@@ -49,7 +49,7 @@
\usepackage{pgfplots}
%\tcbset{draftmode}
-%\includeonly{tcolorbox.doc.sidebyside}
+%\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 51647e2965c..a66a929fae7 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\let\tcb@parboxrestore@true=\tcb@parboxrestore
\let\tcb@parboxrestore@false\tcb@parbox@false@settings
@@ -276,11 +276,14 @@
}
\def\tcb@height@fill@unbroken#1{%
- \tcb@prepare@break@operation%
- \tcb@breakat@init%
- \tcbset{compress page=#1}%
- \tcb@comp@h@page%
- \tcbset{height=\tcb@h@page-\kvtcb@bbtop@stand-\kvtcb@bbbottom@stand,after=\eject}%
+ \ifnum\c@tcblayer<2\relax%
+ \tcb@ignorenobreaktrue%
+ \tcb@prepare@break@operation%
+ \tcb@breakat@init%
+ \tcbset{compress page=#1}%
+ \tcb@comp@h@page%
+ \tcbset{height=\tcb@h@page-\kvtcb@bbtop@stand-\kvtcb@bbbottom@stand}%
+ \fi%
}
\def\tcb@height@fill@unbroken@normal{\tcb@height@fill@unbroken{none}}
@@ -305,6 +308,13 @@
\fi%
}
+\def\tcb@split@pagebreak{%
+ \tcb@undo@before%
+ \iftcb@multicol\columnbreak\else\pagebreak\fi%
+ \tcb@nobreak@warning%
+ \tcb@enlbreak@init\tcb@break@allowedfalse%
+}
+
\def\tcb@split@start{%
\tcb@breakat@init%
\tcb@comp@h@page%
@@ -318,9 +328,7 @@
\else%
\iftcb@break@allowed%
\ifdim\dimexpr\tcb@h@page-\tcb@h@padding-\tcb@h@padtitle<\kvtcb@breakminlines\baselineskip\relax%
- \iftcb@multicol\columnbreak\else\pagebreak\fi%
- \tcb@nobreak@warning%
- \tcb@enlbreak@init\tcb@break@allowedfalse%
+ \tcb@split@pagebreak%
\tcb@comp@h@page%
\tcb@check@for@final@box%
\iftcb@final@box%
@@ -459,9 +467,7 @@
\tcb@swap{\tcb@totallowerbox}{\tcb@lowerbox}%
\tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}%
\tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}%
- \iftcb@multicol\columnbreak\else\pagebreak\fi%
- \tcb@nobreak@warning%
- \tcb@enlbreak@init\tcb@break@allowedfalse%
+ \tcb@split@pagebreak%
\let\tcb@split@next=\tcb@split@start%
}
@@ -749,6 +755,7 @@
\tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\csname tcb@break@ch@\tcb@split@state\endcsname%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
+ \tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
\tcb@drawing@env@begin%
\tcb@extensions@preframe%
% draw frame and interior
@@ -778,6 +785,7 @@
\tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\csname tcb@break@ch@\tcb@split@state\endcsname%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
+ \tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
\tcb@drawing@env@begin%
\tcb@extensions@preframe%
% draw frame and interior
@@ -803,6 +811,7 @@
\tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@bottom+\kvtcb@boxsep+\tcb@h@segment+\tcb@h@lower+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\csname tcb@break@ch@\tcb@split@state\endcsname%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
+ \tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
\tcb@drawing@env@begin%
\tcb@extensions@preframe%
% draw frame and interior
@@ -831,6 +840,7 @@
\tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\ht\tcb@lowerbox+\dp\tcb@lowerbox+\csname tcb@h@breaksep@\tcb@split@state\endcsname}%
\csname tcb@break@ch@\tcb@split@state\endcsname%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
+ \tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
\tcb@drawing@env@begin%
\tcb@extensions@preframe%
% draw frame and interior
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index abd5dfb6e8b..f813d8ecb14 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\tcbuselibrary{listings,skins,xparse,external}
@@ -310,8 +310,8 @@
\begin{tcb@doc@head}{doc@head@command}%
\tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\tcb@cs{#2}}\label{com:#2}{\ttfamily #3}%
\tcb@doc@do@description%
- \end{tcb@doc@head}\tcbset{before upper=}\kvtcb@doc@body@command@before}%
- {\kvtcb@doc@body@command@after\end{tcb@manual@entry}}
+ \end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@command@before\ignorespaces}%
+ {\ifvmode\else\unskip\fi\kvtcb@doc@body@command@after\end{tcb@manual@entry}}
\newenvironment{docCommand*}{\bgroup\tcb@doc@toindexfalse\begin{docCommand}}{\end{docCommand}\egroup}
@@ -322,8 +322,8 @@
\strut~~\meta{\kvtcb@text@envcontent}\par%
\strut\cs{end}\brackets{\tcb@Print@Env{#2}}%
\tcb@doc@do@description%
- \end{tcb@doc@head}\tcbset{before upper=}\kvtcb@doc@body@environment@before}%
- {\kvtcb@doc@body@environment@after\end{tcb@manual@entry}}
+ \end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@environment@before\ignorespaces}%
+ {\ifvmode\else\unskip\fi\kvtcb@doc@body@environment@after\end{tcb@manual@entry}}
\newenvironment{docEnvironment*}{\bgroup\tcb@doc@toindexfalse\begin{docEnvironment}}{\end{docEnvironment}\egroup}
@@ -337,8 +337,8 @@
\tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/#3}{\ttfamily #4}%
}%
\tcb@doc@do@description%
- \end{tcb@doc@head}\tcbset{before upper=}\kvtcb@doc@body@key@before}%
- {\kvtcb@doc@body@key@after\end{tcb@manual@entry}}
+ \end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@key@before\ignorespaces}%
+ {\ifvmode\else\unskip\fi\kvtcb@doc@body@key@after\end{tcb@manual@entry}}
\newenvironment{docKey*}{\bgroup\tcb@doc@toindexfalse\begin{docKey}}{\end{docKey}\egroup}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
index c196548ff76..9f4a67717c8 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbexternal.code.tex: Code for externalization
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
{
\catcode`\"=12
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index 82eb542c73f..14b76fc8a97 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbfitting.code.tex: Code for fit boxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
@@ -240,6 +240,7 @@
\long\def\tcbox@inner@fitbox#1{%
\tcbset{breakable@false,sidebyside=false}%
+ \let\tcb@space\tcb@zpt%
\let\tcb@val@raisebase=\tcb@zpt%
\unless\ifdefined\kvtcb@height@fixed%
\tcbset{height=\kvtcb@width}%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index 04549bd4554..63e0fb91139 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\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 cdfbebbdff2..5c06ee8db89 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\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 d6d296c9521..e5211fdc781 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\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 81cf7837dd7..9c3bc9dd7b6 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\RequirePackage{listingsutf8}[2011/11/10]
\tcbuselibrary{listings}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
index 40a2828956b..d65b9e769ce 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbmagazine.code.tex: Code for box sets and magazine styles
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\tcbuselibrary{breakable}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
index c02b6fb15c7..16af5e8e9f2 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbminted.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\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 3c097718a3b..7d2269d3519 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\newcounter{tcbrastercolumn}
\newcounter{tcbrasterrow}
@@ -73,6 +73,23 @@
raster force size/.default=true,%
raster force size/true/.code={\let\tcb@raster@set@size\tcbset@late@options},%
raster force size/false/.code={\let\tcb@raster@set@size\tcbset},%
+ raster multicolumn/.code={%
+ \ifnum\numexpr\c@tcbrastercolumn+#1>\numexpr\kvtcb@raster@columns+1\relax
+ \tcb@warning{'raster multicolumn' combined too much columns}%
+ \else%
+ \tcbset@late@options{%
+ code={\preto\kvtcb@afterbox{\addtocounter{tcbrastercolumn}{\numexpr#1-1}}},
+ width=(\tcb@raster@box@width+\kvtcb@raster@xskip)*#1-\kvtcb@raster@xskip}%
+ \fi%
+ },
+ raster multirow/.code={%
+ \ifdefined\tcb@raster@box@height%
+ \tcbset@late@options{%
+ height=(\tcb@raster@box@height+\kvtcb@raster@yskip)*#1-\kvtcb@raster@yskip}%
+ \else%
+ \tcb@warning{'raster multirow' needs a fixed 'raster height'}%
+ \fi%
+ },
}
\tcbset{
@@ -94,6 +111,18 @@
\let\tcb@raster@change@fitbox\@empty
\def\tcb@raster@change@hbox{\tcbset{capture=minipage}}
+\def\tcb@height@fill@unbroken@raster#1{%
+ \ifnum\c@tcblayer<2\relax%
+ \kvtcb@beforebox%
+ \def\kvtcb@beforebox{}%
+ \tcb@breakat@init%
+ \tcbset{compress page=#1}%
+ \tcb@comp@h@page%
+ \ifdim\tcb@h@page<0pt\relax\unkern\pagebreak\tcb@comp@h@page\kern\kvtcb@raster@skip@left\fi%
+ \tcbset{height=\tcb@h@page-\kvtcb@bbtop@stand-\kvtcb@bbbottom@stand}%
+ \fi%
+}
+
\newenvironment{tcbraster}[1][]{%
\tcb@layer@pushup%
\stepcounter{tcbraster}%
@@ -103,6 +132,7 @@
\let\tcb@raster@change@fitbox\@empty%
\setcounter{tcbrastercolumn}{1}%
\setcounter{tcbrasterrow}{1}%
+ \let\tcb@height@fill@unbroken\tcb@height@fill@unbroken@raster%
\tcbset{every box on layer \the\numexpr\number\c@tcblayer+1\relax/.code={%
\tcbset{raster every box/.try}%
\ifodd\c@tcbrastercolumn\relax%
@@ -194,3 +224,7 @@
\let\tcb@raster@change@fitbox=\tcb@raster@change@hbox%
\let\tcbitem=\tcbitem@first%
}{\end{tcolorbox}\end{tcbraster}}
+
+\newenvironment{tcboxedraster}[2][]{%
+ \tcolorbox[#2]\tcbraster[#1]}%
+ {\endtcbraster\endtcolorbox}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index ee765fe33ac..9bc4926d41d 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\RequirePackage{tikz}[2010/10/13]
@@ -478,7 +478,10 @@
\tcbset{empty/.style={skin=empty},%
blanker/.style={empty,arc=0pt,outer arc=0pt,boxsep=0pt,top=0pt,bottom=0pt,left=0pt,right=0pt,boxrule=0pt,%
- bottomtitle=6pt,middle=3pt}}
+ bottomtitle=6pt,middle=3pt},
+ blankest/.style={blanker,notitle,
+ no shadow,no underlay,no overlay,no finish,no borderline},
+ }
\tcb@new@skin{freelance}{base@unbroken,%
frame engine=freelance,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=freelance,%
@@ -629,6 +632,19 @@
\tcb@drawspec@sbs@F{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LR{fill=tcbcol@backlower}\fi\tcb@spec{}},%
skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast}
+\tcb@new@skin{tile}{skin@bicolor,frame engine=empty,%
+ skin first=tilefirst,skin middle=tilemiddle,skin last=tilelast}
+
+\tcbset{tile/.style={skin=tile,boxrule=0pt,sharp corners,title filled,fonttitle=\bfseries}}
+
+\tcb@new@skin{tilefirst}{skin@bicolorfirst,frame engine=empty,%
+ skin first=tilefirst,skin middle=tilemiddle,skin last=tilemiddle}
+
+\tcb@new@skin{tilemiddle}{skin@bicolormiddle,frame engine=empty,%
+ skin first=tilemiddle,skin middle=tilemiddle,skin last=tilemiddle}
+
+\tcb@new@skin{tilelast}{skin@bicolorlast,frame engine=empty,%
+ skin first=tilemiddle,skin middle=tilemiddle,skin last=tilelast}
\tikzset{beamer@color/.style={fill=none,top color=tcbcol@back,bottom color=tcbcol@back!85!black}}
@@ -949,21 +965,43 @@
no finish/.style={no finish unbroken,no finish first,no finish middle,no finish last},%
}
+\def\tcb@trans@set@boxedsize@copy@top{%
+ \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcb@trans@boxedsize{%
+ leftrule=\kvtcb@left@rule,rightrule=\kvtcb@right@rule,
+ toprule=\kvtcb@top@rule@stand,bottomrule=\kvtcb@title@rule,
+ boxsep=\kvtcb@boxsep,leftupper=\kvtcb@lefttitle,rightupper=\kvtcb@righttitle,
+ top=\kvtcb@toptitle,bottom=\kvtcb@bottomtitle,arc=\kvtcb@arc,
+ sharp corners=south,
+ }}\x}%
+\def\tcb@trans@set@boxedsize@copy@bottom{%
+ \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcb@trans@boxedsize{%
+ leftrule=\kvtcb@left@rule,rightrule=\kvtcb@right@rule,
+ toprule=\kvtcb@title@rule,bottomrule=\kvtcb@bottom@rule@stand,
+ boxsep=\kvtcb@boxsep,leftupper=\kvtcb@lefttitle,rightupper=\kvtcb@righttitle,
+ top=\kvtcb@toptitle,bottom=\kvtcb@bottomtitle,arc=\kvtcb@arc,
+ sharp corners=north,
+ }}\x}%
\tcbset{%
+ boxed title size/.is choice,
+ boxed title size/standard/.code={\def\tcb@trans@set@boxedsize##1{\let\tcb@trans@boxedsize\@empty}},
+ boxed title size/title/.code={\def\tcb@trans@set@boxedsize##1{\def\tcb@trans@boxedsize{size=title}}},
+ boxed title size/copy/.code={\def\tcb@trans@set@boxedsize##1{%
+ \ifstrequal{##1}{top}{\tcb@trans@set@boxedsize@copy@top}{\tcb@trans@set@boxedsize@copy@bottom}}},
before@boxed@title/.store in=\kvtcb@before@boxedtitle,%
after@boxed@title/.store in=\kvtcb@after@boxedtitle,%
- boxed title style/.store in=\kvtcb@style@boxedtitle,%
+ boxed title style/.code={\appto\kvtcb@style@boxedtitle{,#1}},%
+ no boxed title style/.code={\let\kvtcb@style@boxedtitle\@empty},%
%
varwidth boxed title/.style={before@boxed@title={\tcbdimto\tcb@w@title{#1}\begin{varwidth}{\tcb@w@title}},after@boxed@title={\end{varwidth}}},%
- varwidth boxed title/.default={\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@lefttitle-\kvtcb@righttitle},
+ varwidth boxed title/.default={\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)},
varwidth boxed title*/.style={varwidth boxed title={\kvtcb@width+#1}},
- varwidth boxed title*/.default={-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@lefttitle-\kvtcb@righttitle},
+ varwidth boxed title*/.default={0pt-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)},
%
minipage boxed title/.style={before@boxed@title={\tcbdimto\tcb@w@title{#1}\begin{minipage}{\tcb@w@title}},after@boxed@title={\end{minipage}}},%
- minipage boxed title/.default={\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@lefttitle-\kvtcb@righttitle},
+ minipage boxed title/.default={\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)},
minipage boxed title*/.style={minipage boxed title={\kvtcb@width+#1}},
- minipage boxed title*/.default={-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@lefttitle-\kvtcb@righttitle},
+ minipage boxed title*/.default={0pt-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)},
%
tikznode boxed title/.style={before@boxed@title={\centering\tcb@shield@externalize\begin{tikzpicture}\node[align=center,inner sep=0pt,outer sep=0pt,#1]\bgroup},after@boxed@title={\egroup;\end{tikzpicture}}},%
hbox boxed title/.style={before@boxed@title=,after@boxed@title=},%
@@ -998,11 +1036,14 @@
detach title,
code={\def\tcb@specialtitle@hook{%
\ifx\tcbtitletext\@empty\else%
+ \tcb@trans@set@boxedsize{#2}%
\colorlet{tcbtranscol@frame}{tcbcol@frame}%
\colorlet{tcbtranscol@back}{tcbcol@backtitle}%
+ \let\tcb@trans@skin@current\kvtcb@skin@current%
\let\tcb@trans@boxedstyle\kvtcb@style@boxedtitle%
- \setbox\tcb@titlebox\color@hbox\bgroup\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox%
- \setbox\tcb@titlebox\color@hbox\tcbox[colframe=tcbtranscol@frame,colback=tcbtranscol@back,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox%
+ \setbox\tcb@titlebox\color@hbox\bgroup\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@haligntitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox%
+ \setbox\tcb@titlebox\color@hbox\tcbox[skin=\tcb@trans@skin@current,colframe=tcbtranscol@frame,colback=tcbtranscol@back,%
+ code={\pgfkeysalsofrom\tcb@trans@boxedsize\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox%
%
\tcbdimto\tcboxedtitleheight{\ht\tcb@titlebox+\dp\tcb@titlebox}%
\tcbdimto\tcboxedtitlewidth{\wd\tcb@titlebox}%
@@ -1028,6 +1069,33 @@
attach boxed title to bottom left/.style={attach@title@boxed@bottom={#1}{below right}{south west}},
attach boxed title to bottom center/.style={attach@title@boxed@bottom={#1}{below}{south}},
attach boxed title to bottom right/.style={attach@title@boxed@bottom={#1}{below left}{south east}},
+ reduce@vertical@rules/.code={%
+ \ifdim\dimexpr\kvtcb@left@rule<\dimexpr\kvtcb@right@rule\relax%
+ \tcbdimto\tcb@temp{\kvtcb@left@rule/2}%
+ \else%
+ \tcbdimto\tcb@temp{\kvtcb@right@rule/2}%
+ \fi%
+ \tcbset{leftrule/.expanded=\the\dimexpr\kvtcb@left@rule-\tcb@temp\relax,
+ rightrule/.expanded=\the\dimexpr\kvtcb@right@rule-\tcb@temp\relax}%
+ },
+ attach boxed title to bottom/.style={%
+ attach boxed title to bottom center={yshift*=\tcboxedtitleheight,#1},
+ minipage boxed title,boxed title size=copy,
+ },
+ attach boxed title to bottom*/.style={%
+ attach boxed title to bottom={#1},
+ boxed title style={reduce@vertical@rules},
+ },
+ attach boxed title to top/.style={%
+ attach boxed title to top center={yshift*=-\tcboxedtitleheight,#1},
+ minipage boxed title,boxed title size=copy,
+ },
+ attach boxed title to top*/.style={%
+ attach boxed title to top={#1},
+ boxed title style={reduce@vertical@rules},
+ },
+ flip title/.style={attach boxed title to bottom,
+ boxed title style={reduce@vertical@rules,#1}},
}
@@ -1633,25 +1701,19 @@
\def\tcb@include@graphics{%
\ifdefstring{\kvtcb@capture}{hbox}{%
\tcbox{%
- \edef\tcb@temp{\noexpand\includegraphics[\expandonce\kvtcb@graphics@options]}%
- \tcb@temp{\imagepath}%
+ \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options]}%
+ \x{\imagepath}%
}%
}{%
\iftcb@fixedheight%
- \begin{tcolorbox}[underlay={%
- \begin{tcbclipinterior}%
- \edef\tcb@temp{\noexpand\tikzset{fill image options={\expandonce\kvtcb@graphics@options}}}%
- \tcb@temp%
- \path[fill zoom image={\imagepath}]
- ([xshift=\kvtcb@boxsep+\kvtcb@leftupper,yshift=\kvtcb@boxsep+\kvtcb@bottom]interior.south west) rectangle
- ([xshift=-\kvtcb@boxsep-\kvtcb@rightupper,yshift=-\kvtcb@boxsep-\kvtcb@top]interior.north east);
- \end{tcbclipinterior}%
- }]%
+ \begin{tcolorbox}%
+ \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,height=\tcbtextheight]}%
+ \x{\imagepath}%
\end{tcolorbox}%
\else%
\begin{tcolorbox}%
- \edef\tcb@temp{\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth]}%
- \tcb@temp{\imagepath}%
+ \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth]}%
+ \x{\imagepath}%
\end{tcolorbox}%
\fi%
}%
@@ -1752,7 +1814,7 @@
watermark zoom=0.75,clip watermark,%
clip title=false,clip upper=false,clip lower=false,%
no borderline,smart shadow arc,no shadow,no underlay,no finish,tikz reset,at begin tikz reset,at end tikz reset,%
- boxed title style=,hbox boxed title,code={\let\tcb@specialgeonodes@hook\relax},%
+ boxed title size=title,no boxed title style,hbox boxed title,code={\let\tcb@specialgeonodes@hook\relax},%
graphics options=,graphics pages={1,...,\pdfpages},graphics directory=,%
},
initialize@reset=reset@skins,
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
index 98ec28d47c4..6325257bebd 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\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 3365d806cbd..e01802d9c7b 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\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 9da5627107d..63d673d955f 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcbxparse.code.tex: Code for xparse features
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{3.80}
+\tcb@set@library@version{3.90}
\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 7462c504629..6bfd79d8556 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 3.80 (2015/11/27)
+%% The LaTeX package tcolorbox - version 3.90 (2016/02/29)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2015/11/27 version 3.80 text color boxes]
-\def\tcb@version{3.80}
+\ProvidesPackage{tcolorbox}[2016/02/29 version 3.90 text color boxes]
+\def\tcb@version{3.90}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -255,18 +255,28 @@
float*/.default=\kvtcb@floatplacement,
every float/.store in=\kvtcb@everyfloat,%
nofloat/.style={float=},
- before/.code={\def\kvtcb@beforebox{#1}\let\tcb@use@autoparskip=\relax},
+ before/.code={\def\kvtcb@beforebox{#1}\let\tcb@undo@before=\@empty\let\tcb@use@autoparskip=\relax},
after/.code={\def\kvtcb@afterbox{#1}\let\tcb@use@autoparskip=\relax},
autoparskip/.code={\let\tcb@use@autoparskip=\tcb@use@auto@parskip},
- parskip/.style={before={\par\pagebreak[0]\parindent=0pt},after={\par}},
- noparskip/.style={before={\ifnum\lastnodetype=-1\relax\else\par\smallskip\pagebreak[0]\fi\parindent=0pt},after={\par\smallskip}},
+ parskip/.style={before={\ifnum\lastnodetype=-1\relax\else\par%
+ \ifvmode\edef\tcb@prevdepth{\the\glueexpr\prevdepth+\lineskip+\parskip}%
+ \def\tcb@undo@before{\addvspace{-\glueexpr\tcb@prevdepth}}%
+ \pagebreak[0]\fi\fi\parindent=0pt},
+ after={\par}},
+ noparskip/.style={before={\ifnum\lastnodetype=-1\relax\else\par%
+ \ifvmode\edef\tcb@prevdepth{\the\glueexpr\prevdepth+\lineskip}%
+ \def\tcb@undo@before{\addvspace{-\glueexpr\smallskipamount+\tcb@prevdepth}}%
+ \pagebreak[0]\smallskip\fi\fi\parindent=0pt},
+ after={\par\smallskip}},
nobeforeafter/.style={before=,after=},
force nobeforeafter/.code={\tcbset@late@options{nobeforeafter}},
before skip/.style={before={%
\ifnum\lastnodetype=-1\relax%
\else%
- \par\ifvmode\nointerlineskip%
- \addvspace{\glueexpr#1-\parskip}%
+ \par%
+ \ifvmode\tcbdimto\tcb@prevdepth{\prevdepth}\nointerlineskip%
+ \addvspace{\glueexpr#1-\parskip}%
+ \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}%
\fi%
\fi%
\lineskip=0pt\noindent%
@@ -286,23 +296,43 @@
upperbox/invisible/.code={\tcb@uppervisiblefalse},
visible/.style={upperbox=visible,lowerbox=visible},
invisible/.style={upperbox=invisible,lowerbox=invisible},
- natural height/.code={\tcb@fixedheightfalse\let\tcb@ch=\tcb@ch@natural\let\tcb@height@adjust\@empty},
- height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed\let\tcb@height@adjust\@empty},
- text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed\let\tcb@height@adjust\@empty},
- add to height/.code={\ifdefined\kvtcb@height@fixed\tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+(#1)}\fi},
+% natural height/.code={\tcb@fixedheightfalse\let\tcb@ch=\tcb@ch@natural\let\tcb@height@adjust\@empty},
+ natural height/.code={\tcb@fixedheightfalse\tcb@@ch@@operation{\tcb@ch@natural}},
+% height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed\let\tcb@height@adjust\@empty},
+ height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\tcb@@ch@@operation{\tcb@ch@fixed}},
+% text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed\let\tcb@height@adjust\@empty},
+ text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\tcb@@ch@@operation{\tcb@ch@innerfixed}},
+ add to height/.code={\iftcb@fixedheight\tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+(#1)}\fi},
+ add to natural height/.code={\tcb@fixedheightfalse\def\kvtcb@height@natural@plus{#1}\tcb@@ch@@operation{\tcb@ch@natural@plus}},
height plus/.dimstore in=\kvtcb@height@fixed@plus,%
height from/.style args={#1 to #2}{height={#1},height plus={#2-(#1)}},%
height fill/.is choice,%
height fill/false/.code={\let\tcb@height@adjust\@empty},%
square/.style={height=\kvtcb@width},
- equal height group/.code={\edef\tcb@ehgid{#1}\let\tcb@ch=\tcb@ch@equalheight},
+% equal height group/.code={\edef\tcb@ehgid{#1}\let\tcb@ch=\tcb@ch@equalheight\let\tcb@height@adjust\@empty},
+ equal height group/.code={\tcb@fixedheightfalse\edef\tcb@ehgid{#1}\tcb@@ch@@operation{\tcb@ch@equalheight}},
minimum for equal height group/.code args={#1:#2}{\edef\tcb@ehgid{#1}\tcb@ehgadd{#2}},
use height from group/.code={\ifcsundef{tcb@ehg@height@#1}{}{\tcbset{height=\csuse{tcb@ehg@height@#1}}}},
- space/.code={\def\tcb@height@fraction{#1}\let\tcb@ch@fixed@both=\tcb@ch@fixed@space},
+ use height from group/.default={\csuse{tcb@ehgid}},
+ space/.code={\def\tcb@height@fraction{#1}%
+ \let\tcb@ch@fixed@both=\tcb@ch@fixed@space%
+ \let\tcb@ch@fixed@upper=\tcb@ch@fixed@upper@standard%
+ },
space to upper/.style={space=1},
space to lower/.style={space=0},
space to both/.style={space=0.5},
- split/.code={\def\tcb@height@fraction{#1}\let\tcb@ch@fixed@both=\tcb@ch@fixed@split},
+ split/.code={\def\tcb@height@fraction{#1}%
+ \let\tcb@ch@fixed@both=\tcb@ch@fixed@space%
+ \let\tcb@ch@fixed@upper=\tcb@ch@fixed@upper@standard%
+ },
+ space to/.code={%
+ \ifcsdef{tcb@space@\thetcolorboxnumber}{%
+ \letcs{\tcb@space}{tcb@space@\thetcolorboxnumber}%
+ }{}%
+ \let#1\tcb@space%
+ \let\tcb@ch@fixed@both=\tcb@ch@fixed@spacesave%
+ \let\tcb@ch@fixed@upper=\tcb@ch@fixed@spacesave%
+ },
%
halign/.is choice,
halign/flush left/.code={\let\kvtcb@halignupper=\raggedright},
@@ -419,7 +449,7 @@
skin first/.store in=\kvtcb@skin@first,
skin middle/.store in=\kvtcb@skin@middle,
skin last/.store in=\kvtcb@skin@last,
- skin/.style={skin@#1},
+ skin/.style={code={\edef\kvtcb@skin@current{#1}},skin@#1},
skin first is subskin of/.style 2 args={skin@local@first/.style={skin@#1,#2},skin first=local@first},%
skin middle is subskin of/.style 2 args={skin@local@middle/.style={skin@#1,#2},skin middle=local@middle},%
skin last is subskin of/.style 2 args={skin@local@last/.style={skin@#1,#2},skin last=local@last},%
@@ -461,10 +491,10 @@
after title/.store in=\kvtcb@after@title,%
before upper/.store in=\kvtcb@before@upper,%
after upper/.store in=\kvtcb@after@upper,%
- after upper*/.style={after upper={\unskip#1}},%
+ after upper*/.style={after upper={\ifvmode\else\unskip\fi#1}},%
before lower/.store in=\kvtcb@before@lower,%
after lower/.store in=\kvtcb@after@lower,%
- after lower*/.style={after lower={\unskip#1}},%
+ after lower*/.style={after lower={\ifvmode\else\unskip\fi#1}},%
center title/.style={halign title=flush center},%
center upper/.style={halign upper=flush center},%
center lower/.style={halign lower=flush center},%
@@ -490,13 +520,9 @@
\begin{varwidth}{\tcb@w@upper}},after upper={\end{varwidth}}},%
varwidth upper/.default=\kvtcb@width,
text fill/.style={before upper={%
- \iftcb@fixedheight%
- \tcbdimto\tcb@temp{\kvtcb@top@rule@stand+\kvtcb@bottom@rule@stand+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}%
- \iftcb@hasTitle%
- \tcbdimto\tcb@temp{\tcb@temp+\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle}%
- \fi%
- \tcbdimto\tcb@temp{\kvtcb@height@fixed-\tcb@temp}%
- \edef\tcb@temp{\noexpand\minipage[c][\tcb@temp]}%
+ \ifdim\dimexpr\tcbtextheight>0pt\relax%
+ %\iftcb@fixedheight%
+ \edef\tcb@temp{\noexpand\minipage[c][\tcbtextheight]}%
\else%
\let\tcb@temp\minipage%
\fi%
@@ -753,7 +779,16 @@
\tcbdimto\tcb@width{\kvtcb@width}%
\tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}%
\tcbdimto\tcb@w@upper{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}%
+ \let\tcbtextwidth=\tcb@w@upper%
\tcbdimto\kvtcb@arc{\kvtcb@arc}%
+ % computation of text height
+ \iftcb@fixedheight%
+ \tcbdimto\tcbtextheight{\kvtcb@top@rule@stand+\kvtcb@bottom@rule@stand+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}%
+ \iftcb@hasTitle%
+ \tcbdimto\tcbtextheight{\tcbtextheight+\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle}%
+ \fi%
+ \tcbdimto\tcbtextheight{\kvtcb@height@fixed-\tcbtextheight}%
+ \fi%
}
\def\tcb@set@@sidebyside{%
@@ -935,6 +970,9 @@
}
\long\def\tcb@apply@box@options#1{%
+ \let\tcb@space\tcb@zpt%
+ \let\tcbtextheight\tcb@zpt%
+ \let\tcbtextwidth\tcb@zpt%
\tcbset{#1}\tcb@lateoptions@hook\tcb@afteroptions@hook%
\if@nobreak%
\let\iftcb@nobreak\@firstoftwo%
@@ -968,27 +1006,64 @@
\let\endtcolorbox=\tcb@endboxanddraw
% height computations
+\def\tcb@@ch@@operation#1{%
+ \let\tcb@ch=#1%
+ \let\tcb@height@adjust\@empty%
+}
+
+
\def\tcb@ch@natural{%
\let\tcb@height\tcb@natheight%
+ \let\tcbheightspace\tcb@zpt%
\tcbdimto\tcb@height@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}%
\iftcb@lowerspace%
\tcbdimto\tcb@height@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}%
\fi%
}
-\def\tcb@ch@fixed@upper{%
- \tcbdimto\tcb@height@upper{\ht\tcb@upperbox+\dp\tcb@upperbox+\tcb@height-\tcb@natheight}%
+\def\tcb@ch@natural@plus{%
+ \tcbdimto\tcbheightspace{\kvtcb@height@natural@plus}%
+ \tcbdimto\tcb@height{\tcb@natheight+\tcbheightspace}%
+ \iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi%
+}
+
+
+\def\tcb@ch@fixed@upper@standard{%
+ \tcbdimto\tcb@height@upper{\ht\tcb@upperbox+\dp\tcb@upperbox+\tcbheightspace}%
}
\def\tcb@ch@fixed@space{%
- \tcbdimto\tcb@height@space{\tcb@height-\tcb@natheight}%
- \tcbdimto\tcb@height@spaceupper{\tcb@height@fraction\dimexpr\tcb@height@space\relax}%
+ %\tcbdimto\tcb@height@space{\tcb@height-\tcb@natheight}%
+ \tcbdimto\tcb@height@spaceupper{\tcb@height@fraction\dimexpr\tcbheightspace\relax}%
\tcbdimto\tcb@height@upper{\ht\tcb@upperbox+\dp\tcb@upperbox+\tcb@height@spaceupper}%
- \tcbdimto\tcb@height@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox+\tcb@height@space-\tcb@height@spaceupper}%
+ \tcbdimto\tcb@height@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox+\tcbheightspace-\tcb@height@spaceupper}%
+}
+
+\def\tcb@savespace#1#2{%
+ \immediate\write\@auxout{\string\csgdef{tcb@space@#1}{#2}}%
+}
+
+\def\tcb@ch@fixed@spacesave{%
+ %\tcbdimto\tcb@height@space{\tcb@height-\tcb@natheight}%
+ \tcbdimto\tcb@space{\tcb@space+\tcbheightspace}%
+ \ifdim\dimexpr\tcb@space<0pt\relax
+ \let\tcb@space\tcb@zpt%
+ \else%
+ \ifdim\dimexpr\tcb@space>\tcb@height\relax
+ \let\tcb@space\tcb@height%
+ \fi%
+ \fi%
+ \begingroup\edef\x{\endgroup\noexpand\tcb@savespace{\thetcolorboxnumber}{\tcb@space}}\x%
+ \tcbdimto\tcb@height@upper{\ht\tcb@upperbox+\dp\tcb@upperbox+\tcbheightspace}%
+ \let\tcbheightspace\tcb@zpt%
+ \iftcb@lowerspace%
+ \tcbdimto\tcb@height@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}%
+ \fi%
}
\def\tcb@ch@fixed@split{%
- \tcbdimto\tcb@height@space{\tcb@height-\tcb@natheight+\ht\tcb@upperbox+\dp\tcb@upperbox+\ht\tcb@lowerbox+\dp\tcb@lowerbox}%
+% \tcbdimto\tcb@height@space{\tcb@height-\tcb@natheight+\ht\tcb@upperbox+\dp\tcb@upperbox+\ht\tcb@lowerbox+\dp\tcb@lowerbox}%
+ \tcbdimto\tcb@height@space{\tcbheightspace+\ht\tcb@upperbox+\dp\tcb@upperbox+\ht\tcb@lowerbox+\dp\tcb@lowerbox}%
\tcbdimto\tcb@height@upper{\tcb@height@fraction\dimexpr\tcb@height@space\relax}%
\tcbdimto\tcb@height@lower{\tcb@height@space-\tcb@height@upper}%
}
@@ -997,6 +1072,7 @@
\ifdim\tcb@natheight<\dimexpr\kvtcb@height@fixed\relax%
\tcbdimto\tcb@height{\kvtcb@height@fixed}%
\else%
+ \tcbdimto\tcb@space{\tcb@space+\kvtcb@height@fixed-\tcb@natheight}%
\tcbdimto\tcb@temp{\kvtcb@height@fixed+\kvtcb@height@fixed@plus}%
\ifdim\tcb@natheight>\tcb@temp\relax%
\let\tcb@height\tcb@temp%
@@ -1004,6 +1080,7 @@
\let\tcb@height\tcb@natheight%
\fi%
\fi%
+ \tcbdimto\tcbheightspace{\tcb@height-\tcb@natheight}%
\iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi%
}
@@ -1037,16 +1114,18 @@
}
\def\tcb@ch@equalheight{%
- \tcb@ehgadd{\tcb@natheight}%
+ \tcbdimto\tcb@ehg@currentheight{\tcb@natheight-\tcb@space}%
+ \tcb@ehgadd{\tcb@ehg@currentheight}%
\ifcsdef{tcb@ehg@height@\tcb@ehgid}{%
- \ifdim\csuse{tcb@ehg@height@\tcb@ehgid}<\tcb@natheight\relax%
- \let\tcb@height\tcb@natheight%
+ \ifdim\csuse{tcb@ehg@height@\tcb@ehgid}<\tcb@ehg@currentheight\relax%
+ \let\tcb@height\tcb@ehg@currentheight%
\else%
\letcs{\tcb@height}{tcb@ehg@height@\tcb@ehgid}%
\fi%
}{%
- \let\tcb@height\tcb@natheight%
+ \let\tcb@height\tcb@ehg@currentheight%
}%
+ \tcbdimto\tcbheightspace{\tcb@height-\tcb@natheight}%
\iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi%
}
@@ -1509,6 +1588,7 @@
\fi%
\tcb@ch%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
+ \tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
\tcb@drawing@env@begin%
\pgfsetbaseline{\the\dimexpr\kvtcb@baseline-\kvtcb@bbbottom\relax}%
\tcb@extensions@preframe%