diff options
Diffstat (limited to 'Master/texmf-dist')
28 files changed, 671 insertions, 84 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 09fefc3cdde..aa0e2e58f08 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -428,5 +428,20 @@ version 2.71 (2014/02/21) 'keys', 'index colorize', 'index annotate', 'color command', 'color environment', 'color key', 'color value', 'color color' - - +version 2.72 (2014/03/18) +- bug fix: mixing \newtcblisting with 'ams align' and similar options was not possíble +- bug fix: footnotes lost for 'listing outside text' and similar options +- sidebyside and outside implementation slightly changed for beamer usage +- bicolor skin respects 'opacityback' for the upper part now +- new TikZ options: + 'fill image opacity', 'fill image options', + 'fill plain image', 'fill plain image*', 'fill stretch image', 'fill stretch image*', + 'fill overzoom image', 'fill overzoom image*', 'fill zoom image', 'fill zoom image*', + 'fill shrink image', 'fill shrink image*', 'fill tile image', 'fill tile image*' +- library 'skins': + * new options: + 'frame style image', 'frame style tile', 'interior style image', 'interior style tile', + 'title style image', 'title style tile' +- library 'listings': + * new options: + 'every listing line', 'every listing line*' diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index c4bb263c551..3d23872cd1a 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -47,6 +47,10 @@ Contents of the package 'tcolorbox-example.pdf' Compiled example 'Basilica_5.png' Example picture 'lichtspiel.jpg' Example picture + 'blueshade.png' Example picture + 'crinklepaper.png' Example picture + 'goldshade.png' Example picture + 'pink_marble.png' Example picture Installation ============ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/blueshade.png b/Master/texmf-dist/doc/latex/tcolorbox/blueshade.png Binary files differnew file mode 100644 index 00000000000..4b1713e657c --- /dev/null +++ b/Master/texmf-dist/doc/latex/tcolorbox/blueshade.png diff --git a/Master/texmf-dist/doc/latex/tcolorbox/crinklepaper.png b/Master/texmf-dist/doc/latex/tcolorbox/crinklepaper.png Binary files differnew file mode 100644 index 00000000000..c030edf7656 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tcolorbox/crinklepaper.png diff --git a/Master/texmf-dist/doc/latex/tcolorbox/goldshade.png b/Master/texmf-dist/doc/latex/tcolorbox/goldshade.png Binary files differnew file mode 100644 index 00000000000..7e082640532 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tcolorbox/goldshade.png diff --git a/Master/texmf-dist/doc/latex/tcolorbox/pink_marble.png b/Master/texmf-dist/doc/latex/tcolorbox/pink_marble.png Binary files differnew file mode 100644 index 00000000000..d3279dff5cf --- /dev/null +++ b/Master/texmf-dist/doc/latex/tcolorbox/pink_marble.png diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf Binary files differindex 40fd4ce9b05..9b8ab2d3db6 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index 5fd04ca11bd..87d09062de5 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.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) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- @@ -40,7 +40,8 @@ Lower part of my box. \end{tcolorbox} -\begin{tcolorbox}[colback=yellow!5!white,colframe=yellow!75!black,title=My title] +\begin{tcolorbox}[colback=yellow!5!white,colframe=yellow!50!black, + colbacktitle=yellow!75!black,title=My title] I can do this also with a title. \tcblower Lower part of my box. @@ -64,6 +65,16 @@ \end{tcolorbox} +\begin{tcolorbox}[enhanced,frame style image=blueshade.png, + opacityback=0.75,opacitybacktitle=0.25, + colback=blue!5!white,colframe=blue!75!black, + title=My title] + This box is filled with an external image.\par + Title and interior are made partly transparent to show the image. +\end{tcolorbox} + + + \clearpage %---------------------------------------------------------- \section{\LaTeX-Examples} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex index 795e97388c1..405f891259a 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex @@ -30,7 +30,13 @@ colbacktitle=Navy!15!ExampleBack,top=0mm,before=\par\smallskip,% listing style=mydocumentation,listing only} -\hspace{0pt} +\bigskip + +\begin{marker} +If you have trouble printing this document, the reason is quite likely the +cover page. Printing the pages starting with page 2 or page 3 should work. +\end{marker} + \clearpage \begin{center} \begin{tcolorbox}[enhanced,hbox,tikznode,left=8mm,right=8mm,boxrule=0.4pt, @@ -57,6 +63,8 @@ \begin{tcolorbox}[breakable,enhanced jigsaw,title={Contents},fonttitle=\bfseries\Large, colback=yellow!10!white,colframe=red!50!black,before=\par\bigskip\noindent, + interior style={fill overzoom image=goldshade.png,fill image opacity=0.25}, + colbacktitle=red!50!yellow!75!black, watermark color=yellow!75!red!25!white,pad at break=3mm, watermark text={\bfseries\Large Contents}, %enlargepage=2\baselineskip, diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex index b2770352663..4b339d30172 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -748,15 +748,14 @@ This is the lower part. % \usepackage{changepage} for 'check odd page' % \usepackage{lipsum} % \usetikzlibrary{patterns} -% \tcbuselibrary{skins,breakable,hooks} +% \tcbuselibrary{skins,breakable} \begin{tcolorbox}[skin=enhancedmiddle,breakable, check odd page,toggle left and right, boxrule=0mm,top=0mm,bottom=0mm,left=1mm,right=1mm, rightrule=1cm,colupper=blue!25!black, - watermark graphics=lichtspiel.jpg,watermark opacity=0.5, - watermark overzoom=1.00,watermark opacity=0.25, + interior style={fill overzoom image=lichtspiel.jpg,fill image opacity=0.25}, frame style={pattern=crosshatch dots light steel blue}, - overlay app={% + overlay={% \ifoddpage\coordinate (X) at ([xshift=-5mm]frame.east); \else\coordinate (X) at ([xshift=5mm]frame.west);\fi \fill[shading=ball,ball color=blue!50!white,opacity=0.5] (X) circle (4mm);}] diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex index 4432811ab50..043f8d61196 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex @@ -159,7 +159,9 @@ The following keys are used inside |\tcbuselibrary| respectively \begin{tcolorbox}[title={Package \texttt{tcolorbox}},center title,fonttitle=\bfseries,arc=0pt, - colback=red!10!white,colframe=red!50!black] + colback=red!10!white, + interior style={fill tile image*={width=2cm}{pink_marble.png},fill image opacity=0.5}, + colframe=red!50!black] \begin{tcolorbox}[beamer,adjusted title=Basic Features,colframe=blue!50!black,colback=blue!10!white] Base package \end{tcolorbox} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex index 6627745ba61..041e9281896 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex @@ -367,8 +367,44 @@ Note that listings outside \refEnv{tcblisting} and Typically, a user is not expected to use this key at all. \end{docTcbKey} +\begin{docTcbKey}{every listing line}{=\meta{text}}{no default, initially unset/empty} +Inserts some \meta{text} to the begin of every line of a listing. +Note that this a hack of the |listings| package code. This may become unusable +or superfluous in the future. +\begin{dispExample} +\newtcblisting{commandshell}{colback=black,colupper=white,colframe=yellow!75!black, + listing only,listing options={style=tcblatex,language=sh}, + every listing line={\textcolor{red}{\small\ttfamily\bfseries root \$> }}} + +\begin{commandshell} +ls -al +cd /usr/lib +\end{commandshell} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}{every listing line*}{=\meta{text}}{no default, initially unset/empty} +Identical to \refKey{/tcb/every listing line} plus additional enlargement +of \refKey{/tcb/rightupper} by the width of \meta{text}. Therefore, this +option has to be used after the geometry settings are done. +This option is intended to be used in conjunction with \refKey{/tcb/hbox}. + +\begin{dispExample} +\newtcblisting{commandshell}{colback=black,colupper=white,colframe=yellow!75!black, + listing only,listing options={style=tcblatex,language=sh},hbox, + every listing line*={\textcolor{red}{\small\ttfamily\bfseries root \$> }}} + +\begin{commandshell} +ls -al +cd /usr/lib +\end{commandshell} +\end{dispExample} +\end{docTcbKey} + See further options in \Vref{sec:commonlistingkeys}. +\clearpage \subsection{Option Keys of the \mylib{listingsutf8} Library} The \mylib{listingsutf8} library is an extension of the \mylib{listings} library, so @@ -384,7 +420,7 @@ all options from \Vref{sec:speclistingkeys} are applicable. See further options in \Vref{sec:commonlistingkeys}. - +\clearpage \subsection{Option Keys of the \mylib{minted} Library} \begin{docTcbKey}{minted language}{=\meta{programming language}}{no default, initially |latex|} @@ -403,7 +439,7 @@ public class HelloWorld { \end{dispExample} \end{docTcbKey} -\clearpage + \begin{docTcbKey}{minted options}{=\meta{key list}}{no default, initially |tabsize=2,fontsize=\textbackslash small|} Sets the options from the package |minted| \cite{rudolph:2011a} which are used during typesetting of the listing. @@ -427,7 +463,7 @@ public class HelloWorld { \end{dispExample} \end{docTcbKey} - +\clearpage \begin{docTcbKey}{minted style}{=\meta{style}}{no default, initially unset} Sets a \meta{style} known to |Pygments| \cite{pygments:2013}. This is independent from \refKey{/tcb/minted options}. Note that styles are always diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.picturecredits.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.picturecredits.tex new file mode 100644 index 00000000000..c39429d7d54 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.picturecredits.tex @@ -0,0 +1,37 @@ +% !TeX root = tcolorbox.tex +% include file of tcolorbox.tex (manual of the LaTeX package tcolorbox) +\clearpage +\section{Picture Credits} +The following pictures were used inside this documentation. + +\def\parorfillfill{\hfill\global\let\parorfill\parorfillpar} +\def\parorfillpar{\par\global\let\parorfill\parorfillfill} +\let\parorfill\parorfillfill + +\newcommand{\diabox}[3][]{% + \begin{tcolorbox}[bicolor,before=,after=\parorfill,equal height group=diabox,width=7.9cm, + fonttitle=\bfseries\ttfamily,adjusted title=\detokenize{#2},center title, + colframe=blue!20!black,leftupper=0mm,rightupper=0mm,colback=black!75!white,#1] + \tikz\path[fill zoom image={#2}] (0,0) rectangle (\linewidth,4cm);% + \tcblower% + #3% + \end{tcolorbox}} + +\diabox[before=]{Basilica_5.png}{ + \url{http://commons.wikimedia.org/wiki/File:Basilica_5.png}} +\diabox{lichtspiel.jpg}{ + Photograph taken by Thomas F.~Sturm.} +\diabox{crinklepaper.png}{% + Created with |GIMP|.\\ + \url{http://www.gimp.org}} +\diabox{pink_marble.png}{% + Created with |GIMP|.\\ + \url{http://www.gimp.org}} +\diabox{blueshade.png}{% + Created with |GIMP|.\\ + \url{http://www.gimp.org}} +\diabox{goldshade.png}{% + Created with |GIMP|.\\ + \url{http://www.gimp.org}} + + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex index 3b1fce4615b..256e66803f6 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -232,6 +232,42 @@ This is the lower part. \end{docTcbKey} +\begin{docTcbKey}{frame style image}{=\meta{file name}}{no default, initially unset} + Fills the frame with an external image referenced by \meta{file name}. + For advanced features like blending of a picture with the background, + use \refKey{/tcb/frame style} together with \refKey{/tikz/fill stretch image}. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\tcbset{colback=red!5!white,fonttitle=\bfseries} + +\begin{tcolorbox}[enhanced,title=My title, + frame style image=blueshade.png] +This is a \textbf{tcolorbox}. +\tcblower +This is the lower part. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + + +\begin{docTcbKey}{frame style tile}{=\marg{graphics options}\marg{file name}}{no default, initially unset} + Fills the frame with a tile pattern based on an external image referenced by \meta{file name}. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. + For advanced features like blending of a picture with the background, + use \refKey{/tcb/frame style} together with \refKey{/tikz/fill tile image}. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\tcbset{colback=red!5!white,coltitle=red!30!black, + opacityback=0.75,fonttitle=\bfseries} + +\begin{tcolorbox}[enhanced,title=My title, + frame style tile={width=1cm}{pink_marble.png}] +This is a \textbf{tcolorbox}. +\tcblower +This is the lower part. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\clearpage \begin{docTcbKey}{frame hidden}{}{style, no value} This is a shortcut for |frame style={draw=none,fill=none}|. Depending on the skin, this option switches off the drawing of the @@ -272,7 +308,42 @@ This is the lower part. \end{dispExample*} \end{docTcbKey} + +\begin{docTcbKey}{interior style image}{=\meta{file name}}{no default, initially unset} + Fills the interior with an external image referenced by \meta{file name}. + For advanced features like blending of a picture with the background, + use \refKey{/tcb/interior style} together with \refKey{/tikz/fill stretch image}. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\tcbset{colframe=red!75!black,fonttitle=\bfseries} + +\begin{tcolorbox}[enhanced,title=My title, + interior style image=goldshade.png] +This is a \textbf{tcolorbox}. +\tcblower +This is the lower part. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + \clearpage +\begin{docTcbKey}{interior style tile}{=\marg{graphics options}\marg{file name}}{no default, initially unset} + Fills the interior with a tile pattern based on an external image referenced by \meta{file name}. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. + For advanced features like blending of a picture with the background, + use \refKey{/tcb/interior style} together with \refKey{/tikz/fill tile image}. + +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\tcbset{colframe=red!75!black,fonttitle=\bfseries} + +\begin{tcolorbox}[enhanced,title=My title, + interior style tile={width=2cm}{crinklepaper.png}] +This is a \textbf{tcolorbox}. +\tcblower +This is the lower part. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + \begin{docTcbKey}{interior hidden}{}{style, no value} This is a shortcut for |interior style={draw=none,fill=none}|. @@ -315,6 +386,7 @@ This is the lower part. \end{docTcbKey} +\clearpage \begin{docTcbKey}{segmentation hidden}{}{style, no value} This is a shortcut for |segmentation style={draw=none,fill=none}|. Depending on the skin, this option switches off the drawing of the @@ -334,7 +406,6 @@ This is the lower part. \end{docTcbKey} -\clearpage \begin{docTcbKey}{title style}{=\meta{\texttt{\upshape tikz} keys}}{style, no default} The \meta{\texttt{\upshape tikz} keys} are used inside the |tikz| path command for drawing the \emph{title area} of the box.\\ @@ -357,6 +428,44 @@ This is the lower part. \end{docTcbKey} +\begin{docTcbKey}{title style image}{=\meta{file name}}{no default, initially unset} + Fills the title area with an external image referenced by \meta{file name}. + For advanced features like blending of a picture with the background, + use \refKey{/tcb/title style} together with \refKey{/tikz/fill stretch image}. + +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\tcbset{colback=blue!5!white,colframe=blue!75!black, + fonttitle=\bfseries} + +\begin{tcolorbox}[enhanced,title=My title, + title style image=blueshade.png] +This is a \textbf{tcolorbox}. +\tcblower +This is the lower part. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\clearpage +\begin{docTcbKey}{title style tile}{=\marg{graphics options}\marg{file name}}{no default, initially unset} + Fills the title area with a tile pattern based on an external image referenced by \meta{file name}. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. + For advanced features like blending of a picture with the background, + use \refKey{/tcb/title style} together with \refKey{/tikz/fill tile image}. + +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\tcbset{colback=red!5!white,colframe=red!75!black, + coltitle=blue!50!black,fonttitle=\bfseries} + +\begin{tcolorbox}[enhanced,title=My title, + title style tile={width=1cm}{pink_marble.png}] +This is a \textbf{tcolorbox}. +\tcblower +This is the lower part. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + \begin{docTcbKey}{title hidden}{}{style, no value} This is a shortcut for |title style={draw=none,fill=none}|. @@ -3348,3 +3457,245 @@ Nevertheless, this skin can be applied independently. \end{dispExample} +\clearpage +\subsection{TikZ Image Fill Extensions}\label{subsec:tikzimagefilling} +The \mylib{skins} library adds some image fill options to the vast option set of +|tikz| \cite{tantau:2013a}. These options can be used in any |tikzpicture|. + +\begin{docTikzKey}{fill plain image}{=\meta{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The image is put in the center of the path, but it is not resized to fit into + the path area. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[draw,fill plain image=goldshade.png] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill plain image*}{=\meta{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The image is put in the center of the path, but it is not resized to fit into + the path area. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[draw,fill plain image*={width=2.5cm}{goldshade.png}] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill stretch image}{=\meta{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The image is stretched to fill the path area. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[fill stretch image=goldshade.png] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill stretch image*}{=\marg{graphics options}\marg{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. + The image is stretched to fill the path area. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[fill stretch image*= + {angle=90,origin=c}{goldshade.png}] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill overzoom image}{=\meta{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The image is zoomed such that the path area fills the image. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[fill overzoom image=goldshade.png] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill overzoom image*}{=\marg{graphics options}\marg{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. + The image is zoomed such that the path area fills the image. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[fill overzoom image*= + {angle=90,origin=c}{goldshade.png}] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill zoom image}{=\meta{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The image is zoomed such that it fits inside the path area. + Typically, some parts of the path area will stay unfilled. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[draw,fill zoom image=goldshade.png] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill zoom image*}{=\marg{graphics options}\marg{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. + The image is zoomed such that it fits inside the path area. + Typically, some parts of the path area will stay unfilled. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[draw,fill zoom image*= + {angle=90,origin=c}{goldshade.png}] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + +\clearpage +\begin{docTikzKey}{fill shrink image}{=\meta{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The image is zoomed such that it fits inside the path area, but it never + gets enlarged. + Typically, some parts of the path area will stay unfilled. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[draw,fill shrink image=goldshade.png] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill shrink image*}{=\meta{file name}}{no default, initially unset} + Fills the current path with an external image referenced by \meta{file name}. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. + The image is zoomed such that it fits inside the path area, but it never + gets enlarged. + Typically, some parts of the path area will stay unfilled. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[draw,fill shrink image*={width=1.5cm}{goldshade.png}] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + + +\begin{docTikzKey}{fill tile image}{=\meta{file name}}{no default, initially unset} + Fills the current path with a tile pattern using an external image referenced by \meta{file name}. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[fill tile image=pink_marble.png] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{docTikzKey}{fill tile image*}{=\marg{graphics options}\marg{file name}}{no default, initially unset} + Fills the current path with a tile pattern using an external image referenced by \meta{file name}. + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[fill tile image*={width=1cm}{pink_marble.png}] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\clearpage +\begin{docTikzKey}{fill image opacity}{=\meta{fraction}}{no default, initially |1.0|} + Sets the fill opacity for the image fill options to the given \meta{fraction}. +\begin{dispExample} +\begin{tikzpicture} +\path[fill stretch image=goldshade.png] (0,0) circle (1cm); +\path[fill=red,fill stretch image=goldshade.png,fill image opacity=0.75] + (2,0) circle (1cm); +\path[fill=red,fill stretch image=goldshade.png,fill image opacity=0.5] + (4,0) circle (1cm); +\path[fill=red,fill stretch image=goldshade.png,fill image opacity=0.25] + (6,0) circle (1cm); +\path[fill=red] (8,0) circle (1cm); +\end{tikzpicture} +\end{dispExample} +\end{docTikzKey} + + +\begin{docTikzKey}{fill image options}{=\meta{graphics options}}{no default, initially empty} + The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command + for the image fill options. This can be just together with + \refKey{/tikz/fill stretch image}, \refKey{/tikz/fill overzoom image}, \refKey{/tikz/fill zoom image}, + and \refKey{/tikz/fill tile image}. +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\begin{tikzpicture} +\path[fill image options={width=1cm}, + fill tile image=pink_marble.png] + (2.75,-0.75) -- (3,0) -- (2.75,0.75) + \foreach \w in {45,90,...,315} + { -- (\w:1.5cm) } -- cycle; +\end{tikzpicture} +\end{dispExample*} +\end{docTikzKey} + + +\begin{dispExample*}{sbs,lefthand ratio=0.6,center lower, + title=Image blending example} +\begin{tikzpicture}[every node/.style= + {circle,minimum width=2cm}] +\node[fill stretch image=blueshade.png] + (A) at (120:3cm) {A}; +\node[fill stretch image=goldshade.png] + (B) at (60:3cm) {B}; +\node[ + preaction={fill stretch image=blueshade.png}, + fill stretch image=goldshade.png, + fill image opacity=0.5] (C) {C}; +\path (A) -- node{$+$} (B); +\draw[->,very thick] (A)--(C); +\draw[->,very thick] (B)--(C); +\end{tikzpicture} +\end{dispExample*} + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 1c29db55d11..07472f82bfb 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index a62aa250081..75bcb6955be 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 2.71 (2014/02/21) +%% The LaTeX package tcolorbox - version 2.72 (2014/03/18) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -79,6 +79,7 @@ \tcbmakedocSubKey{docTcbKey}{tcb} \tcbmakedocSubKey{langTcbKey}{tcb/doclang} \tcbmakedocSubKey{newTcbKey}{tcb/new} +\tcbmakedocSubKey{docTikzKey}{tikz} \makeatletter \newrobustcmd{\tcbIndexPrintSkinCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@key}{Skin}} @@ -97,8 +98,8 @@ \newtcolorbox{marker}[1][]{marker,#1} -\def\version{2.71}% -\def\datum{2014/02/21}% +\def\version{2.72}% +\def\datum{2014/03/18}% \makeindex \hypersetup{ @@ -151,10 +152,15 @@ \tcbset{documentation listing style=mydocumentation,% sbs/.style={sidebyside,before lower app={\tcbset{sidebyside=false}}},% - innerbox/.style={reset,documentation listing style=mydocumentation,docexample/.style={docexample original}%,listing engine=minted,documentation minted style=perldoc, + innerbox/.style={reset,documentation listing style=mydocumentation, + docexample/.style={docexample original}%,listing engine=minted,documentation minted style=perldoc, }, - base example/.style={bicolor,colframe=Navy!50!ExampleFrame,colback=Navy!5!ExampleBack,fontlower=\footnotesize, - colbacklower=ExampleBack!5!white,drop fuzzy shadow}, + base example/.style={bicolor, + colframe=Navy!50!ExampleFrame,colback=Navy!5!ExampleBack,fontlower=\footnotesize, + %interior style={fill stretch image=blueshade.png,fill image opacity=0.15}, + frame style={fill stretch image*={angle=180,origin=c}{blueshade.png},fill image opacity=0.75}, + colbacklower=ExampleBack!5!white,opacityback=0.9, + drop fuzzy shadow}, docexample/.style={base example,% every box on layer 2/.style={every box}, before upper={\tcbset{innerbox}},before lower={\tcbset{innerbox}} @@ -283,7 +289,7 @@ \input{\jobname_preamble_J.tex} %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.coreoptions} +%\includeonly{tcolorbox.doc.skins} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} @@ -300,6 +306,8 @@ \include{tcolorbox.doc.fitting} \include{tcolorbox.doc.hooks} \include{tcolorbox.doc.documentation} +\appendix +\include{tcolorbox.doc.picturecredits} \include{tcolorbox.doc.references} \include{tcolorbox.doc.index} \end{document} 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% |
