diff options
27 files changed, 409 insertions, 68 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 6b46d6db0ae..23b789336ae 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -615,7 +615,23 @@ version 3.21 (2014/10/10) - new macros: '\tcbsubtitle' - new options: - 'subtitle style', 'before skip', 'after skip', 'beforeafter', + 'subtitle style', 'before skip', 'after skip', 'beforeafter skip', - library 'documentation': implementation of handling macro and key names changed to accept underscores several internal implementation changes + +version 3.22 (2014/10/31) +- new macro: '\tcolorboxenvironment' +- new options: + 'text width', 'text height' +- library 'skins': + * new options: 'borderline north', 'borderline south', + 'borderline east', 'borderline west', 'borderline horizontal', 'borderline vertical' +- library 'breakable': + * internal change for compatibility with the 'perpage' option of the 'footmisc' package +- library 'theorems': + * compatibility fix: The 'ams equation' options left too much vertical + space for the 'fleqn' case +- library 'fitting': + * new 'fit algorithm' settings: 'fontsize*', 'areasize*', 'hybrid*' + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index df25f1746c8..629b4528161 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf Binary files differindex c9ba08dac34..c6c44efbf1c 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index 34b1929eb8f..f91ac86c657 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- 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 894db46d014..50ff63e5488 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -107,9 +107,12 @@ parameters. The differences are: use \refKey{/tcb/enforce breakable} for the nested 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. +\item\tcbdocmarginnote{\tcbdocnew{2014-10-30}} + 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). \end{itemize} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex index 52a0694b74a..7898513a167 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex @@ -275,4 +275,30 @@ The \xmybox[green]{quick} brown \xmybox{fox} \xmybox[blue]{jumps} over the An existing macro is redefined. \end{docCommand} +\clearpage + +\begin{docCommand}[doc new=2014-10-20]{tcolorboxenvironment}{\marg{name}\marg{options}} + An existing environment \meta{name} is redefined to be boxed inside a + |tcolorbox| with the given \meta{options}. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +% tcbuselibrary{skins} +\newenvironment{myitemize}{% + \begin{itemize}}{\end{itemize}} + +\tcolorboxenvironment{myitemize}{blanker, + before skip=6pt,after skip=6pt, + borderline west={3mm}{0pt}{red}} + +Some text. +\begin{myitemize} +\item Alpha +\item Beta +\item Gamma +\end{myitemize} +More text. +\end{dispExample*} + +\medskip +See further examples in \Vref{subsec:theorems_other}. +\end{docCommand} 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 fdedb1dc812..e997410d6ad 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -458,6 +458,19 @@ This is a \textbf{tcolorbox}. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-10-31]{text width}{=\meta{length}}{style, no default} + Sets the text width of the upper part to \meta{length}. + See also \refKey{/tcb/text height}. +\begin{dispExample} +\tcbset{colback=red!5!white,colframe=red!75!black} + +\begin{tcolorbox}[text width=4cm] +This is a \textbf{tcolorbox} where the text has a width of 4cm. +\end{tcolorbox} +\end{dispExample} +\end{docTcbKey} + + \begin{docTcbKey}{toprule}{=\meta{length}}{no default, initially \texttt{0.5mm}} Sets the line width of the top rule to \meta{length}. \begin{dispExample} @@ -481,7 +494,7 @@ This is a \textbf{tcolorbox}. \end{dispExample} \end{docTcbKey} - +\clearpage \begin{docTcbKey}{leftrule}{=\meta{length}}{no default, initially \texttt{0.5mm}} Sets the line width of the left rule to \meta{length}. \begin{dispExample} @@ -493,7 +506,7 @@ This is a \textbf{tcolorbox}. \end{dispExample} \end{docTcbKey} -\clearpage + \begin{docTcbKey}{rightrule}{=\meta{length}}{no default, initially \texttt{0.5mm}} Sets the line width of the right rule to \meta{length}. \begin{dispExample} @@ -517,6 +530,7 @@ This is a \textbf{tcolorbox}. \end{dispExample} \end{docTcbKey} +\enlargethispage*{1cm} \begin{docTcbKey}{boxrule}{=\meta{length}}{style, no default, initially \texttt{0.5mm}} Sets all rules of the frame to \meta{length}, i.\,e.\ @@ -1180,6 +1194,21 @@ This is a tcolorbox. This is a tcolorbox. This is a tcolorbox. \end{dispExample} \end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-10-31]{text height}{=\meta{length}}{style, no default} + Sets the text height to \meta{length}. This is the length from the top + of the upper part to the bottom of the optional lower part. + See also \refKey{/tcb/text width}. +\begin{dispExample} +\tcbset{colback=red!5!white,colframe=red!75!black} + +\begin{tcolorbox}[text height=2cm] +This is a \textbf{tcolorbox} where the text area has a height of 2cm. +\end{tcolorbox} +\end{dispExample} +\end{docTcbKey} + + \clearpage \begin{docTcbKey}[][doc new=2014-09-22]{height fill}{\colOpt{=true\textbar false}}{default |true|, initially |false|} If set to |true|, the height of the |tcolorbox| is set to the rest of the @@ -1671,7 +1700,7 @@ One & Two & Three \\\hline\hline of the lower part. The \meta{options} may be given as \tikzname\ picture options. \begin{dispExample} % \usepackage{tikz} -% \usetikzlibrary{skins,listings} +% \tcbuselibrary{skins,listings} \tcbset{tikz lower,listing side text,fonttitle=\bfseries, bicolor,colback=LightBlue!50!white,colbacklower=white,colframe=black, righthand width=3cm} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex index 4f3d9905253..642ec9b91f6 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex @@ -393,6 +393,14 @@ are adapted. Other content than text is not scaled down. The aspect ratio is fully garanteed. \end{marker} + \item\docValue{fontsize*}:\tcbdocmarginnote{\tcbdocnew{2014-10-29}} + First, the \docValue{fontsize} algorithm is applied. If the font was scaled down + and the resulting height is too small, the box is squeezed to fit the area. + \begin{marker} + The used font has to be freely scalable for this method! + Other content than text may be slightly rescaled. + The aspect ratio cannot be fully garanteed. + \end{marker} \item\docValue{areasize}: The algorithm calculates the area size for the text without scaling the font. The text box is shaped for the needed aspect ratio in one or two @@ -401,9 +409,24 @@ are adapted. The used font has not to be scalable. Every box content is scaled down. The aspect ratio cannot be fully garanteed. \end{marker} + \item\docValue{areasize*}:\tcbdocmarginnote{\tcbdocnew{2014-10-29}} + The \docValue{areasize} algorithm is applied, but if the content was scaled + down and the resulting height is too small, the box is squeezed to fit the area. + \begin{marker} + The used font has not to be scalable. Every box content is scaled down. + The aspect ratio cannot be fully garanteed. + \end{marker} \item\docValue{hybrid}: First, this algorithm estimates the needed font size in one or two steps. - Then an |areasize| fitting as above is a applied. + Then an \docValue{areasize} fitting as above is a applied. + \begin{marker} + The used font has to be freely scalable for this method! + Other content than text may be slightly rescaled. + The aspect ratio cannot be fully garanteed. + \end{marker} + \item\docValue{hybrid*}:\tcbdocmarginnote{\tcbdocnew{2014-10-29}} + First, this algorithm estimates the needed font size in one or two steps. + Then an \docValue{areasize*} fitting as above is a applied. \begin{marker} The used font has to be freely scalable for this method! Other content than text may be slightly rescaled. @@ -417,6 +440,8 @@ are adapted. \end{marker} \end{itemize} + +\end{docTcbKey} \begin{dispExample} % \usepackage{lipsum} \newtcboxfit{mybox}[1]{colback=red!5!white,colframe=red!75!black,left=1mm,top=1mm, @@ -433,7 +458,17 @@ are adapted. Quality \dotfill versus \dotfill Speed \end{dispExample} -\end{docTcbKey} + +\begin{dispExample} +% \usepackage{lipsum} +\newtcboxfit{mybox}[2]{colback=red!5!white,colframe=red!75!black,left=1mm,top=1mm, + size=tight,width=7.2cm,height=5cm,nobeforeafter, + before upper=\textcolor{blue}{\rule{5mm}{5mm}}\ , + enhanced,fonttitle=\bfseries,adjusted title=#2,fit algorithm=#1} + +\mybox{hybrid}{hybrid (possible gap at end)}{\lipsum[1]}\hfill +\mybox{hybrid*}{hybrid* (no gap but possibly squeezed)}{\lipsum[1]} +\end{dispExample} \clearpage diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex index 58d6c7c8a7a..3065f142df1 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex @@ -99,7 +99,7 @@ and in compiled form. \clearpage \begin{dispExample} -% \usetikzlibrary{listings} /or/ \usetikzlibrary{listingsutf8} +% \tcbuselibrary{listings} /or/ \tcbuselibrary{listingsutf8} \begin{tcblisting}{colback=yellow!5,colframe=yellow!50!black,listing only, title=This is source code in another language (XML), fonttitle=\bfseries, listing options={language=XML,columns=fullflexible,keywordstyle=\color{red}}} @@ -115,7 +115,7 @@ and in compiled form. \enlargethispage*{10mm} \begin{dispExample} -% \usetikzlibrary{minted} +% \tcbuselibrary{minted} \begin{tcblisting}{colback=yellow!5,colframe=yellow!50!black,listing only, title=This is source code in another language (XML), fonttitle=\bfseries, listing engine=minted,minted language=xml} @@ -132,7 +132,7 @@ and in compiled form. \begin{dispExample} % This box is as wide as needed (listing only !!) -% \usetikzlibrary{skins} +% \tcbuselibrary{skins} \begin{tcblisting}{colback=green!5!white,colframe=green!50!black,listing only, hbox,enhanced,drop fuzzy shadow,before=\begin{center},after=\end{center}} \begin{tikzpicture} 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 e2e319848c3..6e3544cbfa1 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -1202,15 +1202,15 @@ Donau\-dampf\-schiff\-fahrts\-ka\-pi\-t\"ans\-m\"ut\-zen\-fran\-sen \clearpage \subsection{Border Line Option Keys}\label{subsec:borderline} -The following border line options are applicable for most skins which +The following borderline options are applicable for most skins which use |tikzpicture| as \refKey{/tcb/graphical environment}. Therefore, the skin \refSkin{standard} does not support these border lines, but most other skins, e.\,g.\ \refSkin{enhanced}. -The border lines are independent from the normal |tcolorbox| rules. +The borderlines are independent from the normal |tcolorbox| rules. They may be used with or without the \refKey{/tcb/segmentation engine}. -The border lines are stackable, i.\,e.\ several different border lines can be +The borderlines are stackable, i.\,e.\ several different border lines can be used on the same |tcolorbox|. They are drawn \emph{after} the box frame and box interior and \emph{before} overlays or watermarks. @@ -1222,15 +1222,15 @@ This can be used to apply different effects. \begin{docTcbKey}{borderline}{=\marg{width}\marg{offset}\marg{options}}{no default, initially unset} - Adds a new border line to the stack of border lines. - This border line is drawn with the given \meta{width} and gets a + Adds a new borderline to the stack of border lines. + This border line is drawn with the given \meta{width} and gets an \meta{offset} computed from the frame outline. A positive \meta{offset} value moves the borderline inside the |tcolorbox| and a negative \meta{offset} value moves it outside without changing the bounding box.\\ The border line is drawn along a \tikzname\ path with the given \tikzname\ \meta{options}. Note that the \tikzname\ |line width| option should not be used here.\\ - The border lines adapt to the rounded corners of the |tcolorbox|. An inside border - line will switch to sharp corners if necessary, an outside border line will + The border lines adapt to the rounded corners of the |tcolorbox|. An inside + borderline will switch to sharp corners if necessary, an outside borderline will always be rounded except for \refKey{/tcb/sharp corners}. \begin{dispExample} \begin{tcolorbox}[enhanced,title=Rounded corners,fonttitle=\bfseries,boxsep=5pt, @@ -1303,7 +1303,7 @@ This is a tcolorbox. \begin{docTcbKey}{no borderline}{}{no default, initially set} - Removes all border lines if set before. + Removes all borderlines if set before. \end{docTcbKey} @@ -1329,6 +1329,111 @@ This is a tcolorbox. \end{dispExample} \end{docTcbKey} +\clearpage + +\begin{marker} +The following \emph{partial} borderlines act slightly different from the +complete borderlines described before. They ignore rounded corner settings, +their length is not modified by their \meta{offset}, they ignore skin settings +but adapt to breakable boxes. +\end{marker} + +\begin{docTcbKey}[][doc new=2014-10-20]{borderline north}{=\marg{width}\marg{offset}\marg{options}}{no default, initially unset} + Adds a new borderline with the given \meta{width} to the + north of the |tcolorbox|. + A positive \meta{offset} value + moves the borderline inside the |tcolorbox| and a negative \meta{offset} value + moves it outside without changing the bounding box. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[enhanced, + borderline north={2pt}{-2pt}{red}] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-10-20]{borderline south}{=\marg{width}\marg{offset}\marg{options}}{no default, initially unset} + Adds a new borderline with the given \meta{width} to the + south of the |tcolorbox|. + A positive \meta{offset} value + moves the borderline inside the |tcolorbox| and a negative \meta{offset} value + moves it outside without changing the bounding box. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[enhanced, + borderline south={2pt}{-2pt}{red}] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-10-20]{borderline east}{=\marg{width}\marg{offset}\marg{options}}{no default, initially unset} + Adds a new borderline with the given \meta{width} to the + east of the |tcolorbox|. + A positive \meta{offset} value + moves the borderline inside the |tcolorbox| and a negative \meta{offset} value + moves it outside without changing the bounding box. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[enhanced, + borderline east={2pt}{-2pt}{red}] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-10-20]{borderline west}{=\marg{width}\marg{offset}\marg{options}}{no default, initially unset} + Adds a new borderline with the given \meta{width} to the + west of the |tcolorbox|. + A positive \meta{offset} value + moves the borderline inside the |tcolorbox| and a negative \meta{offset} value + moves it outside without changing the bounding box. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[enhanced, + borderline west={2pt}{-2pt}{red}] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\clearpage +\begin{docTcbKey}[][doc new=2014-10-20]{borderline horizontal}{=\marg{width}\marg{offset}\marg{options}}{no default, initially unset} + Adds a new borderline with the given \meta{width} to the + north and south of the |tcolorbox|. + A positive \meta{offset} value + moves the borderlines inside the |tcolorbox| and a negative \meta{offset} value + moves them outside without changing the bounding box. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[blanker,top=3mm,bottom=3mm, + borderline horizontal={2pt}{0pt}{red}] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-10-20]{borderline vertical}{=\marg{width}\marg{offset}\marg{options}}{no default, initially unset} + Adds a new borderline with the given \meta{width} to the + east and west of the |tcolorbox|. + A positive \meta{offset} value + moves the borderlines inside the |tcolorbox| and a negative \meta{offset} value + moves them outside without changing the bounding box. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[blanker,left=3mm,right=3mm, + borderline vertical={2pt}{0pt}{red}] + This is a \textbf{tcolorbox}.\\ + My second line. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\begin{dispExample} +\begin{tcolorbox}[enhanced,colback=yellow!10!white,boxrule=0pt,frame hidden, + borderline north={1mm}{-2mm}{red}, + borderline south={1mm}{-2mm}{blue}, + borderline west={1mm}{-2mm}{green}, + borderline east={1mm}{-2mm}{yellow}] +\lipsum[1] +\end{tcolorbox} +\end{dispExample} \clearpage \subsection{Shadow Option Keys}\label{subsec:shadows} 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 8c84ce2318f..430b157f9c7 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex @@ -497,7 +497,7 @@ For this definition, we get the maximal number of drawing steps: Lower part \end{testbox} \tcblower -\item\Vref{subsec:shadows} +\item Section~\ref{subsec:shadows} on page \pageref{subsec:shadows}. \end{itembox} \begin{itembox} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex index 0a261de187f..70e50d01d15 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex @@ -464,17 +464,17 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor to use \refKey{/tcb/ams gather} in this case. \end{marker} -\begin{docTcbKey}{ams equation upper}{}{style, no value} +\begin{docTcbKey}[][doc updated=2014-10-30]{ams equation upper}{}{style, no value} Adds an |amsmath| |equation| environment to the start and end of the upper part. \end{docTcbKey} -\begin{docTcbKey}{ams equation lower}{}{style, no value} +\begin{docTcbKey}[][doc updated=2014-10-30]{ams equation lower}{}{style, no value} Adds an |amsmath| |equation| environment to the start and end of the lower part. \end{docTcbKey} -\begin{docTcbKey}{ams equation}{}{style, no value} +\begin{docTcbKey}[][doc updated=2014-10-30]{ams equation}{}{style, no value} Adds an |amsmath| |equation| environment to the start and end of the upper \emph{and} lower part. \begin{dispExample} @@ -484,17 +484,17 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor \end{dispExample} \end{docTcbKey} -\begin{docTcbKey}{ams equation* upper}{}{style, no value} +\begin{docTcbKey}[][doc updated=2014-10-30]{ams equation* upper}{}{style, no value} Adds an |amsmath| |equation*| environment to the start and end of the upper part. \end{docTcbKey} -\begin{docTcbKey}{ams equation* lower}{}{style, no value} +\begin{docTcbKey}[][doc updated=2014-10-30]{ams equation* lower}{}{style, no value} Adds an |amsmath| |equation*| environment to the start and end of the lower part. \end{docTcbKey} -\begin{docTcbKey}{ams equation*}{}{style, no value} +\begin{docTcbKey}[][doc updated=2014-10-30]{ams equation*}{}{style, no value} Adds an |amsmath| |equation*| environment to the start and end of the upper \emph{and} lower part. \begin{dispExample} @@ -949,3 +949,27 @@ Let's try a more conservative approach: \end{YetAnotherTheorem} \end{dispExample} + +\clearpage +\subsection{Using other theorem environments with \texttt{tcolorbox}}\label{subsec:theorems_other} + +Instead of creating theorem environments with the methods described before, +environments from other packages can be boxed with a |tcolorbox|. + +Environments may be created e.g. by methods from the |theorem| package or +the |amsthm| package. \refCom{tcolorboxenvironment} can be used to put a box +around these environments. + +\inputpreamblelisting{K} + +\begin{dispExample} +\begin{lem} + \lipsum[2] +\end{lem} + +\lipsum[3] + +\begin{proof} + \lipsum*[4] +\end{proof} +\end{dispExample} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 5ac8006b1fd..51c707949c8 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index b61ddcb75a3..a80113cf2c5 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -105,8 +105,8 @@ \renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1} \renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1} -\def\version{3.21}% -\def\datum{2014/10/10}% +\def\version{3.22}% +\def\datum{2014/10/31}% \makeindex \hypersetup{ @@ -136,6 +136,7 @@ moretexcs={% core endtcolorbox,endtcbverbatimwrite,newtcolorbox,newtcbox,newtcboxfit,tcbusetemp,tcbtitle,tcbtitletext, tcblower,tcbox,tcboxfit,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite,tcbsetforeverylayer,tcbsubtitle, + tcolorboxenvironment, % listings endtcblisting,newtcblisting,newtcbinputlisting, tcblisting,tcbinputlisting,tcbuselistingtext,tcbuselistinglisting,tcbusetemplisting, @@ -305,9 +306,25 @@ \end{tcbverbatimwrite} \input{\jobname_preamble_J.tex} +\begin{tcbverbatimwrite}{\jobname_preamble_K.tex} +\usepackage{amsthm} + +\theoremstyle{plain}% from 'amsthm' +\newtheorem{lem}{Lemma}% from 'amsthm' + +\tcolorboxenvironment{lem}{ + enhanced jigsaw,colframe=cyan,interior hidden, + breakable,before skip=10pt,after skip=10pt } + +\tcolorboxenvironment{proof}{% 'proof' from 'amsthm' + blanker,breakable,left=5mm, + before skip=10pt,after skip=10pt, + borderline west={1mm}{0pt}{red}} +\end{tcbverbatimwrite} +\input{\jobname_preamble_K.tex} + %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.documentation,tcolorbox.doc.index} %\includeonly{tcolorbox.doc.coreoptions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index ac7e06059d9..a5d87614def 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -80,7 +80,8 @@ \c@mpfootnote\z@% \let\@footnotetext\@mpfootnotetext% \@setminipage\tcb@hyph@fix% - \let\tcb@drawcolorbox=\tcb@drawcolorbox@standalone% + \let\tcb@drawcolorbox\tcb@drawcolorbox@standalone% + \let\FN@pp@footnote\@empty% disable perpage mode of 'footmisc' package \ignorespaces% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 23d432c99e3..7b9da97ff49 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \tcbuselibrary{listings,skins,xparse} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index fb6b9f5215f..31cbfd9a835 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -60,8 +60,11 @@ \def\tcb@fit@warn@end{\hbadness=\tcb@cur@hbadness\relax\tcb@fit@@box}}, fit algorithm/.is choice, fit algorithm/fontsize/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@fontsize}, + fit algorithm/fontsize*/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@fontsize@star}, fit algorithm/areasize/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@areasize}, + fit algorithm/areasize*/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@areasize@star}, fit algorithm/hybrid/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@hybrid}, + fit algorithm/hybrid*/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@hybrid@star}, fit algorithm/squeeze/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@squeeze}, spartan@fit/.style={fit algorithm=squeeze}, } @@ -142,7 +145,13 @@ \fi% } -\def\tcbox@fitalgorithm@areasize{% +\def\tcbox@fitalgorithm@fontsize@star{% + \tcbox@fitalgorithm@fontsize% + \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@target}{\box\tcb@upperbox}}% + \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% +} + +\def\tcbox@fitalgorithm@areasize@core{% \pgfmathdivide{\tcb@fit@@h}{\tcb@fit@@target}% \pgfmathsqrt{\pgfmathresult}% \let\tcb@temp=\pgfmathresult% @@ -162,6 +171,10 @@ \fi\fi% % \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% +} + +\def\tcbox@fitalgorithm@areasize{% + \tcbox@fitalgorithm@areasize@core% \pgfmathdivide{\tcb@w@upper}{\tcb@w@upper@temp}% \tcbdimto\tcb@fit@@h{\pgfmathresult\dimexpr\tcb@fit@@h}% \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% @@ -172,12 +185,18 @@ \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% } +\def\tcbox@fitalgorithm@areasize@star{% + \tcbox@fitalgorithm@areasize@core% + \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@target}{\box\tcb@upperbox}}% + \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% +} + \def\tcbox@fitalgorithm@squeeze{% \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@target}{\box\tcb@upperbox}}% \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% } -\def\tcbox@fitalgorithm@hybrid{% +\def\tcbox@fitalgorithm@hybrid@core{% \pgfmathdivide{\tcb@fit@@target}{\tcb@fit@@h}% \pgfmathsqrt{\pgfmathresult}% \tcbfitdim=\pgfmathresult\tcbfitdim% @@ -192,10 +211,18 @@ \tcbfitdim=\pgfmathresult\tcbfitdim% \tcb@fit@@box% \fi\fi% - % +} + +\def\tcbox@fitalgorithm@hybrid{% + \tcbox@fitalgorithm@hybrid@core% \tcbox@fitalgorithm@areasize% } +\def\tcbox@fitalgorithm@hybrid@star{% + \tcbox@fitalgorithm@hybrid@core% + \tcbox@fitalgorithm@areasize@star% +} + \def\tcb@fit@@box{% \tcbdimto\tcb@fit@@line{\kvtcb@fit@skip\tcbfitdim}% \tcbdimto\tcb@w@upper{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 64b6db45cf5..98115a07e74 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \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 9bd78cb3139..64695f2aede 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \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 622e0eafad4..ba4ba48df05 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% \def\tcbuselistingcomment{\kvtcb@listingcomment}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index b209c5a84f1..4c84604223b 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index e6741554ece..f9c57560fc6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index fff5f4ce095..4bf2713601f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \RequirePackage{tikz}[2010/10/13] @@ -1342,7 +1342,6 @@ }% } - \def\tcb@draw@border@unbroken{% \let\tcb@border=\tcb@border@unbroken% \kvtcb@borderline% @@ -1363,10 +1362,46 @@ \kvtcb@borderline% } +\def\tcb@bordernorth@draw#1#2#3{% + \tcbdimto\tcb@border@ts{#2+(#1)/2}% + \draw[line width=#1,#3] ([yshift=-\tcb@border@ts]frame.north west) -- ([yshift=-\tcb@border@ts]frame.north east);% +} + +\def\tcb@bordernorth{% + \ifdefstring{\tcb@split@state}{unbroken}{\tcb@bordernorth@draw}{% + \ifdefstring{\tcb@split@state}{first}{\tcb@bordernorth@draw}{}}% +} + +\def\tcb@bordersouth@draw#1#2#3{% + \tcbdimto\tcb@border@ts{#2+(#1)/2}% + \draw[line width=#1,#3] ([yshift=\tcb@border@ts]frame.south west) -- ([yshift=\tcb@border@ts]frame.south east);% +} + +\def\tcb@bordersouth{% + \ifdefstring{\tcb@split@state}{unbroken}{\tcb@bordersouth@draw}{% + \ifdefstring{\tcb@split@state}{last}{\tcb@bordersouth@draw}{}}% +} + +\def\tcb@borderwest#1#2#3{% + \tcbdimto\tcb@border@ts{#2+(#1)/2}% + \draw[line width=#1,#3] ([xshift=\tcb@border@ts]frame.north west) -- ([xshift=\tcb@border@ts]frame.south west);% +} + +\def\tcb@bordereast#1#2#3{% + \tcbdimto\tcb@border@ts{#2+(#1)/2}% + \draw[line width=#1,#3] ([xshift=-\tcb@border@ts]frame.north east) -- ([xshift=-\tcb@border@ts]frame.south east);% +} + \tcbset{% border@line app/.code={\appto\kvtcb@borderline{#1}},% borderline/.style args={#1#2#3}{border@line app={\tcb@border{#1}{#2}{#3}}},% no borderline/.code={\def\kvtcb@borderline{}},% + borderline north/.style args={#1#2#3}{border@line app={\tcb@bordernorth{#1}{#2}{#3}}},% + borderline south/.style args={#1#2#3}{border@line app={\tcb@bordersouth{#1}{#2}{#3}}},% + borderline west/.style args={#1#2#3}{border@line app={\tcb@borderwest{#1}{#2}{#3}}},% + borderline east/.style args={#1#2#3}{border@line app={\tcb@bordereast{#1}{#2}{#3}}},% + borderline horizontal/.style args={#1#2#3}{borderline north={#1}{#2}{#3},borderline south={#1}{#2}{#3}},% + borderline vertical/.style args={#1#2#3}{borderline west={#1}{#2}{#3},borderline east={#1}{#2}{#3}},% } \def\tcb@shadow@prepare#1#2{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 5bd8f8178a6..72dbb7d3025 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \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 48809563ce0..67f702a00c6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \RequirePackage{amsmath} @@ -55,6 +55,22 @@ \fi% } +\if@fleqn% +\tcbset{% + ams equation upper/.style={before upper=\tcb@hack@amsmath\equation,after upper=\endequation},% + ams equation lower/.style={before lower=\tcb@hack@amsmath\equation,after lower=\endequation},% + ams equation* upper/.style={before upper=\tcb@hack@amsmath\csname equation*\endcsname,after upper=\endequation},% + ams equation* lower/.style={before lower=\tcb@hack@amsmath\csname equation*\endcsname,after lower=\endequation}% +}% +\else% +\tcbset{% + ams equation upper/.style={before upper=\tcb@hack@currenvir\equation,after upper=\endequation},% + ams equation lower/.style={before lower=\tcb@hack@currenvir\equation,after lower=\endequation},% + ams equation* upper/.style={before upper=\tcb@hack@currenvir\csname equation*\endcsname,after upper=\endequation},% + ams equation* lower/.style={before lower=\tcb@hack@currenvir\csname equation*\endcsname,after lower=\endequation},% +}% +\fi + \tcbset{ theorem/.style args={#1#2#3#4}{% step and label={#2}{#4},% @@ -62,11 +78,7 @@ math upper/.style={before upper=$\displaystyle,after upper=$},% math lower/.style={before lower=$\displaystyle,after lower=$},% math/.style={math upper,math lower},% - ams equation upper/.style={before upper=\tcb@hack@currenvir\equation,after upper=\endequation},% - ams equation lower/.style={before lower=\tcb@hack@currenvir\equation,after lower=\endequation},% ams equation/.style={ams equation upper,ams equation lower},% - ams equation* upper/.style={before upper=\tcb@hack@currenvir\csname equation*\endcsname,after upper=\endequation},% - ams equation* lower/.style={before lower=\tcb@hack@currenvir\csname equation*\endcsname,after lower=\endequation},% ams equation*/.style={ams equation* upper,ams equation* lower},% ams align upper/.style={before upper=\tcb@hack@amsmath\align,after upper=\endalign},% ams align lower/.style={before lower=\tcb@hack@amsmath\align,after lower=\endalign},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 76b7acec17f..1b3a69f76a3 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.21} +\tcb@set@library@version{3.22} \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 d3f9a404674..93dd89e095a 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) +%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/10/10 version 3.21 text color boxes] -\def\tcb@version{3.21} +\ProvidesPackage{tcolorbox}[2014/10/31 version 3.22 text color boxes] +\def\tcb@version{3.22} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -147,6 +147,7 @@ attach title to upper/.default=, subtitle style/.store in=\kvtcb@subtitle@style,% width/.dimstore in=\kvtcb@width, + text width/.style={width={#1+\kvtcb@left@rule+\kvtcb@right@rule+\kvtcb@boxsep*2+\kvtcb@leftupper+\kvtcb@rightupper}},% boxsep/.store in=\kvtcb@boxsep, toprule/.code={% \def\kvtcb@top@rule@stand{#1}% @@ -225,6 +226,7 @@ lowerbox/ignored/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse}, natural height/.code={\let\tcb@ch=\tcb@ch@natural}, height/.code={\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed}, + text height/.code={\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed}, 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,% @@ -732,6 +734,11 @@ \iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi% } +\def\tcb@ch@innerfixed{% + \tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+\kvtcb@top@rule+\kvtcb@bottom@rule+\tcb@h@padtitle+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}% + \tcb@ch@fixed% +} + \def\tcb@saveehg#1{% \immediate\write\@auxout{\string\gdef\string\tcb@ehg@#1@height{\csname tcb@ehg@#1@current\endcsname}}% } @@ -1345,6 +1352,10 @@ \let\tcb@process@newtcolorbox@continue\tcb@new@tcolorbox% \tcb@process@newenvironment} +\newcommand{\tcolorboxenvironment}[2]{% + \BeforeBeginEnvironment{#1}{\begin{tcolorbox}[savedelimiter={#1},#2]}% + \AfterEndEnvironment{#1}{\end{tcolorbox}}% +} % auxiliary code to remove a leading backspace \newcommand{\tcb@remove@bs}[1]{% |