diff options
Diffstat (limited to 'Master/texmf-dist/tex')
11 files changed, 360 insertions, 219 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 84ee098f379..9ab88ed24d5 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.41} +\tcb@set@library@version{2.50} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 3b29a2bf9a7..8e7bbc74dd4 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.41} +\tcb@set@library@version{2.50} \tcbuselibrary{listings} @@ -73,7 +73,9 @@ % documentation options \tcbset{ - documentation listing style/.store in=\kvtcb@doclstsytle, + documentation listing style/.store in=\kvtcb@doclststyle, + documentation minted style/.store in=\kvtcb@docmintstyle, + documentation minted options/.store in=\kvtcb@docmintoptions, color option/.store in=\kvtcb@colopt, color definition/.store in=\kvtcb@coldef, color hyperlink/.store in=\kvtcb@colhyper, @@ -90,6 +92,8 @@ % styles \tcbset{ docexample/.style={colframe=ExampleFrame,colback=ExampleBack,fontlower=\footnotesize}, + documentation minted style=, + documentation minted options={tabsize=2,fontsize=\small}, index default settings/.style={index actual={@},index quote={"},index level={!}}, index german settings/.style={index actual={=},index quote={!},index level={>}}, english language/.code={\tcbset{doclang/.cd, @@ -114,7 +118,7 @@ }} % tcolorbox specific macros -\def\tcb@doc@usetemplisting{\lstinputlisting[style=\kvtcb@doclstsytle]{\kvtcb@tempfile}} +%\def\tcb@doc@usetemplisting{\lstinputlisting[style=\kvtcb@doclststyle]{\kvtcb@tempfile}} \def\dispExample{\tcbset{docexample}\tcbwritetemp} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index da86046b55a..ba335414e47 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.41} +\tcb@set@library@version{2.50} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -42,9 +42,10 @@ \renewcommand\LARGE{\tcb@setfontsize\LARGE{1.728}}% \renewcommand\huge{\tcb@setfontsize\huge{2.0736}}% \renewcommand\Huge{\tcb@setfontsize\Huge{2.48832}}},% - fit height plus/.dimstore in=\kvtcb@fit@plus@height,% + fit height plus/.style={fit,height plus=#1},% fit width plus/.dimstore in=\kvtcb@fit@plus@width,% - fit height from/.style args={#1 to #2}{fit,height={#1},fit height plus={#2-#1}}, + %fit height from/.style args={#1 to #2}{fit,height={#1},fit height plus={#2-#1}}, + fit height from/.style args={#1 to #2}{fit,height from={#1} to {#2}}, fit width from/.style args={#1 to #2}{fit,width={#1},fit width plus={#2-#1}}, fit maxstep/.store in=\kvtcb@fit@maxstep,% fit maxfontdiff/.store in=\kvtcb@fit@maxfontdiff,% @@ -70,7 +71,7 @@ \long\def\tcbox@inner@fitbox#1{% \tcbset{breakable@false,sidebyside=false}% \let\tcb@val@raisebase=\tcb@zpt% - \unless\ifdefined\tcb@height@fixed% + \unless\ifdefined\kvtcb@height@fixed% \tcbset{height=\kvtcb@width}% \fi% \tcb@hasLowerfalse% @@ -85,10 +86,10 @@ \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}% \color{\kvtcb@colupper}% \kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% - \kvtcb@before@upper#1\kvtcb@after@upper% + \kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper% \end{tcb@savebox}% \tcbdimto\tcb@fit@@h{\ht\tcb@upperbox+\dp\tcb@upperbox}% - \tcbdimto\tcb@fit@@target{\tcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand-\kvtcb@top-\kvtcb@bottom-\kvtcb@boxsep*2-\tcb@h@titletotal}% + \tcbdimto\tcb@fit@@target{\kvtcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand-\kvtcb@top-\kvtcb@bottom-\kvtcb@boxsep*2-\tcb@h@titletotal}% \advance\count@ 1\relax% }% \def\tcb@fit@@box@titled{% @@ -104,14 +105,14 @@ \tcb@fit@@box@titled% % % height fit - \ifdim\kvtcb@fit@plus@height>0pt\relax% - \let\tcb@fit@@minheight=\tcb@height@fixed% + \ifdim\kvtcb@height@fixed@plus>0pt\relax% + \let\tcb@fit@@minheight=\kvtcb@height@fixed% \ifdim\dimexpr\tcb@fit@@h>\tcb@fit@@target\relax% - \ifdim\dimexpr\tcb@fit@@h>\dimexpr\tcb@fit@@target+\kvtcb@fit@plus@height\relax% - \tcbdimto\tcb@height@fixed{\tcb@height@fixed+\kvtcb@fit@plus@height}% - \tcbdimto\tcb@fit@@target{\tcb@fit@@target+\kvtcb@fit@plus@height}% + \ifdim\dimexpr\tcb@fit@@h>\dimexpr\tcb@fit@@target+\kvtcb@height@fixed@plus\relax% + \tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+\kvtcb@height@fixed@plus}% + \tcbdimto\tcb@fit@@target{\tcb@fit@@target+\kvtcb@height@fixed@plus}% \else% - \tcbdimto\tcb@height@fixed{\tcb@height@fixed+\tcb@fit@@h-\tcb@fit@@target}% + \tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+\tcb@fit@@h-\tcb@fit@@target}% \let\tcb@fit@@target=\tcb@fit@@h% \fi% \fi% @@ -232,12 +233,12 @@ \fi% % % last height fit - \ifdim\kvtcb@fit@plus@height>0pt\relax% + \ifdim\kvtcb@height@fixed@plus>0pt\relax% \ifdim\dimexpr\tcb@fit@@h<\tcb@fit@@target\relax% - \tcbdimto\tcb@temp{\tcb@height@fixed+\tcb@fit@@h-\tcb@fit@@target}% + \tcbdimto\tcb@temp{\kvtcb@height@fixed+\tcb@fit@@h-\tcb@fit@@target}% \ifdim\dimexpr\tcb@temp<\tcb@fit@@minheight\relax% \else% - \let\tcb@height@fixed=\tcb@temp% + \let\kvtcb@height@fixed=\tcb@temp% \fi% \fi% \fi% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 4eb0c6bad32..a6608702f8f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.41} +\tcb@set@library@version{2.50} \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 07d9207c93d..55375f697c5 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,10 +18,12 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.41} +\tcb@set@library@version{2.50} \RequirePackage{listings}[2007/02/22] +\tcbuselibrary{listings@core} + \let\tcb@listing@MakeCaption@org=\lst@MakeCaption \def\tcb@listing@set@MakeCaption@org{% @@ -37,210 +39,50 @@ basicstyle=\ttfamily\small, extendedchars=true, nolol, inputencoding=\kvtcb@listingencoding} -\def\tcbuselistingtext{\input{\kvtcb@listingfile}}% - -\def\tcbuselistinglisting{% +\def\tcb@listing@input@listing#1#2{% \begingroup% - \toks@=\expandafter{\kvtcb@listingoptions}% + \toks@=\expandafter{#1}% \edef\tcb@temp{\noexpand\lstinputlisting[nolol,\the\toks@]}% \tcb@listing@set@MakeCaption% - \tcb@temp{\kvtcb@listingfile}% + \tcb@temp{#2}% \endgroup% }% -\def\tcb@listing@listingAndText{% - \tcbuselistinglisting% - \tcblower% - \tcbuselistingtext% -} - -\def\tcb@listing@listingAndComment{% - \tcbuselistinglisting% - \tcblower% - \kvtcb@listingcomment% -} - -\def\tcb@listing@textAndListing{% - \tcbuselistingtext% - \tcblower% - \tcbuselistinglisting% -} - -\def\tcb@listing@commentAndListing{% - \kvtcb@listingcomment% - \tcblower% - \tcbuselistinglisting% -} - -\def\tcb@inputlisting@out@prepare{% - \tcbdimto\tcb@width{\kvtcb@width}% - \tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}% - \tcbdimto\tcb@temp{\tcb@innerwidth-\kvtcb@boxsep*2}% - \tcbdimto\tcb@w@upper{\tcb@temp-\kvtcb@leftupper-\kvtcb@rightupper}% - \tcbset{breakable@false}% - \def\tcb@minipage{\csname tcb@minipage@\kvtcb@sbs@align\endcsname}% - \tcbdimto\tcb@w@upper@real{\tcb@w@upper}% - \tcbdimto\tcb@w@sbs{\tcb@w@upper@real-\kvtcb@sbs@gap}% - \tcb@sbs@quota% - \ifx\kvtcb@float\@empty% - \newenvironment{tcb@sbsfloat}{\kvtcb@beforebox}{\kvtcb@afterbox}% - \else% - \edef\float@start{\noexpand\@float{tcbfloat}[\kvtcb@float]}% - \newenvironment{tcb@sbsfloat}{\float@start}{\end@float}% - \fi% -} - -\def\tcb@inputlisting@out@listingAndText{% - \tcb@inputlisting@out@prepare% - \tcbdimto\tcb@w@outside{\tcb@w@lower}% - \tcbdimto\tcb@w@inside{\tcb@width-\tcb@w@lower-\kvtcb@sbs@gap}% - \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}% - \tcb@minipage{\tcb@w@inside}% - \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}% - \endminipage\hfill% - \iftcb@lowervisible\tcb@minipage{\tcb@w@outside}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces% - \tcbuselistingtext\unskip\kvtcb@after@lower\endminipage\fi% - \end{minipage}\end{tcb@sbsfloat}% -} - -\def\tcb@inputlisting@out@textAndListing{% - \tcb@inputlisting@out@prepare% - \tcbdimto\tcb@w@outside{\tcb@w@upper}% - \tcbdimto\tcb@w@inside{\tcb@width-\tcb@w@upper-\kvtcb@sbs@gap}% - \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}% - \iftcb@lowervisible\tcb@minipage{\tcb@w@outside}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces% - \tcbuselistingtext\unskip\kvtcb@after@lower\endminipage\fi\hfill% - \tcb@minipage{\tcb@w@inside}% - \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}% - \endminipage% - \end{minipage}\end{tcb@sbsfloat}% -} -\def\tcb@inputlisting@inside{% - \begin{tcolorbox}[capture=\tcb@listing@capture]\tcb@listing@process\end{tcolorbox}% -} +\def\tcb@listing@uselistinglisting{% + \tcb@listing@input@listing{\kvtcb@listingoptions}{\kvtcb@listingfile}% +}% -\let\tcb@inputlisting\tcb@inputlisting@inside +\def\tcb@listing@usetemplisting{% + \tcb@listing@input@listing{\kvtcb@listingoptions}{\kvtcb@tempfile}% +}% -\def\tcb@set@listing@process#1{% - \let\tcb@inputlisting\tcb@inputlisting@inside% - \let\tcb@listing@process=#1% +\def\tcb@listing@doc@usetemplisting{% + \tcb@listing@input@listing{style=\kvtcb@doclststyle}{\kvtcb@tempfile}% } \tcbset{% - listing file/.store in=\kvtcb@listingfile,% listing options/.store in=\kvtcb@listingoptions,% listing style/.style={listing options={style=#1}},% no listing options/.style={listing options=},% - comment/.store in=\kvtcb@listingcomment,% - listing and text/.code={\tcb@set@listing@process{\tcb@listing@listingAndText}},% - text and listing/.code={\tcb@set@listing@process{\tcb@listing@textAndListing}},% - listing and comment/.code={\tcb@set@listing@process{\tcb@listing@listingAndComment}},% - comment and listing/.code={\tcb@set@listing@process{\tcb@listing@commentAndListing}},% - listing only/.code={\tcb@set@listing@process{\tcbuselistinglisting}},% - text only/.code={\tcb@set@listing@process{\tcbuselistingtext}},% listing inputencoding/.store in=\kvtcb@listingencoding,% - text side listing/.style={sidebyside,text and listing},% - listing side text/.style={sidebyside,listing and text},% - text outside listing/.code={\let\tcb@inputlisting\tcb@inputlisting@out@textAndListing},% - listing outside text/.code={\let\tcb@inputlisting\tcb@inputlisting@out@listingAndText},% listing remove caption/.is choice, listing remove caption/true/.code={\let\tcb@listing@set@MakeCaption\tcb@listing@set@MakeCaption@empty}, listing remove caption/false/.code={\let\tcb@listing@set@MakeCaption\tcb@listing@set@MakeCaption@org}, listing remove caption/.default=true, + listing engine/listings/.code={\let\tcbuselistinglisting\tcb@listing@uselistinglisting% + \let\tcbusetemplisting\tcb@listing@usetemplisting% + \let\tcb@doc@usetemplisting\tcb@listing@doc@usetemplisting}, } -\newenvironment{tcblisting}[1]{% - \def\tcblisting@box{\tcbinputlisting{#1}}% - \begingroup\tcbverbatimwrite{\kvtcb@listingfile}% -}{\endtcbverbatimwrite\endgroup% - \tcblisting@box% -} - -\long\def\tcbinputlisting#1{% - \begingroup% - \tcb@layer@pushup%´ - \tcbset{capture=minipage,#1}% - \let\tcb@listing@capture=\kvtcb@capture% - \tcb@inputlisting\endgroup% -} - -\newenvironment{tcboutputlisting}{% - \begingroup\tcbverbatimwrite{\kvtcb@listingfile}% -}{\endtcbverbatimwrite\endgroup} - -\def\tcbusetemplisting{% - \toks@=\expandafter{\kvtcb@listingoptions}% - \edef\tcb@temp{\noexpand\lstinputlisting[\the\toks@]}% - \tcb@temp{\kvtcb@tempfile}% -}% - -\long\def\tcb@newtcblisting#1#2{\newenvironment{#1}{\tcblisting{#2,options@for=#1}}{\endtcblisting}} - -\long\def\tcb@newtcblisting@#1[#2]#3{\newenvironment{#1}[#2]{\tcblisting{#3,options@for=#1}}{\endtcblisting}} - -\long\def\tcb@newtcblisting@@#1[#2][#3]#4{\newenvironment{#1}[#2][#3]{\tcblisting{#4,options@for=#1}}{\endtcblisting}} - -\long\def\tcb@new@tcblisting@#1[#2]{% - \@ifnextchar[{\tcb@newtcblisting@@{#1}[#2]}{\tcb@newtcblisting@{#1}[#2]}} - -\long\def\tcb@new@tcblisting#1{% - \preto\tcb@new@colopt{savedelimiter=#1}% - \cslet{tcb@opt@#1}{\tcb@new@colopt}% - \@ifnextchar[{\tcb@new@tcblisting@{#1}}{\tcb@newtcblisting{#1}}} - -\long\def\tcb@new@tcblisting@opt[#1]#2{% - \tcb@proc@options@init{#1}{#2}% - \tcb@new@tcblisting{#2}% -} - -\long\def\newtcblisting{% - \def\tcb@new@colopt{}% - \@ifnextchar[{\tcb@new@tcblisting@opt}{\tcb@new@tcblisting}} - - -\long\def\tcb@newtcbinputlisting#1#2{\expandafter\newcommand\csname#1\endcsname{\tcbinputlisting{#2,options@for=#1}}} - -\long\def\tcb@newtcbinputlisting@#1[#2]#3{\expandafter\newcommand\csname#1\endcsname[#2]{\tcbinputlisting{#3,options@for=#1}}} - -\long\def\tcb@newtcbinputlisting@@#1[#2][#3]#4{\expandafter\newcommand\csname#1\endcsname[#2][#3]{\tcbinputlisting{#4,options@for=#1}}} - -\long\def\tcb@new@tcbinputlisting@#1[#2]{% - \@ifnextchar[{\tcb@newtcbinputlisting@@{#1}[#2]}{\tcb@newtcbinputlisting@{#1}[#2]}} - -\long\def\tcb@new@tcbinputlisting#1{% - \preto\tcb@new@colopt{savedelimiter=#1}% - \cslet{tcb@opt@#1}{\tcb@new@colopt}% - \@ifnextchar[{\tcb@new@tcbinputlisting@{#1}}{\tcb@newtcbinputlisting{#1}}} - -\long\def\tcb@new@tcbinputlisting@opt[#1]#2{% - \tcb@proc@options@init{#1}{#2}% - \tcb@new@tcbinputlisting{#2}% -} - -\long\def\tcb@new@tcbinputlisting@bs#1{% - \edef\temp{\tcb@remove@bs{#1}}% - \tcb@new@tcbinputlisting{\temp}% -} - -\long\def\tcb@new@tcbinputlisting@opt@bs[#1]#2{% - \edef\temp{\tcb@remove@bs{#2}}% - \tcb@new@tcbinputlisting@opt[#1]{\temp}% -} - -\long\def\newtcbinputlisting{% - \def\tcb@new@colopt{}% - \@ifnextchar[{\tcb@new@tcbinputlisting@opt@bs}{\tcb@new@tcbinputlisting@bs}} - \tcbset{% reset@listings/.style={% - listing file=\jobname.listing, listing style=tcblatex, - comment=, - listing and text, listing inputencoding=\inputencodingname, - listing remove caption, }, + listing remove caption, + listing engine=listings, + }, initialize@reset=reset@listings, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex new file mode 100644 index 00000000000..2f1abb21116 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -0,0 +1,211 @@ +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) +%% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% ------------------------------------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of all files listed in README +%% +%\makeatletter +\tcb@set@library@version{2.50} + +\def\tcbuselistingtext{\input{\kvtcb@listingfile}}% + +\def\tcb@listing@listingAndText{% + \tcbuselistinglisting% + \tcblower% + \tcbuselistingtext% +} + +\def\tcb@listing@listingAndComment{% + \tcbuselistinglisting% + \tcblower% + \kvtcb@listingcomment% +} + +\def\tcb@listing@textAndListing{% + \tcbuselistingtext% + \tcblower% + \tcbuselistinglisting% +} + +\def\tcb@listing@commentAndListing{% + \kvtcb@listingcomment% + \tcblower% + \tcbuselistinglisting% +} + +\def\tcb@listing@listing{% + \tcbuselistinglisting% +} + + +\def\tcb@inputlisting@out@prepare{% + \tcbdimto\tcb@width{\kvtcb@width}% + \tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}% + \tcbdimto\tcb@temp{\tcb@innerwidth-\kvtcb@boxsep*2}% + \tcbdimto\tcb@w@upper{\tcb@temp-\kvtcb@leftupper-\kvtcb@rightupper}% + \tcbset{breakable@false}% + \def\tcb@minipage{\csname tcb@minipage@\kvtcb@sbs@align\endcsname}% + \tcbdimto\tcb@w@upper@real{\tcb@w@upper}% + \tcbdimto\tcb@w@sbs{\tcb@w@upper@real-\kvtcb@sbs@gap}% + \tcb@sbs@quota% + \ifx\kvtcb@float\@empty% + \newenvironment{tcb@sbsfloat}{\kvtcb@beforebox}{\kvtcb@afterbox}% + \else% + \edef\float@start{\noexpand\@float{tcbfloat}[\kvtcb@float]}% + \newenvironment{tcb@sbsfloat}{\float@start}{\end@float}% + \fi% +} + +\def\tcb@inputlisting@out@listingAndText{% + \tcb@inputlisting@out@prepare% + \tcbdimto\tcb@w@outside{\tcb@w@lower}% + \tcbdimto\tcb@w@inside{\tcb@width-\tcb@w@lower-\kvtcb@sbs@gap}% + \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}% + \tcb@minipage{\tcb@w@inside}% + \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}% + \endminipage\hfill% + \iftcb@lowervisible\tcb@minipage{\tcb@w@outside}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces% + \tcbuselistingtext\unskip\kvtcb@after@lower\endminipage\fi% + \end{minipage}\end{tcb@sbsfloat}% +} + +\def\tcb@inputlisting@out@textAndListing{% + \tcb@inputlisting@out@prepare% + \tcbdimto\tcb@w@outside{\tcb@w@upper}% + \tcbdimto\tcb@w@inside{\tcb@width-\tcb@w@upper-\kvtcb@sbs@gap}% + \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}% + \iftcb@lowervisible\tcb@minipage{\tcb@w@outside}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces% + \tcbuselistingtext\unskip\kvtcb@after@lower\endminipage\fi\hfill% + \tcb@minipage{\tcb@w@inside}% + \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}% + \endminipage% + \end{minipage}\end{tcb@sbsfloat}% +} + +\def\tcb@inputlisting@inside{% + \begin{tcolorbox}[capture=\tcb@listing@capture]\tcb@listing@process\end{tcolorbox}% +} + +\let\tcb@inputlisting\tcb@inputlisting@inside + +\def\tcb@set@listing@process#1{% + \let\tcb@inputlisting\tcb@inputlisting@inside% + \let\tcb@listing@process=#1% +} + +\tcbset{% + listing file/.store in=\kvtcb@listingfile,% + comment/.store in=\kvtcb@listingcomment,% + listing and text/.code={\tcb@set@listing@process{\tcb@listing@listingAndText}},% + text and listing/.code={\tcb@set@listing@process{\tcb@listing@textAndListing}},% + listing and comment/.code={\tcb@set@listing@process{\tcb@listing@listingAndComment}},% + comment and listing/.code={\tcb@set@listing@process{\tcb@listing@commentAndListing}},% + listing only/.code={\tcb@set@listing@process{\tcb@listing@listing}},% + text only/.code={\tcb@set@listing@process{\tcbuselistingtext}},% + text side listing/.style={sidebyside,text and listing},% + listing side text/.style={sidebyside,listing and text},% + text outside listing/.code={\let\tcb@inputlisting\tcb@inputlisting@out@textAndListing},% + listing outside text/.code={\let\tcb@inputlisting\tcb@inputlisting@out@listingAndText},% + listing engine/.is choice, +} + +\newenvironment{tcblisting}[1]{% + \def\tcblisting@box{\tcbinputlisting{#1}}% + \begingroup\tcbverbatimwrite{\kvtcb@listingfile}% +}{\endtcbverbatimwrite\endgroup% + \tcblisting@box% +} + +\long\def\tcbinputlisting#1{% + \begingroup% + \tcb@layer@pushup% + \tcbset{capture=minipage,#1}% + \let\tcb@listing@capture=\kvtcb@capture% + \tcb@inputlisting\endgroup% +} + +\newenvironment{tcboutputlisting}{% + \begingroup\tcbverbatimwrite{\kvtcb@listingfile}% +}{\endtcbverbatimwrite\endgroup} + + +\long\def\tcb@newtcblisting#1#2{\newenvironment{#1}{\tcblisting{#2,options@for=#1}}{\endtcblisting}} + +\long\def\tcb@newtcblisting@#1[#2]#3{\newenvironment{#1}[#2]{\tcblisting{#3,options@for=#1}}{\endtcblisting}} + +\long\def\tcb@newtcblisting@@#1[#2][#3]#4{\newenvironment{#1}[#2][#3]{\tcblisting{#4,options@for=#1}}{\endtcblisting}} + +\long\def\tcb@new@tcblisting@#1[#2]{% + \@ifnextchar[{\tcb@newtcblisting@@{#1}[#2]}{\tcb@newtcblisting@{#1}[#2]}} + +\long\def\tcb@new@tcblisting#1{% + \preto\tcb@new@colopt{savedelimiter=#1}% + \cslet{tcb@opt@#1}{\tcb@new@colopt}% + \@ifnextchar[{\tcb@new@tcblisting@{#1}}{\tcb@newtcblisting{#1}}} + +\long\def\tcb@new@tcblisting@opt[#1]#2{% + \tcb@proc@options@init{#1}{#2}% + \tcb@new@tcblisting{#2}% +} + +\long\def\newtcblisting{% + \def\tcb@new@colopt{}% + \@ifnextchar[{\tcb@new@tcblisting@opt}{\tcb@new@tcblisting}} + + +\long\def\tcb@newtcbinputlisting#1#2{\expandafter\newcommand\csname#1\endcsname{\tcbinputlisting{#2,options@for=#1}}} + +\long\def\tcb@newtcbinputlisting@#1[#2]#3{\expandafter\newcommand\csname#1\endcsname[#2]{\tcbinputlisting{#3,options@for=#1}}} + +\long\def\tcb@newtcbinputlisting@@#1[#2][#3]#4{\expandafter\newcommand\csname#1\endcsname[#2][#3]{\tcbinputlisting{#4,options@for=#1}}} + +\long\def\tcb@new@tcbinputlisting@#1[#2]{% + \@ifnextchar[{\tcb@newtcbinputlisting@@{#1}[#2]}{\tcb@newtcbinputlisting@{#1}[#2]}} + +\long\def\tcb@new@tcbinputlisting#1{% + \preto\tcb@new@colopt{savedelimiter=#1}% + \cslet{tcb@opt@#1}{\tcb@new@colopt}% + \@ifnextchar[{\tcb@new@tcbinputlisting@{#1}}{\tcb@newtcbinputlisting{#1}}} + +\long\def\tcb@new@tcbinputlisting@opt[#1]#2{% + \tcb@proc@options@init{#1}{#2}% + \tcb@new@tcbinputlisting{#2}% +} + +\long\def\tcb@new@tcbinputlisting@bs#1{% + \edef\temp{\tcb@remove@bs{#1}}% + \tcb@new@tcbinputlisting{\temp}% +} + +\long\def\tcb@new@tcbinputlisting@opt@bs[#1]#2{% + \edef\temp{\tcb@remove@bs{#2}}% + \tcb@new@tcbinputlisting@opt[#1]{\temp}% +} + +\long\def\newtcbinputlisting{% + \def\tcb@new@colopt{}% + \@ifnextchar[{\tcb@new@tcbinputlisting@opt@bs}{\tcb@new@tcbinputlisting@bs}} + + +\tcbset{% + reset@listingscore/.style={% + listing file=\jobname.listing, + comment=, + listing and text, + }, + 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 fda425379a2..b2348a3467d 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% 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{2.41} +\tcb@set@library@version{2.50} \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 new file mode 100644 index 00000000000..d231bd6a680 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -0,0 +1,69 @@ +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) +%% tcbminted.code.tex: Code for colorboxes with listings +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% ------------------------------------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of all files listed in README +%% +%\makeatletter +\tcb@set@library@version{2.50} + +\RequirePackage{minted}[2011/09/17] + +\tcbuselibrary{listings@core} + +\def\tcb@minted@input@listing#1#2#3#4{% + \edef\temp@a{#4}% + \ifx\temp@a\@empty% + \else + \usemintedstyle{\temp@a}% + \fi% + \toks@=\expandafter{#1}% + \edef\tcb@temp{\noexpand\inputminted[\the\toks@]}% + \tcb@temp{#2}{#3}% +} + +\def\tcb@minted@uselistinglisting{% + \tcb@minted@input@listing{\kvtcb@minted@options}{\kvtcb@minted@language}{\kvtcb@listingfile}{\kvtcb@minted@style}% +}% + +\def\tcb@minted@usetemplisting{% + \tcb@minted@input@listing{\kvtcb@minted@options}{\kvtcb@minted@language}{\kvtcb@tempfile}{\kvtcb@minted@style}% +}% + +\def\tcb@minted@doc@usetemplisting{% + \tcb@minted@input@listing{\kvtcb@docmintoptions}{latex}{\kvtcb@tempfile}{\kvtcb@docmintstyle}% +} + +\tcbset{% + minted language/.store in=\kvtcb@minted@language, + minted options/.store in=\kvtcb@minted@options, + minted style/.store in=\kvtcb@minted@style, + listing engine/minted/.code={\let\tcbuselistinglisting\tcb@minted@uselistinglisting% + \let\tcbusetemplisting\tcb@minted@usetemplisting% + \let\tcb@doc@usetemplisting\tcb@minted@doc@usetemplisting}, +} + + +\tcbset{% + reset@minted/.style={% + minted language=latex, + minted options={tabsize=2,fontsize=\small}, + minted style=, + listing engine=minted, + }, + initialize@reset=reset@minted, +} + diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index ece95e163d9..f63ef5b26d8 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.41} +\tcb@set@library@version{2.50} \RequirePackage{tikz}[2010/10/13] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index b8a2b188399..d4f202a0cdb 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% 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{2.41} +\tcb@set@library@version{2.50} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 645054c5673..ca73c3fe193 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.41 (2013/07/23) +%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2013/07/23 version 2.41 text color boxes] -\def\tcb@version{2.41} +\ProvidesPackage{tcolorbox}[2013/07/29 version 2.50 text color boxes] +\def\tcb@version{2.50} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -175,7 +175,9 @@ lowerbox/invisible/.code={\tcb@lowerignoredfalse\tcb@lowervisiblefalse}, lowerbox/ignored/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse}, natural height/.code={\let\tcb@ch=\tcb@ch@natural}, - height/.code={\tcb@dim@to\tcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed}, + 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}},% 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}, @@ -343,7 +345,7 @@ \let\tcb@parboxrestore=\@parboxrestore \def\tcb@parbox@use@false{% - \def\@parboxrestore{\leavevmode\linewidth\hsize\let\@parboxrestore=\tcb@parboxrestore}% + \def\@parboxrestore{\noindent\linewidth\hsize\let\@parboxrestore=\tcb@parboxrestore\leavevmode}% } \let\tcb@parbox@use@true\relax% @@ -574,7 +576,16 @@ } \def\tcb@ch@fixed{% - \edef\tcb@height{\tcb@height@fixed}% + \ifdim\tcb@natheight<\dimexpr\kvtcb@height@fixed\relax% + \edef\tcb@height{\kvtcb@height@fixed}% + \else% + \tcbdimto\tcb@temp{\kvtcb@height@fixed+\kvtcb@height@fixed@plus}% + \ifdim\tcb@natheight>\tcb@temp% + \edef\tcb@height{\tcb@temp}% + \else% + \edef\tcb@height{\tcb@natheight}% + \fi% + \fi% \iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi% } @@ -874,7 +885,7 @@ \tcbset{breakable@false,sidebyside=false}% \let\tcb@val@raisebase=\tcb@zpt% \tcb@set@@dim@and@title% - \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper#1\kvtcb@after@upper\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}% \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}% \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}% \tcb@hasLowerfalse% @@ -1113,7 +1124,7 @@ initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},% reset/.code={\tcb@reset},% reset@core/.style={notitle,width=\linewidth, - natural height,space to lower,valign=top,valign lower=top, + natural height,height plus=0pt,space to lower,valign=top,valign lower=top, boxsep=1mm,boxrule=0.5mm, left=4mm,right=4mm,top=2mm,bottom=2mm,middle=2mm,arc=1mm, enlarge top by=0mm,enlarge bottom by=0mm,enlarge left by=0mm,enlarge right by=0mm, @@ -1172,8 +1183,10 @@ \DeclareOption{#1}{\appto\tcb@optionlist{,#1}}% } +\tcb@add@library{listings@core}{tcblistingscore.code.tex} \tcb@add@library{listings}{tcblistings.code.tex} \tcb@add@library{listingsutf8}{tcblistingsutf8.code.tex} +\tcb@add@library{minted}{tcbminted.code.tex} \tcb@add@library{theorems}{tcbtheorems.code.tex} \tcb@add@library{documentation}{tcbdocumentation.code.tex} \tcb@add@library{skins}{tcbskins.code.tex} @@ -1181,8 +1194,9 @@ \tcb@add@library{hooks}{tcbhooks.code.tex} \tcb@add@library{fitting}{tcbfitting.code.tex} -\tcb@add@library@style{most}{skins,breakable,listingsutf8,hooks,theorems,fitting} -\tcb@add@library@style{all}{most,documentation} +\tcb@add@library@style{many}{skins,breakable,hooks,theorems,fitting} +\tcb@add@library@style{most}{many,listingsutf8} +\tcb@add@library@style{all}{many,minted,listingsutf8,documentation} \ProcessOptions* \edef\tcb@temp{\noexpand\tcbuselibrary{\tcb@optionlist}} |