diff options
author | Karl Berry <karl@freefriends.org> | 2014-11-17 23:04:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-11-17 23:04:59 +0000 |
commit | 3c6a608133a7c050ad2a11570145fd5baa2884d3 (patch) | |
tree | 6daaeb677aa9f03d121df2fdda841797778790ab /Master | |
parent | 5ab61128dc89e66ccf400232d0ad3ef5e590bd96 (diff) |
tcolorbox (17nov14)
git-svn-id: svn://tug.org/texlive/trunk@35601 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
29 files changed, 2444 insertions, 820 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 23b789336ae..b9b918d9601 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 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -635,3 +635,38 @@ version 3.22 (2014/10/31) - library 'fitting': * new 'fit algorithm' settings: 'fontsize*', 'areasize*', 'hybrid*' +version 3.30 (2014/11/17) +- bug fix: compilation errors using colors like 'red!10' in some skins like 'beamer' +- '\thetcbcounter' can now be used as part of a 'listing file' name for 'tcblisting' +- implementation of 'before skip' and 'after skip' improved +- implementation of 'equal height group' improved to take arbitrary id's +- Quick Reference added +- new options: + 'add to width', 'add to height', + 'box align', 'left skip', 'right skip', 'leftright skip' +- library 'skins': + * new macros: + '\tcbincludegraphics', '\tcbincludepdf' + * new options: + 'graphics options', 'graphics directory', 'graphics pages' +- library 'listings', 'listingsut8', 'minted': + * 'listing file' now usable inside 'tcblisting' and 'tcbinputlisting' + * new options: + 'comment only', 'text above* listing', 'listing above* text', + 'comment above* listing', 'listing above* comment', + 'comment style', 'tcbimage comment', 'pdf extension', 'pdf comment', + 'process code', 'no process', 'run system command', 'run pdflatex', + 'run xelatex', 'run lualatex', 'run makeindex', 'run bibtex', 'run biber', + 'run arara', 'run latex', 'run dvips', 'run ps2pdf', + 'compilable listing' +- new library 'raster': + * new macros and environments: + 'tcbraster', 'tcbitemize', 'tcbitem' + * new options: + 'raster columns', 'raster rows', 'raster width', 'raster height', 'raster before skip', + 'raster after skip', 'raster left skip', 'raster right skip', 'raster column skip', + 'raster row skip', 'raster halign', 'raster valign', 'raster equal height', + 'raster equal height group', 'raster force size' ,'raster reset', + 'raster odd column', 'raster even column', 'raster column n', 'raster odd row', + 'raster even row', 'raster row m','raster odd number', 'raster even number', + 'raster row m column n', 'raster number n' diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 629b4528161..e13acdde5b8 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 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -37,6 +37,7 @@ Contents of the package 'tcblistingscore.code.tex' LaTeX package file (library of tcolorbox) 'tcblistingsutf8.code.tex' LaTeX package file (library of tcolorbox) 'tcbminted.code.tex' LaTeX package file (library of tcolorbox) + 'tcbraster.code.tex' LaTeX package file (library of tcolorbox) 'tcbskins.code.tex' LaTeX package file (library of tcolorbox) 'tcbskinsjigsaw.code.tex' LaTeX package file (library of tcolorbox) 'tcbtheorems.code.tex' LaTeX package file (library of tcolorbox) @@ -67,12 +68,14 @@ Alternatively, put the files to their respective locations within the TeX instal 'tcblistingscore.code.tex' -> /tex/latex/tcolorbox 'tcblistingsutf8.code.tex' -> /tex/latex/tcolorbox 'tcbminted.code.tex' -> /tex/latex/tcolorbox - 'tcbtheorems.code.tex' -> /tex/latex/tcolorbox + 'tcbraster.code.tex' -> /tex/latex/tcolorbox 'tcbskins.code.tex' -> /tex/latex/tcolorbox 'tcbskinsjigsaw.code.tex' -> /tex/latex/tcolorbox + 'tcbtheorems.code.tex' -> /tex/latex/tcolorbox 'tcbxparse.code.tex' -> /tex/latex/tcolorbox 'blueshade.png' -> /tex/latex/tcolorbox 'crinklepaper.png' -> /tex/latex/tcolorbox 'goldshade.png' -> /tex/latex/tcolorbox 'pink_marble.png' -> /tex/latex/tcolorbox + all other files -> /doc/latex/tcolorbox 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 c6c44efbf1c..c39dcb96838 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 f91ac86c657..f6d9ac5733f 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 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- 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 d355b85d922..89327dcde48 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex @@ -13,7 +13,7 @@ {\node[below right,rotate around={\w:(C)}] at ([xshift=1cm]C) {% \begin{tcolorbox}[width=8cm,title=tcolorbox \version, fontupper=\scriptsize,fonttitle=\small\bfseries, - colback=boxcol!25!white,colbacktitle=boxcol!!+!50!black,colframe=boxcol, + colframe=boxcol,colback=boxcol!25!white,colbacktitle=boxcol!!+!50!black, enhanced jigsaw,opacityback=0.5,opacitybacktitle=0.75] \lipsum[2] \end{tcolorbox}}; 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 e997410d6ad..b1782eb8d16 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -445,6 +445,7 @@ This is a \textbf{tcolorbox}. \clearpage \subsection{Geometry} + \begin{docTcbKey}{width}{=\meta{length}}{no default, initially \cs{linewidth}} Sets the total width of the colored box to \meta{length}. See also \refKey{/tcb/height}. @@ -470,7 +471,24 @@ This is a \textbf{tcolorbox} where the text has a width of 4cm. \end{dispExample} \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-11-07]{add to width}{=\meta{length}}{style, no default} + Adds \meta{length} to the current total width of the colored box. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\tcbset{width=4cm,colback=red!5!white, + colframe=red!75!black} + +\begin{tcolorbox} +This is a \textbf{tcolorbox}. +\end{tcolorbox} + +\begin{tcolorbox}[add to width=1cm] +This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\clearpage \begin{docTcbKey}{toprule}{=\meta{length}}{no default, initially \texttt{0.5mm}} Sets the line width of the top rule to \meta{length}. \begin{dispExample} @@ -494,7 +512,6 @@ This is a \textbf{tcolorbox}. \end{dispExample} \end{docTcbKey} -\clearpage \begin{docTcbKey}{leftrule}{=\meta{length}}{no default, initially \texttt{0.5mm}} Sets the line width of the left rule to \meta{length}. \begin{dispExample} @@ -518,6 +535,7 @@ This is a \textbf{tcolorbox}. \end{dispExample} \end{docTcbKey} +\clearpage \begin{docTcbKey}{titlerule}{=\meta{length}}{no default, initially \texttt{0.5mm}} Sets the line width of the rule below the title to \meta{length}. \begin{dispExample} @@ -530,7 +548,6 @@ This is a \textbf{tcolorbox}. \end{dispExample} \end{docTcbKey} -\enlargethispage*{1cm} \begin{docTcbKey}{boxrule}{=\meta{length}}{style, no default, initially \texttt{0.5mm}} Sets all rules of the frame to \meta{length}, i.\,e.\ @@ -1208,8 +1225,26 @@ This is a \textbf{tcolorbox} where the text area has a height of 2cm. \end{dispExample} \end{docTcbKey} - \clearpage + +\begin{docTcbKey}[][doc new=2014-11-07]{add to height}{=\meta{length}}{style, no default} + Adds \meta{length} to the current height of the colored box. + \refKey{/tcb/height} has to be set before this key is used! +\begin{dispExample} +\tcbset{height=1cm, + valign=center,width=(\linewidth-2mm)/2, + before=,after=\hfill,colframe=blue!75!black,colback=white} + +\begin{tcolorbox} + This box has a height of 1cm. +\end{tcolorbox} +\begin{tcolorbox}[add to height=1cm] + This box has a height of 2cm. +\end{tcolorbox} +\end{dispExample} +\end{docTcbKey} + + \begin{docTcbKey}[][doc new=2014-09-22]{height fill}{\colOpt{=true\textbar false}}{default |true|, initially |false|} If set to |true|, the height of the |tcolorbox| is set to the rest of the available vertical space of the current page. Note that the |tcolorbox| @@ -1308,7 +1343,7 @@ This is the lower part with a lot of text in several lines. \begin{docTcbKey}{valign}{=\meta{alignment}}{no default, initially |top|} If the height of a |tcolorbox| is not the natural height, |valign| determines the vertical \meta{alignment} of the upper part. - Feasible values are |top|, |center|, and |bottom|. For a box with natural + Feasible values are \docValue{top}, \docValue{center}, and \docValue{bottom}. For a box with natural height, these values are meaningless. \begin{dispExample} \tcbset{width=(\linewidth-2mm)/3,before=,after=\hfill, @@ -1331,13 +1366,14 @@ colframe=blue!75!black,colback=white,height=2cm} \clearpage -\begin{docTcbKey}{equal height group}{=\meta{id}}{no default} +\begin{docTcbKey}[][doc updated=2014-11-07]{equal height group}{=\meta{id}}{no default} Boxes which are members of an |equal height group| will all get the same height, i.\,e. the maximum of all their natural heights. The \meta{id} serves to distinguish between different height groups. - This \meta{id} should contain only characters which are feasible - for \TeX\ macro names, typically alphabetic characters but no numerals - and spaces. Note that you have to compile twice to see changes and + %This \meta{id} should contain only characters which are feasible + %for \TeX\ macro names, typically alphabetic characters but no numerals + %and spaces. + Note that you have to compile twice to see changes and that height groups are global definitions. @@ -2254,14 +2290,78 @@ This behavior is controlled by the keys |before| and |after|. \end{dispExample} \end{docTcbKey} +\clearpage \begin{docTcbKey}{baseline}{=\meta{length}}{no default, initially |0pt|} Used to set the |\pgfsetbaseline| value of the resulting |tcolorbox|. +\begin{dispExample} +\tcbset{colframe=red!50!white,width=4cm,nobeforeafter} +Some text\dotfill +\begin{tcolorbox}[baseline=3mm] +One line. +\end{tcolorbox} +\begin{tcolorbox}[baseline=3mm] +First line.\\Second line. +\end{tcolorbox} +\end{dispExample} \end{docTcbKey} -\clearpage -\begin{docTcbKey}[][doc new=2014-10-10]{before skip}{=\meta{length}}{style, no default} +\begin{docTcbKey}[][doc new=2014-10-10]{box align}{=\meta{alignment}}{style, no default, initially |bottom|} + Used to set the \refKey{/tcb/baseline} value of the resulting |tcolorbox|. + Feasible values for \meta{alignment} are: + \begin{itemize} + \item\docValue{bottom}: alignment with the box bottom, + \item\docValue{top}: alignment with the box top, + \item\docValue{center}: alignment with the box center, + \item\docValue{base}: alignment with the box content base. This option + is not applicable for a \refEnv{tcolorbox} but for a \refCom{tcbox} only. + It is an alias for \refKey{/tcb/tcbox raise base}. + \end{itemize} + +\begin{dispExample} +\tcbset{colframe=red!50!white,width=4cm,nobeforeafter} +Some text\dotfill +\begin{tcolorbox}[box align=bottom] +One line. +\end{tcolorbox} +\begin{tcolorbox}[box align=bottom] +First line.\\Second line. +\end{tcolorbox} +\end{dispExample} + +\begin{dispExample} +\tcbset{colframe=red!50!white,width=4cm,nobeforeafter} +Some text\dotfill +\begin{tcolorbox}[box align=top] +One line. +\end{tcolorbox} +\begin{tcolorbox}[box align=top] +First line.\\Second line. +\end{tcolorbox} +\end{dispExample} + +\begin{dispExample} +\tcbset{colframe=red!50!white,width=4cm,nobeforeafter} +Some text\dotfill +\begin{tcolorbox}[box align=center] +One line. +\end{tcolorbox} +\begin{tcolorbox}[box align=center] +First line.\\Second line. +\end{tcolorbox} +\end{dispExample} + +\begin{dispExample} +\tcbset{colframe=red!50!white,nobeforeafter} +Some text\dotfill +\tcbox[nobeforeafter,box align=base]{One line} +\tcbox[nobeforeafter,box align=base,size=fbox]{Another line} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new and updated={2014-10-10}{2014-11-07}]{before skip}{=\meta{length}}{style, no default} Inserts some vertical space of the given \meta{length} before the colored box. This style sets \refKey{/tcb/before}. \begin{dispExample*}{sbs,lefthand ratio=0.6} @@ -2273,7 +2373,7 @@ Some text. \end{dispExample*} \end{docTcbKey} -\begin{docTcbKey}[][doc new=2014-10-10]{after skip}{=\meta{length}}{style, no default} +\begin{docTcbKey}[][doc new and updated={2014-10-10}{2014-11-07}]{after skip}{=\meta{length}}{style, no default} Inserts some vertical space of the given \meta{length} after the colored box. This style sets \refKey{/tcb/after}. \begin{dispExample*}{sbs,lefthand ratio=0.6} @@ -2300,6 +2400,50 @@ Some text. \end{dispExample*} \end{docTcbKey} +\clearpage + +\begin{docTcbKey}[][doc new=2014-11-07]{left skip}{=\meta{length}}{style, no default, initially |0mm|} + Inserts some horizontal space of the given \meta{length} before the colored box. + This style sets \refKey{/tcb/grow to left by} with the negated \meta{length}, + i.e. the bounding box and box width are changed. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\noindent\rule{\linewidth}{2pt} + +\begin{tcolorbox}[left skip=1cm, + colframe=red!50!white] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-07]{right skip}{=\meta{length}}{style, no default, initially |0mm|} + Inserts some horizontal space of the given \meta{length} after the colored box. + This style sets \refKey{/tcb/grow to right by} with the negated \meta{length}, + i.e. the bounding box and box width are changed. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\noindent\rule{\linewidth}{2pt} + +\begin{tcolorbox}[right skip=1cm, + colframe=red!50!white] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-10-10]{leftright skip}{=\meta{length}}{style, no default} + Inserts some horizontal space of the given \meta{length} before \emph{and} after the colored box. + This style changes the bounding box and the box width. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\noindent\rule{\linewidth}{2pt} + +\begin{tcolorbox}[leftright skip=1cm, + colframe=red!50!white] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + + \clearpage \subsection{Bounding Box} @@ -2432,9 +2576,9 @@ This is a \textbf{tcolorbox}. \begin{docTcbKey}{grow to left by}{=\meta{length}}{no default, initially |0mm|} - Enlarges the current box size by \meta{length} and + Enlarges the current box width by \meta{length} and enlarges (shrinks) the bounding box distance to the left side of the box by - $-$\meta{length}. + $-$\meta{length}. Also see \refKey{/tcb/left skip}. \begin{dispExample} \tcbset{colframe=blue!75!black,colback=white} @@ -2445,9 +2589,9 @@ This is a \textbf{tcolorbox} with a width of 7cm. \end{docTcbKey} \begin{docTcbKey}{grow to right by}{=\meta{length}}{no default, initially |0mm|} - Enlarges the current box size by \meta{length} and + Enlarges the current box width by \meta{length} and enlarges (shrinks) the bounding box distance to the right side of the box by - $-$\meta{length}. + $-$\meta{length}. Also see \refKey{/tcb/right skip}. \begin{dispExample} \tcbset{colframe=blue!75!black,colback=white} @@ -2724,13 +2868,13 @@ not forbidden. \begin{tcboutputlisting} % \usepackage{lipsum} % \tcbuselibrary{skins,breakable} -\tcbset{enhanced jigsaw,breakable,colframe=red!75!black,fonttitle=\bfseries, +\tcbset{colframe=red!75!black,fonttitle=\bfseries, colback=red!5!white, every box/.style={enhanced,watermark text=\thetcblayer, before=\par\smallskip,after=\par\smallskip}, every box on layer 2/.style={reset,every box,colback=yellow!10!white, drop fuzzy shadow}} -\begin{tcolorbox}[title=Layer 1 Box] +\begin{tcolorbox}[enhanced jigsaw,breakable,title=Layer 1 Box] Here comes a footnote\footnote{Footnote from layer 1 box}. \lipsum[2] \begin{tcolorbox}[title=Layer 2 Box] @@ -3114,6 +3258,8 @@ do \emph{not} use |\tikzexternaldisable| in front of the |tcolorbox|. Sets (nearly) all |tcolorbox| settings (including loaded libraries) back to their default values \emph{plus} any settings given by \refCom{tcbsetforeverylayer}. \refKey{/tcb/savedelimiter} and \refKey{/tcb/capture} keep their values. +Also, all raster values (see \Vref{sec:raster}) are not resetted. + This option is useful for boxes in boxes where the inner box should not inherit the settings of the outer box. Note that for boxes inside boxes the |reset| is done automatically, if the diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex new file mode 100644 index 00000000000..5e3e6e672cb --- /dev/null +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex @@ -0,0 +1,147 @@ +% !TeX root = tcolorbox.tex +% include file of tcolorbox.tex (manual of the LaTeX package tcolorbox) +\clearpage +\section{Inclusion of Boxed Image Files}\label{sec:includegraphics} +The \mylib{skins} library adds some commands to conveniently include +boxed image files. +For the following macros and options, the \mylib{skins} library has to be loaded +by a package option or inside the preamble by: +\begin{dispListing} +\tcbuselibrary{skins} +\end{dispListing} + +See \Vref{sec:skins} for the documentation of all other options of the \mylib{skins} library. + +\subsection{Macros} + +\begin{docCommand}[doc new=2014-11-14]{tcbincludegraphics}{\oarg{options}\marg{file name}} + In principle, this macro includes an image file denoted by \meta{file name} + using the standard |\includegraphics| and puts it into a \refEnv{tcolorbox}. + The \meta{options} are |tcolorbox| keys to set up the colored box. + Use \refKey{/tcb/graphics options} to specify options for the underlying + |\includegraphics|. + Some |tcolorbox| option keys are automatically set, namely \refKey{/tcb/enhanced} and + options to center the image inside the box. + + The sizing of the included image is done depending on the following: + \begin{itemize} + \item If a \refKey{/tcb/width} is specified, but no fixed \refKey{/tcb/height}, + the image is sized to fill the inner width of the box. The height of the + box adapts to the image. + \item If a fixed \refKey{/tcb/height} is specified, the image is sized to fill + the fixed inner area of the box. + \item If the \refKey{/tcb/capture} mode \refKey{/tcb/hbox} is specified, + the image is sized according to given |\includegraphics| options only. + The box adapts to the image. + \end{itemize} + +\begin{dispExample} +% \tcbuselibrary{raster} +\begin{tcbraster}[raster columns=3,raster force size=false,size=fbox, + colframe=red!50!black,colback=red!20!black, + fonttitle=\bfseries,center title,drop fuzzy shadow] + \tcbincludegraphics[title=Normal]{goldshade.png} + \tcbincludegraphics[title=Fixed height,height=3cm]{goldshade.png} + \tcbincludegraphics[title=hbox mode,hbox,graphics options={width=3cm}] + {goldshade.png} +\end{tcbraster} +\end{dispExample} + +\clearpage +The auxiliary macro \docAuxCommand{imagename} may be used inside +\refCom{tcbincludegraphics} to display the name of the file. +\docAuxCommand{imagename} is already detokenized and is allowed to +included special characters like the underscore. Note that an appropriate +font is required to display such characters. +%\docAuxCommand{imagepath}% + +\begin{dispExample} +% \tcbuselibrary{raster} +\begin{tcbraster}[size=fbox, + colframe=red!50!black,colback=red!20!black, + fonttitle=\bfseries\ttfamily,center title,drop fuzzy shadow] + \tcbincludegraphics[title=\imagename]{goldshade.png} + \tcbincludegraphics[finish={ + \node[fill=white,fill opacity=0.5,text opacity=1] + at (frame.center) {\bfseries\ttfamily\imagename};}]{blueshade.png} +\end{tcbraster} +\end{dispExample} +\end{docCommand} + +\clearpage +\begin{docCommand}[doc new=2014-11-14]{tcbincludepdf}{\oarg{options}\marg{file name}} +This is a generalized version of \refCom{tcbincludegraphics} which allows +to include a complete PDF file denoted by \meta{file name}. +Every page is boxed into an own \refEnv{tcolorbox} customized by the +given \meta{options}. It is reasonable to put such a series of boxes +inside a \refEnv{tcbraster} for alignment. + +Use \refKey{/tcb/graphics pages} to use a selection of pages instead of +using the whole file. + +The auxiliary macro \docAuxCommand{imagepage} may be used inside +\refCom{tcbincludepdf} to display the current page number. +\end{docCommand} + + +\begin{dispListing} +% \tcbuselibrary{raster} +\begin{tcbraster}[raster columns=3,colframe=blue,colback=white, + colbacktitle=blue!50!white,fonttitle=\small\bfseries\ttfamily, + left=0pt,right=0pt,top=0pt,bottom=0pt,boxsep=0pt,boxrule=0.6pt, + toptitle=1mm,bottomtitle=1mm,drop lifted shadow,center title, + graphics pages={1,...,6},title={\imagename\ [\imagepage]}] +\tcbincludepdf{tcolorbox-example.pdf} +\end{tcbraster} +\end{dispListing} +{\tcbusetemp} + + +\clearpage +\subsection{Option Keys} + +\begin{docTcbKey}[][doc new=2014-11-14]{graphics options}{=\meta{options}}{no default, initially empty} +Used for \refCom{tcbincludegraphics} and \refCom{tcbincludepdf} to +specify |\includegraphics| \meta{options}. + +\begin{dispExample} +% \tcbuselibrary{raster} +\begin{tcbraster}[raster columns=3,size=fbox,raster equal height, + colframe=red!50!black,colback=red!20!black,drop fuzzy shadow] + \tcbincludegraphics{goldshade.png} + \tcbincludegraphics[graphics options={angle=20}]{goldshade.png} + \tcbincludegraphics[graphics options={viewport=0cm 0cm 8cm 4cm,clip}] + {goldshade.png} +\end{tcbraster} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-14]{graphics directory}{=\meta{directory}}{no default, initially empty} +Used for \refCom{tcbincludegraphics} and \refCom{tcbincludepdf} to +specify a file system \meta{directory} where the image files are located. +\begin{dispListing} +\tcbset{ + graphics directory={.}, + graphics directory={examples}, + graphics directory={../../pictures}, +} +\end{dispListing} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{graphics pages}{=\meta{selection}}{no default, initially |1,...,|\cs{pdfpages}} +Used for \refCom{tcbincludepdf} to specify a \meta{selection} of pages to be included. +The largest page number is accessible by \docAuxCommand{pdfpages}. +The \meta{selection} has to be given using the |\foreach| syntax of \tikzname. +\begin{dispListing} +\tcbset{ + graphics pages={1,3,7}, + graphics pages={1,...,10}, + graphics pages={1,3,...,18}, + graphics pages={100,...,\pdfpages}, +} +\end{dispListing} +\end{docTcbKey} + + + 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 c5a5097e862..6cb0825b13e 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex @@ -85,13 +85,19 @@ The following keys are used inside |\tcbuselibrary| respectively \begin{docTcbKey}[library]{skins}{}{\mylib{skins}} Loads the package |tikz| \cite{tantau:2013a} and provides additional styles (skins) for the appearance of the colored boxes; see - Section \ref{sec:skins} from page \pageref{sec:skins}. + Section~\ref{sec:skins} from page~\pageref{sec:skins}. +\end{docTcbKey} + +\begin{docTcbKey}[library]{raster}{}{\mylib{raster}} + Provides additional macros and options for typesetting multiple + boxes arranged in a kind of raster; + see Section~\ref{sec:raster} from page~\pageref{sec:raster}. \end{docTcbKey} \begin{docTcbKey}[library]{listings}{}{\mylib{listings}} Loads the package |listings| \cite{heinz:2013a} and provides additional - macros for typesetting listings which are described in Section \ref{sec:listings} - from page \pageref{sec:listings}. + macros for typesetting listings which are described in Section~\ref{sec:listings} + from page~\pageref{sec:listings}. \end{docTcbKey} \begin{docTcbKey}[library]{listingsutf8}{}{\mylib{listingsutf8}} @@ -99,7 +105,7 @@ The following keys are used inside |\tcbuselibrary| respectively |listingsutf8| \cite{oberdiek:2011a} for UTF-8 support. This is a variant of the library \mylib{listings} and is described in Section \ref{sec:listings} - from page \pageref{sec:listings}. + from page~\pageref{sec:listings}. \end{docTcbKey} \begin{docTcbKey}[library]{minted}{}{\mylib{minted}} @@ -110,43 +116,43 @@ The following keys are used inside |\tcbuselibrary| respectively \begin{docTcbKey}[library]{theorems}{}{\mylib{theorems}} Provides additional - macros for typesetting theorems which are described in Section \ref{sec:theorems} - from page \pageref{sec:theorems}. + macros for typesetting theorems which are described in Section~\ref{sec:theorems} + from page~\pageref{sec:theorems}. \end{docTcbKey} \begin{docTcbKey}[library]{breakable}{}{\mylib{breakable}} Provides support for automatic box breaking from one page to another; - see Section \ref{sec:breakable} from page \pageref{sec:breakable}. + see Section~\ref{sec:breakable} from page~\pageref{sec:breakable}. \end{docTcbKey} \begin{docTcbKey}[library]{fitting}{}{\mylib{fitting}} Provides support for font size adaption of the box content to the box dimensions; - see Section \ref{sec:fitting} from page \pageref{sec:fitting}. + see Section~\ref{sec:fitting} from page~\pageref{sec:fitting}. \end{docTcbKey} \begin{docTcbKey}[library]{hooks}{}{\mylib{hooks}} Extends several option keys to 'hookable' keys; - see Section \ref{sec:hooks} from page \pageref{sec:hooks}. + see Section~\ref{sec:hooks} from page~\pageref{sec:hooks}. \end{docTcbKey} \begin{docTcbKey}[library]{xparse}{}{\mylib{xparse}} Provides document command production with |xparse| for |tcolorbox|; - see Section \ref{sec:xparse} from page \pageref{sec:xparse}. + see Section~\ref{sec:xparse} from page~\pageref{sec:xparse}. \end{docTcbKey} \begin{docTcbKey}[library]{documentation}{}{\mylib{documentation}} Provides additional macros for typesetting \LaTeX\ documentations - which are described in Section \ref{sec:documentation} - from page \pageref{sec:documentation}. + which are described in Section~\ref{sec:documentation} + from page~\pageref{sec:documentation}. \end{docTcbKey} \clearpage \begin{docTcbKey}[library]{many}{}{style, no value} - Loads the libraries \mylib{skins}, \mylib{breakable}, \mylib{hooks}, + Loads the libraries \mylib{skins}, \mylib{breakable}, \mylib{raster}, \mylib{hooks}, \mylib{theorems}, \mylib{fitting}, and \mylib{xparse}. Use this shortcut, if you want to use all features of |tcolorbox| with exception of typesetting listings and using @@ -173,29 +179,23 @@ The following keys are used inside |\tcbuselibrary| respectively \begin{tcolorbox}[beamer,adjusted title=Basic Features,colframe=blue!50!black,colback=blue!10!white] Base package \end{tcolorbox} - \tcbset{every box on layer 2/.style={reset,nobeforeafter,width=\linewidth/3-2mm, - equal height group=packageoverview,beamer,colframe=blue!50!black,colback=blue!10!white}} - \vspace{2mm} - \begin{tcolorbox}[adjusted title=Advanced Features] + \begin{tcbitemize}[raster columns=3,raster before skip=2mm,raster after skip=0pt, + raster equal height,beamer,colframe=blue!50!black,colback=blue!10!white] + \tcbitem[adjusted title=Advanced Features] \mylib{skins}\\ + \mylib{raster}\\ \mylib{breakable}\\ \mylib{theorems}\\ \mylib{fitting}\\ \mylib{hooks}\\ \mylib{xparse} - \end{tcolorbox} - \hfill - \begin{tcolorbox}[adjusted title=Listings] + \tcbitem[adjusted title=Advanced Listings] \mylib{listings}\\ \mylib{listingsutf8} \tcblower \mylib{minted} - \end{tcolorbox} - \hfill - \begin{tcolorbox}[adjusted title=Documentation] + \tcbitem[adjusted title=Documentation] \mylib{documentation} - \end{tcolorbox} + \end{tcbitemize} \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 3065f142df1..65a406d2712 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex @@ -566,6 +566,19 @@ This is a \textbf{tcolorbox}. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-11-17]{comment only}{}{no value} + Typesets the environment content with the comment text. +\begin{dispExample} +\begin{tcblisting}{comment only, + comment={This is a comment.}, + colback=red!5!white,colframe=red!75!black} +This is a \textbf{tcolorbox}. +\end{tcblisting} +\end{dispExample} +\end{docTcbKey} + + + \begin{docTcbKey}{image comment}{=\marg{options}\marg{filename}}{style, no default, initially unset} Uses an image denoted by \meta{filename} as \textit{comment} for the listing. The image is included by the standard |\includegraphics| macro with @@ -578,7 +591,68 @@ This is a \LaTeX\ example. \end{dispExample} \end{docTcbKey} + +\clearpage +\begin{docTcbKey}[][doc new=2014-11-14]{tcbimage comment}{=\meta{filename}}{style, no default, initially unset} + Uses an image denoted by \meta{filename} as \textit{comment} for the listing. + The image is included by the \refCom{tcbincludegraphics} macro. + The inclusion can be customized by \refKey{/tcb/comment style}. + \begin{marker} + The library \mylib{skins} is needed to apply this option. + \end{marker} + \medskip +\begin{dispExample} +% \tcbuselibrary{skins} +\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing side comment, + righthand width=3cm,lower separated=false, + tcbimage comment={example-image-a.pdf}, + comment style={size=fbox,colframe=blue,colback=blue!50,sharp corners, + drop fuzzy shadow}} +This is a \LaTeX\ example. +\end{tcblisting} +\end{dispExample} +\end{docTcbKey} + +%\enlargethispage*{1cm} + +\begin{docTcbKey}[][doc new=2014-11-14]{pdf comment}{\colOpt{=\meta{filename}}}{style, default listing file, initially unset} + Uses a PDF file denoted by \meta{filename} as \textit{comment} for the listing. + The image is included by \refCom{tcbincludepdf} inside a \refEnv{tcbraster}. + The inclusion can be customized by \refKey{/tcb/comment style}. + \begin{marker} + The libraries \mylib{skins} and \mylib{raster} are needed to apply this option. + \end{marker} + \medskip +\begin{dispExample} +% \tcbuselibrary{skins,raster} +\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing and comment, + righthand width=3cm,lower separated=false,middle=1mm, + pdf comment={tcolorbox-example.pdf}, + comment style={raster columns=3,graphics pages={1,2,3}, + colframe=blue,drop fuzzy shadow}} +This is a \LaTeX\ example. +\end{tcblisting} +\end{dispExample} +\end{docTcbKey} + \clearpage + + +\begin{docTcbKey}[][doc new=2014-11-14]{pdf extension}{=\meta{extension}}{no default, initially |pdf|} + Sets the PDF file name extension for \refKey{/tcb/pdf comment} to \meta{extension}. + Note that \meta{extension} always overwrites any actual extension given + inside \refKey{/tcb/pdf comment}. +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-14]{comment style}{=\meta{options}}{no default, initially empty} + Sets the \meta{options} for \refKey{/tcb/tcbimage comment} and \refKey{/tcb/pdf comment}. + These are |tcolorbox| options to customize the colored box drawn around the + image(s), also image options encapsulated by \refKey{/tcb/graphics options}, + and \refEnv{tcbraster} options for \refKey{/tcb/pdf comment}. +\end{docTcbKey} + + \begin{docTcbKey}{listing and comment}{}{no value} Typesets the environment content as listing in the upper part and a given comment in the lower part. @@ -731,6 +805,14 @@ This is a \LaTeX\ example. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-11-07]{listing above* text}{}{no value} + Widely equal to \refKey{/tcb/listing above text}, but the outside text is + not formatted with the lower part options. + Also, it is not put into a minipage and it may span several pages. + The distance between box and text is controlled by \refKey{/tcb/after}. +\end{docTcbKey} + + \begin{docTcbKey}{text above listing}{}{no value} Typesets the environment content as listing in a |tcolorbox| and as compiled text outside and above the box. @@ -745,6 +827,14 @@ This is a \LaTeX\ example. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-11-07]{text above* listing}{}{no value} + Widely equal to \refKey{/tcb/text above listing}, but the outside text is + not formatted with the lower part options. + Also, it is not put into a minipage and it may span several pages. + The distance between box and text is controlled by \refKey{/tcb/before}. +\end{docTcbKey} + + \clearpage \begin{docTcbKey}{listing above comment}{}{no value} Typesets the environment content as listing in a |tcolorbox| @@ -761,6 +851,14 @@ This is a \LaTeX\ example. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-11-07]{listing above* comment}{}{no value} + Widely equal to \refKey{/tcb/listing above comment}, but the outside comment is + not formatted with the lower part options. + Also, it is not put into a minipage and it may span several pages. + The distance between box and comment is controlled by \refKey{/tcb/after}. +\end{docTcbKey} + + \begin{docTcbKey}{comment above listing}{}{no value} Typesets the environment content as listing in a |tcolorbox| and a given comment outside and above the box. @@ -776,6 +874,211 @@ This is a \LaTeX\ example. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-11-07]{comment above* listing}{}{no value} + Widely equal to \refKey{/tcb/comment above listing}, but the outside comment is + not formatted with the lower part options. + Also, it is not put into a minipage and it may span several pages. + The distance between box and comment is controlled by \refKey{/tcb/before}. +\end{docTcbKey} + + +\clearpage +\subsection{Option Keys for Processing and Full Document Examples}\label{sec:proclistingkeys} +A complete \LaTeX\ document including |\documentclass|, |\begin{document}| +and |\end{document}| cannot be processed directly by |tcolorbox|. +It always has to be compiled separately. There are two methods supported +by the package to process and display such a full document example: +\begin{itemize} +\item Prepare and compile the example document independent from your main + document. The source file and the resulting PDF file can be included + into the main document afterwards. This is the most economic way since + the example document can be left untouched after the example is complete. +\item The other possibility is to compile the example on the fly while + the main document is compiled. This way has some charm, because the + example can be edited inside the main document. But be aware that the + compilation of the example is issued on every run of the main document. + Also, there are fewer degrees of freedom how the example is compiled. +\end{itemize} + +For both methods, the resulting example PDF file can be included +as a \refKey{/tcb/pdf comment}. + +The following example shows how to apply the first method. +There already is a file |tcolorbox-example.tex| and a PDF file +|tcolorbox-example.pdf|. Both of them are input partly by the following: + +\begin{dispListing} +% \tcbuselibrary{breakable,skins,raster} +\tcbinputlisting{ + enhanced jigsaw,breakable,pad at break*=2mm,height fixed for=first and middle, + lower separated=false, + leftlower=0pt,rightlower=0pt,middle=0pt, + colframe=red!50!black,colback=yellow!10!white, + listing and comment, + listing file={tcolorbox-example}, + listing options= + {style=tcblatex,texcsstyle=*\color{red!70!black},firstline=20,lastline=85}, + after upper={\par\bigskip\texttt{\ldots}\par}, + pdf comment, + comment style={drop lifted shadow,graphics pages={1,...,4}}, +} +\end{dispListing} +{\tcbusetemp} + + +\clearpage + + +\begin{docTcbKey}[][doc new=2014-11-14]{no process}{}{no default} + Removes all processing commands if set before. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{process code}{=\meta{code}}{no default, initially empty} + Adds \meta{code} which is executed during \refCom{tcbinputlisting} + and \refEnv{tcblisting}. At the time of executing the given \meta{code}, + the listing is already written to \refKey{/tcb/listing file}, but + the colored box is not constructed yet. + Its intended use is to process the listing somehow before displaying. + The processing result can be used inside a \refKey{/tcb/comment}. + Several \refKey{/tcb/process code} options can be given which are + processed in the given order. +\end{docTcbKey} + +\begin{marker} +To use the further options, the compiler has to be called with the +|-shell-escape| permission to authorize potentially dangerous system calls. +Be warned that this is a security risk. Anyway, it's more economic to +compile examples independent from the main document and to include them as +shown in the previous pages. +\end{marker} + +\begin{docTcbKey}[][doc new=2014-11-14]{run system command}{=\meta{system command}}{style, no default, initially unset} +Runs a \meta{system command}, if the document is compiled with the +|-shell-escape| permission. +The current listing file can be accessed as |\filename@area\filename@base\filename@ext|. +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-14]{compilable listing}{}{style, no default} + Sets \refKey{/tcb/listing file} to |\jobname|\texttt{-listing-}\meta{counter}. + \begin{marker} + The default \refKey{/tcb/listing file} setting cannot be used to compile + a listing, since the base name equals the |\jobname| and the included PDF + files should be unique. + Therefore, to use \refKey{/tcb/run pdflatex} etc., the \refKey{/tcb/listing file} + has to be set to a unique value. + One may use \refKey{/tcb/compilable listing} for this purpose. + \end{marker} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-14]{run pdflatex}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |pdflatex| compilation of the listing with the given \meta{arguments}. +\begin{itemize} +\item The main document has to be compiled with the |-shell-escape| permission. +\item The \refKey{/tcb/listing file} has to be unique for the listing. +\item If the listing has to be compiled twice, add |run pdflatex| two times to + the option list. +\end{itemize} + +\begin{dispListing*}{breakable,enhanced,pad at break*=2mm,before upper=,after skip=3mm} +\begin{tcblisting}{enhanced jigsaw,lower separated=false, + leftlower=0pt,rightlower=0pt, + colframe=red!50!black,colback=yellow!10!white, + listing options={style=tcblatex,texcsstyle=*\color{red!70!black}}, + listing and comment, + pdf comment, + compilable listing, + run pdflatex +} +\documentclass{beamer} +\usetheme{Warsaw} +\begin{document} +\begin{frame}{Beamer example} + \begin{block}{Hello World} + \begin{itemize}[<+->] + \item One + \item Two + \end{itemize} + \end{block} + + \begin{alertblock}{Integral} + \begin{equation} + \visible<3->{\int\limits_1^x \frac{1}{t}~dt} + \visible<4->{ = \ln(x).} + \end{equation} + \end{alertblock} +\end{frame} +\end{document} +\end{tcblisting} +\end{dispListing*} +{\tcbusetemp} +\end{docTcbKey} + + +\clearpage +\begin{docTcbKey}[][doc new=2014-11-14]{run xelatex}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |xelatex| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{run lualatex}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |lualatex| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{run makeindex}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |makeindex| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{run bibtex}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |bibtex| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{run biber}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |biber| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{run arara}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues an |arara| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{run latex}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |latex| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{run dvips}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |dvips| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-14]{run ps2pdf}{\colOpt{=\meta{arguments}}}{style, no default, initially unset} +Issues a |ps2pdf| compilation of the listing with the given \meta{arguments}. +\end{docTcbKey} + +\begin{dispListing*}{breakable,enhanced,pad at break*=2mm,before upper=,after skip=3mm} +\begin{tcblisting}{enhanced jigsaw, + title={PSTricks with pdflatex},fonttitle=\bfseries, + colframe=red!50!black,colback=yellow!10!white, + listing options={style=tcblatex,texcsstyle=*\color{red!70!black}}, + lower separated=false,middle=0pt, + listing side comment,righthand width=4.5cm, + compilable listing, + run latex,run dvips,run ps2pdf, + pdf comment, + comment style={raster columns=1,graphics options={viewport=0in 8in 4in 11.5in,clip}}, +} +\documentclass{article} +\usepackage{pstricks,multido} +\begin{document} +\psset{unit=3}% +\multido{\nHue=0.01+0.01}{100}{% +\definecolor{MyColor}{hsb}{\nHue,1,1}% +\pscircle[linewidth=0.01,linecolor=MyColor]{\nHue}} +\end{document} +\end{tcblisting} +\end{dispListing*} +{\tcbusetemp} + + + \clearpage \subsection{Creation of \LaTeX\ Tutorials}\label{sec:latextutorial} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.picturecredits.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.picturecredits.tex index 5b7d1513bd7..2a9ea227aba 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.picturecredits.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.picturecredits.tex @@ -4,19 +4,14 @@ \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 - \DeclareTotalTColorBox{\diabox}{ O{} v m } - { bicolor,before=,after=\parorfill,equal height group=diabox,width=7.9cm, - fonttitle=\bfseries\ttfamily,adjusted title={#2},center title, + { bicolor,fonttitle=\bfseries\ttfamily,adjusted title={#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} - -\diabox[before=]{Basilica_5.png}{ +\begin{tcbraster}[raster equal height] +\diabox{Basilica_5.png}{ \url{http://commons.wikimedia.org/wiki/File:Basilica_5.png}} \diabox{lichtspiel.jpg}{ Photograph taken by Thomas F.~Sturm.} @@ -32,5 +27,5 @@ The following pictures were used inside this documentation. \diabox{goldshade.png}{% Created with |GIMP|.\\ \url{http://www.gimp.org}} - +\end{tcbraster} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.quickref.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.quickref.tex new file mode 100644 index 00000000000..53625465073 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.quickref.tex @@ -0,0 +1,91 @@ +% !TeX root = tcolorbox.tex +% include file of tcolorbox.tex (manual of the LaTeX package tcolorbox) +\clearpage +\section{Quick Reference}\label{sec:quickref} + +\makeatletter +\begin{tcolorbox}[enhanced,title={tcolorbox}, + left skip=1cm,right skip=1cm,before skip=1cm,after skip=1cm, + colframe=red!50!black!30!white,colback=red!10!white!40!white, + colbacktitle=red!30!white,colupper=black!20!white, + code={\appto\kvtcb@shadow{% + \path[fill=yellow!20!white,draw=yellow!50!black,dashed,line width=0.4pt] + ([xshift=-1cm,yshift=-1cm]frame.south west) rectangle + ([xshift=1cm,yshift=1cm]frame.north east); + }}, + finish={ + \draw[thick,<->] ([yshift=-1.3cm]frame.north west)-- node[below]{\refKey{/tcb/width}} + ([yshift=-1.3cm]frame.north east); + \draw[thick,<->] ([xshift=-15mm]frame.north east)-- node[left,pos=0.35]{\refKey{/tcb/height}} + ([xshift=-15mm]frame.south east); + \draw[thick,<->] (frame.north)-- node[right]{\refKey{/tcb/before}, \refKey{/tcb/before skip}} +(0,1); + \draw[thick,<->] (frame.south)-- node[right]{\refKey{/tcb/after}, \refKey{/tcb/after skip}} +(0,-1); + \draw[thick,<->] (frame.west)-- node[below right,align=center]{\refKey{/tcb/left skip}\\\refKey{/tcb/grow to left by}}+(-1,0); + \draw[thick,<->] (frame.east)-- node[below left,align=center]{\refKey{/tcb/right skip}\\\refKey{/tcb/grow to right by}}+(1,0); + } + ] + \lipsum[1] +\end{tcolorbox} +\makeatother + +\bigskip +\bigskip + +\begin{tcolorbox}[enhanced,title={tcolorbox},before skip=5mm,after skip=5mm, + colframe=red!50!black!30!white,colback=red!10!white!40!white, + colbacktitle=red!30!white,coltext=black!20!white, + finish={ + \coordinate (A) at ([yshift=-0.25mm]frame.north); + \draw[thick,<-] (A) -- +(-1,0.3) node[left]{\refKey{/tcb/toprule}}; + \coordinate (A) at ([yshift=-0.75mm]A); + \draw[thick,<-] (A) -- +(1,0) node[right]{\refKey{/tcb/boxsep}}; + \draw[thick,<-] (A) -- +(-1,0) node[left]{\refKey{/tcb/toptitle}}; + % + \coordinate (A) at ([yshift=1.00mm]interior.north); + \draw[thick,<-] (A) -- +(1,0) node[right]{\refKey{/tcb/boxsep}}; + \draw[thick,<-] (A) -- +(-1,0) node[left]{\refKey{/tcb/bottomtitle}}; + \coordinate (A) at ([yshift=0.25mm]interior.north); + \draw[thick,<-] (A) -- +(-1,-0.4) node[left]{\refKey{/tcb/titlerule}}; + \coordinate (A) at ([yshift=-0.25mm]interior.north); + \draw[thick,<-] (A) -- +(1,-0.2) node[right]{\refKey{/tcb/boxsep}}; + \coordinate (A) at ([yshift=-1.5mm]A); + \draw[thick,<-] (A) -- +(-1,-0.6) node[left]{\refKey{/tcb/top}}; + % + \coordinate (A) at ([yshift=2.0mm]segmentation); + \draw[thick,<-] (A) -- +(-1,0) node[left]{\refKey{/tcb/middle}}; + \coordinate (A) at ([yshift=0.5mm]segmentation); + \draw[thick,<-] (A) -- +(1,0.2) node[right]{\refKey{/tcb/boxsep}}; + \coordinate (A) at ([yshift=-0.5mm]segmentation); + \draw[thick,<-] (A) -- +(1,-0.2) node[right]{\refKey{/tcb/boxsep}}; + \coordinate (A) at ([yshift=-2.0mm]segmentation); + \draw[thick,<-] (A) -- +(-1,0) node[left]{\refKey{/tcb/middle}}; + % + \coordinate (A) at ([yshift=0.25mm]frame.south); + \draw[thick,<-] (A) -- +(-1,-0.3) node[left]{\refKey{/tcb/bottomrule}}; + \coordinate (A) at ([yshift=0.75mm]A); + \draw[thick,<-] (A) -- +(1,0) node[right]{\refKey{/tcb/boxsep}}; + \coordinate (A) at ([yshift=2.5mm]A); + \draw[thick,<-] (A) -- +(-1,0) node[left]{\refKey{/tcb/bottom}}; + % + \coordinate (A) at ([xshift=0.25mm]frame.west); + \draw[thick,<-] (A) -- +(-0.3,-1) node[below]{\refKey{/tcb/leftrule}}; + \coordinate (A) at ([xshift=0.75mm]A); + \draw[thick,<-] (A) -- +(0,1) node[above]{\refKey{/tcb/boxsep}}; + \coordinate (A) at ([xshift=2.5mm]A); + \draw[thick,<-] (A) -- +(0.7,0.5) node[above right]{\refKey{/tcb/left}}; + % + \coordinate (A) at ([xshift=-0.25mm]frame.east); + \draw[thick,<-] (A) -- +(0.3,-1) node[below]{\refKey{/tcb/rightrule}}; + \coordinate (A) at ([xshift=-0.75mm]A); + \draw[thick,<-] (A) -- +(0,1) node[above]{\refKey{/tcb/boxsep}}; + \coordinate (A) at ([xshift=-2.5mm]A); + \draw[thick,<-] (A) -- +(-0.7,0.5) node[above left]{\refKey{/tcb/right}}; + } + ] + \lipsum[1] + \tcblower + \lipsum[2] +\end{tcolorbox} + + + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex new file mode 100644 index 00000000000..a28f326e658 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex @@ -0,0 +1,555 @@ +% !TeX root = tcolorbox.tex +% include file of tcolorbox.tex (manual of the LaTeX package tcolorbox) +\clearpage +\section{Library \mylib{raster}}\label{sec:raster} +The library is loaded by a package option or inside the preamble by: +\begin{dispListing} +\tcbuselibrary{raster} +\end{dispListing} +%This also loads the package |xparse| \cite{latexproject:2013a}. + +%The purpose of this library is to give comfortable access to the +%powerful document command production with |xparse| for |tcolorbox|. +%See the |xparse| package documentation \cite{latexproject:2013a} +%for details about the argument \meta{specification} used in this section. + +\subsection{Concept of Rasters}\label{subsec:raster_overview} + +A \emph{raster} is used to align several colored boxes in a regular way. +It can be seen as a far related counterpart to the |matrix| construct +of \tikzname, but it differs in many aspects. + +In principle, |tcolorbox|es are arranged in rows and columns when put +inside a \refEnv{tcbraster} environment. The boxes are fluently added to the +raster like adding text to a paragraph. +Especially, line/row breaks are done +automatically and one cannot end a line/row ahead of schedule. +Further, a \emph{raster} is not restricted to a single page but may +break into an arbitrary series of pages. + +\bigskip +\begin{tcolorbox}[enhanced,size=tight,boxrule=0pt,frame hidden, + top=5mm,bottom=5mm,colback=yellow!20!white, + borderline={0.4pt}{0pt}{dashed,yellow!50!black}, + finish={ + \draw[thick,<->] ([yshift=-1.3cm]frame.north west)-- node[below]{\refKey{/tcb/raster width}} + ([yshift=-1.3cm]frame.north east); + \draw[thick,<->] ([xshift=5mm,yshift=-5mm]frame.north east)-- node[left,pos=.75]{\refKey{/tcb/raster height}} + ([xshift=5mm,yshift=5mm]frame.south east); + }] + \begin{tcbitemize}[enhanced,fontupper=\tiny, + title={Box \#\thetcbrasternum}, + colframe=red!50!black!30!white,colback=red!10!white!40!white, + colupper=black!20!white, + raster equal height=rows, + raster left skip=5mm,raster right skip=5mm, + raster before skip=5mm,raster after skip=5mm, + raster row skip=3mm,raster column skip=3mm, + ] + \tcbitem[finish={% + \draw[thick,<->] (frame.west)-- node[below right]{\refKey{/tcb/raster left skip}}+(-0.5,0); + \draw[thick,<->] (frame.north)-- node[right]{\refKey{/tcb/raster before skip}} +(0,0.5); + \draw[thick,<->] (frame.south)-- node[above]{\refKey{/tcb/raster row skip}} +(0,-0.3); + }] \lipsum[1] + \tcbitem[finish={ + \draw[thick,<->] (frame.east)-- node[below left]{\refKey{/tcb/raster right skip}}+(0.5,0); + \draw[thick,<->] ([yshift=5mm]frame.south west)-- node[above]{\refKey{/tcb/raster column skip}}+(-0.3,0); + }] \lipsum[2] + \tcbitem[finish={% + \draw[thick,<->] (frame.south)-- node[right]{\refKey{/tcb/raster after skip}} +(0,-0.5); + }] \lipsum[3] + \tcbitem \lipsum[4] + \end{tcbitemize} +\end{tcolorbox} + +\clearpage +\begin{tcboutputlisting} +\begin{tcbraster}[raster columns=3,raster rows=3,raster height=\linewidth, + enhanced,size=small,sharp corners,arc=8mm,colframe=red!50!black, + colback=yellow!10!white,watermark overzoom=1.0,fit algorithm=hybrid* ] + \begin{tcolorbox}[rounded corners=northwest,boxrule=0pt, + watermark graphics=lichtspiel.jpg]\end{tcolorbox} + \tcboxfit{\lipsum[1]} + \begin{tcolorbox}[rounded corners=northeast,boxrule=0pt, + watermark graphics=goldshade.png]\end{tcolorbox} + \tcboxfit{\lipsum[2]} + \begin{tcolorbox}[valign=center,center upper]Nine Boxes.\end{tcolorbox} + \tcboxfit{\lipsum[3]} + \begin{tcolorbox}[rounded corners=southwest,boxrule=0pt, + watermark graphics=goldshade.png]\end{tcolorbox} + \tcboxfit{\lipsum[4]} + \begin{tcolorbox}[rounded corners=southeast,boxrule=0pt, + watermark graphics=lichtspiel.jpg]\end{tcolorbox} +\end{tcbraster} +\end{tcboutputlisting} + +\tcbinputlisting{base example,listing only,listing style=mydocumentation} + +\bigskip +{\tcbuselistingtext} + +\clearpage +\subsection{Macros of the Library}\label{subsec:raster_macros} + +\begin{docEnvironment}[doc new=2014-11-10]{tcbraster}{\oarg{options}} +A raster arranges enclosed boxes in a regular way, mainly into rows and +columns. The \meta{options} are used to control the raster +parameters and to set the properties for the enclosed boxes. +\begin{itemize} +\item The \emph{raster} is only allowed to contain a series of + \refEnv{tcolorbox} environments or derived constructs. + With some small restrictions, boxes created with \refCom{tcboxfit} can also be added. + Boxes created with \refCom{tcbox} are not reasonable here, but may be + used to a certain degree. +\item Do not add anything else between the boxes inside the raster with + exception of white\-space. Especially, do not use |\\| or |\par| to end + a row; row breaks are done automatically. +\item The boxes inside a raster are numbered automatically. + \docAuxCommand{thetcbrasternum} may be used inside a box to access + this number. +\end{itemize} + +\begin{dispExample} +\begin{tcbraster}[raster columns=3, raster equal height, + size=small,colframe=red!50!black,colback=red!10!white,colbacktitle=red!50!white, + title={Box \# \thetcbrasternum}] + \begin{tcolorbox}First box\end{tcolorbox} + \begin{tcolorbox}Second box\end{tcolorbox} + \begin{tcolorbox}This is a box\\with a second line\end{tcolorbox} + \begin{tcolorbox}Another box\end{tcolorbox} + \begin{tcolorbox}A box again\end{tcolorbox} +\end{tcbraster} +\end{dispExample} + +\begin{dispExample} +\begin{tcbraster}[raster columns=2, raster equal height=rows, + size=small,colframe=red!50!black,colback=red!10!white,colbacktitle=red!50!white, + title={Box \# \thetcbrasternum}] + \begin{tcolorbox}First box\end{tcolorbox} + \begin{tcolorbox}Second box\end{tcolorbox} + \begin{tcolorbox}This is a box\\with a second line\end{tcolorbox} + \begin{tcolorbox}Another box\end{tcolorbox} + \begin{tcolorbox}A box again\end{tcolorbox} +\end{tcbraster} +\end{dispExample} +\end{docEnvironment} + + +\clearpage + +\begin{docEnvironment}[doc new=2014-11-10]{tcbitemize}{\oarg{options}} +This is a special case of a \refEnv{tcbraster} with the given \meta{options}. +\begin{itemize} +\item Here, the enclosed boxes are created using \refCom{tcbitem}. +\item There has to be at least one \refCom{tcbitem}. +\item One cannot use anything else than \refCom{tcbitem} to add something + to the \emph{raster}. +\end{itemize} +This leads to a very compact syntax. + +\begin{dispExample} +\begin{tcbitemize}[raster columns=2, raster equal height=rows, + size=small,colframe=red!50!black,colback=red!10!white,colbacktitle=red!50!white, + title={Box \# \thetcbrasternum}] + \tcbitem First box + \tcbitem Second box + \tcbitem This is a box\\with a second line + \tcbitem[colback=yellow,colbacktitle=yellow!50!black] Another box + \tcbitem A box again +\end{tcbitemize} +\end{dispExample} + +\bigskip + +\begin{marker} +\refEnv{tcbitemize} has more restrictions than \refEnv{tcbraster}. +Especially, the \refKey{/tcb/capture} mode has to be \docValue{minipage}. +For example, \refKey{/tcb/fit} cannot be used safely. +If \refKey{/tcb/fit} should be used, turn over to \refEnv{tcbraster}. +\end{marker} +\end{docEnvironment} + + +\begin{docCommand}[doc new=2014-11-10]{tcbitem}{\oarg{options}} + Used inside \refEnv{tcbitemize} to create a new \refEnv{tcolorbox} + with the given \meta{options}. +\end{docCommand} + + +\clearpage +\subsection{Option Keys of the Library}\label{subsec:raster_options} + +\begin{docTcbKey}[][doc new=2014-11-10]{raster columns}{=\meta{number}}{no default, initially |2|} + Sets the \meta{number} of columns for a \emph{raster}. +\begin{dispExample} +\begin{tcbitemize}[raster columns=3, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\begin{tcbitemize}[raster columns=4, + size=small,colframe=blue!50!black,colback=blue!10!white] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-10]{raster rows}{=\meta{number}}{no default, initially |2|} + Sets the \meta{number} of rows for a \emph{raster}. + Note that this is only relevant in connection with setting \refKey{/tcb/raster height} + to a value greater than |0pt|. Then, it defines the number of rows \emph{per} given + height. +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-10]{raster width}{=\meta{length}}{no default, initially \cs{linewidth}} + Sets the total raster width to the given \meta{length}. + \refKey{/tcb/raster left skip} and \refKey{/tcb/raster right skip} are part + of the total width. +\begin{dispExample} +\begin{tcbitemize}[raster width=\linewidth/2, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + +\clearpage +\begin{docTcbKey}[][doc new=2014-11-10]{raster height}{=\meta{length}}{no default, initially |0pt|} + Sets the raster height \emph{per} \refKey{/tcb/raster rows} to the given \meta{length}. + This forces an appropriate height for the enclosed boxes. + \refKey{/tcb/raster before skip} and \refKey{/tcb/raster after skip} + are not part of this calculation. + If the \meta{length} is set to |0pt|, this feature is deactivated. +\begin{dispExample} +\begin{tcbitemize}[raster height=4cm, raster rows=2, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem[enhanced, + finish={\draw[blue,very thick,<->] (frame.south) + -- node[right,pos=.75]{4cm} +(0,4); }] + Three + \tcbitem Four + \tcbitem Five +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-10]{raster before skip}{=\meta{length}}{no default, initially |2mm|} + Space of the given \meta{length} is inserted vertically before the \emph{raster}. + This space is discardable. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-10]{raster after skip}{=\meta{length}}{no default, initially |2mm|} + Space of the given \meta{length} is inserted vertically after the \emph{raster}. + This space is discardable. +\end{docTcbKey} + + +\clearpage + +\begin{docTcbKey}[][doc new=2014-11-10]{raster left skip}{=\meta{length}}{no default, initially |0pt|} + Space of the given \meta{length} is inserted horizontally left of the \emph{raster}. +\begin{dispExample} +\begin{tcbitemize}[raster left skip=2cm, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-10]{raster right skip}{=\meta{length}}{no default, initially |0pt|} + Space of the given \meta{length} is inserted horizontally right of the \emph{raster}. +\begin{dispExample} +\begin{tcbitemize}[raster right skip=2cm, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + +\enlargethispage*{1cm} + +\begin{docTcbKey}[][doc new=2014-11-10]{raster column skip}{=\meta{length}}{no default, initially |2mm|} + Space of the given \meta{length} is inserted horizontally between the columns. +\begin{dispExample} +\begin{tcbitemize}[raster column skip=2cm, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-11-10]{raster row skip}{=\meta{length}}{no default, initially |2mm|} + Space of the given \meta{length} is inserted vertically between the rows. +\begin{dispExample} +\begin{tcbitemize}[raster row skip=0pt, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + +\clearpage + +\begin{docTcbKey}[][doc new=2014-11-10]{raster halign}{=\meta{alignment}}{no default, initially \docValue{left}} + Defines the horizontal alignment for the boxes of the rows of a \emph{raster}, + if these rows are not completely filled (mainly: the last one). + + Feasible values for \meta{alignment} are: + \begin{itemize} + \item\docValue{left}: align to the left side, + \item\docValue{center}: align to the center, + \item\docValue{right}: align to the right side. + \end{itemize} + +\begin{dispExample} +\begin{tcbitemize}[raster halign=center, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem Three +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-10]{raster valign}{=\meta{alignment}}{no default, initially \docValue{center}} + Defines the vertical alignment for the boxes of a row, + if the boxes do not have equal height. This sets the + \refKey{/tcb/box align} option. + + Feasible values for \meta{alignment} are: + \begin{itemize} + \item\docValue{top}: align to the top side, + \item\docValue{center}: align to the center, + \item\docValue{bottom}: align to the bottom side. + \end{itemize} + +\begin{dispExample} +\begin{tcbitemize}[raster valign=top, raster columns=3, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem \Huge One + \tcbitem \Large Two + \tcbitem Three +\end{tcbitemize} +\begin{tcbitemize}[raster valign=center, raster columns=3, + size=small,colframe=blue!50!black,colback=blue!10!white] + \tcbitem \Huge One + \tcbitem \Large Two + \tcbitem Three +\end{tcbitemize} +\begin{tcbitemize}[raster valign=bottom, raster columns=3, + size=small,colframe=green!50!black,colback=green!10!white] + \tcbitem \Huge One + \tcbitem \Large Two + \tcbitem Three +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + +\clearpage +\begin{docTcbKey}[][doc new=2014-11-10]{raster equal height}{=\meta{type}}{default \docValue{all}, initially \docValue{none}} + Puts the enclosed boxes into a common \refKey{/tcb/equal height group}. + The \meta{id} of the equal height group is chosen automatically, but + it may be set manually by \refKey{/tcb/raster equal height group}. + + Feasible values for \meta{type} are: + \begin{itemize} + \item\docValue{none}: no equal height setting, + \item\docValue{rows}: all boxes in a row are set to equal height, + \item\docValue{all}: all boxes in the raster are set to equal height. + \end{itemize} + Note that you have to compile twice to see changes. + +\begin{dispExample} +\begin{tcbitemize}[raster equal height=rows, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem \Huge Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\begin{dispExample} +\begin{tcbitemize}[raster equal height, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem \Huge Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2014-11-10]{raster equal height group}{=\meta{id}}{no default} + Overwrites the automatically chosen id with the given \meta{id}. + If this is used to share a common height between the \emph{raster} and + another raster or box, the \refKey{/tcb/raster equal height} option + should be set to \docValue{all}. +\begin{dispExample} +\tcbset{size=small,colframe=red!50!black,colback=red!10!white} +\begin{tcolorbox}[equal height group=raster-manual-id] + A single box +\end{tcolorbox} +\begin{tcbitemize}[raster equal height,raster equal height group=raster-manual-id] + \tcbitem One + \tcbitem \Huge Two +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + +\clearpage + +\begin{docTcbKey}[][doc new=2014-11-10]{raster force size}{\colOpt{=true\textbar false}}{default |true|, initially |true|} + Enforces the raster size computations onto the enclosed boxes. + If set to \docValue{false}, individual settings can be used (for the better or worse). +\begin{dispExample} +\begin{tcbitemize}[raster force size=false, raster halign=center, + size=small,colframe=red!50!black,colback=red!10!white] + \tcbitem One + \tcbitem Two + \tcbitem[add to width=-3cm] Three + \tcbitem[add to width=-3cm] Four + \tcbitem[add to width=-3cm] Five + \tcbitem[add to width=3cm] Six +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + + +\begin{docTcbKey}[][doc new=2014-11-10]{raster reset}{}{no value} + Sets all raster settings back to their default values. + Note that \refKey{/tcb/reset} does not execute this option. + Style settings like \refKey{/tcb/raster odd column} etc. are not + touched by \refKey{/tcb/raster reset}. +\end{docTcbKey} + + + +\subsection{Adding Styles for Specific Boxes}\label{subsec:raster_styles} + +The following styles can be defined to address certain boxes inside +a \emph{raster}. Note that such style definitions are not removed by +\refKey{/tcb/reset} or \refKey{/tcb/raster reset}. +The style definitions are used in the order given below. + +\begin{docTcbKey}{raster odd column}{}{style} +This style is used for every box in an odd column. +\begin{dispExample} +\begin{tcbitemize}[size=small,colframe=red!50!black,colback=red!10!white, + raster odd column/.style={colframe=blue!50!black,colback=blue!10!white}] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{raster even column}{}{style} +This style is used for every box in an even column. +\end{docTcbKey} + + +\begin{docTcbKey}{raster column n}{}{style} +This style is used for every box in the |n|-th column. +|n| has to be replaced by a number. +\end{docTcbKey} + + +\begin{docTcbKey}{raster odd row}{}{style} +This style is used for every box in an odd row. +\end{docTcbKey} + +\begin{docTcbKey}{raster even row}{}{style} +This style is used for every box in an even row. +\end{docTcbKey} + + +\begin{docTcbKey}{raster row m}{}{style} +This style is used for every box in the |m|-th row. +|m| has to be replaced by a number. +\begin{dispExample} +\begin{tcbitemize}[size=small,colframe=red!50!black,colback=red!10!white, + raster row 2/.style={colframe=blue!50!black,colback=blue!10!white}] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{raster odd number}{}{style} +This style is used for every box with an odd number. +\end{docTcbKey} + +\begin{docTcbKey}{raster even number}{}{style} +This style is used for every box with an even number. +\begin{dispExample} +\begin{tcbitemize}[size=small,colframe=red!50!black,colback=red!10!white, + raster columns=3, + raster even number/.style={colframe=blue!50!black,colback=blue!10!white}] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four + \tcbitem Five + \tcbitem Six +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}{raster row m column n}{}{style} +This style is used for the box in the +|m|-th row and |n|-th column. +|m| and |n| have to be replaced by numbers. +\end{docTcbKey} + + +\begin{docTcbKey}{raster number n}{}{style} +This style is used for the box with number |n|. +|n| has to be replaced by a number. +\begin{dispExample} +\begin{tcbitemize}[size=small,colframe=red!50!black,colback=red!10!white, + raster number 4/.style={colframe=blue!50!black,colback=blue!10!white}] + \tcbitem One + \tcbitem Two + \tcbitem Three + \tcbitem Four +\end{tcbitemize} +\end{dispExample} +\end{docTcbKey} + + + 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 6e3544cbfa1..e088dd6e3ed 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -2564,27 +2564,26 @@ This box looks like a box provided by the \texttt{beamer} class. \end{docTcbKey} \begin{dispExample} -\tcbset{standard,equal height group=standard, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - colbacktitle=LimeGreen!75!DarkGreen,width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[standard,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -2611,28 +2610,27 @@ This box looks like a box provided by the \texttt{beamer} class. \end{docTcbKey} \begin{dispExample} -\tcbset{standard jigsaw,equal height group=standardjigsaw, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - colbacktitle=LimeGreen!75!DarkGreen,width=(\linewidth-6mm)/4,nobeforeafter, - opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[standard jigsaw,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -2673,27 +2671,26 @@ have some 'enhanced' features, the |enhanced| skin is what you are looking for. \end{docTcbKey} \begin{dispExample} -\tcbset{enhanced,equal height group=enhanced, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[enhanced,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} \begin{dispExample} @@ -2799,27 +2796,26 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{skin=enhancedfirst,equal height group=enhancedfirst, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=enhancedfirst,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -2844,27 +2840,26 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{skin=enhancedmiddle,equal height group=enhancedmiddle, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=enhancedmiddle,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -2889,27 +2884,26 @@ Nevertheless, this skin can be applied independently. \end{docSkin} \begin{dispExample} -\tcbset{skin=enhancedlast,equal height group=enhancedlast, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=enhancedlast,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -2935,28 +2929,27 @@ Nevertheless, this skin can be applied independently. \end{docTcbKey} \begin{dispExample} -\tcbset{enhanced jigsaw,equal height group=enhancedjigsaw, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - colbacktitle=LimeGreen!75!DarkGreen,width=(\linewidth-6mm)/4,nobeforeafter, - opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[enhanced jigsaw,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -2979,28 +2972,27 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{skin=enhancedfirst jigsaw,equal height group=enhancedfirstjigsaw, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - colbacktitle=LimeGreen!75!DarkGreen,width=(\linewidth-6mm)/4,nobeforeafter, - opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=enhancedfirst jigsaw,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3023,28 +3015,27 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{skin=enhancedmiddle jigsaw,equal height group=enhancedmiddlejigsaw, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - colbacktitle=LimeGreen!75!DarkGreen,width=(\linewidth-6mm)/4,nobeforeafter, - opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=enhancedmiddle jigsaw,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3122,28 +3113,27 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{skin=enhancedlast jigsaw,equal height group=enhancedlastjigsaw, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - colbacktitle=LimeGreen!75!DarkGreen,width=(\linewidth-6mm)/4,nobeforeafter, - opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=enhancedlast jigsaw,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3201,27 +3191,27 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{bicolor,equal height group=bicolor, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[bicolor,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, + colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} \begin{docTcbKey}{colbacklower}{=\meta{color}}{no default, initially \texttt{black!15!white}} @@ -3271,27 +3261,27 @@ Nevertheless, this skin can be applied independently. \end{docSkin} \begin{dispExample} -\tcbset{skin=bicolorfirst,equal height group=bicolorfirst, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=bicolorfirst,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, + colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3315,27 +3305,27 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{skin=bicolormiddle,equal height group=bicolormiddle, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=bicolormiddle,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, + colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3359,27 +3349,27 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{skin=bicolorlast,equal height group=bicolorlast, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[skin=bicolorlast,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, + colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3421,27 +3411,26 @@ cannot be controlled by a style. \begin{dispExample} -\tcbset{beamer,equal height group=beamer, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[beamer,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3494,27 +3483,26 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{beamer,skin=beamerfirst,equal height group=beamerfirst, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[beamer,skin=beamerfirst,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3539,27 +3527,26 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{beamer,skin=beamermiddle,equal height group=beamermiddle, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[beamer,skin=beamermiddle,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3582,27 +3569,26 @@ Nevertheless, this skin can be applied independently. \end{docSkin} \begin{dispExample} -\tcbset{beamer,skin=beamerlast,equal height group=beamerlast, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[beamer,skin=beamerlast,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3640,27 +3626,26 @@ if needed. \begin{dispExample} -\tcbset{widget,equal height group=widget, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[widget,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3692,27 +3677,26 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{widget,skin=widgetfirst,equal height group=widgetfirst, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[widget,skin=widgetfirst,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} \clearpage @@ -3735,27 +3719,26 @@ Nevertheless, this skin can be applied independently. \end{docSkin} \begin{dispExample} -\tcbset{widget,skin=widgetmiddle,equal height group=widgetmiddle, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[widget,skin=widgetmiddle,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3779,27 +3762,26 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{widget,skin=widgetlast,equal height group=widgetlast, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[widget,skin=widgetlast,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3831,27 +3813,26 @@ Nevertheless, this skin can be applied independently. \end{docTcbKey} \begin{dispExample} -\tcbset{empty,equal height group=empty, - coltitle=Navy,borderline={2pt}{0pt}{black!10!white}, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[empty,raster equal height,raster columns=4, + coltitle=Navy,borderline={2pt}{0pt}{black!10!white}, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3901,27 +3882,26 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{empty,skin=emptyfirst,equal height group=emptyfirst, - coltitle=Navy,borderline={2pt}{0pt}{black!10!white}, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[empty,skin=emptyfirst,raster equal height,raster columns=4, + coltitle=Navy,borderline={2pt}{0pt}{black!10!white}, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3946,27 +3926,26 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} -\tcbset{empty,skin=emptymiddle,equal height group=emptymiddle, - coltitle=Navy,borderline={2pt}{0pt}{black!10!white}, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[empty,skin=emptymiddle,raster equal height,raster columns=4, + coltitle=Navy,borderline={2pt}{0pt}{black!10!white}, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -3989,27 +3968,26 @@ Nevertheless, this skin can be applied independently. \end{docSkin} \begin{dispExample} -\tcbset{empty,skin=emptylast,equal height group=emptylast, - coltitle=Navy,borderline={2pt}{0pt}{black!10!white}, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[empty,skin=emptylast,raster equal height,raster columns=4, + coltitle=Navy,borderline={2pt}{0pt}{black!10!white}, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} \clearpage @@ -4130,27 +4108,26 @@ are drawn by the codes given by \begin{dispExample} -\tcbset{spartan,equal height group=spartan, - colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[spartan,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \end{dispExample} @@ -4180,27 +4157,26 @@ are drawn by the codes given by \begin{dispExample} -\tcbset{draft,equal height group=draft, - colback=LightGreen,colframe=DarkGreen, - width=(\linewidth-6mm)/4,nobeforeafter, - left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm} -% -\begin{tcolorbox} - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox} - This is my content. - \tcblower - More content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. -\end{tcolorbox}\hfill -\begin{tcolorbox}[adjusted title=My title] - This is my content. - \tcblower - More content. -\end{tcolorbox} +\begin{tcbraster}[draft,raster equal height,raster columns=4, + colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen, + left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm] + \begin{tcolorbox} + This is my content. + \end{tcolorbox} + \begin{tcolorbox} + This is my content. + \tcblower + More content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \end{tcolorbox} + \begin{tcolorbox}[adjusted title=My title] + This is my content. + \tcblower + More content. + \end{tcolorbox} +\end{tcbraster} \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 51c707949c8..91fc5275574 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 a80113cf2c5..28008bbb92e 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 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -105,8 +105,8 @@ \renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1} \renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1} -\def\version{3.22}% -\def\datum{2014/10/31}% +\def\version{3.30}% +\def\datum{2014/11/17}% \makeindex \hypersetup{ @@ -141,6 +141,8 @@ endtcblisting,newtcblisting,newtcbinputlisting, tcblisting,tcbinputlisting,tcbuselistingtext,tcbuselistinglisting,tcbusetemplisting, tcbfitdim,tcbfitsteps, + % raster + thetcbrasternum,tcbitem, % theorems tcbmaketheorem,tcboxmath,tcbhighmath,thetcbcounter,newtcbtheorem, % documentation @@ -152,6 +154,7 @@ refCom,refEnv,refKey, tcbmakedocSubKey,tcbdocmarginnote,tcbdocnew,tcbdocupdated, % skins + tcbincludegraphics,tcbincludepdf,pdfpages,imagepage,imagepath,imagename, tcbline,tcboxedtitleheight,tcboxedtitlewidth, tcbsettowidthofnode,tcbsetmacrotowidthofnode,tcbsettoheightofnode,tcbsetmacrotoheightofnode, % xparse @@ -325,19 +328,22 @@ %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.coreoptions} +%\includeonly{tcolorbox.doc.quickref} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} \include{tcolorbox.doc.abstract} \include{tcolorbox.doc.intro} +\include{tcolorbox.doc.quickref} \include{tcolorbox.doc.coremacros} \include{tcolorbox.doc.coreoptions} \include{tcolorbox.doc.initoptions} \include{tcolorbox.doc.verbatim} \include{tcolorbox.doc.technical} \include{tcolorbox.doc.skins} +\include{tcolorbox.doc.graphics} \include{tcolorbox.doc.filling} +\include{tcolorbox.doc.raster} \include{tcolorbox.doc.listings} \include{tcolorbox.doc.theorems} \include{tcolorbox.doc.breakable} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index a5d87614def..c68230e2954 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -155,7 +155,7 @@ \else% \tcb@hasTitletrue% \tcbdimto\tcb@w@title{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@lefttitle-\kvtcb@righttitle}% - \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@followingtitle\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@followingtitle\end{tcb@savebox}% \tcbdimto\tcb@h@title{\ht\tcb@titlebox+\dp\tcb@titlebox}% \tcbdimto\tcb@h@padtitle{\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle+\tcb@h@title}% \fi% @@ -245,9 +245,11 @@ \tcbset{height=\tcb@h@page}% } +\def\tcb@use@after@lastbox{\bgroup\tcb@after@lastbox\egroup} + \def\tcb@drawcolorbox@breakable{% \tcb@prepare@break@operation% - \let\tcb@after@lastbox=\kvtcb@afterbox% + \global\let\tcb@after@lastbox=\kvtcb@afterbox% \let\kvtcb@afterbox=\@empty% \begingroup% \parskip\z@% @@ -256,8 +258,9 @@ \topskip\z@% \tcb@split@start% \endgroup% + \color{.}% hack for some special cases \ifx\kvtcb@float\@empty% - \tcb@after@lastbox% + \aftergroup\tcb@use@after@lastbox% \fi% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 7b9da97ff49..a527cff86cf 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \tcbuselibrary{listings,skins,xparse} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 31cbfd9a835..fb8177184b0 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -255,7 +255,7 @@ % \def\tcb@fit@@boxsave##1{% \begin{tcb@savebox}{\tcb@upperbox}{##1}% - \color{\kvtcb@colupper}% + \color{tcbcol@upper}% \kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% \kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper% \end{tcb@savebox}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 98115a07e74..881969b1c3e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \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 64695f2aede..87c3bf72de3 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \RequirePackage{listings}[2007/02/22] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex index ba4ba48df05..e812ba74f20 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,9 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} + +\RequirePackage{pdftexcmds} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% \def\tcbuselistingcomment{\kvtcb@listingcomment}% @@ -38,21 +40,23 @@ \newenvironment{tcb@lower@outside}[1]{% \tcbset{savedelimiter=tcb@lower@outside}\tcb@minipage{#1}% - \color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces}% + \color{tcbcol@lower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces}% {\unskip\kvtcb@after@lower\endminipage} +\def\tcb@use@listing@other@reset{% + \tcbset{every box on layer 1/.style={reset,every box}}% + \tcb@use@listing@other} + \def\tcb@use@lower@outside#1{% \setbox\z@=\hbox{\begin{tcb@lower@outside}{#1}% - \stepcounter{tcblayer}% - \tcb@use@listing@other% - \addtocounter{tcblayer}{-1}% + \tcb@use@listing@other@reset% \end{tcb@lower@outside}}% \tcbdimto{\tcb@temp@wd}{\wd\z@}% \unhbox\z@% } \def\tcb@inputlisting@out@otherAboveListing{% - \kvtcb@beforebox\noindent% + {\kvtcb@beforebox}\noindent% \iftcb@lowervisible% \tcb@use@lower@outside{\kvtcb@width}% \par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent% @@ -60,14 +64,29 @@ \begin{tcolorbox}[before=,savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}% } +\def\tcb@inputlisting@out@otherAboveListing@Decoupled{% + \iftcb@lowervisible% + {\par\tcb@use@listing@other@reset\par}% + \fi% + \begin{tcolorbox}[savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}% +} + \def\tcb@inputlisting@out@listingAboveOther{% \begin{tcolorbox}[after=,savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}% \iftcb@lowervisible\par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent% \tcb@use@lower@outside{\kvtcb@width}% \fi% - \kvtcb@afterbox% + {\kvtcb@afterbox}% } +\def\tcb@inputlisting@out@listingAboveOther@Decoupled{% + \begin{tcolorbox}[savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}% + \iftcb@lowervisible% + {\par\tcb@use@listing@other@reset\par}% + \fi% +} + + \newenvironment{tcb@outside@environment}{% \tcb@before@unbroken% \begin{minipage}{\tcb@width}}% @@ -129,6 +148,17 @@ \begin{tcolorbox}[capture=\tcb@listing@capture,savedelimiter=tcolorbox]\tcb@listing@process\end{tcolorbox}% } +\long\def\tcb@run@system@command#1{% + \ifcase\pdf@shellescape\relax + \tcb@error{You must invoke LaTeX with the -shell-escape flag}{Pass the -shell-escape flag to LaTeX.}% + \or\or + \tcb@warning{System call with restricted shell escape may fail}% + \fi% + \filename@parse{\kvtcb@listingfile}\immediate\write18{#1}% + \relax% +} + + \tcbset{% listing file/.store in=\kvtcb@listingfile,% comment/.store in=\kvtcb@listingcomment,% @@ -141,10 +171,13 @@ \let\tcb@use@listing@other=#2},% listing only/.style={listing@process@inside={\tcb@listing@listing}{\tcbuselistingtext}},% text only/.style={listing@process@inside={\tcbuselistingtext}{\tcbuselistingtext}},% + comment only/.style={listing@process@inside={\tcbuselistingcomment}{\tcbuselistingcomment}},% listing and text/.style={listing@process@inside={\tcb@listing@listingAndOther}{\tcbuselistingtext}},% text and listing/.style={listing@process@inside={\tcb@listing@otherAndListing}{\tcbuselistingtext}},% text above listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAboveListing}{\tcbuselistingtext}},% + text above* listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAboveListing@Decoupled}{\tcbuselistingtext}},% listing above text/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther}{\tcbuselistingtext}},% + listing above* text/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther@Decoupled}{\tcbuselistingtext}},% text outside listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAndListing}{\tcbuselistingtext}},% listing outside text/.style={listing@process@outside={\tcb@inputlisting@out@listingAndOther}{\tcbuselistingtext}},% text side listing/.style={sidebyside,text and listing},% @@ -152,28 +185,62 @@ listing and comment/.style={listing@process@inside={\tcb@listing@listingAndOther}{\tcbuselistingcomment}},% comment and listing/.style={listing@process@inside={\tcb@listing@otherAndListing}{\tcbuselistingcomment}},% comment above listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAboveListing}{\tcbuselistingcomment}},% + comment above* listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAboveListing@Decoupled}{\tcbuselistingcomment}},% listing above comment/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther}{\tcbuselistingcomment}},% + listing above* comment/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther@Decoupled}{\tcbuselistingcomment}},% comment outside listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAndListing}{\tcbuselistingcomment}},% listing outside comment/.style={listing@process@outside={\tcb@inputlisting@out@listingAndOther}{\tcbuselistingcomment}},% comment side listing/.style={sidebyside,comment and listing},% listing side comment/.style={sidebyside,listing and comment},% listing engine/.is choice,% - image comment/.style 2 args={comment={\includegraphics[#1]{#2}}}, + image comment/.style 2 args={comment={\includegraphics[#1]{#2}}},% + comment style/.store in=\kvtcb@commentstyle,% + tcbimage comment/.style={comment={\let\tcb@trans@commentstyle\kvtcb@commentstyle\tcbincludegraphics[code={\pgfkeysalsofrom\tcb@trans@commentstyle}]{#1}}}, + pdf extension/.store in=\kvtcb@pdf@extension,% + pdf comment/.style={comment={\let\tcb@trans@commentstyle\kvtcb@commentstyle\filename@parse{#1}\edef\tcb@trans@commentfile{\filename@area\filename@base.\kvtcb@pdf@extension}% + \begin{tcbraster}[raster halign=center,sharp corners,size=tight,colback=white,code={\pgfkeysalsofrom\tcb@trans@commentstyle}]\tcbincludepdf{\tcb@trans@commentfile}\end{tcbraster}}}, + pdf comment/.default={\kvtcb@listingfile}, + process code/.code={\appto\tcb@listing@process@hook{#1}},% + no process/.code={\def\tcb@listing@process@hook{}},% + compilable listing/.style={listing file={\jobname-listing-\thetcblistingcount}}, + run system command/.style={process code={\tcb@run@system@command{#1}}},% + run@system@command/.style 2 args={run system command={#1\space#2\space\filename@area\filename@base}},% + run pdflatex/.style={run@system@command={pdflatex}{#1}},% + run xelatex/.style={run@system@command={xelatex}{#1}},% + run lualatex/.style={run@system@command={lualatex}{#1}},% + run makeindex/.style={run@system@command={makeindex}{#1}},% + run bibtex/.style={run@system@command={bibtex}{#1}},% + run biber/.style={run@system@command={biber}{#1}},% + run arara/.style={run@system@command={arara}{#1}},% + run latex/.style={run@system@command={latex}{#1}},% + run dvips/.style={run@system@command={dvips}{#1}},% + run ps2pdf/.style={run system command={ps2pdf\space#1\space\filename@area\filename@base.ps}},% +} + +\def\tcbinputlisting@core{% + \tcb@listing@process@hook% + \let\tcb@listing@capture=\kvtcb@capture% + \tcb@inputlisting% } +\newcounter{tcblisting} + \newenvironment{tcblisting}[1]{% - \def\tcblisting@box{\tcbinputlisting{#1}}% + \stepcounter{tcblisting}\edef\thetcblistingcount{\thetcblisting}% + \tcb@layer@pushup% + \tcb@apply@box@options{capture=minipage,#1}% \begingroup\tcbverbatimwrite{\kvtcb@listingfile}% }{\endtcbverbatimwrite\endgroup% - \tcblisting@box% + \tcbinputlisting@core% } \long\def\tcbinputlisting#1{% \begingroup% + \stepcounter{tcblisting}\edef\thetcblistingcount{\thetcblisting}% \tcb@layer@pushup% - \tcbset{capture=minipage,#1}\tcb@afteroptions@hook% - \let\tcb@listing@capture=\kvtcb@capture% - \tcb@inputlisting\endgroup% + \tcb@apply@box@options{capture=minipage,#1}% + \tcbinputlisting@core% + \endgroup% } \newenvironment{tcboutputlisting}{% @@ -227,8 +294,8 @@ \tcbset{% reset@listingscore/.style={% listing file=\jobname.listing, - comment=, - listing and text, + comment=, listing and text, + no process,comment style=,pdf extension=pdf, }, initialize@reset=reset@listingscore, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 4c84604223b..53ef49b102b 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \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 f9c57560fc6..0775f4ce12d 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex new file mode 100644 index 00000000000..c38fe7eb326 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex @@ -0,0 +1,184 @@ +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) +%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% ------------------------------------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of all files listed in README +%% +\tcb@set@library@version{3.30} + +\newcounter{tcbrastercolumn} +\newcounter{tcbrasterrow} +\newcounter{tcbraster} + +\newrobustcmd{\thetcbrasternum}{\the\numexpr(\c@tcbrasterrow-1)*\kvtcb@raster@columns+\c@tcbrastercolumn\relax} + +\def\tcb@raster@ehg@all{% + \tcbset{equal height group={\kvtcb@raster@ehgid}}% +} + +\def\tcb@raster@ehg@row{% + \tcbset{equal height group={\kvtcb@raster@ehgid @\number\c@tcbrasterrow}}% +} + + +\tcbset{% + raster columns/.store in=\kvtcb@raster@columns, + raster rows/.store in=\kvtcb@raster@rows, + raster width/.store in=\kvtcb@raster@width, + raster height/.store in=\kvtcb@raster@height, + % + raster before skip/.store in=\kvtcb@raster@skip@before, + raster after skip/.store in=\kvtcb@raster@skip@after, + raster left skip/.store in=\kvtcb@raster@skip@left, + raster right skip/.store in=\kvtcb@raster@skip@right, + % + raster column skip/.store in=\kvtcb@raster@xskip, + raster row skip/.store in=\kvtcb@raster@yskip, + % + raster@halign/.store in=\kvtcb@raster@halign, + raster halign/.is choice, + raster halign/center/.style={raster@halign=\centering}, + raster halign/left/.style={raster@halign=\raggedright}, + raster halign/right/.style={raster@halign=\raggedleft}, + % + raster valign/.store in=\kvtcb@raster@valign, + % + raster equal height group/.store in=\kvtcb@raster@ehgid,% + raster equal height/.is choice, + raster equal height/.default=all, + raster equal height/none/.code={\let\tcb@raster@ehg@start\@empty% + \let\tcb@raster@ehg@continue\@empty},% + raster equal height/rows/.code={\let\tcb@raster@ehg@start\tcb@raster@ehg@row% + \let\tcb@raster@ehg@continue\tcb@raster@ehg@row},% + raster equal height/all/.code={\let\tcb@raster@ehg@start\tcb@raster@ehg@all% + \let\tcb@raster@ehg@continue\@empty},% + % + raster force size/.is choice,% + raster force size/.default=true,% + raster force size/true/.code={\let\tcb@raster@set@size\tcbset@late@options},% + raster force size/false/.code={\let\tcb@raster@set@size\tcbset},% +} + +\tcbset{ + raster reset/.style={ + raster width=\linewidth,raster height=0pt, + raster before skip=2mm, raster after skip=2mm, + raster columns=2,raster rows=2, + raster column skip=2mm,raster row skip=2mm, + raster left skip=0pt,raster right skip=0pt, + raster halign=left,raster valign=center, + raster equal height=none, + raster equal height group={REG@\tcb@raster@number}, + raster force size,}, + raster reset +} + +\setcounter{tcbraster}{0} + +\let\tcb@raster@change@minipage\@empty +\let\tcb@raster@change@fitbox\@empty +\def\tcb@raster@change@hbox{\tcbset{capture=minipage}} + +\newenvironment{tcbraster}[1][]{% + \tcb@layer@pushup% + \stepcounter{tcbraster}% + \edef\tcb@raster@number{\number\c@tcbraster}% + \edef\tcb@raster@save@column{\number\c@tcbrastercolumn}% + \edef\tcb@raster@save@row{\number\c@tcbrasterrow}% + \let\tcb@raster@change@fitbox\@empty% + \setcounter{tcbrastercolumn}{1}% + \setcounter{tcbrasterrow}{1}% + \tcbset{every box on layer \the\numexpr\number\c@tcblayer+1\relax/.code={% + \ifodd\c@tcbrastercolumn\relax% + \tcbset{raster odd column/.try}% + \else% + \tcbset{raster even column/.try}% + \fi% + \tcbset{raster column \number\c@tcbrastercolumn/.try}% + \ifodd\c@tcbrasterrow\relax% + \tcbset{raster odd row/.try}% + \else% + \tcbset{raster even row/.try}% + \fi% + \tcbset{raster row \number\c@tcbrasterrow/.try}% + \ifodd\thetcbrasternum\relax% + \tcbset{raster odd number/.try}% + \else% + \tcbset{raster even number/.try}% + \fi% + \tcbset{raster row \number\c@tcbrasterrow\space column \number\c@tcbrastercolumn/.try}% + \tcbset{raster number \thetcbrasternum/.try}% + }}% + \tcbset{#1}% + \tcbset@late@options{% + before={\unskip\ifnum\c@tcbrastercolumn>1 \kern\kvtcb@raster@xskip\else\kern\kvtcb@raster@skip@left\fi}, + after={% + \ifnum\c@tcbrastercolumn=\kvtcb@raster@columns\relax% + \kern\kvtcb@raster@skip@right% + \parindent\z@\parskip\z@\par\nointerlineskip% + \addvspace{\the\dimexpr\kvtcb@raster@yskip\relax}% + \noindent% + \setcounter{tcbrastercolumn}{1}\addtocounter{tcbrasterrow}{1}% + \aftergroup\tcb@raster@ehg@continue% + \else% + \stepcounter{tcbrastercolumn}% + \fi},% + box align=\kvtcb@raster@valign,% + }% + \tcbdimto\tcb@raster@box@width{(\kvtcb@raster@width+\kvtcb@raster@xskip-\kvtcb@raster@skip@left-\kvtcb@raster@skip@right)/\kvtcb@raster@columns-\kvtcb@raster@xskip}% + \tcb@raster@set@size{% + code={\csuse{tcb@raster@change@\kvtcb@capture}}, + width=\tcb@raster@box@width, + }% + \ifdim\dimexpr\kvtcb@raster@height>0pt\relax% + \tcbdimto\tcb@raster@box@height{(\kvtcb@raster@height+\kvtcb@raster@yskip-0.001pt)/\kvtcb@raster@rows-\kvtcb@raster@yskip}% + \tcb@raster@set@size{height=\tcb@raster@box@height}% + \fi% + \tcb@raster@ehg@start% + {\par\nointerlineskip% + \addvspace{\the\dimexpr\kvtcb@raster@skip@before-\parskip\relax}}% + \kvtcb@raster@halign\noindent% +}{% + \unskip% + \ifnum\c@tcbrastercolumn>1 % + \kern\kvtcb@raster@skip@right% + \fi% + \begingroup% + \par\nointerlineskip% + \ifnum\c@tcbrastercolumn=1 % + \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\kvtcb@raster@yskip-\parskip\relax}% + \else% + \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\parskip\relax}% + \fi% + \endgroup% + \setcounter{tcbrastercolumn}{\tcb@raster@save@column}% + \setcounter{tcbrasterrow}{\tcb@raster@save@row}% +} + +\newcommand{\tcbitem@following}[1][]{% + \end{tcolorbox}\begin{tcolorbox}[#1]% +} + +\newcommand{\tcbitem@first}[1][]{% + \let\tcbitem=\tcbitem@following% + \begin{tcolorbox}[#1]% +} + +\newenvironment{tcbitemize}[1][]{% + \begin{tcbraster}[#1]% + \let\tcb@raster@change@fitbox=\tcb@raster@change@hbox% + \let\tcbitem=\tcbitem@first% +}{\end{tcolorbox}\end{tcbraster}} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 4bf2713601f..1c895583237 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \RequirePackage{tikz}[2010/10/13] @@ -109,9 +109,9 @@ } \tikzset{% - tcb fill frame/.style={fill=\kvtcb@colframe,fill opacity=\kvtcb@opacityframe,tcb@spec,frame@style},% - tcb fill interior/.style={fill=\kvtcb@colback,fill opacity=\kvtcb@opacityback,tcb@spec,interior@style},% - tcb fill title/.style={fill=\kvtcb@colbacktitle,fill opacity=\kvtcb@opacitybacktitle,tcb@spec,title@style},% + tcb fill frame/.style={fill=tcbcol@frame,fill opacity=\kvtcb@opacityframe,tcb@spec,frame@style},% + tcb fill interior/.style={fill=tcbcol@back,fill opacity=\kvtcb@opacityback,tcb@spec,interior@style},% + tcb fill title/.style={fill=tcbcol@backtitle,fill opacity=\kvtcb@opacitybacktitle,tcb@spec,title@style},% } % fill frame @@ -166,10 +166,10 @@ % draw segmentation line \def\tcb@drawlower@path{% \iftcb@sidebyside% - \path[draw=\kvtcb@colframe,fill opacity=\kvtcb@opacityframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style] + \path[draw=tcbcol@frame,fill opacity=\kvtcb@opacityframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style] (segmentation.north)--(segmentation.south);% \else% - \path[draw=\kvtcb@colframe,fill opacity=\kvtcb@opacityframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style] + \path[draw=tcbcol@frame,fill opacity=\kvtcb@opacityframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style] (segmentation.west)--(segmentation.east);% \fi% } @@ -256,7 +256,7 @@ } \def\tcb@drawspec@T{% - \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@pathbase{top color=tcbcol@frame,bottom color=tcbcol@back,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}% } @@ -270,7 +270,7 @@ \def\tcb@drawframe@spartan{% \begin{pgfscope}% \pgfpathrectangle{\pgfpointorigin}{\pgfqpoint{\tcb@width}{\tcb@height}}% - \pgfsetfillcolor{\kvtcb@colframe}% + \pgfsetfillcolor{tcbcol@frame}% \pgfsetfillopacity{\kvtcb@opacityframe}% \pgfusepath{fill}% \end{pgfscope}% @@ -280,7 +280,7 @@ \begin{pgfscope}% \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}% {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}% - \pgfsetfillcolor{\kvtcb@colback}% + \pgfsetfillcolor{tcbcol@back}% \pgfsetfillopacity{\kvtcb@opacityback}% \pgfusepath{fill}% \end{pgfscope}% @@ -290,7 +290,7 @@ \begin{pgfscope}% \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}% {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\tcb@height-\kvtcb@top@rule\relax}}% - \pgfsetfillcolor{\kvtcb@colback}% + \pgfsetfillcolor{tcbcol@back}% \pgfsetfillopacity{\kvtcb@opacityback}% \pgfusepath{fill}% \end{pgfscope}% @@ -300,7 +300,7 @@ \begin{pgfscope}% \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight+\kvtcb@title@rule\relax}}% {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\tcb@height-\kvtcb@top@rule\relax}}% - \pgfsetfillcolor{\kvtcb@colbacktitle}% + \pgfsetfillcolor{tcbcol@backtitle}% \pgfsetfillopacity{\kvtcb@opacitybacktitle}% \pgfusepath{fill}% \end{pgfscope}% @@ -317,7 +317,7 @@ \pgfpathmoveto{\pgfqpoint{\kvtcb@left@rule}{\tcb@seg@pos}}% \pgfpathlineto{\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}% \fi% - \pgfsetcolor{\kvtcb@colframe}% + \pgfsetcolor{tcbcol@frame}% \pgfsetstrokeopacity{\kvtcb@opacityframe}% \pgfusepath{stroke}% \end{pgfscope}% @@ -371,7 +371,7 @@ @title style/.code={\tikzset{title@style/.style={#1}}},% title style/.style={title filled,@title style={#1}}, title hidden/.style={title style={draw=none,fill=none}}, - colbacklower/.store in=\kvtcb@colbacklower,% + colbacklower/.colorlet=tcbcol@backlower,% clear@spec/.code={\tcb@spec{}},% tikz/.code={\appto\tcb@tikz@option@hook{,#1}},% tikz reset/.code={\let\tcb@tikz@option@hook\@empty},% @@ -504,30 +504,30 @@ interior titled code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@path}% \or% - \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT% + \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@path}% + {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@path}% \fi% \else% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@path}% \fi\tcb@spec{}}, interior code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@path}% \or% - \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UR% + \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UR% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}% + {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@path}% \fi% \else% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@path}% \fi\tcb@spec{}}, 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\tcb@spec{}},% + \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=tcbcol@backlower}\else% + \tcb@drawspec@sbs@A{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LR{fill=tcbcol@backlower}\fi\tcb@spec{}},% skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolorlast} \tcbset{bicolor/.style={skin=bicolor}} @@ -537,30 +537,30 @@ interior titled code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathfirst}% \or% - \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT% + \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathfirst}% + {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathfirst}% \fi% \else% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathfirst}% \fi\tcb@spec{}}, interior code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathfirst}% \or% - \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UR% + \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UR% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}% + {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathfirst}% \fi% \else% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathfirst}% \fi\tcb@spec{}}, 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\tcb@spec{}},% + \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=tcbcol@backlower}\else% + \tcb@drawspec@sbs@C{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LS{fill=tcbcol@backlower}\fi\tcb@spec{}},% skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolormiddle} \tcb@new@skin{bicolormiddle}{base@middle,% @@ -568,30 +568,30 @@ interior titled code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathmiddle}% \or% - \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT% + \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathmiddle}% + {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathmiddle}% \fi% \else% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathmiddle}% \fi\tcb@spec{}},% interior code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathmiddle}% \or% - \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@US% + \tcb@spec{fill=tcbcol@back}\tcb@drawspec@US% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}% + {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathmiddle}% \fi% \else% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathmiddle}% \fi\tcb@spec{}}, 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\tcb@spec{}},% + \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=tcbcol@backlower}\else% + \tcb@drawspec@sbs@E{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LS{fill=tcbcol@backlower}\fi\tcb@spec{}},% skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolormiddle} \tcb@new@skin{bicolorlast}{base@last,% @@ -599,34 +599,34 @@ interior titled code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathlast}% \or% - \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT% + \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT% \else% - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathlast}% + {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathlast}% \fi% \else% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathlast}% \fi\tcb@spec{}}, interior code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathlast}% \or% - \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@US% + \tcb@spec{fill=tcbcol@back}\tcb@drawspec@US% \else - {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}% + {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathlast}% \fi% \else% - {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% + {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathlast}% \fi\tcb@spec{}},% 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\tcb@spec{}},% + \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=tcbcol@backlower}\else% + \tcb@drawspec@sbs@F{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LR{fill=tcbcol@backlower}\fi\tcb@spec{}},% skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast} -\tikzset{beamer@color/.style={top color=\kvtcb@colback,bottom color=\kvtcb@colback!85!black}} +\tikzset{beamer@color/.style={top color=tcbcol@back,bottom color=tcbcol@back!85!black}} \tcb@new@skin{beamer}{base@unbroken,% frame engine=path,interior titled engine=empty,interior engine=empty,segmentation engine=empty,title engine=path,% @@ -738,12 +738,12 @@ \iftcb@sidebyside% \tcb@drawlower@path% \else% - \path[left color=\kvtcb@colframe!75!white,right color=\kvtcb@colframe!75!white!25!\kvtcb@colback,segmentation@style] + \path[left color=tcbcol@frame!75!white,right color=tcbcol@frame!75!white!25!tcbcol@back,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}} +\tikzset{widget@color/.style={left color=tcbcol@frame!75!white,right color=tcbcol@frame!75!white!25!tcbcol@back}} \tcb@new@skin{widget}{base@unbroken,% frame engine=path,interior titled engine=path,interior engine=path,segmentation engine=empty,title engine=empty,% @@ -994,11 +994,11 @@ detach title, code={\def\tcb@specialtitle@hook{% \ifx\tcbtitletext\@empty\else% - \let\tcb@trans@colframe\kvtcb@colframe% - \let\tcb@trans@colback\kvtcb@colbacktitle% + \colorlet{tcbtranscol@frame}{tcbcol@frame}% + \colorlet{tcbtranscol@back}{tcbcol@backtitle}% \let\tcb@trans@boxedstyle\kvtcb@style@boxedtitle% - \setbox\tcb@titlebox\color@hbox\bgroup\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox% - \setbox\tcb@titlebox\color@hbox\tcbox[colframe=\tcb@trans@colframe,colback=\tcb@trans@colback,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox% + \setbox\tcb@titlebox\color@hbox\bgroup\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox% + \setbox\tcb@titlebox\color@hbox\tcbox[colframe=tcbtranscol@frame,colback=tcbtranscol@back,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox% % \tcbdimto\tcboxedtitleheight{\ht\tcb@titlebox+\dp\tcb@titlebox}% \tcbdimto\tcboxedtitlewidth{\wd\tcb@titlebox}% @@ -1270,8 +1270,8 @@ enlarge top by=0mm, enlarge bottom by=0mm, width=\the\dimexpr\linewidth+1.6cm\relax, - frame style={top color=\kvtcb@colframe,bottom color=\kvtcb@colframe,middle color=yellow!75!\kvtcb@colframe}, - title style={left color=\kvtcb@colframe,right color=\kvtcb@colframe,middle color=yellow!75!\kvtcb@colframe}, + frame style={top color=tcbcol@frame,bottom color=tcbcol@frame,middle color=yellow!75!tcbcol@frame}, + title style={left color=tcbcol@frame,right color=tcbcol@frame,middle color=yellow!75!tcbcol@frame}, watermark tikz={\draw[line width=2mm] circle (1cm) node{\fontfamily{ptm}\fontseries{b}\fontsize{20mm}{20mm}\selectfont!};}, watermark zoom=0.75, }} @@ -1608,17 +1608,104 @@ draftmode/false/.code=\tcbstopdraftmode,% } + +\def\tcb@include@graphics{% + \ifdefstring{\kvtcb@capture}{hbox}{% + \tcbox{% + \edef\tcb@temp{\noexpand\includegraphics[\expandonce\kvtcb@graphics@options]}% + \tcb@temp{\imagepath}% + }% + }{% + \iftcb@fixedheight% + \begin{tcolorbox}[underlay={% + \begin{tcbclipinterior}% + \edef\tcb@temp{\noexpand\tikzset{fill image options={\expandonce\kvtcb@graphics@options}}}% + \tcb@temp% + \path[fill zoom image={\imagepath}] + ([xshift=\kvtcb@boxsep+\kvtcb@leftupper,yshift=\kvtcb@boxsep+\kvtcb@bottom]interior.south west) rectangle + ([xshift=-\kvtcb@boxsep-\kvtcb@rightupper,yshift=-\kvtcb@boxsep-\kvtcb@top]interior.north east); + \end{tcbclipinterior}% + }]% + \end{tcolorbox}% + \else% + \begin{tcolorbox}% + \edef\tcb@temp{\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth]}% + \tcb@temp{\imagepath}% + \end{tcolorbox}% + \fi% + }% +} + +\def\tcb@include@graphics@preparefile#1{% + \def\imagename{\detokenize{#1}}% + \ifx\kvtcb@graphics@directory\@empty% + \edef\imagepath{#1}% + \else% + \edef\imagepath{\expandonce\kvtcb@graphics@directory/\noexpand#1}% + \fi% +} + +\newcommand{\tcbincludegraphics}[2][]{% + \begingroup% + \tcb@layer@pushup% + \tcb@apply@box@options{enhanced,clip upper=true,valign=center,center upper,#1}% + \tcb@include@graphics@preparefile{#2}% + \edef\imagepage{1}% + \tcb@include@graphics% + \endgroup% +} + +\def\tcb@set@pdfpages#1#2{% + \IfFileExists{#2}{% + \ifdef{\pdfximage}{% + \pdfximage{#2}% + \edef#1{\the\pdflastximagepages}% + }{% + \ifdef{\XeTeXpdfpagecount}{% + \edef#1{\the\XeTeXpdfpagecount #2 }% + \ifnum#1=0 % + \edef#1{1}% + \fi% + }{\tcb@error{For PDF support run pdflatex, xelatex, or lualatex}{% + Your compiler seems not to support PDF include files.}}% + }% + }{\tcb@error{PDF file `#2' not found}{The PDF file `#2' was not found}}% + \relax% +} + +\newcommand{\tcbincludepdf}[2][]{% + \begingroup% + \tcb@layer@pushup% + \tcb@apply@box@options{enhanced,clip upper=true,valign=center,center upper,#1}% + \appto\kvtcb@graphics@options{,page=\imagepage}% + \tcb@include@graphics@preparefile{#2}% + \tcb@set@pdfpages\pdfpages{\imagepath}% + \foreach \imagepage in \kvtcb@graphics@pages% + {% + \tcb@include@graphics% + }% + \endgroup% +} + +\tcbset{% + graphics options/.store in=\kvtcb@graphics@options, + graphics pages/.store in=\kvtcb@graphics@pages, + graphics directory/.store in=\kvtcb@graphics@directory, +} + + \tcbset{% reset@skins/.style={% frame style=,interior style=,segmentation style=,@title style=,% colbacklower=black!15!white,% extend freelance=,extend freelancefirst=,extend freelancemiddle=,extend freelancelast=,% clear@spec,% - watermark opacity=1.00,watermark color=\kvtcb@colback!85!\kvtcb@colframe,% + watermark opacity=1.00,watermark color=tcbcol@back!85!tcbcol@frame,% watermark zoom=0.75,clip watermark,% clip title=false,clip upper=false,clip lower=false,% no borderline,no shadow,no underlay,no finish,tikz reset,at begin tikz reset,at end tikz reset,% - boxed title style=,hbox boxed title,code={\let\tcb@specialgeonodes@hook\relax}% + boxed title style=,hbox boxed title,code={\let\tcb@specialgeonodes@hook\relax},% + graphics options=,graphics pages={1,...,\pdfpages},graphics directory=,% }, initialize@reset=reset@skins, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 72dbb7d3025..fda058f95e9 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \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 67f702a00c6..d8f14fa29c8 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 1b3a69f76a3..520dc58bd58 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.22} +\tcb@set@library@version{3.30} \RequirePackage{xparse}[2013/12/31] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 93dd89e095a..f6cbdad0d8d 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.22 (2014/10/31) +%% The LaTeX package tcolorbox - version 3.30 (2014/11/17) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/10/31 version 3.22 text color boxes] -\def\tcb@version{3.22} +\ProvidesPackage{tcolorbox}[2014/11/17 version 3.30 text color boxes] +\def\tcb@version{3.30} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -36,6 +36,7 @@ \newif\iftcb@hasPhantom \newif\iftcb@lowerseparated \newif\iftcb@titlefilled +\newif\iftcb@fixedheight \newbox\tcb@titlebox \newbox\tcb@upperbox @@ -52,6 +53,7 @@ \pgfkeys{/tcb/.is family} \def\tcbset{\pgfqkeys{/tcb}} +\long\def\tcbset@late@options#1{\appto\tcb@lateoptions@hook{\tcbset{#1}}} \def\tcb@dim@to#1#2{\def#1{\the\dimexpr#2\relax}} \def\tcbdimto#1#2{\edef#1{\the\dimexpr#2\relax}} @@ -114,9 +116,10 @@ \newcommand{\tcbsubskin}[3]{\tcb@new@skin{#1}{skin@#2,#3}} \pgfkeys{/handlers/.dimstore in/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\def#1{\the\dimexpr##1\relax}}} +\pgfkeys{/handlers/.colorlet/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\colorlet{#1}{##1}}} \newcommand\tcbtitle{\ifx\tcbtitletext\@empty\else% - {\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi} + {\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi} \def\tcb@detach@title@code@{% \let\tcbtitletext\kvtcb@title% @@ -148,6 +151,7 @@ subtitle style/.store in=\kvtcb@subtitle@style,% width/.dimstore in=\kvtcb@width, text width/.style={width={#1+\kvtcb@left@rule+\kvtcb@right@rule+\kvtcb@boxsep*2+\kvtcb@leftupper+\kvtcb@rightupper}},% + add to width/.code={\tcbdimto\kvtcb@width{\kvtcb@width+(#1)}},% boxsep/.store in=\kvtcb@boxsep, toprule/.code={% \def\kvtcb@top@rule@stand{#1}% @@ -186,12 +190,12 @@ bottom/.store in=\kvtcb@bottom, bottomtitle/.store in=\kvtcb@bottomtitle, middle/.store in=\kvtcb@middle, - colback/.store in=\kvtcb@colback, - colframe/.store in=\kvtcb@colframe, - colupper/.store in=\kvtcb@colupper, - collower/.store in=\kvtcb@collower, + colback/.colorlet=tcbcol@back, + colframe/.colorlet=tcbcol@frame, + colupper/.colorlet=tcbcol@upper, + collower/.colorlet=tcbcol@lower, coltext/.style={colupper=#1,collower=#1}, - coltitle/.store in=\kvtcb@coltitle, + coltitle/.colorlet=tcbcol@title, fonttitle/.store in=\kvtcb@fonttitle, fontupper/.store in=\kvtcb@fontupper, fontlower/.store in=\kvtcb@fontlower, @@ -211,22 +215,24 @@ parskip/.style={before={\par\pagebreak[0]\parindent=0pt},after={\par}}, noparskip/.style={before={\par\smallskip\pagebreak[0]\parindent=0pt},after={\par\smallskip}}, nobeforeafter/.style={before=,after=}, - before skip/.style={before={\begingroup% - \parindent\z@\parskip\z@\par\nointerlineskip% - \addvspace{#1}\noindent% - \endgroup}}, - after skip/.style={after={\begingroup% - \parindent\z@\parskip\z@\par\nointerlineskip% - \addvspace{#1}% - \endgroup}}, + before skip/.style={before={% + \par\nointerlineskip\lineskip=0pt% + \addvspace{\the\dimexpr#1-\parskip\relax}% + \noindent% + }}, + after skip/.style={after={% + \par\nointerlineskip% + \addvspace{\the\dimexpr#1-\parskip\relax}% + }}, beforeafter skip/.style={before skip={#1},after skip={#1}}, lowerbox/.is choice, lowerbox/visible/.code={\tcb@lowerignoredfalse\tcb@lowervisibletrue}, lowerbox/invisible/.code={\tcb@lowerignoredfalse\tcb@lowervisiblefalse}, lowerbox/ignored/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse}, - natural height/.code={\let\tcb@ch=\tcb@ch@natural}, - height/.code={\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed}, - text height/.code={\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed}, + natural height/.code={\tcb@fixedheightfalse\let\tcb@ch=\tcb@ch@natural}, + height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed}, + text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed}, + add to height/.code={\ifdefined\kvtcb@height@fixed\tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+(#1)}\fi}, height plus/.dimstore in=\kvtcb@height@fixed@plus,% height from/.style args={#1 to #2}{height={#1},height plus={#2-#1}},% height fill/.is choice,% @@ -255,6 +261,9 @@ grow to right by/.code={% \tcbdimto\kvtcb@width{\kvtcb@width+#1}% \pgfkeysalso{enlarge right by={-\the\dimexpr#1\relax}}},% + left skip/.style={grow to left by={-#1}}, + right skip/.style={grow to right by={-#1}}, + leftright skip/.style={left skip={#1},right skip={#1}}, toggle enlargement/.is choice, toggle enlargement/none/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@none}, toggle enlargement/evenpage/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@evenpage}, @@ -365,7 +374,7 @@ tabularx*/.style 2 args={% boxsep=0pt,top=0pt,bottom=0pt,leftupper=0pt,rightupper=0pt, toptitle=1mm,bottomtitle=1mm,boxrule=0.5mm, - before upper={\arrayrulecolor{\kvtcb@colframe}\def\arraystretch{1.1}#1% + before upper={\arrayrulecolor{tcbcol@frame}\def\arraystretch{1.1}#1% \tcb@hack@currenvir\tabularx{\linewidth}{#2}}, after upper=\endtabularx\arrayrulecolor{black}}, tabularx/.style={tabularx*={}{#1}}, @@ -385,6 +394,11 @@ baseline/.store in=\kvtcb@baseline,% tcbox raise/.style={baseline=-#1},% tcbox raise base/.style={baseline=\tcb@val@raisebase},% + box align/.is choice,% + box align/bottom/.style={baseline=0pt},% + box align/top/.style={baseline=\tcb@height},% + box align/center/.style={baseline=\tcb@height/2},% + box align/base/.style={baseline=\tcb@val@raisebase},% shrink tight/.style={boxsep=0mm,top=-\kvtcb@top@rule@stand,bottom=-\kvtcb@bottom@rule@stand,left=-\kvtcb@left@rule,right=-\kvtcb@right@rule},% extrude left by/.code={\tcbdimto\kvtcb@leftupper{\kvtcb@leftupper+#1}\tcbdimto\kvtcb@bbleft{\kvtcb@bbleft-#1}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},% extrude right by/.code={\tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+#1}\tcbdimto\kvtcb@bbright{\kvtcb@bbright-#1}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},% @@ -435,7 +449,7 @@ list entry/.store in=\kvtcb@listentry, list text/.style={list entry={\protect\numberline{\thetcbcounter}{\ignorespaces #1}}}, title filled/.is if=tcb@titlefilled,% - @colbacktitle/.store in=\kvtcb@colbacktitle, + @colbacktitle/.colorlet=tcbcol@backtitle, colbacktitle/.style={title filled,@colbacktitle={#1}}, opacityupper/.store in=\kvtcb@opacityupper, opacitylower/.store in=\kvtcb@opacitylower, @@ -550,7 +564,7 @@ \ifx\kvtcb@title\@empty\tcb@hasTitlefalse\tcb@specialtitle@hook\else% \tcb@hasTitletrue% \tcbdimto\tcb@w@title{\tcb@temp-\kvtcb@lefttitle-\kvtcb@righttitle}% - \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% \fi% } @@ -671,9 +685,13 @@ \addtocounter{tcblayer}{-1}% } +\long\def\tcb@apply@box@options#1{% + \tcbset{#1}\tcb@lateoptions@hook\tcb@afteroptions@hook% +} + \long\def\tcb@@icolorbox[#1]{% \tcb@layer@inc% - \tcbset{capture=minipage,#1}\tcb@height@adjust\tcb@afteroptions@hook% + \tcb@apply@box@options{capture=minipage,#1}\tcb@height@adjust% \tcb@hasLowerfalse% \csname tcb@@capture@\kvtcb@capture\endcsname% } @@ -688,7 +706,7 @@ } \def\tcb@finalize@environment{% - \color{.}% hack for some special cases + %\color{.}% hack for some special cases \tcb@layer@dec% } @@ -740,27 +758,32 @@ } \def\tcb@saveehg#1{% - \immediate\write\@auxout{\string\gdef\string\tcb@ehg@#1@height{\csname tcb@ehg@#1@current\endcsname}}% + \immediate\write\@auxout{\string\csgdef{tcb@ehg@height@#1}{\csuse{tcb@ehg@current@#1}}}% } \def\tcb@ehgadd#1{% - \@ifundefined{tcb@ehg@\tcb@ehgid @current}{% - \expandafter\xdef\csname tcb@ehg@\tcb@ehgid @current\endcsname{#1}% + \ifcsdef{tcb@ehg@current@\tcb@ehgid}{% + \ifdim\csuse{tcb@ehg@current@\tcb@ehgid}<#1\relax% + \csxdef{tcb@ehg@current@\tcb@ehgid}{#1}% + \fi% + }{% + \csxdef{tcb@ehg@current@\tcb@ehgid}{#1}% \edef\tcb@temp{\noexpand\AtEndDocument{\noexpand\tcb@saveehg{\tcb@ehgid}}}% - \tcb@temp}{% - \ifdim\csname tcb@ehg@\tcb@ehgid @current\endcsname<#1% - \expandafter\xdef\csname tcb@ehg@\tcb@ehgid @current\endcsname{#1}\fi}% + \tcb@temp% + }% } \def\tcb@ch@equalheight{% \tcb@ehgadd{\tcb@natheight}% - \@ifundefined{tcb@ehg@\tcb@ehgid @height}{% - \edef\tcb@height{\tcb@natheight}}{% - \ifdim\csname tcb@ehg@\tcb@ehgid @height\endcsname<\tcb@natheight% + \ifcsdef{tcb@ehg@height@\tcb@ehgid}{% + \ifdim\csuse{tcb@ehg@height@\tcb@ehgid}<\tcb@natheight\relax% + \edef\tcb@height{\tcb@natheight}% + \else% + \letcs{\tcb@height}{tcb@ehg@height@\tcb@ehgid}% + \fi% + }{% \edef\tcb@height{\tcb@natheight}% - \else - \edef\tcb@height{\csname tcb@ehg@\tcb@ehgid @height\endcsname}% - \fi}% + }% \iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi% } @@ -878,7 +901,7 @@ \def\tcb@drawframe@standard{% \begin{pgfscope}% \tcb@boundaryframe@standard% - \pgfsetfillcolor{\kvtcb@colframe}% + \pgfsetfillcolor{tcbcol@frame}% \pgfsetfillopacity{\kvtcb@opacityframe}% \pgfusepath{fill}% \end{pgfscope}% @@ -888,7 +911,7 @@ \def\tcb@drawframe@standardjigsaw{% \begin{pgfscope}% \tcb@boundaryframe@standardjigsaw% - \pgfsetfillcolor{\kvtcb@colframe}% + \pgfsetfillcolor{tcbcol@frame}% \pgfsetfillopacity{\kvtcb@opacityframe}% \pgfusepath{fill}% \end{pgfscope}% @@ -898,7 +921,7 @@ \def\tcb@drawwithtitle@standard{% \begin{pgfscope}% \tcb@boundaryinterior@title@standard% - \pgfsetfillcolor{\kvtcb@colback}% + \pgfsetfillcolor{tcbcol@back}% \pgfsetfillopacity{\kvtcb@opacityback}% \pgfusepath{fill}% \end{pgfscope}% @@ -908,7 +931,7 @@ \def\tcb@drawwithouttitle@standard{% \begin{pgfscope}% \tcb@boundaryinterior@notitle@standard% - \pgfsetfillcolor{\kvtcb@colback}% + \pgfsetfillcolor{tcbcol@back}% \pgfsetfillopacity{\kvtcb@opacityback}% \pgfusepath{fill}% \end{pgfscope}% @@ -918,7 +941,7 @@ \def\tcb@drawtitle@standard{% \begin{pgfscope}% \tcb@boundarytitle@standard% - \pgfsetfillcolor{\kvtcb@colbacktitle}% + \pgfsetfillcolor{tcbcol@backtitle}% \pgfsetfillopacity{\kvtcb@opacitybacktitle}% \pgfusepath{fill}% \end{pgfscope}% @@ -937,7 +960,7 @@ \pgfpathmoveto{\pgfqpoint{\kvtcb@left@rule}{\tcb@seg@pos}}% \pgfpathlineto{\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}% \fi% - \pgfsetcolor{\kvtcb@colframe}% + \pgfsetcolor{tcbcol@frame}% \pgfsetstrokeopacity{\kvtcb@opacityframe}% \pgfusepath{stroke}% \end{pgfscope}% @@ -1013,7 +1036,7 @@ \pgfsetfillopacity{\kvtcb@opacitytitle}% \pgftext[x=\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@lefttitle\relax, y=\the\dimexpr\tcb@height-\kvtcb@top@rule-\kvtcb@boxsep-\kvtcb@toptitle\relax, - left,top]{\color{\kvtcb@coltitle}\box\tcb@titlebox}% + left,top]{\color{tcbcol@title}\box\tcb@titlebox}% \end{pgfscope}% \fi% } @@ -1024,7 +1047,7 @@ \pgfsetfillopacity{\kvtcb@opacityupper}% \csname tcb@dbox@\kvtcb@valign\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper\relax}% {\the\dimexpr\tcb@innerheight+\kvtcb@bottom@rule-\kvtcb@boxsep-\tcb@break@topsep-\kvtcb@top-\tcb@height@upper\relax}% - {\tcb@height@upper}{\tcb@upperbox}{\kvtcb@colupper}% + {\tcb@height@upper}{\tcb@upperbox}{tcbcol@upper}% \end{pgfscope}% } \let\tcb@tdraw@upper=\tcb@tdraw@upper@core @@ -1035,7 +1058,7 @@ \pgfsetfillopacity{\kvtcb@opacitylower}% \csname tcb@dbox@\kvtcb@valignlower\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftlower\relax}% {\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep+\tcb@break@bottomsep+\kvtcb@bottom\relax}% - {\tcb@height@lower}{\tcb@lowerbox}{\kvtcb@collower}% + {\tcb@height@lower}{\tcb@lowerbox}{tcbcol@lower}% \end{pgfscope}% \fi% } @@ -1046,7 +1069,7 @@ \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\color{\kvtcb@collower}\unhbox\tcb@lowerbox% + \iftcb@lowervisible\color{tcbcol@lower}\unhbox\tcb@lowerbox% \else% \iftcb@lowerignored\else\rule[-\dp\tcb@lowerbox]{0pt}{\the\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox\relax}\fi% \fi% @@ -1173,7 +1196,7 @@ \long\def\tcbox@inner@hbox#1{% \tcbset{breakable@false,sidebyside=false}% - \sbox\tcb@upperbox{\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}% + \sbox\tcb@upperbox{\color{tcbcol@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}% \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}% \tcbdimto{\tcb@val@raisebase}{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}% \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}% @@ -1186,7 +1209,7 @@ \tcbset{breakable@false,sidebyside=false}% \let\tcb@val@raisebase=\tcb@zpt% \tcb@set@@dim@and@title% - \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{tcbcol@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}% \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}% \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}% \tcb@hasLowerfalse% @@ -1197,7 +1220,7 @@ \long\def\tcb@ox#1#2{% \begingroup% \tcb@layer@inc% - \tcbset{#1}\tcb@height@adjust\tcb@afteroptions@hook% + \tcb@apply@box@options{#1}\tcb@height@adjust% \csname tcbox@inner@\kvtcb@capture\endcsname{#2}% \tcb@layer@dec% \endgroup% @@ -1209,13 +1232,13 @@ \newcommand{\tcbsubtitle}[2][]{% \begingroup% - \let\tcb@trans@colframe\kvtcb@colframe% + \colorlet{tcbtranscol@frame}{tcbcol@frame}% \iftcb@titlefilled% - \let\tcb@trans@colback\kvtcb@colbacktitle% + \colorlet{tcbtranscol@back}{tcbcol@backtitle}% \else% - \let\tcb@trans@colback\kvtcb@colframe% + \colorlet{tcbtranscol@back}{tcbcol@frame}% \fi% - \let\tcb@trans@colupper\kvtcb@coltitle% + \colorlet{tcbtranscol@upper}{tcbcol@title}% \let\tcb@trans@fontupper\kvtcb@fonttitle% \let\tcb@trans@boxsep\kvtcb@boxsep% \let\tcb@trans@left\kvtcb@leftupper% @@ -1226,8 +1249,8 @@ \let\tcb@trans@style\kvtcb@subtitle@style% \begin{tcolorbox}[sharp corners, before skip={0.5\baselineskip},after skip={0.5\baselineskip}, - colframe=\tcb@trans@colframe,colback=\tcb@trans@colback, - colupper=\tcb@trans@colupper,fontupper=\tcb@trans@fontupper, + colframe=tcbtranscol@frame,colback=tcbtranscol@back, + colupper=tcbtranscol@upper,fontupper=\tcb@trans@fontupper, boxsep=\tcb@trans@boxsep,left=\tcb@trans@left,right=\tcb@trans@right, top=\tcb@trans@top,bottom=\tcb@trans@bottom, boxrule=\tcb@trans@rule,leftrule=0pt,rightrule=0pt,oversize, @@ -1278,7 +1301,7 @@ \csxdef{the\tcbcounter}{\kvtcb@new@freestyle}% \fi% \global\csletcs{thetcb@cnt@#1}{the\tcbcounter}% - \appto\tcb@new@colopt{,code={\letcs\tcbcounter{tcb@cnt@#1}\letcs\thetcbcounter{thetcb@cnt@#1}\preto\kvtcb@phantom{\refstepcounter{\tcbcounter}}}}% + \appto\tcb@new@colopt{,code={\letcs\tcbcounter{tcb@cnt@#1}\letcs\thetcbcounter{thetcb@cnt@#1}\stepcounter{\tcbcounter}\preto\kvtcb@phantom{\addtocounter{\tcbcounter}{-1}\refstepcounter{\tcbcounter}}}}% } \def\tcb@proc@counter@auto#1{% @@ -1295,7 +1318,7 @@ \def\tcb@proc@counter@from#1{% \csxdef{tcb@cnt@#1}{\kvtcb@new@counter}% \global\csletcs{thetcb@cnt@#1}{the\kvtcb@new@counter}% - \appto\tcb@new@colopt{,code={\letcs\tcbcounter{tcb@cnt@#1}\letcs\thetcbcounter{thetcb@cnt@#1}\preto\kvtcb@phantom{\refstepcounter{\tcbcounter}}}}% + \appto\tcb@new@colopt{,code={\letcs\tcbcounter{tcb@cnt@#1}\letcs\thetcbcounter{thetcb@cnt@#1}\stepcounter{\tcbcounter}\preto\kvtcb@phantom{\addtocounter{\tcbcounter}{-1}\refstepcounter{\tcbcounter}}}}% } \def\tcb@proc@counter@no#1{% @@ -1492,7 +1515,8 @@ \tcbset{% initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},% reset/.code={\tcb@reset},% - reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@}, + reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@% + \let\tcb@lateoptions@hook\@empty}, width=\linewidth,autoparskip, natural height,height plus=0pt,space to lower,valign=top,valign lower=top, size=normal,rounded corners, @@ -1526,7 +1550,8 @@ \def\tcb@check@library@version{% \ifx\tcb@library@version\tcb@version\else% - \PackageError{tcolorbox}{tcolorbox version '\tcb@version' loads library '\tcb@library@inload' with version '\tcb@library@version'} + \tcb@error{tcolorbox version '\tcb@version' loads library '\tcb@library@inload' with version '\tcb@library@version'}% + {tcolorbox is not installed correctly. At least one library is not compatible to the main package.}% \fi% } @@ -1574,6 +1599,7 @@ \tcb@add@library{minted}{tcbminted.code.tex} \tcb@add@library{theorems}{tcbtheorems.code.tex} \tcb@add@library{documentation}{tcbdocumentation.code.tex} +\tcb@add@library{raster}{tcbraster.code.tex} \tcb@add@library{skins@jigsaw}{tcbskinsjigsaw.code.tex} \tcb@add@library{skins}{tcbskins.code.tex} \tcb@add@library{breakable}{tcbbreakable.code.tex} @@ -1581,7 +1607,7 @@ \tcb@add@library{fitting}{tcbfitting.code.tex} \tcb@add@library{xparse}{tcbxparse.code.tex} -\tcb@add@library@style{many}{skins,breakable,hooks,theorems,fitting,xparse} +\tcb@add@library@style{many}{raster,skins,breakable,hooks,theorems,fitting,xparse} \tcb@add@library@style{most}{many,listingsutf8} \tcb@add@library@style{all}{many,minted,listingsutf8,documentation} |