diff options
19 files changed, 524 insertions, 237 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 6b21d50de24..25247eec8f2 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,188 +1,195 @@ -%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
-%%
-%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
-%% -------------------------------------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `author-maintained'.
-%%
-%% This work consists of all files listed in README
-%%
-
-(2006-2011): pre publication usage
-
-version 1.00 (2011/12/08): initial public release
-
-version 1.01 (2012/01/26):
-- dates amended to \RequirePackage(s)
-- provision of the tcolorbox.tds.zip file for easier installation
-
-version 1.02 (2012/02/15)
-- documentation language changed from German to English
-- small correction of the theorem title line appearance
-
-version 1.10 (2012/03/01)
-- tcblatex style for listings changed (nolol added)
-- improved hyperref support
-- new keys parskip and noparskip
-- source code of the documentation added
-- new library 'documentation' to support LaTeX documentations
- with several library commands, environments and keys (see documentation)
-
-version 1.20 (2012/03/16)
-- new geometry keys:
- 'lefttitle', 'leftupper', 'leftlower', 'righttitle', 'rightupper', 'rightlower'
- and implementation changed for 'left' and 'right'
-- implementation for tcolorbox changed (adaption to height options)
-- new fixed height option keys:
- 'natural height', 'height', 'equal height group', 'minimum for equal height group',
- 'space', 'space to upper', 'space to lower', 'space to both', 'split',
- 'valign', 'valign lower',
- 'adjusted title'
-- new bounding box option keys:
- 'enlarge top by', 'enlarge bottom by', 'enlarge left by', 'enlarge right by',
- 'toggle enlargement'
-- preparations for a future skin changing option implemented
-- commands \brackets and \docAuxCommand added to the documentation library
-- documentation rearranged
-
-version 1.30 (2012/04/20)
-- several internal code changes to provide a 'skin' exchange mechanism
-- new keys for the core package:
- 'frame engine', 'interior titled engine', 'interior engine', 'segmentation engine'
- 'skin', 'graphical environment', 'geometry nodes', 'colupper', 'collower'
-- tcolorbox now defined as 'long' macro
-- new keys for the library 'listings':
- 'comment', 'listing and comment', 'comment and listing'
-- new library 'skins' with the skins
- 'standard', 'enhanced', 'freelance', 'bicolor', 'beamer', 'widget'
-- keys for the library 'skins':
- 'frame style', 'interior style', 'segmentation style'
- 'frame code', 'interior titled code', 'interior code', 'segmentation code',
- 'colbacklower'
-
-version 2.00 (2013/03/01)
-- breaking news: the new library 'breakable' adds breaking support to tcolorbox.
-- e-TeX now used instead of calc
-- new key 'adjust text' and new implementation for 'adjusted title'
-- new geometry keys:
- 'toprule', 'toprule at break', 'bottomrule', 'bottomrule at break',
- 'leftrule', 'rightrule', 'titlerule', 'outer arc', 'auto outer arc',
- 'toptitle', 'bottomtitle'
-- new bounding box keys:
- 'enlarge top at break by', 'enlarge bottom at break by'
-- new overlay keys:
- 'overlay', 'no overlay', 'overlay broken', 'overlay unbroken',
- 'overlay first', 'overlay middle', 'overlay last',
- 'overlay unbroken and first', 'overlay middle and last'
-- new key: 'parbox' to change text behaviour
-- new library 'breakable' for breakable boxes with the new keys:
- 'breakable', 'unbreakable', 'title after break', 'notitle after break',
- 'adjusted title after break', 'lines before break', 'shrink break goal'
-- new keys for the 'skins' library
- 'skin first', 'skin middle', 'skin last', 'title engine', 'pathfirst',
- 'pathmiddle', 'pathlast', 'title style', 'title code', 'enhancedfirst',
- 'enhancedmiddle', 'enhancedlast', 'enhanced', 'marker', 'bicolor',
- 'bicolorfirst', 'bicolormiddle', 'bicolorlast', 'beamer',
- 'beamerfirst', 'beamermiddle', 'beamerlast', 'draft', 'freelance', 'standard'
-- NOTE: skins 'beamer' and 'widget' changed
- use the new style options 'beamer' and 'widget' to get the old appearance
-- new watermark keys:
- 'watermark text', 'watermark text on', 'watermark graphics',
- 'watermark graphics on', 'watermark tikz', 'watermark tikz on',
- 'no watermark', 'watermark opacity', 'watermark color',
- 'watermark zoom', 'watermark stretch'
-
-version 2.01 (2013/03/07)
-- bug fix: superfluous vertical space for a breakable box which appeared after a page break
-- bug fix: height computation error when a broken boxed starts with a segmentation line
-- new key for the 'listings' library:
- 'listing inputencoding'
-- new library 'listingsutf8' as variant of 'listings' with new key
- 'listing utf8'
-- keys 'toprule at break', 'bottomrule at break',
- 'enlarge top at break by', 'enlarge bottom at break by'
- moved from core package to 'breakable' library.
-- new keys for the 'breakable' library:
- 'topsep at break', 'bottomsep at break', 'pad before break',
- 'pad after break', 'pad at break'
-
-version 2.02 (2013/03/13)
-- minor bug fix: segmentation line of 'enhanced' now matches 'standard'
-- new macro '\tcbox' to draw a colorbox fitted to the content width
-- new key 'autoparskip' to detect usage of package parskip automatically
-- new key 'nobeforeafter'
-- new macro '\tcbline' in the 'skins' library to draw 'just lines'
-- new key 'colbacktitle' for the 'skins' library
-
-version 2.10 (2013/04/09)
-- bug fix: \tcbox ignored font settings
-- outdated documentation in German removed from package
-- new core package keys:
- 'oversize', 'tcbox raise', 'tcbox raise base',
- 'before title', 'after title', 'before upper', 'after upper', 'before lower',
- 'after lower', 'center title', 'center upper', 'center lower',
- 'tabularx*', 'tabularx', 'tikz upper', 'tikz lower',
- 'shrink tight', 'extrude left by', 'extrude right by', 'extrude top by',
- 'extrude bottom by', 'extrude by'
-- the 'theorems' library now loads 'amsmath'
-- new macros for the 'theorems' library:
- '\tcboxmath', '\tcbhighmath'
-- new keys for the 'theorems' library:
- 'math upper', 'math lower', 'math', 'highlight math', 'highlight math style',
- 'ams equation upper', 'ams equation lower', 'ams equation', 'ams equation* upper',
- 'ams equation* lower', 'ams equation*', 'ams align upper', 'ams align lower',
- 'ams align', 'ams align* upper', 'ams align* lower', 'ams align*',
- 'ams gather upper', 'ams gather lower', 'ams gather', 'ams gather* upper',
- 'ams gather* lower', 'ams gather*',
- 'ams nodisplayskip upper', 'ams nodisplayskip lower', 'ams nodisplayskip'
-- new library 'hooks' for hook options with the new keys:
- 'before upper app', 'before upper pre', 'after upper app', 'after upper pre',
- 'before lower app', 'before lower pre', 'after lower app', 'after lower pre',
- 'before title app', 'before title pre', 'after title app', 'after title pre',
- 'before app', 'before pre', 'after app', 'after pre',
- 'overlay unbroken app', 'overlay unbroken pre', 'overlay first app', 'overlay first pre',
- 'overlay middle app', 'overlay middle pre', 'overlay last app', 'overlay last pre',
- 'overlay app', 'overlay pre', 'overlay broken app', 'overlay broken pre',
- 'overlay unbroken and first app', 'overlay unbroken and first pre',
- 'overlay middle and last app', 'overlay middle and last pre',
- 'watermark tikz app', 'watermark tikz pre', 'watermark tikz app on', 'watermark tikz pre on',
- 'watermark graphics app', 'watermark graphics pre', 'watermark graphics app on', 'watermark graphics pre on',
- 'watermark text app', 'watermark text pre', 'watermark text app on', 'watermark text pre on',
- 'frame code app', 'frame code pre', 'interior titled code app', 'interior titled code pre',
- 'interior code app', 'interior code pre', 'segmentation code app', 'segmentation code pre',
- 'title code app', 'title code pre'
-- colorization of source code snippets in the documentation
-
-version 2.20 (2013/04/17)
-- bug fix: problem with breaking boxes after headings
-- new feature: support for boxes with side by side content
-- new keys:
- 'sidebyside', 'sidebyside align', 'sidebyside gap',
- 'lefthand width', 'righthand width', 'lefthand ratio', 'righthand ratio'
-- key 'nofloat' documented
-- new keys for the 'listings' library:
- 'listing side text', 'text side listing'
- 'listing outside text', 'text outside listing'
-- new keys for the 'skins' library:
- 'frame hidden', 'interior hidden', 'segmentation hidden', 'title hidden'
-- new environments for the 'documentation' library:
- 'dispExample*', 'dispListing*'
-- the default style for 'highlight math' is changed to have no title
-- minor change of internal width computation
-- minor internal fixes
-- slight overhaul of the documentation
-
-
-
-
-
-
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% ------------------------------------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of all files listed in README +%% + +(2006-2011): pre publication usage + +version 1.00 (2011/12/08): initial public release + +version 1.01 (2012/01/26): +- dates amended to \RequirePackage(s) +- provision of the tcolorbox.tds.zip file for easier installation + +version 1.02 (2012/02/15) +- documentation language changed from German to English +- small correction of the theorem title line appearance + +version 1.10 (2012/03/01) +- tcblatex style for listings changed (nolol added) +- improved hyperref support +- new keys parskip and noparskip +- source code of the documentation added +- new library 'documentation' to support LaTeX documentations + with several library commands, environments and keys (see documentation) + +version 1.20 (2012/03/16) +- new geometry keys: + 'lefttitle', 'leftupper', 'leftlower', 'righttitle', 'rightupper', 'rightlower' + and implementation changed for 'left' and 'right' +- implementation for tcolorbox changed (adaption to height options) +- new fixed height option keys: + 'natural height', 'height', 'equal height group', 'minimum for equal height group', + 'space', 'space to upper', 'space to lower', 'space to both', 'split', + 'valign', 'valign lower', + 'adjusted title' +- new bounding box option keys: + 'enlarge top by', 'enlarge bottom by', 'enlarge left by', 'enlarge right by', + 'toggle enlargement' +- preparations for a future skin changing option implemented +- commands \brackets and \docAuxCommand added to the documentation library +- documentation rearranged + +version 1.30 (2012/04/20) +- several internal code changes to provide a 'skin' exchange mechanism +- new keys for the core package: + 'frame engine', 'interior titled engine', 'interior engine', 'segmentation engine' + 'skin', 'graphical environment', 'geometry nodes', 'colupper', 'collower' +- tcolorbox now defined as 'long' macro +- new keys for the library 'listings': + 'comment', 'listing and comment', 'comment and listing' +- new library 'skins' with the skins + 'standard', 'enhanced', 'freelance', 'bicolor', 'beamer', 'widget' +- keys for the library 'skins': + 'frame style', 'interior style', 'segmentation style' + 'frame code', 'interior titled code', 'interior code', 'segmentation code', + 'colbacklower' + +version 2.00 (2013/03/01) +- breaking news: the new library 'breakable' adds breaking support to tcolorbox. +- e-TeX now used instead of calc +- new key 'adjust text' and new implementation for 'adjusted title' +- new geometry keys: + 'toprule', 'toprule at break', 'bottomrule', 'bottomrule at break', + 'leftrule', 'rightrule', 'titlerule', 'outer arc', 'auto outer arc', + 'toptitle', 'bottomtitle' +- new bounding box keys: + 'enlarge top at break by', 'enlarge bottom at break by' +- new overlay keys: + 'overlay', 'no overlay', 'overlay broken', 'overlay unbroken', + 'overlay first', 'overlay middle', 'overlay last', + 'overlay unbroken and first', 'overlay middle and last' +- new key: 'parbox' to change text behaviour +- new library 'breakable' for breakable boxes with the new keys: + 'breakable', 'unbreakable', 'title after break', 'notitle after break', + 'adjusted title after break', 'lines before break', 'shrink break goal' +- new keys for the 'skins' library + 'skin first', 'skin middle', 'skin last', 'title engine', 'pathfirst', + 'pathmiddle', 'pathlast', 'title style', 'title code', 'enhancedfirst', + 'enhancedmiddle', 'enhancedlast', 'enhanced', 'marker', 'bicolor', + 'bicolorfirst', 'bicolormiddle', 'bicolorlast', 'beamer', + 'beamerfirst', 'beamermiddle', 'beamerlast', 'draft', 'freelance', 'standard' +- NOTE: skins 'beamer' and 'widget' changed + use the new style options 'beamer' and 'widget' to get the old appearance +- new watermark keys: + 'watermark text', 'watermark text on', 'watermark graphics', + 'watermark graphics on', 'watermark tikz', 'watermark tikz on', + 'no watermark', 'watermark opacity', 'watermark color', + 'watermark zoom', 'watermark stretch' + +version 2.01 (2013/03/07) +- bug fix: superfluous vertical space for a breakable box which appeared after a page break +- bug fix: height computation error when a broken boxed starts with a segmentation line +- new key for the 'listings' library: + 'listing inputencoding' +- new library 'listingsutf8' as variant of 'listings' with new key + 'listing utf8' +- keys 'toprule at break', 'bottomrule at break', + 'enlarge top at break by', 'enlarge bottom at break by' + moved from core package to 'breakable' library. +- new keys for the 'breakable' library: + 'topsep at break', 'bottomsep at break', 'pad before break', + 'pad after break', 'pad at break' + +version 2.02 (2013/03/13) +- minor bug fix: segmentation line of 'enhanced' now matches 'standard' +- new macro '\tcbox' to draw a colorbox fitted to the content width +- new key 'autoparskip' to detect usage of package parskip automatically +- new key 'nobeforeafter' +- new macro '\tcbline' in the 'skins' library to draw 'just lines' +- new key 'colbacktitle' for the 'skins' library + +version 2.10 (2013/04/09) +- bug fix: \tcbox ignored font settings +- outdated documentation in German removed from package +- new core package keys: + 'oversize', 'tcbox raise', 'tcbox raise base', + 'before title', 'after title', 'before upper', 'after upper', 'before lower', + 'after lower', 'center title', 'center upper', 'center lower', + 'tabularx*', 'tabularx', 'tikz upper', 'tikz lower', + 'shrink tight', 'extrude left by', 'extrude right by', 'extrude top by', + 'extrude bottom by', 'extrude by' +- the 'theorems' library now loads 'amsmath' +- new macros for the 'theorems' library: + '\tcboxmath', '\tcbhighmath' +- new keys for the 'theorems' library: + 'math upper', 'math lower', 'math', 'highlight math', 'highlight math style', + 'ams equation upper', 'ams equation lower', 'ams equation', 'ams equation* upper', + 'ams equation* lower', 'ams equation*', 'ams align upper', 'ams align lower', + 'ams align', 'ams align* upper', 'ams align* lower', 'ams align*', + 'ams gather upper', 'ams gather lower', 'ams gather', 'ams gather* upper', + 'ams gather* lower', 'ams gather*', + 'ams nodisplayskip upper', 'ams nodisplayskip lower', 'ams nodisplayskip' +- new library 'hooks' for hook options with the new keys: + 'before upper app', 'before upper pre', 'after upper app', 'after upper pre', + 'before lower app', 'before lower pre', 'after lower app', 'after lower pre', + 'before title app', 'before title pre', 'after title app', 'after title pre', + 'before app', 'before pre', 'after app', 'after pre', + 'overlay unbroken app', 'overlay unbroken pre', 'overlay first app', 'overlay first pre', + 'overlay middle app', 'overlay middle pre', 'overlay last app', 'overlay last pre', + 'overlay app', 'overlay pre', 'overlay broken app', 'overlay broken pre', + 'overlay unbroken and first app', 'overlay unbroken and first pre', + 'overlay middle and last app', 'overlay middle and last pre', + 'watermark tikz app', 'watermark tikz pre', 'watermark tikz app on', 'watermark tikz pre on', + 'watermark graphics app', 'watermark graphics pre', 'watermark graphics app on', 'watermark graphics pre on', + 'watermark text app', 'watermark text pre', 'watermark text app on', 'watermark text pre on', + 'frame code app', 'frame code pre', 'interior titled code app', 'interior titled code pre', + 'interior code app', 'interior code pre', 'segmentation code app', 'segmentation code pre', + 'title code app', 'title code pre' +- colorization of source code snippets in the documentation + +version 2.20 (2013/04/17) +- bug fix: problem with breaking boxes after headings +- new feature: support for boxes with side by side content +- new keys: + 'sidebyside', 'sidebyside align', 'sidebyside gap', + 'lefthand width', 'righthand width', 'lefthand ratio', 'righthand ratio' +- key 'nofloat' documented +- new keys for the 'listings' library: + 'listing side text', 'text side listing' + 'listing outside text', 'text outside listing' +- new keys for the 'skins' library: + 'frame hidden', 'interior hidden', 'segmentation hidden', 'title hidden' +- new environments for the 'documentation' library: + 'dispExample*', 'dispListing*' +- the default style for 'highlight math' is changed to have no title +- minor change of internal width computation +- minor internal fixes +- slight overhaul of the documentation + +version 2.21 (2013/04/23) +- bug fix: \tcbox and 'sidebyside' needed 'breakable' library +- bug fix: library 'tcbhooks' relied on etoolbox package +- bug fix: breaking boxes between upper part and box frame +- new macro '\newtcolorbox' +- new macro '\newtcblisting' for the 'listings' library +- new key 'code' +- documentation corrections and extensions + + + + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 026ac798416..8696eff79d8 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf Binary files differindex f1a94de86cf..11848764a4d 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index 3359233dee9..59d493ff090 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex index bce81fdaa22..bf52c71934b 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex @@ -100,4 +100,44 @@ Text \tcbox[tcbox raise base]{Hello World}\hfill \end{dispExample} \end{docCommand} +\clearpage +\begin{docCommand}{newtcolorbox}{\marg{name}\oarg{number}\oarg{default}\marg{options}} + Creates a new environment \meta{name} based on \refEnv{tcolorbox}. + Basically, |\newtcolorbox| operates like |\newenvironment|. This means, + the new environment \meta{name} optionally takes \meta{number} arguments, where + \meta{default} is the default value for the optional first argument. + The \meta{options} are given to the underlying |tcolorbox|. + Note that \refKey{/tcb/savedelimiter} is set to the given \meta{name} + automatically. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\newtcolorbox{mybox}{colback=red!5!white, + colframe=red!75!black} + +\begin{mybox} +This is my own box. +\end{mybox} +\end{dispExample*} + +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\newtcolorbox{mybox}[1]{colback=red!5!white, + colframe=red!75!black,fonttitle=\bfseries, + title=#1} + +\begin{mybox}{Hello there} +This is my own box with a mandatory title. +\end{mybox} +\end{dispExample*} + +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\newtcolorbox{mybox}[2][]{colback=red!5!white, + colframe=red!75!black,fonttitle=\bfseries, + title=#2,#1} + +\begin{mybox}[colback=yellow]{Hello there} +This is my own box with a mandatory title +and options. +\end{mybox} +\end{dispExample*} +\end{docCommand} + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex index 88b534dda7b..867e9890745 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -123,6 +123,26 @@ Now, the saved part is used: \input{\jobname_bspsave2.tex} \end{tcolorbox} \end{dispExample} + +The |savedelimiter| is used implicitely with \refCom{newtcolorbox} which +allows a more convenient usage: +\begin{dispExample} +\newtcolorbox{mybox}[1]{% + savelowerto=\jobname_bspsave2.tex,lowerbox=ignored, + colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries, + title=#1}% + +\begin{mybox}{My Example} +Upper part. +\tcblower +Saved lower part! +\end{mybox} + +Now, the saved part is used: +\begin{tcolorbox}[colback=green!5] +\input{\jobname_bspsave2.tex} +\end{tcolorbox} +\end{dispExample} \end{docTcbKey} @@ -928,7 +948,7 @@ This is the lower part. \clearpage \begin{docTcbKey}{tabularx}{=\meta{preamble}}{style} - This style sets \refKey{/tcb/before lower} and \refKey{/tcb/after lower} + This style sets \refKey{/tcb/before upper} and \refKey{/tcb/after upper} and several geometry keys to support a |tabularx| with the given \meta{preamble}. The package |tabularx| \cite {carlisle:1999a} has to be loaded separately. @@ -1007,6 +1027,22 @@ One & Two & Three \\\hline\hline \clearpage +\begin{docTcbKey}{code}{=\meta{code}}{no default, initially unset} + The given \meta{code} is executed immediately. This option is useful + to place some arbitrary code into an option list. +\begin{dispExample} +\tcbset{colback=red!5!white,colframe=red!75!black, + code={Useless at this spot but functional.}, + fonttitle=\bfseries} + +\begin{tcolorbox}[code={\newcommand{\mycommand}{\textit{working}}}, + title=My \mycommand\ title] +This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample} +\end{docTcbKey} + +\clearpage \subsection{Overlays}\label{subsec:overlays} With an overlay, arbitrary \meta{graphical code} can be added to a |tcolorbox|. This code is executed \emph{after} the frame and interior are @@ -1116,6 +1152,61 @@ This is the lower part. +\begin{dispListing*}{breakable,before upper={This example demonstrates +the application of break sequence specific overlay options. +Here, we define an environment |myexample| based +on |tcolorbox| where the visible drawing is done totally by overlay keys.\par +Here, the first application of |myexample| produces an unbroken |tcolorbox|. +The frame is drawn by the code given with \refKey{/tcb/overlay unbroken}.\par +The second application of |myexample| is broken into several parts which +are drawn by the codes given with +\refKey{/tcb/overlay first}, \refKey{/tcb/overlay middle}, and +\refKey{/tcb/overlay last}. +\par\bigskip +}} +% Preamble: +%\usepackage{tikz,lipsum,calc} +%\tcbuselibrary{skins,breakable} +%\newcounter{example} +%\newlength{\examlen} +\colorlet{colexam}{red!75!black} + +\newtcolorbox{myexample}{% + code={\refstepcounter{example}% + \settowidth{\examlen}{\Large\bfseries Example \arabic{example}}},% + title=Example \arabic{example}, + coltitle=colexam,fonttitle=\Large\bfseries, + enhanced,breakable,before=\par\medskip,parbox=false, + frame hidden,interior hidden,segmentation hidden, + boxsep=0pt,left=0pt,right=3mm,toptitle=2mm,pad at break=0mm, + overlay unbroken={\draw[colexam,line width=1pt] (frame.north west) + --([xshift=-0.5pt]frame.north east)--([xshift=-0.5pt]frame.south east) + --(frame.south west); + \draw[colexam,line width=2pt] ([yshift=0.5pt]frame.north west) + -- +(\examlen,0pt);}, + overlay first={\draw[colexam,line width=1pt] (frame.north west) + --([xshift=-0.5pt]frame.north east)--([xshift=-0.5pt]frame.south east); + \draw[red!75!black,line width=2pt] ([yshift=0.5pt]frame.north west) + -- +(\examlen,0pt);}, + overlay middle={\draw[colexam,line width=1pt] ([xshift=-0.5pt]frame.north east) + --([xshift=-0.5pt]frame.south east); }, + overlay last={\draw[colexam,line width=1pt] ([xshift=-0.5pt]frame.north east) + --([xshift=-0.5pt]frame.south east)--(frame.south west);}% +} + +\begin{myexample} +\lipsum[1] +\end{myexample} + +\begin{myexample} +\lipsum[2-14] +\end{myexample} + +\lipsum[15]% following text +\end{dispListing*} +{\tcbusetemp} + + \clearpage \subsection{Floating Objects} \begin{docTcbKey}{floatplacement}{=\meta{values}}{no default, initially \texttt{htb}} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex index 2edcab150f2..16cbbb6ccf0 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex @@ -35,7 +35,8 @@ This is a \LaTeX\ example which displays the text as source code and in compiled form. \end{tcblisting} \end{dispExample} -{\tcbset{breakable}\begin{dispExample} +\clearpage +\begin{dispExample} \begin{tcblisting}{colback=yellow!5,colframe=yellow!50!black,listing only, title=This is source code in another language (XML), fonttitle=\bfseries, listing options={language=XML,columns=fullflexible,keywordstyle=\color{red}}} @@ -47,7 +48,6 @@ and in compiled form. </project> \end{tcblisting} \end{dispExample} -} \end{docEnvironment} @@ -90,7 +90,7 @@ This \textbf{text} is written to a standardized file for later usage. \end{dispExample} \end{docCommand} -\enlargethispage*{5mm} +%\enlargethispage*{5mm} \begin{docCommand}{tcbusetemplisting}{} Typesets text as listing from a temporary file which was written by \refEnv{tcbwritetemp}. @@ -98,6 +98,61 @@ This \textbf{text} is written to a standardized file for later usage. \clearpage +\begin{docCommand}{newtcblisting}{\marg{name}\oarg{number}\oarg{default}\marg{options}} + Creates a new environment \meta{name} based on \refEnv{tcblisting}. + Basically, |\newtcblisting| operates like |\newenvironment|. This means, + the new environment \meta{name} optionally takes \meta{number} arguments, where + \meta{default} is the default value for the optional first argument. + The \meta{options} are given to the underlying |tcblisting|. + Note that \refKey{/tcb/savedelimiter} is set to the given \meta{name} + automatically. +\begin{dispExample*}{sbs,lefthand ratio=0.5} +\newtcblisting{mybox}{% + colback=red!5!white, + colframe=red!75!black} + +\begin{mybox} +This is my \LaTeX\ box. +\end{mybox} +\end{dispExample*} + +\begin{dispExample*}{sbs,lefthand ratio=0.5} +\newtcblisting{mybox}[1]{% + colback=red!5!white, + colframe=red!75!black, + fonttitle=\bfseries, + title=#1} + +\begin{mybox}{Listing Box} +This is my \LaTeX\ box. +\end{mybox} +\end{dispExample*} + +\begin{dispExample*}{sbs,lefthand ratio=0.5} +\newtcblisting{mybox}[2][]{% + colback=red!5!white, + colframe=red!75!black, + fonttitle=\bfseries, + title=#2,#1} + +\begin{mybox}[listing only] + {Listing Box} +This is my \LaTeX\ box. +\end{mybox} +\bigskip + +\begin{mybox}[listing side text] + {Listing Box} +This is my +\LaTeX\ box. +\end{mybox} + +\end{dispExample*} +\end{docCommand} + + + +\clearpage \subsection{Option Keys of the Library} For the \meta{options} in \refEnv{tcblisting} respectively \refCom{tcbinputlisting} the following |pgf| keys can be applied. The key tree path |/tcb/| is not to @@ -327,9 +382,9 @@ For the next examples, two environments are defined for abbreviation. \begin{dispListing} -\newenvironment{texexp}[1]{\tcblisting{texexp,#1}}{\endtcblisting} +\newtcblisting{texexp}[1]{texexp,#1} -\newenvironment{texexptitled}[3][]{\tcblisting{example={#2}{#3},#1}}{\endtcblisting} +\newtcblisting{texexptitled}[3][]{example={#2}{#3},#1} \end{dispListing} \tcbusetemp @@ -536,22 +591,16 @@ Inside the exercise text, there may be text parts which are needed as saved by \refEnv{tcbwritetemp} and used in compiled form by \refCom{tcbusetemp} or as source code by \refCom{tcbusetemplisting}. -At first, we generate some new keys. Since exercises and solutions should -be numbered, we force to use a label \meta{marker} while using the style |texercise|. +At first, we generate some a common style for the exercises and the +solutions. Further, since exercises and solutions should +be numbered, we force to use a label \meta{marker}. Automatically, the label |exe:|\meta{marker} is used to mark the exercise and the label |sol:|\meta{marker} is used to mark the solution. \begin{dispListing} -\tcbset{ -texercisestyle/.style={arc=0.5mm, colframe=blue!25!yellow!90!white, +\tcbset{texercisestyle/.style={arc=0.5mm, colframe=blue!25!yellow!90!white, colback=blue!25!yellow!5!white, coltitle=blue!25!yellow!40!black, - fonttitle=\small\sffamily\bfseries, fontupper=\small, fontlower=\small}, -texercise/.code={\refstepcounter{texercise}\label{exe:#1}\writesol{#1}% - \pgfkeysalso{texercisestyle, - listing file={\solfile\thetexercise}, - title={Exercise \arabic{texercise}\hfill\mdseries Solution on page \pageref{sol:#1}} - }} -} + fonttitle=\small\sffamily\bfseries, fontupper=\small, fontlower=\small}} \end{dispListing} \tcbusetemp @@ -559,9 +608,11 @@ With these preparations, the kernel environment |texercise| for our exercises is created quickly: \begin{dispListing} -\newenvironment{texercise}[2][]{% - \tcolorbox[texercise=#2,savedelimiter=texercise,#1]}% - {\endtcolorbox} +\newtcolorbox{texercise}[2][]{texercisestyle, + code={\refstepcounter{texercise}\label{exe:#2}\writesol{#2}}, + listing file={\solfile\thetexercise}, + title={Exercise \arabic{texercise}\hfill\mdseries Solution on page \pageref{sol:#2}}, + #1} \end{dispListing} \tcbusetemp 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 cb0feeb2f21..0bfdac01ef9 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -971,13 +971,51 @@ Nevertheless, this skin can be applied independently. This styles relies on the skin \refSkin{enhancedmiddle}. It is intended to be used as an optical marker like a highlighter pen. \begin{dispExample} -\begin{marker} +\begin{tcolorbox}[marker] \lipsum[2] -\end{marker} +\end{tcolorbox} \end{dispExample} \end{docTcbKey} +\clearpage +\begin{dispListing*}{before upper={This examples demonstrates the creation of several + \emph{text marker} environments based on \refSkin{enhancedmiddle}.\par\medskip}} +\tcbset{textmarker/.style={% + skin=enhancedmiddle,breakable,parbox=false, + boxrule=0mm,leftrule=5mm,rightrule=5mm,boxsep=0mm,arc=0mm,outer arc=0mm, + left=3mm,right=3mm,top=1mm,bottom=1mm,enlarge left by=-8mm,enlarge right by=-8mm, + toptitle=1mm,bottomtitle=1mm,width=\the\dimexpr\linewidth+1.6cm\relax}} + +\newtcolorbox{yellow}{textmarker,colback=yellow!5!white,colframe=yellow} +\newtcolorbox{orange}{textmarker,colback=DarkOrange!5!white, + colframe=DarkOrange!75!yellow} +\newtcolorbox{red}{textmarker,colback=red!5!white,colframe=red} +\newtcolorbox{blue}{textmarker,colback=DeepSkyBlue!5!white,colframe=DeepSkyBlue} +\newtcolorbox{green}{textmarker,colback=Chartreuse!5!white,colframe=Chartreuse} + +\begin{yellow} + \lipsum[1] +\end{yellow} + +\begin{orange} + \lipsum[2] +\end{orange} + +\begin{red} + \lipsum[3] +\end{red} + +\begin{green} + \lipsum[4] +\end{green} + +\begin{blue} + \lipsum[5] +\end{blue} +\lipsum[6]% following text +\end{dispListing*} +{\tcbusetemp} \clearpage 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 c890a8a6223..4700bdc5dbd 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex @@ -294,6 +294,30 @@ created by hand or using \refCom{tcbmaketheorem}. \end{dispExample} \end{docTcbKey} +\bigskip +New colored mathematical environments are easily created using +\refCom{newtcolorbox}: + +\begin{dispExample} +\newtcolorbox{mymath}{ams gather*,colback=yellow!10!white,colframe=red!50!black} + +\begin{mymath} + \sum\limits_{n=1}^{\infty} \frac{1}{n} = \infty.\\ + \int x^2 ~\text{d}x = \frac13 x^3 + c. +\end{mymath} +\end{dispExample} + +\bigskip +\begin{marker} + All described options like \refKey{/tcb/ams gather upper}, \refKey{/tcb/ams gather lower}, + \refKey{/tcb/ams gather} are (partially) setting (overwritting) the + keys \refKey{/tcb/before upper}, \refKey{/tcb/after upper}, + \refKey{/tcb/before lower}, \refKey{/tcb/after lower}.\par + Therefore, e.\,g.\ |\tcbset{ams gather,before upper={\text{Pythagoras:}}}| + produces an invalid result. For this case, you are invited to use\\ + |\tcbset{ams gather,before upper app={\text{Pythagoras:}}}|,\\ + see \refKey{/tcb/before upper app}. +\end{marker} % \clearpage diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 8ca73d17d90..7685c8f8a7f 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index b6128360346..c3ab1f3b3bc 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -82,14 +82,19 @@ pdfkeywords={colored boxes, LaTeX examples, theorems} } -\def\version{2.20}% -\def\datum{2013/04/17}% +\def\version{2.21}% +\def\datum{2013/04/23}% \makeindex + + \newcounter{texexp} \newcounter{texercise} \newcounter{mytheorem}[section] +\newcounter{example} +\newlength{\examlen} + \lstdefinestyle{mydocumentation}{style=tcbdocumentation, classoffset=0, @@ -99,10 +104,10 @@ classoffset=1, % tcolorbox macros moretexcs={% core - endtcolorbox,endtcbverbatimwrite, + endtcolorbox,endtcbverbatimwrite,newtcolorbox,tcbusetemp, tcblower,tcbox,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite, % listings - endtcblisting, + endtcblisting,newtcblisting, tcblisting,tcbinputlisting,tcbuselistingtext,tcbuselistinglisting,tcbusetemplisting, % theorems tcbmaketheorem,tcboxmath,tcbhighmath, @@ -124,7 +129,7 @@ morekeywords={% core adjusted,adjust,after,arc,auto,autoparskip,align, before,bottom,boxsep,boxrule,bottomtitle,bottomrule,broken, - collower,coltext,coltitle,colback,colframe,colupper,center, + collower,coltext,coltitle,colback,colframe,colupper,center,code, equal,enlarge,enlargement,extrude, fontupper,fontlower,fonttitle,first,floatplacement,float, group,gap, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index db889791249..5e1a42ea4cd 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -20,8 +20,6 @@ \makeatletter \def\tcblibrary@breakable@loaded{} -\let\tcb@drawcolorbox@standalone=\tcb@drawcolorbox - \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip} @@ -209,7 +207,11 @@ \tcbdimto\tcb@split@dim{\tcb@split@dim-\tcb@h@upper-\tcb@h@segment} \ifdim\tcb@split@dim<\kvtcb@breakminlines\baselineskip\relax% \tcb@sdraw@U% + \iftcb@lowerspace% \let\tcb@split@next=\tcb@split@SL% + \else% + \let\tcb@split@next=\tcb@split@USL% + \fi% \else \tcb@split@lower@box% \tcb@sdraw@USL% @@ -249,7 +251,11 @@ \tcbdimto\tcb@split@dim{\tcb@split@dim-\tcb@h@upper-\tcb@h@segment} \ifdim\tcb@split@dim<\kvtcb@breakminlines\baselineskip\relax% \tcb@sdraw@U% + \iftcb@lowerspace% \let\tcb@split@next=\tcb@split@SL% + \else% + \let\tcb@split@next=\tcb@split@USL% + \fi% \else \tcb@split@lower@box% \tcb@sdraw@USL% @@ -430,10 +436,6 @@ \let\tcb@savebox=\tcb@vbox% \let\endtcb@savebox=\endtcb@vbox% \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable}, - breakable@false/.code={% - \let\tcb@savebox=\tcb@lrbox% - \let\endtcb@savebox=\endtcb@lrbox% - \let\tcb@drawcolorbox=\tcb@drawcolorbox@standalone}, breakable/.style={breakable@#1}, breakable/.default=true,% unbreakable/.style={breakable=false},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 890a5f349dd..b14d5f73c5e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index eedab8df24e..1bda22de6c2 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 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -20,12 +20,15 @@ \makeatletter \def\tcblibrary@hooks@loaded{} +% expandonce from etoolbox +\newcommand{\tcb@expandonce}[1]{\unexpanded\expandafter{#1}} + % slim version of etoolbox'es more general macro \newcommand{\tcb@appto}[2]{% \ifx#1\relax% \edef#1{\unexpanded{#2}}% \else% - \edef#1{\expandonce#1\unexpanded{#2}}% + \edef#1{\tcb@expandonce#1\unexpanded{#2}}% \fi} % slim version of etoolbox'es more general macro @@ -33,7 +36,7 @@ \ifx#1\relax% \edef#1{\unexpanded{#2}}% \else% - \edef#1{\unexpanded{#2}\expandonce#1}% + \edef#1{\unexpanded{#2}\tcb@expandonce#1}% \fi} \tcbset{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index 18827d89ba8..3f6dae4c39e 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 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -163,4 +163,14 @@ \tcb@temp{\kvtcb@tempfile}% }% +\long\def\tcb@newtcblisting#1#2{\newenvironment{#1}{\tcblisting{savedelimiter=#1,#2}}{\endtcblisting}} +\long\def\tcb@new@tcblisting#1[#2]#3{\newenvironment{#1}[#2]{\tcblisting{savedelimiter=#1,#3}}{\endtcblisting}} + +\long\def\tcb@new@@tcblisting#1[#2][#3]#4{\newenvironment{#1}[#2][#3]{\tcblisting{savedelimiter=#1,#4}}{\endtcblisting}} + +\long\def\new@tcblisting#1[#2]{% + \@ifnextchar[{\tcb@new@@tcblisting{#1}[#2]}{\tcb@new@tcblisting{#1}[#2]}} + +\long\def\newtcblisting#1{% + \@ifnextchar[{\new@tcblisting{#1}}{\tcb@newtcblisting{#1}}} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 7ef2d51ad74..617febb25f7 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 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index aab07bdf7bc..75a6c71eccc 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 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index 09cc57d8c8d..da525707d72 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 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 9954b1f9a9c..847f31b842e 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 2.20 (2013/04/17) +%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2013/04/17 version 2.20 text color boxes] +\ProvidesPackage{tcolorbox}[2013/04/23 version 2.21 text color boxes] \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -254,7 +254,12 @@ righthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightwidth}, lefthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftratio}, righthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightratio}, -} + breakable@false/.code={% + \let\tcb@savebox=\tcb@lrbox% + \let\endtcb@savebox=\endtcb@lrbox% + \let\tcb@drawcolorbox=\tcb@drawcolorbox@standalone}, + code/.code={#1}, + } \tcbset{notitle,width=\linewidth,boxsep=1mm,boxrule=0.5mm,adjust text={\"Apgjy}, left=4mm,right=4mm,top=2mm,bottom=2mm,middle=2mm,arc=1mm,lowerbox=visible, @@ -639,10 +644,11 @@ \end{\kvtcb@graphenv}\end{tcb@float}% } +\let\tcb@drawcolorbox@standalone=\tcb@drawcolorbox \newcommand{\tcbox}[2][]{% \begingroup% - \tcbset{#1,unbreakable}% + \tcbset{#1,breakable@false}% \setbox0=\hbox{\begingroup\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#2\kvtcb@after@upper\endgroup}% \tcbdimto{\tcb@temp@wd}{\wd0}% \tcbdimto{\tcb@temp@dp}{\dp0+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand}% @@ -655,7 +661,17 @@ \endgroup% } +\long\def\tcb@newtcolorbox#1#2{\newenvironment{#1}{\tcolorbox[savedelimiter=#1,#2]}{\endtcolorbox}} + +\long\def\tcb@new@tcolorbox#1[#2]#3{\newenvironment{#1}[#2]{\tcolorbox[savedelimiter=#1,#3]}{\endtcolorbox}} + +\long\def\tcb@new@@tcolorbox#1[#2][#3]#4{\newenvironment{#1}[#2][#3]{\tcolorbox[savedelimiter=#1,#4]}{\endtcolorbox}} + +\long\def\new@tcolorbox#1[#2]{% + \@ifnextchar[{\tcb@new@@tcolorbox{#1}[#2]}{\tcb@new@tcolorbox{#1}[#2]}} +\long\def\newtcolorbox#1{% + \@ifnextchar[{\new@tcolorbox{#1}}{\tcb@newtcolorbox{#1}}} % verbatim output as in 'verbatim' |