diff options
Diffstat (limited to 'Master/texmf-dist')
29 files changed, 646 insertions, 234 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 41f94695da2..0e38c2c3c86 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -371,3 +371,15 @@ version 2.60 (2013/12/17) - documentation extended - major internal implementation changes and optimizations +version 2.61 (2014/01/10) +- bug fix: '@' was set as letter in some situations +- typing error corrections +- new macro \tcbsetforeverylayer +- library 'skins': + * new macros and environments: + '\tcbstartdraftmode', '\tcbstopdraftmode', '\tcbinterruptdraftmode', '\tcbcontinuedraftmode' + * new skin: 'spartan' + * new options: 'spartan', 'draftmode' +- library 'fitting': + * alternative fitting algorithms implemented (fontsize, areasize, hybrid, squeeze) + * new option: 'fit algorithm' diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 301c83b5e51..52d3f038fe9 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf Binary files differindex c7939ef7c3f..16cee65d0bb 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 5d2693d784e..5f8c5b535dc 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% 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 8e181efeab8..cbcb98b5f61 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -154,7 +154,7 @@ parameters. The differences are: \begin{docTcbKey}{enlargepage}{=\meta{length}\colOpt{/\meta{length}\ldots/\meta{length}}}{no default, initially |0pt|} Inserts a |\enlargethispage|\marg{length} to the pages of the break sequence, - i.\,e.\ allows to enlarge (or shrink) partial boxes. The first \meta{length} is applied + i.\,e.\ allows one to enlarge (or shrink) partial boxes. The first \meta{length} is applied to the first partial box, the second \meta{length} is applied to the second partial box, and so on. The last \meta{length} value is applied to all following partial boxes if any. Note that floating boxes will not be enlarged. @@ -293,6 +293,7 @@ the \emph{break sequence} parts are displayed. \tcbbreakskininto{standard}{standard}{standard}{standard}{watermark text/.style={}} \tcbbreakskininto{standard jigsaw}{standard jigsaw}{standard jigsaw}{standard jigsaw}{watermark text/.style={}} +\tcbbreakskininto{spartan}{spartan}{spartan}{spartan}{} \clearpage \tcbbreakskininto{enhanced}{enhancedfirst}{enhancedmiddle}{enhancedlast}{} \tcbbreakskininto{enhancedfirst}{enhancedfirst}{enhancedmiddle}{enhancedmiddle}{} 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 b53de723550..6eab6e60e38 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex @@ -41,7 +41,7 @@ Here, you see the lower part of the box. \end{tcolorbox} The \meta{options} control the appearance and several functions of the boxes, -see section \ref{sec:optkeys} for the complete list. +see \Vref{sec:optkeys} for the complete list. A quick example is given here: \begin{dispExample} @@ -65,8 +65,7 @@ Here, you see the lower part of the box. \clearpage \begin{docCommand}{tcbset}{\marg{options}} Sets options for every following \refEnv{tcolorbox} inside the current \TeX\ group. - By default, this does not apply to nested boxes, see - Section \ref{subsec:everybox} from page \pageref{subsec:everybox}.\par + By default, this does not apply to nested boxes, see \Vref{subsec:everybox}.\par For example, the colors of the boxes may be defined for the whole document by this: \begin{dispListing} \tcbset{colback=red!5!white,colframe=red!75!black} @@ -74,6 +73,34 @@ Here, you see the lower part of the box. \end{docCommand} +\begin{docCommand}{tcbsetforeverylayer}{\marg{options}} + Sets options for every following \refEnv{tcolorbox} inside the current \TeX\ group. + In contrast to \refCom{tcbset}, this does also + apply to nested boxes, see \Vref{subsec:everybox}. + Technically, the \meta{options} are appended to the default values for every + tcolorbox which are applied by \refKey{/tcb/reset}.\par + You should not use this macro, if you are not completely sure that you + want to have the \meta{options} also for boxes in boxes (in boxes in boxes \ldots). +\begin{dispExample} +\tcbset{colback=green!10!white} +\tcbsetforeverylayer{colframe=red!75!black} + +\begin{tcolorbox}[title=All options for this box] + This is a tcolorbox.\par\medskip + \begin{tcolorbox}[title=Nested box] + Note that this nested box has a red frame but no green background. + \end{tcolorbox} +\end{tcolorbox} +\bigskip + +\begin{tcolorbox}[reset] + Options given with |\tcbsetforeverylayer| survive a |reset|. +\end{tcolorbox} +\end{dispExample} +\end{docCommand} + + +\clearpage \begin{docCommand}{tcbox}{\oarg{options}\marg{box content}} Creates a colored box which is fitted to the width of the given \meta{box content}. In principal, most \meta{options} for a \refEnv{tcolorbox} @@ -111,7 +138,7 @@ Text \tcbox[tcbox raise base]{Hello World}\hfill The \meta{options} are given to the underlying |tcolorbox|. Note that \refKey{/tcb/savedelimiter} is set to the given \meta{name} automatically. - The \meta{init options} allow to set up automatic numbering, + The \meta{init options} allow setting up automatic numbering, see Section \ref{sec:initkeys} from page \pageref{sec:initkeys}. \begin{dispExample*}{sbs,lefthand ratio=0.6} \newtcolorbox{mybox}{colback=red!5!white, @@ -167,7 +194,7 @@ numbered title and options. The new macro \texttt{\textbackslash}\meta{name} optionally takes \meta{number}$+1$ arguments, where \meta{default} is the default value for the optional first argument. The \meta{options} are given to the underlying |tcbox|. - The \meta{init options} allow to set up automatic numbering, + The \meta{init options} allow setting up automatic numbering, see Section \ref{sec:initkeys} from page \pageref{sec:initkeys}. \begin{dispExample*}{sbs,lefthand ratio=0.6} \newtcbox{\mybox}{colback=red!5!white, 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 8082974f916..7008cbdab9b 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -96,9 +96,9 @@ Now, we load the saved text:\\ \end{docTcbKey} \clearpage -\begin{docTcbKey}{lower separated}{\colOpt{=\meta{boolean value}}}{default |true|, initially |true|} +\begin{docTcbKey}{lower separated}{\colOpt{=true\textbar false}}{default |true|, initially |true|} If set to |true|, the lower part is visually separated from the upper part. -It depends from the chosen skin how the visualization of the separation is done. +It depends on the chosen skin how the visualization of the separation is done. \begin{dispExample} % \tcbuselibrary{skins} @@ -213,8 +213,8 @@ This is a \textbf{tcolorbox}. \end{docTcbKey} -\begin{docTcbKey}{title filled}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} - Switches the drawing of the title background according to the \meta{boolean value}. +\begin{docTcbKey}{title filled}{\colOpt{=true\textbar false}}{default |true|, initially |false|} + Switches the drawing of the title background according to the given value. This option is set to |true| automatically by \refKey{/tcb/colbacktitle}, \refKey{/tcb/opacitybacktitle}, and \refKey{/tcb/title style}, and \refKey{/tcb/title code}. @@ -689,7 +689,7 @@ This is the lower part. \item |none|: no switching. \item |forced|: the values of the left and right rules and spaces are switched. \item |evenpage|: if the page is an even page, the values of the left and - right rules and spaces are switched. It is recommended to use this setting in + right rules and spaces are switched. It is recommended that one use this setting in conjunction with \refKey{/tcb/check odd page}. \end{itemize} \begin{dispListing} @@ -765,7 +765,7 @@ This is a \textbf{tcolorbox}. \begin{docTcbKey}{opacityfill}{=\meta{fraction}}{style, no default, initially \texttt{1.0}} Sets the fill opacity for frame, interior and optionally the title background - to to the given \meta{fraction}. + to the given \meta{fraction}. \begin{dispExample*}{sbs,lefthand ratio=0.6,segmentation style={pattern=crosshatch dots light steel blue}} \begin{tcolorbox}[standard jigsaw, opacityfill=0.7, title=This is a title] @@ -1095,7 +1095,7 @@ with a listing. \clearpage \subsection{Box Content Additions}\label{subsec:contentadditions} The following options introduce some arbitrary \meta{code} to the content -of a |tcolorbox|. These additions can be given at the begin or at the end +of a |tcolorbox|. These additions can be given at the beginning or at the ending of the title, the upper part, or the lower part. \begin{docTcbKey}{before title}{=\meta{code}}{no default, initially unset} @@ -1358,8 +1358,8 @@ One & Two & Three \\\hline\hline \clearpage \begin{docTcbKey}{tikz upper}{\colOpt{=\meta{options}}}{style} - This style adds a centered |tikzpicture| environment to the begin and - to the end of the upper part. + This style adds a centered |tikzpicture| environment to the start and end + of the upper part. \begin{dispExample} % \usepackage{tikz} @@ -1374,8 +1374,8 @@ One & Two & Three \\\hline\hline \end{docTcbKey} \begin{docTcbKey}{tikz lower}{\colOpt{=\meta{options}}}{style} - This style adds a centered |tikzpicture| environment to the begin and - to the end of the lower part. + This style adds a centered |tikzpicture| environment to the start and end + of the lower part. \begin{dispExample} % \usepackage{tikz} % \usetikzlibrary{skins,listings} @@ -1647,7 +1647,7 @@ are drawn by the codes given with \refKey{/tcb/text outside listing}. \end{marker} -\begin{docTcbKey}{sidebyside}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} +\begin{docTcbKey}{sidebyside}{\colOpt{=true\textbar false}}{default |true|, initially |false|} Normally, the upper part and the lower part of the box have their positions as their names suggest. If |sidebyside| is set to |true|, the upper part is drawn \emph{left-handed} and the lower part is drawn \emph{right-handed}. @@ -1813,9 +1813,9 @@ This behavior is controlled by the keys |before| and |after|. Tries to detect the usage of the package |parskip| and sets the keys |before| and |after| accordingly. Actually, the following is done: \begin{itemize} - \item If the length of |\parskip| is greater than |0pt| at the begin of the document, + \item If the length of |\parskip| is greater than |0pt| at the beginning of the document, \refKey{/tcb/parskip} is executed. Here, the usage of package |parskip| is \emph{assumed}. - \item Otherwise, if the length of |\parskip| is not greater than |0pt| at the begin of the document, + \item Otherwise, if the length of |\parskip| is not greater than |0pt| at the beginning of the document, \refKey{/tcb/noparskip} is executed. Here, the absence of package |parskip| is \emph{assumed}. \end{itemize} |autoparskip| is the default for the package |tcolorbox|, if |before| or |after| @@ -1978,7 +1978,7 @@ This is a \textbf{tcolorbox}. \item |none|: no switching. \item |forced|: the values of the left and right enlargement are switched. \item |evenpage|: if the page is an even page, the values of the left and - right enlargement are switched. It is recommended to use this setting in + right enlargement are switched. It is recommended that one use this setting in conjunction with \refKey{/tcb/check odd page}. %Note that the page number detection may %fail in certain cases. For these cases, use the |forced| value. @@ -2181,6 +2181,15 @@ It may be changed by redefining this style. % setting all boxes to be enhanced: \tcbset{every box/.style={enhanced}} \end{dispListing} + +\begin{marker} +The alternative for setting something for every box (on every layer) is\\ +\refCom{tcbsetforeverylayer}: +\begin{dispListing} +% setting all boxes to be enhanced: +\tcbsetforeverylayer{enhanced} +\end{dispListing} +\end{marker} \end{docTcbKey} \clearpage @@ -2316,13 +2325,13 @@ This is a tcolorbox. \clearpage \subsection{Text Characteristics} -\begin{docTcbKey}{parbox}{\colOpt{=\meta{boolean value}}}{default |true|, initially |true|} +\begin{docTcbKey}{parbox}{\colOpt{=true\textbar false}}{default |true|, initially |true|} The text inside a |tcolorbox| is formatted using a \LaTeX\ |minipage| if the box is unbreakable. If breakable, the box tries a mimicry of a |minipage|. In a |minipage| or |parbox|, paragraphs are formatted slightly different as the main text. If the key value is set to |false|, the normal main text behavior is restored. In some situations, this has some unwanted side - effects. It is recommended to use this experimental setting only + effects. It is recommended that one use this experimental setting only where you really want to have this feature. \end{docTcbKey} @@ -2343,8 +2352,8 @@ This is a tcolorbox. \clearpage -\begin{docTcbKey}{hyphenationfix}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} - Long words at the begin of paragraphs in very narrow boxes +\begin{docTcbKey}{hyphenationfix}{\colOpt{=true\textbar false}}{default |true|, initially |false|} + Long words at the beginning of paragraphs in very narrow boxes will not be hyphenated using |pdflatex|. This problem is circumvented by applying the |hyphenationfix| option. @@ -2407,7 +2416,7 @@ There are additional option keys which change the appearance of a |tcolorbox|. If only the core package is used, there is only one \emph{skin} and these keys are meaningless. The library \mylib{skins} adds more skins. The appropriate option keys for skins of -the core package are therefore described in section \ref{sec:skincorekeys} from +the core package are therefore described in \Vref{sec:skincorekeys} from page \pageref{sec:skincorekeys}. \clearpage @@ -2483,7 +2492,7 @@ If the \flqq list of tcolorbox(es)\frqq\ feature described in Subsection \ref{sec:listsof} from page \pageref{sec:listsof} is used, this key describes the \meta{text} for an entry into the generated list, e.\,g. \begin{dispListing} -list entry={\numberline{\thetcbcounter}My beautiful Example} +list entry={\protect\numberline{\thetcbcounter}My beautiful Example} \end{dispListing} See Section \ref{listing:exercises} from page \pageref{listing:exercises} for a complete example. @@ -2499,7 +2508,7 @@ This issues:\\ \end{docTcbKey} -\begin{docTcbKey}{check odd page}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} +\begin{docTcbKey}{check odd page}{\colOpt{=true\textbar false}}{default |true|, initially |false|} If set to |true|, the even/odd page testing from the package |changepage| is applied. The \refKey{/tcb/toggle enlargement} check and the \refKey{/tcb/toggle left and right} check @@ -2553,7 +2562,7 @@ To avoid this, there are two possible strategies: \end{dispListing} \end{itemize} -\begin{docTcbKey}{shield externalize}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} +\begin{docTcbKey}{shield externalize}{\colOpt{=true\textbar false}}{default |true|, initially |false|} If set to |true|, the drawing part of the |tcolorbox| is not being externalized which is a good thing at the current state of art. Nevertheless, if the |tcolorbox| contains a |tikzpicture|, this picture is still externalized. @@ -2571,7 +2580,8 @@ do \emph{not} use |\tikzexternaldisable| in front of the |tcolorbox|. \subsection{Miscellaneous} \begin{docTcbKey}{reset}{}{no value, initially set} -Sets (nearly) all |tcolorbox| settings (including loaded libraries) back to their default values. +Sets (nearly) all |tcolorbox| settings (including loaded libraries) back to their default values +\emph{plus} any settings given by \refCom{tcbsetforeverylayer}. \refKey{/tcb/savedelimiter} and \refKey{/tcb/capture} keep their values. This option is useful for boxes in boxes where the inner box should not inherit the settings of the outer box. diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex index 749cc9ec244..0242d15119e 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex @@ -12,7 +12,7 @@ The library is loaded by a package option or inside the preamble by: \begin{dispListing} \tcbuselibrary{documentation} \end{dispListing} -This also loads the library \mylib{listings}, see section \ref{sec:listings}, +This also loads the library \mylib{listings}, see \Vref{sec:listings}, and a bunch of packages, namely |doc|, |pifont|, |marvosym|, |hyperref|, |makeidx|, and |refcount|. 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 4d3a305c7aa..6210d6aecd1 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex @@ -42,7 +42,7 @@ The library is loaded by a package option or inside the preamble by: The new macro \texttt{\textbackslash}\meta{name} optionally takes \meta{number}$+1$ arguments, where \meta{default} is the default value for the optional first argument. The \meta{options} are given to the underlying |tcboxfit|. - The \meta{init options} allow to set up automatic numbering, + The \meta{init options} allow setting up automatic numbering, see Section \ref{sec:initkeys} from page \pageref{sec:initkeys}. \begin{dispExample*}{sbs,lefthand ratio=0.6} \newtcboxfit{\mybox}{colback=red!5!white, @@ -371,12 +371,68 @@ This is a tcolorbox. This is a tcolorbox. This is a tcolorbox. \end{dispExample} \end{docTcbKey} +\clearpage +\begin{docTcbKey}{fit algorithm}{=\meta{name}}{no default, initially |fontsize|} +Sets the algorithm for the fitting process \emph{after} optionally width and height +are adapted. + Feasible values for \meta{name} are: + \begin{itemize} + \item |fontsize| (initial): + The algorithm is a bisection method that adapts the font size until + certain stop conditions are fulfilled. This is the most time-consuming + method but it is robust and gives pleasant results. + \begin{marker} + The used font has to be freely scalable for this method! + Other content than text is not scaled down. + The aspect ratio is fully garanteed. + \end{marker} + \item |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 + steps. Finally, it is scaled down with a standard |\resizebox| macro. + \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 |hybrid|: + First, this algorithm estimates the needed font size in one or two steps. + Then an |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 |squeeze|: + The text box is brutally scaled down to fit. + \begin{marker} + The aspect ratio is very likely to be horrible. + You should not use this method for final documents. + \end{marker} +\end{itemize} + +\begin{dispExample} +% \usepackage{lipsum} +\newtcboxfit{mybox}[1]{colback=red!5!white,colframe=red!75!black,left=1mm,top=1mm, + bottom=1mm,right=1mm,boxsep=0mm,width=3.5cm,height=7cm,nobeforeafter, + before upper=\textcolor{blue}{\rule{5mm}{5mm}}\ , + enhanced,watermark text={\tcbfitsteps}, + fonttitle=\bfseries,adjusted title=#1,fit algorithm=#1} + +\mybox{fontsize}{\lipsum[2]}\hfill +\mybox{hybrid}{\lipsum[2]}\hfill +\mybox{areasize}{\lipsum[2]}\hfill +\mybox{squeeze}{\lipsum[2]} + +Quality \dotfill versus \dotfill Speed +\end{dispExample} + +\end{docTcbKey} + \clearpage \begin{marker} The following options set control parameters for the fit algorithm. -The algorithms is a bisection method which stops if certain stop conditions -are fulfilled. +Mainly, they apply to the |fontsize| variant, see \refKey{/tcb/fit algorithm}. The options should be seen as experimental and are likely to change in future versions, if necessary. \end{marker} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex index 35180832978..75045520293 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex @@ -14,9 +14,9 @@ separately. \subsection{Concept of Hooks} A hook is a placeholder in some \LaTeX\ code where additional code can be added. For example, the \LaTeX\ macro |\AtBeginDocument| adds code to a -hook which is placed at the begin of every document. +hook which is placed at the beginning of every document. -Several option keys of |tcolorbox| allow to provide some code which is +Several option keys of |tcolorbox| allow providing some code which is added to specific places of a colored box. For example, \refKey{/tcb/before upper} places code before the content of the upper part. A following usage of this key overwrites any prior settings. diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex index c1874a4bebe..511f0d81438 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex @@ -17,7 +17,7 @@ Particularly, they can be used for \bigskip \begin{marker} Typically, these options may generate counters and alike. -It is \textbf{strongly} recommended to use initialization options inside +It is \textbf{strongly} recommended that one use initialization options inside the preamble only. Otherwise, you may get trouble when using \LaTeX's |\include| features. \end{marker} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex index 1773ac4b7f4..f11470c6857 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex @@ -14,10 +14,9 @@ mathematics \cite{sturm:2007b,sturm:2008b,sturm:2010a} as well. With this package, you are invited to apply these boxes for similar projects. -Starting with version 2.00, all internal calculations are not longer performed -by the package |calc| \cite{thorub:2007a} but -by $\varepsilon$-\TeX\ \cite{breitenlohner:1998a} expressions since -$\varepsilon$-\TeX\ is assumed to be used by everybody (hopefully). +Starting with version 2.00, for all internal calculations +$\varepsilon$-\TeX\ \cite{breitenlohner:1998a} expressions are used +in replacement of the package |calc| \cite{thorub:2007a}. The breaking news for version 2.00 is the support for breakable boxes. This new feature allows new applications of the package without affecting the core package too much if you do not need boxes to break automatically. 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 1b0036e7f5b..655912ed321 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex @@ -190,7 +190,7 @@ This \textbf{text} is written to a standardized file for later usage. \clearpage \begin{marker} -It is not recommended to create a new sort of |tcblisting| environment with +It is not recommended that a new sort of |tcblisting| environment is created with one optional argument only. If there is just one argument, it should be made mandatory to avoid content scanning problems. \end{marker} @@ -203,7 +203,7 @@ mandatory to avoid content scanning problems. The \meta{options} are given to the underlying |tcblisting|. Note that \refKey{/tcb/savedelimiter} is set to the given \meta{name} automatically. - The \meta{init options} allow to set up automatic numbering, + The \meta{init options} allow setting up automatic numbering, see Section \ref{sec:initkeys} from page \pageref{sec:initkeys}. \begin{dispExample*}{sbs,lefthand ratio=0.5} \newtcblisting{mybox}{% @@ -272,7 +272,7 @@ This is my \LaTeX\ box. The new macro \texttt{\textbackslash}\meta{name} optionally takes \meta{number}$+1$ arguments, where \meta{default} is the default value for the optional first argument. The \meta{options} are given to the underlying |tcbinputlisting|. - The \meta{init options} allow to set up automatic numbering, + The \meta{init options} allow setting up automatic numbering, see Section \ref{sec:initkeys} from page \pageref{sec:initkeys}. \begin{dispExample} @@ -357,7 +357,7 @@ Here, we use the predefined style. The initial value is derived from the package |inputenc| if used. \end{docTcbKey} -\begin{docTcbKey}{listing remove caption}{\colOpt{=\meta{boolean value}}}{default |true|, initially |true|} +\begin{docTcbKey}{listing remove caption}{\colOpt{=true\textbar false}}{default |true|, initially |true|} If set to |true|, some part of the caption building code of the |listings| package is silenced to prevent some unwanted interaction with the |hyperref| package resulting in additional vertical space. 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 3dbdba3fe1e..a3d730301f3 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -95,6 +95,7 @@ Every engine for the up to four steps can be set to one of the following types: \item |pathmiddle|: a |tikz| path which can be controlled by options. \item |pathlast|: a |tikz| path which can be controlled by options. \item |freelance|: arbitrary user code. +\item |spartan|: a quite spartan code. \end{enumerate} %\clearpage @@ -113,7 +114,8 @@ Every engine for the up to four steps can be set to one of the following types: \item |pathlast|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, \item |pathlastjigsaw|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, \item |freelance|: arbitrary user code which is given by \refKey{/tcb/frame code}. - \end{itemize} + \item |spartan|: a quite spartan code. +\end{itemize} \end{docTcbKey} \begin{docTcbKey}{interior titled engine}{=\meta{name}}{no default, initially \texttt{standard}} @@ -127,6 +129,7 @@ Every engine for the up to four steps can be set to one of the following types: \item |pathmiddle|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, \item |pathlast|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, \item |freelance|: arbitrary user code which is given by \refKey{/tcb/interior titled code}. + \item |spartan|: a quite spartan code. \end{itemize} \end{docTcbKey} @@ -142,6 +145,7 @@ Every engine for the up to four steps can be set to one of the following types: \item |pathmiddle|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, \item |pathlast|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, \item |freelance|: arbitrary user code which is given by \refKey{/tcb/interior code}. + \item |spartan|: a quite spartan code. \end{itemize} \end{docTcbKey} @@ -153,6 +157,7 @@ Every engine for the up to four steps can be set to one of the following types: \item |standard|: the original code from the core package, \item |path|: a |tikz| path which is controlled by \refKey{/tcb/segmentation style}, \item |freelance|: arbitrary user code which is given by \refKey{/tcb/segmentation code}. + \item |spartan|: a quite spartan code. \end{itemize} \end{docTcbKey} @@ -167,10 +172,11 @@ Every engine for the up to four steps can be set to one of the following types: \item |pathmiddle|: a |tikz| path which is controlled by \refKey{/tcb/title style}, \item |pathlast|: a |tikz| path which is controlled by \refKey{/tcb/title style}, \item |freelance|: arbitrary user code which is given by \refKey{/tcb/title code}. + \item |spartan|: a quite spartan code. \end{itemize} \end{docTcbKey} -\begin{docTcbKey}{geometry nodes}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} +\begin{docTcbKey}{geometry nodes}{\colOpt{=true\textbar false}}{default |true|, initially |false|} If set to |true|, up to four |tikz| nodes are defined for a |tcolorbox| which are named |frame|, |interior|, |segmentation|, and |title|. These nodes describe the boundaries of the equally named parts of a |tcolorbox|. @@ -711,7 +717,7 @@ To avoid this optical glitch, just set \refKey{/tcb/pad at break} to any desired \clearpage -\begin{docTcbKey}{clip watermark}{\colOpt{=\meta{boolean value}}}{default |true|, initially |true|} +\begin{docTcbKey}{clip watermark}{\colOpt{=true\textbar false}}{default |true|, initially |true|} Sets the watermark to be clipped to the interior area. \begin{dispExample} \tcbset{enhanced,colback=white,colframe=blue!50!white,fonttitle=\bfseries, @@ -810,7 +816,7 @@ Defines a |Tikz| scope which clips to the title area path. \end{docEnvironment} \clearpage -\begin{docTcbKey}{clip title}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} +\begin{docTcbKey}{clip title}{\colOpt{=true\textbar false}}{default |true|, initially |false|} Sets the title to be clipped to the title area. \begin{dispExample} \tcbset{enhanced,width=5cm,colframe=red!50!white,coltitle=black, @@ -828,7 +834,7 @@ This is a tcolorbox. \end{docTcbKey} -\begin{docTcbKey}{clip upper}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} +\begin{docTcbKey}{clip upper}{\colOpt{=true\textbar false}}{default |true|, initially |false|} Sets the upper part to be clipped to the interior area. \begin{dispExample} \newcommand{\mygraphics}[2][]{% @@ -861,7 +867,7 @@ options provide an easy solution. \end{dispExample} -\begin{docTcbKey}{clip lower}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} +\begin{docTcbKey}{clip lower}{\colOpt{=true\textbar false}}{default |true|, initially |false|} Sets the lower part to be clipped to the interior area. \begin{dispExample} \tcbset{enhanced,width=5cm,colframe=red!50!black,text and listing} @@ -1466,7 +1472,7 @@ This is a tcolorbox. \begin{docTcbKey}{at begin tikz}{=\meta{tikz code}}{no default, initially empty} - The given \meta{tikz code} is executed at the begin of the |tikzpicture| environment + The given \meta{tikz code} is executed at the beginning of the |tikzpicture| environment after the TikZ option |execute at begin picture| was applied. If this option is applied a second time, the new \meta{tikz code} is appended to the current code. \end{docTcbKey} @@ -1478,7 +1484,7 @@ This is a tcolorbox. \begin{docTcbKey}{at end tikz}{=\meta{tikz code}}{no default, initially empty} - The given \meta{tikz code} is executed at the end of the |tikzpicture| environment + The given \meta{tikz code} is executed at the ending of the |tikzpicture| environment before the TikZ option |execute at end picture| was applied. If this option is applied a second time, the new \meta{tikz code} is appended to the current code. \end{docTcbKey} @@ -1523,7 +1529,7 @@ This is a tcolorbox. \begin{docTcbKey}{remember}{}{style, initially unset} - Shortcut for |tikz={remember picture}|. This allows to reference nodes + Shortcut for |tikz={remember picture}|. This allows one to reference nodes in other TikZ pictures. \begin{dispExample} \begin{tcolorbox}[enhanced,remember,colback=red!5!white,colframe=red!75!black, @@ -1539,6 +1545,7 @@ This is a tcolorbox. \end{docTcbKey} \clearpage +\tcbinterruptdraftmode% \begin{docTcbKey}{remember as}{=\meta{name}}{style, no default, initially unset} The |frame| node will be remembered by the given \meta{name} to be referenced in other TikZ pictures. @@ -1573,6 +1580,7 @@ This is a test. \end{tikzpicture} \end{dispExample} \end{docTcbKey} +\tcbcontinuedraftmode% \clearpage \subsection{Jigsaw Skin Variants}\label{subsec:skinjigsaw} @@ -1622,12 +1630,12 @@ and \refSkin{enhanced jigsaw}. frame style={left color=red!75!black,right color=red!10!yellow}, fonttitle=\bfseries,interior hidden,title hidden} -\begin{tcolorbox}[title=A normal box with hidden interior and titel] +\begin{tcolorbox}[title=A normal box with hidden interior and title] This is a tcolorbox. \end{tcolorbox} \begin{tcolorbox}[enhanced jigsaw, - title=A jigsaw box with hidden interior and titel] + title=A jigsaw box with hidden interior and title] This is a tcolorbox. \end{tcolorbox} \end{dispExample*} @@ -1645,6 +1653,81 @@ and \refSkin{enhanced jigsaw}. \clearpage +\subsection{Draft Mode}\label{subsec:draftmode} +To reduce the compiliation time while drafting a document, the \emph{draft mode} +can be applied. Basically, it changes all skins to \refSkin{spartan} and +sets the \refKey{/tcb/fit algorithm} to |squeeze|. Especially, +when fuzzy shadows are used, the speedup will be considerable high. + +\begin{marker} +It is strongly recommended that the draft mode is \emph{not} used for the final document. +Use \refSkin{spartan} directly, if you want to stay with it. The draft mode +implementation may change in future. +\end{marker} + +\begin{marker} +Normally, switching to the draft mode should not alter the geometry of +your document. Since overlays are deactivated, any code placed there +(e.g. counter changes) is not executed anymore! Also, \refKey{/tcb/remember as} +will not have any effect. You may exclude critical code with +\refCom{tcbinterruptdraftmode} / \refCom{tcbcontinuedraftmode} +from converting to draft mode. +\end{marker} + + +\begin{docCommand}{tcbstartdraftmode}{} + Any following |tcolorbox| code is put into \emph{draft mode}. All skin + settings are overruled with \refSkin{spartan}. Overlays, watermarks, + shadows, borderlines, and rounded corners are deactivated for all |tcolorbox| + layers. +\end{docCommand} + +\begin{docCommand}{tcbstopdraftmode}{} + The \emph{draft mode} is deactivated for the following code. +\end{docCommand} + +\begin{docCommand}{tcbinterruptdraftmode}{} + If the compilation is in \emph{draft mode}, the \emph{draft mode} is deactivated + until a following \refCom{tcbcontinuedraftmode} is detected.\par + If the compilation is not in \emph{draft mode}, no happens and a following + \refCom{tcbcontinuedraftmode} will not start the \emph{draft mode}. + \begin{marker} + The pair |\tcbinterruptdraftmode| and |\tcbcontinuedraftmode| cannot + be used nested. + \end{marker} +\end{docCommand} + +\begin{docCommand}{tcbcontinuedraftmode}{} + Continues the \emph{draft mode} which was suspended by a preceding + \refCom{tcbinterruptdraftmode}. Nothing happens, if there was no draft + mode before \refCom{tcbinterruptdraftmode}. + \begin{marker} + Code, which is place between \refCom{tcbinterruptdraftmode} and + \refCom{tcbcontinuedraftmode} is shielded from \emph{draft mode}. + \end{marker} +\end{docCommand} + +\enlargethispage*{2cm} +\begin{docTcbKey}{draftmode}{\colOpt{=true\textbar false}}{default |true|, initially |false|} + If set to |true|, the \emph{draft mode} is started. + If set to |false|, the \emph{draft mode} is stopped. + +\begin{dispExample*}{} +\newtcolorbox{mybeamer}[2][]{beamer,colback=Salmon!50!white, + colframe=FireBrick!75!black,adjusted title={#2},#1} + +\begin{mybeamer}{Beamer box} +This box looks like a box provided by the \texttt{beamer} class. +\end{mybeamer}\par\medskip +\begin{mybeamer}[draftmode]{Beamer box} +This box looks like a box provided by the \texttt{beamer} class. +\end{mybeamer} +\end{dispExample*} +\end{docTcbKey} + + + +\clearpage \tcbset{skintable/.style={colframe=red!50!yellow!50!black, colback=red!50!yellow!5!white,coltitle=red!50!yellow!3!white, fonttitle=\bfseries,before=\par\smallskip, @@ -3138,6 +3221,62 @@ Nevertheless, this skin can be applied independently. \clearpage +\subsection{Skin 'spartan'}\label{subsec:spartan} + +\begin{docSkin}{spartan} + This skin is quite \ldots\ spartan. + It supports no rounded corners, no overlays, no shadows, no borderlines, + and no \refKey{/tcb/geometry nodes}. One cannot do any fancy things with + this skin, but it compiles very fast. Therefore, the |spartan| skin is + used for the draft mode, see \Vref{subsec:draftmode}. + Nevertheless, it can be used as a normal skin. + +\begin{tcolorbox}[skintable=spartan] + \begin{tabbing} + \refKey{/tcb/interior titled engine}: \=\kill + \refKey{/tcb/graphical environment}: \> |tikzpicture|\\ + \refKey{/tcb/frame engine}: \> |spartan|\\ + \refKey{/tcb/interior titled engine}: \> |spartan|\\ + \refKey{/tcb/interior engine}: \> |spartan|\\ + \refKey{/tcb/segmentation engine}: \> |spartan|\\ + \refKey{/tcb/title engine}: \> |spartan| + \end{tabbing} +\end{tcolorbox} +\end{docSkin} + + +\begin{docTcbKey}{spartan}{}{style, no value} + This is an abbreviation for setting |skin=spartan|. +\end{docTcbKey} + + +\begin{dispExample} +\tcbset{spartan,equal height group=spartan, + colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, + width=(\linewidth-6mm)/4,nobeforeafter, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} +% +\begin{tcolorbox} + This is my content. +\end{tcolorbox}\hfill +\begin{tcolorbox} + This is my content. + \tcblower + More content. +\end{tcolorbox}\hfill +\begin{tcolorbox}[adjusted title=My title] + This is my content. +\end{tcolorbox}\hfill +\begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. +\end{tcolorbox} +\end{dispExample} + + +\clearpage + \subsection{Skin 'draft'}\label{subsec:draft} \begin{docSkin}{draft} 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 58542326d1b..4f6a9277ddf 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex @@ -17,7 +17,7 @@ This also loads the package |amsmath|. The \meta{options} are given to the underlying |tcolorbox| to control the appearance. %The \meta{counter} is used for automatic numbering. - The \meta{init options} allow to set up automatic numbering, + The \meta{init options} allow setting up automatic numbering, see \Vref{sec:initkeys}.\par The new environment \meta{name} takes one optional and two mandatory parameters. The optional parameter supplements the options and should be @@ -245,18 +245,18 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor \end{marker} \begin{docTcbKey}{ams equation upper}{}{style, no value} - Adds an |amsmath| |equation| environment to the begin and to the end - if the upper part. + Adds an |amsmath| |equation| environment to the start and end + of the upper part. \end{docTcbKey} \begin{docTcbKey}{ams equation lower}{}{style, no value} - Adds an |amsmath| |equation| environment to the begin and to the end - if the lower part. + Adds an |amsmath| |equation| environment to the start and end + of the lower part. \end{docTcbKey} \begin{docTcbKey}{ams equation}{}{style, no value} - Adds an |amsmath| |equation| environment to the begin and to the end - if the upper \emph{and} lower part. + Adds an |amsmath| |equation| environment to the start and end + of the upper \emph{and} lower part. \begin{dispExample} \begin{tcolorbox}[ams equation,colback=yellow!10!white,colframe=red!50!black] \sum\limits_{n=1}^{\infty} \frac{1}{n} = \infty. @@ -265,18 +265,18 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor \end{docTcbKey} \begin{docTcbKey}{ams equation* upper}{}{style, no value} - Adds an |amsmath| |equation*| environment to the begin and to the end - if the upper part. + Adds an |amsmath| |equation*| environment to the start and end + of the upper part. \end{docTcbKey} \begin{docTcbKey}{ams equation* lower}{}{style, no value} - Adds an |amsmath| |equation*| environment to the begin and to the end - if the lower part. + Adds an |amsmath| |equation*| environment to the start and end + of the lower part. \end{docTcbKey} \begin{docTcbKey}{ams equation*}{}{style, no value} - Adds an |amsmath| |equation*| environment to the begin and to the end - if the upper \emph{and} lower part. + Adds an |amsmath| |equation*| environment to the start and end + of the upper \emph{and} lower part. \begin{dispExample} \begin{tcolorbox}[ams equation*,colback=yellow!10!white,colframe=red!50!black] \sum\limits_{n=1}^{\infty} \frac{1}{n} = \infty. @@ -286,18 +286,18 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor \clearpage \begin{docTcbKey}{ams align upper}{}{style, no value} - Adds an |amsmath| |align| environment to the begin and to the end - if the upper part. + Adds an |amsmath| |align| environment to the start and end + of the upper part. \end{docTcbKey} \begin{docTcbKey}{ams align lower}{}{style, no value} - Adds an |amsmath| |align| environment to the begin and to the end - if the lower part. + Adds an |amsmath| |align| environment to the start and end + of the lower part. \end{docTcbKey} \begin{docTcbKey}{ams align}{}{style, no value} - Adds an |amsmath| |align| environment to the begin and to the end - if the upper \emph{and} lower part. + Adds an |amsmath| |align| environment to the start and end + of the upper \emph{and} lower part. \begin{dispExample} \begin{tcolorbox}[ams align,colback=yellow!10!white,colframe=red!50!black] \sum\limits_{n=1}^{\infty} \frac{1}{n} &= \infty.\\ @@ -307,18 +307,18 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor \end{docTcbKey} \begin{docTcbKey}{ams align* upper}{}{style, no value} - Adds an |amsmath| |align*| environment to the begin and to the end - if the upper part. + Adds an |amsmath| |align*| environment to the start and end + of the upper part. \end{docTcbKey} \begin{docTcbKey}{ams align* lower}{}{style, no value} - Adds an |amsmath| |align*| environment to the begin and to the end - if the lower part. + Adds an |amsmath| |align*| environment to the start and end + of the lower part. \end{docTcbKey} \begin{docTcbKey}{ams align*}{}{style, no value} - Adds an |amsmath| |align*| environment to the begin and to the end - if the upper \emph{and} lower part. + Adds an |amsmath| |align*| environment to the start and end + of the upper \emph{and} lower part. \begin{dispExample} \begin{tcolorbox}[ams align*,colback=yellow!10!white,colframe=red!50!black] \sum\limits_{n=1}^{\infty} \frac{1}{n} &= \infty.\\ @@ -329,18 +329,18 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor \clearpage \begin{docTcbKey}{ams gather upper}{}{style, no value} - Adds an |amsmath| |gather| environment to the begin and to the end - if the upper part. + Adds an |amsmath| |gather| environment to the start and end + of the upper part. \end{docTcbKey} \begin{docTcbKey}{ams gather lower}{}{style, no value} - Adds an |amsmath| |gather| environment to the begin and to the end - if the lower part. + Adds an |amsmath| |gather| environment to the start and end + of the lower part. \end{docTcbKey} \begin{docTcbKey}{ams gather}{}{style, no value} - Adds an |amsmath| |gather| environment to the begin and to the end - if the upper \emph{and} lower part. + Adds an |amsmath| |gather| environment to the start and end + of the upper \emph{and} lower part. \begin{dispExample} \begin{tcolorbox}[ams gather,colback=yellow!10!white,colframe=red!50!black] \sum\limits_{n=1}^{\infty} \frac{1}{n} = \infty.\\ @@ -350,18 +350,18 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor \end{docTcbKey} \begin{docTcbKey}{ams gather* upper}{}{style, no value} - Adds an |amsmath| |gather*| environment to the begin and to the end - if the upper part. + Adds an |amsmath| |gather*| environment to the start and end + of the upper part. \end{docTcbKey} \begin{docTcbKey}{ams gather* lower}{}{style, no value} - Adds an |amsmath| |gather*| environment to the begin and to the end - if the lower part. + Adds an |amsmath| |gather*| environment to the start and end + of the lower part. \end{docTcbKey} \begin{docTcbKey}{ams gather*}{}{style, no value} - Adds an |amsmath| |gather*| environment to the begin and to the end - if the upper \emph{and} lower part. + Adds an |amsmath| |gather*| environment to the start and end + of the upper \emph{and} lower part. \begin{dispExample} \begin{tcolorbox}[ams gather*,colback=yellow!10!white,colframe=red!50!black] \sum\limits_{n=1}^{\infty} \frac{1}{n} = \infty.\\ @@ -593,7 +593,7 @@ type with the more flexible \refCom{newtcolorbox} macro: fontupper=\itshape]{% before upper={\textcolor{red!50!black}{\upshape\bfseries Theorem~\thetcbcounter\ (#2)}\quad}, - list entry={\numberline{\thetcbcounter}#2},% + list entry={\protect\numberline{\thetcbcounter}#2},% label={theo:#3},#1} \begin{YetAnotherTheorem}{Mittelwertsatz f\"{u}r $n$ Variable}{mittelwertsatz_n3}% diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex dd9cba7e3bd..9962e622a80 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 f02fc310661..b6454c10805 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -82,8 +82,8 @@ \newtcolorbox{marker}[1][]{marker,#1} -\def\version{2.60}% -\def\datum{2013/12/17}% +\def\version{2.61}% +\def\datum{2014/01/10}% \makeindex \hypersetup{ @@ -112,7 +112,7 @@ % tcolorbox macros moretexcs={% core endtcolorbox,endtcbverbatimwrite,newtcolorbox,newtcbox,newtcboxfit,tcbusetemp, - tcblower,tcbox,tcboxfit,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite, + tcblower,tcbox,tcboxfit,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite,tcbsetforeverylayer, % listings endtcblisting,newtcblisting,newtcbinputlisting, tcblisting,tcbinputlisting,tcbuselistingtext,tcbuselistinglisting,tcbusetemplisting, @@ -297,7 +297,7 @@ listing file={\solfile\thetcbcounter},label={exe:#2}, phantom={\writesol{#2}}, title={Exercise \thetcbcounter\hfill\mdseries Solution on page \pageref{sol:#2}}, - list entry={\numberline{\thetcbcounter}Exercise with solution on + list entry={\protect\numberline{\thetcbcounter}Exercise with solution on page \pageref{sol:#2}},#1} \end{tcbverbatimwrite} \input{\jobname_preamble_E.tex} @@ -342,8 +342,8 @@ \end{tcbverbatimwrite} \input{\jobname_preamble_I.tex} - -%\includeonly{tcolorbox.doc.abstract} +%\tcbset{draftmode} +%\includeonly{tcolorbox.doc.skins} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 2f2843d08a0..b21bf39c727 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize} @@ -458,7 +458,7 @@ \def\tcb@sdraw@USL{% - \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}% + \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook% \def\tcb@segment@state{1}% \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower+\csname tcb@h@breaksep@\tcb@split@state\endcsname}% \tcb@ch@natural% @@ -485,7 +485,7 @@ \def\tcb@sdraw@U{% - \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}% + \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook% \def\tcb@segment@state{0}% \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\tcb@h@upper+\csname tcb@h@breaksep@\tcb@split@state\endcsname}% \tcb@ch@natural% @@ -508,7 +508,7 @@ \def\tcb@sdraw@SL{% - \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}% + \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook% \def\tcb@segment@state{1}% \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@bottom+\kvtcb@boxsep+\tcb@h@segment+\tcb@h@lower+\csname tcb@h@breaksep@\tcb@split@state\endcsname}% \tcb@ch@natural% @@ -534,7 +534,7 @@ \def\tcb@sdraw@L{% - \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}% + \tcbset{skin=\csname kvtcb@skin@@\tcb@split@state\endcsname}\tcb@afteroptions@hook% \def\tcb@segment@state{2}% \tcbdimto\tcb@natheight{\tcb@h@padtitle+\kvtcb@top@rule+\kvtcb@bottom@rule+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom+\ht\tcb@lowerbox+\dp\tcb@lowerbox+\csname tcb@h@breaksep@\tcb@split@state\endcsname}% \tcb@ch@natural% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 38107a77327..c2d86c32e7d 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 85ec5f60284..3a66d5d6d84 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -58,6 +58,12 @@ \let\tcb@fit@warn@end=\@empty}, fit warning/final/.code={\tcb@cur@hbadness=\hbadness\def\tcb@fit@warn@begin{\hbadness=10000\relax}% \def\tcb@fit@warn@end{\hbadness=\tcb@cur@hbadness\relax\tcb@fit@@box}}, + fit algorithm/.is choice, + fit algorithm/fontsize/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@fontsize}, + fit algorithm/areasize/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@areasize}, + fit algorithm/hybrid/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@hybrid}, + fit algorithm/squeeze/.code={\let\tcbox@fitalgorithm=\tcbox@fitalgorithm@squeeze}, + spartan@fit/.style={fit algorithm=squeeze}, } \def\tcb@@capture@fitbox{% @@ -76,6 +82,138 @@ \newcount\tcb@cur@hbadness +\def\tcbox@fitalgorithm@fontsize{% + \tcb@continuetrue% + \loop% + \tcbfitdim.5\tcbfitdim% + \tcb@fit@@box% + \ifnum\count@=\kvtcb@fit@maxstep\relax% + \tcb@continuefalse% + \else% + \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% + \ifdim\tcbfitdim<18000sp\relax% + \count@\kvtcb@fit@maxstep\relax% + \tcb@continuefalse% + \fi% + \else% + \tcb@continuefalse% + \fi% + \fi% + \iftcb@continue \repeat% + \ifnum\count@<\kvtcb@fit@maxstep\relax% + \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}% + \tcb@lowerfitdim\tcbfitdim% + \tcb@upperfitdim2\tcbfitdim% + \tcbfitdim1.5\tcbfitdim% + \loop% + \tcb@fit@@box% + \tcb@continuetrue% + \ifnum\count@<\kvtcb@fit@maxstep\relax% + \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxfontdiff\relax% + \tcb@continuefalse% + \else% + \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxfontdiffgap\relax% + \ifdim\dimexpr\tcb@fit@@gap<\tcb@fit@@line\relax% + \tcb@continuefalse% + \fi% + \fi% + \fi% + \else% + \tcb@continuefalse% + \fi% + \iftcb@continue% + \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% + \tcb@upperfitdim\tcbfitdim% + \advance\tcbfitdim\tcb@lowerfitdim% + \tcbfitdim0.5\tcbfitdim% + \else% + \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}% + \tcb@lowerfitdim\tcbfitdim% + \advance\tcbfitdim\tcb@upperfitdim% + \tcbfitdim0.5\tcbfitdim% + \fi% + \else% + \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% + \tcbfitdim\tcb@lowerfitdim% + \tcb@fit@@box% + \fi% + \fi% + \iftcb@continue \repeat% + \fi% +} + +\def\tcbox@fitalgorithm@areasize{% + \pgfmathdivide{\tcb@fit@@h}{\tcb@fit@@target}% + \pgfmathsqrt{\pgfmathresult}% + \let\tcb@temp=\pgfmathresult% + \tcbdimto\tcb@w@upper@temp{\pgfmathresult\dimexpr\tcb@w@upper}% + \tcb@fit@@boxsave{\tcb@w@upper@temp}% + % + \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% + \pgfmathdivide{\tcb@fit@@h}{\tcb@fit@@target}% + \pgfmathdivide{\pgfmathresult}{\tcb@temp}% + \pgfmathsqrt{\pgfmathresult}% + \ifdim\dimexpr\pgfmathresult pt<0.98pt\relax + \tcbdimto\tcb@w@upper@temp{\pgfmathresult\dimexpr\tcb@w@upper@temp}% + \tcb@fit@@boxsave{\tcb@w@upper@temp}% + \else\ifdim\dimexpr\pgfmathresult pt>1.02pt\relax + \tcbdimto\tcb@w@upper@temp{\pgfmathresult\dimexpr\tcb@w@upper@temp}% + \tcb@fit@@boxsave{\tcb@w@upper@temp}% + \fi\fi% + % + \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% + \pgfmathdivide{\tcb@w@upper}{\tcb@w@upper@temp}% + \tcbdimto\tcb@fit@@h{\pgfmathresult\dimexpr\tcb@fit@@h}% + \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% + \let\tcb@fit@@h=\tcb@fit@@target% + \fi + \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@h}{\box\tcb@upperbox}}% + % + \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% +} + +\def\tcbox@fitalgorithm@squeeze{% + \setbox\tcb@upperbox\hbox{\resizebox*{\tcb@w@upper}{\tcb@fit@@target}{\box\tcb@upperbox}}% + \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% +} + +\def\tcbox@fitalgorithm@hybrid{% + \pgfmathdivide{\tcb@fit@@target}{\tcb@fit@@h}% + \pgfmathsqrt{\pgfmathresult}% + \tcbfitdim=\pgfmathresult\tcbfitdim% + \tcb@fit@@box% + % + \pgfmathdivide{\tcb@fit@@target}{\tcb@fit@@h}% + \pgfmathsqrt{\pgfmathresult}% + \ifdim\dimexpr\pgfmathresult pt<0.85pt\relax + \tcbfitdim=\pgfmathresult\tcbfitdim% + \tcb@fit@@box% + \else\ifdim\dimexpr\pgfmathresult pt>1.15pt\relax + \tcbfitdim=\pgfmathresult\tcbfitdim% + \tcb@fit@@box% + \fi\fi% + % + \tcbox@fitalgorithm@areasize% +} + +\def\tcb@fit@@box{% + \tcbdimto\tcb@fit@@line{\kvtcb@fit@skip\tcbfitdim}% + \tcbdimto\tcb@w@upper{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}% + \tcb@fit@@boxsave{\tcb@w@upper}% + \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% + \tcbdimto\tcb@fit@@target{\kvtcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand-\kvtcb@top-\kvtcb@bottom-\kvtcb@boxsep*2-\tcb@h@titletotal}% +}% + +\def\tcb@fit@@box@titled{% + \tcb@set@@dim@and@title% + \iftcb@hasTitle% + \tcbdimto\tcb@h@titletotal{\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle}% + \else% + \let\tcb@h@titletotal=\tcb@zpt% + \fi% + \tcb@fit@@box% +}% + \long\def\tcbox@inner@fitbox#1{% \tcbset{breakable@false,sidebyside=false}% \let\tcb@val@raisebase=\tcb@zpt% @@ -88,32 +226,14 @@ \tcbfitdim\kvtcb@fit@basedim% \tcb@fit@warn@begin% % - \def\tcb@fit@@box{% - \tcbdimto\tcb@fit@@line{\kvtcb@fit@skip\tcbfitdim}% - \tcbdimto\tcb@w@upper{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}% - \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}% + \def\tcb@fit@@boxsave##1{% + \begin{tcb@savebox}{\tcb@upperbox}{##1}% \color{\kvtcb@colupper}% \kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% \kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper% \end{tcb@savebox}% - % - \ifdim\wd\tcb@upperbox>\tcb@w@upper\relax - \message{WARNING!!!!!} - \fi - % - \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% - \tcbdimto\tcb@fit@@target{\kvtcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand-\kvtcb@top-\kvtcb@bottom-\kvtcb@boxsep*2-\tcb@h@titletotal}% \advance\count@ 1\relax% }% - \def\tcb@fit@@box@titled{% - \tcb@set@@dim@and@title% - \iftcb@hasTitle% - \tcbdimto\tcb@h@titletotal{\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle}% - \else% - \let\tcb@h@titletotal=\tcb@zpt% - \fi% - \tcb@fit@@box% - }% % \tcb@fit@@box@titled% % @@ -182,66 +302,10 @@ \fi% \fi% % - % font fit + % (font) fit \ifnum\count@<\kvtcb@fit@maxstep\relax% \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% - \tcb@continuetrue% - \loop% - \tcbfitdim.5\tcbfitdim% - \tcb@fit@@box% - \ifnum\count@=\kvtcb@fit@maxstep\relax% - \tcb@continuefalse% - \else% - \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% - \ifdim\tcbfitdim<18000sp\relax% - \count@\kvtcb@fit@maxstep\relax% - \tcb@continuefalse% - \fi% - \else% - \tcb@continuefalse% - \fi% - \fi% - \iftcb@continue \repeat% - \ifnum\count@<\kvtcb@fit@maxstep\relax% - \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}% - \tcb@lowerfitdim\tcbfitdim% - \tcb@upperfitdim2\tcbfitdim% - \tcbfitdim1.5\tcbfitdim% - \loop% - \tcb@fit@@box% - \tcb@continuetrue% - \ifnum\count@<\kvtcb@fit@maxstep\relax% - \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxfontdiff\relax% - \tcb@continuefalse% - \else% - \ifdim\dimexpr\tcb@upperfitdim-\tcb@lowerfitdim<\kvtcb@fit@maxfontdiffgap\relax% - \ifdim\dimexpr\tcb@fit@@gap<\tcb@fit@@line\relax% - \tcb@continuefalse% - \fi% - \fi% - \fi% - \else% - \tcb@continuefalse% - \fi% - \iftcb@continue% - \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% - \tcb@upperfitdim\tcbfitdim% - \advance\tcbfitdim\tcb@lowerfitdim% - \tcbfitdim0.5\tcbfitdim% - \else% - \tcbdimto\tcb@fit@@gap{\tcb@fit@@target-\tcb@fit@@h}% - \tcb@lowerfitdim\tcbfitdim% - \advance\tcbfitdim\tcb@upperfitdim% - \tcbfitdim0.5\tcbfitdim% - \fi% - \else% - \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% - \tcbfitdim\tcb@lowerfitdim% - \tcb@fit@@box% - \fi% - \fi% - \iftcb@continue \repeat% - \fi% + \tcbox@fitalgorithm% \fi% \fi% % @@ -312,8 +376,9 @@ \tcbset{% reset@fitting/.style={% + fit algorithm=fontsize,% fit basedim=10pt,fit skip=1.2, - fit height plus=0pt,fit width plus=0pt, + height plus=0pt,fit width plus=0pt, fit maxstep=20,fit maxfontdiff=0.1pt,fit maxfontdiffgap=1pt, fit maxwidthdiff=1pt,fit maxwidthdiffgap=10pt, fit warning=off diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 4726ccc8799..1fb7e50fdbe 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index a793223297f..9ecaf1366e4 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \RequirePackage{listings}[2007/02/22] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex index 5f8286aa7ff..7afca6e94ae 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% @@ -154,7 +154,7 @@ \long\def\tcbinputlisting#1{% \begingroup% \tcb@layer@pushup% - \tcbset{capture=minipage,#1}% + \tcbset{capture=minipage,#1}\tcb@afteroptions@hook% \let\tcb@listing@capture=\kvtcb@capture% \tcb@inputlisting\endgroup% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 7bc89405ca2..d077adad17e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 58c1ed0553b..0a2c0564d23 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 22242ee750a..0fa7982653a 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \RequirePackage{tikz}[2010/10/13] @@ -233,6 +233,64 @@ \def\tcb@drawlower@freelance{\tcb@segmentation@code} \def\tcb@drawtitle@freelance{\tcb@title@code} + +\def\tcb@drawframe@spartan{% + \begin{pgfscope}% + \pgfpathrectangle{\pgfpointorigin}{\pgfqpoint{\tcb@width}{\tcb@height}}% + \pgfsetfillcolor{\kvtcb@colframe}% + \pgfsetfillopacity{\kvtcb@opacityframe}% + \pgfusepath{fill}% + \end{pgfscope}% +} + +\def\tcb@drawwithtitle@spartan{% + \begin{pgfscope}% + \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}% + {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}% + \pgfsetfillcolor{\kvtcb@colback}% + \pgfsetfillopacity{\kvtcb@opacityback}% + \pgfusepath{fill}% + \end{pgfscope}% +} + +\def\tcb@drawwithouttitle@spartan{% + \begin{pgfscope}% + \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}% + {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\tcb@height-\kvtcb@top@rule\relax}}% + \pgfsetfillcolor{\kvtcb@colback}% + \pgfsetfillopacity{\kvtcb@opacityback}% + \pgfusepath{fill}% + \end{pgfscope}% +} + +\def\tcb@drawtitle@spartan{% + \begin{pgfscope}% + \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight+\kvtcb@title@rule\relax}}% + {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\tcb@height-\kvtcb@top@rule\relax}}% + \pgfsetfillcolor{\kvtcb@colbacktitle}% + \pgfsetfillopacity{\kvtcb@opacitybacktitle}% + \pgfusepath{fill}% + \end{pgfscope}% +} + +\def\tcb@drawlower@spartan{% + \begin{pgfscope}% + \iftcb@sidebyside% + \tcbdimto\tcb@seg@pos{\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper+\tcb@w@upper+\kvtcb@sbs@gap/2}% + \pgfpathmoveto{\pgfqpoint{\tcb@seg@pos}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}% + \pgfpathlineto{\pgfqpoint{\tcb@seg@pos}{\kvtcb@bottom@rule}}% + \else% + \tcbdimto\tcb@seg@pos{\kvtcb@bottom@rule+\kvtcb@boxsep*2+\tcb@break@bottomsep+\kvtcb@middle+\kvtcb@bottom+\tcb@height@lower}% + \pgfpathmoveto{\pgfqpoint{\kvtcb@left@rule}{\tcb@seg@pos}}% + \pgfpathlineto{\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}% + \fi% + \pgfsetcolor{\kvtcb@colframe}% + \pgfsetstrokeopacity{\kvtcb@opacityframe}% + \pgfusepath{stroke}% + \end{pgfscope}% +} + + \tcbset{% frame style/.code={\tikzset{frame@style/.style={#1}}},% frame hidden/.style={frame style={draw=none,fill=none}}, @@ -625,6 +683,14 @@ segmentation code={\tcb@drawspec@widgetsegment},% skin first=widgetmiddle,skin middle=widgetmiddle,skin last=widgetlast} +\tcb@new@skin{spartan}{graphical environment=tikzpicture@tcb@hooked,geometry nodes=false, + set@extensions@preframe=,set@extensions@postframe=, + frame engine=spartan,interior titled engine=spartan,interior engine=spartan,title engine=spartan,segmentation engine=spartan,% + set@outerboundary=\tcb@boundaryframe@standard,% + skin first=spartan,skin middle=spartan,skin last=spartan} + +\tcbset{spartan/.style={skin=spartan}} + \tcb@new@skin{draft}{clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,% frame engine=freelance,interior titled engine=freelance,interior engine=freelance,segmentation engine=path,title engine=path,% interior style=,frame style=,segmentation style={draw=black,dashed}, @@ -1073,6 +1139,26 @@ } +\newif\iftcb@isindraft +\def\tcb@draftmode{\tcbset{spartan,spartan@fit}} +\def\tcbstartdraftmode{\let\tcb@afteroptions@hook=\tcb@draftmode\tcb@isindrafttrue} +\def\tcbstopdraftmode{\let\tcb@afteroptions@hook=\@empty\tcb@isindraftfalse} + +\def\tcbinterruptdraftmode{% + \iftcb@isindraft% + \tcbstopdraftmode% + \let\tcbcontinuedraftmode=\tcbstartdraftmode% + \else% + \let\tcbcontinuedraftmode=\@empty% + \fi} + +\tcbset{% + draftmode/.is choice,% + draftmode/.default=true,% + draftmode/true/.code=\tcbstartdraftmode,% + draftmode/false/.code=\tcbstopdraftmode,% +} + \tcbset{% reset@skins/.style={% frame style=,interior style=,segmentation style=,@title style=,% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 9e75fb0a731..4dfab320b3c 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \tcbuselibrary{skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index ece7cf5b1cd..1517e3fc6ab 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.60} +\tcb@set@library@version{2.61} \RequirePackage{amsmath} @@ -38,7 +38,7 @@ } \def\tcb@theo@listentry#1#2#3{% - \def\kvtcb@listentry{\numberline{#2}#3}% + \def\kvtcb@listentry{\protect\numberline{#2}#3}% } \def\tcb@theo@label#1#2{% @@ -86,7 +86,7 @@ \newcommand{\new@tcbtheorem}[5][]{% \@@newtcolorbox[auto counter,#1]{#2}[3][]{#4,% title={\tcb@theo@title{#3}{\thetcbcounter}{##2}},% - list entry={\numberline{\thetcbcounter}##2},% + list entry={\protect\numberline{\thetcbcounter}##2},% code={\tcb@theo@label{#5}{##3}},% ##1}% \@@newtcolorbox[#1,no counter,list inside=]{#2*}[2][]{#4,% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index caabe86692a..4f57a3135cb 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.60 (2013/12/17) +%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2013/12/17 version 2.60 text color boxes] -\def\tcb@version{2.60} +\ProvidesPackage{tcolorbox}[2014/01/10 version 2.61 text color boxes] +\def\tcb@version{2.61} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -348,6 +348,7 @@ opacitybacktitle/.style={title filled,@opacitybacktitle={#1}}, opacityfill/.style={opacityframe={#1},opacityback={#1},@opacitybacktitle={#1}}, opacitytext/.style={opacityupper={#1},opacitylower={#1}}, + spartan@fit/.code={},% } \tcbset{% @@ -369,6 +370,7 @@ \def\@parboxrestore{\noindent\linewidth\hsize\let\@parboxrestore=\tcb@parboxrestore\leavevmode}% } +\let\tcb@afteroptions@hook\@empty \let\tcb@parbox@use@true\relax% \def\tcb@minipage@top{\minipage[t]} @@ -549,7 +551,7 @@ \long\def\tcb@@icolorbox[#1]{% \tcb@layer@inc% - \tcbset{capture=minipage,#1}% + \tcbset{capture=minipage,#1}\tcb@afteroptions@hook% \tcb@hasLowerfalse% \csname tcb@@capture@\kvtcb@capture\endcsname% } @@ -1005,7 +1007,7 @@ \long\def\tcb@ox#1#2{% \begingroup% \tcb@layer@inc% - \tcbset{#1}% + \tcbset{#1}\tcb@afteroptions@hook% \csname tcbox@inner@\kvtcb@capture\endcsname{#2}% \tcb@layer@dec% \endgroup% @@ -1178,9 +1180,9 @@ \def\tcb@addcontentsline#1#2{% \ifx\kvtcb@listentry\@empty% \ifx\kvtcb@title\@empty% - \addcontentsline{#1}{#2}{\numberline{\thetcbcounter}\kvtcb@savedelimiter}% + \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}\kvtcb@savedelimiter}% \else% - \addcontentsline{#1}{#2}{\numberline{\thetcbcounter}\kvtcb@title}% + \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}\kvtcb@title}% \fi% \else% \addcontentsline{#1}{#2}{\kvtcb@listentry}% @@ -1280,6 +1282,8 @@ initialize@reset=reset@core, } +\def\tcbsetforeverylayer#1{\tcbset{initialize@reset={#1}}} + % libraries \def\tcb@optionlist{} @@ -1300,16 +1304,28 @@ \providecommand{\tcbpkgprefix}{} +\def\tcb@input@library@in#1{% + \input\tcbpkgprefix#1\relax% +} + +\let\tcb@input@library=\tcb@input@library@in% + +\def\tcb@input@library@ex#1{% + \let\tcb@input@library=\tcb@input@library@in% + \edef\tcb@at@catcode{\the\catcode`@}% + \catcode`\@11\relax% + \tcb@input@library@in{#1}% + \catcode`\@\tcb@at@catcode\relax% + \let\tcb@input@library=\tcb@input@library@ex% +} + \def\tcb@load@library#1#2{% \pgfkeysifdefined{/tcb/libload/#1}{}{% \pgfkeyssetvalue{/tcb/libload/#1}{}% \def\tcb@library@inload{#2}% \def\tcb@library@version{-}% - \edef\tcb@at@catcode{\the\catcode`@}% - \catcode`\@11\relax% - \input\tcbpkgprefix#2\relax% - \catcode`\@\tcb@at@catcode\relax% - \tcb@check@library@version}{}% + \tcb@input@library{#2}% + \tcb@check@library@version}% } \def\tcb@add@library#1#2{% @@ -1340,3 +1356,4 @@ \ProcessOptions* \edef\tcb@temp{\noexpand\tcbuselibrary{\tcb@optionlist}} \tcb@temp +\let\tcb@input@library=\tcb@input@library@ex% |