diff options
22 files changed, 934 insertions, 496 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 0c1acfe59f0..0fac352a7fc 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,247 +1,259 @@ -%% The LaTeX package tcolorbox - version 2.32 (2013/06/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
-
-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'
-
-version 2.30 (2013/06/04)
-- bug fix: handling of 'before' and 'after' for \tcbox corrected
-- \tcbline now also works for centered environments
-- implementation for \tcbox made more efficient
-- new capture mode for automated content fit by font size adjustment
- with the new macros '\tcboxfit' and '\newtcboxfit'
- and the new keys 'fit', 'fit to', 'fit to height', 'fit basedim', 'fit skip',
- 'fit maxstep'
-- new keys 'baseline', 'capture', 'hbox', 'minipage'
-- new stackable borderlines with the 'skins' library:
- 'borderline', 'no borderline'
-- new keys for the 'skins' library:
- 'enhanced standard', 'blank'
-- new key 'index format' for the 'documentation' library
-
-version 2.31 (2013/06/18)
-- several internal changes
-- library loading mechanism revisited
-- internal label change for '\tcbmaketheorem'
-- new library options 'most' and 'all'
-- \tcbline now also works for ragged environments
-- new keys:
- 'flushleft title', 'flushleft upper', 'flushleft lower',
- 'flushright title', 'flushright upper', 'flushright lower'
-- new key 'no listing options' for the 'listings' library
-- new shadow features for the 'skins' library with the options:
- 'shadow', 'fuzzy shadow', 'drop shadow', 'drop fuzzy shadow', 'halo', 'fuzzy halo'
-- shadows for the 'beamer' skin changed to fuzzy
-- new library 'fitting' for the content fit operations.
- NOTE: '\tcboxfit' and the fit options introduced in version 2.30 are moved
- to this new library
-- the fit algorithm is completey revisited and extended
-- new macro '\tcbfontsize' ('fitting library') for relative font sizes
-- new keys for the 'fitting' library:
- 'fit fontsize macros', 'fit height plus', 'fit width plus',
- 'fit width from', 'fit height from'
-
-version 2.32 (2013/06/23)
-- bug fix: 'ams nodisplayskip lower' was applied to upper.
-- new option 'check odd page'
-- new environments for the 'skins' library:
- 'tcbclipinterior', 'tcbclipframe', 'tcbcliptitle'
-- new keys for the 'skins' library:
- 'watermark overzoom', 'clip watermark'
- 'clip title', 'clip upper', 'clip lower'
-- NOTE: watermarks are now clipped by default.
- To get the old behaviour add the option 'clip watermark=false'
+%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) +%% +%% ------------------------------------------------------------------------------------------- +%% 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 + +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' + +version 2.30 (2013/06/04) +- bug fix: handling of 'before' and 'after' for \tcbox corrected +- \tcbline now also works for centered environments +- implementation for \tcbox made more efficient +- new capture mode for automated content fit by font size adjustment + with the new macros '\tcboxfit' and '\newtcboxfit' + and the new keys 'fit', 'fit to', 'fit to height', 'fit basedim', 'fit skip', + 'fit maxstep' +- new keys 'baseline', 'capture', 'hbox', 'minipage' +- new stackable borderlines with the 'skins' library: + 'borderline', 'no borderline' +- new keys for the 'skins' library: + 'enhanced standard', 'blank' +- new key 'index format' for the 'documentation' library + +version 2.31 (2013/06/18) +- several internal changes +- library loading mechanism revisited +- internal label change for '\tcbmaketheorem' +- new library options 'most' and 'all' +- \tcbline now also works for ragged environments +- new keys: + 'flushleft title', 'flushleft upper', 'flushleft lower', + 'flushright title', 'flushright upper', 'flushright lower' +- new key 'no listing options' for the 'listings' library +- new shadow features for the 'skins' library with the options: + 'shadow', 'fuzzy shadow', 'drop shadow', 'drop fuzzy shadow', 'halo', 'fuzzy halo' +- shadows for the 'beamer' skin changed to fuzzy +- new library 'fitting' for the content fit operations. + NOTE: '\tcboxfit' and the fit options introduced in version 2.30 are moved + to this new library +- the fit algorithm is completey revisited and extended +- new macro '\tcbfontsize' ('fitting library') for relative font sizes +- new keys for the 'fitting' library: + 'fit fontsize macros', 'fit height plus', 'fit width plus', + 'fit width from', 'fit height from' + +version 2.32 (2013/06/23) +- bug fix: 'ams nodisplayskip lower' was applied to upper. +- new option 'check odd page' +- new environments for the 'skins' library: + 'tcbclipinterior', 'tcbclipframe', 'tcbcliptitle' +- new keys for the 'skins' library: + 'watermark overzoom', 'clip watermark' + 'clip title', 'clip upper', 'clip lower' +- NOTE: watermarks are now clipped by default. + To get the old behaviour add the option 'clip watermark=false' + +version 2.33 (2013/07/04) +- new options 'phantom', 'step and label', 'nophantom', + 'lower separated', 'reset', 'toggle left and right' +- 'highlight math' sets 'notitle,nophantom' automatically +- hyper anchor setting for theorems and LaTeX examples improved +- new key 'shield externalize' for externalization +- additional empty-first-box test for breakable boxes +- new key 'enlargepage' for fine-tuning breakable boxes +- parameter added to option 'oversize' +- option 'toggle enlargement' has a default value 'evenpage' now + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index d87f56b89d8..f38eca9f9f1 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% %% ------------------------------------------------------------------------------------------- %% 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 811f18687a5..4c866dc2eff 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 ebad17baa6f..90b5a446a39 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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 e2108ceb652..eaedb8f7bff 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex @@ -24,7 +24,7 @@ colback=yellow!10!white,colframe=red!50!black,before=\par\bigskip\noindent, watermark color=yellow!75!red!25!white,pad at break=3mm, watermark text={\bfseries\Large Contents}, - shrink break goal=25pt, + enlargepage=2\baselineskip, drop fuzzy shadow] \makeatletter \@starttoc{toc} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex index e42aead27dc..3c893dc6d72 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -152,6 +152,26 @@ parameters. The differences are: \end{docTcbKey} +\begin{docTcbKey}{enlargepage}{=\meta{length}\colOpt{/\meta{length}\ldots/\meta{length}}}{no default, initially |0pt|} + Inserts a |\enlargethispage|\marg{length} to the pages of the break sequence, + i.\,e.\ allows to enlarge (or shrink) partial boxes. The first \meta{length} is applied + to the first partial box, the second \meta{length} is applied + to the second partial box, and so on. The last \meta{length} value is applied + to all following partial boxes if any. Note that floating boxes will not be enlarged. +\begin{dispListing} +\begin{tcolorbox}[breakable,enlargepage=0mm/\baselineskip/2\baselineskip/0mm,... +\end{dispListing} + The example code enlarged the second partial box by one line, the third + partial box by two lines, and all following parts are not enlarged. + \begin{marker} + If an automated page break occures before the first partial box, the + page enlargement is applied to the page before the first partial box \emph{and} + again to the page of the first partial box. Insert a manual break to prevent this.\\ + In general, |enlargepage| should be used at the final stage of a document + for fine-tuning only. + \end{marker} +\end{docTcbKey} + \begin{docTcbKey}{shrink break goal}{=\meta{length}}{no default, initially |0pt|} This is an emergency parameter if the break algorithm produces unpleasant 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 9a7b682057d..c220d7ceb70 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -81,7 +81,7 @@ This is the lower part (but ignored). \begin{docTcbKey}{savelowerto}{=\meta{file name}}{no default, initially empty} - Saves the content of the lower box in a file for an optional later usage. + Saves the content of the lower part in a file for an optional later usage. \begin{dispExample} \begin{tcolorbox}[lowerbox=invisible,savelowerto=\jobname_bspsave.tex,colback=white] This is a \textbf{tcolorbox}. @@ -95,6 +95,51 @@ Now, we load the saved text:\\ \end{dispExample} \end{docTcbKey} +\clearpage +\begin{docTcbKey}{lower separated}{\colOpt{=\meta{boolean value}}}{default |true|, initially |true|} +If set to |true|, the lower part is visually separated from the upper part. +It depends from the chosen skin how the visualization of the separation is done. + +\begin{dispExample} +% \tcbuselibrary{skins} +\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries,nobeforeafter, + width=(\linewidth-4mm)/2,fontlower=\itshape} + +\begin{tcolorbox}[title=Lower separated] +This is the upper part. +\tcblower +This is the lower part. +\end{tcolorbox}\hfill +\begin{tcolorbox}[title=Lower not separated,lower separated=false] +This is the upper part. +\tcblower +This is the lower part. +\end{tcolorbox} +\par\bigskip\par +\begin{tcolorbox}[sidebyside,title=Lower separated] +This is the upper part. +\tcblower +This is the lower part. +\end{tcolorbox}\hfill +\begin{tcolorbox}[sidebyside,title=Lower not separated,lower separated=false] +This is the upper part. +\tcblower +This is the lower part. +\end{tcolorbox} +\par\bigskip\par +\begin{tcolorbox}[beamer,title=Lower separated] +This is the upper part. +\tcblower +This is the lower part. +\end{tcolorbox}\hfill +\begin{tcolorbox}[beamer,title=Lower not separated,lower separated=false] +This is the upper part. +\tcblower +This is the lower part. +\end{tcolorbox} +\end{dispExample} +\end{docTcbKey} + \clearpage \begin{docTcbKey}{savedelimiter}{=\meta{name}}{no default, initially \texttt{tcolorbox}} @@ -576,9 +621,10 @@ This is the lower part. \clearpage -\begin{docTcbKey}{oversize}{}{style} - Sets the text width of the upper part to the current line width. - This is achieved by changed the keys \refKey{/tcb/width} +\begin{docTcbKey}{oversize}{\colOpt{=\meta{length}}}{style, default |0pt|} + Sets the text width of the upper part to the current line width plus an + optional \meta{length}. + This is achieved by changing the keys \refKey{/tcb/width} \refKey{/tcb/enlarge left by}, and \refKey{/tcb/enlarge right by} appropriately. The resulting box is overlapping into the left and right margin of @@ -604,6 +650,46 @@ This is the lower part. {\tcbusetemp} +\clearpage +\begin{docTcbKey}{toggle left and right}{=\meta{toggle preset}}{default |evenpage|, initially |none|} + According to the \meta{toggle preset}, the left and the right settings of + the |tcolorbox| are switched or not. Feasible values are: + \begin{itemize} + \item |none|: no switching. + \item |forced|: the values of the left and right rules and spaces are switched. + \item |evenpage|: if the page is an even page, the values of the left and + right rules and spaces are switched. It is recommended to use this setting in + conjunction with \refKey{/tcb/check odd page}. + \end{itemize} +\begin{dispListing} +% \usepackage{changepage} for 'check odd page' +% \usepackage{lipsum} +% \usetikzlibrary{patterns} +% \tcbuselibrary{skins,breakable,hooks} +\begin{tcolorbox}[skin=enhancedmiddle,breakable, + check odd page,toggle left and right, + boxrule=0mm,top=0mm,bottom=0mm,left=1mm,right=1mm, + rightrule=1cm,colupper=blue!25!black, + watermark graphics=lichtspiel.jpg,watermark opacity=0.5, + watermark overzoom=1.00,watermark opacity=0.25, + frame style={pattern=crosshatch dots light steel blue}, + overlay app={% + \ifoddpage\coordinate (X) at ([xshift=-5mm]frame.east); + \else\coordinate (X) at ([xshift=5mm]frame.west);\fi + \fill[shading=ball,ball color=blue!50!white,opacity=0.5] (X) circle (4mm);}] +\lipsum[1-6] +\end{tcolorbox} +\end{dispListing} +\medskip + +This example switches a |1cm| thick rule from the left to the right side +depending on the page number. Thereby, the rule is always on the outer side +of the double-sided paper. Additionally, a ball is drawn on the outer side +with help of an overlay. +\bigskip + +\tcbusetemp +\end{docTcbKey} \clearpage \subsection{Height Control} @@ -1041,10 +1127,6 @@ This is the lower part. \end{docTcbKey} - - - - \clearpage \begin{docTcbKey}{tabularx}{=\meta{preamble}}{style} This style sets \refKey{/tcb/before upper} and \refKey{/tcb/after upper} @@ -1276,9 +1358,9 @@ are drawn by the codes given with \colorlet{colexam}{red!75!black} \newtcolorbox{myexample}{% - code={\refstepcounter{example}% - \settowidth{\examlen}{\Large\bfseries Example \arabic{example}}},% - title=Example \arabic{example}, + phantom={\refstepcounter{example}% + \settowidth{\global\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, @@ -1313,18 +1395,21 @@ are drawn by the codes given with \begin{dispExample} % \tcbuselibrary{skins} -\newtcolorbox{FancyTitle}[2][]{% +% \newcounter{example} +\newtcolorbox{FancyTitle}[3][]{% enhanced,colback=blue!10!white,colframe=orange,top=4mm, enlarge top by=\baselineskip/2+1mm, enlarge top at break by=0mm,pad at break=2mm, fontupper=\normalsize, + step and label={example}{#3}, overlay unbroken and first={% \node[rectangle,rounded corners,draw=black,fill=blue!20!white, inner sep=1mm,anchor=west,font=\small] - at ([xshift=4.5mm]frame.north west) {\strut\textbf{#2}};}, + at ([xshift=4.5mm]frame.north west) + {\strut\textbf{Example \arabic{example}: #2}};}, #1}% -\begin{FancyTitle}{My fancy title} +\begin{FancyTitle}{My fancy title}{fancy:title} \lipsum[1] \end{FancyTitle} \end{dispExample} @@ -1646,7 +1731,7 @@ This is a \textbf{tcolorbox}. \end{docTcbKey} \clearpage -\begin{docTcbKey}{toggle enlargement}{=\meta{toggle preset}}{no default, initially |none|} +\begin{docTcbKey}{toggle enlargement}{=\meta{toggle preset}}{default |evenpage|, initially |none|} According to the \meta{toggle preset}, the left and the right enlargements of the bounding box are switched or not. Feasible values are: \begin{itemize} @@ -1928,12 +2013,51 @@ the core package are therefore described in section \ref{sec:skincorekeys} from page \pageref{sec:skincorekeys}. \clearpage -\subsection{Miscellaneous} +\subsection{Counters and Page References} + +\begin{docTcbKey}{phantom}{=\meta{code}}{no default, initially unset} +The \meta{code} is put in a box at the upper left corner of the |tcolorbox|. +If the |tcolorbox| is breakable, the \meta{code} is executed for the first box of +the break sequence only.\par +The \meta{code} is intended to be used for counter stepping, labelling, and +related operations which do not produce visible text. +\begin{itemize} +\item The \meta{code} is executed before the title and box content, i.\,e.\ counter + values are ensured to be increased before usage. +\item Labels are ensured to reference the correct page number. +\item The \meta{code} is executed only once even during fitting operations for + title and box content. +\item In combination with the |hyperref| package, the hyper anchor is set + to the upper left corner of the |tcolorbox|, i.\,e.\ links inside the pdf document + will jump to the box pleasantly. +\item Since the \meta{code} is executed inside a \TeX\ group, only global + operations can survive this group. +\end{itemize} +Examples for the |phantom| usage are given in Section \ref{listing:exercises} +from page \pageref{listing:exercises}, e.\,g.\ +Example \ref{exe:tabular_example} on page \pageref{exe:tabular_example}. +\end{docTcbKey} +\begin{docTcbKey}{nophantom}{}{no value, initially set} +Removes the phantom code if set before. +\end{docTcbKey} + +\begin{docTcbKey}{step and label}{=\marg{counter}\marg{marker}}{no default, initially unset} +Shortcut for |phantom={\refstepcounter{#1}\label{#2}}|. The \meta{counter} is +increased and the \meta{marker} is set as label text.\par +Examples for the |phantom| usage are given in Section \ref{sec:latextutorial} +from page \pageref{sec:latextutorial}, e.\,g.\ +Example \ref{firstExample} on page \pageref{firstExample}. +\end{docTcbKey} + +\clearpage \begin{docTcbKey}{check odd page}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} If set to |true|, the even/odd page testing from the package |changepage| -is applied. The \refKey{/tcb/toggle enlargement} check will use the +is applied. The \refKey{/tcb/toggle enlargement} check +and the \refKey{/tcb/toggle left and right} check +will use the |\ifoddpage| macro from this package. +This options is independent from \refKey{/tcb/phantom}. Note that you have to include the package |changepage| by hand\footnote{If |changepage| is not included, a compilation error will arise.}: @@ -1959,3 +2083,49 @@ box content. \end{dispExample} \end{docTcbKey} + +\clearpage +\subsection{Externalization} +If the \emph{externalization} library of the \texttt{tikz} package is used +and \refKey{/tcb/graphical environment} is set to |tikzpicture|, +a |tcolorbox| could trigger the externalization process which will arise +a compilation error. + +To avoid this, there are two possible strategies: +\begin{itemize} +\item Ensure, that |\tikzexternaldisable| is set before a |tcolorbox| is used. + If you typically use the pattern |\tikzexternalenable| \textit{some picture} |\tikzexternaldisable|, + there is nothing to care about. +\item If \emph{externalization} is enabled globally, use \refKey{/tcb/shield externalize} to + shield any |tcolorbox|. The preamble code could look like this: +\begin{dispListing} +\usetikzlibrary{external} +\tikzexternalize +\tcbset{shield externalize} +\end{dispListing} +\end{itemize} + +\begin{docTcbKey}{shield externalize}{\colOpt{=\meta{boolean value}}}{default |true|, initially |false|} +If set to |true|, the drawing part of the |tcolorbox| is not being externalized +which is a good thing at the current state of art. Nevertheless, if the +|tcolorbox| contains a |tikzpicture|, this picture is still externalized. +Pictures drawn with help of \refKey{/tcb/tikz upper} or alike are \emph{not} +externalized. +\end{docTcbKey} + +\begin{marker} +If a |tcolorbox| is used inside a node of an encircling |tikzpicture| which is externalized, +do \emph{not} use |\tikzexternaldisable| in front of the |tcolorbox|. +\refKey{/tcb/shield externalize} is deactivated automatically inside a |tikzpicture|. +\end{marker} + + + +\subsection{Miscellaneous} +\begin{docTcbKey}{reset}{}{no value, initially set} +Sets (nearly) all |tcolorbox| settings (including loaded libraries) back to their default values. +\refKey{/tcb/savedelimiter} and \refKey{/tcb/capture} keep their values. +This option is useful for boxes in boxes where the inner box should not inherit +the settings of the outer box. +See \refCom{tcbhighmath} for an example. +\end{docTcbKey} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex index 171988fc395..e0d360cfe2c 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex @@ -321,6 +321,8 @@ Typically, the optional title of a |tcolorbox| is not part of the fit operation. If a \refKey{/tcb/fit width plus} is applied, the title is also adapted to the new width. If counters are increased inside the title text, they may be increased more than one time. +To avoid this, you are encouraged to use \refKey{/tcb/phantom} or \refKey{/tcb/step and label} +to set counters. \end{marker} 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 c2a6f9ef860..317ad7e5166 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex @@ -371,7 +371,8 @@ numbering. coltitle=red!50!yellow!3!white, fonttitle=\small\sffamily\bfseries, fontupper=\small, fontlower=\small}, example/.style 2 args={texexp, - title={Example \refstepcounter{texexp}\label{#2}\thetexexp: #1}}, + step and label={texexp}{#2}, + title={Example \thetexexp: #1}}, } \end{dispListing} \tcbusetemp @@ -569,7 +570,7 @@ The following series of examples demonstrate the application of \clearpage -\subsection{Creation of \LaTeX\ Exercises} +\subsection{Creation of \LaTeX\ Exercises}\label{listing:exercises} In the following, a guideline is given for the creation of \LaTeX\ exercises with solutions. These solutions are saved to disk for application at a place of choice. @@ -624,8 +625,8 @@ exercises is created quickly: \begin{dispListing} \newtcolorbox{texercise}[2][]{texercisestyle, listing file={\solfile\thetexercise}, - title={Exercise \refstepcounter{texercise}\label{exe:#2}\writesol{#2}% - \arabic{texercise}% + phantom={\refstepcounter{texercise}\label{exe:#2}\writesol{#2}}, + title={Exercise \arabic{texercise}% \hfill\mdseries Solution on page \pageref{sol:#2}},#1} \end{dispListing} \tcbusetemp @@ -736,11 +737,12 @@ For all solutions, a macro |\processsol| was written to the file |\jobname.sol|. Now, we need a definition for this macro to use the solutions. \begin{dispListing} +% \usepackage{hyperref} % for \phantomsection \newcommand{\processsol}[2]{% \tcbinputlisting{texercisestyle,listing only, - title={Solution for Exercise \ref{exe:#2} on page \pageref{exe:#2}\label{sol:#2}}, - listing file={\solfile#1}% - }} + phantom={\phantomsection\label{sol:#2}},% + title={Solution for Exercise \ref{exe:#2} on page \pageref{exe:#2}}, + listing file={\solfile#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 2be4be9a13b..11ea2274bcd 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -307,7 +307,8 @@ This is the lower part. \begin{docTcbKey}{segmentation hidden}{}{style, no value} This is a shortcut for |segmentation style={draw=none,fill=none}|. Depending on the skin, this option switches off the drawing of the - segmentation line. + segmentation line. See also \refKey{/tcb/lower separated} which + has the same effect for most skins. \begin{dispExample*}{sbs,lefthand ratio=0.66} \tcbset{colback=red!5!white,colframe=red!75!black, fonttitle=\bfseries} 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 ba46a78dfe0..236d3eb4ff3 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex @@ -63,7 +63,7 @@ This also loads the package |amsmath|. \begin{dispExample} \tcbset{myformula/.style={colback=yellow!10!white,colframe=red!50!black, - highlight math style={colback=LightBlue!50!white,colframe=Navy}}} + highlight math style={reset,colback=LightBlue!50!white,colframe=Navy}}} \begin{align} \tcbhighmath{\sum\limits_{n=1}^{\infty} \frac{1}{n}} &= \infty.\\ @@ -412,15 +412,13 @@ referenced with the marker \texttt{cor:nullstellen}.\bigskip \end{Theorem} \end{dispExample} - \begin{dispExample} % \tcbuselibrary{skins} \tcbmaketheorem{YetAnotherTheorem}{Theorem}{enhanced,frame hidden, boxrule=2mm,titlerule=0mm,toptitle=1mm,bottomtitle=1mm, fonttitle=\bfseries\large,fontupper=\normalsize, coltitle=green!35!black,colbacktitle=green!15!white, - colback=green!50!yellow!15!white, - borderline={1pt}{0pt}{green!25!blue}, + colback=green!50!yellow!15!white,borderline={1pt}{0pt}{green!25!blue}, }{mytheorem}{theo} \begin{YetAnotherTheorem}{Mittelwertsatz f\"{u}r $n$ Variable}{mittelwertsatz_n}% @@ -434,7 +432,29 @@ referenced with the marker \texttt{cor:nullstellen}.\bigskip \end{dispExample} -\clearpage +\begin{dispExample} +% \tcbuselibrary{skins} +\tcbmaketheorem{YetAnotherTheorem}{Theorem}{enhanced,arc=0mm,outer arc=0mm, + boxrule=0mm,toprule=1mm,bottomrule=1mm,left=1mm,right=1mm, + titlerule=0mm,toptitle=0mm,bottomtitle=1mm,top=0mm, + colframe=red!50!black,colback=red!5!white,coltitle=red!50!black, + title style={top color=yellow!50!white,bottom color=red!5!white, + middle color=yellow!50!white}, + fonttitle=\bfseries\sffamily\normalsize,fontupper=\normalsize\itshape, + }{mytheorem}{theo} + +\begin{YetAnotherTheorem}{Mittelwertsatz f\"{u}r $n$ Variable}{mittelwertsatz_n}% + Es sei $n\in\mathbb{N}$, $D\subseteq\mathbb{R}^n$ eine offene Menge und + $f\in C^{1}(D,\mathbb{R})$. Dann gibt es auf jeder Strecke + $[x_0,x]\subset D$ einen Punkt $\xi\in[x_0,x]$, so dass gilt + \begin{equation*} + f(x)-f(x_0) = \operatorname{grad} f(\xi)^{\top}(x-x_0) + \end{equation*} +\end{YetAnotherTheorem} +\end{dispExample} + + + You need more attention for your theorems? Here, you are \ldots \begin{dispExample} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 80af6a0abdd..bbe315426a3 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 0a157f82294..cd0f87a6665 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -78,8 +78,8 @@ \newtcolorbox{marker}[1][]{marker,#1} -\def\version{2.32}% -\def\datum{2013/06/23}% +\def\version{2.33}% +\def\datum{2013/07/04}% \makeindex \hypersetup{ @@ -131,18 +131,18 @@ morekeywords={% core adjusted,adjust,after,arc,auto,autoparskip,align, before,bottom,boxsep,boxrule,bottomtitle,bottomrule,broken,basedim, - collower,coltext,coltitle,colback,colframe,colupper,center,code,capture, + collower,coltext,coltitle,colback,colframe,colupper,center,code,capture,check, equal,enlarge,enlargement,extrude, fontupper,fontlower,fonttitle,first,floatplacement,float,fit,fontsize,flushleft,flushright, group,gap, height, - lowerbox,left,leftrule,lefttitle,leftupper,leftlower,lower,last,lefthand, + lowerbox,left,leftrule,lefttitle,leftupper,leftlower,lower,last,lefthand,label, middle,minimum,maxstep,macros, notitle,natural,noparskip,nobeforeafter,nofloat, - parskip,parbox, - outer,oversize,overlay, + parskip,parbox,phantom,page, + outer,oversize,overlay,odd, right,rightrule,righttitle,rightupper,rightlower,righthand,ratio, - savelowerto,savedelimiter,space,split,shrink,sidebyside,skip, + savelowerto,savedelimiter,space,split,shrink,sidebyside,skip,step,separated, title,top,toptitle,toprule,titlerule,tabularx,tikz,toggle,tight,tempfile,text, upper,unbroken, valign, @@ -186,14 +186,14 @@ graphical,geometry,graphics, hidden,halo, interior, - opacity, + opacity,overzoom, nodes, skin,segmentation,stretch,standard,shadow, titled, watermark,widget, zoom, % breakable - breakable,break, + breakable,break,enlargepage, goal, pad, unbreakable, @@ -205,15 +205,16 @@ \tcbset{documentation listing style=mydocumentation,% sbs/.style={sidebyside,before lower app={\tcbset{sidebyside=false}}},% - innerbox/.style={standard,frame style={},colback=black!5!white,colframe=black!75!white,coltext=black,coltitle=white,docexample/.style={docexample original}, - frame code,interior code,interior titled code,segmentation code,no shadow}, + innerbox/.style={reset,documentation listing style=mydocumentation,docexample/.style={docexample original}, + }, docexample/.style={colframe=Navy!50!ExampleFrame,colback=Navy!5!ExampleBack,fontlower=\footnotesize, bicolor,colbacklower=ExampleBack!5!white,drop fuzzy shadow,%, before upper={\tcbset{innerbox}},before lower={\tcbset{innerbox}}}, docexample original/.style={colframe=ExampleFrame,colback=ExampleBack,fontlower=\footnotesize,frame style={}}, } -%\includeonly{tcolorbox.doc.abstract} +%\includeonly{tcolorbox.doc.coreoptions} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 455d18d6686..587368a99a4 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.32} +\tcb@set@library@version{2.33} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip} @@ -31,7 +31,7 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a% \@endpefalse% - \begingroup% + \color@begingroup% \csname tcb@parboxrestore@\kvtcv@parbox\endcsname% \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@% \let\@footnotetext\@mpfootnotetext% @@ -50,7 +50,7 @@ \unvbox\@mpfootins% \fi% \@minipagefalse% - \endgroup} + \color@endgroup} % remaining height \def\tcb@comp@h@page{% @@ -86,6 +86,34 @@ \newbox\tcb@totalupperbox \newbox\tcb@totallowerbox +\newif\iftcb@break@allowed + +\def\tcb@enlbreak@next@final{% + \ifdim\dimexpr\tcb@enlbreak@dim=0pt\relax + \else\enlargethispage{\tcb@enlbreak@dim}\fi% +} + +\def\tcb@enlbreak@next@scan#1/#2@{% + \def\temp@a{#2}% + \tcbdimto\tcb@enlbreak@dim{#1}% + \ifx\temp@a\@empty% + \let\tcb@enlbreak@next=\tcb@enlbreak@next@final% + \else% + \edef\tcb@enlbreak@seq{\temp@a @}% + \fi% + \tcb@enlbreak@next@final% +} + +\def\tcb@enlbreak@next@step{% + \edef\tcb@temp{\noexpand\tcb@enlbreak@next@scan\tcb@enlbreak@seq}% + \tcb@temp% +} + +\def\tcb@enlbreak@init{% + \edef\tcb@enlbreak@seq{\kvtcb@enlargepage/@}% + \let\tcb@enlbreak@next=\tcb@enlbreak@next@step% + \tcb@enlbreak@next% +} \def\tcb@drawcolorbox@breakable{% \ifx\kvtcb@float\@empty% @@ -94,11 +122,17 @@ \tcbdimto\tcb@h@before{\ht\z@+\dp\z@+\dimexpr\parskip\relax}% \setbox\z@=\vbox{\kvtcb@afterbox}% \tcbdimto\tcb@h@after{\ht\z@+\dp\z@}% - % + \tcb@break@allowedtrue% + \tcb@enlbreak@init% \else% \let\tcb@h@before=\tcb@zpt% \let\tcb@h@after=\tcb@zpt% + \tcb@break@allowedfalse% \fi% + \tcb@split@start% +} + +\def\tcb@split@start{% \tcb@comp@h@page% % % height calculation @@ -108,9 +142,9 @@ \ifdim\tcb@h@total<\tcb@h@page\relax% no break \tcb@drawcolorbox@standalone% \else - \ifx\kvtcb@float\@empty% + \iftcb@break@allowed% \ifdim\dimexpr\tcb@h@page-\tcb@h@before-\tcb@h@padding-\tcb@h@padtitle<\kvtcb@breakminlines\baselineskip\relax% - \pagebreak% + \pagebreak\tcb@enlbreak@init\tcb@break@allowedfalse% \tcb@comp@h@page% \ifdim\tcb@h@total<\tcb@h@page\relax% no break! \tcb@drawcolorbox@standalone% @@ -129,9 +163,9 @@ \def\tcb@setbox@upper#1#2{% - \setbox\tcb@upperbox=\vbox{\begingroup\color{\kvtcb@colupper}\unvbox#2\endgroup}% + \setbox\tcb@upperbox=\vbox{\color@begingroup\color{\kvtcb@colupper}\unvbox#2\color@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}% + \setbox\tcb@upperbox=\vbox to\the\dimexpr#1-\dp\tcb@upperbox\relax {\color@begingroup\unvbox\tcb@upperbox\color@endgroup}% \fi% \tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}% } @@ -144,9 +178,9 @@ } \def\tcb@setbox@lower#1#2{% - \setbox\tcb@lowerbox=\vbox{\begingroup\color{\kvtcb@collower}\unvbox#2\endgroup}% + \setbox\tcb@lowerbox=\vbox{\color@begingroup\color{\kvtcb@collower}\unvbox#2\color@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}% + \setbox\tcb@lowerbox=\vbox to\the\dimexpr#1-\dp\tcb@lowerbox\relax {\color@begingroup\unvbox\tcb@lowerbox\color@endgroup}% \fi% \tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% } @@ -188,12 +222,6 @@ \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% @@ -209,7 +237,7 @@ \def\tcb@before@first{\nointerlineskip\kvtcb@beforebox}% \def\tcb@before@middle{\nointerlineskip\noindent}% \let\tcb@before@last=\tcb@before@middle% - \long\def\tcb@after@first{\parskip\z@\par\pagebreak\nointerlineskip{\topskip\z@\null}}% + \long\def\tcb@after@first{\parskip\z@\par\pagebreak\nointerlineskip{\topskip\z@\null}\tcb@enlbreak@next}% \let\tcb@after@middle=\tcb@after@first% \let\tcb@after@last=\kvtcb@afterbox% \else% @@ -256,8 +284,22 @@ \tcb@drawcolorbox@standalone% \fi% \else% - \tcb@sdraw@U% - \let\tcb@split@next=\tcb@split@USL% + \ifdim\dimexpr\tcb@h@upper=0pt\relax% + \iftcb@break@allowed + \tcb@swap{\tcb@totalupperbox}{\tcb@upperbox}% + \tcb@swap{\tcb@totallowerbox}{\tcb@lowerbox}% + \tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}% + \tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% + \pagebreak\tcb@enlbreak@init\tcb@break@allowedfalse% + \let\tcb@split@next=\tcb@split@start% + \else% + \tcb@sdraw@U% + \let\tcb@split@next=\tcb@split@USL% + \fi% + \else% + \tcb@sdraw@U% + \let\tcb@split@next=\tcb@split@USL% + \fi% \fi% \else% \tcb@swap{\tcb@totalupperbox}{\tcb@upperbox}% @@ -428,7 +470,9 @@ \else% \csname tcb@drawwithouttitle@\kvtcb@engine@interior\endcsname% \fi% - \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \iftcb@lowerseparated% + \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \fi% \iftcb@hasTitle% \csname tcb@drawtitle@\kvtcb@engine@title\endcsname% \fi% @@ -488,7 +532,9 @@ \else% \csname tcb@drawwithouttitle@\kvtcb@engine@interior\endcsname% \fi% - \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \iftcb@lowerseparated% + \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \fi% \iftcb@hasTitle% \csname tcb@drawtitle@\kvtcb@engine@title\endcsname% \fi% @@ -557,13 +603,19 @@ pad after break/.code={\let\kvtcb@top@rule@break=\tcb@zpt% \tcbdimto\kvtcb@topsep{#1-\kvtcb@top-\kvtcb@boxsep}},% pad at break/.style={pad before break={#1},pad after break={#1}},% + enlargepage/.store in=\kvtcb@enlargepage, } + \tcbset{% - notitle after break, - shrink break goal=0pt, - lines before break=2, - topsep at break=0pt, - bottomsep at break=0pt, + reset@breakable/.style={% + unbreakable,notitle after break, + shrink break goal=0pt, + lines before break=2, + topsep at break=0pt, + bottomsep at break=0pt, + enlargepage=0pt, + }, + initialize@reset=reset@breakable, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 2bd4ad3b087..1aaa04ff63d 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.32} +\tcb@set@library@version{2.33} \tcbuselibrary{listings} @@ -102,19 +102,6 @@ pageshort={P.}}}, } -% presets -\tcbset{ - index format=pgf, - english language, - documentation listing style=tcbdocumentation, - index default settings, - color option=Option, - color definition=Definition, - color hyperlink=Hyperlink, - before example=\par\smallskip, - after example=, -} - \AtBeginDocument{% \csname tcb@doc@index@\idx@format\endcsname% \hypersetup{ @@ -239,3 +226,18 @@ \PageIndex% } +\tcbset{% + reset@documentation/.style={% + index format=pgf, + english language, + documentation listing style=tcbdocumentation, + index default settings, + color option=Option, + color definition=Definition, + color hyperlink=Hyperlink, + before example=\par\smallskip, + after example=,}, + initialize@reset=reset@documentation, +} + + diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 174b062f093..0ce78004d7b 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 2.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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{2.32} +\tcb@set@library@version{2.33} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -53,19 +53,11 @@ fit maxwidthdiffgap/.store in=\kvtcb@fit@maxwidthdiffgap,% } -\tcbset{% - fit basedim=10pt,fit skip=1.2, - fit height plus=0pt,fit width plus=0pt, - fit maxstep=20,fit maxfontdiff=0.1pt,fit maxfontdiffgap=1pt, - fit maxwidthdiff=1pt,fit maxwidthdiffgap=10pt, -} - \def\tcb@@capture@fitbox{% \let\endtcolorbox=\relax% \Collect@Body\tcbox@inner@fitbox% } - \def\tcbfontsize#1{\fontsize{#1\tcbfitdim}{#1\dimexpr\kvtcb@fit@skip\tcbfitdim}\selectfont} \def\tcb@setfontsize#1#2{\@setfontsize#1{#2\tcbfitdim}{#2\dimexpr\kvtcb@fit@skip\tcbfitdim}} @@ -266,4 +258,13 @@ \long\def\newtcboxfit#1{% \@ifnextchar[{\new@tcboxfit{#1}}{\tcb@newtcboxfit{#1}}} +\tcbset{% + reset@fitting/.style={% + fit basedim=10pt,fit skip=1.2, + fit height plus=0pt,fit width plus=0pt, + fit maxstep=20,fit maxfontdiff=0.1pt,fit maxfontdiffgap=1pt, + fit maxwidthdiff=1pt,fit maxwidthdiffgap=10pt, + }, + initialize@reset=reset@fitting, +} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 1cc71312634..c1530e74ba5 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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{2.32} +\tcb@set@library@version{2.33} \tcbset{% before upper app/.code={\tcb@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 e3b5c89614e..c642a4583c7 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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{2.32} +\tcb@set@library@version{2.33} \RequirePackage{listings}[2007/02/22] @@ -135,14 +135,6 @@ listing outside text/.code={\let\tcb@inputlisting\tcb@inputlisting@out@listingAndText},% } -\tcbset{ - listing file=\jobname.listing, - listing style=tcblatex, - comment=, - listing and text, - listing inputencoding=\inputencodingname, -} - \newenvironment{tcblisting}[1]{% \def\tcblisting@box{\tcbinputlisting{#1}}% \begingroup\tcbverbatimwrite{\kvtcb@listingfile}% @@ -175,3 +167,15 @@ \long\def\newtcblisting#1{% \@ifnextchar[{\new@tcblisting{#1}}{\tcb@newtcblisting{#1}}} + +\tcbset{% + reset@listings/.style={% + listing file=\jobname.listing, + listing style=tcblatex, + comment=, + listing and text, + listing inputencoding=\inputencodingname, + }, + initialize@reset=reset@listings, +} + diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 9288f75428e..180a53d3801 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,13 +17,17 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.32} +\tcb@set@library@version{2.33} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} \tcbset{ listing utf8/.style={listing inputencoding=utf8/#1}, - listing utf8=latin1, +} + +\tcbset{% + reset@listingsutf8/.style={listing utf8=latin1}, + initialize@reset=reset@listingsutf8, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 0d585183416..07710cd7b4b 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% 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{2.32} +\tcb@set@library@version{2.33} \RequirePackage{tikz}[2010/10/13] @@ -118,7 +118,7 @@ \long\def\tcb@pseudo@segmentation#1{% {\parskip\z@\par\nointerlineskip\hfilneg\kern-\@totalleftmargin}\begingroup% -\begin{tikzpicture}% +\tcb@shield@externalize\begin{tikzpicture}% \path[use as bounding box] (0,{\the\dimexpr-\kvtcb@middle-\kvtcb@boxsep\relax}) rectangle (\linewidth,{\the\dimexpr\kvtcb@middle+\kvtcb@boxsep\relax}); \node[line width=0mm,inner sep=0mm,draw=none,fill=none,rectangle, @@ -254,21 +254,6 @@ } \tcbset{% - frame style=,% - interior style=,% - segmentation style=,% - frame code,% - interior titled code,% - interior code,% - segmentation code,% - title style=,% - title code,% - colbacklower=black!15!white,% - clear@spec% -} - - -\tcbset{% base@unbroken/.style={% clear@spec,graphical environment=tikzpicture,geometry nodes,% set@extensions@preframe={\tcb@draw@shadow@unbroken},% @@ -331,20 +316,28 @@ frame engine=path,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=path, interior titled code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% - \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% + \or% + \tcb@drawspec@UT{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@path}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@path}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% \fi}, interior code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% - \or% - \tcb@drawspec@UR{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% + \or% + \tcb@drawspec@UR{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% \fi}, segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else% @@ -356,20 +349,28 @@ frame engine=pathfirst,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathfirst, interior titled code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% - \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% + \or% + \tcb@drawspec@UT{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathfirst}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathfirst}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% \fi}, interior code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% - \or% - \tcb@drawspec@UR{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% + \or% + \tcb@drawspec@UR{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% \fi}, segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else% @@ -381,20 +382,28 @@ frame engine=pathmiddle,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathmiddle, interior titled code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% - \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% + \or% + \tcb@drawspec@UT{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathmiddle}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathmiddle}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% \fi}, interior code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% - \or% - \tcb@drawspec@US{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% + \or% + \tcb@drawspec@US{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% \fi}, segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else% @@ -406,20 +415,28 @@ frame engine=pathlast,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathlast, interior titled code={% - \ifcase\tcb@segment@state - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% - \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% + \or% + \tcb@drawspec@UT{fill=\kvtcb@colback}% + \else% + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathlast}% + \fi% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathlast}% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% \fi}, interior code={% - \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% - \or% - \tcb@drawspec@US{fill=\kvtcb@colback}% - \else - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}% + \iftcb@lowerseparated% + \ifcase\tcb@segment@state% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% + \or% + \tcb@drawspec@US{fill=\kvtcb@colback}% + \else + {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}% + \fi% + \else% + {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% \fi}, segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else% @@ -435,17 +452,25 @@ frame engine=path,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=path, interior titled code={% - \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1% + \tcb@drawspec@UT{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@path}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithtitle@path}% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@path}% \fi% \tcb@drawspec@T}, interior code={% - \ifnum\tcb@segment@state=1 - \tcb@drawspec@UR{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1 + \tcb@drawspec@UR{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},% skin first=beamerfirst,skin middle=beamermiddle,skin last=beamerlast}, @@ -459,16 +484,24 @@ frame engine=pathfirst,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathfirst, interior titled code={% - \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1% + \tcb@drawspec@UT{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% \fi% \tcb@drawspec@T}, interior code={% - \ifnum\tcb@segment@state=1 - \tcb@drawspec@UR{beamer@color}\else% - {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1 + \tcb@drawspec@UR{beamer@color}\else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% + \fi% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},% skin first=beamerfirst,skin middle=beamermiddle,skin last=beamermiddle}} @@ -478,17 +511,25 @@ frame engine=pathmiddle,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathmiddle, interior titled code={% - \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1% + \tcb@drawspec@UT{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% \fi% \tcb@drawspec@T}, interior code={% - \ifnum\tcb@segment@state=1 - \tcb@drawspec@US{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1 + \tcb@drawspec@US{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},% skin first=beamermiddle,skin middle=beamermiddle,skin last=beamermiddle}} @@ -498,17 +539,25 @@ frame engine=pathlast,interior titled engine=freelance, interior engine=freelance,segmentation engine=freelance,title engine=pathlast, interior titled code={% - \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1% + \tcb@drawspec@UT{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathlast}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathlast}% + {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathlast}% \fi% \tcb@drawspec@T}, interior code={% - \ifnum\tcb@segment@state=1 - \tcb@drawspec@US{beamer@color}% + \iftcb@lowerseparated% + \ifnum\tcb@segment@state=1 + \tcb@drawspec@US{beamer@color}% + \else% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% + \fi% \else% - {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% + {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},% skin first=beamermiddle,skin middle=beamermiddle,skin last=beamerlast}} @@ -749,11 +798,6 @@ clip watermark/true/.code={\let\tcb@drawspec@watermark=\tcb@drawspec@watermark@@clip}, clip watermark/false/.code={\let\tcb@drawspec@watermark=\tcb@drawspec@watermark@@noclip}, clip watermark/.default=true, - % - watermark opacity=1.00, - watermark color=\kvtcb@colback!85!\kvtcb@colframe, - watermark zoom=0.75, - clip watermark, } \def\tcb@tdraw@title@clip{% @@ -878,8 +922,6 @@ border@line app/.code={\tcb@appto\kvtcb@borderline{#1}},% borderline/.style args={#1#2#3}{border@line app={\tcb@border{#1}{#2}{#3}}},% no borderline/.code={\def\kvtcb@borderline{}},% - % - no borderline,% } \def\tcb@shadow@prepare#1#2{% @@ -972,9 +1014,22 @@ drop fuzzy shadow/.default={black!50!white},% fuzzy halo/.style args={#1 with #2}{fuzzy shadow={0mm}{0mm}{-#1}{0.12mm}{#2}}, fuzzy halo/.default={1.0mm with yellow},% - % - no shadow,% - % - % } + + +\tcbset{% + reset@skins/.style={% + frame style=,interior style=,segmentation style=,% + frame code,interior titled code,interior code,segmentation code,% + title style=,title code,colbacklower=black!15!white,% + clear@spec,% + watermark opacity=1.00,watermark color=\kvtcb@colback!85!\kvtcb@colframe,% + watermark zoom=0.75,clip watermark,% + clip title=false,clip upper=false,clip lower=false, + no borderline,no shadow,% + }, + initialize@reset=reset@skins, +} + + diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index b587416f7a6..9b18811f834 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,15 +18,16 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.32} +\tcb@set@library@version{2.33} \RequirePackage{amsmath} \def\tcb@hack@amsmath{\tcb@hack@currenvir\vskip-\abovedisplayskip} \tcbset{ - theorem/.code args={#1#2#3#4}{% - \pgfkeysalso{title={\refstepcounter{#2}\setbox\z@=\hbox{#1~\csname the#2\endcsname:\ }\hangindent\wd\z@\hangafter=1 \mbox{#1~\csname the#2\endcsname:\label{#4}\ }#3}}},% + theorem/.style args={#1#2#3#4}{% + step and label={#2}{#4},% + title={\setbox\z@=\hbox{#1~\csname the#2\endcsname:\ }\hangindent\wd\z@\hangafter=1 \mbox{#1~\csname the#2\endcsname:\ }#3}},% math upper/.style={before upper=$\displaystyle,after upper=$},% math lower/.style={before lower=$\displaystyle,after lower=$},% math/.style={math upper,math lower},% @@ -51,8 +52,7 @@ ams nodisplayskip upper/.style={before upper=\vskip-\abovedisplayskip},% ams nodisplayskip lower/.style={before lower=\vskip-\abovedisplayskip},% ams nodisplayskip/.style={ams nodisplayskip upper,ams nodisplayskip lower},% - highlight math style/.style={highlight math/.style={#1}},% - highlight math style={colframe=red,colback=yellow!25!white,notitle},% + highlight math style/.style={highlight math/.style={notitle,nophantom,#1}},% } \newcommand{\tcbmaketheorem}[5]{% @@ -60,5 +60,12 @@ } \newtcbox{\tcboxmath}[1][]{nobeforeafter,math upper,tcbox raise base,#1} -\newtcbox{\tcbhighmath}[1][]{nobeforeafter,math upper,tcbox raise base,highlight math,#1} +\newtcbox{\tcbhighmath}[1][]{highlight math,nobeforeafter,math upper,tcbox raise base,#1} + +\tcbset{% + reset@theorems/.style={% + highlight math style={colframe=red,colback=yellow!25!white},% + }, + initialize@reset=reset@theorems, +} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index a4f76aab89b..c9eb2f4b935 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.32 (2013/06/23) +%% The LaTeX package tcolorbox - version 2.33 (2013/07/04) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2013/06/23 version 2.32 text color boxes] -\def\tcb@version{2.32} +\ProvidesPackage{tcolorbox}[2013/07/04 version 2.33 text color boxes] +\def\tcb@version{2.33} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -32,10 +32,13 @@ \newif\iftcb@hasLower \newif\iftcb@lowerspace \newif\iftcb@sidebyside +\newif\iftcb@hasPhantom +\newif\iftcb@lowerseparated \newbox\tcb@titlebox \newbox\tcb@upperbox \newbox\tcb@lowerbox +\newbox\tcb@phantombox \newcounter{tcbbreakpart} @@ -90,6 +93,14 @@ \tcbdimto\tcb@w@upper{\tcb@w@sbs-\tcb@w@lower}% } +\def\tcb@shield@@externalize{% + \ifdefined\tikzexternaldisable% + \ifdefined\pgfpictureid% + \else% + \tikzexternaldisable% + \fi% + \fi} + \pgfkeys{/handlers/.dimstore in/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\def#1{\the\dimexpr##1\relax}}} \tcbset{% @@ -182,7 +193,16 @@ }, enlarge left by/.store in=\kvtcb@bbleft, enlarge right by/.store in=\kvtcb@bbright, - toggle enlargement/.store in=\kvtcb@bbtoggle, + toggle enlargement/.is choice, + toggle enlargement/none/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@none}, + toggle enlargement/evenpage/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@evenpage}, + toggle enlargement/forced/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@forced}, + toggle enlargement/.default=evenpage, + toggle left and right/.is choice, + toggle left and right/none/.code={\let\tcb@lrtoggle=\tcb@lrtoggle@none}, + toggle left and right/evenpage/.code={\let\tcb@lrtoggle=\tcb@lrtoggle@evenpage}, + toggle left and right/forced/.code={\let\tcb@lrtoggle=\tcb@lrtoggle@forced}, + toggle left and right/.default=evenpage, graphical environment/.store in=\kvtcb@graphenv, frame engine/.store in=\kvtcb@engine@frame, interior titled engine/.store in=\kvtcb@engine@interiortitled, @@ -249,12 +269,13 @@ \tcb@hack@currenvir\tabularx{\linewidth}{#2}}, after upper=\endtabularx}, tabularx/.style={tabularx*={}{#1}}, - tikz upper/.style={before upper=\centering\tikzpicture[#1],after upper=\endtikzpicture},% - tikz lower/.style={before lower=\centering\tikzpicture[#1],after lower=\endtikzpicture},% + tikz upper/.style={before upper=\centering\tcb@shield@externalize\tikzpicture[#1],after upper=\endtikzpicture},% + tikz lower/.style={before lower=\centering\tcb@shield@externalize\tikzpicture[#1],after lower=\endtikzpicture},% oversize/.style={% - width=\the\dimexpr\dimexpr\linewidth\relax+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax,% - enlarge left by=\the\dimexpr-\kvtcb@left@rule-\kvtcb@leftupper-\kvtcb@boxsep\relax,% - enlarge right by=\the\dimexpr-\kvtcb@boxsep-\kvtcb@rightupper-\kvtcb@right@rule\relax},% + width=\the\dimexpr\dimexpr\linewidth+#1+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax,% + enlarge left by=\the\dimexpr-\kvtcb@left@rule-\kvtcb@leftupper-\kvtcb@boxsep-#1/2\relax,% + enlarge right by=\the\dimexpr-\kvtcb@boxsep-\kvtcb@rightupper-\kvtcb@right@rule-#1/2\relax},% + oversize/.default=0pt,% baseline/.store in=\kvtcb@baseline,% tcbox raise/.style={baseline=-#1},% tcbox raise base/.style={baseline=\tcb@val@raisebase},% @@ -281,23 +302,24 @@ minipage/.style={capture=minipage},% check odd page/.is choice, check odd page/true/.code={\let\tcb@checkoddpage=\checkoddpage% - \let\tcb@setbb@toggle@evenpage=\tcb@setbb@toggle@evenpage@strict}, + \def\tcb@evenoddmode{strict}% + }, check odd page/false/.code={\let\tcb@checkoddpage=\relax% - \let\tcb@setbb@toggle@evenpage=\tcb@setbb@toggle@evenpage@easy}, + \def\tcb@evenoddmode{easy}% + }, check odd page/.default=true, + phantom/.store in=\kvtcb@phantom, + step and label/.style 2 args={phantom={\refstepcounter{#1}\label{#2}}},% + nophantom/.style={phantom=},% + shield externalize/.is choice, + shield externalize/true/.code={\let\tcb@shield@externalize=\tcb@shield@@externalize}, + shield externalize/false/.code={\let\tcb@shield@externalize=\relax}, + shield externalize/.default=true, + lower separated/.is if=tcb@lowerseparated, } -\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, - colback=black!5!white,colframe=black!75!white,coltext=black,coltitle=white, - fonttitle=,fontupper=,fontlower=,floatplacement=htb,nofloat,savelowerto=, - savedelimiter={tcolorbox},tempfile={\jobname.tcbtemp},autoparskip, - enlarge top by=0mm,enlarge bottom by=0mm,enlarge left by=0mm,enlarge right by=0mm, - toggle enlargement=none,toptitle=0mm,bottomtitle=0mm, - standard,parbox,overlay=,auto outer arc, - before title=,after title=,before upper=,after upper=,before lower=,after lower=, - baseline=0pt,sidebyside=false,sidebyside align=center,sidebyside gap=10mm, - lefthand ratio=0.5,capture=minipage,check odd page=false, +\tcbset{% + autoparskip,minipage,savedelimiter=tcolorbox,% set@extensions@preframe=,set@extensions@postframe=,% }% @@ -324,10 +346,10 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a \@endpefalse - \begingroup% + \color@setgroup% \csname tcb@parbox@use@\kvtcv@parbox\endcsname% \ignorespaces\tcb@minipage#2\ignorespaces} -\def\endtcb@lrbox{\unskip\endminipage\unskip\endgroup} +\def\endtcb@lrbox{\unskip\endminipage\unskip\color@endgroup} \let\tcb@savebox=\tcb@lrbox \let\endtcb@savebox=\endtcb@lrbox @@ -363,6 +385,10 @@ \tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}% \tcbdimto\tcb@temp{\tcb@innerwidth-\kvtcb@boxsep*2}% \tcbdimto\tcb@w@upper{\tcb@temp-\kvtcb@leftupper-\kvtcb@rightupper}% + \ifx\kvtcb@phantom\@empty\tcb@hasPhantomfalse\else% + \tcb@hasPhantomtrue% + \sbox\tcb@phantombox{\kvtcb@phantom}% + \fi% \ifx\kvtcb@title\@empty\tcb@hasTitlefalse\else% \tcb@hasTitletrue% \tcbdimto\tcb@w@title{\tcb@temp-\kvtcb@lefttitle-\kvtcb@righttitle}% @@ -498,7 +524,6 @@ \def\tcb@dbox@center#1#2#3#4{\pgftext[x=#1,y=#2+#3/2,left]{\box#4}}% -\tcbset{natural height,space to lower,valign=top,valign lower=top} % fill frame \def\tcb@drawframe@standard{% @@ -572,19 +597,53 @@ \def\tcb@setbb@toggle@evenpage@easy{% \ifodd\thepage\tcb@setbb@toggle@none\else\tcb@setbb@toggle@forced\fi% } -\let\tcb@setbb@toggle@evenpage=\tcb@setbb@toggle@evenpage@easy \def\tcb@setbb@toggle@evenpage@strict{% \ifoddpage\tcb@setbb@toggle@none\else\tcb@setbb@toggle@forced\fi% } +\def\tcb@setbb@toggle@evenpage{% + \csname tcb@setbb@toggle@evenpage@\tcb@evenoddmode\endcsname% +} \def\tcb@creategeonodes@false{} +\def\tcb@swap#1#2{% + \let\tcb@temp=#1% + \let#1=#2% + \let#2=\tcb@temp% +} + +\let\tcb@lrtoggle@none=\relax + +\def\tcb@lrtoggle@forced{% + \tcb@swap{\kvtcb@left@rule}{\kvtcb@right@rule}% + \tcb@swap{\kvtcb@lefttitle}{\kvtcb@righttitle}% + \tcb@swap{\kvtcb@leftupper}{\kvtcb@rightupper}% + \tcb@swap{\kvtcb@leftlower}{\kvtcb@rightlower}% +} + +\def\tcb@lrtoggle@evenpage@easy{% + \unless\ifodd\thepage\tcb@lrtoggle@forced\fi% +} + +\def\tcb@lrtoggle@evenpage@strict{% + \unless\ifoddpage\tcb@lrtoggle@forced\fi% +} + +\def\tcb@lrtoggle@evenpage{% + \csname tcb@lrtoggle@evenpage@\tcb@evenoddmode\endcsname% +} + \def\tcb@bbdraw{% \tcb@checkoddpage% - \csname tcb@setbb@toggle@\kvtcb@bbtoggle\endcsname% + \tcb@lrtoggle% + \tcb@setbb@toggle% \pgfusepath{use as bounding box}% + \iftcb@hasPhantom% + \pgftext[x=0pt,y=\tcb@height-\baselineskip,left,top]{\box\tcb@phantombox}% + \tcb@hasPhantomfalse% + \fi% \csname tcb@creategeonodes@\kvtcv@geonodes\endcsname% } @@ -650,6 +709,7 @@ \let\tcb@h@lower=\tcb@zpt% \fi% % + \tcb@shield@externalize% \tcb@drawcolorbox% } @@ -692,11 +752,13 @@ \else% \csname tcb@drawwithouttitle@\kvtcb@engine@interior\endcsname% \fi% - \iftcb@lowerspace% - \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% - \else\iftcb@sidebyside% - \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% - \fi\fi% + \iftcb@lowerseparated% + \iftcb@lowerspace% + \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \else\iftcb@sidebyside% + \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname% + \fi\fi% + \fi% \iftcb@hasTitle% \csname tcb@drawtitle@\kvtcb@engine@title\endcsname% \fi% @@ -708,13 +770,13 @@ \end{\kvtcb@graphenv}\end{tcb@float}% } -\def\tcb@draw@border#1{} - \let\tcb@drawcolorbox@standalone=\tcb@drawcolorbox +\def\tcb@draw@border#1{} + \long\def\tcbox@inner@hbox#1{% \tcbset{breakable@false,sidebyside=false}% - \setbox\tcb@upperbox=\hbox{\begingroup\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\endgroup}% + \sbox\tcb@upperbox{\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}% \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}% \tcbdimto{\tcb@val@raisebase}{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}% \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}% @@ -838,6 +900,29 @@ \edef#1{\unexpanded{#2}\tcb@expandonce#1}% \fi} +\def\tcb@reset{}% +\tcbset{% + initialize@reset/.code={\tcbset{#1}\tcb@appto\tcb@reset{\tcbset{#1}}},% + reset/.code={\tcb@reset},% + reset@core/.style={notitle,width=\linewidth, + natural height,space to lower,valign=top,valign lower=top, + boxsep=1mm,boxrule=0.5mm, + left=4mm,right=4mm,top=2mm,bottom=2mm,middle=2mm,arc=1mm, + enlarge top by=0mm,enlarge bottom by=0mm,enlarge left by=0mm,enlarge right by=0mm, + toggle enlargement=none,toggle left and right=none,toptitle=0mm,bottomtitle=0mm, + baseline=0pt,adjust text={\"Apgjy},lowerbox=visible,lower separated, + colback=black!5!white,colframe=black!75!white,coltext=black,coltitle=white, + fonttitle=,fontupper=,fontlower=,floatplacement=htb,nofloat,savelowerto=, + tempfile={\jobname.tcbtemp}, + standard,parbox,overlay=,auto outer arc, + before title=,after title=,before upper=,after upper=,before lower=,after lower=, + sidebyside=false,sidebyside align=center,sidebyside gap=10mm, + lefthand ratio=0.5,check odd page=false,nophantom, + shield externalize=false, + }, + initialize@reset=reset@core, +} + % libraries \def\tcb@optionlist{} |