From f297f05f92068bd7f54e8ee25ce7b8b8a83c2353 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 May 2013 22:27:53 +0000 Subject: tcolorbox (16may13) git-svn-id: svn://tug.org/texlive/trunk@30508 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tcolorbox/CHANGES | 396 +++++++++++---------- Master/texmf-dist/doc/latex/tcolorbox/README | 2 +- .../doc/latex/tcolorbox/tcolorbox-example.pdf | Bin 148406 -> 148418 bytes .../doc/latex/tcolorbox/tcolorbox-example.tex | 2 +- .../latex/tcolorbox/tcolorbox.doc.breakable.tex | 3 - .../latex/tcolorbox/tcolorbox.doc.coremacros.tex | 32 ++ .../latex/tcolorbox/tcolorbox.doc.coreoptions.tex | 5 +- .../texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf | Bin 1938516 -> 1943237 bytes .../texmf-dist/doc/latex/tcolorbox/tcolorbox.tex | 10 +- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 176 +++++++-- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 2 +- .../tex/latex/tcolorbox/tcbhooks.code.tex | 2 +- .../tex/latex/tcolorbox/tcblistings.code.tex | 2 +- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 2 +- .../tex/latex/tcolorbox/tcbskins.code.tex | 2 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 13 +- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 17 +- 17 files changed, 406 insertions(+), 260 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 25247eec8f2..8cc95fb1e75 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,195 +1,201 @@ -%% The LaTeX package tcolorbox - version 2.21 (2013/04/23) -%% -%% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm -%% ------------------------------------------------------------------------------------------- -%% -%% 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 - - - - +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm +%% ------------------------------------------------------------------------------------------- +%% +%% 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 + +version 2.22 (2013/05/15) +- bug fix: text color bleeded out of the box in some cases +- bug fix: breakable boxes were too large in some cases (leading to blank pages) +- bug fix: breaking boxes produced empty boxes in some cases +- documentation forgot naming package 'colortbl' for the 'tabularx' option +- new feature: breakable boxes allow footnotes now (like minipages) +- new macro '\newtcbox' + + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 8696eff79d8..0533f9b9f06 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2013 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 11848764a4d..90967cf8fd0 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 59d493ff090..6c84a9b1b61 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex index e959499b45f..e42aead27dc 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -86,9 +86,6 @@ parameters. The differences are: \item The box content is a \TeX\ |\vbox| register which has a restricted capacity. Therefore, you cannot place hundreds of pages inside a |tcolorbox|. -\item Footnotes can be used inside an \refKey{/tcb/unbreakable} box - but not inside a \refKey{/tcb/breakable} box, even if it is not broken - actually. Other different behaviors may and will be effective. \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, 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 bf52c71934b..11dca2965f4 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex @@ -141,3 +141,35 @@ and options. \end{docCommand} + +\begin{docCommand}{newtcbox}{\marg{\texttt{\textbackslash}name}\oarg{number}\oarg{default}\marg{options}} + Creates a new macro \meta{\texttt{\textbackslash}name} based on \refCom{tcbox}. + Basically, |\newtcbox| operates like |\newcommand|. + The new macro \meta{\texttt{\textbackslash}name} optionally takes \meta{number}$+1$ arguments, where + \meta{default} is the default value for the optional first argument. + The \meta{options} are given to the underlying |tcbox|. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\newtcbox{\mybox}{colback=red!5!white, + colframe=red!75!black} + +\mybox{This is my own box.} +\end{dispExample*} + +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\newtcbox{\mybox}[1]{colback=red!5!white, + colframe=red!75!black,fonttitle=\bfseries, + title=#1} + +\mybox{Hello there}{This is my own box.} +\end{dispExample*} + +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\newtcbox{\mybox}[2][]{colback=red!5!white, + colframe=red!75!black,fonttitle=\bfseries, + title=#2,#1} + +\mybox[colback=yellow]{Hello there}% + {This is my own box.} +\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 867e9890745..cf5c9669d37 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -951,9 +951,11 @@ This is the lower part. 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. + The packages |tabularx| \cite {carlisle:1999a}, |array|, and |colortbl| + have to be loaded separately. \begin{dispExample} % \usepackage{array,tabularx} +% \usepackage{colortbl} - or - \usepackage[table]{xcolor} \newcolumntype{Y}{>{\raggedleft\arraybackslash}X}% see tabularx \tcbset{enhanced,fonttitle=\bfseries\large,fontupper=\normalsize\sffamily, colback=yellow!10!white,colframe=red!50!black,colbacktitle=Salmon!30!white, @@ -975,6 +977,7 @@ Sum & 6000.00 & 9000.00 & 12000.00 & 15000.00 & 42000.00 before the table starts. \begin{dispExample} % \usepackage{array,tabularx} +% \usepackage{colortbl} - or - \usepackage[table]{xcolor} \tcbset{enhanced,fonttitle=\bfseries\large,fontupper=\normalsize\sffamily, colback=yellow!10!white,colframe=red!50!black,colbacktitle=Salmon!30!white, coltitle=black,center title} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf index 7685c8f8a7f..08269fd3609 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 c3ab1f3b3bc..2dc6d526ec6 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -82,8 +82,8 @@ pdfkeywords={colored boxes, LaTeX examples, theorems} } -\def\version{2.21}% -\def\datum{2013/04/23}% +\def\version{2.22}% +\def\datum{2013/05/15}% \makeindex @@ -104,7 +104,7 @@ classoffset=1, % tcolorbox macros moretexcs={% core - endtcolorbox,endtcbverbatimwrite,newtcolorbox,tcbusetemp, + endtcolorbox,endtcbverbatimwrite,newtcolorbox,newtcbox,tcbusetemp, tcblower,tcbox,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite, % listings endtcblisting,newtcblisting, @@ -211,7 +211,7 @@ docexample original/.style={colframe=ExampleFrame,colback=ExampleBack,fontlower=\footnotesize,frame style={}}, } -%\includeonly{tcolorbox.doc.skins} +%\includeonly{tcolorbox.doc.coremacros,tcolorbox.doc.theorems} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 5e1a42ea4cd..b6b98be075f 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -34,10 +34,24 @@ \@endpefalse% \begingroup% \csname tcb@parboxrestore@\kvtcv@parbox\endcsname% + \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@% + \let\@footnotetext\@mpfootnotetext% + \@setminipage% \ignorespaces% \let\tcb@drawcolorbox=\tcb@drawcolorbox@standalone% } -\def\endtcb@vbox{\unskip\endgroup} + +\def\endtcb@vbox{% + \par% + \unskip% + \ifvoid\@mpfootins\else% + \vskip\skip\@mpfootins% + \normalcolor% + \footnoterule% + \unvbox\@mpfootins% + \fi% + \@minipagefalse% + \endgroup} % remaining height \def\tcb@comp@h@page{% @@ -52,6 +66,11 @@ \fi% } +\def\tcb@comp@h@total@standalone{% + \tcbdimto\tcb@h@padding{\kvtcb@bbtop@stand+\kvtcb@bbbottom@stand+\kvtcb@top@rule@stand+\kvtcb@bottom@rule@stand+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}% + \tcbdimto\tcb@h@total{\tcb@h@before+\tcb@h@after+\tcb@h@padding+\tcb@h@padtitle+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower}% +} + \def\tcb@following@title{% \ifx\kvtcb@followingtitle\@empty% \tcb@hasTitlefalse% @@ -84,9 +103,10 @@ \tcb@comp@h@page% % % height calculation - \tcbdimto\tcb@h@padding{\kvtcb@bbtop@stand+\kvtcb@bbbottom@stand+\kvtcb@top@rule@stand+\kvtcb@bottom@rule@stand+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}% + %\tcbdimto\tcb@h@padding{\kvtcb@bbtop@stand+\kvtcb@bbbottom@stand+\kvtcb@top@rule@stand+\kvtcb@bottom@rule@stand+\kvtcb@boxsep*2+\kvtcb@top+\kvtcb@bottom}% % - \tcbdimto\tcb@h@total{\tcb@h@before+\tcb@h@after+\tcb@h@padding+\tcb@h@padtitle+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower}% + %\tcbdimto\tcb@h@total{\tcb@h@before+\tcb@h@after+\tcb@h@padding+\tcb@h@padtitle+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower}% + \tcb@comp@h@total@standalone% % \let\tcb@split@next=\relax% \ifdim\tcb@h@total<\tcb@h@page\relax% no break @@ -111,20 +131,35 @@ \tcb@split@next% } + +\def\tcb@setbox@upper#1#2{% + \setbox\tcb@upperbox=\vbox{\begingroup\color{\kvtcb@colupper}\unvbox#2\endgroup}% + \ifdim\dimexpr\ht\tcb@upperbox+\dp\tcb@upperbox>#1\relax% + \setbox\tcb@upperbox=\vbox to\the\dimexpr#1-\dp\tcb@upperbox\relax {\unvbox\tcb@upperbox}% + \fi% + \tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}% +} + \def\tcb@split@upper@box{% \vfuzz=\maxdimen\vbadness=10000% \setbox\tcb@upperbox=\vsplit\tcb@totalupperbox to\tcb@split@dim% - \setbox\tcb@upperbox=\vbox{\begingroup\color{\kvtcb@colupper}\unvbox\tcb@upperbox\endgroup}% + \tcb@setbox@upper{\tcb@split@dim}{\tcb@upperbox}% \vbadness=\tcb@thevbadness\vfuzz=\tcb@thevfuzz% - \tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}% +} + +\def\tcb@setbox@lower#1#2{% + \setbox\tcb@lowerbox=\vbox{\begingroup\color{\kvtcb@collower}\unvbox#2\endgroup}% + \ifdim\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox>#1\relax% + \setbox\tcb@lowerbox=\vbox to\the\dimexpr#1-\dp\tcb@lowerbox\relax {\unvbox\tcb@lowerbox}% + \fi% + \tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% } \def\tcb@split@lower@box{% \vfuzz=\maxdimen\vbadness=10000% \setbox\tcb@lowerbox=\vsplit\tcb@totallowerbox to\tcb@split@dim% - \setbox\tcb@lowerbox=\vbox{\unvbox\tcb@lowerbox}% + \tcb@setbox@lower{\tcb@split@dim}{\tcb@lowerbox}% \vbadness=\tcb@thevbadness\vfuzz=\tcb@thevfuzz% - \tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% } \def\tcb@split@setstate@first{% @@ -157,6 +192,21 @@ \let\tcb@break@bottomsep=\tcb@zpt% } +\def\tcb@swap#1#2{% + \let\tcb@temp=#1% + \let#1=#2% + \let#2=\tcb@temp% +} + + +\def\tcb@split@force@standalone{% + \tcb@comp@h@total@standalone% + \ifdim\tcb@h@total>\tcb@h@page% + \tcbdimto\kvtcb@bbbottom@stand{\kvtcb@bbbottom@stand+\tcb@h@page-\tcb@h@total}% + \fi% +} + + \def\tcb@split@first{% \setcounter{tcbbreakpart}{1}% \ifx\kvtcb@float\@empty% @@ -194,16 +244,27 @@ \edef\tcb@thevfuzz{\the\vfuzz}% \edef\tcb@thevbadness{\the\vbadness}% % - \setbox\tcb@totalupperbox=\vbox{\unvbox\tcb@upperbox}% - \setbox\tcb@totallowerbox=\vbox{\unvbox\tcb@lowerbox}% + \tcb@swap{\tcb@totalupperbox}{\tcb@upperbox}% + \tcb@swap{\tcb@totallowerbox}{\tcb@lowerbox}% % + \let\tcb@split@next=\relax% \tcbdimto\tcb@split@dim{\tcb@h@page-\tcb@h@before-\tcb@h@padding@first-\tcb@h@padtitle}% \ifdim\tcb@split@dim<\tcb@h@upper\relax% \tcb@split@upper@box% - \tcb@sdraw@U% - \let\tcb@split@next=\tcb@split@USL% + \ifvoid\tcb@totalupperbox% + \iftcb@lowerspace% + \tcb@sdraw@U% + \let\tcb@split@next=\tcb@split@SL% + \else% + \tcb@split@force@standalone% + \tcb@drawcolorbox@standalone% + \fi% + \else% + \tcb@sdraw@U% + \let\tcb@split@next=\tcb@split@USL% + \fi% \else% - \setbox\tcb@upperbox=\vbox{\unvbox\tcb@totalupperbox}% + \tcb@swap{\tcb@totalupperbox}{\tcb@upperbox}% \tcbdimto\tcb@split@dim{\tcb@split@dim-\tcb@h@upper-\tcb@h@segment} \ifdim\tcb@split@dim<\kvtcb@breakminlines\baselineskip\relax% \tcb@sdraw@U% @@ -214,14 +275,27 @@ \fi% \else \tcb@split@lower@box% - \tcb@sdraw@USL% - \let\tcb@split@next=\tcb@split@L% + \ifvoid\tcb@totallowerbox% + \tcb@split@force@standalone% + \tcb@drawcolorbox@standalone% + \else% + \tcb@sdraw@USL% + \let\tcb@split@next=\tcb@split@L% + \fi% \fi% \fi% \tcb@split@next% } +\def\tcb@split@force@last{% + \tcb@split@setstate@last% + \ifdim\tcb@h@total>\tcb@h@page% + \tcbdimto\kvtcb@bbbottom{\kvtcb@bbbottom+\tcb@h@page-\tcb@h@total}% + \fi% +} + + \def\tcb@split@USL{% \stepcounter{tcbbreakpart}% \tcb@following@title% @@ -229,37 +303,53 @@ \tcbdimto\tcb@h@upper{\ht\tcb@totalupperbox+\dp\tcb@totalupperbox}% \tcbdimto\tcb@h@total{\tcb@h@after+\tcb@h@padding@last+\tcb@h@padtitle+\tcb@h@upper+\tcb@h@segment+\tcb@h@lower}% % + \let\tcb@split@next=\relax% \ifdim\tcb@h@total<\tcb@h@page\relax% no break \tcb@split@setstate@last% - \setbox\tcb@upperbox=\vbox{\begingroup\color{\kvtcb@colupper}\unvbox\tcb@totalupperbox\endgroup}% - \setbox\tcb@lowerbox=\vbox{\begingroup\color{\kvtcb@collower}\unvbox\tcb@totallowerbox\endgroup}% + \tcb@setbox@upper{\tcb@h@upper}{\tcb@totalupperbox}% \iftcb@lowerspace% + \tcb@setbox@lower{\tcb@h@lower}{\tcb@totallowerbox}% \tcb@sdraw@USL% \else \tcb@sdraw@U% \fi% - \let\tcb@split@next=\relax% \else \tcb@split@setstate@middle% \tcbdimto\tcb@split@dim{\tcb@h@page-\tcb@h@padding@middle-\tcb@h@padtitle}% \ifdim\tcb@split@dim<\tcb@h@upper\relax% \tcb@split@upper@box% - \tcb@sdraw@U% - \let\tcb@split@next=\tcb@split@USL% - \else% - \setbox\tcb@upperbox=\vbox{\begingroup\color{\kvtcb@colupper}\unvbox\tcb@totalupperbox\endgroup}% - \tcbdimto\tcb@split@dim{\tcb@split@dim-\tcb@h@upper-\tcb@h@segment} - \ifdim\tcb@split@dim<\kvtcb@breakminlines\baselineskip\relax% - \tcb@sdraw@U% + \ifvoid\tcb@totalupperbox% \iftcb@lowerspace% - \let\tcb@split@next=\tcb@split@SL% + \tcb@sdraw@U% + \let\tcb@split@next=\tcb@split@SL% \else% + \tcb@split@force@last% + \tcb@sdraw@U% + \fi% + \else% + \tcb@sdraw@U% \let\tcb@split@next=\tcb@split@USL% + \fi% + \else% + \tcb@setbox@upper{\tcb@h@upper}{\tcb@totalupperbox}% + \iftcb@lowerspace% + \tcbdimto\tcb@split@dim{\tcb@split@dim-\tcb@h@upper-\tcb@h@segment} + \ifdim\tcb@split@dim<\kvtcb@breakminlines\baselineskip\relax% + \tcb@sdraw@U% + \let\tcb@split@next=\tcb@split@SL% + \else + \tcb@split@lower@box% + \ifvoid\tcb@totallowerbox% + \tcb@split@force@last% + \tcb@sdraw@USL% + \else% + \tcb@sdraw@USL% + \let\tcb@split@next=\tcb@split@L% + \fi% \fi% - \else - \tcb@split@lower@box% - \tcb@sdraw@USL% - \let\tcb@split@next=\tcb@split@L% + \else% + \tcb@split@force@last% + \tcb@sdraw@U% \fi% \fi% \fi% @@ -275,17 +365,22 @@ \tcbdimto\tcb@h@lower{\ht\tcb@totallowerbox+\dp\tcb@totallowerbox}% \tcbdimto\tcb@h@total{\tcb@h@after+\tcb@h@padding@last-\kvtcb@top-\kvtcb@boxsep+\tcb@h@padtitle+\tcb@h@segment+\tcb@h@lower}% % + \let\tcb@split@next=\relax% \ifdim\tcb@h@total<\tcb@h@page\relax% no break \tcb@split@setstate@last% - \setbox\tcb@lowerbox=\vbox{\begingroup\color{\kvtcb@collower}\unvbox\tcb@totallowerbox\endgroup}% + \tcb@setbox@lower{\tcb@h@lower}{\tcb@totallowerbox}% \tcb@sdraw@SL% - \let\tcb@split@next=\relax% \else \tcb@split@setstate@middle% \tcbdimto\tcb@split@dim{\tcb@h@page-\tcb@h@padding@middle+\kvtcb@top+\kvtcb@boxsep-\tcb@h@padtitle-\tcb@h@segment}% \tcb@split@lower@box% - \tcb@sdraw@SL% - \let\tcb@split@next=\tcb@split@L% + \ifvoid\tcb@totallowerbox% + \tcb@split@force@last% + \tcb@sdraw@SL% + \else + \tcb@sdraw@SL% + \let\tcb@split@next=\tcb@split@L% + \fi% \fi% \tcb@split@next% } @@ -299,17 +394,22 @@ \tcbdimto\tcb@h@lower{\ht\tcb@totallowerbox+\dp\tcb@totallowerbox}% \tcbdimto\tcb@h@total{\tcb@h@after+\tcb@h@padding@last+\tcb@h@padtitle+\tcb@h@lower}% % + \let\tcb@split@next=\relax% \ifdim\tcb@h@total<\tcb@h@page\relax% no break \tcb@split@setstate@last% - \setbox\tcb@lowerbox=\vbox{\begingroup\color{\kvtcb@collower}\unvbox\tcb@totallowerbox\endgroup}% + \tcb@setbox@lower{\tcb@h@lower}{\tcb@totallowerbox}% \tcb@sdraw@L% - \let\tcb@split@next=\relax% \else \tcb@split@setstate@middle% \tcbdimto\tcb@split@dim{\tcb@h@page-\tcb@h@padding@middle-\tcb@h@padtitle}% \tcb@split@lower@box% - \tcb@sdraw@L% - \let\tcb@split@next=\tcb@split@L% + \ifvoid\tcb@totallowerbox% + \tcb@split@force@last% + \tcb@sdraw@L% + \else + \tcb@sdraw@L% + \let\tcb@split@next=\tcb@split@L% + \fi% \fi% \tcb@split@next% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index b14d5f73c5e..7cb9b5cf1d2 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% 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 1bda22de6c2..3a5dbc4f98f 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index 3f6dae4c39e..3c12ec06328 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 617febb25f7..bc2b02ebd0b 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% 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 75a6c71eccc..9c2bf760b1f 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% 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 da525707d72..4bb334b5d5b 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -57,14 +57,9 @@ } \newcommand{\tcbmaketheorem}[5]{% - \newenvironment{#1}[3][]{% - \tcolorbox[#3,savedelimiter=#1, - theorem={#2}{#4}{##2}{#5:##3}, - ##1]}% - {\endtcolorbox}% + \newtcolorbox{#1}[3][]{#3,theorem={#2}{#4}{##2}{#5:##3},##1}% } -\newcommand{\tcboxmath}[1][]{\tcbox[nobeforeafter,math upper,tcbox raise base,#1]} - -\newcommand{\tcbhighmath}[1][]{\tcboxmath[highlight math,#1]} +\newtcbox{\tcboxmath}[1][]{nobeforeafter,math upper,tcbox raise base,#1} +\newtcbox{\tcbhighmath}[1][]{nobeforeafter,math upper,tcbox raise base,highlight math,#1} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 847f31b842e..8238c1589b5 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.21 (2013/04/23) +%% The LaTeX package tcolorbox - version 2.22 (2013/05/15) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2013/04/23 version 2.21 text color boxes] +\ProvidesPackage{tcolorbox}[2013/05/15 version 2.22 text color boxes] \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -382,6 +382,7 @@ \unskip\tcb@after@box% \end{tcb@savebox}% \tcb@draw@color@box% + \color{.}% hack for some special cases } \let\endtcolorbox=\tcb@endboxanddraw @@ -673,6 +674,18 @@ \long\def\newtcolorbox#1{% \@ifnextchar[{\new@tcolorbox{#1}}{\tcb@newtcolorbox{#1}}} +\long\def\tcb@newtcbox#1#2{\newcommand{#1}{\tcbox[#2]}} + +\long\def\tcb@new@tcbox#1[#2]#3{\newcommand{#1}[#2]{\tcbox[#3]}} + +\long\def\tcb@new@@tcbox#1[#2][#3]#4{\newcommand{#1}[#2][#3]{\tcbox[#4]}} + +\long\def\new@tcbox#1[#2]{% + \@ifnextchar[{\tcb@new@@tcbox{#1}[#2]}{\tcb@new@tcbox{#1}[#2]}} + +\long\def\newtcbox#1{% + \@ifnextchar[{\new@tcbox{#1}}{\tcb@newtcbox{#1}}} + % verbatim output as in 'verbatim' \newwrite\tcb@out -- cgit v1.2.3