diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-11 23:19:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-11 23:19:25 +0000 |
commit | fbb20601c6298bc825560a5a048859d60217f14f (patch) | |
tree | 0dc74c0df4f8b0871933db4446ab68b3960c50fb /Master/texmf-dist/tex/latex/tcolorbox | |
parent | d68a92426a296573336399c1252f21da178f1b75 (diff) |
tcolorbox (2jun16)
git-svn-id: svn://tug.org/texlive/trunk@41383 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tcolorbox')
17 files changed, 88 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 3618a0255cd..5914031e464 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings @@ -361,11 +361,14 @@ \tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}% } +\def\tcb@vsplit@upper{% + \setbox\tcb@upperbox=\vsplit\tcb@totalupperbox to\tcb@split@dim% + \edef\tcb@upper@box@badness{\the\badness}% +} \def\tcb@split@upper@box@and@assemble{% \vfuzz=\maxdimen\vbadness=10000\savingvdiscards=1% - \setbox\tcb@upperbox=\vsplit\tcb@totalupperbox to\tcb@split@dim% - \edef\tcb@upper@box@badness{\the\badness}% + \tcb@vsplit@upper% \ifnum\tcb@upper@box@badness=1000000\relax% \setbox\tcb@totalupperbox=\vbox{% \unvbox\tcb@upperbox% @@ -377,11 +380,9 @@ \vbadness=\tcb@thevbadness\vfuzz=\tcb@thevfuzz\savingvdiscards=0% } - \def\tcb@split@upper@box{% \vfuzz=\maxdimen\vbadness=10000% - \setbox\tcb@upperbox=\vsplit\tcb@totalupperbox to\tcb@split@dim% - \edef\tcb@upper@box@badness{\the\badness}% + \tcb@vsplit@upper% \ifnum\tcb@upper@box@badness=1000000\relax% \tcb@warning{The upper box part has become overfull}% \fi% @@ -389,16 +390,19 @@ \vbadness=\tcb@thevbadness\vfuzz=\tcb@thevfuzz% } - \def\tcb@setbox@lower#1#2{% \tcb@setbox\tcb@lowerbox{#1}{#2}% \tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% } -\def\tcb@split@lower@box@and@assemble{% - \vfuzz=\maxdimen\vbadness=10000\savingvdiscards=1% +\def\tcb@vsplit@lower{% \setbox\tcb@lowerbox=\vsplit\tcb@totallowerbox to\tcb@split@dim% \edef\tcb@lower@box@badness{\the\badness}% +} + +\def\tcb@split@lower@box@and@assemble{% + \vfuzz=\maxdimen\vbadness=10000\savingvdiscards=1% + \tcb@vsplit@lower% \ifnum\tcb@lower@box@badness=1000000\relax% \setbox\tcb@totallowerbox=\vbox{% \unvbox\tcb@lowerbox% @@ -413,8 +417,7 @@ \def\tcb@split@lower@box{% \vfuzz=\maxdimen\vbadness=10000% - \setbox\tcb@lowerbox=\vsplit\tcb@totallowerbox to\tcb@split@dim% - \edef\tcb@lower@box@badness{\the\badness}% + \tcb@vsplit@lower% \ifnum\tcb@lower@box@badness=1000000\relax% \tcb@warning{The lower box part has become overfull}% \fi% @@ -422,6 +425,29 @@ \vbadness=\tcb@thevbadness\vfuzz=\tcb@thevfuzz% } +% patch for luatex 0.95 (thanks to Jeremy Engel) +\ifdefined\directlua + \RequirePackage{ifluatex} + \ifnum\luatexversion=95\relax + \def\tcb@vsplit@upper{% + \directlua{% + tex.savingvdiscards = 1 + local vlist = tex.splitbox("tcb@totalupperbox", tex.sp("\tcb@split@dim"), "exactly") + tex.setbox("tcb@upperbox", vlist) + tex.savingvdiscards = 0 + }% + \edef\tcb@upper@box@badness{\the\badness}% + } + \def\tcb@vsplit@lower{% + \directlua{% + tex.savingvdiscards = 1 + local vlist = tex.splitbox("tcb@totallowerbox", tex.sp("\tcb@split@dim"), "exactly") + tex.setbox("tcb@lowerbox", vlist) + tex.savingvdiscards = 0 + }% + \edef\tcb@lower@box@badness{\the\badness}% + } +\fi\fi \def\tcb@split@setstate@first{% \edef\tcb@split@state{first}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index bd32634d4b7..bb760a2c538 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \tcbuselibrary{listings,skins,xparse,external} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 16100d92048..c42b0c1ff05 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,9 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} + +\RequirePackage{shellesc} { \catcode`\"=12 @@ -76,7 +78,7 @@ \immediate\closeout\tcb@out% \foreach \n in {1,...,\tcbexternal@runs} {% - \immediate\write18{% + \ShellEscape{% \tcbexternal@compiler\space -shell-escape -halt-on-error diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index fe06d6ca36f..e985561ece4 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 8a0dc9f06ee..f64ff57fb8d 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index 90d62d37c35..2d0fdbba6bc 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \RequirePackage{listings}[2007/02/22] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex index 0263c476cb4..a08a78253bf 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,9 +18,10 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \RequirePackage{pdftexcmds} +\RequirePackage{shellesc} \def\tcbuselistingtext@input{\input{\kvtcb@listingfile}}% \def\tcbuselistingtext{\tcbuselistingtext@input}% @@ -171,7 +172,7 @@ \or\or \tcb@warning{System call with restricted shell escape may fail}% \fi% - \filename@parse{\kvtcb@listingfile}\immediate\write18{#1}% + \filename@parse{\kvtcb@listingfile}\ShellEscape{#1}% \relax% } @@ -219,7 +220,7 @@ pdf comment/.default={\kvtcb@listingfile}, process code/.code={\appto\tcb@listing@process@hook{#1}},% no process/.code={\def\tcb@listing@process@hook{}},% - compilable listing/.style={listing file={\jobname-listing-\thetcblistingcount}}, + compilable listing/.style={listing file={\jobname-listing-\thetcblistingcount.tex}}, run system command/.style={process code={\tcb@run@system@command{#1}}},% run@system@command/.style 2 args={run system command={#1\space#2\space\filename@area\filename@base}},% run pdflatex/.style={run@system@command={pdflatex}{#1}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 7a29fe1cd7c..edaa3b32263 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex index 51684b96a8c..528ccb536a6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \tcbuselibrary{breakable} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index df752c63a0c..7ca5861790e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 8d29897a05e..3de8d30c03a 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index ea9958de51c..64eff210d50 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \RequirePackage{tikz}[2010/10/13] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index a790ddc43d9..b68f4dc7819 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \tcbuselibrary{skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index d1fb74a6faf..6a94a75ed65 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex index 18b92028d32..393ff7cc2f1 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \tcbuselibrary{skins} @@ -125,6 +125,7 @@ \newcommand{\tcbvignette}[1]{% \ifdefined\pgfpictureid% + \begingroup% \tcbset{vig/.cd,#1}% \tcbdimto\tcb@vig@xA{\tcb@vig@xmin}% \tcbdimto\tcb@vig@xB{\tcb@vig@xmax}% @@ -134,7 +135,10 @@ \tcbdimto\tcb@vig@xb{\tcb@vig@xB-(\tcb@vig@size@east)}% \tcbdimto\tcb@vig@ya{\tcb@vig@yA+\tcb@vig@size@south}% \tcbdimto\tcb@vig@yb{\tcb@vig@yB-(\tcb@vig@size@north)}% + \begin{scope}[tcb@vig@scope]% \tcb@vig@draw% + \end{scope} + \endgroup% \else% \tcb@warning{'tcbvignette' was found outside a 'tikzpicture' environment and is ignored}% \fi% @@ -168,6 +172,7 @@ south style/.store in=\tcb@vig@style@south, east style/.store in=\tcb@vig@style@east, west style/.store in=\tcb@vig@style@west, + scope/.code={\tikzset{tcb@vig@scope/.style={#1}}}, draw method/.is choice, draw method/direct/.code={\let\tcb@vig@draw\tcb@vig@draw@direct},% draw method/clipped/.code={\let\tcb@vig@draw\tcb@vig@draw@clipped},% @@ -221,6 +226,7 @@ }, semi fade out/.default=white, % + scope=, draw method=direct, xmin=0pt, xmax=1cm, @@ -234,10 +240,11 @@ \tcbset{% finish@vignette/.style 2 args={finish #1={% \begin{tcbclipframe}\tcbvignette{% - north style={white,opacity=0.25}, - east style={black!75,opacity=0.25}, - south style={black,opacity=0.25}, - west style={black!25,opacity=0.25},#2,inside node=frame + scope={transparency group,opacity=0.25}, + north style=white, + east style=black!75, + south style=black, + west style=black!25,#2,inside node=frame }\end{tcbclipframe}}}, finish vignette/.style={% finish@vignette={unbroken}{#1},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 9f96afdaeb0..fbe3cd4356a 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.91} +\tcb@set@library@version{3.93} \RequirePackage{xparse}[2013/12/31] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index e8e5424fba0..1455dcd5669 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.91 (2016/04/27) +%% The LaTeX package tcolorbox - version 3.93 (2016/06/01) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2016/04/27 version 3.91 text color boxes] -\def\tcb@version{3.91} +\ProvidesPackage{tcolorbox}[2016/06/01 version 3.93 text color boxes] +\def\tcb@version{3.93} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] |