diff options
Diffstat (limited to 'Master/texmf-dist/tex')
18 files changed, 78 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index b5936ffd193..4f49995650a 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index b514fac092c..2a22308c2bf 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \tcbuselibrary{listings,skins,xparse,external} @@ -469,8 +469,6 @@ \tcbset{% reset@documentation/.style={% index command=\index,% - index format=pgf, - english language, documentation listing style=tcbdocumentation, index default settings, color option=Option, @@ -490,6 +488,8 @@ doc marginnote=, }, initialize@reset=reset@documentation, + index format=pgf, + english language, } % deprecated diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 22938134556..1b8007ef0cb 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.94} +\tcb@set@library@version{3.95} \tcbuselibrary{pro@cessing} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index e4196e72458..4e079ccef35 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -257,8 +257,7 @@ \tcb@set@color{tcbcol@upper}% \begin{tcb@savebox}{\tcb@upperbox}{##1}% \kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% -% \kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper% - \kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\kvtcb@after@upper% + \kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\ifvmode\else\unskip\fi\kvtcb@after@upper% \end{tcb@savebox}% \tcb@reset@color% \advance\count@ 1\relax% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 001d3a0f26b..09eebf59d18 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 05ae51bc857..4e688db6918 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 84a7edc429b..f35d49cc7e8 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.94} +\tcb@set@library@version{3.95} \tcbuselibrary{pro@cessing} @@ -42,7 +42,7 @@ \newenvironment{tcb@lower@outside}[1]{% \tcbset{savedelimiter=tcb@lower@outside}\tcb@minipage{#1}% \color{tcbcol@lower}\kvtcb@fontlower\kvtcb@halignlower\kvtcb@before@lower\ignorespaces}% - {\kvtcb@after@lower\endminipage} + {\ifvmode\else\unskip\fi\kvtcb@after@lower\endminipage} \def\tcb@use@listing@other@reset{% \tcbset{every box on layer 1/.style={reset,every box}}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index afc31d98309..7d113e55432 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 dff4369a280..4fb8094aeaf 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 4d9cfecd05e..49d84486484 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \RequirePackage{minted}[2011/09/17] @@ -34,7 +34,9 @@ \fi% \toks@=\expandafter{#1}% \edef\tcb@temp{\noexpand\inputminted[\the\toks@]}% - \tcb@temp{#2}{\minted@outputdir#3}% + \IfFileExists{\minted@outputdir#3}% + {\tcb@temp{#2}{\minted@outputdir#3}}% + {\tcb@temp{#2}{#3}}% } \def\tcb@minted@uselistinglisting{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex index c24e493096f..581d1f243e1 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.94} +\tcb@set@library@version{3.95} \RequirePackage{pdftexcmds} \RequirePackage{shellesc} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 4d4c02ca597..517ffdd74d7 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 6fa5bef8e62..db327334ec8 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \RequirePackage{tikz}[2010/10/13] @@ -1711,10 +1711,22 @@ \x{\imagepath}% \end{tcolorbox}% \else% - \begin{tcolorbox}% - \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth]}% - \x{\imagepath}% - \end{tcolorbox}% + \ifdefempty\tcb@height@adjust{% + \begin{tcolorbox}% + \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth]}% + \x{\imagepath}% + \end{tcolorbox}% + }{% height fill + \begin{tcolorbox}[underlay={% + \begin{tcbclipinterior}% + \begingroup\edef\x{\endgroup\noexpand\tikzset{fill image options={\expandonce\kvtcb@graphics@options}}}\x% + \path[fill zoom image={\imagepath}] + ([xshift=\kvtcb@boxsep+\kvtcb@leftupper,yshift=\kvtcb@boxsep+\kvtcb@bottom]interior.south west) rectangle + ([xshift=-\kvtcb@boxsep-\kvtcb@rightupper,yshift=-\kvtcb@boxsep-\kvtcb@top]interior.north east); + \end{tcbclipinterior}% + }]% + \end{tcolorbox}% + }% \fi% }% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 537ad9fe6fd..5a606e2c145 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 8203e2dc108..cc03011904f 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 302de99d103..1f812319862 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 f884b978e92..be73677cf7c 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% 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.94} +\tcb@set@library@version{3.95} \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 f398fd14b7a..aa7a56d80fb 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.94 (2016/07/14) +%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2016/07/14 version 3.94 text color boxes] -\def\tcb@version{3.94} +\ProvidesPackage{tcolorbox}[2016/10/21 version 3.95 text color boxes] +\def\tcb@version{3.95} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -497,10 +497,10 @@ after title/.store in=\kvtcb@after@title,% before upper/.store in=\kvtcb@before@upper,% after upper/.store in=\kvtcb@after@upper,% - after upper*/.style={after upper={\ifvmode\else\unskip\fi#1}},% + after upper*/.style={after upper={#1}},% before lower/.store in=\kvtcb@before@lower,% after lower/.store in=\kvtcb@after@lower,% - after lower*/.style={after lower={\ifvmode\else\unskip\fi#1}},% + after lower*/.style={after lower={#1}},% center title/.style={halign title=flush center},% center upper/.style={halign upper=flush center},% center lower/.style={halign lower=flush center},% @@ -578,6 +578,7 @@ capture/.store in=\kvtcb@capture,% hbox/.style={capture=hbox},% minipage/.style={capture=minipage},% + void/.style={capture=v@@d,capture/.code=,options@for/.code=,code={\def\tcbinputlisting@core{}}}, check odd page/.is if=tcb@checkpage, if odd page/.code 2 args={% \tcbset{check odd page}% @@ -823,7 +824,7 @@ \let\tcb@after@box=\kvtcb@after@upper% % switch for lower box \def\tcblower{% - \tcb@after@box% + \ifvmode\else\unskip\fi\tcb@after@box% \end{tcb@savebox}% \tcb@set@color{tcbcol@lower}% \unless\iftcb@sidebyside% @@ -871,6 +872,16 @@ \Collect@Body\tcbox@inner@hbox@collected% } +\def\tcb@@end@v@@d{% + \endcomment% + \tcb@layer@dec% +} + +\def\tcb@@capture@v@@d{% + \let\endtcolorbox\tcb@@end@v@@d% + \comment% +} + \long\def\tcbox@inner@hbox@collected#1{% \tcbox@inner@hbox{#1}% \tcb@finalize@environment% @@ -997,7 +1008,7 @@ \let\tcolorbox\tcb@colorbox \def\tcb@endboxanddraw{% - \tcb@after@box% + \ifvmode\else\unskip\fi\tcb@after@box% \end{tcb@savebox}% \tcb@reset@color% \tcb@draw@color@box% @@ -1623,7 +1634,7 @@ \tcb@set@@phantom% \colorlet{tcbcol@origin}{.}% \tcb@set@color{tcbcol@upper}% - \sbox\tcb@upperbox{\tcb@embed@tcbox{\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\kvtcb@after@upper}}% + \sbox\tcb@upperbox{\tcb@embed@tcbox{\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\ifvmode\else\unskip\fi\kvtcb@after@upper}}% \tcb@reset@color% \tcbdimto\tcb@val@raisebase{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}% \tcbdimto\kvtcb@width{\wd\tcb@upperbox+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}% @@ -1641,12 +1652,13 @@ \tcb@set@@dimensions% \colorlet{tcbcol@origin}{.}% \tcb@set@color{tcbcol@upper}% - \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\kvtcb@after@upper\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\ifvmode\else\unskip\fi\kvtcb@after@upper\end{tcb@savebox}% \tcb@reset@color% \tcb@hasLowerfalse% \tcb@draw@color@box% } +\long\def\tcbox@inner@v@@d#1{}% \long\def\tcb@ox#1#2{% \begingroup% |