diff options
author | Karl Berry <karl@freefriends.org> | 2016-07-14 21:41:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-07-14 21:41:30 +0000 |
commit | 2d5135a3daaa80ca6f8878e7296bd5cbd0041cd5 (patch) | |
tree | 07fd3e88c1db56ee4d86fcc7e4d5bd893d9e2341 /Master/texmf-dist/tex/latex | |
parent | 15d8e872670cad2846331dc4843baf948fdac3dd (diff) |
tcolorbox (14jul16)
git-svn-id: svn://tug.org/texlive/trunk@41700 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
18 files changed, 158 insertions, 75 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 5914031e464..b5936ffd193 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings @@ -156,7 +156,7 @@ \else% \tcb@hasTitletrue% \tcbdimto\tcb@w@title{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@lefttitle-\kvtcb@righttitle}% - \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@followingtitle\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\leavevmode\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@followingtitle\end{tcb@savebox}% \tcbdimto\tcb@h@title{\ht\tcb@titlebox+\dp\tcb@titlebox}% \tcbdimto\tcb@h@padtitle{\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle+\tcb@h@title}% \fi% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index bb760a2c538..b514fac092c 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 c42b0c1ff05..22938134556 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,9 +17,9 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.93} +\tcb@set@library@version{3.94} -\RequirePackage{shellesc} +\tcbuselibrary{pro@cessing} { \catcode`\"=12 @@ -90,6 +90,12 @@ \endgroup% } +\def\tcbexternal@compile#1{% + \tcbiffileprocess{#1}% + {\tcbexternal@job@source}{\tcbexternal@job@mdfive}{\tcbexternal@job@pdf}% + {\tcbexternal@corecompile}{}% +} + \def\tcbexternal@inputsource{% \IfFileExists{\tcbexternal@job@source}% {\input{\tcbexternal@job@source}}% @@ -122,37 +128,12 @@ \newif\iftcb@externalize \tcb@externalizefalse -\def\tcbexternal@generatemdivesum{% - \iftcb@externalize% - \def\tcbexternallastmdfivesum{}% - \IfFileExists{\tcbexternal@job@mdfive}{\input{\tcbexternal@job@mdfive}}{}% - \edef\tcbexternalmdfivesum{\pdfmdfivesum file {\tcbexternal@job@source}}% - \else% - \def\tcbexternallastmdfivesum{x}% - \edef\tcbexternalmdfivesum{}% - \fi% - \immediate\openout\tcb@out=\tcbexternal@job@mdfive% - \immediate\write\tcb@out{\string\def\string\tcbexternallastmdfivesum{\tcbexternalmdfivesum}\@percentchar}% - \immediate\closeout\tcb@out% -} - -\def\tcbexternal@conditionalcompile{% - \IfFileExists{\tcbexternal@job@pdf}{% - \ifdefstrequal{\tcbexternallastmdfivesum}{\tcbexternalmdfivesum}{% - }{% - \tcbexternal@corecompile% - }% - }{% - \tcbexternal@corecompile% - }% -} - \def\tcb@useexternal{% - \tcbexternal@generatemdivesum% \iftcb@externalize% - \tcbexternal@compile% + \tcbexternal@compile{\tcbexternal@condition}% \tcbexternal@inputpdf% \else% + \tcbexternal@compile{2}% \tcbexternal@inputsource% \fi% } @@ -242,8 +223,8 @@ -/.style={externalize=false}, % force remake/.is choice, - force remake/true/.code={\let\tcbexternal@compile=\tcbexternal@corecompile}, - force remake/false/.code={\let\tcbexternal@compile=\tcbexternal@conditionalcompile}, + force remake/true/.code={\def\tcbexternal@condition{0}}, + force remake/false/.code={\def\tcbexternal@condition{1}}, force remake/.default=true, !/.style=force remake, % diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index e985561ece4..e4196e72458 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 f64ff57fb8d..001d3a0f26b 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 2d0fdbba6bc..05ae51bc857 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 a08a78253bf..84a7edc429b 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,10 +18,9 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.93} +\tcb@set@library@version{3.94} -\RequirePackage{pdftexcmds} -\RequirePackage{shellesc} +\tcbuselibrary{pro@cessing} \def\tcbuselistingtext@input{\input{\kvtcb@listingfile}}% \def\tcbuselistingtext{\tcbuselistingtext@input}% @@ -43,7 +42,6 @@ \newenvironment{tcb@lower@outside}[1]{% \tcbset{savedelimiter=tcb@lower@outside}\tcb@minipage{#1}% \color{tcbcol@lower}\kvtcb@fontlower\kvtcb@halignlower\kvtcb@before@lower\ignorespaces}% -% {\unskip\kvtcb@after@lower\endminipage} {\kvtcb@after@lower\endminipage} \def\tcb@use@listing@other@reset{% @@ -172,7 +170,7 @@ \or\or \tcb@warning{System call with restricted shell escape may fail}% \fi% - \filename@parse{\kvtcb@listingfile}\ShellEscape{#1}% + \ShellEscape{#1}% \relax% } @@ -233,10 +231,23 @@ run latex/.style={run@system@command={latex}{#1}},% run dvips/.style={run@system@command={dvips}{#1}},% run ps2pdf/.style={run system command={ps2pdf\space#1\space\filename@area\filename@base.ps}},% + freeze file/.code={\def\tcbprocess@condition{1}\def\tcbprocess@target{#1}},% + freeze none/.code={\def\tcbprocess@condition{0}\def\tcbprocess@target{}},% + freeze extension/.style={freeze file={\filename@area\filename@base#1}},% + freeze pdf/.style={freeze extension={.pdf}}, + freeze png/.style={freeze extension={.png}}, + freeze jpg/.style={freeze extension={.jpg}}, +} + +\def\tcb@listing@process@core{% + \filename@parse{\kvtcb@listingfile}% + \tcbiffileprocess{\tcbprocess@condition}% + {\kvtcb@listingfile}{\filename@area\filename@base.md5}{\tcbprocess@target}% + {\tcb@listing@process@hook}{}% } \def\tcbinputlisting@core{% - \tcb@listing@process@hook% + \ifdefempty\tcb@listing@process@hook{}{\tcb@listing@process@core}% \let\tcb@listing@capture=\kvtcb@capture% \tcb@inputlisting% } @@ -313,7 +324,8 @@ reset@listingscore/.style={% listing file=\jobname.listing, comment=, listing and text, - no process,comment style=,pdf extension=pdf, + no process,freeze none, + comment style=,pdf extension=pdf, }, initialize@reset=reset@listingscore, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index edaa3b32263..afc31d98309 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 528ccb536a6..dff4369a280 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 7ca5861790e..4d9cfecd05e 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex new file mode 100644 index 00000000000..c24e493096f --- /dev/null +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex @@ -0,0 +1,79 @@ +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) +%% tcbprocessing.code.tex: Code for conditional processing +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2006-2016 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 +%% +\tcb@set@library@version{3.94} + +\RequirePackage{pdftexcmds} +\RequirePackage{shellesc} + +\ifdefined\pdf@filemdfivesum\else% XeLaTeX presumed ... + \def\pdf@filemdfivesum#1{\mdfivesum file {#1}}% +\fi +\ifdefined\pdf@filemoddate\else% very poor XeLaTeX bypassing + \def\pdf@filemoddate#1{}% +\fi + +\def\tcbproc@readmdfive#1#2{% + \edef\tcbprocmdfivesum{\pdf@filemdfivesum{#1}}% + \IfFileExists{#2}{\input{#2}}{\def\tcbproclastmdfivesum{}}% +} + +\def\tcbproc@writemdfive#1{% + \immediate\openout\tcb@out=#1% + \immediate\write\tcb@out{\string\def\string\tcbproclastmdfivesum{\tcbprocmdfivesum}\@percentchar}% + \immediate\closeout\tcb@out% +} + +\newrobustcmd{\iftcb@process@on}[3]{% + \tcbproc@readmdfive{#1}{#2}% + \ifdefstrequal{\tcbproclastmdfivesum}{\tcbprocmdfivesum}{}{\tcbproc@writemdfive{#2}}% + \expandafter\@firstoftwo% +} + +\newrobustcmd{\iftcb@process@conditional}[3]{% + \tcbproc@readmdfive{#1}{#2}% + \ifdefstrequal{\tcbproclastmdfivesum}{\tcbprocmdfivesum}{% + \IfFileExists{#3}{% + \ifnum\pdf@strcmp{\pdf@filemoddate{#2}}{\pdf@filemoddate{#3}}>0\relax% + \expandafter\@firstoftwo% + \else% + \expandafter\@secondoftwo% + \fi% + }{\expandafter\@firstoftwo}% + }{% + \tcbproc@writemdfive{#2}% + \expandafter\@firstoftwo% + }% +} + +\newrobustcmd{\iftcb@process@off}[3]{% + \tcbproc@readmdfive{#1}{#2}% + \ifdefstrequal{\tcbproclastmdfivesum}{\tcbprocmdfivesum}{}{\tcbproc@writemdfive{#2}}% + \expandafter\@secondoftwo% +}% + +\newrobustcmd{\tcbiffileprocess}[1]{% + \ifcase\numexpr#1\relax% + \expandafter\iftcb@process@on% + \or% + \expandafter\iftcb@process@conditional% + \else% + \expandafter\iftcb@process@off% + \fi% +} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 3de8d30c03a..4d4c02ca597 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 64eff210d50..6fa5bef8e62 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \RequirePackage{tikz}[2010/10/13] @@ -1707,7 +1707,7 @@ }{% \iftcb@fixedheight% \begin{tcolorbox}% - \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,height=\tcbtextheight]}% + \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth,height=\tcbtextheight,keepaspectratio]}% \x{\imagepath}% \end{tcolorbox}% \else% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index b68f4dc7819..537ad9fe6fd 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 6a94a75ed65..8203e2dc108 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \RequirePackage{amsmath} @@ -139,6 +139,7 @@ \@@newtcolorbox[auto counter,#1]{#2}[3][]{#4,% title={\tcb@theo@title{#3}{\thetcbcounter}{##2}},% list entry={\protect\numberline{\thetcbcounter}##2},% + nameref={##2},% code={\tcb@theo@label{#5}{##3}},% ##1}% \@@newtcolorbox[#1,no counter,list inside=]{#2*}[2][]{#4,% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex index 393ff7cc2f1..302de99d103 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \tcbuselibrary{skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index fbe3cd4356a..f884b978e92 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% 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.93} +\tcb@set@library@version{3.94} \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 1455dcd5669..f398fd14b7a 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.93 (2016/06/01) +%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2016/06/01 version 3.93 text color boxes] -\def\tcb@version{3.93} +\ProvidesPackage{tcolorbox}[2016/07/14 version 3.94 text color boxes] +\def\tcb@version{3.94} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -129,7 +129,7 @@ \pgfkeys{/handlers/.colorlet/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\colorlet{#1}{##1}}} \newcommand\tcbtitle{\ifx\tcbtitletext\@empty\else% - {\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi} + \leavevmode{\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi} \def\tcb@detach@title@code@{% \let\tcbtitletext\kvtcb@title% @@ -149,6 +149,14 @@ \let\tcb@specialtitle@hook\@empty% } +\def\tcb@gettitle#1{\edef\@currentlabelname{#1}} + +\AtBeginDocument{% + \@ifpackageloaded{nameref}{% + \let\tcb@gettitle\NR@gettitle% + }{}% +} + % analog to plain.tex \def\tcb@raggedright@plain{\raggedright\rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax} \def\tcb@raggedleft@plain{\raggedleft\leftskip0pt plus2em \spaceskip.3333em \xspaceskip.5em \hbadness=10000\relax} @@ -580,6 +588,7 @@ step/.style={phantom={\refstepcounter{#1}}},% label/.style={phantom={\tcb@set@label{#1}}},% phantomlabel/.style={phantom={\ifdefined\phantomsection\phantomsection\fi\tcb@set@label{#1}}},% + nameref/.code={\tcb@gettitle{#1}},% label type/.store in=\kvtcb@label@type,% no label type/.style={label type=},% add to list/.style 2 args={phantom={\tcb@addcontentsline{#1}{#2}}}, @@ -1470,7 +1479,7 @@ \fi% \iftcb@hasLower% \tcb@box@align{\tcb@lowerbox}% - \iftcb@lowervisible\color{tcbcol@lower}\unhbox\tcb@lowerbox% + \iftcb@lowervisible\leavevmode\color{tcbcol@lower}\unhbox\tcb@lowerbox% \else% \iftcb@lowerignored\else\rule[-\dp\tcb@lowerbox]{0pt}{\the\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox\relax}\fi% \fi% @@ -2066,6 +2075,7 @@ \DeclareOption{#1}{\appto\tcb@optionlist{,#1}}% } +\tcb@add@library{pro@cessing}{tcbprocessing.code.tex} \tcb@add@library{listings@core}{tcblistingscore.code.tex} \tcb@add@library{listings}{tcblistings.code.tex} \tcb@add@library{listingsutf8}{tcblistingsutf8.code.tex} |