From 386b0766bf3d980ab3b41391fb0ee0171982bd39 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Jun 2014 15:10:50 +0000 Subject: tcolorbox (28may14) git-svn-id: svn://tug.org/texlive/trunk@34406 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tcolorbox/CHANGES | 11 ++- Master/texmf-dist/doc/latex/tcolorbox/README | 2 +- .../doc/latex/tcolorbox/tcolorbox-example.pdf | Bin 361334 -> 361329 bytes .../doc/latex/tcolorbox/tcolorbox-example.tex | 2 +- .../doc/latex/tcolorbox/tcolorbox.doc.abstract.tex | 4 +- .../latex/tcolorbox/tcolorbox.doc.breakable.tex | 32 ++++-- .../doc/latex/tcolorbox/tcolorbox.doc.skins.tex | 85 +++++++++++++++- .../texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf | Bin 4298125 -> 4326972 bytes .../texmf-dist/doc/latex/tcolorbox/tcolorbox.tex | 12 ++- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 8 +- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 4 +- .../tex/latex/tcolorbox/tcbfitting.code.tex | 4 +- .../tex/latex/tcolorbox/tcbhooks.code.tex | 4 +- .../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 | 9 +- .../tex/latex/tcolorbox/tcbskins.code.tex | 107 +++++++++++++++------ .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 4 +- .../tex/latex/tcolorbox/tcbxparse.code.tex | 4 +- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 20 ++-- 22 files changed, 253 insertions(+), 75 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 1f12bd7f91a..520bd9032f7 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm @@ -536,3 +536,12 @@ version 3.04 (2014/05/18) * new keys 'underlay boxed title', 'no underlay boxed title', 'underlay boxed title pre' * documentation example updated +version 3.05 (2014/05/28) +- compatibility fix for the upcoming version 2.0 of the package minted +- inner boxes are enforced to be unbreakable now +- library 'breakable': + new key 'enforce breakable' (for breaking inner boxed deliberately) +- library 'skins': + * new options: + 'lifted shadow', 'drop small lifted shadow', 'drop lifted shadow', 'drop large lifted shadow' + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 52531fedecd..0eb00c4bbde 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% %% ------------------------------------------------------------------------------------------- %% 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 380293fe52d..77df64b9536 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 a1e29da8a7f..18a1561d335 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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 b1ca770328c..b447e3530fb 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex @@ -40,7 +40,9 @@ cover page. Printing the pages starting with page 2 or page 3 should work. \clearpage \begin{center} \begin{tcolorbox}[enhanced,hbox,tikznode,left=8mm,right=8mm,boxrule=0.4pt, - colback=white,colframe=black!50!yellow,drop fuzzy midday shadow=black!50!yellow, + colback=white,colframe=black!50!yellow, + %drop fuzzy midday shadow=black!50!yellow, + drop lifted shadow=black!50!yellow, before=\par\vspace*{5mm},after=\par\bigskip] {\bfseries\LARGE The \texttt{tcolorbox} package}\\[3mm] {\large Manual for version \version\ (\datum)} 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 1fca8ae8497..ba0467b34c1 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -87,12 +87,17 @@ parameters. The differences are: restricted capacity. Therefore, you cannot place hundreds of pages inside a |tcolorbox|. \item You can nest an unbreakable |tcolorbox| inside another |tcolorbox|, - even inside a breakable one. But you should not nest a breakable box - inside a breakable box since this will give a mess. Inside a breakable box, - the further breaking is disabled by default. If you really want to or - have to use the keys \refKey{/tcb/breakable} or \refKey{/tcb/unbreakable} - inside the content of an outer |tcolorbox|, you have to guard this with a - \TeX\ group. + even inside a breakable one. + But you cannot not nest a breakable box inside a breakable box. + The \refKey{/tcb/breakable} key for a nested box is ignored + automatically\footnote{Until |tcolorbox| 3.04, the \refKey{/tcb/breakable} key + was not ignored for nested boxes.}, i.\,e.\ inner + boxes are always unbreakable.\par + After all, in the unlikely case you really want to have the nested box to be breakable, + use \refKey{/tcb/enforce breakable} for the nested + box\footnote{ \refKey{/tcb/enforce breakable} acts like \refKey{/tcb/breakable} until |tcolorbox| 3.04.}. + \textbf{But, a breakable box inside a breakable box will usually give a mess.} + \item If your text content contains some text color changing commands, your color will not survive the break to the next box. \end{itemize} @@ -100,7 +105,7 @@ parameters. The differences are: \clearpage \subsection{Main Option Keys} -\begin{docTcbKey}{breakable}{}{no value} +\begin{docTcbKey}{breakable}{\colOpt{=true\textbar false}}{default |true|, initially |false|} Allows the |tcolorbox| to be breakable. If the box is larger than the available space at the current page, the box is automatically broken and continued to the next next page. All sorts of |tcolorbox| can be made @@ -127,6 +132,17 @@ parameters. The differences are: \end{docTcbKey} +\begin{docTcbKey}{enforce breakable}{}{no value} + A |tcolorbox| inside a |tcolorbox| is automatically set to be unbreakable. + Using \refKey{/tcb/breakable} on such an inner box has no effect. + If one \emph{really} wants the inner box to be breakable, use \refKey{/tcb/enforce breakable}. + \textbf{This will usually give a mess of shattered boxes. You are advised to not use this option.}\\ + Note that \refKey{/tcb/enforce breakable} has the functionality + that \refKey{/tcb/breakable} had until package version 3.04 + and exists for backward compatibility. +\end{docTcbKey} + + \begin{docTcbKey}{title after break}{=\meta{text}}{no default, initially empty} The \refKey{/tcb/title} is used only for the \emph{first} part of a \emph{break sequence}. Use |title after break| to create a heading line @@ -149,7 +165,7 @@ parameters. The differences are: the lower box part are placed before a break happens. \end{docTcbKey} - +\clearpage \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 one to enlarge (or shrink) partial boxes. The first \meta{length} is applied 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 ac7c378897b..c7830b43597 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -1399,7 +1399,7 @@ This is a tcolorbox. \clearpage \begin{docTcbKey}{fuzzy shadow}{=\marg{xshift}\marg{yshift}\marg{offset}\marg{step}\marg{options}}{no default} Adds a new fuzzy shadow to the stack of shadows. Actually, this option - adds seversal shadows which appear like a shadow with a fuzzy border. + adds several shadows which appear like a shadow with a fuzzy border. This fuzzy shadow is follows the outline of the |tcolorbox| but is shifted by \meta{xshift} and \meta{yshift}. The \meta{offset} value is a distance value from the frame outline. A positive \meta{offset} value shrinks the shadow @@ -1754,6 +1754,89 @@ equivalent to the preceding examples. \end{docTcbKey}% +\clearpage +\begin{docTcbKey}{lifted shadow}{=\marg{xshift}\marg{yshift}\marg{bend}\marg{step}\marg{options}}{no default} + Adds a new lifted shadow to the stack of shadows. Actually, this option + adds several shadows which appear like a shadow with a fuzzy border. + This lifted shadow is follows the outline of the |tcolorbox| but is shifted by + \meta{xshift} and \meta{yshift} on the lower left corner and by + $-$\meta{xshift} and \meta{yshift} on the lower right corner. + Additionally, there is a \meta{bend} in the middle. + The \marg{step} value describes a shrink + offset used for the combination of the partial shadows. + The shadow is filled along a \tikzname\ path with the given \tikzname\ \meta{options} but + any |opacity| value will be ignored. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\tcbset{enhanced,colback=red!5!white, + boxrule=0.1pt, + colframe=red!75!black,fonttitle=\bfseries} + +\begin{tcolorbox}[title=My own shadow, + lifted shadow={1mm}{-2mm}{3mm}{0.1mm}% + {black!50!white}] +This is a tcolorbox. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\begin{docTcbKey}{drop lifted shadow}{\colOpt{=\meta{color}}}{style, default |black!50!white|} + Adds a new lifted shadow with standard dimensions to the stack of shadows. + Optionally, the \meta{color} for the shadow can be changed. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\tcbset{enhanced,colback=red!5!white, + boxrule=0.4pt,arc=0pt,outer arc=0pt, + colframe=red!75!black,fonttitle=\bfseries} + +\begin{tcolorbox}[drop lifted shadow] +This is a tcolorbox. +\end{tcolorbox}\par\bigskip +\begin{tcolorbox}[title=Another shadow, + drop lifted shadow=blue] +This is a tcolorbox. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + + +\begin{docTcbKey}{drop small lifted shadow}{\colOpt{=\meta{color}}}{style, default |black!50!white|} + Adds a new small lifted shadow with standard dimensions to the stack of shadows. + Optionally, the \meta{color} for the shadow can be changed. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\tcbset{enhanced,colback=red!5!white, + boxrule=0.4pt,arc=0pt,outer arc=0pt, + colframe=red!75!black,fonttitle=\bfseries} + +\tcbox[drop small lifted shadow,size=fbox] + {This is a tcolorbox.} +\par\bigskip +\begin{tcolorbox}[title=Another shadow, + drop small lifted shadow=black] +This is a tcolorbox. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + + +\clearpage +\begin{docTcbKey}{drop large lifted shadow}{\colOpt{=\meta{color}}}{style, default |black!50!white|} + Adds a new large lifted shadow with standard dimensions to the stack of shadows. + Optionally, the \meta{color} for the shadow can be changed. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\tcbset{enhanced,colback=red!5!white, + colframe=red!75!black,fonttitle=\bfseries} + +\begin{tcolorbox}[drop large lifted shadow] +This is a tcolorbox. +\end{tcolorbox}\par\bigskip +\begin{tcolorbox}[title=Another shadow, + drop large lifted shadow=blue] +This is a tcolorbox. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + + + \clearpage \subsection{\tikzname\ Picture Option Keys}\label{subsec:tikzpicture} The following general options are applicable for skins which diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf index cc559935619..298363bc1a5 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 2f63cd63b0c..dfb3185c97b 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -61,6 +61,8 @@ \usepackage{lipsum} \usepackage{empheq} +%\usepackage[cache]{minted}% minted 2.0 + \usepackage{changepage} \strictpagecheck @@ -100,8 +102,8 @@ \newtcolorbox{marker}[1][]{marker,#1} -\def\version{3.04}% -\def\datum{2014/05/18}% +\def\version{3.05}% +\def\datum{2014/05/28}% \makeindex \hypersetup{ @@ -165,7 +167,7 @@ \tcbset{documentation listing style=mydocumentation,% sbs/.style={sidebyside,before lower app={\tcbset{sidebyside=false}}},% innerbox/.style={reset,documentation listing style=mydocumentation, - docexample/.style={docexample original}%,listing engine=minted,documentation minted style=perldoc, + docexample/.style={docexample original},%listing engine=minted,documentation minted style=manni,documentation minted options={tabsize=2,fontsize=\footnotesize}, }, base example/.style={bicolor, colframe=Navy!50!ExampleFrame,colback=Navy!5!ExampleBack,fontlower=\footnotesize, @@ -302,7 +304,7 @@ %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.skins} +%\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 22b7f4d7993..e020d19ac07 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -556,6 +556,10 @@ breakable/.style={breakable@#1}, breakable/.default=true,% unbreakable/.style={breakable=false},% + enforce breakable/.code={% + \let\tcb@savebox=\tcb@vbox% + \let\endtcb@savebox=\endtcb@vbox% + \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable}, title after break/.store in=\kvtcb@followingtitle,% notitle after break/.style={title after break=},% adjusted title after break/.style={title after break={#1\vphantom{\kvtcb@adjusttext}}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 1d1f1397f33..062dbf971f8 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.04} +\tcb@set@library@version{3.05} \tcbuselibrary{listings,skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 18c04aaaf84..27789460801 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \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 d0ebfb12c9c..90e48e2a386 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \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 061c3d7a2b0..f43baa7826b 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \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 63713ac5477..ccbe190ca24 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \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 3b3d2ca715f..a17c1807983 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \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 6a2af63f945..bc1f0b9b900 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \RequirePackage{minted}[2011/09/17] @@ -28,7 +28,10 @@ \edef\temp@a{#4}% \ifx\temp@a\@empty% \else - \usemintedstyle{\temp@a}% + %\usemintedstyle{\temp@a}% + \toks@=\expandafter{#4}% + \edef\tcb@temp{\noexpand\usemintedstyle{\the\toks@}}% + \tcb@temp% \fi% \toks@=\expandafter{#1}% \edef\tcb@temp{\noexpand\inputminted[\the\toks@]}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 8b540e35bbe..0146ccf44de 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \RequirePackage{tikz}[2010/10/13] @@ -370,28 +370,32 @@ base@unbroken/.style={% clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,% set@outerboundary=\tcb@boundaryframe@standard,% - set@extensions@preframe={\tcb@draw@shadow@unbroken},% + shape@of@skin=unbroken,% + set@extensions@preframe={\kvtcb@shadow},% set@extensions@postframe={\tcb@draw@border@unbroken\tcb@apply@underlay\tcb@apply@overlay},% set@extensions@final={\tcb@apply@finish}% },% base@first/.style={% clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,% set@outerboundary=\tcb@boundaryframe@pathfirst,% - set@extensions@preframe={\tcb@draw@shadow@first},% + shape@of@skin=first,% + set@extensions@preframe={\kvtcb@shadow},% set@extensions@postframe={\tcb@draw@border@first\tcb@apply@underlay\tcb@apply@overlay},% set@extensions@final={\tcb@apply@finish}% },% base@middle/.style={% clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,% set@outerboundary=\tcb@boundaryframe@pathmiddle,% - set@extensions@preframe={\tcb@draw@shadow@middle},% + shape@of@skin=middle,% + set@extensions@preframe={\kvtcb@shadow},% set@extensions@postframe={\tcb@draw@border@middle\tcb@apply@underlay\tcb@apply@overlay},% set@extensions@final={\tcb@apply@finish}% },% base@last/.style={% clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,% set@outerboundary=\tcb@boundaryframe@pathlast,% - set@extensions@preframe={\tcb@draw@shadow@last},% + shape@of@skin=last,% + set@extensions@preframe={\kvtcb@shadow},% set@extensions@postframe={\tcb@draw@border@last\tcb@apply@underlay\tcb@apply@overlay},% set@extensions@final={\tcb@apply@finish}% },% @@ -735,7 +739,7 @@ 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=true, +\tcb@new@skin{spartan}{graphical environment=tikzpicture@tcb@hooked,geometry nodes=true,shape@of@skin=unbroken,% set@extensions@preframe=,set@extensions@postframe={\tcb@apply@underlay},set@extensions@final=,% frame engine=spartan,interior titled engine=spartan,interior engine=spartan,title engine=spartan,segmentation engine=spartan,% set@outerboundary=\tcb@boundaryframe@standard,% @@ -743,7 +747,7 @@ \tcbset{spartan/.style={skin=spartan}} -\tcb@new@skin{draft}{clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,% +\tcb@new@skin{draft}{clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,shape@of@skin=unbroken,% frame engine=empty,interior titled engine=empty,interior engine=empty,segmentation engine=path,title empty,% segmentation style={draw=black,dashed}, set@extensions@postframe=, @@ -1347,32 +1351,14 @@ {\tcb@arc@sha}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@sha}% } -\def\tcb@draw@shadow@unbroken{% - \let\tcb@shadow=\tcb@shadow@unbroken% - \kvtcb@shadow% -} - -\def\tcb@draw@shadow@first{% - \let\tcb@shadow=\tcb@shadow@first% - \kvtcb@shadow% -} - -\def\tcb@draw@shadow@middle{% - \let\tcb@shadow=\tcb@shadow@middle% - \kvtcb@shadow% -} - -\def\tcb@draw@shadow@last{% - \let\tcb@shadow=\tcb@shadow@last% - \kvtcb@shadow% -} \tcbset{% shad@w app/.code={\appto\kvtcb@shadow{#1}},% - shadow/.style args={#1#2#3#4}{shad@w app={\tcb@shadow{#1}{#2}{#3}{#4}}},% + shadow/.style args={#1#2#3#4}{shad@w app={\csuse{tcb@shadow@\tcb@shapeofskin}{#1}{#2}{#3}{#4}}},% no shadow/.code={\def\kvtcb@shadow{}},% fuzzy shadow/.style args={#1#2#3#4#5}{shad@w app={% \begin{scope}[#5]% + \letcs\tcb@shadow{tcb@shadow@\tcb@shapeofskin}% \tcb@shadow{#1}{#2}{\the\dimexpr#3-4\dimexpr#4\relax}{opacity=0.01}% \tcb@shadow{#1}{#2}{\the\dimexpr#3-3\dimexpr#4\relax}{opacity=0.02}% \tcb@shadow{#1}{#2}{\the\dimexpr#3-2\dimexpr#4\relax}{opacity=0.04}% @@ -1432,6 +1418,71 @@ drop fuzzy shadow east/.default={black!50!white},% } +\def\tcb@boundary@tikzbendedbase#1#2#3#4#5#6#7#8{% + \tcb@gettikzxy{(#1)}{\tcb@xa}{\tcb@ya}% + \tcb@gettikzxy{(#2)}{\tcb@xb}{\tcb@yb}% + \pgfpathmoveto{\pgfqpoint{\tcb@xa}{\tcb@yb}}% + #5\pgfpathquadraticcurveto{\pgfqpoint{\dimexpr0.5\dimexpr\tcb@xa+\tcb@xb\relax}{\dimexpr\tcb@yb+#8}}{\pgfqpoint{\tcb@xb}{\tcb@yb}}% + #6\pgfpathlineto{\pgfqpoint{\tcb@xb}{\tcb@ya}}% + #3\pgfpathquadraticcurveto{\pgfqpoint{\dimexpr0.5\dimexpr\tcb@xa+\tcb@xb\relax}{\dimexpr\tcb@ya+#7}}{\pgfqpoint{\tcb@xa}{\tcb@ya}}% + #4\pgfpathclose% +} + +\def\tcb@pathbendedbase#1#2#3#4#5#6#7#8#9{\tcb@pathboundary{#1}{\tcb@boundary@tikzbendedbase{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}}} + +\def\tcb@shadowbended@prepare#1{% + \tcbdimto\tcb@shadow@arc{\tcb@outer@arc-#1}% + \ifdim\dimexpr\tcb@shadow@arc<0pt\relax% + \let\tcb@shadow@arc=\tcb@zpt% + \fi% +} + +\def\tcb@shadowlifted@unbroken#1#2#3#4#5{% + \tcb@shadowbended@prepare{#3}% + \tcb@pathbendedbase{fill,#5}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=-#1-#3,yshift=#2-#3]frame.north east}% + {\tcb@arc@sha}{\tcb@arc@sha}{\tcb@arc@sha}{\tcb@arc@sha}{#4}{0pt}% +} + +\def\tcb@shadowlifted@first#1#2#3#4#5{% + \tcb@shadowbended@prepare{#3}% + \tcb@pathbendedbase{fill,#5}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=-#1-#3,yshift=#2-#3]frame.north east}% + {\tcb@arc@zpt}{\tcb@arc@sha}{\tcb@arc@sha}{\tcb@arc@zpt}{#4}{0pt}% +} + +\def\tcb@shadowlifted@middle#1#2#3#4#5{% + \tcb@shadowbended@prepare{#3}% + \tcb@pathbendedbase{fill,#5}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=-#1-#3,yshift=#2-#3]frame.north east}% + {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{#4}{0pt}% +} + +\def\tcb@shadowlifted@last#1#2#3#4#5{% + \tcb@shadowbended@prepare{#3}% + \tcb@pathbendedbase{fill,#5}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=-#1-#3,yshift=#2-#3]frame.north east}% + {\tcb@arc@sha}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@sha}{#4}{0pt}% +} + +\tcbset{ + lifted shadow/.style n args={5}{shad@w app={% + \begin{scope}[#5]% + \letcs\tcb@shadowlifted{tcb@shadowlifted@\tcb@shapeofskin}% + \tcb@shadowlifted{#1}{#2}{\dimexpr-4\dimexpr#4}{#3}{opacity=0.01}% + \tcb@shadowlifted{#1}{#2}{\dimexpr-3\dimexpr#4}{#3}{opacity=0.02}% + \tcb@shadowlifted{#1}{#2}{\dimexpr-2\dimexpr#4}{#3}{opacity=0.04}% + \tcb@shadowlifted{#1}{#2}{\dimexpr-#4}{#3}{opacity=0.07}% + \tcb@shadowlifted{#1}{#2}{0pt}{#3}{opacity=0.11}% + \tcb@shadowlifted{#1}{#2}{\dimexpr+#4}{#3}{opacity=0.11}% + \tcb@shadowlifted{#1}{#2}{\dimexpr+2\dimexpr#4}{#3}{opacity=0.07}% + \tcb@shadowlifted{#1}{#2}{\dimexpr+3\dimexpr#4}{#3}{opacity=0.04}% + \tcb@shadowlifted{#1}{#2}{\dimexpr+4\dimexpr#4}{#3}{opacity=0.02}% + \tcb@shadowlifted{#1}{#2}{\dimexpr+5\dimexpr#4}{#3}{opacity=0.01}% + \end{scope}}},% + drop small lifted shadow/.style={lifted shadow={1mm}{-0.75mm}{1.3mm}{0.1mm}{#1}}, + drop small lifted shadow/.default={black!50!white},% + drop lifted shadow/.style={lifted shadow={1.5mm}{-1.5mm}{2.7mm}{0.12mm}{#1}}, + drop lifted shadow/.default={black!50!white},% + drop large lifted shadow/.style={lifted shadow={2mm}{-3mm}{5.7mm}{0.16mm}{#1}}, + drop large lifted shadow/.default={black!50!white},% +} \newif\iftcb@isindraft \def\tcb@draftmode{\tcbset{spartan,spartan@fit}} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index b118a4f6b6f..031f609d4c1 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \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 0ffad0ef838..c59b2f3d8d9 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index d9ed7cac2fc..941fcdbb49c 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% 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.04} +\tcb@set@library@version{3.05} \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 9c19069ab56..eec907b4a3b 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.04 (2014/05/18) +%% The LaTeX package tcolorbox - version 3.05 (2014/05/28) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/05/18 version 3.04 text color boxes] -\def\tcb@version{3.04} +\ProvidesPackage{tcolorbox}[2014/05/28 version 3.05 text color boxes] +\def\tcb@version{3.05} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -435,6 +435,7 @@ size/minimal/.style={boxrule=0pt,boxsep=0pt,left=0pt,right=0pt,top=0pt,bottom=0pt,toptitle=0pt,bottomtitle=0pt, middle=0pt,arc=0pt,outer arc=0pt}, on line/.style={tcbox raise base,nobeforeafter}, + shape@of@skin/.store in=\tcb@shapeofskin, } \def\kvtcb@beforebox{} @@ -608,6 +609,9 @@ \def\tcb@layer@inc{% \stepcounter{tcblayer}% + \ifnum\c@tcblayer>1% + \tcbset{breakable@true/.code=}% + \fi% \ifnum\c@tcblayer>\tcb@managed@layers@max% \tcbset{every box on higher layers}% \else% @@ -619,14 +623,17 @@ \def\tcb@layer@pushup{% \stepcounter{tcblayer}% + \ifnum\c@tcblayer>1% + \tcbset{breakable@true/.code=}% + \fi% \ifnum\c@tcblayer>\tcb@managed@layers@max% \tcbset{every box on higher layers}% - \tcbset{every box on higher layers/.style={}}% not ideal + \tcbset{every box on higher layers/.code=}% \else% \tcbset{every box on layer \number\c@tcblayer}% - \tcbset{every box on layer \number\c@tcblayer/.style={}}% + \tcbset{every box on layer \number\c@tcblayer/.code=}% \fi% - \addtocounter{tcblayer}{-1}%´ + \addtocounter{tcblayer}{-1}% } \def\tcb@layer@dec{% @@ -1350,6 +1357,7 @@ graphical environment=pgfpicture,geometry nodes=false, set@extensions@preframe=,set@extensions@postframe={\tcb@apply@overlay},set@extensions@final=,% set@outerboundary=\tcb@boundaryframe@standard,% + shape@of@skin=unbroken, skin first=standard,skin middle=standard,skin last=standard% } -- cgit v1.2.3