From 1ae7c2b9cce883c37a23327ae611d51921b8a1b6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 18 Mar 2014 22:07:07 +0000 Subject: tcolorbox (18mar14) git-svn-id: svn://tug.org/texlive/trunk@33222 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 4 +- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 4 +- .../tex/latex/tcolorbox/tcbfitting.code.tex | 4 +- .../tex/latex/tcolorbox/tcbhooks.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistings.code.tex | 13 +- .../tex/latex/tcolorbox/tcblistingscore.code.tex | 38 ++++-- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 4 +- .../tex/latex/tcolorbox/tcbminted.code.tex | 4 +- .../tex/latex/tcolorbox/tcbskins.code.tex | 144 +++++++++++++++++---- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 4 +- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 11 +- 12 files changed, 177 insertions(+), 61 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tcolorbox') diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 01af1193ad8..c0682b5a397 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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.71} +\tcb@set@library@version{2.72} \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 5164150c79b..5d73558c30b 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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.71} +\tcb@set@library@version{2.72} \tcbuselibrary{listings,skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 2ea25e52ac9..e402dd7da14 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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.71} +\tcb@set@library@version{2.72} \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 585483e9493..7771431555e 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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.71} +\tcb@set@library@version{2.72} \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 3485a370bfc..f958c8fec7a 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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{2.71} +\tcb@set@library@version{2.72} \RequirePackage{listings}[2007/02/22] @@ -73,6 +73,15 @@ listing engine/listings/.code={\let\tcbuselistinglisting\tcb@listing@uselistinglisting% \let\tcbusetemplisting\tcb@listing@usetemplisting% \let\tcb@doc@usetemplisting\tcb@listing@doc@usetemplisting}, + every listing line/.code={% + \def\lst@NewLine{% + \ifx\lst@OutputBox\@gobble\else + \par\noindent \hbox{}#1% + \fi + \global\advance\lst@newlines\m@ne + \lst@newlinetrue}},% + every listing line*/.style={every listing line={#1},% + code={\setbox\z@=\hbox{#1}\tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+\wd\z@}}},% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex index 588279e58d2..a5f68b1ce2c 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 2.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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{2.71} +\tcb@set@library@version{2.72} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% \def\tcbuselistingcomment{\kvtcb@listingcomment}% @@ -36,10 +36,19 @@ \tcbuselistinglisting% } +\newenvironment{tcb@lower@outside}[1]{% + \tcbset{savedelimiter=tcb@lower@outside}\tcb@minipage{#1}% + \color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces}% + {\unskip\kvtcb@after@lower\endminipage} + \def\tcb@use@lower@outside#1{% - \tcb@minipage{#1}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces% - \begingroup\tcb@layer@inc\tcb@use@listing@other\tcb@layer@dec\endgroup% - \unskip\kvtcb@after@lower\endminipage% + \setbox\z@=\hbox{\begin{tcb@lower@outside}{#1}% + \stepcounter{tcblayer}% + \tcb@use@listing@other% + \addtocounter{tcblayer}{-1}% + \end{tcb@lower@outside}}% + \tcbdimto{\tcb@temp@wd}{\wd\z@}% + \unhbox\z@% } \def\tcb@inputlisting@out@otherAboveListing{% @@ -48,11 +57,11 @@ \tcb@use@lower@outside{\kvtcb@width}% \par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent% \fi% - \begin{tcolorbox}[before=]\tcbuselistinglisting\end{tcolorbox}% + \begin{tcolorbox}[before=,savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}% } \def\tcb@inputlisting@out@listingAboveOther{% - \begin{tcolorbox}[after=]\tcbuselistinglisting\end{tcolorbox}% + \begin{tcolorbox}[after=,savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}% \iftcb@lowervisible\par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent% \tcb@use@lower@outside{\kvtcb@width}% \fi% @@ -83,8 +92,8 @@ \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\hspace{\kvtcb@sbs@gap}\hfill% + \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false,savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}% + \endminipage\kern\kvtcb@sbs@gap% \iftcb@lowervisible% \tcb@use@lower@outside{\tcb@w@outside}% \fi% @@ -98,15 +107,18 @@ \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}% \iftcb@lowervisible% \tcb@use@lower@outside{\tcb@w@outside}% - \fi\hspace{\kvtcb@sbs@gap}\hfill% - \tcb@minipage{\tcb@w@inside}% - \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}% + \tcbdimto{\tcb@temp@wd}{\tcb@w@outside-\tcb@temp@wd+\kvtcb@sbs@gap}% + \else% + \tcbdimto{\tcb@temp@wd}{\tcb@w@outside+\kvtcb@sbs@gap}% + \fi% + \kern\tcb@temp@wd\tcb@minipage{\tcb@w@inside}% + \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false,savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}% \endminipage% \end{minipage}\end{tcb@sbsfloat}% } \def\tcb@inputlisting@inside{% - \begin{tcolorbox}[capture=\tcb@listing@capture]\tcb@listing@process\end{tcolorbox}% + \begin{tcolorbox}[capture=\tcb@listing@capture,savedelimiter=tcolorbox]\tcb@listing@process\end{tcolorbox}% } \tcbset{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 70305d3b656..f18a89e55df 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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.71} +\tcb@set@library@version{2.72} \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 4918a3db3a5..8c65eda686b 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 2.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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{2.71} +\tcb@set@library@version{2.72} \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 255f2c015fe..9a234d42a41 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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.71} +\tcb@set@library@version{2.72} \RequirePackage{tikz}[2010/10/13] @@ -167,18 +167,18 @@ % draw special versions -\def\tcb@drawspec@UT#1{% - \tcb@pathbase{#1,interior@style}{segmentation.west}{interior.north east}% +\def\tcb@drawspec@UT{% + \tcb@pathbase{tcb@fill@interior}{segmentation.west}{interior.north east}% {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}% } -\def\tcb@drawspec@UR#1{% - \tcb@pathbase{#1,interior@style}{segmentation.west}{interior.north east}% +\def\tcb@drawspec@UR{% + \tcb@pathbase{tcb@fill@interior}{segmentation.west}{interior.north east}% {\tcb@arc@zpt}{\tcb@arc@ins}{\tcb@arc@ins}{\tcb@arc@zpt}% } -\def\tcb@drawspec@US#1{% - \tcb@pathbase{#1,interior@style}{segmentation.west}{interior.east|-frame.north}% +\def\tcb@drawspec@US{% + \tcb@pathbase{tcb@fill@interior}{segmentation.west}{interior.east|-frame.north}% {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}% } @@ -223,7 +223,7 @@ } \def\tcb@drawspec@T{% - \tcb@pathbase{top color=\kvtcb@colframe,bottom color=\kvtcb@colback}{[yshift=-0.01pt]interior.north west}{[yshift=0.01pt]title.south east}% + \tcb@pathbase{top color=\kvtcb@colframe,bottom color=\kvtcb@colback,fill opacity=\kvtcb@opacitybacktitle}{[yshift=-0.01pt]interior.north west}{[yshift=0.01pt]title.south east}% {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}% } @@ -419,7 +419,7 @@ \ifcase\tcb@segment@state% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT% \else% {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@path}% \fi% @@ -431,7 +431,7 @@ \ifcase\tcb@segment@state% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% \or% - \tcb@drawspec@UR{fill=\kvtcb@colback}% + \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UR% \else% {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}% \fi% @@ -452,7 +452,7 @@ \ifcase\tcb@segment@state% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT% \else% {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathfirst}% \fi% @@ -464,7 +464,7 @@ \ifcase\tcb@segment@state% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% \or% - \tcb@drawspec@UR{fill=\kvtcb@colback}% + \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UR% \else% {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}% \fi% @@ -483,7 +483,7 @@ \ifcase\tcb@segment@state% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT% \else% {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathmiddle}% \fi% @@ -495,7 +495,7 @@ \ifcase\tcb@segment@state% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% \or% - \tcb@drawspec@US{fill=\kvtcb@colback}% + \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@US% \else% {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}% \fi% @@ -514,7 +514,7 @@ \ifcase\tcb@segment@state {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% \or% - \tcb@drawspec@UT{fill=\kvtcb@colback}% + \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT% \else% {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathlast}% \fi% @@ -526,7 +526,7 @@ \ifcase\tcb@segment@state% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% \or% - \tcb@drawspec@US{fill=\kvtcb@colback}% + \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@US% \else {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}% \fi% @@ -546,7 +546,7 @@ interior titled code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \tcb@spec{beamer@color}\tcb@drawspec@UT% \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@path}% \fi% @@ -557,7 +557,7 @@ interior code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1 - \tcb@drawspec@UR{beamer@color}% + \tcb@spec{beamer@color}\tcb@drawspec@UR% \else% {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% \fi% @@ -574,7 +574,7 @@ interior titled code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \tcb@spec{beamer@color}\tcb@drawspec@UT% \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% \fi% @@ -585,7 +585,8 @@ interior code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1 - \tcb@drawspec@UR{beamer@color}\else% + \tcb@spec{beamer@color}\tcb@drawspec@UR% + \else% {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% \fi% \else% @@ -599,7 +600,7 @@ interior titled code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \tcb@spec{beamer@color}\tcb@drawspec@UT% \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% \fi% @@ -610,7 +611,7 @@ interior code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1 - \tcb@drawspec@US{beamer@color}% + \tcb@spec{beamer@color}\tcb@drawspec@US% \else% {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% \fi% @@ -625,7 +626,7 @@ interior titled code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1% - \tcb@drawspec@UT{beamer@color}% + \tcb@spec{beamer@color}\tcb@drawspec@UT% \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathlast}% \fi% @@ -636,7 +637,7 @@ interior code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1 - \tcb@drawspec@US{beamer@color}% + \tcb@spec{beamer@color}\tcb@drawspec@US% \else% {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% \fi% @@ -911,6 +912,99 @@ \end{tcbclipinterior}% } + +\def\tcb@process@ppbb{% + \pgf@process{\pgfpointanchor{path picture bounding box}{south west}}% + \pgf@xa\pgf@x\pgf@ya\pgf@y% + \pgf@process{\pgfpointanchor{path picture bounding box}{north east}}% + \pgf@xb\pgf@x\pgf@yb\pgf@y% + \pgfsetfillopacity{\tcb@tikz@fill@graphics@opacity}% +} + +\def\tcb@process@ppbb@wh{% + \tcb@process@ppbb% + \tcbdimto\tcb@ppbb@width{\pgf@xb-\pgf@xa}% + \tcbdimto\tcb@ppbb@height{\pgf@yb-\pgf@ya}% +} + +\def\tcb@set@waterbox@to@graphics#1{% + \setbox\tcb@waterbox=\hbox{\pgfinterruptpicture{\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options]{#1}}\endpgfinterruptpicture}% +} + +\tikzset{% + fill image opacity/.store in=\tcb@tikz@fill@graphics@opacity,% + fill image opacity=1.0,% + fill image options/.store in=\tcb@tikz@fill@graphics@options,% + fill image options=,% + fill plain image/.style={path picture={% + \node at (path picture bounding box.center) {\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options]{#1}}; + }}, + fill stretch image/.style={path picture={% + \tcb@process@ppbb@wh% + \node at (path picture bounding box.center) {\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options,width=\tcb@ppbb@width,height=\tcb@ppbb@height]{#1}}; + }}, + fill overzoom image/.style={path picture={% + \tcb@process@ppbb@wh% + \tcb@set@waterbox@to@graphics{#1}% + \tcb@setratiorobust\tcb@scale@x{\tcb@ppbb@width}{\wd\tcb@waterbox}% + \tcb@setratiorobust\tcb@scale@y{\tcb@ppbb@height}{\ht\tcb@waterbox+\dp\tcb@waterbox}% + \ifdim\dimexpr\tcb@scale@x pt\relax>\dimexpr\tcb@scale@y pt\relax\let\tcb@scale@y=\tcb@scale@x\else\let\tcb@scale@x=\tcb@scale@y\fi% + \node at (path picture bounding box.center) {\scalebox{\tcb@scale@x}[\tcb@scale@y]{\box\tcb@waterbox}};% + }}, + fill zoom image/.style={path picture={% + \tcb@process@ppbb@wh% + \tcb@set@waterbox@to@graphics{#1}% + \tcb@setratiorobust\tcb@scale@x{\tcb@ppbb@width}{\wd\tcb@waterbox}% + \tcb@setratiorobust\tcb@scale@y{\tcb@ppbb@height}{\ht\tcb@waterbox+\dp\tcb@waterbox}% + \ifdim\dimexpr\tcb@scale@x pt\relax<\dimexpr\tcb@scale@y pt\relax\let\tcb@scale@y=\tcb@scale@x\else\let\tcb@scale@x=\tcb@scale@y\fi% + \node at (path picture bounding box.center) {\scalebox{\tcb@scale@x}[\tcb@scale@y]{\box\tcb@waterbox}};% + }}, + fill shrink image/.style={path picture={% + \tcb@process@ppbb@wh% + \tcb@set@waterbox@to@graphics{#1}% + \tcb@setratiorobust\tcb@scale@x{\tcb@ppbb@width}{\wd\tcb@waterbox}% + \tcb@setratiorobust\tcb@scale@y{\tcb@ppbb@height}{\ht\tcb@waterbox+\dp\tcb@waterbox}% + \ifdim\dimexpr\tcb@scale@x pt\relax<\dimexpr\tcb@scale@y pt\relax\let\tcb@scale@y=\tcb@scale@x\else\let\tcb@scale@x=\tcb@scale@y\fi% + \ifdim\dimexpr\tcb@scale@x pt\relax<1pt\relax% + \node at (path picture bounding box.center) {\scalebox{\tcb@scale@x}[\tcb@scale@y]{\box\tcb@waterbox}};% + \else% + \node at (path picture bounding box.center) {\box\tcb@waterbox};% + \fi% + }}, + fill tile image/.style={path picture={% + \tcb@process@ppbb% + \tcb@set@waterbox@to@graphics{#1}% + \tcbdimto\tcb@ppbb@tilew{\wd\tcb@waterbox}% + \tcbdimto\tcb@ppbb@tileh{\ht\tcb@waterbox+\dp\tcb@waterbox}% + \pgf@xc\pgf@xa\pgf@yc\pgf@yb% + \pgfutil@loop% + \pgfutil@loop% + \pgftext[x=\pgf@xc,y=\pgf@yc,left,top]{\copy\tcb@waterbox}% + \ifdim\pgf@xc<\pgf@xb% + \advance\pgf@xc\tcb@ppbb@tilew% + \pgfutil@repeat% + \ifdim\pgf@yc>\pgf@ya% + \advance\pgf@yc-\tcb@ppbb@tileh% + \pgf@xc\pgf@xa% + \pgfutil@repeat% + }},% + 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}},% + fill overzoom image*/.style 2 args={fill image options={#1},fill overzoom image={#2}},% + fill zoom image*/.style 2 args={fill image options={#1},fill zoom image={#2}},% + fill shrink image*/.style 2 args={fill image options={#1},fill shrink image={#2}},% + fill tile image*/.style 2 args={fill image options={#1},fill tile image={#2}},% +} + +\tcbset{% + frame style image/.style={frame style={fill=none,fill stretch image={#1}}}, + frame style tile/.style 2 args={frame style={fill=none,fill tile image*={#1}{#2}}}, + interior style image/.style={interior style={fill=none,fill stretch image={#1}}}, + interior style tile/.style 2 args={interior style={fill=none,fill tile image*={#1}{#2}}}, + title style image/.style={title style={fill=none,fill stretch image={#1}}}, + title style tile/.style 2 args={title style={fill=none,fill tile image*={#1}{#2}}}, +} + \tcbset{% clip title/.is choice, clip title/true/.code={\let\tcb@tdraw@title=\tcb@tdraw@title@clip}, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 92482269544..aeceaf8b208 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 2.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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{2.71} +\tcb@set@library@version{2.72} \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 db6a6014950..894d72c9bdf 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% 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.71} +\tcb@set@library@version{2.72} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index b14d0379342..c6c39d25d05 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.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/02/21 version 2.71 text color boxes] -\def\tcb@version{2.71} +\ProvidesPackage{tcolorbox}[2014/03/18 version 2.72 text color boxes] +\def\tcb@version{2.72} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -898,8 +898,9 @@ \let\tcb@tdraw@lower=\tcb@tdraw@lower@core \def\tcb@sbs@mix{% - \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper@real} - \noindent\unhbox\tcb@upperbox\hspace{\kvtcb@sbs@gap}\hfill% + \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper@real}% + \tcbdimto{\tcb@temp@wd}{\tcb@w@upper-\wd\tcb@upperbox+\kvtcb@sbs@gap}% + \noindent\unhbox\tcb@upperbox\kern\tcb@temp@wd% \iftcb@hasLower% \iftcb@lowervisible\unhbox\tcb@lowerbox% \else% -- cgit v1.2.3