diff options
Diffstat (limited to 'Master/texmf-dist/tex')
13 files changed, 152 insertions, 70 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 8aa4f023dfa..3cc9dcea3d3 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -218,7 +218,7 @@ \newif\iftcb@multicol \newif\iftcb@vfillbeforefirst -\def\tcb@drawcolorbox@breakable{% +\def\tcb@prepare@break@operation{% \@ifundefined{columnbreak}{\tcb@multicolfalse}{% \ifnum\doublecol@number>\z@ % \tcb@multicoltrue% @@ -227,7 +227,7 @@ \fi}% \ifx\kvtcb@float\@empty% \kvtcb@beforebox% - \def\kvtcb@beforebox{\nointerlineskip\noindent}% + \def\kvtcb@beforebox{\parskip\z@\nointerlineskip\noindent}% \noindent% applies parskip \vskip\lineskip{\parskip\z@\par\vskip\z@}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list \tcb@break@allowedtrue% @@ -235,13 +235,24 @@ \else% \tcb@break@allowedfalse% \fi% +} + +\def\tcb@height@fill@unbroken{% + \tcb@prepare@break@operation% + \tcb@breakat@init% + \tcb@comp@h@page% + \tcbset{height=\tcb@h@page}% +} + +\def\tcb@drawcolorbox@breakable{% + \tcb@prepare@break@operation% \let\tcb@after@lastbox=\kvtcb@afterbox% \let\kvtcb@afterbox=\@empty% \begingroup% - \parskip0pt% - \parindent0pt% - \lineskip0pt% - \topskip0pt% + \parskip\z@% + \parindent\z@% + \lineskip\z@% + \topskip\z@% \tcb@split@start% \endgroup% \ifx\kvtcb@float\@empty% @@ -373,7 +384,7 @@ \fi% \let\tcb@after@last=\par% \else% - \edef\tcb@before@first{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]}% + \edef\tcb@before@first{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]\noexpand\kvtcb@everyfloat}% \let\tcb@before@middle=\tcb@before@first% \let\tcb@before@last=\tcb@before@first% \let\tcb@after@first=\tcb@float@env@end% @@ -720,7 +731,7 @@ bottomsep at break/.store in=\kvtcb@bottomsep,% pad before break/.code={\let\kvtcb@bottom@rule@break=\tcb@zpt% \tcbdimto\kvtcb@bottomsep{#1-\kvtcb@bottom-\kvtcb@boxsep}},% - pad before break*/.style={pad before break,% + pad before break*/.style={pad before break={#1},% code={\tcbdimto\tcb@temp{\kvtcb@bottom@rule@stand-\kvtcb@bottomsep}% \ifdim\tcb@temp>0pt\relax% \tcbdimto\kvtcb@enlargepage@flex{\kvtcb@enlargepage@flex+\tcb@temp}\fi}},% @@ -761,6 +772,8 @@ \let\tcb@break@ch@middle=\tcb@break@ch@fixed% \let\tcb@break@ch@last=\tcb@break@ch@fixed},% vfill before first/.is if=tcb@vfillbeforefirst,% + height fill/true/.code={\let\tcb@height@adjust\tcb@height@fill@unbroken},% + height fill/.default=true,% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index e409e62f9e4..badf3f59411 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,9 +17,9 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.12} +\tcb@set@library@version{3.20} -\tcbuselibrary{listings,skins} +\tcbuselibrary{listings,skins,xparse} \RequirePackage{doc}[2010/02/04] \RequirePackage{pifont}[2005/04/12] @@ -27,6 +27,7 @@ \ifdefined\printindex\else\RequirePackage{makeidx}[2000/03/29]\fi \RequirePackage{refcount}[2011/10/16] \RequirePackage{hyperref}[2012/02/06] +\ifdefined\marginnote\else\RequirePackage{marginnote}[2012/03/29]\fi \definecolor{Option}{rgb}{0.118,0.546,0.222} \definecolor{Definition}{rgb}{0.784,0.06,0.176} @@ -75,7 +76,9 @@ key/.store in=\kvtcb@text@key, keys/.store in=\kvtcb@text@keys, index/.store in=\kvtcb@text@index, + new/.store in=\kvtcb@text@new, pageshort/.store in=\kvtcb@text@pageshort, + updated/.store in=\kvtcb@text@updated, value/.store in=\kvtcb@text@value, values/.store in=\kvtcb@text@values, } @@ -113,6 +116,10 @@ doc head/.style={doc head command={#1},doc head environment={#1},doc head key={#1}}, doc description/.store in=\kvtcb@doc@description,% doc into index/.is if=tcb@doc@toindex,% + doc updated/.style={before upper={\tcbdocmarginnote{\tcbdocupdated{#1}}}}, + doc new/.style={before upper={\tcbdocmarginnote{\tcbdocnew{#1}}}}, + doc new and updated/.style 2 args={before upper={\tcbdocmarginnote{\tcbdocnew{#1}\\\tcbdocupdated{#2}}}}, + doc marginnote/.style={doc@marginnote/.style={#1}}, } @@ -129,7 +136,9 @@ environment=environment,environments=Environments, key=key,keys=Keys, index=Index, + new=New, pageshort={P.}, + updated=Updated, value=value,values=Values}}, } @@ -240,7 +249,7 @@ \begin{tcb@doc@head}{doc@head@command}% \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\cs{#2}}\label{com:#2}{\ttfamily #3}% \tcb@doc@do@description% - \end{tcb@doc@head}}% + \end{tcb@doc@head}\tcbset{before upper=}}% {\end{tcb@manual@entry}} \newenvironment{docCommand*}{\bgroup\tcb@doc@toindexfalse\begin{docCommand}}{\end{docCommand}\egroup} @@ -252,28 +261,28 @@ \strut~~\meta{\kvtcb@text@envcontent}\par% \strut\cs{end}\brackets{\tcb@Print@Env{#2}}% \tcb@doc@do@description% - \end{tcb@doc@head}}% + \end{tcb@doc@head}\tcbset{before upper=}}% {\end{tcb@manual@entry}} \newenvironment{docEnvironment*}{\bgroup\tcb@doc@toindexfalse\begin{docEnvironment}}{\end{docEnvironment}\egroup} -\newenvironment{docKey}[4][\@empty]{\begin{tcb@manual@entry}% - \tcbset{doc description={#4}}% +\NewDocumentEnvironment{docKey}{ O{\@empty} +O{} m m +m }{\tcbset{#2,doc description={#5}}% + \begin{tcb@manual@entry}% \begin{tcb@doc@head}{doc@head@key}% - \ifx#1\@empty% - \tcb@Print@Key{#2}\tcb@index@Key{#2}\protected@edef\@currentlabel{#2}\label{key:#2}{\ttfamily #3}% - \else\tcb@Print@Key{/#1/#2}\tcb@index@KeyPath{#1}{#2}\protected@edef\@currentlabel{/#1/#2}\label{key:/#1/#2}{\ttfamily #3}% - \fi% + \def\temp@a{#1}\ifx\temp@a\@empty% + \tcb@Print@Key{#3}\tcb@index@Key{#3}\protected@edef\@currentlabel{#3}\label{key:#2}{\ttfamily #4}% + \else\tcb@Print@Key{/#1/#3}\tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/#3}{\ttfamily #4}\fi% \tcb@doc@do@description% - \end{tcb@doc@head}}% + \end{tcb@doc@head}\tcbset{before upper=}}% {\end{tcb@manual@entry}} \newenvironment{docKey*}{\bgroup\tcb@doc@toindexfalse\begin{docKey}}{\end{docKey}\egroup} \def\tcbmakedocSubKey#1#2{% - \newenvironment{#1}[4][\@empty]{% - \ifx##1\@empty\def\tcb@key@path{#2}\else\def\tcb@key@path{#2/##1}\fi% - \begin{docKey}[\tcb@key@path]{##2}{##3}{##4}}% + \NewDocumentEnvironment{#1}{ O{} +O{} m m +m }{% + \def\temp@a{##1}\ifx\temp@a\@empty% + \def\tcb@key@path{#2}\else\def\tcb@key@path{#2/##1}\fi% + \begin{docKey}[\tcb@key@path][##2]{##3}{##4}{##5}}% {\end{docKey}}% \newenvironment{#1*}{\bgroup\tcb@doc@toindexfalse\begin{#1}}{\end{#1}\egroup}% } @@ -286,15 +295,15 @@ \def\docAuxEnvironment@star#1{\tcb@Print@Env{#1}}% \def\docAuxEnvironment{\@ifstar\docAuxEnvironment@star\docAuxEnvironment@} -\newcommand{\docAuxKey@}[2][\@empty]{% - \ifx#1\@empty% +\newcommand{\docAuxKey@}[2][]{% + \def\temp@a{#1}\ifx\temp@a\@empty% \tcb@Print@Key{#2}\tcb@index@Key{#2}% \else% \tcb@Print@Key{/#1/#2}\tcb@index@KeyPath{#1}{#2}% \fi}% -\newcommand{\docAuxKey@star}[2][\@empty]{% - \ifx#1\@empty% +\newcommand{\docAuxKey@star}[2][]{% + \def\temp@a{#1}\ifx\temp@a\@empty% \tcb@Print@Key{#2}% \else% \tcb@Print@Key{/#1/#2}% @@ -336,6 +345,17 @@ \item\relax\footnotesize} {\endlist} +\newcommand{\tcbdocmarginnote}[2][]{ + \marginnote{% + \begin{tcolorbox}[enhanced jigsaw,size=fbox,boxrule=1pt,leftrule=0pt,rightrule=0pt, + arc=0pt,outer arc=1pt,boxsep=1pt,top=1pt,bottom=1pt, + nobeforeafter,width=\marginparwidth, + colframe=red!50!white,colback=red!25!yellow!5!white,fontupper=\scriptsize,before upper=\flushright, + doc@marginnote,#1]#2\end{tcolorbox}}} + +\newcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1} +\newcommand*{\tcbdocupdated}[1]{\kvtcb@text@updated: #1} + %--- index macros taken from pgfmanual-en-macros \def\tcb@doc@index@pgf@{% \c@IndexColumns=2% @@ -398,6 +418,7 @@ doc into index=true, index colorize=false, index annotate=true, + doc marginnote=, }, 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 e0603ede7da..1bdc416c4e5 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 c1dfbfa8c90..f7a67861239 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% @@ -59,6 +59,8 @@ overlay unbroken and last pre/.style={overlay unbroken pre={#1},overlay last pre={#1}},% overlay middle and last app/.style={overlay middle app={#1},overlay last app={#1}},% overlay middle and last pre/.style={overlay middle pre={#1},overlay last pre={#1}},% + overlay first and middle app/.style={overlay first app={#1},overlay middle app={#1}},% + overlay first and middle pre/.style={overlay first pre={#1},overlay middle pre={#1}},% % % skins: frame code app/.code={\appto\tcb@frame@code{#1}},% @@ -82,6 +84,7 @@ underlay unbroken and first pre/.style={underlay unbroken pre={#1},underlay first pre={#1}},% underlay unbroken and last pre/.style={underlay unbroken pre={#1},underlay last pre={#1}},% underlay middle and last pre/.style={underlay middle pre={#1},underlay last pre={#1}},% + underlay first and middle pre/.style={underlay first pre={#1},underlay middle pre={#1}},% finish unbroken pre/.code={\preto\tcb@finish@unbroken{#1}},% finish first pre/.code={\preto\tcb@finish@first{#1}},% finish middle pre/.code={\preto\tcb@finish@middle{#1}},% @@ -91,6 +94,7 @@ finish unbroken and first pre/.style={finish unbroken pre={#1},finish first pre={#1}},% finish unbroken and last pre/.style={finish unbroken pre={#1},finish last pre={#1}},% finish middle and last pre/.style={finish middle pre={#1},finish last pre={#1}},% + finish first and middle pre/.style={finish first pre={#1},finish middle pre={#1}},% % watermark tikz app/.style={overlay app={\tcb@drawspec@watermark@tikz{#1}}}, watermark tikz pre/.style={overlay pre={\tcb@drawspec@watermark@tikz{#1}}}, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index ed80e9828bb..7169de937dc 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 8fbf0e8989c..53b86a534cc 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% \def\tcbuselistingcomment{\kvtcb@listingcomment}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index f52492e9c79..9754221198b 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 2950b0ccc05..56574f31d1a 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index c20c9d9785c..4ab546e513c 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \RequirePackage{tikz}[2010/10/13] @@ -44,6 +44,30 @@ \end{scope}% } +\def\tcbsettowidthofnode#1#2{% + \pgfpointanchor{#2}{east}\unskip% + #1\pgf@x% + \pgfpointanchor{#2}{west}\unskip% + \advance #1 by -\pgf@x\relax% +} + +\def\tcbsetmacrotowidthofnode#1#2{% + \tcbsettowidthofnode\pgf@xa{#2}% + \edef#1{\the\pgf@xa}% +} + +\def\tcbsettoheightofnode#1#2{% + \pgfpointanchor{#2}{north}\unskip% + #1\pgf@y% + \pgfpointanchor{#2}{south}\unskip% + \advance #1 by -\pgf@y\relax% +} + +\def\tcbsetmacrotoheightofnode#1#2{% + \tcbsettoheightofnode\pgf@ya{#2}% + \edef#1{\the\pgf@ya}% +} + \def\tcb@spec#1{\tikzset{tcb@spec/.style={#1}}} \def\tcb@gettikzxy#1#2#3{% @@ -897,6 +921,7 @@ underlay unbroken and first/.style={underlay unbroken={#1},underlay first={#1}},% underlay unbroken and last/.style={underlay unbroken={#1},underlay last={#1}},% underlay middle and last/.style={underlay middle={#1},underlay last={#1}},% + underlay first and middle/.style={underlay first={#1},underlay middle={#1}},% no underlay unbroken/.code={\let\tcb@underlay@unbroken\@empty},% no underlay first/.code={\let\tcb@underlay@first\@empty},% no underlay middle/.code={\let\tcb@underlay@middle\@empty},% @@ -912,6 +937,7 @@ finish unbroken and first/.style={finish unbroken={#1},finish first={#1}},% finish unbroken and last/.style={finish unbroken={#1},finish last={#1}},% finish middle and last/.style={finish middle={#1},finish last={#1}},% + finish first and middle/.style={finish first={#1},finish middle={#1}},% no finish unbroken/.code={\let\tcb@finish@unbroken\@empty},% no finish first/.code={\let\tcb@finish@first\@empty},% no finish middle/.code={\let\tcb@finish@middle\@empty},% @@ -971,8 +997,8 @@ \let\tcb@trans@colframe\kvtcb@colframe% \let\tcb@trans@colback\kvtcb@colbacktitle% \let\tcb@trans@boxedstyle\kvtcb@style@boxedtitle% - \setbox\tcb@titlebox\hbox{\bgroup\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup}% - \setbox\tcb@titlebox\hbox{\tcbox[colframe=\tcb@trans@colframe,colback=\tcb@trans@colback,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}}% + \setbox\tcb@titlebox\color@hbox\bgroup\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox% + \setbox\tcb@titlebox\color@hbox\tcbox[colframe=\tcb@trans@colframe,colback=\tcb@trans@colback,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox% % \tcbdimto\tcboxedtitleheight{\ht\tcb@titlebox+\dp\tcb@titlebox}% \tcbdimto\tcboxedtitlewidth{\wd\tcb@titlebox}% @@ -1043,12 +1069,12 @@ } \def\tcb@drawspec@watermark@tikz#1{% - \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\pgfsetbaseline{0pt}\begin{tikzpicture}[color=\kvtcb@watermark@color]#1\end{tikzpicture}}\endpgfinterruptpicture}% + \setbox\tcb@waterbox=\color@hbox\pgfinterruptpicture{\pgfsetbaseline{0pt}\begin{tikzpicture}[color=\kvtcb@watermark@color]#1\end{tikzpicture}}\endpgfinterruptpicture\color@endbox% \tcb@drawspec@watermark% } \def\tcb@drawspec@watermark@graphics#1{% - \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\includegraphics{#1}}\endpgfinterruptpicture}% + \setbox\tcb@waterbox=\color@hbox\pgfinterruptpicture{\includegraphics{#1}}\endpgfinterruptpicture\color@endbox% \tcb@drawspec@watermark% } @@ -1118,11 +1144,11 @@ } \def\tcb@set@waterbox@to@graphics#1{% - \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options]{#1}}\endpgfinterruptpicture}% + \setbox\tcb@waterbox=\color@hbox\pgfinterruptpicture{\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options]{#1}}\endpgfinterruptpicture\color@endbox% } \def\tcb@set@waterbox@to@picture#1{% - \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\pgfsetbaseline{0pt}\begin{tikzpicture}#1\end{tikzpicture}}\endpgfinterruptpicture}% + \setbox\tcb@waterbox=\color@hbox\pgfinterruptpicture{\pgfsetbaseline{0pt}\begin{tikzpicture}#1\end{tikzpicture}}\endpgfinterruptpicture\color@endbox% } \tikzset{% @@ -1195,7 +1221,7 @@ fill tile image/.style={fill@tile={\tcb@set@waterbox@to@graphics{#1}}},% fill tile picture/.style={fill@tile={\tcb@set@waterbox@to@picture{#1}}},% fill tile picture*/.style 2 args={fill@tile={\tcb@set@waterbox@to@picture{#2}% - \setbox\tcb@waterbox=\hbox{\scalebox{#1}{\box\tcb@waterbox}}}},% + \setbox\tcb@waterbox=\color@hbox\scalebox{#1}{\box\tcb@waterbox}\color@endbox}},% % fill plain image*/.style 2 args={fill image options={#1},fill plain image={#2}},% fill stretch image*/.style 2 args={fill image options={#1},fill stretch image={#2}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index ffba3c635f0..5253c506a43 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 005715b58db..ebae94f0781 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \RequirePackage{amsmath} @@ -31,7 +31,7 @@ \def\tcb@theo@desc@form@std#1{\tcb@desc@col\kvtcb@desc@font\kvtcb@desc@delim@left#1\kvtcb@desc@delim@right} \def\tcb@theo@title#1#2#3{% - \ifdefempty{#2}{\setbox\z@=\hbox{#1}}{\setbox\z@=\tcb@theo@form{#1}{#2}}% + \ifdefempty{#2}{\setbox\z@=\color@hbox#1\color@endbox}{\setbox\z@=\tcb@theo@form{#1}{#2}}% \def\temp@a{#3}% \ifx\temp@a\@empty\relax% \unhbox\z@\kvtcb@terminatorsign% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 1507a58e0b2..0f28592d610 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% 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.12} +\tcb@set@library@version{3.20} \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 7ec9b8061a3..4791a3c546f 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.12 (2014/07/29) +%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/07/29 version 3.12 text color boxes] -\def\tcb@version{3.12} +\ProvidesPackage{tcolorbox}[2014/09/22 version 3.20 text color boxes] +\def\tcb@version{3.20} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -201,6 +201,7 @@ float/.default=\kvtcb@floatplacement, float*/.code={\def\kvtcb@float{#1}\def\tcb@float@env@begin{\@dblfloat}\def\tcb@float@env@end{\end@dblfloat}}, float*/.default=\kvtcb@floatplacement, + every float/.store in=\kvtcb@everyfloat,% nofloat/.style={float=}, before/.code={\def\kvtcb@beforebox{#1}\let\tcb@use@autoparskip=\relax}, after/.code={\def\kvtcb@afterbox{#1}\let\tcb@use@autoparskip=\relax}, @@ -216,6 +217,8 @@ height/.code={\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed}, height plus/.dimstore in=\kvtcb@height@fixed@plus,% height from/.style args={#1 to #2}{height={#1},height plus={#2-#1}},% + height fill/.is choice,% + height fill/false/.code={\let\tcb@height@adjust\@empty},% equal height group/.code={\edef\tcb@ehgid{#1}\let\tcb@ch=\tcb@ch@equalheight}, minimum for equal height group/.code args={#1:#2}{\edef\tcb@ehgid{#1}\tcb@ehgadd{#2}}, space/.code={\def\tcb@height@fraction{#1}\let\tcb@ch@fixed@both=\tcb@ch@fixed@space}, @@ -326,6 +329,9 @@ overlay middle and last/.code={\def\tcb@overlay@temp{#1}% \let\tcb@overlay@middle=\tcb@overlay@temp% \let\tcb@overlay@last=\tcb@overlay@temp},% + overlay first and middle/.code={\def\tcb@overlay@temp{#1}% + \let\tcb@overlay@first=\tcb@overlay@temp% + \let\tcb@overlay@middle=\tcb@overlay@temp},% no overlay/.style={overlay=},% standard/.style={skin=standard},% standard jigsaw/.style={skin=standard jigsaw},% @@ -368,8 +374,8 @@ tcbox raise/.style={baseline=-#1},% tcbox raise base/.style={baseline=\tcb@val@raisebase},% shrink tight/.style={boxsep=0mm,top=-\kvtcb@top@rule@stand,bottom=-\kvtcb@bottom@rule@stand,left=-\kvtcb@left@rule,right=-\kvtcb@right@rule},% - extrude left by/.code={\tcbdimto\kvtcb@leftupper{\kvtcb@leftupper+#1}\tcbdimto\kvtcb@bbleft{\kvtcb@bbleft-#1}},% - extrude right by/.code={\tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+#1}\tcbdimto\kvtcb@bbright{\kvtcb@bbright-#1}},% + extrude left by/.code={\tcbdimto\kvtcb@leftupper{\kvtcb@leftupper+#1}\tcbdimto\kvtcb@bbleft{\kvtcb@bbleft-#1}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},% + extrude right by/.code={\tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+#1}\tcbdimto\kvtcb@bbright{\kvtcb@bbright-#1}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},% extrude top by/.code={\tcbdimto\kvtcb@top{\kvtcb@top+#1}\tcbdimto\kvtcb@bbtop@stand{\kvtcb@bbtop@stand-#1}},% extrude bottom by/.code={\tcbdimto\kvtcb@bottom{\kvtcb@bottom+#1}\tcbdimto\kvtcb@bbbottom@stand{\kvtcb@bbbottom@stand-#1}},% extrude by/.style={extrude left by=#1,extrude right by=#1,extrude top by=#1,extrude bottom by=#1},% @@ -415,6 +421,7 @@ lower separated/.is if=tcb@lowerseparated, options@for/.code={\letcs\tcb@new@colop{tcb@opt@#1}\pgfkeysalsofrom\tcb@new@colop}, list entry/.store in=\kvtcb@listentry, + list text/.style={list entry={\protect\numberline{\thetcbcounter}{\ignorespaces #1}}}, title filled/.is if=tcb@titlefilled,% @colbacktitle/.store in=\kvtcb@colbacktitle, colbacktitle/.style={title filled,@colbacktitle={#1}}, @@ -654,7 +661,7 @@ \long\def\tcb@@icolorbox[#1]{% \tcb@layer@inc% - \tcbset{capture=minipage,#1}\tcb@afteroptions@hook% + \tcbset{capture=minipage,#1}\tcb@height@adjust\tcb@afteroptions@hook% \tcb@hasLowerfalse% \csname tcb@@capture@\kvtcb@capture\endcsname% } @@ -1106,7 +1113,7 @@ \let\tcb@before@unbroken=\kvtcb@beforebox% \let\tcb@after@unbroken=\kvtcb@afterbox% \else% - \edef\tcb@before@unbroken{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]}% + \edef\tcb@before@unbroken{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]\noexpand\kvtcb@everyfloat}% \let\tcb@after@unbroken=\tcb@float@env@end% \fi% \setcounter{tcbbreakpart}{1}% @@ -1173,7 +1180,7 @@ \long\def\tcb@ox#1#2{% \begingroup% \tcb@layer@inc% - \tcbset{#1}\tcb@afteroptions@hook% + \tcbset{#1}\tcb@height@adjust\tcb@afteroptions@hook% \csname tcbox@inner@\kvtcb@capture\endcsname{#2}% \tcb@layer@dec% \endgroup% @@ -1186,7 +1193,8 @@ \tcbset{% new/.cd,% - use counter/.code={\def\kvtcb@new@counter{#1}\let\tcb@proc@counter=\tcb@proc@counter@use}, + use counter/.code={\edef\kvtcb@new@counter{#1}\let\tcb@proc@counter=\tcb@proc@counter@use}, + use counter*/.code={\edef\kvtcb@new@counter{#1}\let\tcb@proc@counter=\tcb@proc@counter@from}, auto counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@auto}, use counter from/.code={\edef\kvtcb@new@counter{\csname tcb@cnt@#1\endcsname}\let\tcb@proc@counter=\tcb@proc@counter@from}, no counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@no}, @@ -1202,6 +1210,11 @@ crefname/.code 2 args={\appto\kvtcb@init@hook{\crefname{\tcbcounter}{#1}{#2}}}, Crefname/.code 2 args={\appto\kvtcb@init@hook{\Crefname{\tcbcounter}{#1}{#2}}}, % + blend into/.is choice,% + blend into/figures/.style={use counter*=figure,list inside=lof,/tcb/code={\appto\tcb@new@colopt{,before title={\fnum@figure:\ }}}},% + blend into/tables/.style={use counter*=table,list inside=lot,/tcb/code={\appto\tcb@new@colopt{,before title={\fnum@table:\ }}}},% + blend into/listings/.style={use counter*=lstlisting,list inside=lol,/tcb/code={\appto\tcb@new@colopt{,before title={\lstlistingname~\thetcbcounter:\ }}}},% + % reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,list inside=,list type=tcolorbox,init@hook@clear}, } @@ -1339,9 +1352,13 @@ \def\tcb@addcontentsline#1#2{% \ifx\kvtcb@listentry\@empty% \ifx\kvtcb@title\@empty% - \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}\kvtcb@savedelimiter}% + \ifx\tcbtitletext\@empty% + \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}{\ignorespaces\kvtcb@savedelimiter}}% + \else% + \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}{\ignorespaces\tcbtitletext}}% + \fi% \else% - \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}\kvtcb@title}% + \addcontentsline{#1}{#2}{\protect\numberline{\thetcbcounter}{\ignorespaces\kvtcb@title}}% \fi% \else% \addcontentsline{#1}{#2}{\kvtcb@listentry}% @@ -1424,7 +1441,8 @@ \tcbset{% initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},% reset/.code={\tcb@reset},% - reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@}, + reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@% + \let\tcb@afteroptions@hook\@empty}, width=\linewidth,autoparskip, natural height,height plus=0pt,space to lower,valign=top,valign lower=top, size=normal,rounded corners, @@ -1440,7 +1458,7 @@ lefthand ratio=0.5,check odd page=false,nophantom, shield externalize=false,list entry=,no label type, opacityupper=1.0,opacitylower=1.0,opacitytitle=1.0,opacityframe=1.0,opacityback=1.0,@opacitybacktitle=1.0, - title filled=false + title filled=false,every float=,height fill=false, }, initialize@reset=reset@core, } |