diff options
author | Karl Berry <karl@freefriends.org> | 2014-02-06 23:22:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-02-06 23:22:11 +0000 |
commit | 2385abbf2b7e9cee66fd032dcc7ca204808f1135 (patch) | |
tree | 2e2e1a60f376f9751a6e45f49273d39e47185be9 /Master | |
parent | 60d128571258b0d294d7cc43bd4227b4f7b7f076 (diff) |
tcolorbox (6feb14)
git-svn-id: svn://tug.org/texlive/trunk@32886 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
29 files changed, 1039 insertions, 319 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 0e38c2c3c86..64e18b57952 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,7 +1,7 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% 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 @@ -383,3 +383,32 @@ version 2.61 (2014/01/10) - library 'fitting': * alternative fitting algorithms implemented (fontsize, areasize, hybrid, squeeze) * new option: 'fit algorithm' + +version 2.70 (2014/02/06) +- bug fix: global setting of 'before' or 'after' may produce errors or + side effects for layered boxes. +- compatibility issue with TikZ 3.00 solved +- new options: + 'detach title', 'attach title', 'attach title to upper', + 'tikznode upper', 'tikznode lower', 'tikznode' +- library 'theorems': + * new options: + 'separator sign none', 'terminator sign', 'terminator sign colon', + 'terminator sign dash', 'terminator sign none', 'description delimiters', + 'description delimiters parenthesis', 'description delimiters none', + 'theorem name and number', 'theorem number and name', 'theorem name', + 'theorem style' +- library 'documentation': + * re-implementation of the documenting environments + (may alter existing documents slightly) + * new environments: + 'docCommand*', 'docEnvironment*', 'docKey*' + * new commands: + '\docAuxCommand*', '\docAuxEnvironment', '\docAuxEnvironment*', + '\docValue', '\docValue*', '\docAuxKey', '\docAuxKey*', + '\docColor*', '\refAux', '\refAuxcs' + * new options: + 'doc left', 'doc right', 'doc left indent', 'doc right indent', + 'doc head', 'doc head command', 'doc head environment', 'doc head key', + 'doc description', 'doc into index', 'value', 'values' + diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 52d3f038fe9..097953248de 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,7 +1,7 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% 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 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 16cee65d0bb..492f0a76a7e 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 5f8c5b535dc..dd185f81369 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% 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 @@ -101,6 +101,18 @@ This is a \LaTeX\ example: We have given Theorem \ref{theorem:summation} on page \pageref{theorem:summation}. +\newtcbtheorem[use counter from=theo]{antheo}% + {Theorem}{theorem style=change,oversize,enlarge top by=1mm,enlarge bottom by=1mm, + enhanced jigsaw,interior hidden,fuzzy halo=1mm with green, + fonttitle=\bfseries\upshape,fontupper=\slshape, + colframe=green!75!black,coltitle=green!50!blue!75!black}{antheorem} + +\begin{antheo}{Summation of Numbers}{summation} + For all natural number $n$ it holds: + \begin{equation} + \tcbhighmath{\sum\limits_{i=1}^n i = \frac{n(n+1)}{2}.} + \end{equation} +\end{antheo} %---------------------------------------------------------- \section{Watermarks} @@ -123,7 +135,7 @@ We have given Theorem \ref{theorem:summation} on page \pageref{theorem:summation colbacktitle=red!85!black, title=Box inside box,drop fuzzy shadow] \begin{tcolorbox}[beamer,colframe=blue!50!black,title=Box inside box inside box] - An now for something completely different: Boxes!\par\medskip + And now for something completely different: Boxes!\par\medskip \newtcbox{\mybox}{nobeforeafter,tcbox raise base,colframe=green!50!black,colback=green!10!white,arc=0pt} \mybox{This} \mybox{is} \mybox{another} \mybox{box.} \end{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 e53fa8671f7..795e97388c1 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.abstract.tex @@ -1,10 +1,11 @@ % !TeX root = tcolorbox.tex % include file of tcolorbox.tex (manual of the LaTeX package tcolorbox) \begin{tcboutputlisting} -\begin{inctext}[a4paper] -\begin{tikzpicture}% -\definecolorseries{boxcol}{rgb}{last}{red}{blue}% -\resetcolorseries[24]{boxcol}% +% \usepackage{incgraph} +\begin{inctext} +\begin{tikzpicture} +\definecolorseries{boxcol}{rgb}{last}{red}{blue} +\resetcolorseries[24]{boxcol} \coordinate (A) at (0,0); \coordinate (B) at (21,29.7); \path[use as bounding box,top color=Goldenrod!25!white,bottom color=Navy!25!white] (A) rectangle coordinate (C) (B); @@ -15,7 +16,7 @@ colback=boxcol!25!white,colbacktitle=boxcol!!+!50!black,colframe=boxcol, enhanced jigsaw,opacityback=0.5,opacitybacktitle=0.75] \lipsum[2] - \end{tcolorbox}};% + \end{tcolorbox}}; } \node[font=\Huge\bfseries] at ([yshift=12cm]C) {|tcolorbox|}; \node[font=\large\bfseries] at ([yshift=-12cm]C) @@ -32,13 +33,12 @@ \hspace{0pt} \clearpage \begin{center} -\vspace*{5mm} -\begin{tcolorbox}[enhanced, - center upper,width=9cm,boxrule=0.4pt, - colback=white,colframe=black!50!yellow,drop fuzzy midday shadow=black!50!yellow] -{\bfseries\LARGE The \texttt{tcolorbox} package\par}\medskip -{\large Manual for version \version\ (\datum)\par} -\end{tcolorbox}\bigskip +\begin{tcolorbox}[enhanced,hbox,tikznode,left=8mm,right=8mm,boxrule=0.4pt, + colback=white,colframe=black!50!yellow,drop fuzzy midday shadow=black!50!yellow, + before=\par\vspace*{5mm},after=\par\bigskip] +{\bfseries\LARGE The \texttt{tcolorbox} package}\\[3mm] +{\large Manual for version \version\ (\datum)} +\end{tcolorbox} {\large Thomas F.~Sturm% \footnote{Prof.~Dr.~Dr.~Thomas F.~Sturm, Institut f\"{u}r Mathematik und Informatik, Universit\"{a}t der Bundeswehr M\"{u}nchen, D-85577 Neubiberg, Germany; @@ -55,7 +55,7 @@ saving and reuse of source code and text parts. \end{absquote} -\begin{tcolorbox}[breakable,enhanced,title={Contents},fonttitle=\bfseries\Large, +\begin{tcolorbox}[breakable,enhanced jigsaw,title={Contents},fonttitle=\bfseries\Large, colback=yellow!10!white,colframe=red!50!black,before=\par\bigskip\noindent, watermark color=yellow!75!red!25!white,pad at break=3mm, watermark text={\bfseries\Large Contents}, diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib index 5c2f71ae2d4..91147c35d9b 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib @@ -1,10 +1,9 @@ -@manual{heinz:2007a, - author = {Carsten Heinz and Brooks Moses}, +@manual{heinz:2013a, + author = {Carsten Heinz and Brooks Moses and Jobst Hoffmann}, title = {The Listings Package}, url = {http://mirror.ctan.org/macros/latex/contrib/listings/listings.pdf}, - note = {Version 1.4}, - month = feb, - year = 2007, + version = {1.5b}, + date = {2013-08-26}, language = {english} } @@ -60,12 +59,12 @@ language = {german} } -@manual{tantau:2010c, +@manual{tantau:2013a, author = {Till Tantau}, title = {The TikZ and PGF Packages}, - subtitle = {Manual for version 2.10}, - url = {http://mirror.ctan.org/graphics/pgf/base/doc/generic/pgf/pgfmanual.pdf}, - date = {2010-10-25}, + subtitle = {Manual for version 3.0.0}, + url = {http://sourceforge.net/projects/pgf/}, + date = {2013-12-20}, } @manual{thorub:2007a, diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex index cbcb98b5f61..19d9f143bdb 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -94,9 +94,7 @@ parameters. The differences are: inside the content of an outer |tcolorbox|, you have to guard this with a \TeX\ group. \item If your text content contains some text color changing commands, - your color will not survive the break to the next box\footnote{The reason is that - I am to dumb to catch the current color at the split point. If you know the trick, - let me know.}. + your color will not survive the break to the next box. \end{itemize} @@ -112,11 +110,11 @@ parameters. The differences are: by the counter |tcbbreakpart|. \begin{dispListing} % \usepackage{lipsum} % preamble - \tcbset{colback=red!5!white,colframe=red!75!black, + \tcbset{enhanced jigsaw,colback=red!5!white,colframe=red!75!black, watermark color=yellow!25!white,watermark text=\arabic{tcbbreakpart}, fonttitle=\bfseries} - \begin{tcolorbox}[breakable,enhanced,title=My breakable box] + \begin{tcolorbox}[breakable,title=My breakable box] \lipsum[1-6] \end{tcolorbox} \end{dispListing} @@ -239,7 +237,7 @@ parameters. The differences are: % \usepackage{lipsum} % preamble \tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries} -\begin{tcolorbox}[enhanced,breakable,pad at break=0mm, +\begin{tcolorbox}[enhanced jigsaw,breakable,pad at break=0mm, title={For this box, the pad space at the break point is set to 0mm}] \lipsum[1-2] \end{tcolorbox} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex index 6eab6e60e38..135ea125d90 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex @@ -127,6 +127,22 @@ Text \tcbox[tcbox raise base]{Hello World}\hfill title=My picture]{% \includegraphics[width=5cm]{Basilica_5.png}} \end{dispExample} + +\begin{dispExample} +% \usepackage{tikz} +\tcbset{colframe=blue!50!black,colback=white,colupper=red!50!black, + fonttitle=\bfseries,center title} + +% Fixed width box +\begin{tcolorbox}Hello\\World!\end{tcolorbox} + +% Fitted width box (like hbox or makebox) +\tcbox{Hello\\World!} + +% Fitted width box (using a TikZ node) +\tcbox[tikznode]{Hello\\World!} +\end{dispExample} + \end{docCommand} \clearpage 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 7008cbdab9b..cac968f3641 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -5,7 +5,7 @@ For the \meta{options} in \refEnv{tcolorbox} respectively \refCom{tcbset} the following |pgf| keys can be applied. The key tree path |/tcb/| is not to be used inside these macros. It is easy to add your own style keys using -the syntax for |pgf| keys, see \cite{tantau:2010c,sturm:2012k} or the examples +the syntax for |pgf| keys, see \cite{tantau:2013a,sturm:2012k} or the examples starting from page \pageref{sec:latextutorial}. @@ -51,6 +51,58 @@ Now, we try again with adjusted titles:\\ never exceed '\"Apgjy' in depth and height you don't need to care about this option. \end{docTcbKey} +\clearpage + +\begin{docTcbKey}{detach title}{}{no value} +Detaches the title from its normal position. The text of the title is +stored into \docAuxCommand{tcbtitletext} and the formatted title is +available by \docAuxCommand{tcbtitle}. +The main application is to move the title from its usual place to another one. +\begin{dispExample} +\newtcolorbox{mybox}[2][]{colbacktitle=red!10!white, + colback=blue!10!white,coltitle=red!70!black, + title={#2},fonttitle=\bfseries,#1} + +\begin{mybox}{My title} + This is a \textbf{tcolorbox}. +\end{mybox} +\begin{mybox}[detach title,before upper={\tcbtitle\quad}]{My title} + This is a \textbf{tcolorbox}. +\end{mybox} +\begin{mybox}[detach title,after upper={\par\hfill\tcbtitle}]{My title} + This is a \textbf{tcolorbox}. +\end{mybox} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{attach title}{}{no value} +Attaches the title to its normal position. This option is used to reverse +\refKey{/tcb/detach title}. +\end{docTcbKey} + + +\begin{docTcbKey}{attach title to upper}{\colOpt{=\meta{text}}}{style, default empty, initially unset} +Attaches the title to the begin of the upper part of the box content. +The optional \meta{text} is set between the formatted title and the box content. +\begin{dispExample} +\newtcolorbox{mybox}[2][]{colbacktitle=red!10!white, + colback=blue!10!white,coltitle=red!70!black, + title={#2},fonttitle=\bfseries,#1} + +\begin{mybox}[attach title to upper={\ ---\ }]{My title} + This is a \textbf{tcolorbox}. +\end{mybox} +\begin{mybox}[attach title to upper,after title={:\ }]{My title} + This is a \textbf{tcolorbox}. +\end{mybox} +\end{dispExample} +\end{docTcbKey} + + +\bigskip +\begin{marker} +More title options are documented in \Vref{subsec:contentadditions}. +\end{marker} \clearpage @@ -1359,7 +1411,7 @@ One & Two & Three \\\hline\hline \clearpage \begin{docTcbKey}{tikz upper}{\colOpt{=\meta{options}}}{style} This style adds a centered |tikzpicture| environment to the start and end - of the upper part. + of the upper part. The \meta{options} may be given as TikZ picture options. \begin{dispExample} % \usepackage{tikz} @@ -1375,7 +1427,7 @@ One & Two & Three \\\hline\hline \begin{docTcbKey}{tikz lower}{\colOpt{=\meta{options}}}{style} This style adds a centered |tikzpicture| environment to the start and end - of the lower part. + of the lower part. The \meta{options} may be given as TikZ picture options. \begin{dispExample} % \usepackage{tikz} % \usetikzlibrary{skins,listings} @@ -1396,6 +1448,41 @@ One & Two & Three \\\hline\hline \clearpage +\begin{docTcbKey}{tikznode upper}{\colOpt{=\meta{options}}}{style} + This style places the upper part content into a centered + TikZ node. The \meta{options} may be given as TikZ node options. + This style is especially useful for boxes with multiline texts which are + fitted to the text width. +\begin{dispExample} +% \usepackage{tikz} +\newtcbox{\headline}[1][]{enhanced,before=\begin{center},after=\end{center}, + fontupper=\Large\bfseries,colframe=red!50!black,colback=red!10!white, + drop fuzzy shadow=yellow,tikznode upper,#1} + +\headline{Important\\Headline} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{tikznode lower}{\colOpt{=\meta{options}}}{style} + This style places the lower part content into a centered + TikZ node. The \meta{options} may be given as TikZ node options. +\begin{dispExample} +% \usepackage{tikz} +\begin{tcolorbox}[bicolor,colback=LightBlue!50!white,colbacklower=white, + colframe=black,tikznode lower={inner sep=2pt,draw=red,fill=yellow}] +Upper part. +\tcblower +Lower part. +\end{tcolorbox} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{tikznode}{\colOpt{=\meta{options}}}{style} + Shortcut for setting \refKey{/tcb/tikznode upper} and \refKey{/tcb/tikznode lower} + the same time. +\end{docTcbKey} + +%\clearpage \begin{docTcbKey}{code}{=\meta{code}}{no default, initially unset} The given \meta{code} is executed immediately. This option is useful to place some arbitrary code into an option list. @@ -1670,7 +1757,7 @@ This is the lower (\textit{right-handed}) part. \begin{docTcbKey}{sidebyside align}{=\meta{alignment value}}{no default, initially |center|} Sets the vertical alignment for the left-handed and right-handed part. - Feasible values are |center|, |top|, and |bottom|. + Feasible values are \docValue{center}, \docValue{top}, and \docValue{bottom}. \begin{dispExample} \tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries,nobeforeafter, left=2mm,right=2mm,sidebyside,sidebyside gap=6mm,width=(\linewidth-2mm)/3} @@ -1975,9 +2062,9 @@ This is a \textbf{tcolorbox}. According to the \meta{toggle preset}, the left and the right enlargements of the bounding box are switched or not. Feasible values are: \begin{itemize} - \item |none|: no switching. - \item |forced|: the values of the left and right enlargement are switched. - \item |evenpage|: if the page is an even page, the values of the left and + \item\docValue{none}: no switching. + \item\docValue{forced}: the values of the left and right enlargement are switched. + \item\docValue{evenpage}: if the page is an even page, the values of the left and right enlargement are switched. It is recommended that one use this setting in conjunction with \refKey{/tcb/check odd page}. %Note that the page number detection may @@ -2182,6 +2269,7 @@ It may be changed by redefining this style. \tcbset{every box/.style={enhanced}} \end{dispListing} +\medskip \begin{marker} The alternative for setting something for every box (on every layer) is\\ \refCom{tcbsetforeverylayer}: @@ -2227,7 +2315,7 @@ not forbidden. \begin{tcboutputlisting} % \usepackage{lipsum} % \tcbuselibrary{skins,breakable} -\tcbset{enhanced,breakable,colframe=red!75!black,fonttitle=\bfseries, +\tcbset{enhanced jigsaw,breakable,colframe=red!75!black,fonttitle=\bfseries, colback=red!5!white, every box/.style={enhanced,watermark text=\thetcblayer, before=\par\smallskip,after=\par\smallskip}, @@ -2270,17 +2358,17 @@ Some text\footnote{Footnote from some text}. Feasible values for \meta{mode} are: \begin{itemize} -\item |minipage|:\\ +\item\docValue{minipage}:\\ This is the default \meta{mode} for \refEnv{tcolorbox}. The content may have an upper and a lower part. Optionally, the box can be \refKey{/tcb/breakable}. The box content is put into a minipage or into something similar to a minipage. -\item |hbox|:\\ +\item\docValue{hbox}:\\ This is the default \meta{mode} for \refCom{tcbox}. The content cannot have a lower part and cannot be broken. The colored box is sized according to the dimensions of the content. A shortcut to set this mode is \refKey{/tcb/hbox}. -\item |fitbox|: (needs the \mylib{fitting} library)\\ +\item\docValue{fitbox}: (needs the \mylib{fitting} library)\\ This is the default \meta{mode} for \refCom{tcboxfit}. The content cannot have a lower part and cannot be broken. The content is sized according to the dimensions of the colored box. diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex index 0242d15119e..2b6e64f95c3 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex @@ -4,7 +4,7 @@ \section{Library \mylib{documentation}}\label{sec:documentation} This library has the single purpose to support \LaTeX\ package documentations like this one. Actually, the visual nature follows the approach from -Till Tantau's |pgf| \cite{tantau:2010c} documentation. +Till Tantau's |pgf| \cite{tantau:2013a} documentation. Typically, this library is assumed to be used in conjunction with the class |ltxdoc| or alike. @@ -29,7 +29,6 @@ For |minted| \cite{rudolph:2011a} support, load: \subsection{Macros of the Library} - \begin{docEnvironment}[doclang/environment content=command description]{docCommand}{\oarg{options}\marg{name}\marg{parameters}} Documents a \LaTeX\ macro with given \meta{name} where \meta{name} is written without backslash. The given \meta{options} are set with \refCom{tcbset}. @@ -51,7 +50,13 @@ For |minted| \cite{rudolph:2011a} support, load: \end{dispExample} \end{docEnvironment} -\clearpage + +\begin{docEnvironment}[doclang/environment content=command description]{docCommand*}{\oarg{options}\marg{name}\marg{parameters}} + Identical to \refEnv{docCommand}, but without index entry. +\end{docEnvironment} + + +%\clearpage {\let\xdocEnvironment\docEnvironment \let\endxdocEnvironment\enddocEnvironment \begin{xdocEnvironment}[doclang/environment content=environment description]{docEnvironment}{\oarg{options}\marg{name}\marg{parameters}} @@ -76,6 +81,12 @@ For |minted| \cite{rudolph:2011a} support, load: \end{dispExample} \end{xdocEnvironment}} +{\let\xdocEnvironment\docEnvironment +\let\endxdocEnvironment\enddocEnvironment +\begin{xdocEnvironment}[doclang/environment content=environment description]{docEnvironment*}{\oarg{options}\marg{name}\marg{parameters}} + Identical to \refEnv{docEnvironment}, but without index entry. +\end{xdocEnvironment}} + \begin{docEnvironment}[doclang/environment content=key description]{docKey}{\oarg{key path}\marg{name}\marg{parameters}\marg{description}} Documents a key with given \meta{name} and an optional \meta{key path}. @@ -91,6 +102,25 @@ For |minted| \cite{rudolph:2011a} support, load: \end{docEnvironment} +\begin{docEnvironment}[doclang/environment content=key description]{docKey*}{\oarg{key path}\marg{name}\marg{parameters}\marg{description}} + Identical to \refEnv{docKey}, but without index entry. +\end{docEnvironment} + + +\begin{docCommand}{docValue}{\marg{name}} + Documents a value with given \meta{name}. Typically, this is a value for a key. + This value is automatically indexed. +\begin{dispExample} +A feasible value for \refKey{/foo/footitle} is \docValue{foovalue}. +\end{dispExample} +\end{docCommand} + + +\begin{docCommand}{docValue*}{\marg{name}} + Identical to \refCom{docValue}, but without index entry. +\end{docCommand} + + \begin{docCommand}{docAuxCommand}{\marg{name}} Documents an auxiliary or minor \LaTeX\ macro with given \meta{name} where \meta{name} is written without backslash. @@ -100,6 +130,37 @@ The macro \docAuxCommand{fooaux} holds some interesting data. \end{dispExample} \end{docCommand} +\begin{docCommand}{docAuxCommand*}{\marg{name}} + Identical to \refCom{docAuxCommand}, but without index entry. +\end{docCommand} + +\begin{docCommand}{docAuxEnvironment}{\marg{name}} + Documents an auxiliary or minor \LaTeX\ environment with given \meta{name}. + This macro is automatically indexed. +\begin{dispExample} +The environment \docAuxEnvironment{fooauxenv} holds some interesting data. +\end{dispExample} +\end{docCommand} + +\begin{docCommand}{docAuxEnvironment*}{\marg{name}} + Identical to \refCom{docAuxEnvironment}, but without index entry. +\end{docCommand} + + +\begin{docCommand}{docAuxKey}{\marg{name}} + Documents an auxiliary key with given \meta{name} including path. + It is automatically indexed. +\begin{dispExample} +The key \docAuxEnvironment{/foo/fooaux} holds some interesting data. +\end{dispExample} +\end{docCommand} + + +\begin{docCommand}{docAuxKey*}{\marg{name}} + Identical to \refCom{docAuxKey}, but without index entry. +\end{docCommand} + + \clearpage \begin{docCommand}{docColor}{\marg{name}} Documents a color with given \meta{name}. The color is automatically indexed. @@ -108,6 +169,10 @@ The color \docColor{foocolor} is available. \end{dispExample} \end{docCommand} +\begin{docCommand}{docAuxColor*}{\marg{name}} + Identical to \refCom{docColor}, but without index entry. +\end{docCommand} + \begin{docCommand}{cs}{\marg{name}} Macro from |ltxdoc| \cite{carlisle:2007a} to typeset a command word \meta{name} @@ -119,6 +184,7 @@ This is a \cs{foocommand}. \begin{docCommand}{meta}{\marg{text}} Macro from |doc| \cite{mittelbach:2011a} to typeset a meta \meta{text}. + The library overwrites the original macro. \begin{dispExample} This is a \meta{text}. \end{dispExample} @@ -225,12 +291,18 @@ heading line. Optionally, such a box can be split in an upper and a lower part. Creates a new environment \meta{name} based on \refEnv{docKey} for the documentation of keys with the given \meta{key path} as default. The new environment \meta{name} takes the same para\-meters as \refEnv{docKey} itself. + A second starred environment \meta{name} is also created, which is identical + to \meta{name} but without index entry. \begin{dispExample} \tcbmakedocSubKey{docFooKey}{foo} \begin{docFooKey}{foodummy}{=\meta{nothing}}{no default, initially empty} Some key. \end{docFooKey} + +\begin{docFooKey*}{foo another dummy}{=\meta{nothing}}{no default, initially empty} +Some key (not indexed). +\end{docFooKey*} \end{dispExample} \end{docCommand} @@ -288,6 +360,25 @@ We have created \refKey*{/foo/footitle} as an example. \end{dispExample} \end{docCommand} + +\begin{docCommand}{refAux}{\marg{name}} + References some auxiliary environment, key, value, or color. The hyperlink color is + used, but there is no real link. +\begin{dispExample} +Some pages back, one can see \refAux{/foo/footitle} as an example. +\end{dispExample} +\end{docCommand} + +\begin{docCommand}{refAuxcs}{\marg{name}} + References some auxiliary macro \meta{name} where \meta{name} is + written without backslash. The hyperlink color is + used, but there is no real link. +\begin{dispExample} +Some pages back, one can see \refAuxcs{fooaux} as an example. +\end{dispExample} +\end{docCommand} + + % \begin{docCommand}{colDef}{\marg{text}} Sets \meta{text} with the definition color, see \refKey{/tcb/color definition}. @@ -315,7 +406,7 @@ This is my \colOpt{text}. \end{docTcbKey} \begin{docTcbKey}{documentation listing options}{=\meta{key list}}{no default,\\\hspace*{\fill} initially |style=tcbdocumentation|} - Sets the options from the package |listings| \cite{heinz:2007a}. + Sets the options from the package |listings| \cite{heinz:2013a}. They are used inside \refEnv{dispExample} and \refEnv{dispListing} to typeset the listings. Note that this is not identical to the key \refKey{/tcb/listing options} which is used for 'normal' listings.\\ @@ -325,7 +416,7 @@ This is my \colOpt{text}. \begin{docTcbKey}{documentation listing style}{=\meta{listing style}}{no default, initially |tcbdocumentation|} Abbreviation for |documentation listing options={style=...}|. This key sets a \meta{style} - for the |listings| package, see \cite{heinz:2007a}. + for the |listings| package, see \cite{heinz:2013a}. Note that this is not identical to the key \refKey{/tcb/listing style} which is used for 'normal' listings.\\ Used for \refKey{/tcb/listing engine}|=listings| only. @@ -373,13 +464,13 @@ This is my \colOpt{text}. Determines the basic \meta{format} of the generated index. Feasible values are: \begin{itemize} - \item |pgfsection|: The index is formatted like in the |pgf| documentation (as a section). - \item |pgfchapter|: The index is formatted like in the |pgf| documentation (as a chapter). - \item |pgf|: Alias for |pgfsection|. - \item |doc|: The index is assumed to be formatted by |doc|/|ltxdoc|. A usage of |makeindex| + \item\docValue{pgfsection}: The index is formatted like in the |pgf| documentation (as a section). + \item\docValue{pgfchapter}: The index is formatted like in the |pgf| documentation (as a chapter). + \item\docValue{pgf}: Alias for |pgfsection|. + \item\docValue{doc}: The index is assumed to be formatted by |doc| or |ltxdoc|. The usage of |makeindex| with |-s gind.ist| is assumed. The package |hypdoc| has to be loaded \emph{before} |tcolorbox|. - \item |off|: The index is not formatted by |tcolorbox|. + \item\docValue{off}: The index is not formatted by |tcolorbox|. \end{itemize} \end{docTcbKey} @@ -412,7 +503,7 @@ This is my \colOpt{text}. \end{dispListing} \end{docTcbKey} -%\clearpage + The following keys are provided for language specific settings. The English language is predefined. @@ -444,6 +535,14 @@ The English language is predefined. Text used in the index for keys. \end{langTcbKey} +\begin{langTcbKey}{value}{=\meta{text}}{no default, initially |value|} + Text used in the index for values. +\end{langTcbKey} + +\begin{langTcbKey}{values}{=\meta{text}}{no default, initially |Values|} + Heading text in the index for values. +\end{langTcbKey} + \begin{langTcbKey}{index}{=\meta{text}}{no default, initially |Index|} Heading text for the index. \end{langTcbKey} @@ -453,6 +552,127 @@ The English language is predefined. \end{langTcbKey} +\clearpage +\begin{docTcbKey}{doc left}{=\meta{length}}{no default, initially |2em|} + Sets the left hand offset of the documentation texts from + \refEnv{docCommand}, \refEnv{docEnvironment}, \refEnv{docKey}, etc, to \meta{length}. +\begin{dispExample} +\begin{docCommand*}[doc left=2cm,doc left indent=-2cm]{myCommandA}{\marg{argment}} + This is the documentation of \refCom{myCommandA} which takes one \meta{argument}. + \refCom{myCommandA} does some funny things with its \meta{argument}. +\end{docCommand*} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{doc right}{=\meta{length}}{no default, initially |0em|} + Sets the right hand offset of the documentation texts from + \refEnv{docCommand}, \refEnv{docEnvironment}, \refEnv{docKey}, etc, to \meta{length}. +\begin{dispExample} +\begin{docCommand*}[doc right=2cm]{myCommandB}{\marg{argment}} + This is the documentation of \refCom{myCommandB} which takes one \meta{argument}. + \refCom{myCommandB} does some funny things with its \meta{argument}. +\end{docCommand*} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{doc left indent}{=\meta{length}}{no default, initially |-2em|} + Sets the left hand indent of documentation heads from + \refEnv{docCommand}, \refEnv{docEnvironment}, \refEnv{docKey}, etc, to \meta{length}. +\begin{dispExample} +\begin{docCommand*}[doc left indent=2cm]{myCommandC}{\marg{argment}} + This is the documentation of \refCom{myCommandC} which takes one \meta{argument}. + \refCom{myCommandC} does some funny things with its \meta{argument}. +\end{docCommand*} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{doc right indent}{=\meta{length}}{no default, initially |0pt|} + Sets the right hand indent of documentation heads from + \refEnv{docCommand}, \refEnv{docEnvironment}, \refEnv{docKey}, etc, to \meta{length}. +\begin{dispExample} +\begin{docCommand*}[doc right indent=-10mm,doc right=10mm, + doc description=test value]{myCommandD}{\marg{argment}} + This is the documentation of \refCom{myCommandD} which takes one \meta{argument}. + \refCom{myCommandD} does some funny things with its \meta{argument}. +\end{docCommand*} +\end{dispExample} +\end{docTcbKey} + +\clearpage +The head lines of the main documentation environments \refEnv{docCommand}, +\refEnv{docEnvironment}, \refEnv{docKey}, etc, are set inside |tcolorbox|es. +Options to these |tcolorbox|es can be given using the following keys. + +\begin{docTcbKey}{doc head command}{=\meta{options}}{no default, initially empty} + Sets \meta{options} for the head line of \refEnv{docCommand} and \refEnv{docCommand*}. +\begin{dispExample} +\tcbset{doc head command={interior style={fill,left color=red!20!white, + right color=blue!20!white}}} + +\begin{docCommand*}{myCommandE}{\marg{argment}} + This is the documentation of \refCom{myCommandE} which takes one \meta{argument}. + \refCom{myCommandE} does some funny things with its \meta{argument}. +\end{docCommand*} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{doc head environment}{=\meta{options}}{no default, initially empty} + Sets \meta{options} for the head line of \refEnv{docEnvironment} and \refEnv{docEnvironment*}. +\begin{dispExample} +\tcbset{doc head environment={beamer,boxsep=2pt,arc=2pt,colback=green!20!white, + after=\par\smallskip}} + +\begin{docEnvironment*}{myEnvironment}{\marg{argment}} + This is the documentation of \refEnv{myEnvironment} which + takes one \meta{argument}. +\end{docEnvironment*} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{doc head key}{=\meta{options}}{no default, initially empty} + Sets \meta{options} for the head line of \refEnv{docKey} and \refEnv{docKey*}. +\begin{dispExample} +\tcbset{doc head key={boxsep=4pt,arc=4pt,boxrule=0.6pt, + frame style=fill,interior style=fill,colframe=green!50!black}} + +\begin{docKey*}{/foo/myKey}{}{no value} + This is the documentation of \refKey{/foo/myKey}. +\end{docKey*} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{doc head}{=\meta{options}}{no default, initially empty} + Shortcut for setting the same \meta{options} for + \refKey{/tcb/doc head command}, \refKey{/tcb/doc head environment}, + and \refKey{/tcb/doc head key}. +\end{docTcbKey} + +\clearpage +\begin{docTcbKey}{doc description}{=\meta{text}}{no default, initially empty} + Sets a (short!) additional description \meta{text} for + \refEnv{docCommand} or \refEnv{docEnvironment}. Such a description is + mandatory for \refEnv{docKey}. +\begin{dispExample} +\begin{docCommand*}[doc description=my description]{myCommandF}{\marg{argment}} + This is the documentation of \refCom{myCommandF} which takes one \meta{argument}. + \refCom{myCommandF} does some funny things with its \meta{argument}. +\end{docCommand*} +\end{dispExample} +\begin{marker} +Note that the description \meta{text} may overlap with the text on the left +hand side if too long. Linebreaks can be used inside the \meta{text}. +\end{marker} +\end{docTcbKey} + +\begin{docTcbKey}{doc into index}{\colOpt{=true\textbar false}}{default |true|, initially |true|} + If set to |false|, no index entries are written for the main documentation + environments. The same effect is achieved by using e.\,g.\ \refEnv{docCommand*} + instead of \refEnv{docCommand}. +\end{docTcbKey} + +%\clearpage + + \subsection{Predefined Colors of the Library} The following colors are predefined. They are used as default colors in some library commands. diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex index 6210d6aecd1..e10bda58a88 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex @@ -377,7 +377,7 @@ Sets the algorithm for the fitting process \emph{after} optionally width and hei are adapted. Feasible values for \meta{name} are: \begin{itemize} - \item |fontsize| (initial): + \item\docValue{fontsize} (initial): The algorithm is a bisection method that adapts the font size until certain stop conditions are fulfilled. This is the most time-consuming method but it is robust and gives pleasant results. @@ -386,7 +386,7 @@ are adapted. Other content than text is not scaled down. The aspect ratio is fully garanteed. \end{marker} - \item |areasize|: + \item\docValue{areasize}: The algorithm calculates the area size for the text without scaling the font. The text box is shaped for the needed aspect ratio in one or two steps. Finally, it is scaled down with a standard |\resizebox| macro. @@ -394,7 +394,7 @@ are adapted. The used font has not to be scalable. Every box content is scaled down. The aspect ratio cannot be fully garanteed. \end{marker} - \item |hybrid|: + \item\docValue{hybrid}: First, this algorithm estimates the needed font size in one or two steps. Then an |areasize| fitting as above is a applied. \begin{marker} @@ -402,7 +402,7 @@ are adapted. Other content than text may be slightly rescaled. The aspect ratio cannot be fully garanteed. \end{marker} - \item |squeeze|: + \item\docValue{squeeze}: The text box is brutally scaled down to fit. \begin{marker} The aspect ratio is very likely to be horrible. @@ -474,10 +474,10 @@ if necessary. the auxiliary boxes may produce many |hbox| warnings. This option key changes the |\hbadness| value. \begin{itemize} - \item |off|: Most of |'Underfull \hbox'| and |'Overfull \hbox'| warnings are + \item\docValue{off}: Most of |'Underfull \hbox'| and |'Overfull \hbox'| warnings are switched off (including the ones for the finally used box). - \item |on|: All warnings for all auxiliary boxes are displayed. - \item |final|: Only warnings for the finally used box are displayed. + \item\docValue{on}: All warnings for all auxiliary boxes are displayed. + \item\docValue{final}: Only warnings for the finally used box are displayed. Note that an additional box has to be contructed for theses messages. \end{itemize} \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 f11470c6857..4432811ab50 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex @@ -48,7 +48,7 @@ for some hints. The short story is: you have to install not only \subsection{Loading the Package} The base package |tcolorbox| loads the packages -|pgf| \cite{tantau:2010c}, |verbatim| \cite{schoepf:2001a}, +|pgf| \cite{tantau:2013a}, |verbatim| \cite{schoepf:2001a}, |etoolbox| \cite{lehmann:2011a}, and |environ| \cite{robertson:2013a}. |tcolorbox| itself is loaded in the usual manner in the preamble: @@ -81,19 +81,19 @@ The following keys are used inside |\tcbuselibrary| respectively |\usepackage| without the key tree path |/tcb/library/|. \begin{docTcbKey}[library]{skins}{}{\mylib{skins}} - Loads the package |tikz| \cite{tantau:2010c} and provides additional + 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}. \end{docTcbKey} \begin{docTcbKey}[library]{listings}{}{\mylib{listings}} - Loads the package |listings| \cite{heinz:2007a} and provides additional + 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}. \end{docTcbKey} \begin{docTcbKey}[library]{listingsutf8}{}{\mylib{listingsutf8}} - Loads the packages |listings| \cite{heinz:2007a} and + Loads the packages |listings| \cite{heinz:2013a} and |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} 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 655912ed321..08c6309378b 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex @@ -24,12 +24,12 @@ the settings of a previous loaded library. A library is never loaded twice. \subsubsection{Loading \mylib{listings}} -This library uses the package |listings| \cite{heinz:2007a} to typeset +This library uses the package |listings| \cite{heinz:2013a} to typeset listings. It is loaded by a package option or inside the preamble by: \begin{dispListing} \tcbuselibrary{listings} \end{dispListing} -This also loads the package |listings| \cite{heinz:2007a}. +This also loads the package |listings| \cite{heinz:2013a}. The \refKey{/tcb/listing engine} is set to |listings| by the library. To reactivate this setting, if overwritten by other libraries, use @@ -46,7 +46,7 @@ variant \mylib{listingsutf8}. \tcbset{listing utf8=latin1}% optional; 'latin1' is the default. \end{dispListing} This also loads the library \mylib{listings} -and the packages |listings| \cite{heinz:2007a} +and the packages |listings| \cite{heinz:2013a} and |listingsutf8| \cite{oberdiek:2011a}. The \refKey{/tcb/listing engine} is set to |listings| by the library. @@ -310,7 +310,7 @@ This is my \LaTeX\ box. \subsection{Option Keys of the \mylib{listings} Library}\label{sec:speclistingkeys} \begin{docTcbKey}{listing options}{=\meta{key list}}{no default, initially |style=tcblatex|} - Sets the options from the package |listings| \cite{heinz:2007a} + Sets the options from the package |listings| \cite{heinz:2013a} which are used during typesetting of the listing. For \LaTeX\ listings, there is a predefined |listings| style named |tcblatex| which can be used. @@ -340,7 +340,7 @@ All \textit{listings} options removed. \begin{docTcbKey}{listing style}{=\meta{style}}{no default, initially |tcblatex|} Abbreviation for |listing options={style=...}|. This key sets a \meta{style} - for the |listings| package, see \cite{heinz:2007a}. + for the |listings| package, see \cite{heinz:2013a}. For \LaTeX, there is a predefined style named |tcblatex|. \begin{dispExample} \begin{tcblisting}{colback=red!5!white,colframe=red!75!black, @@ -451,9 +451,9 @@ be used inside these macros. \begin{docTcbKey}{listing engine}{=\meta{engine}}{no default} Sets the \meta{engine} which typesets the listings. Feasible values are \begin{itemize} - \item |listings|, if library \mylib{listings} or + \item\docValue{listings}, if library \mylib{listings} or \mylib{listingsutf8} is loaded. - \item |minted|, if library \mylib{minted} is loaded. + \item\docValue{minted}, if library \mylib{minted} is loaded. \end{itemize} \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 a3d730301f3..3b1fce4615b 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex @@ -6,7 +6,7 @@ The library is loaded by a package option or inside the preamble by: \begin{dispListing} \tcbuselibrary{skins} \end{dispListing} -This also loads the package |tikz| \cite{tantau:2010c}. Typically but not necessarily, +This also loads the package |tikz| \cite{tantau:2013a}. Typically but not necessarily, the following skins use |tikz| instead of |pgf|. \subsection{Technical Overview and Core Package Option Keys}\label{sec:skincorekeys} @@ -89,13 +89,13 @@ The four steps are: Every engine for the up to four steps can be set to one of the following types: \begin{enumerate} -\item |standard|: the original code from the core package. -\item |path|: a |tikz| path which can be controlled by options. -\item |pathfirst|: a |tikz| path which can be controlled by options. -\item |pathmiddle|: a |tikz| path which can be controlled by options. -\item |pathlast|: a |tikz| path which can be controlled by options. -\item |freelance|: arbitrary user code. -\item |spartan|: a quite spartan code. +\item\docValue{standard}: the original code from the core package. +\item\docValue{path}: a |tikz| path which can be controlled by options. +\item\docValue{pathfirst}: a |tikz| path which can be controlled by options. +\item\docValue{pathmiddle}: a |tikz| path which can be controlled by options. +\item\docValue{pathlast}: a |tikz| path which can be controlled by options. +\item\docValue{freelance}: arbitrary user code. +\item\docValue{spartan}: a quite spartan code. \end{enumerate} %\clearpage @@ -104,17 +104,17 @@ Every engine for the up to four steps can be set to one of the following types: Typically, this key is set by a \refKey{/tcb/skin}. Feasible values for \meta{name} are: \begin{itemize} - \item |standard|: the original code from the core package, - \item |path|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, - \item |pathjigsaw|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, - \item |pathfirst|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, - \item |pathfirstjigsaw|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, - \item |pathmiddle|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, - \item |pathmiddlejigsaw|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, - \item |pathlast|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, - \item |pathlastjigsaw|: a |tikz| path which is controlled by \refKey{/tcb/frame style}, - \item |freelance|: arbitrary user code which is given by \refKey{/tcb/frame code}. - \item |spartan|: a quite spartan code. + \item\docValue{standard}: the original code from the core package, + \item\docValue{path}: a |tikz| path which is controlled by \refKey{/tcb/frame style}, + \item\docValue{pathjigsaw}: a |tikz| path which is controlled by \refKey{/tcb/frame style}, + \item\docValue{pathfirst}: a |tikz| path which is controlled by \refKey{/tcb/frame style}, + \item\docValue{pathfirstjigsaw}: a |tikz| path which is controlled by \refKey{/tcb/frame style}, + \item\docValue{pathmiddle}: a |tikz| path which is controlled by \refKey{/tcb/frame style}, + \item\docValue{pathmiddlejigsaw}: a |tikz| path which is controlled by \refKey{/tcb/frame style}, + \item\docValue{pathlast}: a |tikz| path which is controlled by \refKey{/tcb/frame style}, + \item\docValue{pathlastjigsaw}: a |tikz| path which is controlled by \refKey{/tcb/frame style}, + \item\docValue{freelance}: arbitrary user code which is given by \refKey{/tcb/frame code}. + \item\docValue{spartan}: a quite spartan code. \end{itemize} \end{docTcbKey} @@ -123,13 +123,13 @@ Every engine for the up to four steps can be set to one of the following types: Typically, this key is set by a \refKey{/tcb/skin}. Feasible values for \meta{name} are: \begin{itemize} - \item |standard|: the original code from the core package, - \item |path|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, - \item |pathfirst|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, - \item |pathmiddle|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, - \item |pathlast|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, - \item |freelance|: arbitrary user code which is given by \refKey{/tcb/interior titled code}. - \item |spartan|: a quite spartan code. + \item\docValue{standard}: the original code from the core package, + \item\docValue{path}: a |tikz| path which is controlled by \refKey{/tcb/interior style}, + \item\docValue{pathfirst}: a |tikz| path which is controlled by \refKey{/tcb/interior style}, + \item\docValue{pathmiddle}: a |tikz| path which is controlled by \refKey{/tcb/interior style}, + \item\docValue{pathlast}: a |tikz| path which is controlled by \refKey{/tcb/interior style}, + \item\docValue{freelance}: arbitrary user code which is given by \refKey{/tcb/interior titled code}. + \item\docValue{spartan}: a quite spartan code. \end{itemize} \end{docTcbKey} @@ -139,13 +139,13 @@ Every engine for the up to four steps can be set to one of the following types: Typically, this key is set by a \refKey{/tcb/skin}. Feasible values for \meta{name} are: \begin{itemize} - \item |standard|: the original code from the core package, - \item |path|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, - \item |pathfirst|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, - \item |pathmiddle|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, - \item |pathlast|: a |tikz| path which is controlled by \refKey{/tcb/interior style}, - \item |freelance|: arbitrary user code which is given by \refKey{/tcb/interior code}. - \item |spartan|: a quite spartan code. + \item\docValue{standard}: the original code from the core package, + \item\docValue{path}: a |tikz| path which is controlled by \refKey{/tcb/interior style}, + \item\docValue{pathfirst}: a |tikz| path which is controlled by \refKey{/tcb/interior style}, + \item\docValue{pathmiddle}: a |tikz| path which is controlled by \refKey{/tcb/interior style}, + \item\docValue{pathlast}: a |tikz| path which is controlled by \refKey{/tcb/interior style}, + \item\docValue{freelance}: arbitrary user code which is given by \refKey{/tcb/interior code}. + \item\docValue{spartan}: a quite spartan code. \end{itemize} \end{docTcbKey} @@ -154,10 +154,10 @@ Every engine for the up to four steps can be set to one of the following types: Typically, this key is set by a \refKey{/tcb/skin}. Feasible values for \meta{name} are: \begin{itemize} - \item |standard|: the original code from the core package, - \item |path|: a |tikz| path which is controlled by \refKey{/tcb/segmentation style}, - \item |freelance|: arbitrary user code which is given by \refKey{/tcb/segmentation code}. - \item |spartan|: a quite spartan code. + \item\docValue{standard}: the original code from the core package, + \item\docValue{path}: a |tikz| path which is controlled by \refKey{/tcb/segmentation style}, + \item\docValue{freelance}: arbitrary user code which is given by \refKey{/tcb/segmentation code}. + \item\docValue{spartan}: a quite spartan code. \end{itemize} \end{docTcbKey} @@ -166,13 +166,13 @@ Every engine for the up to four steps can be set to one of the following types: Typically, this key is set by a \refKey{/tcb/skin}. Feasible values for \meta{name} are: \begin{itemize} - \item |standard|: the original code from the core package, - \item |path|: a |tikz| path which is controlled by \refKey{/tcb/title style}, - \item |pathfirst|: a |tikz| path which is controlled by \refKey{/tcb/title style}, - \item |pathmiddle|: a |tikz| path which is controlled by \refKey{/tcb/title style}, - \item |pathlast|: a |tikz| path which is controlled by \refKey{/tcb/title style}, - \item |freelance|: arbitrary user code which is given by \refKey{/tcb/title code}. - \item |spartan|: a quite spartan code. + \item\docValue{standard}: the original code from the core package, + \item\docValue{path}: a |tikz| path which is controlled by \refKey{/tcb/title style}, + \item\docValue{pathfirst}: a |tikz| path which is controlled by \refKey{/tcb/title style}, + \item\docValue{pathmiddle}: a |tikz| path which is controlled by \refKey{/tcb/title style}, + \item\docValue{pathlast}: a |tikz| path which is controlled by \refKey{/tcb/title style}, + \item\docValue{freelance}: arbitrary user code which is given by \refKey{/tcb/title code}. + \item\docValue{spartan}: a quite spartan code. \end{itemize} \end{docTcbKey} @@ -1222,7 +1222,7 @@ This is a tcolorbox. \clearpage -\begin{docTcbKey}{halo}{=\meta{size} \texttt{with} \meta{color}}{style, default |0.9mm with yellow|} +\begin{docTcbKey}{halo}{\colOpt{=\meta{size} \texttt{with} \meta{color}}}{style, default |0.9mm with yellow|} Adds a new halo shadow with the given \meta{color} which overlaps the colorbox an all sides by \meta{size}. \begin{dispExample*}{sbs,lefthand ratio=0.6} @@ -1241,7 +1241,7 @@ This is a tcolorbox. \end{docTcbKey} -\begin{docTcbKey}{fuzzy halo}{=\meta{size} \texttt{with} \meta{color}}{style, default |0.9mm with yellow|} +\begin{docTcbKey}{fuzzy halo}{\colOpt{=\meta{size} \texttt{with} \meta{color}}}{style, default |0.9mm with yellow|} Adds a new fuzzy halo shadow with the given \meta{color} which overlaps the colorbox an all sides by \meta{size} plus |0.48mm|. \begin{dispExample*}{sbs,lefthand ratio=0.6} @@ -1450,7 +1450,7 @@ but most other skins, e.\,g.\ \refSkin{enhanced}. \begin{docTcbKey}{tikz}{=\meta{tikz option list}}{no default, initially empty} Adds the given \meta{tikz option list} to the main |tikzpicture| environment - used to draw the color box, see \cite{tantau:2010c}. If this option is + used to draw the color box, see \cite{tantau:2013a}. If this option is applied a second time, the new \meta{tikz option list} is appended to the current option list. \begin{dispExample*}{sbs,lefthand ratio=0.66, @@ -1463,6 +1463,19 @@ but most other skins, e.\,g.\ \refSkin{enhanced}. This is a tcolorbox. \end{tcolorbox} \end{dispExample*} + +\begin{dispExample*}{sbs,lefthand ratio=0.66} +\tcbset{enhanced,colback=red!5!white, + colframe=red!75!black,fonttitle=\bfseries, + fontupper=\bfseries\Huge, + center title,center upper} + +\begin{tcolorbox}[title=Rotated box, + tikz={rotate=30}] +Sold! +\end{tcolorbox} +\end{dispExample*} + \end{docTcbKey} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex index 4f6a9277ddf..4a26f16905d 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex @@ -73,7 +73,7 @@ This also loads the package |amsmath|. \begin{docCommand}{tcbmaketheorem}{\marg{name}\marg{display name}\marg{options}\marg{counter}\marg{prefix}} -\begin{marker} +\smallskip\begin{marker} \refCom{newtcbtheorem} supersedes this macro. \end{marker} \begin{deprecated} @@ -132,6 +132,47 @@ This also loads the package |amsmath|. \int x^2 ~\text{d}x &= \frac13 x^3 + c. \end{tcolorbox} \end{dispExample} + +\clearpage +\refCom{tcbhighmath} can be used in symbiosis with the |empheq| package +which allows to specify own boxing commands to mark multiline formulas. + +\begin{dispExample} +% \usepackage{empheq} +\begin{empheq}[box=\tcbhighmath]{align} +a&=\sin(z)\\ +E&=mc^2 + \int_a^b x\, dx +\end{empheq} + +\tcbset{highlight math style={enhanced, + colframe=red!60!black,colback=yellow!50!white,arc=4pt,boxrule=1pt, + drop fuzzy shadow}} + +\begin{empheq}[box=\tcbhighmath]{align} +a&=\sin(z)\\ +E&=mc^2 + \int_a^b x\, dx +\end{empheq} +\end{dispExample} + +Besides \refCom{tcbhighmath}, one can easily define an independent new box +based on \refCom{tcbox} which acts like \refCom{tcbhighmath}: + +\begin{dispExample} +% \usepackage{empheq} +\newtcbox{\otherbox}[1][]{nobeforeafter,math upper,tcbox raise base, + enhanced,frame hidden,boxrule=0pt,interior style={top color=green!10!white, + bottom color=green!10!white,middle color=green!50!yellow}, + fuzzy halo=1pt with green,#1} + +\begin{empheq}[box=\otherbox]{align} +a&=\sin(z)\\ +E&=mc^2 + \int_a^b x\, dx +\end{empheq} + +\begin{equation} +\tcbhighmath{E} = \otherbox{mc^2} +\end{equation} +\end{dispExample} \end{docCommand} @@ -139,7 +180,7 @@ This also loads the package |amsmath|. \subsection{Option Keys of the Library} -\begin{docTcbKey}{separator sign}{=\meta{sign}}{no default, initial |:|} +\begin{docTcbKey}{separator sign}{=\meta{sign}}{no default, initially |:|} The given \meta{sign} is used inside the title text of a theorem as separater between display name combined with number and the specific title text. It is omitted, if there is no specific title text. @@ -171,6 +212,134 @@ My theorem text. \end{dispExample} \end{docTcbKey} +\begin{docTcbKey}{separator sign none}{}{style, no value} +Sets \refKey{/tcb/separator sign} to empty. +\begin{dispExample} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + separator sign none}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + +\clearpage +\begin{docTcbKey}{description delimiters}{=\meta{left}\meta{right}}{no default, initially empty} + The given \meta{left} and \meta{right} delimiter signs are used to frame + the descriptive title text of a theorem. + +\begin{dispExample} +% \usepackage{amssymb} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + description delimiters={\flqq}{\frqq}}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}{description delimiters parenthesis}{}{style, no value} +Sets \refKey{/tcb/description delimiters} to |(| and |)|. +\begin{dispExample} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + description delimiters parenthesis}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}{description delimiters none}{}{style, no value, initially set} +Sets \refKey{/tcb/description delimiters} to the default empty texts. +\end{docTcbKey} + + + +\begin{docTcbKey}{terminator sign}{=\meta{sign}}{no default, initially empty} + The given \meta{sign} is used as terminator at the end of the title text of a theorem. + +\begin{dispExample} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + terminator sign={.}}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + +\clearpage +\begin{docTcbKey}{terminator sign colon}{}{style, no value, initially set} +Sets \refKey{/tcb/terminator sign} to the colon |:| sign. +\begin{dispExample} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + separator sign dash,terminator sign colon}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{terminator sign dash}{}{style, no value} +Sets \refKey{/tcb/terminator sign} to an en-dash sign. +\begin{dispExample} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + terminator sign dash}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{terminator sign none}{}{style, no value} +Sets \refKey{/tcb/terminator sign} to the default empty text. +\end{docTcbKey} + + +\begin{docTcbKey}{theorem name and number}{}{style, no value, initially set} +Prints theorem name followed by theorem number inside the title. +\begin{dispExample} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + theorem name and number}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + +\clearpage +\begin{docTcbKey}{theorem number and name}{}{style, no value} +Prints theorem number followed by theorem name inside the title. +\begin{dispExample} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + theorem number and name}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + +\begin{docTcbKey}{theorem name}{}{style, no value} +Prints theorem name without number inside the title. +\begin{dispExample} +\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% + {colback=white,colframe=red!50!black,fonttitle=\bfseries, + theorem name,enhanced,watermark text={\thetcbcounter}}{theo} +\begin{sometheorem}{My example}{} +My theorem text. +\end{sometheorem} +\end{dispExample} +\end{docTcbKey} + \begin{docTcbKey}{theorem}{=\marg{display name}\marg{counter}\marg{title}\marg{marker}}{no default} This key is internally used by \refCom{tcbmaketheorem}, but can be used @@ -426,6 +595,116 @@ New colored mathematical environments are easily created using see \refKey{/tcb/before upper app}. \end{marker} + +\clearpage +\begin{docTcbKey}{theorem style}{=\meta{name}}{no default, initially |standard|} +Applies a predefined style \meta{name} to the theorem environment. Some of +the feasible \meta{name} values resemble style names from the packages |theorem| +and |ntheorem| to give convenient access to known patterns. +\begin{marker} +The styles alter \refKey{/tcb/separator sign}, \refKey{/tcb/description delimiters}, +\refKey{/tcb/terminator sign}, and more. Therefore, one should apply such +keys \emph{after} a theorem style. +\end{marker} + +For the following examples, we use: +\inputpreamblelisting{J} + +The predefined styles are: +\begin{itemize} +% +\item\docValue{standard}: This is the initial value. +\begin{dispExample} +\begin{theorem}[theorem style=standard]{standard}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\item\docValue{change standard} +\begin{dispExample} +\begin{theorem}[theorem style=change standard]{change standard}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\item\docValue{plain} +\begin{dispExample} +\begin{theorem}[theorem style=plain]{plain}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\clearpage +\item\docValue{break} +\begin{dispExample} +\begin{theorem}[theorem style=break]{break}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\item\docValue{plain apart} +\begin{dispExample} +\begin{theorem}[theorem style=plain apart]{plain apart}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\item\docValue{change} +\begin{dispExample} +\begin{theorem}[theorem style=change]{change}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\item\docValue{change break} +\begin{dispExample} +\begin{theorem}[theorem style=change break]{change break}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\item\docValue{change apart} +\begin{dispExample} +\begin{theorem}[theorem style=change apart]{change apart}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\clearpage +\item\docValue{margin} +\begin{dispExample} +\begin{theorem}[theorem style=margin,left=10mm]{margin}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\begin{theorem}[theorem style=margin,left=10mm,oversize]{margin}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\item\docValue{margin break} +\begin{dispExample} +\begin{theorem}[theorem style=margin break,left=10mm]{margin break}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\begin{theorem}[theorem style=margin break,left=10mm,oversize]{margin break}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\item\docValue{margin apart} +\begin{dispExample} +\begin{theorem}[theorem style=margin apart,left=10mm]{margin apart}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\begin{theorem}[theorem style=margin apart,left=10mm,oversize]{margin apart}{} +This is my theorem. \begin{equation*} a^2 + b^2 = c^2. \end{equation*} +\end{theorem} +\end{dispExample} +% +\end{itemize} +\end{docTcbKey} + + % \clearpage \subsection{Examples for Definitions and Theorems} @@ -506,7 +785,7 @@ referenced with the marker \texttt{cor:nullstellen}.\bigskip % \usepackage{cleveref} % \tcbuselibrary{skins} \newtcbtheorem[use counter from=Definition]{YetAnotherTheorem}{Theorem}% - {label type=theorem,enhanced,frame hidden, + {theorem style=plain apart,label type=theorem,enhanced,frame hidden, boxrule=2mm,titlerule=0mm,toptitle=1mm,bottomtitle=1mm, fonttitle=\bfseries\large,fontupper=\normalsize, coltitle=green!35!black,colbacktitle=green!15!white, @@ -543,7 +822,7 @@ Here, using |\Vref| resulting in \Vref{theo:meanvaluetheorem} is more interestin \begin{dispExample} % \tcbuselibrary{skins} \newtcbtheorem[use counter from=Definition]{YetAnotherTheorem}{Theorem}% - {enhanced,arc=0mm,outer arc=0mm, + {theorem style=change apart,enhanced,arc=0mm,outer arc=0mm, boxrule=0mm,toprule=1mm,bottomrule=1mm,left=1mm,right=1mm, titlerule=0mm,toptitle=0mm,bottomtitle=1mm,top=0mm, colframe=red!50!black,colback=red!5!white,coltitle=red!50!black, @@ -579,22 +858,14 @@ You need more attention for your theorems? Here, you are \ldots \end{Theorem} \end{dispExample} - -Using \refCom{newtcbtheorem} is a convenient way to generate a new -theorem type. On the other hand, it enforces to use a titled |tcolorbox|. -If you prefer to have an embedded title, you may create a new theorem -type with the more flexible \refCom{newtcolorbox} macro: +Let's try a more conservative approach: \begin{dispExample} % \tcbuselibrary{skins} -\newtcolorbox[use counter from=Definition]{YetAnotherTheorem}[3][% - enhanced,colframe=blue!50!black,colback=yellow!20!white, - drop fuzzy shadow=blue!50!black!50!white,boxrule=0.4pt, - fontupper=\itshape]{% - before upper={\textcolor{red!50!black}{\upshape\bfseries - Theorem~\thetcbcounter\ (#2)}\quad}, - list entry={\protect\numberline{\thetcbcounter}#2},% - label={theo:#3},#1} +\newtcbtheorem[use counter from=Definition]{YetAnotherTheorem}{Theorem}% + {theorem style=plain,enhanced,colframe=blue!50!black,colback=yellow!20!white, + coltitle=red!50!black,fonttitle=\upshape\bfseries,fontupper=\itshape, + drop fuzzy shadow=blue!50!black!50!white,boxrule=0.4pt}{theo} \begin{YetAnotherTheorem}{Mittelwertsatz f\"{u}r $n$ Variable}{mittelwertsatz_n3}% Es sei $n\in\mathbb{N}$, $D\subseteq\mathbb{R}^n$ eine offene Menge und diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 9962e622a80..ee6a8991e70 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 b6454c10805..bc9dbc13e84 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,9 +1,9 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% 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 @@ -59,13 +59,14 @@ \usepackage{array,tabularx} \usepackage{amsmath} \usepackage{lipsum} +\usepackage{empheq} \usepackage{changepage} \strictpagecheck \usepackage[all]{tcolorbox} -\tcbset{skin=enhanced} +\tcbset{skin=enhanced,doc head={colback=yellow!10!white,interior style=fill}} \urlstyle{sf} \tcbmakedocSubKey{docTcbKey}{tcb} @@ -74,16 +75,18 @@ \makeatletter \def\index@Skin#1{\index{#1\idx@actual\texttt{#1} Skin}\index{Skins\idx@level#1\idx@actual\texttt{#1}}} -\newenvironment{docSkin}[1]{\begin{manual@entry}% -\hypertarget{skin:#1}{\manual@top{\texttt{/tcb/skin=}\disp@com{#1}\index@Skin{#1}\protected@edef\@currentlabel{#1}\label{skin:#1}\hfill(skin)}}}% - {\end{manual@entry}} -\def\refSkin#1{\ref@doc{skin:#1}} +\newenvironment{docSkin}[1]{\begin{tcb@manual@entry}% + \begin{tcb@doc@head}{}% + \hypertarget{skin:#1}{\texttt{/tcb/skin=}\tcb@disp@com{#1}\index@Skin{#1}\protected@edef\@currentlabel{#1}\label{skin:#1}\hfill(skin)}% + \end{tcb@doc@head}}% + {\end{tcb@manual@entry}} +\def\refSkin#1{\tcb@ref@doc{skin:#1}} \makeatother \newtcolorbox{marker}[1][]{marker,#1} -\def\version{2.61}% -\def\datum{2014/01/10}% +\def\version{2.70}% +\def\datum{2014/02/06}% \makeindex \hypersetup{ @@ -105,13 +108,13 @@ \lstdefinestyle{mydocumentation}{style=tcbdocumentation, classoffset=0, - texcsstyle=\color{blue}, + texcsstyle=*\color{blue}, % LaTeX and other packages moretexcs={arrayrulecolor,draw,includegraphics,ifthenelse,isodd,lipsum,path,pgfkeysalso}, classoffset=1, % tcolorbox macros moretexcs={% core - endtcolorbox,endtcbverbatimwrite,newtcolorbox,newtcbox,newtcboxfit,tcbusetemp, + endtcolorbox,endtcbverbatimwrite,newtcolorbox,newtcbox,newtcboxfit,tcbusetemp,tcbtitle,tcbtitletext, tcblower,tcbox,tcboxfit,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite,tcbsetforeverylayer, % listings endtcblisting,newtcblisting,newtcbinputlisting, @@ -130,99 +133,16 @@ % skins tcbline, }, - texcsstyle=\color{Definition}\bfseries, - classoffset=2, - keywordstyle=\color{Option}\bfseries, - % tcolorbox options - morekeywords={% core - adjusted,adjust,after,arc,auto,autoparskip,align, - before,bottom,boxsep,boxrule,bottomtitle,bottomrule,broken,basedim, - collower,coltext,coltitle,colback,colframe,colupper,center,code,capture,check,counter,crefname,Crefname, - equal,enlarge,enlargement,extrude,every,box,higher,layers, - fontupper,fontlower,fonttitle,first,floatplacement,float,fit,fontsize,flushleft,flushright,freestyle,format,filled, - group,gap, - height, - jigsaw, - lowerbox,left,leftrule,lefttitle,leftupper,leftlower,lower,last,lefthand,label, - middle,minimum,maxstep,macros, - notitle,natural,noparskip,nobeforeafter,nofloat,number, - parskip,parbox,phantom,page, - outer,oversize,overlay,odd,opacitytext,opacityfill, - opacityupper,opacitylower,opacitytitle,opacityframe,opacityback,opacitybacktitle, - right,rightrule,righttitle,rightupper,rightlower,righthand,ratio, - savelowerto,savedelimiter,space,split,shrink,sidebyside,skip,step,separated, - title,top,toptitle,toprule,titlerule,tabularx,tikz,toggle,tight,tempfile,text, - upper,unbroken, - valign, - width,within, - % listings - above, - comment, - file, - inputencoding, - listing,minted, - options,outside, - style,side, - utf, - % theorems - ams,align, - dash, - equation, - gather, - highlight, - math, - nodisplayskip, - separator,sign, - theorem, - % documentation - actual, - color,colors, - docexample,documentation,definition,default, - example,english,environment,environments, - german, - hyperlink, - key, - index, - level,language, - pageshort, - option, - quote, - settings, - % skins - beamer,bicolor,blank,borderline,clip, - colbacktitle,code,colbacklower, - draft,drop, - enhanced,engine,extend, - frame,freelance,fuzzy,freelancefirst,freelancemiddle,freelancelast, - graphical,geometry,graphics, - hidden,halo, - interior, - opacity,overzoom, - midday, - nodes, - rotate,remember, - skin,segmentation,stretch,standard,shadow,scale, - titled, - watermark,widget, - zoom, - southeast,south,southwest,west,northwest,north,northeast,east, - % breakable - breakable,break,enlargepage, - goal, - pad, - unbreakable, - % hooks - app,pre, - }, + texcsstyle=*\color{Definition}\bfseries, classoffset=0% restore default } \tcbset{documentation listing style=mydocumentation,% sbs/.style={sidebyside,before lower app={\tcbset{sidebyside=false}}},% - innerbox/.style={reset,documentation listing style=mydocumentation,docexample/.style={docexample original}, + innerbox/.style={reset,documentation listing style=mydocumentation,docexample/.style={docexample original}%,listing engine=minted,documentation minted style=perldoc, }, - base example/.style={enhanced,colframe=Navy!50!ExampleFrame,colback=Navy!5!ExampleBack,fontlower=\footnotesize, - bicolor,colbacklower=ExampleBack!5!white,drop fuzzy shadow}, + base example/.style={bicolor,colframe=Navy!50!ExampleFrame,colback=Navy!5!ExampleBack,fontlower=\footnotesize, + colbacklower=ExampleBack!5!white,drop fuzzy shadow}, docexample/.style={base example,% every box on layer 2/.style={every box}, before upper={\tcbset{innerbox}},before lower={\tcbset{innerbox}} @@ -342,10 +262,18 @@ \end{tcbverbatimwrite} \input{\jobname_preamble_I.tex} -%\tcbset{draftmode} -%\includeonly{tcolorbox.doc.skins} +\begin{tcbverbatimwrite}{\jobname_preamble_J.tex} +\newtcbtheorem[use counter from=mytheo]{theorem}{Theorem}{% + fonttitle=\bfseries\upshape,fontupper=\itshape, + colframe=green!50!black,colback=green!10!white, + colbacktitle=green!20!white,coltitle=blue!75!black}{theo} +\end{tcbverbatimwrite} +\input{\jobname_preamble_J.tex} +%\tcbset{draftmode} +%\includeonly{tcolorbox.doc.documentation} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} \include{tcolorbox.doc.abstract} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index b21bf39c727..e1aca3d2ed2 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% 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 @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index c2d86c32e7d..62037191692 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% 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 @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \tcbuselibrary{listings} @@ -53,10 +53,14 @@ % The following macros are taken from ltxdoc \DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +\let\tcb@doc@org@meta\meta% +\def\meta#1{{\rmfamily\tcb@doc@org@meta{#1}}} \def\marg#1{% - {\ttfamily\char`\{}{\rmfamily\meta{#1}}{\ttfamily\char`\}}} + {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}} \def\oarg#1{% - \colOpt{{\ttfamily[}{\rmfamily\meta{#1}}{\ttfamily]}}} + \colOpt{{\ttfamily[}\meta{#1}{\ttfamily]}}} + +\newif\iftcb@doc@toindex % language specific texts \tcbset{ @@ -69,6 +73,8 @@ key/.store in=\kvtcb@text@key, index/.store in=\kvtcb@text@index, pageshort/.store in=\kvtcb@text@pageshort, + value/.store in=\kvtcb@text@value, + values/.store in=\kvtcb@text@values, } % documentation options @@ -81,13 +87,22 @@ color definition/.store in=\kvtcb@coldef, color hyperlink/.store in=\kvtcb@colhyper, color frame/.store in=\kvtcb@colhyper, - color hyperlink/.store in=\kvtcb@colhyper, before example/.store in=\kvtcb@beforeexample, after example/.store in=\kvtcb@afterexample, index actual/.store in=\idx@actual, index quote/.store in=\idx@quote, index level/.store in=\idx@level, index format/.store in=\idx@format, + doc left/.dimstore in=\kvtcb@doc@left, + doc right/.dimstore in=\kvtcb@doc@right, + doc left indent/.dimstore in=\kvtcb@doc@indentleft, + doc right indent/.dimstore in=\kvtcb@doc@indentright, + doc head command/.style={doc@head@command/.style={#1}}, + doc head environment/.style={doc@head@environment/.style={#1}}, + doc head key/.style={doc@head@key/.style={#1}}, + doc head/.style={doc head command={#1},doc head environment={#1},doc head key={#1}}, + doc description/.store in=\kvtcb@doc@description,% + doc into index/.is if=tcb@doc@toindex,% } % styles @@ -98,14 +113,13 @@ index default settings/.style={index actual={@},index quote={"},index level={!}}, index german settings/.style={index actual={=},index quote={!},index level={>}}, english language/.code={\tcbset{doclang/.cd, - color=color, - colors=Colors, + color=color,colors=Colors, environment content=environment content, - environment=environment, - environments=Environments, + environment=environment,environments=Environments, key=key, index=Index, - pageshort={P.}}}, + pageshort={P.}, + value=value,values=Values}}, } \AtBeginDocument{% @@ -149,66 +163,127 @@ % index auxiliary macros -\def\index@Col#1{\index{#1\idx@actual\texttt{#1} \kvtcb@text@color}\index{\kvtcb@text@colors\idx@level#1\idx@actual\texttt{#1}}} -\def\index@Com#1{\index{#1\idx@actual\cs{#1}}} -\def\index@Env#1{\index{#1\idx@actual\texttt{#1} \kvtcb@text@env}\index{\kvtcb@text@envs\idx@level#1\idx@actual\texttt{#1}}} -\def\index@Key#1{\index{#1\idx@actual\texttt{#1} \kvtcb@text@key}}% -\def\index@KeyPath#1#2{\index@Key{#2}\index{#1\idx@actual\texttt{/#1/}\idx@level#2\idx@actual\texttt{#2}}}% +\def\tcb@index@Col#1{\iftcb@doc@toindex\index{#1\idx@actual\texttt{#1} \kvtcb@text@color}\index{\kvtcb@text@colors\idx@level#1\idx@actual\texttt{#1}}\fi} +\def\tcb@index@Com#1{\iftcb@doc@toindex\index{#1\idx@actual\cs{#1}}\fi} +\def\tcb@index@Env#1{\iftcb@doc@toindex\index{#1\idx@actual\texttt{#1} \kvtcb@text@env}\index{\kvtcb@text@envs\idx@level#1\idx@actual\texttt{#1}}\fi} +\def\tcb@index@Key#1{\iftcb@doc@toindex\index{#1\idx@actual\texttt{#1} \kvtcb@text@key}\fi}% +\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\tcb@index@Key{#2}\index{#1\idx@actual\texttt{/#1/}\idx@level#2\idx@actual\texttt{#2}}\fi}% +\def\tcb@index@Val#1{\iftcb@doc@toindex\index{#1\idx@actual\texttt{#1} \kvtcb@text@value}\index{\kvtcb@text@values\idx@level#1\idx@actual\texttt{#1}}\fi} -\def\disp@com#1{\colDef{\ttfamily\bfseries#1}} +\def\tcb@disp@com#1{\colDef{\ttfamily\bfseries#1}} \def\brackets#1{{\ttfamily\char`\{}#1{\ttfamily\char`\}}} -\newenvironment{manual@entry}{\list{}{\leftmargin=2em\itemindent-\leftmargin\def\makelabel##1{\hss##1}}}{\endlist} +\newenvironment{tcb@manual@entry}{\begin{list}{}{% + \setlength{\leftmargin}{\kvtcb@doc@left}% + \setlength{\itemindent}{0pt}% + \setlength{\itemsep}{0pt}% + \setlength{\parsep}{0pt}% + \setlength{\rightmargin}{\kvtcb@doc@right}% + }\item}{\end{list}} -\def\manual@top#1{\itemsep=0pt\parskip=0pt\item\strut{#1}\par\topsep=0pt} +\def\tcb@manual@top#1{\itemsep=0pt\parskip=0pt\item\strut{#1}\par\topsep=0pt} -% main documentation environments -\newenvironment{docCommand}[3][]{\begin{manual@entry}% - \tcbset{#1}\hypertarget{com:#2}{\manual@top{\disp@com{\cs{#2}}\index@Com{#2}\protected@edef\@currentlabel{\noexpand\cs{#2}}\label{com:#2}{\ttfamily #3}}}}% - {\end{manual@entry}} +\def\tcb@doc@do@description{% + \ifx\kvtcb@doc@description\@empty\else\tcblower\raggedleft(\kvtcb@doc@description)\fi% +} -\newenvironment{docEnvironment}[3][]{\begin{manual@entry}% - \tcbset{#1}\hypertarget{env:#2}{\manual@top{\cs{begin}\brackets{\disp@com{#2}}\index@Env{#2}\protected@edef\@currentlabel{#2}\label{env:#2}{\ttfamily #3}}}% - \manual@top{~~\meta{\kvtcb@text@envcontent}}% - \manual@top{\cs{end}\brackets{\disp@com{#2}}}}% - {\end{manual@entry}} +\newtcolorbox{tcb@doc@head}[1]{blank,colback=white,colframe=white, + code={\tcbdimto\tcb@temp@grow@left{-\kvtcb@doc@indentleft}% + \tcbdimto\tcb@temp@grow@right{-\kvtcb@doc@indentright}}, + grow to left by=\tcb@temp@grow@left,% + grow to right by=\tcb@temp@grow@right, + sidebyside,sidebyside align=top, + sidebyside gap=-\tcb@w@upper@real, + phantom=\phantomsection,% + enlarge bottom by=-0.2\baselineskip,#1} -\newenvironment{docKey}[4][\@empty]{\begin{manual@entry}% +% main documentation environments +\newenvironment{docCommand}[3][]{\tcbset{#1}% + \begin{tcb@manual@entry}% + \begin{tcb@doc@head}{doc@head@command}% + \tcb@disp@com{\cs{#2}}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\cs{#2}}\label{com:#2}{\ttfamily #3}% + \tcb@doc@do@description% + \end{tcb@doc@head}}% + {\end{tcb@manual@entry}} + +\newenvironment{docCommand*}{\bgroup\tcb@doc@toindexfalse\begin{docCommand}}{\end{docCommand}\egroup} + +\newenvironment{docEnvironment}[3][]{\tcbset{#1}% + \begin{tcb@manual@entry}% + \begin{tcb@doc@head}{doc@head@environment}% + \strut\cs{begin}\brackets{\tcb@disp@com{#2}}\tcb@index@Env{#2}\protected@edef\@currentlabel{#2}\label{env:#2}{\ttfamily #3}\par% + \strut~~\meta{\kvtcb@text@envcontent}\par% + \strut\cs{end}\brackets{\tcb@disp@com{#2}}% + \tcb@doc@do@description% + \end{tcb@doc@head}}% + {\end{tcb@manual@entry}} + +\newenvironment{docEnvironment*}{\bgroup\tcb@doc@toindexfalse\begin{docEnvironment}}{\end{docEnvironment}\egroup} + +\newenvironment{docKey}[4][\@empty]{\begin{tcb@manual@entry}% + \tcbset{doc description={#4}}% + \begin{tcb@doc@head}{doc@head@key}% \ifx#1\@empty% - \hypertarget{key:#2}{\manual@top{\disp@com{#2}\index@Key{#2}\protected@edef\@currentlabel{#2}\label{key:#2}{\ttfamily #3}\hfill(#4)}} - \else\hypertarget{key:/#1/#2}{\manual@top{\disp@com{/#1/#2}\index@KeyPath{#1}{#2}\protected@edef\@currentlabel{/#1/#2}\label{key:/#1/#2}#3\hfill(#4)}}\fi}% - {\end{manual@entry}} + \tcb@disp@com{#2}\tcb@index@Key{#2}\protected@edef\@currentlabel{#2}\label{key:#2}{\ttfamily #3}% + \else\tcb@disp@com{/#1/#2}\tcb@index@KeyPath{#1}{#2}\protected@edef\@currentlabel{/#1/#2}\label{key:/#1/#2}{\ttfamily #3}% + \fi% + \tcb@doc@do@description% + \end{tcb@doc@head}}% + {\end{tcb@manual@entry}} + +\newenvironment{docKey*}{\bgroup\tcb@doc@toindexfalse\begin{docKey}}{\end{docKey}\egroup} \def\tcbmakedocSubKey#1#2{% \newenvironment{#1}[4][\@empty]{% \ifx##1\@empty\def\tcb@key@path{#2}\else\def\tcb@key@path{#2/##1}\fi% \begin{docKey}[\tcb@key@path]{##2}{##3}{##4}}% {\end{docKey}}% + \newenvironment{#1*}{\bgroup\tcb@doc@toindexfalse\begin{#1}}{\end{#1}\egroup}% } -\def\docColor#1{\disp@com{#1}\index@Col{#1}}% -\def\docAuxCommand#1{\disp@com{\cs{#1}}\index@Com{#1}}% +\def\docAuxCommand@#1{\tcb@disp@com{\cs{#1}}\tcb@index@Com{#1}}% +\def\docAuxCommand@star#1{\tcb@disp@com{\cs{#1}}}% +\def\docAuxCommand{\@ifstar\docAuxCommand@star\docAuxCommand@} + +\def\docAuxEnvironment@#1{\tcb@disp@com{#1}\tcb@index@Env{#1}}% +\def\docAuxEnvironment@star#1{\tcb@disp@com{#1}}% +\def\docAuxEnvironment{\@ifstar\docAuxEnvironment@star\docAuxEnvironment@} + +\def\docAuxKey@#1{\tcb@disp@com{#1}\tcb@index@Key{#1}}% +\def\docAuxKey@star#1{\tcb@disp@com{#1}}% +\def\docAuxKey{\@ifstar\docAuxKey@star\docAuxKey@} + +\def\docColor@#1{\tcb@disp@com{#1}\tcb@index@Col{#1}}% +\def\docColor@star#1{\tcb@disp@com{#1}}% +\def\docColor{\@ifstar\docColor@star\docColor@} + +\def\docValue@#1{\tcb@disp@com{#1}\tcb@index@Val{#1}}% +\def\docValue@star#1{\tcb@disp@com{#1}}% +\def\docValue{\@ifstar\docValue@star\docValue@} \setrefcountdefault{-1} -\def\ref@doc#1{\hyperlink{#1}{\texttt{\ref*{#1}}% +\def\tcb@ref@doc#1{\hyperref[#1]{\texttt{\ref*{#1}}% \ifnum\getpagerefnumber{#1}=\thepage\else% \textsuperscript{\ding{213}\,\kvtcb@text@pageshort\,\pageref*{#1}}\fi}} -\def\ref@doc@star#1{\hyperlink{#1}{\texttt{\ref*{#1}}}} +\def\tcb@ref@doc@star#1{\hyperref[#1]{\texttt{\ref*{#1}}}} -\def\refCom@#1{\ref@doc{com:#1}} -\def\refCom@star#1{\ref@doc@star{com:#1}} +\def\refCom@#1{\tcb@ref@doc{com:#1}} +\def\refCom@star#1{\tcb@ref@doc@star{com:#1}} \def\refCom{\@ifstar\refCom@star\refCom@} -\def\refEnv@#1{\ref@doc{env:#1}} -\def\refEnv@star#1{\ref@doc@star{env:#1}} +\def\refEnv@#1{\tcb@ref@doc{env:#1}} +\def\refEnv@star#1{\tcb@ref@doc@star{env:#1}} \def\refEnv{\@ifstar\refEnv@star\refEnv@} -\def\refKey@#1{\ref@doc{key:#1}} -\def\refKey@star#1{\ref@doc@star{key:#1}} +\def\refKey@#1{\tcb@ref@doc{key:#1}} +\def\refKey@star#1{\tcb@ref@doc@star{key:#1}} \def\refKey{\@ifstar\refKey@star\refKey@} +\def\refAux#1{\textcolor{\kvtcb@colhyper}{\ttfamily #1}} +\def\refAuxcs#1{\textcolor{\kvtcb@colhyper}{\cs{#1}}} + \newenvironment{absquote} {\list{}{\leftmargin2cm\rightmargin\leftmargin}% \item\relax\footnotesize} @@ -250,8 +325,8 @@ \def\tcb@doc@index@doc{% - \let\index@Com=\SpecialMainIndex%% - \let\index@Env=\SpecialMainEnvIndex% + \let\tcb@index@Com=\SpecialMainIndex%% + \let\tcb@index@Env=\SpecialMainEnvIndex% \tcbset{index german settings}% \EnableCrossrefs% \PageIndex% @@ -269,7 +344,15 @@ color definition=Definition, color hyperlink=Hyperlink, before example=\par\smallskip, - after example=,}, + after example=, + doc left=2em, + doc right=0pt, + doc left indent=-2em, + doc right indent=0pt, + doc head=, + doc description=, + doc into index=true, + }, initialize@reset=reset@documentation, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 3a66d5d6d84..89b411d52a9 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 1fb7e50fdbe..f39b877d3c6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \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 9ecaf1366e4..366520111d9 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \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 7afca6e94ae..4401fd0a840 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index d077adad17e..80393ee5702 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \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 0a2c0564d23..1a20c11733f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 0fa7982653a..3c58bf1940b 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \RequirePackage{tikz}[2010/10/13] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 4dfab320b3c..2e8009cf1b8 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \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 1517e3fc6ab..4cae6984bd6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,22 +18,26 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{2.61} +\tcb@set@library@version{2.70} \RequirePackage{amsmath} \def\tcb@hack@amsmath{\tcb@hack@currenvir\vskip-\abovedisplayskip} +\def\tcb@theo@form@namenumber#1#2{\hbox{#1~#2}} +\def\tcb@theo@form@numbername#1#2{\hbox{#2~#1}} +\def\tcb@theo@form@name#1#2{\hbox{#1}} + \def\tcb@theo@title#1#2#3{% - \ifdefempty{#2}{\setbox\z@=\hbox{#1}}{\setbox\z@=\hbox{#1~#2}}% + \ifdefempty{#2}{\setbox\z@=\hbox{#1}}{\setbox\z@=\tcb@theo@form{#1}{#2}}% \def\temp@a{#3}% \ifx\temp@a\@empty\relax% - \unhbox\z@% + \unhbox\z@\kvtcb@terminatorsign% \else% \setbox\z@=\hbox{\unhbox\z@\kvtcb@separatorsign\ }% \hangindent\wd\z@% \hangafter=1% - \mbox{\unhbox\z@}#3% + \mbox{\unhbox\z@}\kvtcb@desc@delim@left#3\kvtcb@desc@delim@right\kvtcb@terminatorsign% \fi% } @@ -81,6 +85,32 @@ separator sign/.store in=\kvtcb@separatorsign,% separator sign colon/.style={separator sign={:}},% separator sign dash/.style={separator sign={\ --}},% + separator sign none/.style={separator sign=},% + terminator sign/.store in=\kvtcb@terminatorsign,% + terminator sign colon/.style={terminator sign={:}},% + terminator sign dash/.style={terminator sign={\ --}},% + terminator sign none/.style={terminator sign=},% + description delimiters/.code 2 args={\def\kvtcb@desc@delim@left{#1}\def\kvtcb@desc@delim@right{#2}},% + description delimiters parenthesis/.style={description delimiters=()}, + description delimiters none/.style={description delimiters={}{}}, + theorem name and number/.code={\let\tcb@theo@form=\tcb@theo@form@namenumber}, + theorem number and name/.code={\let\tcb@theo@form=\tcb@theo@form@numbername}, + theorem name/.code={\let\tcb@theo@form=\tcb@theo@form@name}, + theorem style/.is choice, + theorem style/standard/.style={separator sign colon,description delimiters none, + terminator sign none,theorem name and number,attach title}, + theorem style/change standard/.style={theorem style=standard,theorem number and name}, + theorem style/plain/.style={separator sign none,description delimiters parenthesis, + terminator sign colon,theorem name and number,attach title to upper={\ }}, + theorem style/plain apart/.style={separator sign none,description delimiters parenthesis, + terminator sign none,theorem name and number,attach title}, + theorem style/break/.style={theorem style=plain,attach title to upper={\par}}, + theorem style/change/.style={theorem style=plain,theorem number and name}, + theorem style/change apart/.style={theorem style=plain apart,theorem number and name}, + theorem style/change break/.style={theorem style=break,theorem number and name}, + theorem style/margin/.style={theorem style=plain,theorem name,before title=\makebox[0pt][r]{\thetcbcounter\ }}, + theorem style/margin apart/.style={theorem style=margin,attach title,terminator sign none}, + theorem style/margin break/.style={theorem style=margin,attach title to upper={\par}}, } \newcommand{\new@tcbtheorem}[5][]{% @@ -110,7 +140,7 @@ \tcbset{% reset@theorems/.style={% highlight math style={colframe=red,colback=yellow!25!white},% - separator sign colon,% + theorem style=standard,% }, initialize@reset=reset@theorems, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 4f57a3135cb..325ae9945a2 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.61 (2014/01/10) +%% The LaTeX package tcolorbox - version 2.70 (2014/02/06) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/01/10 version 2.61 text color boxes] -\def\tcb@version{2.61} +\ProvidesPackage{tcolorbox}[2014/02/06 version 2.70 text color boxes] +\def\tcb@version{2.70} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -108,11 +108,34 @@ \pgfkeys{/handlers/.dimstore in/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\def#1{\the\dimexpr##1\relax}}} +\newcommand\tcbtitle{\ifx\tcbtitletext\@empty\else% + {\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi} + +\def\tcb@detach@title@code@{% + \let\tcbtitletext\kvtcb@title% + \let\kvtcb@title\@empty% + \tcbset{title/.store in=\tcbtitletext}% + \let\tcb@detach@title@code\@empty% + \let\tcb@attach@title@code\tcb@attach@title@code@% +} + +\def\tcb@attach@title@code@{% + \let\kvtcb@title\tcbtitletext% + \let\tcbtitletext\@empty% + \tcbset{title/.store in=\kvtcb@title}% + \let\tcb@attach@title@code\@empty% + \let\tcb@detach@title@code\tcb@detach@title@code@% +} + \tcbset{% title/.store in=\kvtcb@title, notitle/.style={title=}, adjust text/.store in=\kvtcb@adjusttext, adjusted title/.style={title={#1\vphantom{\kvtcb@adjusttext}}}, + detach title/.code=\tcb@detach@title@code,% + attach title/.code=\tcb@attach@title@code,% + attach title to upper/.style={detach title,before upper={\tcbtitle#1}}, + attach title to upper/.default=, width/.dimstore in=\kvtcb@width, boxsep/.store in=\kvtcb@boxsep, toprule/.code={% @@ -282,8 +305,11 @@ \tcb@hack@currenvir\tabularx{\linewidth}{#2}}, after upper=\endtabularx\arrayrulecolor{black}}, tabularx/.style={tabularx*={}{#1}}, - tikz upper/.style={before upper=\centering\tcb@shield@externalize\tikzpicture[#1],after upper=\endtikzpicture},% - tikz lower/.style={before lower=\centering\tcb@shield@externalize\tikzpicture[#1],after lower=\endtikzpicture},% + tikz upper/.style={before upper=\centering\tcb@shield@externalize\begin{tikzpicture}[#1],after upper=\end{tikzpicture}},% + tikz lower/.style={before lower=\centering\tcb@shield@externalize\begin{tikzpicture}[#1],after lower=\end{tikzpicture}},% + tikznode upper/.style={before upper={\centering\tcb@shield@externalize\begin{tikzpicture}\node[align=center,inner sep=0pt,outer sep=0pt,#1]\bgroup},after upper={\egroup;\end{tikzpicture}}},% + tikznode lower/.style={before lower={\centering\tcb@shield@externalize\begin{tikzpicture}\node[align=center,inner sep=0pt,outer sep=0pt,#1]\bgroup},after lower={\egroup;\end{tikzpicture}}},% + tikznode/.style={tikznode upper={#1},tikznode lower={#1}},% oversize/.style={% width=\the\dimexpr\dimexpr\linewidth+#1+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax,% enlarge left by=\the\dimexpr-\kvtcb@left@rule-\kvtcb@leftupper-\kvtcb@boxsep-#1/2\relax,% @@ -300,7 +326,7 @@ extrude by/.style={extrude left by=#1,extrude right by=#1,extrude top by=#1,extrude bottom by=#1},% sidebyside/.is if=tcb@sidebyside,% sidebyside align/.store in=\kvtcb@sbs@align,% - sidebyside gap/.store in=\kvtcb@sbs@gap,% + sidebyside gap/.dimstore in=\kvtcb@sbs@gap,% lefthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftwidth}, righthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightwidth}, lefthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftratio}, @@ -351,6 +377,9 @@ spartan@fit/.code={},% } +\def\kvtcb@beforebox{} +\def\kvtcb@afterbox{} + \tcbset{% autoparskip,minipage,savedelimiter=tcolorbox,% set@extensions@preframe=,set@extensions@postframe=,% @@ -867,7 +896,7 @@ \def\tcb@sbs@mix{% \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper@real} - \noindent\unhbox\tcb@upperbox\hfill% + \noindent\unhbox\tcb@upperbox\hspace{\kvtcb@sbs@gap}% \iftcb@hasLower% \iftcb@lowervisible\unhbox\tcb@lowerbox% \else% @@ -1228,10 +1257,13 @@ } \def\tcb@lowerverbatim{% + \begingroup% \tcbverbatimwrite\kvtcb@savelowerto} -\let\tcb@endlowerverbatim\endtcbverbatimwrite% - +\def\tcb@endlowerverbatim{% + \endtcbverbatimwrite% + \endgroup% +} % saving of the upper box @@ -1261,7 +1293,8 @@ \tcbset{% initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},% reset/.code={\tcb@reset},% - reset@core/.style={notitle,width=\linewidth, + reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@}, + width=\linewidth,autoparskip, natural height,height plus=0pt,space to lower,valign=top,valign lower=top, boxsep=1mm,boxrule=0.5mm, left=4mm,right=4mm,top=2mm,bottom=2mm,middle=2mm,arc=1mm, |