summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex19
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex91
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex98
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty93
8 files changed, 257 insertions, 56 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index 839e5139259..db889791249 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -73,7 +73,7 @@
\def\tcb@drawcolorbox@breakable{%
\ifx\kvtcb@float\@empty%
- {\parskip\z@\par}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list
+ {\parskip\z@\par\vskip\z@}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list
\setbox\z@=\vbox{\kvtcb@beforebox}%
\tcbdimto\tcb@h@before{\ht\z@+\dp\z@+\dimexpr\parskip\relax}%
\setbox\z@=\vbox{\kvtcb@afterbox}%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 2402acaffc9..890a5f349dd 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
@@ -125,26 +125,35 @@
% tcolorbox specific macros
\def\tcb@doc@usetemplisting{\lstinputlisting[style=\kvtcb@doclstsytle]{\kvtcb@tempfile}}
-\let\dispExample\tcbwritetemp
+\def\dispExample{\tcbset{docexample}\tcbwritetemp}
\def\enddispExample{%
\endtcbwritetemp%
- \kvtcb@beforeexample\begin{tcolorbox}[docexample]%
+ \kvtcb@beforeexample\begin{tcolorbox}%
\tcb@doc@usetemplisting%
\tcblower%
\tcbusetemp%
\end{tcolorbox}\kvtcb@afterexample%
}
-\let\dispListing\tcbwritetemp
+\newenvironment{dispExample*}[1]{%
+ \tcbset{docexample,#1}\tcbwritetemp%
+ }{\enddispExample}
+
+\def\dispListing{\tcbset{docexample}\tcbwritetemp}
\def\enddispListing{%
\endtcbwritetemp%
- \kvtcb@beforeexample\begin{tcolorbox}[docexample]%
+ \kvtcb@beforeexample\begin{tcolorbox}%
\tcb@doc@usetemplisting%
\end{tcolorbox}\kvtcb@afterexample%
}
+\newenvironment{dispListing*}[1]{%
+ \tcbset{docexample,#1}\tcbwritetemp%
+ }{\enddispListing}
+
+
% index auxiliary macros
\def\index@Col#1{\index{#1\idx@actual\texttt{#1} \kvtcb@text@color}\index{\kvtcb@text@colors\idx@level#1\idx@actual\texttt{#1}}}
\def\index@Com#1{\index{#1\idx@actual\cs{#1}}}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index d82a1cb7df7..eedab8df24e 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
index 678b9577190..18827d89ba8 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -61,18 +61,77 @@
\tcbuselistinglisting%
}
-\tcbset{
- listing file/.store in=\kvtcb@listingfile,
- listing options/.store in=\kvtcb@listingoptions,
- comment/.store in=\kvtcb@listingcomment,
- listing style/.style={listing options={style=#1}},
- listing and text/.code={\let\tcp@listing@process\tcb@listing@listingAndText},
- text and listing/.code={\let\tcp@listing@process\tcb@listing@textAndListing},
- listing and comment/.code={\let\tcp@listing@process\tcb@listing@listingAndComment},
- comment and listing/.code={\let\tcp@listing@process\tcb@listing@commentAndListing},
- listing only/.code={\let\tcp@listing@process\tcbuselistinglisting},
- text only/.code={\let\tcp@listing@process\tcbuselistingtext},
- listing inputencoding/.store in=\kvtcb@listingencoding,
+\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}[]\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,%
+ listing options/.store in=\kvtcb@listingoptions,%
+ comment/.store in=\kvtcb@listingcomment,%
+ listing style/.style={listing options={style=#1}},%
+ 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},%
}
\tcbset{
@@ -84,14 +143,14 @@
}
\newenvironment{tcblisting}[1]{%
- \def\tcblisting@box{\begin{tcolorbox}[#1]\tcp@listing@process\end{tcolorbox}}%
+ \def\tcblisting@box{\tcbinputlisting{#1}}%
\begingroup\tcbverbatimwrite{\kvtcb@listingfile}%
}{\endtcbverbatimwrite\endgroup%
\tcblisting@box%
}
-\def\tcbinputlisting#1{%
- \begin{tcolorbox}[#1]\tcp@listing@process\end{tcolorbox}%
+\long\def\tcbinputlisting#1{%
+ \begingroup\tcbset{#1}\tcb@inputlisting\endgroup%
}
\newenvironment{tcboutputlisting}{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index 905ad4b8e38..7ef2d51ad74 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index 512da07b794..aab07bdf7bc 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -24,12 +24,15 @@
\def\tcb@creategeonodes@true{%
\begin{scope}[every node/.style={line width=0mm,inner sep=0mm,draw=none,fill=none,rectangle}]
- \node[name=frame,at={(0,0)},above right,minimum width=\kvtcb@width,minimum height=\tcb@height]{};
+ \node[name=frame,at={(0,0)},above right,minimum width=\tcb@width,minimum height=\tcb@height]{};
\node[name=interior,at={({\kvtcb@left@rule},{\kvtcb@bottom@rule})},above right,minimum width=\tcb@innerwidth,minimum height=\tcb@innerheight]{};
\ifnum\tcb@segment@state=1%
\node[name=segmentation,at={({\kvtcb@left@rule},{\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep*2+\tcb@break@bottomsep+\kvtcb@bottom+\tcb@height@lower\relax})},above right,
minimum width=\tcb@innerwidth,minimum height=\the\dimexpr\kvtcb@middle*2\relax]{};
- \fi%
+ \else\iftcb@sidebyside%
+ \node[name=segmentation,at={({\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper+\tcb@w@upper\relax},{\the\dimexpr\kvtcb@bottom@rule\relax})},above right,
+ minimum width=\the\dimexpr\kvtcb@sbs@gap\relax,minimum height=\tcb@innerheight]{};
+ \fi\fi%
\iftcb@hasTitle%
\node[name=title,at={({\kvtcb@left@rule},{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight+\kvtcb@title@rule\relax})},above right,
minimum width=\tcb@innerwidth,minimum height=\the\dimexpr\tcb@h@title+\kvtcb@toptitle+\kvtcb@bottomtitle+\kvtcb@boxsep*2\relax]{};
@@ -105,8 +108,13 @@
% draw segmentation line
\def\tcb@drawlower@path{%
- \path[draw=\kvtcb@colframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
- (segmentation.west)--(segmentation.east);%
+ \iftcb@sidebyside%
+ \path[draw=\kvtcb@colframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
+ (segmentation.north)--(segmentation.south);%
+ \else%
+ \path[draw=\kvtcb@colframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
+ (segmentation.west)--(segmentation.east);%
+ \fi%
}
\long\def\tcb@pseudo@segmentation#1{%
@@ -171,6 +179,44 @@
([yshift=0.1mm]segmentation.east);%
}
+\def\tcb@drawspec@sbs@A#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south)--(segmentation.north)[rounded corners=\kvtcb@arc]
+ --(interior.north east)--(interior.south east)[sharp corners]
+ -- cycle;%
+}
+
+\def\tcb@drawspec@sbs@B#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south)--(segmentation.north)
+ --(interior.north east)[rounded corners=\kvtcb@arc]
+ --(interior.south east)[sharp corners] -- cycle;%
+}
+
+\def\tcb@drawspec@sbs@C#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south|-frame.south)--(segmentation.north)[rounded corners=\kvtcb@arc]
+ --(interior.north east)[sharp corners]--(interior.south east|-frame.south)
+ -- cycle;%
+}
+
+\def\tcb@drawspec@sbs@D#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south|-frame.south) rectangle (interior.north east);%
+}
+
+\def\tcb@drawspec@sbs@E#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south|-frame.south) rectangle (interior.north east|-frame.north);%
+}
+
+\def\tcb@drawspec@sbs@F#1{%
+ \path[#1,segmentation@style]
+ (segmentation.south)--(segmentation.north|-frame.north)
+ --(interior.north east|-frame.north)[rounded corners=\kvtcb@arc]
+ --(interior.south east)[sharp corners] -- cycle;%
+}
+
\def\tcb@drawspec@T{%
\path[top color=\kvtcb@colframe,bottom color=\kvtcb@colback]
([yshift=-0.01pt]interior.north west) rectangle
@@ -185,17 +231,21 @@
\tcbset{%
frame style/.code={\tikzset{frame@style/.style={#1}}},%
+ frame hidden/.style={frame style={draw=none,fill=none}},
frame code/.code={\def\tcb@frame@code{#1}},%
frame code/.default=\tcb@drawframe@standard,%
interior style/.code={\tikzset{interior@style/.style={#1}}},%
+ interior hidden/.style={interior style={draw=none,fill=none}},
interior titled code/.code={\def\tcb@interiortitled@code{#1}},%
interior titled code/.default=\tcb@drawwithtitle@standard,%
interior code/.code={\def\tcb@interior@code{#1}},%
interior code/.default=\tcb@drawwithouttitle@standard,%
segmentation style/.code={\tikzset{segmentation@style/.style={#1}}},%
+ segmentation hidden/.style={segmentation style={draw=none,fill=none}},
segmentation code/.code={\def\tcb@segmentation@code{#1}},%
segmentation code/.default=\tcb@drawlower@standard,%
title style/.code={\tikzset{title@style/.style={#1}}},%
+ title hidden/.style={title style={draw=none,fill=none}},
colbacktitle/.style={title style={fill=#1}},
title code/.code={\def\tcb@title@code{#1}},%
title code/.default=\tcb@drawtitle@standard,%
@@ -273,7 +323,9 @@
\else%
{\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}%
\fi},
- segmentation code={\tcb@drawspec@LR{fill=\kvtcb@colbacklower}},%
+ segmentation code={\iftcb@sidebyside%
+ \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else%
+ \tcb@drawspec@sbs@A{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LR{fill=\kvtcb@colbacklower}\fi},%
skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolorlast},
bicolor/.style={skin=bicolor}}
@@ -297,7 +349,9 @@
\else%
{\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}%
\fi},
- segmentation code={\tcb@drawspec@LS{fill=\kvtcb@colbacklower}},
+ segmentation code={\iftcb@sidebyside%
+ \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else%
+ \tcb@drawspec@sbs@C{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LS{fill=\kvtcb@colbacklower}\fi},%
skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolormiddle
}}
@@ -321,7 +375,9 @@
\else%
{\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}%
\fi},
- segmentation code={\tcb@drawspec@LS{fill=\kvtcb@colbacklower}},
+ segmentation code={\iftcb@sidebyside%
+ \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else%
+ \tcb@drawspec@sbs@E{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LS{fill=\kvtcb@colbacklower}\fi},%
skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolormiddle
}}
@@ -345,7 +401,9 @@
\else
{\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}%
\fi},
- segmentation code={\tcb@drawspec@LR{fill=\kvtcb@colbacklower}},%
+ segmentation code={\iftcb@sidebyside%
+ \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else%
+ \tcb@drawspec@sbs@F{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LR{fill=\kvtcb@colbacklower}\fi},%
skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast
}}
@@ -370,7 +428,7 @@
\else%
{\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}%
\fi},
- segmentation code={\tcb@drawspec@LR{beamer@color}},%
+ segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},%
skin first=beamerfirst,skin middle=beamermiddle,skin last=beamerlast},
beamer/.style={skin=beamer,boxrule=0mm,titlerule=1mm,toptitle=0.5mm,arc=2mm,fonttitle=\bfseries,
frame style={fill=\kvtcb@colframe,drop shadow}},
@@ -393,7 +451,7 @@
\tcb@drawspec@UR{beamer@color}\else%
{\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}%
\fi},
- segmentation code={\tcb@drawspec@LS{beamer@color}},%
+ segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},%
skin first=beamerfirst,skin middle=beamermiddle,skin last=beamermiddle}}
\tcbset{%
@@ -414,7 +472,7 @@
\else%
{\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}%
\fi},
- segmentation code={\tcb@drawspec@LS{beamer@color}},%
+ segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},%
skin first=beamermiddle,skin middle=beamermiddle,skin last=beamermiddle}}
\tcbset{%
@@ -435,13 +493,17 @@
\else%
{\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}%
\fi},
- segmentation code={\tcb@drawspec@LR{beamer@color}},%
+ segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},%
skin first=beamermiddle,skin middle=beamermiddle,skin last=beamerlast}}
\def\tcb@drawspec@widgetsegment{%
+ \iftcb@sidebyside%
+ \tcb@drawlower@path%
+ \else%
\path[left color=\kvtcb@colframe!75!white,right color=\kvtcb@colframe!75!white!25!\kvtcb@colback,segmentation@style]
([yshift={-\kvtcb@middle/4}]segmentation.west) rectangle ([yshift={\kvtcb@middle/4}]segmentation.east);
+ \fi%
}
\tikzset{widget@color/.style={left color=\kvtcb@colframe!75!white,right color=\kvtcb@colframe!75!white!25!\kvtcb@colback}}
@@ -521,6 +583,12 @@
([xshift={\kvtcb@boxsep+\kvtcb@leftupper},yshift={\kvtcb@boxsep+\kvtcb@bottom+\tcb@break@bottomsep}]interior.south west)
rectangle node[font=\scriptsize] {upper: w=\tcb@w@upper, h=\tcb@height@upper}
+(\tcb@w@upper,\tcb@height@upper);
+ \iftcb@sidebyside%
+ \path[fill=green!20!white,draw=green!75!black,dashed]
+ ([yshift={\kvtcb@boxsep+\kvtcb@bottom+\tcb@break@bottomsep}]segmentation.south east)
+ rectangle node[font=\scriptsize] {lower: w=\tcb@w@lower, h=\tcb@height@upper}
+ +(\tcb@w@lower,\tcb@height@upper);
+ \fi%
\or%
\ifvoid\tcb@upperbox
\path[fill=white,draw,dotted]
@@ -549,13 +617,13 @@
([xshift={-\kvtcb@boxsep},yshift={-\kvtcb@boxsep-\tcb@break@topsep}]interior.north east);
\path[fill=green!20!white,draw=green!75!black,dashed]
([xshift={\kvtcb@boxsep+\kvtcb@leftlower},yshift={\kvtcb@boxsep+\kvtcb@bottom+\tcb@break@bottomsep}]interior.south west)
- rectangle node[font=\scriptsize] {lower: w=\tcb@height@lower, h=\tcb@h@lower}
+ rectangle node[font=\scriptsize] {lower: w=\tcb@w@lower, h=\tcb@height@lower}
+(\tcb@w@lower,\tcb@height@lower);
\fi%
\path[draw=red,opacity=0.5] (interior.south west) rectangle (interior.north east);
\path[draw=red,opacity=0.5] (frame.south west) rectangle (frame.north east);
\node[above,font=\scriptsize,red!50!black] at (interior.south) {interior: w=\tcb@innerwidth, h=\tcb@innerheight};
- \node[above,font=\scriptsize,red!50!black] at (frame.north) {frame: w=\the\dimexpr\kvtcb@width\relax, h=\tcb@height};
+ \node[above,font=\scriptsize,red!50!black] at (frame.north) {frame: w=\the\dimexpr\tcb@width\relax, h=\tcb@height};
\path[draw=blue!10!white,double,line width=1pt,dashed,opacity=0.3] (current bounding box.south west) rectangle (current bounding box.north east);
\pgfsetfillopacity{0.3}
},
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
index 7f0fe32e54f..09cc57d8c8d 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -53,7 +53,7 @@
ams nodisplayskip lower/.style={before upper=\vskip-\abovedisplayskip},%
ams nodisplayskip/.style={ams nodisplayskip upper,ams nodisplayskip lower},%
highlight math style/.style={highlight math/.style={#1}},%
- highlight math style={colframe=red,colback=yellow!25!white},%
+ highlight math style={colframe=red,colback=yellow!25!white,notitle},%
}
\newcommand{\tcbmaketheorem}[5]{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index e8575f07f7d..9954b1f9a9c 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.10 (2013/04/09)
+%% The LaTeX package tcolorbox - version 2.20 (2013/04/17)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2013/04/09 version 2.10 text color boxes]
+\ProvidesPackage{tcolorbox}[2013/04/17 version 2.20 text color boxes]
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -29,6 +29,7 @@
\newif\iftcb@hasTitle
\newif\iftcb@hasLower
\newif\iftcb@lowerspace
+\newif\iftcb@sidebyside
\newbox\tcb@titlebox
\newbox\tcb@upperbox
@@ -66,6 +67,26 @@
\def\tcb@hack@currenvir{\edef\tcb@temp{\noexpand\def\noexpand\@currenvir{\kvtcb@savedelimiter}}\tcb@temp}
+\def\tcb@sbs@quota@leftwidth{%
+ \tcbdimto\tcb@w@upper{\kvtcb@sbs@ratio}%
+ \tcbdimto\tcb@w@lower{\tcb@w@sbs-\tcb@w@upper}%
+}
+
+\def\tcb@sbs@quota@rightwidth{%
+ \tcbdimto\tcb@w@lower{\kvtcb@sbs@ratio}%
+ \tcbdimto\tcb@w@upper{\tcb@w@sbs-\tcb@w@lower}%
+}
+
+\def\tcb@sbs@quota@leftratio{%
+ \tcbdimto\tcb@w@upper{\kvtcb@sbs@ratio\dimexpr\tcb@w@sbs}%
+ \tcbdimto\tcb@w@lower{\tcb@w@sbs-\tcb@w@upper}%
+}
+
+\def\tcb@sbs@quota@rightratio{%
+ \tcbdimto\tcb@w@lower{\kvtcb@sbs@ratio\dimexpr\tcb@w@sbs}%
+ \tcbdimto\tcb@w@upper{\tcb@w@sbs-\tcb@w@lower}%
+}
+
\tcbset{
title/.store in=\kvtcb@title,
notitle/.style={title=},
@@ -226,6 +247,13 @@
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},%
+ sidebyside/.is if=tcb@sidebyside,%
+ sidebyside align/.store in=\kvtcb@sbs@align,%
+ sidebyside gap/.store in=\kvtcb@sbs@gap,%
+ lefthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftwidth},
+ righthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightwidth},
+ lefthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftratio},
+ righthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightratio},
}
\tcbset{notitle,width=\linewidth,boxsep=1mm,boxrule=0.5mm,adjust text={\"Apgjy},
@@ -237,7 +265,8 @@
toggle enlargement=none,toptitle=0mm,bottomtitle=0mm,
standard,parbox,overlay=,auto outer arc,
before title=,after title=,before upper=,after upper=,before lower=,after lower=,
- tcbox raise=0pt,
+ tcbox raise=0pt,sidebyside=false,sidebyside align=center,sidebyside gap=10mm,
+ lefthand ratio=0.5,
}%
\let\tcb@parboxrestore=\@parboxrestore
@@ -248,6 +277,11 @@
\let\tcb@parbox@use@true\relax%
+\def\tcb@minipage@top{\minipage[t]}
+\let\tcb@minipage@center=\minipage
+\def\tcb@minipage@bottom{\minipage[b]}
+\let\tcb@minipage=\tcb@minipage@center
+
% lrbox with integrated minipage
\def\tcb@lrbox#1#2{%
\edef\reserved@a{%
@@ -260,7 +294,7 @@
\@endpefalse
\begingroup%
\csname tcb@parbox@use@\kvtcv@parbox\endcsname%
- \ignorespaces\minipage#2\ignorespaces}
+ \ignorespaces\tcb@minipage#2\ignorespaces}
\def\endtcb@lrbox{\unskip\endminipage\unskip\endgroup}
\let\tcb@savebox=\tcb@lrbox
@@ -296,9 +330,17 @@
\tcbset{#1}%
\tcb@hasLowerfalse%
% computation of text width
- \tcbdimto\tcb@innerwidth{\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule}%
+ \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}%
+ \iftcb@sidebyside%
+ \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%
+ \fi%
\ifx\kvtcb@title\@empty\tcb@hasTitlefalse\else%
\tcb@hasTitletrue%
\tcbdimto\tcb@w@title{\tcb@temp-\kvtcb@lefttitle-\kvtcb@righttitle}%
@@ -309,7 +351,9 @@
\def\tcblower{%
\unskip\tcb@after@box%
\end{tcb@savebox}%
- \tcbdimto\tcb@w@lower{\tcb@temp-\kvtcb@leftlower-\kvtcb@rightlower}%
+ \unless\iftcb@sidebyside%
+ \tcbdimto\tcb@w@lower{\tcb@temp-\kvtcb@leftlower-\kvtcb@rightlower}%
+ \fi%
\tcb@hasLowertrue%
\let\tcb@after@box=\kvtcb@after@lower%
\ifx\kvtcb@savelowerto\@empty%
@@ -406,7 +450,7 @@
\begin{pgfscope}%
\pgfsetcornersarced{\pgfpoint{\tcb@outer@arc}{\tcb@outer@arc}}%
\pgfsetfillcolor{\kvtcb@colframe}%
- \pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{\kvtcb@width}{\tcb@height}}%
+ \pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{\tcb@width}{\tcb@height}}%
\pgfusepath{fill}%
\end{pgfscope}%
}
@@ -417,9 +461,9 @@
\pgfsetcornersarced{\pgfpoint{0mm}{0mm}}%
\pgfmoveto{\pgfpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
\pgflineto{\pgfpoint{\kvtcb@left@rule}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
- \pgflineto{\pgfpoint{\the\dimexpr\kvtcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
+ \pgflineto{\pgfpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
\pgfsetcornersarced{\pgfpoint{\kvtcb@arc}{\kvtcb@arc}}%
- \pgflineto{\pgfpoint{\the\dimexpr\kvtcb@width-\kvtcb@right@rule\relax}{\kvtcb@bottom@rule}}%
+ \pgflineto{\pgfpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\kvtcb@bottom@rule}}%
\pgflineto{\pgfpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
\pgfpathclose%
\pgfsetfillcolor{\kvtcb@colback}%
@@ -433,7 +477,7 @@
\pgfsetcornersarced{\pgfpoint{\kvtcb@arc}{\kvtcb@arc}}%
\pgfsetfillcolor{\kvtcb@colback}%
\pgfpathrectangle{\pgfpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
- {\pgfpoint{\the\dimexpr\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule\relax}{\tcb@innerheight}}%
+ {\pgfpoint{\the\dimexpr\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule\relax}{\tcb@innerheight}}%
\pgfusepath{fill}%
\end{pgfscope}%
}
@@ -443,9 +487,15 @@
\begin{pgfscope}%
\pgfsetcolor{\kvtcb@colframe}%
\pgfsetdash{{1mm}{1mm}}{0.5mm}%
+ \iftcb@sidebyside%
+ \tcbdimto\tcb@seg@pos{\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper+\tcb@w@upper+\kvtcb@sbs@gap/2}%
+ \pgfpathmoveto{\pgfpoint{\tcb@seg@pos}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
+ \pgfpathlineto{\pgfpoint{\tcb@seg@pos}{\kvtcb@bottom@rule}}%
+ \else%
\tcbdimto\tcb@seg@pos{\kvtcb@bottom@rule+\kvtcb@boxsep*2+\tcb@break@bottomsep+\kvtcb@middle+\kvtcb@bottom+\tcb@height@lower}%
\pgfpathmoveto{\pgfpoint{\kvtcb@left@rule}{\tcb@seg@pos}}%
- \pgfpathlineto{\pgfpoint{\the\dimexpr\kvtcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}%
+ \pgfpathlineto{\pgfpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}%
+ \fi%
\pgfusepath{stroke}%
\end{pgfscope}%
}
@@ -456,12 +506,12 @@
\def\tcb@setbb@toggle@none{%
\pgfpathrectanglecorners{\pgfpoint{\the\dimexpr0pt-\kvtcb@bbleft\relax}{\the\dimexpr0pt-\kvtcb@bbbottom\relax}}%
- {\pgfpoint{\the\dimexpr\kvtcb@width+\kvtcb@bbright\relax}{\the\dimexpr\tcb@height+\kvtcb@bbtop\relax}}%
+ {\pgfpoint{\the\dimexpr\tcb@width+\kvtcb@bbright\relax}{\the\dimexpr\tcb@height+\kvtcb@bbtop\relax}}%
}
\def\tcb@setbb@toggle@forced{%
\pgfpathrectanglecorners{\pgfpoint{\the\dimexpr0pt-\kvtcb@bbright\relax}{\the\dimexpr0pt-\kvtcb@bbbottom\relax}}%
- {\pgfpoint{\the\dimexpr\kvtcb@width+\kvtcb@bbleft\relax}{\the\dimexpr\tcb@height+\kvtcb@bbtop\relax}}%
+ {\pgfpoint{\the\dimexpr\tcb@width+\kvtcb@bbleft\relax}{\the\dimexpr\tcb@height+\kvtcb@bbtop\relax}}%
}
\def\tcb@setbb@toggle@evenpage{%
@@ -498,8 +548,21 @@
\fi%
}
+\def\tcb@sbs@mix{%
+ \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper@real}
+ \noindent\unhbox\tcb@upperbox\hfill%
+ \iftcb@hasLower%
+ \iftcb@lowervisible\unhbox\tcb@lowerbox%
+ \else%
+ \iftcb@lowerignored\else\rule[-\dp\tcb@lowerbox]{0pt}{\the\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox\relax}\fi%
+ \fi%
+ \fi%
+ \end{tcb@savebox}%
+ \tcb@hasLowerfalse%
+}
\def\tcb@draw@color@box{%
+ \iftcb@sidebyside\tcb@sbs@mix\fi%
\tcb@comp@arc%
\iftcb@hasTitle%
\tcbdimto\tcb@h@title{\ht\tcb@titlebox+\dp\tcb@titlebox}%
@@ -562,7 +625,9 @@
\fi%
\iftcb@lowerspace%
\csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname%
- \fi%
+ \else\iftcb@sidebyside%
+ \csname tcb@drawlower@\kvtcb@engine@segmentation\endcsname%
+ \fi\fi%
\iftcb@hasTitle%
\csname tcb@drawtitle@\kvtcb@engine@title\endcsname%
\fi%