From d618f80f8f62c896392904e75aefd221af6fa9e6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 22 Sep 2014 22:17:46 +0000 Subject: tcolorbox (22sep14) git-svn-id: svn://tug.org/texlive/trunk@35232 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tcolorbox/CHANGES | 28 +++++- Master/texmf-dist/doc/latex/tcolorbox/README | 2 +- .../doc/latex/tcolorbox/tcolorbox-example.pdf | Bin 361348 -> 361353 bytes .../doc/latex/tcolorbox/tcolorbox-example.tex | 2 +- .../doc/latex/tcolorbox/tcolorbox.doc.abstract.tex | 4 +- .../latex/tcolorbox/tcolorbox.doc.breakable.tex | 1 + .../latex/tcolorbox/tcolorbox.doc.coreoptions.tex | 69 +++++++++++++- .../tcolorbox/tcolorbox.doc.documentation.tex | 106 ++++++++++++++++++--- .../doc/latex/tcolorbox/tcolorbox.doc.filling.tex | 38 +++++++- .../doc/latex/tcolorbox/tcolorbox.doc.hooks.tex | 14 +++ .../latex/tcolorbox/tcolorbox.doc.initoptions.tex | 50 +++++++++- .../doc/latex/tcolorbox/tcolorbox.doc.skins.tex | 15 +++ .../doc/latex/tcolorbox/tcolorbox.doc.theorems.tex | 2 +- .../texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf | Bin 4415072 -> 4488553 bytes .../texmf-dist/doc/latex/tcolorbox/tcolorbox.tex | 19 ++-- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 33 +++++-- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 59 ++++++++---- .../tex/latex/tcolorbox/tcbfitting.code.tex | 4 +- .../tex/latex/tcolorbox/tcbhooks.code.tex | 8 +- .../tex/latex/tcolorbox/tcblistings.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingscore.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 4 +- .../tex/latex/tcolorbox/tcbminted.code.tex | 4 +- .../tex/latex/tcolorbox/tcbskins.code.tex | 44 +++++++-- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 6 +- .../tex/latex/tcolorbox/tcbxparse.code.tex | 4 +- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 44 ++++++--- 28 files changed, 467 insertions(+), 105 deletions(-) diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 6acd6031241..192b17cc6d2 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm @@ -566,7 +566,7 @@ version 3.10 (2014/07/23) for all types of boxes, skins, borders, and shadows: * new options: 'sharpish corners', 'sharp corners', and 'rounded corners' - library 'skins': - * new options: '\tcbline*' + * new macros: '\tcbline*' * bug fix: skin families 'bicolor' and 'beamer' did not respect 'colbacktitle' - pictures 'blueshade.png', 'crinklepaper.png', 'goldshade.png', 'pink_marble.png' moved to package folder @@ -583,3 +583,27 @@ version 3.12 (2014/07/29) - library 'breakable': * new option: 'vfill before first' +version 3.20 (2014/09/22) +- bug fix: titles set with 'detach' or 'boxed title' options were not considered + for lists of tcolorboxes. +- bug fix: 'extrude left by', 'extrude right by' worked only for '\tcbox' but not for 'tcolorbox' +- bug fix: 'pad before break*' and 'pad at break*' were always setting to 0pt +- new options: 'every float', 'list text', 'overlay first and middle', + 'height fill' +- new initialization options: + 'use counter*', 'blend into' +- library 'skins': + * new macros: '\tcbsettowidthofnode', '\tcbsetmacrotowidthofnode', + '\tcbsettoheightofnode', '\tcbsetmacrotoheightofnode' + * new options: 'underlay first and middle', 'finish first and middle' +- library 'hooks': + * new options: 'underlay first and middle pre', + 'overlay first and middle app', 'overlay first and middle pre', + 'finish first and middle pre' +- library 'documentation': + * new macros: '\tcbdocmarginnote', '\tcbdocnew', '\tcbdocupdated' + * The 'docKey' and 'docKey*' environments take tcolorbox options now + * new options: + 'doclang/new', 'doclang/updated', + 'doc marginnote', 'doc updated', 'doc new', 'doc new and updated' + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index aa3167bb975..06bb2a4f501 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf index 3f6068330cd..0902b99e687 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index 1a3fc077aca..082cc44e086 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex index b447e3530fb..d355b85d922 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex @@ -67,7 +67,8 @@ cover page. Printing the pages starting with page 2 or page 3 should work. colback=yellow!10!white,colframe=red!50!black,before=\par\bigskip\noindent, interior style={fill overzoom image=goldshade.png,fill image opacity=0.25}, colbacktitle=red!50!yellow!75!black, - watermark color=yellow!75!red!25!white,pad at break=3mm, + enlargepage flexible=\baselineskip,pad at break*=3mm, + watermark color=yellow!75!red!25!white, watermark text={\bfseries\Large Contents}, attach boxed title to top center={yshift=-0.25mm-\tcboxedtitleheight/2,yshifttext=2mm-\tcboxedtitleheight/2}, boxed title style={enhanced,boxrule=0.5mm, @@ -78,7 +79,6 @@ cover page. Printing the pages starting with page 2 or page 3 should work. -- (interior.north west) -- (interior.north east) -- ([xshift=2mm]interior.east) -- (interior.south east) -- (interior.south west) -- cycle;} }, - %enlargepage=2\baselineskip, drop fuzzy shadow] \makeatletter \@starttoc{toc} 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 91dbc9a5c76..894db46d014 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -370,6 +370,7 @@ and \refKey{/tcb/enlarge bottom at break by}. \begin{marker} If the box keeps unbroken, this option is not applied. See \refKey{/tcb/height} for setting a fixed height for unbroken boxes. + See \refKey{/tcb/height fill} for giving unbroken boxes maximum height. \end{marker} \end{docTcbKey} 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 03569b2014d..3c350f3b655 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -1122,9 +1122,32 @@ This is a tcolorbox. This is a tcolorbox. This is a 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 +available vertical space of the current page. Note that the |tcolorbox| +is always set as its own paragraph using this option. +This option overrules \refKey{/tcb/natural height}, \refKey{/tcb/height}, etc. +\begin{marker} +Note that the library \mylib{breakable} has to be loaded to use this key! +\end{marker} +This height control key is only applicable to unbreakable boxes but it +uses code from the library \mylib{breakable}. +The counterpart for breakable boxes is \refKey{/tcb/height fixed for}. +\begin{dispListing} +% \usepackage{lipsum} +% \tcbuselibrary{breakable} +\begin{tcolorbox}[height fill, + colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries, + title=Box which fills the rest of the page] +\lipsum[1] +\end{tcolorbox} +\end{dispListing} +\end{docTcbKey} +{\tcbusetemp} -\clearpage +%\clearpage \begin{docTcbKey}{space}{=\meta{fraction}}{no default, initially 0} If the height of a |tcolorbox| is not the natural height, the space difference between the forced and the natural size is distributed @@ -1794,6 +1817,13 @@ This is the lower part. \refKey{/tcb/overlay} overwrites this key. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{overlay first and middle}{=\meta{graphical code}}{no default, initially unset} + This is an optimized abbreviation for setting + \refKey{/tcb/overlay first} and + \refKey{/tcb/overlay middle} together. + \refKey{/tcb/overlay} overwrites this key. +\end{docTcbKey} + \begin{dispListing*}{breakable,before upper={This example demonstrates the application of break sequence specific overlay options. @@ -1812,7 +1842,6 @@ are drawn by the codes given with %\tcbuselibrary{skins,breakable} %\newcounter{example} \colorlet{colexam}{red!75!black} - \newtcolorbox[use counter=example]{myexample}{% empty,title={Example \thetcbcounter},attach boxed title to top left, boxed title style={empty,size=minimal,toprule=2pt,top=4pt, @@ -1922,6 +1951,24 @@ are drawn by the codes given with \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{every float}{=\meta{code}}{no default, initially empty} + For floating objects, the \refKey{/tcb/before} and \refKey{/tcb/after} + settings are ignored. Instead, the given \meta{code} is inserted before + a floating box. If the box is \refKey{/tcb/breakable}, the given \meta{code} is + inserted before every part of the break sequence. + The most common use case is |every float=\centering|. + +\begin{dispListing} +\tcbox[float=htb,title={Floating box},every float=\centering, + colback=blue!50!black,colframe=blue!50!white,colbacktitle=blue!10!white, + coltitle=black,center title] + {\includegraphics[height=6cm]{lichtspiel.jpg}} +\end{dispListing} +{\tcbset{reset}\tcbusetemp} + +\end{docTcbKey} + + \clearpage \subsection{Side by Side}\label{subsec:sidebyside} \begin{marker} @@ -2363,7 +2410,7 @@ Lorem \tcbox{ipsum} dolor sit amet, consectetuer adipiscing elit. \end{dispExample} \end{docTcbKey} -\begin{docTcbKey}{extrude left by}{=\meta{length}}{style, no default, initially unset} +\begin{docTcbKey}[][doc updated=2014-09-19]{extrude left by}{=\meta{length}}{style, no default, initially unset} The (upper part of the) colored box is extruded by the given \meta{length} to the left side. The inner width and the bounding box is kept unchanged and the operation is additiv! @@ -2379,7 +2426,7 @@ Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna. \end{dispExample} \end{docTcbKey} -\begin{docTcbKey}{extrude right by}{=\meta{length}}{style, no default, initially unset} +\begin{docTcbKey}[][doc updated=2014-09-19]{extrude right by}{=\meta{length}}{style, no default, initially unset} The (upper part of the) colored box is extruded by the given \meta{length} to the right side. The inner width and the bounding box is kept unchanged and the operation is additiv! @@ -2748,7 +2795,7 @@ Test\dotfill %page \pageref{sec:skincorekeys}. \clearpage -\subsection{Counters, Labels and References} +\subsection{Counters, Labels, and References} \begin{docTcbKey}{phantom}{=\meta{code}}{no default, initially unset} The \meta{code} is put in a box at the upper left corner of the |tcolorbox|. @@ -2826,6 +2873,18 @@ See Section \ref{listing:exercises} from page \pageref{listing:exercises} for a complete example. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{list text}{=\meta{text}}{style, no default} +This is a shortcut for setting \refKey{/tcb/list entry} to\\ +|\protect\numberline{\thetcbcounter}|\meta{text}. +So, the following settings are identical: +\begin{dispListing} +list text={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. +\end{docTcbKey} + \begin{docTcbKey}{add to list}{=\marg{list}\marg{type}}{no default, initially unset} If the \flqq list of tcolorbox(es)\frqq\ feature described in Subsection \ref{sec:listsof} from page \pageref{sec:listsof} is used, list entries are 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 b1fe8a9d02d..52fce65f388 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex @@ -14,8 +14,9 @@ The library is loaded by a package option or inside the preamble by: \end{dispListing} This also loads the library \mylib{listings}, see \Vref{sec:listings}, the library \mylib{skins}, see \Vref{sec:skins}, +the library \mylib{xparse}\tcbdocmarginnote{\tcbdocnew{2014-09-19}}, see \Vref{sec:xparse}, and a bunch of packages, namely -|doc|, |pifont|, |marvosym|, |makeidx|, |refcount|, and |hyperref|. +|doc|, |pifont|, |marvosym|, |makeidx|, |marginnote|, |refcount|, and |hyperref|. \begin{marker} The package |makeidx| is loaded only, if \docAuxCommand*{printindex} is @@ -96,8 +97,9 @@ For |minted| \cite{rudolph:2011a} support, load: \end{xdocEnvironment}} -\begin{docEnvironment}[doclang/environment content=key description]{docKey}{\oarg{key path}\marg{name}\marg{parameters}\marg{description}} +\begin{docEnvironment}[doclang/environment content=key description,doc updated=2014-09-19]{docKey}{\oarg{key path}\oarg{options}\marg{name}\marg{parameters}\marg{description}} Documents a key with given \meta{name} and an optional \meta{key path}. + The given \meta{options} are set with \refCom{tcbset}. This key takes mandatory or optional \meta{parameters} as value with a short \meta{description}. It is automatically indexed and can be referenced with @@ -110,7 +112,7 @@ For |minted| \cite{rudolph:2011a} support, load: \end{docEnvironment} -\begin{docEnvironment}[doclang/environment content=key description]{docKey*}{\oarg{key path}\marg{name}\marg{parameters}\marg{description}} +\begin{docEnvironment}[doclang/environment content=key description,doc updated=2014-09-19]{docKey*}{\oarg{key path}\oarg{options}\marg{name}\marg{parameters}\marg{description}} Identical to \refEnv{docKey}, but without index entry. \end{docEnvironment} @@ -402,6 +404,43 @@ This is my \colOpt{text}. \end{dispExample} \end{docCommand} +\clearpage + +\begin{docCommand}[doc new=2014-09-19]{tcbdocmarginnote}{\oarg{options}\marg{text}} + Creates a |tcolorbox| note with the given \meta{text} inside the margin using + the |marginnote| package. The style of the |tcolorbox| is predefined and can be + altered by \refKey{/tcb/doc marginnote} and the given \meta{options}. +\begin{dispExample} +Some text\tcbdocmarginnote{Note A} +which is commented by a note inside the margin. +Alternatively to |\tcbdocmarginnote|, you can always use +|\marginnote| with a |tcolorbox| directly.\par +This is further text% +\tcbdocmarginnote[colframe=blue!50!white,colback=blue!5!white]{Note B} +with another note. +\end{dispExample} +\end{docCommand} + +\begin{docCommand}[doc new=2014-09-19]{tcbdocnew}{\marg{date}} + Auxiliary macro which typesets the \refKey{/tcb/doclang/new} text with + the given \meta{date}. It may be redefined for customization. + \makeatletter\renewcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1}\makeatother% +\begin{dispExample*}{sidebyside} +\tcbdocnew{1981-10-29}. +% Next one is displayed in the margin: +\tcbdocmarginnote{\tcbdocnew{1978-02-09}} +\end{dispExample*} +\end{docCommand} + +\begin{docCommand}[doc new=2014-09-19]{tcbdocupdated}{\marg{date}} + Auxiliary macro which typesets the \refKey{/tcb/doclang/updated} text with + the given \meta{date}. It may be redefined for customization. + \makeatletter\renewcommand*{\tcbdocupdated}[1]{\kvtcb@text@updated: #1}\makeatother% +\begin{dispExample*}{sidebyside} +\tcbdocupdated{2014-09-19}. +\end{dispExample*} +\end{docCommand} + \clearpage \subsection{Option Keys of the Library} @@ -561,9 +600,6 @@ The English language is predefined. Heading text in the index for colors. \end{langTcbKey} -\begin{langTcbKey}{environment content}{=\meta{text}}{no default, initially |environment content|} - Text used in \refEnv{docEnvironment}. -\end{langTcbKey} \begin{langTcbKey}{environment}{=\meta{text}}{no default, initially |environment|} Text used in the index for environments. @@ -573,6 +609,10 @@ The English language is predefined. Heading text in the index for environments. \end{langTcbKey} +\begin{langTcbKey}{environment content}{=\meta{text}}{no default, initially |environment content|} + Text used in \refEnv{docEnvironment}. +\end{langTcbKey} + \begin{langTcbKey}{key}{=\meta{text}}{no default, initially |key|} Text used in the index for keys. \end{langTcbKey} @@ -581,6 +621,22 @@ The English language is predefined. Heading text used in the index for keys. \end{langTcbKey} +\begin{langTcbKey}{index}{=\meta{text}}{no default, initially |Index|} + Heading text for the index. +\end{langTcbKey} + +\begin{langTcbKey}[][doc new={2014-09-19}]{new}{=\meta{text}}{no default, initially |New|} + Announcement text for new content. +\end{langTcbKey} + +\begin{langTcbKey}{pageshort}{=\meta{text}}{no default, initially |P.|} + Short text for page references. +\end{langTcbKey} + +\begin{langTcbKey}[][doc new={2014-09-19}]{updated}{=\meta{text}}{no default, initially |Updated|} + Announcement text for updated content. +\end{langTcbKey} + \begin{langTcbKey}{value}{=\meta{text}}{no default, initially |value|} Text used in the index for values. \end{langTcbKey} @@ -589,13 +645,7 @@ The English language is predefined. Heading text in the index for values. \end{langTcbKey} -\begin{langTcbKey}{index}{=\meta{text}}{no default, initially |Index|} - Heading text for the index. -\end{langTcbKey} -\begin{langTcbKey}{pageshort}{=\meta{text}}{no default, initially |P.|} - Short text for page references. -\end{langTcbKey} \clearpage \begin{docTcbKey}{doc left}{=\meta{length}}{no default, initially |2em|} @@ -716,6 +766,38 @@ hand side if too long. Linebreaks can be used inside the \meta{text}. instead of \refEnv{docCommand}. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{doc marginnote}{=\meta{options}}{no default, initially empty} + Sets style \meta{options} for the displayed box of the \refCom{tcbdocmarginnote} command. +\begin{dispExample} +\tcbset{doc marginnote={colframe=blue!50!white,colback=blue!5!white}}% +This is some text\tcbdocmarginnote{Note A} +which is commented by a note inside the margin. +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-09-19]{doc new}{=\meta{date}}{style, no default} + Adds a a marginnote with a 'New: \meta{data}' message at the beginning of + the upper box part. The intended use is inside the option list of + \refEnv{docCommand}, \refEnv{docEnvironment}, etc. + \makeatletter\renewcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1}\makeatother% +\begin{dispExample} +\begin{docCommand}[doc new=2000-01-01]{foosomething}{\marg{text}} +Some command for something. +\end{docCommand} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-09-19]{doc updated}{=\meta{date}}{style, no default} + Adds a marginnote with a 'Updated: \meta{data}' message at the beginning of + the upper box part. See \refKey{/tcb/doc new}. +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-09-19]{doc new and updated}{=\marg{new date}\marg{update date}}{style, no default} + Adds a marginnote with 'New: \meta{new date}' and 'Updated: \meta{update data}' messages at the beginning of + the upper box part. See \refKey{/tcb/doc new}. +\end{docTcbKey} \subsection{Predefined Colors of the Library} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex index ced3f0ffd01..89e159eba81 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex @@ -1,7 +1,7 @@ % !TeX root = tcolorbox.tex % include file of tcolorbox.tex (manual of the LaTeX package tcolorbox) \clearpage -\section{\tikzname\ Image and Picture Fill Extensions}\label{sec:tikzimagefilling} +\section{\tikzname\ Image and Picture Fill Extensions; Auxiliary Macros}\label{sec:tikzimagefilling} The \mylib{skins} library adds some image and picture fill options to the vast option set of \tikzname\ \cite{tantau:2013a}. These options can be used in any |tikzpicture|. For the following options, the \mylib{skins} library has to be loaded @@ -413,3 +413,39 @@ See \Vref{sec:skins} for the documentation of all other options of the \mylib{sk \end{tikzpicture} \end{dispExample*} + +\clearpage +\subsection{Extracting Node Dimensions} +The following auxiliary macros are defined by the \mylib{skins} library. +They allow to determine the width and height of an arbitrary \tikzname\ node. +To be more specific, they determine the east-to-west and the north-to-south dimensions +which may be not the maximal dimensions for a non-rectangular node. + +\begin{docCommand}[doc new=2014-09-19]{tcbsettowidthofnode}{\marg{register}\marg{node}} + Sets the east-to-west dimension of the given \meta{node} + to the \TeX\ \meta{register}. +\end{docCommand} + +\begin{docCommand}[doc new=2014-09-19]{tcbsetmacrotowidthofnode}{\marg{macro}\marg{node}} + Defines \meta{macro} as the east-to-west dimension of the given \meta{node}. +\end{docCommand} + +\begin{docCommand}[doc new=2014-09-19]{tcbsettoheightofnode}{\marg{register}\marg{node}} + Sets the north-to-south dimension of the given \meta{node} + to the \TeX\ \meta{register}. +\end{docCommand} + +\begin{docCommand}[doc new=2014-09-19]{tcbsetmacrotoheightofnode}{\marg{macro}\marg{node}} + Defines \meta{macro} as the north-to-south dimension of the given \meta{node}. +\end{docCommand} + +\begin{dispExample} +\begin{tikzpicture} + \node[align=center,draw=red,fill=yellow] (A) {This is my\\example node}; + \tcbsetmacrotowidthofnode\mywidth{A} + \tcbsetmacrotoheightofnode\myheight{A} + \path[draw=blue,fill=blue!25!white] ([xshift=2mm]A.south east) + rectangle node{Copy} +(\mywidth,\myheight); +\end{tikzpicture} +\end{dispExample} + 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 88d2ba4385d..8dbd52789e2 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex @@ -275,6 +275,14 @@ Here, we apply a second overlay. Prepends the given \meta{graphical code} to \refKey{/tcb/overlay unbroken and last}. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{overlay first and middle app}{=\meta{graphical code}}{no default} + Appends the given \meta{graphical code} to \refKey{/tcb/overlay first and middle}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-09-19]{overlay first and middle pre}{=\meta{graphical code}}{no default} + Prepends the given \meta{graphical code} to \refKey{/tcb/overlay first and middle}. +\end{docTcbKey} + \clearpage \subsection{Watermarks} @@ -414,6 +422,9 @@ There are no |app| type keys since underlays are stackable by default. Prepends the given \meta{graphical code} to \refKey{/tcb/underlay unbroken and last}. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{underlay first and middle pre}{=\meta{graphical code}}{no default} + Prepends the given \meta{graphical code} to \refKey{/tcb/underlay first and middle}. +\end{docTcbKey} \clearpage @@ -458,6 +469,9 @@ There are no |app| type keys since finishes are stackable by default. Prepends the given \meta{graphical code} to \refKey{/tcb/finish unbroken and last}. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{finish first and middle pre}{=\meta{graphical code}}{no default} + Prepends the given \meta{graphical code} to \refKey{/tcb/finish first and middle}. +\end{docTcbKey} \subsection{Skin Code} 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 c38f60f8d2c..ab92c631692 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex @@ -50,7 +50,7 @@ The real counter name is \texttt{\tcbcounter}. \clearpage \begin{newTcbKey}{use counter from}{=\meta{tcolorbox}}{no default, initially unset} Here, a counter from another \meta{tcolorbox} is reused. -Note that the setting for \refKey{/tcb/new/number format} and +Note that the settings for \refKey{/tcb/new/number format} and \refKey{/tcb/new/number within} are inherited and cannot be changed. The counter value is referenced by \docAuxCommand{thetcbcounter}. @@ -70,7 +70,7 @@ The real counter name is \texttt{\tcbcounter}. \begin{newTcbKey}{use counter}{=\meta{counter}}{no default, initially unset} -Here, an ordinary existing \LaTeX\ counter is used for numbering. +Here, an ordinary existing \LaTeX\ \meta{counter} is used for numbering. With \refKey{/tcb/new/number format} and \refKey{/tcb/new/number within}, the appearance and behavior of the counter can be changed. The counter value is referenced by \docAuxCommand{thetcbcounter}. @@ -91,6 +91,15 @@ The real counter name is \texttt{\tcbcounter}. \end{newTcbKey} +\begin{newTcbKey}[][doc new=2014-09-19]{use counter*}{=\meta{counter}}{no default, initially unset} +An existing \LaTeX\ \meta{counter} is used for numbering. In contrast to +\refKey{/tcb/new/use counter}, the options \refKey{/tcb/new/number format} and +\refKey{/tcb/new/number within} are ignored. Use this for counters which +are already configured outside the |tcolorbox| package, e.\,g.\ the standard +|figure| counter. +\end{newTcbKey} + + \begin{newTcbKey}{no counter}{}{no value, initially set} The created boxes are not numbered. This is the default. The option may be used to overrule a previous option. @@ -182,9 +191,46 @@ With \texttt{varioref}:\\ \Vref*{myreference}, \vref*{myreference}. \end{dispExample} +\clearpage +\begin{newTcbKey}[][doc new=2014-09-19]{blend into}{=\meta{name}}{style, no default, initially unset} +Used to comfortably blend into an existing schema of naming and numbering for +some selected cases. For example, a |tcolorbox| can be used to display +and entitle an image pretending to be a standard |figure| environment. +Here, \refKey{/tcb/title} is used instead of the standard |\caption| +and \refKey{/tcb/list text} can be used instead of the optional parameter +of the standard |\caption|. +Feasible values for \meta{name} are: +\begin{itemize} +\item\docValue{figures}: blend into the standard |figure| environment. +\item\docValue{tables}: blend into the standard |table| environment. +\item\docValue{listings}: blend into the standard |lstlistings| environment + of the package |listings| \cite{heinz:2013a}. + \begin{marker} + Note that |blend into=listings| can only be used in the document content + or, preferably, inside a |\AtBeginDocument| clause! Using it without + |\AtBeginDocument| inside the preamble does not work since the |listings| + packages initializes its counter also inside |\AtBeginDocument|. + \end{marker} +\end{itemize} +\end{newTcbKey} + +\enlargethispage*{5cm} +\begin{dispListing} +\begin{figure}[htb] + \centering\includegraphics[height=4cm]{lichtspiel.jpg} + \caption{A standard figure} +\end{figure} +\newtcolorbox[blend into=figures]{myfigure}[2][]{float=htb,capture=hbox, + title={#2},every float=\centering,#1} + +\begin{myfigure}{A tcolorbox figure} + \includegraphics[height=4cm]{lichtspiel.jpg} +\end{myfigure} +\end{dispListing} +{\tcbusetemp} \clearpage 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 e3eaa60fd02..e2e319848c3 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -823,6 +823,7 @@ But a mixture is possible with the \mylib{hooks} library, see Section \ref{sec:h \end{dispExample} \end{docTcbKey} +\enlargethispage*{1cm} \begin{docTcbKey}{watermark text on}{=\meta{part} is \meta{text}}{no default, initially unset} This option writes some \meta{text} in the center of the interior region of a |tcolorbox| @@ -838,6 +839,7 @@ But a mixture is possible with the \mylib{hooks} library, see Section \ref{sec:h \item\docValue{last}: last parts of a break sequence, \item\docValue{unbroken and first}: unbroken boxes and first parts of a break sequence, \item\docValue{middle and last}: middle and last parts of a break sequence. + \item\docValue{first and middle}: first and middle parts of a break sequence. \end{itemize} \end{docTcbKey} @@ -2125,6 +2127,12 @@ The differences between underlays and overlays are: \refKey{/tcb/underlay} overwrites this key. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{underlay first and middle}{=\meta{graphical code}}{no default, initially unset} + This is an abbreviation for setting + \refKey{/tcb/underlay first} and + \refKey{/tcb/underlay middle} together. + \refKey{/tcb/underlay} overwrites this key. +\end{docTcbKey} \clearpage @@ -2261,6 +2269,13 @@ Finishes are intended for special effects like highlights or glosses or text ove \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-09-19]{finish first and middle}{=\meta{graphical code}}{no default, initially unset} + This is an abbreviation for setting + \refKey{/tcb/finish first} and + \refKey{/tcb/finish middle} together. + \refKey{/tcb/finish} overwrites this key. +\end{docTcbKey} + \clearpage \subsection{Jigsaw Skin Variants}\label{subsec:skinjigsaw} 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 e0d98e5e927..0a261de187f 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex @@ -939,7 +939,7 @@ Let's try a more conservative approach: coltitle=red!50!black,fonttitle=\upshape\bfseries,fontupper=\itshape, drop fuzzy shadow=blue!50!black!50!white,boxrule=0.4pt}{theo} -\begin{YetAnotherTheorem}{Mittelwertsatz f\"{u}r $n$ Variable}{mittelwertsatz_n3}% +\begin{YetAnotherTheorem}{Mittelwertsatz f\"{u}r $n$ Variable}{mittelwertsatz_n4}% Es sei $n\in\mathbb{N}$, $D\subseteq\mathbb{R}^n$ eine offene Menge und $f\in C^{1}(D,\mathbb{R})$. Dann gibt es auf jeder Strecke $[x_0,x]\subset D$ einen Punkt $\xi\in[x_0,x]$, so dass gilt diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf index 0260b9a31a6..e491f7bc7d5 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf differ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index 7a305b322fd..da6e97c717e 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -32,7 +32,7 @@ \usepackage{varwidth,cleveref,incgraph} \usepackage[a4paper,left=2.5cm,right=2.5cm,top=1.5cm,bottom=1.5cm, - marginparsep=5mm,marginparwidth=10mm, + marginparsep=3mm,marginparwidth=18mm, headheight=0mm,headsep=0cm, footskip=1.5cm,includeheadfoot]{geometry} \usepackage{fancyhdr} @@ -103,8 +103,11 @@ \newtcolorbox{marker}[1][]{marker,#1} -\def\version{3.12}% -\def\datum{2014/07/29}% +\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.20}% +\def\datum{2014/09/22}% \makeindex \hypersetup{ @@ -147,9 +150,10 @@ meta,marg, oarg, refCom,refEnv,refKey, - tcbmakedocSubKey, + tcbmakedocSubKey,tcbdocmarginnote,tcbdocnew,tcbdocupdated, % skins tcbline,tcboxedtitleheight,tcboxedtitlewidth, + tcbsettowidthofnode,tcbsetmacrotowidthofnode,tcbsettoheightofnode,tcbsetmacrotoheightofnode, % xparse DeclareTColorBox,NewTColorBox,RenewTColorBox,ProvideTColorBox, DeclareTotalTColorBox,NewTotalTColorBox,RenewTotalTColorBox,ProvideTotalTColorBox, @@ -250,8 +254,7 @@ listing file={\solfile\thetcbcounter},label={exe:#2}, phantom={\writesol{#2}}, title={Exercise \thetcbcounter\hfill\mdseries Solution on page \pageref{sol:#2}}, - list entry={\protect\numberline{\thetcbcounter}Exercise with solution on - page \pageref{sol:#2}},#1} + list text={Exercise with solution on page \pageref{sol:#2}},#1} \end{tcbverbatimwrite} \input{\jobname_preamble_E.tex} @@ -305,7 +308,7 @@ %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.breakable} +%\includeonly{tcolorbox.doc.abstract} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 8aa4f023dfa..3cc9dcea3d3 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -218,7 +218,7 @@ \newif\iftcb@multicol \newif\iftcb@vfillbeforefirst -\def\tcb@drawcolorbox@breakable{% +\def\tcb@prepare@break@operation{% \@ifundefined{columnbreak}{\tcb@multicolfalse}{% \ifnum\doublecol@number>\z@ % \tcb@multicoltrue% @@ -227,7 +227,7 @@ \fi}% \ifx\kvtcb@float\@empty% \kvtcb@beforebox% - \def\kvtcb@beforebox{\nointerlineskip\noindent}% + \def\kvtcb@beforebox{\parskip\z@\nointerlineskip\noindent}% \noindent% applies parskip \vskip\lineskip{\parskip\z@\par\vskip\z@}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list \tcb@break@allowedtrue% @@ -235,13 +235,24 @@ \else% \tcb@break@allowedfalse% \fi% +} + +\def\tcb@height@fill@unbroken{% + \tcb@prepare@break@operation% + \tcb@breakat@init% + \tcb@comp@h@page% + \tcbset{height=\tcb@h@page}% +} + +\def\tcb@drawcolorbox@breakable{% + \tcb@prepare@break@operation% \let\tcb@after@lastbox=\kvtcb@afterbox% \let\kvtcb@afterbox=\@empty% \begingroup% - \parskip0pt% - \parindent0pt% - \lineskip0pt% - \topskip0pt% + \parskip\z@% + \parindent\z@% + \lineskip\z@% + \topskip\z@% \tcb@split@start% \endgroup% \ifx\kvtcb@float\@empty% @@ -373,7 +384,7 @@ \fi% \let\tcb@after@last=\par% \else% - \edef\tcb@before@first{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]}% + \edef\tcb@before@first{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]\noexpand\kvtcb@everyfloat}% \let\tcb@before@middle=\tcb@before@first% \let\tcb@before@last=\tcb@before@first% \let\tcb@after@first=\tcb@float@env@end% @@ -720,7 +731,7 @@ bottomsep at break/.store in=\kvtcb@bottomsep,% pad before break/.code={\let\kvtcb@bottom@rule@break=\tcb@zpt% \tcbdimto\kvtcb@bottomsep{#1-\kvtcb@bottom-\kvtcb@boxsep}},% - pad before break*/.style={pad before break,% + pad before break*/.style={pad before break={#1},% code={\tcbdimto\tcb@temp{\kvtcb@bottom@rule@stand-\kvtcb@bottomsep}% \ifdim\tcb@temp>0pt\relax% \tcbdimto\kvtcb@enlargepage@flex{\kvtcb@enlargepage@flex+\tcb@temp}\fi}},% @@ -761,6 +772,8 @@ \let\tcb@break@ch@middle=\tcb@break@ch@fixed% \let\tcb@break@ch@last=\tcb@break@ch@fixed},% vfill before first/.is if=tcb@vfillbeforefirst,% + height fill/true/.code={\let\tcb@height@adjust\tcb@height@fill@unbroken},% + height fill/.default=true,% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index e409e62f9e4..badf3f59411 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,9 +17,9 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.12} +\tcb@set@library@version{3.20} -\tcbuselibrary{listings,skins} +\tcbuselibrary{listings,skins,xparse} \RequirePackage{doc}[2010/02/04] \RequirePackage{pifont}[2005/04/12] @@ -27,6 +27,7 @@ \ifdefined\printindex\else\RequirePackage{makeidx}[2000/03/29]\fi \RequirePackage{refcount}[2011/10/16] \RequirePackage{hyperref}[2012/02/06] +\ifdefined\marginnote\else\RequirePackage{marginnote}[2012/03/29]\fi \definecolor{Option}{rgb}{0.118,0.546,0.222} \definecolor{Definition}{rgb}{0.784,0.06,0.176} @@ -75,7 +76,9 @@ key/.store in=\kvtcb@text@key, keys/.store in=\kvtcb@text@keys, index/.store in=\kvtcb@text@index, + new/.store in=\kvtcb@text@new, pageshort/.store in=\kvtcb@text@pageshort, + updated/.store in=\kvtcb@text@updated, value/.store in=\kvtcb@text@value, values/.store in=\kvtcb@text@values, } @@ -113,6 +116,10 @@ doc head/.style={doc head command={#1},doc head environment={#1},doc head key={#1}}, doc description/.store in=\kvtcb@doc@description,% doc into index/.is if=tcb@doc@toindex,% + doc updated/.style={before upper={\tcbdocmarginnote{\tcbdocupdated{#1}}}}, + doc new/.style={before upper={\tcbdocmarginnote{\tcbdocnew{#1}}}}, + doc new and updated/.style 2 args={before upper={\tcbdocmarginnote{\tcbdocnew{#1}\\\tcbdocupdated{#2}}}}, + doc marginnote/.style={doc@marginnote/.style={#1}}, } @@ -129,7 +136,9 @@ environment=environment,environments=Environments, key=key,keys=Keys, index=Index, + new=New, pageshort={P.}, + updated=Updated, value=value,values=Values}}, } @@ -240,7 +249,7 @@ \begin{tcb@doc@head}{doc@head@command}% \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\cs{#2}}\label{com:#2}{\ttfamily #3}% \tcb@doc@do@description% - \end{tcb@doc@head}}% + \end{tcb@doc@head}\tcbset{before upper=}}% {\end{tcb@manual@entry}} \newenvironment{docCommand*}{\bgroup\tcb@doc@toindexfalse\begin{docCommand}}{\end{docCommand}\egroup} @@ -252,28 +261,28 @@ \strut~~\meta{\kvtcb@text@envcontent}\par% \strut\cs{end}\brackets{\tcb@Print@Env{#2}}% \tcb@doc@do@description% - \end{tcb@doc@head}}% + \end{tcb@doc@head}\tcbset{before upper=}}% {\end{tcb@manual@entry}} \newenvironment{docEnvironment*}{\bgroup\tcb@doc@toindexfalse\begin{docEnvironment}}{\end{docEnvironment}\egroup} -\newenvironment{docKey}[4][\@empty]{\begin{tcb@manual@entry}% - \tcbset{doc description={#4}}% +\NewDocumentEnvironment{docKey}{ O{\@empty} +O{} m m +m }{\tcbset{#2,doc description={#5}}% + \begin{tcb@manual@entry}% \begin{tcb@doc@head}{doc@head@key}% - \ifx#1\@empty% - \tcb@Print@Key{#2}\tcb@index@Key{#2}\protected@edef\@currentlabel{#2}\label{key:#2}{\ttfamily #3}% - \else\tcb@Print@Key{/#1/#2}\tcb@index@KeyPath{#1}{#2}\protected@edef\@currentlabel{/#1/#2}\label{key:/#1/#2}{\ttfamily #3}% - \fi% + \def\temp@a{#1}\ifx\temp@a\@empty% + \tcb@Print@Key{#3}\tcb@index@Key{#3}\protected@edef\@currentlabel{#3}\label{key:#2}{\ttfamily #4}% + \else\tcb@Print@Key{/#1/#3}\tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/#3}{\ttfamily #4}\fi% \tcb@doc@do@description% - \end{tcb@doc@head}}% + \end{tcb@doc@head}\tcbset{before upper=}}% {\end{tcb@manual@entry}} \newenvironment{docKey*}{\bgroup\tcb@doc@toindexfalse\begin{docKey}}{\end{docKey}\egroup} \def\tcbmakedocSubKey#1#2{% - \newenvironment{#1}[4][\@empty]{% - \ifx##1\@empty\def\tcb@key@path{#2}\else\def\tcb@key@path{#2/##1}\fi% - \begin{docKey}[\tcb@key@path]{##2}{##3}{##4}}% + \NewDocumentEnvironment{#1}{ O{} +O{} m m +m }{% + \def\temp@a{##1}\ifx\temp@a\@empty% + \def\tcb@key@path{#2}\else\def\tcb@key@path{#2/##1}\fi% + \begin{docKey}[\tcb@key@path][##2]{##3}{##4}{##5}}% {\end{docKey}}% \newenvironment{#1*}{\bgroup\tcb@doc@toindexfalse\begin{#1}}{\end{#1}\egroup}% } @@ -286,15 +295,15 @@ \def\docAuxEnvironment@star#1{\tcb@Print@Env{#1}}% \def\docAuxEnvironment{\@ifstar\docAuxEnvironment@star\docAuxEnvironment@} -\newcommand{\docAuxKey@}[2][\@empty]{% - \ifx#1\@empty% +\newcommand{\docAuxKey@}[2][]{% + \def\temp@a{#1}\ifx\temp@a\@empty% \tcb@Print@Key{#2}\tcb@index@Key{#2}% \else% \tcb@Print@Key{/#1/#2}\tcb@index@KeyPath{#1}{#2}% \fi}% -\newcommand{\docAuxKey@star}[2][\@empty]{% - \ifx#1\@empty% +\newcommand{\docAuxKey@star}[2][]{% + \def\temp@a{#1}\ifx\temp@a\@empty% \tcb@Print@Key{#2}% \else% \tcb@Print@Key{/#1/#2}% @@ -336,6 +345,17 @@ \item\relax\footnotesize} {\endlist} +\newcommand{\tcbdocmarginnote}[2][]{ + \marginnote{% + \begin{tcolorbox}[enhanced jigsaw,size=fbox,boxrule=1pt,leftrule=0pt,rightrule=0pt, + arc=0pt,outer arc=1pt,boxsep=1pt,top=1pt,bottom=1pt, + nobeforeafter,width=\marginparwidth, + colframe=red!50!white,colback=red!25!yellow!5!white,fontupper=\scriptsize,before upper=\flushright, + doc@marginnote,#1]#2\end{tcolorbox}}} + +\newcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1} +\newcommand*{\tcbdocupdated}[1]{\kvtcb@text@updated: #1} + %--- index macros taken from pgfmanual-en-macros \def\tcb@doc@index@pgf@{% \c@IndexColumns=2% @@ -398,6 +418,7 @@ doc into index=true, index colorize=false, index annotate=true, + doc marginnote=, }, initialize@reset=reset@documentation, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index e0603ede7da..1bdc416c4e5 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index c1dfbfa8c90..f7a67861239 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% @@ -59,6 +59,8 @@ overlay unbroken and last pre/.style={overlay unbroken pre={#1},overlay last pre={#1}},% overlay middle and last app/.style={overlay middle app={#1},overlay last app={#1}},% overlay middle and last pre/.style={overlay middle pre={#1},overlay last pre={#1}},% + overlay first and middle app/.style={overlay first app={#1},overlay middle app={#1}},% + overlay first and middle pre/.style={overlay first pre={#1},overlay middle pre={#1}},% % % skins: frame code app/.code={\appto\tcb@frame@code{#1}},% @@ -82,6 +84,7 @@ underlay unbroken and first pre/.style={underlay unbroken pre={#1},underlay first pre={#1}},% underlay unbroken and last pre/.style={underlay unbroken pre={#1},underlay last pre={#1}},% underlay middle and last pre/.style={underlay middle pre={#1},underlay last pre={#1}},% + underlay first and middle pre/.style={underlay first pre={#1},underlay middle pre={#1}},% finish unbroken pre/.code={\preto\tcb@finish@unbroken{#1}},% finish first pre/.code={\preto\tcb@finish@first{#1}},% finish middle pre/.code={\preto\tcb@finish@middle{#1}},% @@ -91,6 +94,7 @@ finish unbroken and first pre/.style={finish unbroken pre={#1},finish first pre={#1}},% finish unbroken and last pre/.style={finish unbroken pre={#1},finish last pre={#1}},% finish middle and last pre/.style={finish middle pre={#1},finish last pre={#1}},% + finish first and middle pre/.style={finish first pre={#1},finish middle pre={#1}},% % watermark tikz app/.style={overlay app={\tcb@drawspec@watermark@tikz{#1}}}, watermark tikz pre/.style={overlay pre={\tcb@drawspec@watermark@tikz{#1}}}, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index ed80e9828bb..7169de937dc 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 8fbf0e8989c..53b86a534cc 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 f52492e9c79..9754221198b 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 2950b0ccc05..56574f31d1a 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 c20c9d9785c..4ab546e513c 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \RequirePackage{tikz}[2010/10/13] @@ -44,6 +44,30 @@ \end{scope}% } +\def\tcbsettowidthofnode#1#2{% + \pgfpointanchor{#2}{east}\unskip% + #1\pgf@x% + \pgfpointanchor{#2}{west}\unskip% + \advance #1 by -\pgf@x\relax% +} + +\def\tcbsetmacrotowidthofnode#1#2{% + \tcbsettowidthofnode\pgf@xa{#2}% + \edef#1{\the\pgf@xa}% +} + +\def\tcbsettoheightofnode#1#2{% + \pgfpointanchor{#2}{north}\unskip% + #1\pgf@y% + \pgfpointanchor{#2}{south}\unskip% + \advance #1 by -\pgf@y\relax% +} + +\def\tcbsetmacrotoheightofnode#1#2{% + \tcbsettoheightofnode\pgf@ya{#2}% + \edef#1{\the\pgf@ya}% +} + \def\tcb@spec#1{\tikzset{tcb@spec/.style={#1}}} \def\tcb@gettikzxy#1#2#3{% @@ -897,6 +921,7 @@ underlay unbroken and first/.style={underlay unbroken={#1},underlay first={#1}},% underlay unbroken and last/.style={underlay unbroken={#1},underlay last={#1}},% underlay middle and last/.style={underlay middle={#1},underlay last={#1}},% + underlay first and middle/.style={underlay first={#1},underlay middle={#1}},% no underlay unbroken/.code={\let\tcb@underlay@unbroken\@empty},% no underlay first/.code={\let\tcb@underlay@first\@empty},% no underlay middle/.code={\let\tcb@underlay@middle\@empty},% @@ -912,6 +937,7 @@ finish unbroken and first/.style={finish unbroken={#1},finish first={#1}},% finish unbroken and last/.style={finish unbroken={#1},finish last={#1}},% finish middle and last/.style={finish middle={#1},finish last={#1}},% + finish first and middle/.style={finish first={#1},finish middle={#1}},% no finish unbroken/.code={\let\tcb@finish@unbroken\@empty},% no finish first/.code={\let\tcb@finish@first\@empty},% no finish middle/.code={\let\tcb@finish@middle\@empty},% @@ -971,8 +997,8 @@ \let\tcb@trans@colframe\kvtcb@colframe% \let\tcb@trans@colback\kvtcb@colbacktitle% \let\tcb@trans@boxedstyle\kvtcb@style@boxedtitle% - \setbox\tcb@titlebox\hbox{\bgroup\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup}% - \setbox\tcb@titlebox\hbox{\tcbox[colframe=\tcb@trans@colframe,colback=\tcb@trans@colback,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}}% + \setbox\tcb@titlebox\color@hbox\bgroup\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox% + \setbox\tcb@titlebox\color@hbox\tcbox[colframe=\tcb@trans@colframe,colback=\tcb@trans@colback,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox% % \tcbdimto\tcboxedtitleheight{\ht\tcb@titlebox+\dp\tcb@titlebox}% \tcbdimto\tcboxedtitlewidth{\wd\tcb@titlebox}% @@ -1043,12 +1069,12 @@ } \def\tcb@drawspec@watermark@tikz#1{% - \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\pgfsetbaseline{0pt}\begin{tikzpicture}[color=\kvtcb@watermark@color]#1\end{tikzpicture}}\endpgfinterruptpicture}% + \setbox\tcb@waterbox=\color@hbox\pgfinterruptpicture{\pgfsetbaseline{0pt}\begin{tikzpicture}[color=\kvtcb@watermark@color]#1\end{tikzpicture}}\endpgfinterruptpicture\color@endbox% \tcb@drawspec@watermark% } \def\tcb@drawspec@watermark@graphics#1{% - \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\includegraphics{#1}}\endpgfinterruptpicture}% + \setbox\tcb@waterbox=\color@hbox\pgfinterruptpicture{\includegraphics{#1}}\endpgfinterruptpicture\color@endbox% \tcb@drawspec@watermark% } @@ -1118,11 +1144,11 @@ } \def\tcb@set@waterbox@to@graphics#1{% - \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options]{#1}}\endpgfinterruptpicture}% + \setbox\tcb@waterbox=\color@hbox\pgfinterruptpicture{\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options]{#1}}\endpgfinterruptpicture\color@endbox% } \def\tcb@set@waterbox@to@picture#1{% - \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\pgfsetbaseline{0pt}\begin{tikzpicture}#1\end{tikzpicture}}\endpgfinterruptpicture}% + \setbox\tcb@waterbox=\color@hbox\pgfinterruptpicture{\pgfsetbaseline{0pt}\begin{tikzpicture}#1\end{tikzpicture}}\endpgfinterruptpicture\color@endbox% } \tikzset{% @@ -1195,7 +1221,7 @@ fill tile image/.style={fill@tile={\tcb@set@waterbox@to@graphics{#1}}},% fill tile picture/.style={fill@tile={\tcb@set@waterbox@to@picture{#1}}},% fill tile picture*/.style 2 args={fill@tile={\tcb@set@waterbox@to@picture{#2}% - \setbox\tcb@waterbox=\hbox{\scalebox{#1}{\box\tcb@waterbox}}}},% + \setbox\tcb@waterbox=\color@hbox\scalebox{#1}{\box\tcb@waterbox}\color@endbox}},% % fill plain image*/.style 2 args={fill image options={#1},fill plain image={#2}},% fill stretch image*/.style 2 args={fill image options={#1},fill stretch image={#2}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index ffba3c635f0..5253c506a43 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 005715b58db..ebae94f0781 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \RequirePackage{amsmath} @@ -31,7 +31,7 @@ \def\tcb@theo@desc@form@std#1{\tcb@desc@col\kvtcb@desc@font\kvtcb@desc@delim@left#1\kvtcb@desc@delim@right} \def\tcb@theo@title#1#2#3{% - \ifdefempty{#2}{\setbox\z@=\hbox{#1}}{\setbox\z@=\tcb@theo@form{#1}{#2}}% + \ifdefempty{#2}{\setbox\z@=\color@hbox#1\color@endbox}{\setbox\z@=\tcb@theo@form{#1}{#2}}% \def\temp@a{#3}% \ifx\temp@a\@empty\relax% \unhbox\z@\kvtcb@terminatorsign% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 1507a58e0b2..0f28592d610 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 7ec9b8061a3..4791a3c546f 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/07/29 version 3.12 text color boxes] -\def\tcb@version{3.12} +\ProvidesPackage{tcolorbox}[2014/09/22 version 3.20 text color boxes] +\def\tcb@version{3.20} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -201,6 +201,7 @@ float/.default=\kvtcb@floatplacement, float*/.code={\def\kvtcb@float{#1}\def\tcb@float@env@begin{\@dblfloat}\def\tcb@float@env@end{\end@dblfloat}}, float*/.default=\kvtcb@floatplacement, + every float/.store in=\kvtcb@everyfloat,% nofloat/.style={float=}, before/.code={\def\kvtcb@beforebox{#1}\let\tcb@use@autoparskip=\relax}, after/.code={\def\kvtcb@afterbox{#1}\let\tcb@use@autoparskip=\relax}, @@ -216,6 +217,8 @@ height/.code={\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed}, height plus/.dimstore in=\kvtcb@height@fixed@plus,% height from/.style args={#1 to #2}{height={#1},height plus={#2-#1}},% + height fill/.is choice,% + height fill/false/.code={\let\tcb@height@adjust\@empty},% equal height group/.code={\edef\tcb@ehgid{#1}\let\tcb@ch=\tcb@ch@equalheight}, minimum for equal height group/.code args={#1:#2}{\edef\tcb@ehgid{#1}\tcb@ehgadd{#2}}, space/.code={\def\tcb@height@fraction{#1}\let\tcb@ch@fixed@both=\tcb@ch@fixed@space}, @@ -326,6 +329,9 @@ overlay middle and last/.code={\def\tcb@overlay@temp{#1}% \let\tcb@overlay@middle=\tcb@overlay@temp% \let\tcb@overlay@last=\tcb@overlay@temp},% + overlay first and middle/.code={\def\tcb@overlay@temp{#1}% + \let\tcb@overlay@first=\tcb@overlay@temp% + \let\tcb@overlay@middle=\tcb@overlay@temp},% no overlay/.style={overlay=},% standard/.style={skin=standard},% standard jigsaw/.style={skin=standard jigsaw},% @@ -368,8 +374,8 @@ tcbox raise/.style={baseline=-#1},% tcbox raise base/.style={baseline=\tcb@val@raisebase},% shrink tight/.style={boxsep=0mm,top=-\kvtcb@top@rule@stand,bottom=-\kvtcb@bottom@rule@stand,left=-\kvtcb@left@rule,right=-\kvtcb@right@rule},% - extrude left by/.code={\tcbdimto\kvtcb@leftupper{\kvtcb@leftupper+#1}\tcbdimto\kvtcb@bbleft{\kvtcb@bbleft-#1}},% - extrude right by/.code={\tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+#1}\tcbdimto\kvtcb@bbright{\kvtcb@bbright-#1}},% + extrude left by/.code={\tcbdimto\kvtcb@leftupper{\kvtcb@leftupper+#1}\tcbdimto\kvtcb@bbleft{\kvtcb@bbleft-#1}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},% + extrude right by/.code={\tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+#1}\tcbdimto\kvtcb@bbright{\kvtcb@bbright-#1}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},% extrude top by/.code={\tcbdimto\kvtcb@top{\kvtcb@top+#1}\tcbdimto\kvtcb@bbtop@stand{\kvtcb@bbtop@stand-#1}},% extrude bottom by/.code={\tcbdimto\kvtcb@bottom{\kvtcb@bottom+#1}\tcbdimto\kvtcb@bbbottom@stand{\kvtcb@bbbottom@stand-#1}},% extrude by/.style={extrude left by=#1,extrude right by=#1,extrude top by=#1,extrude bottom by=#1},% @@ -415,6 +421,7 @@ lower separated/.is if=tcb@lowerseparated, options@for/.code={\letcs\tcb@new@colop{tcb@opt@#1}\pgfkeysalsofrom\tcb@new@colop}, list entry/.store in=\kvtcb@listentry, + list text/.style={list entry={\protect\numberline{\thetcbcounter}{\ignorespaces #1}}}, title filled/.is if=tcb@titlefilled,% @colbacktitle/.store in=\kvtcb@colbacktitle, colbacktitle/.style={title filled,@colbacktitle={#1}}, @@ -654,7 +661,7 @@ \long\def\tcb@@icolorbox[#1]{% \tcb@layer@inc% - \tcbset{capture=minipage,#1}\tcb@afteroptions@hook% + \tcbset{capture=minipage,#1}\tcb@height@adjust\tcb@afteroptions@hook% \tcb@hasLowerfalse% \csname tcb@@capture@\kvtcb@capture\endcsname% } @@ -1106,7 +1113,7 @@ \let\tcb@before@unbroken=\kvtcb@beforebox% \let\tcb@after@unbroken=\kvtcb@afterbox% \else% - \edef\tcb@before@unbroken{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]}% + \edef\tcb@before@unbroken{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]\noexpand\kvtcb@everyfloat}% \let\tcb@after@unbroken=\tcb@float@env@end% \fi% \setcounter{tcbbreakpart}{1}% @@ -1173,7 +1180,7 @@ \long\def\tcb@ox#1#2{% \begingroup% \tcb@layer@inc% - \tcbset{#1}\tcb@afteroptions@hook% + \tcbset{#1}\tcb@height@adjust\tcb@afteroptions@hook% \csname tcbox@inner@\kvtcb@capture\endcsname{#2}% \tcb@layer@dec% \endgroup% @@ -1186,7 +1193,8 @@ \tcbset{% new/.cd,% - use counter/.code={\def\kvtcb@new@counter{#1}\let\tcb@proc@counter=\tcb@proc@counter@use}, + use counter/.code={\edef\kvtcb@new@counter{#1}\let\tcb@proc@counter=\tcb@proc@counter@use}, + use counter*/.code={\edef\kvtcb@new@counter{#1}\let\tcb@proc@counter=\tcb@proc@counter@from}, auto counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@auto}, use counter from/.code={\edef\kvtcb@new@counter{\csname tcb@cnt@#1\endcsname}\let\tcb@proc@counter=\tcb@proc@counter@from}, no counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@no}, @@ -1202,6 +1210,11 @@ crefname/.code 2 args={\appto\kvtcb@init@hook{\crefname{\tcbcounter}{#1}{#2}}}, Crefname/.code 2 args={\appto\kvtcb@init@hook{\Crefname{\tcbcounter}{#1}{#2}}}, % + blend into/.is choice,% + blend into/figures/.style={use counter*=figure,list inside=lof,/tcb/code={\appto\tcb@new@colopt{,before title={\fnum@figure:\ }}}},% + blend into/tables/.style={use counter*=table,list inside=lot,/tcb/code={\appto\tcb@new@colopt{,before title={\fnum@table:\ }}}},% + blend into/listings/.style={use counter*=lstlisting,list inside=lol,/tcb/code={\appto\tcb@new@colopt{,before title={\lstlistingname~\thetcbcounter:\ }}}},% + % reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,list inside=,list type=tcolorbox,init@hook@clear}, } @@ -1339,9 +1352,13 @@ \def\tcb@addcontentsline#1#2{% \ifx\kvtcb@listentry\@empty% \ifx\kvtcb@title\@empty% - \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}\kvtcb@savedelimiter}% + \ifx\tcbtitletext\@empty% + \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}{\ignorespaces\kvtcb@savedelimiter}}% + \else% + \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}{\ignorespaces\tcbtitletext}}% + \fi% \else% - \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}\kvtcb@title}% + \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}{\ignorespaces\kvtcb@title}}% \fi% \else% \addcontentsline{#1}{#2}{\kvtcb@listentry}% @@ -1424,7 +1441,8 @@ \tcbset{% initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},% reset/.code={\tcb@reset},% - reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@}, + reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@% + \let\tcb@afteroptions@hook\@empty}, width=\linewidth,autoparskip, natural height,height plus=0pt,space to lower,valign=top,valign lower=top, size=normal,rounded corners, @@ -1440,7 +1458,7 @@ lefthand ratio=0.5,check odd page=false,nophantom, shield externalize=false,list entry=,no label type, opacityupper=1.0,opacitylower=1.0,opacitytitle=1.0,opacityframe=1.0,opacityback=1.0,@opacitybacktitle=1.0, - title filled=false + title filled=false,every float=,height fill=false, }, initialize@reset=reset@core, } -- cgit v1.2.3