From 1bd921307267eff202ea820c26888bd0082e86a0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Oct 2014 22:05:20 +0000 Subject: tcolorbox (10oct14) git-svn-id: svn://tug.org/texlive/trunk@35350 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tcolorbox/CHANGES | 14 ++- Master/texmf-dist/doc/latex/tcolorbox/README | 2 +- .../doc/latex/tcolorbox/tcolorbox-example.pdf | Bin 361353 -> 361375 bytes .../doc/latex/tcolorbox/tcolorbox-example.tex | 2 +- .../latex/tcolorbox/tcolorbox.doc.coreoptions.tex | 99 +++++++++++++++++++++ .../tcolorbox/tcolorbox.doc.documentation.tex | 13 +-- .../texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf | Bin 4488553 -> 4505968 bytes .../texmf-dist/doc/latex/tcolorbox/tcolorbox.tex | 19 ++-- 8 files changed, 130 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/doc/latex/tcolorbox') diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 192b17cc6d2..6b46d6db0ae 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm @@ -607,3 +607,15 @@ version 3.20 (2014/09/22) 'doclang/new', 'doclang/updated', 'doc marginnote', 'doc updated', 'doc new', 'doc new and updated' +version 3.21 (2014/10/10) +- bug fix: empty key path handling inside the 'docKey' and 'docKey*' environments was faulty +- bug fix: wrong coloring for '\docAuxCommand' and '\docAuxCommand*' +- bug fix: draft mode for inner boxes deactivated in v3.20 +- subtitles added +- new macros: + '\tcbsubtitle' +- new options: + 'subtitle style', 'before skip', 'after skip', 'beforeafter', +- library 'documentation': + implementation of handling macro and key names changed to accept underscores + several internal implementation changes diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 06bb2a4f501..df25f1746c8 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf index 0902b99e687..c9ba08dac34 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index 082cc44e086..34b1929eb8f 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex index 3c350f3b655..fdedb1dc812 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -105,6 +105,64 @@ More title options are documented in \Vref{subsec:contentadditions} and \Vref{subsec:skinboxedtitle}. \end{marker} +\clearpage +\subsection{Subtitle} + +Inside the box content, one or more subtitles can be added. +In general, a subtitle is a further \refEnv{tcolorbox} which inherits some +color and geometry options from the enclosing box. It may be customized +just like any other \refEnv{tcolorbox}. + +\begin{docCommand}[doc new=2014-10-10]{tcbsubtitle}{\oarg{options}\marg{text}} + Used inside a \refEnv{tcolorbox} to add a subtitle box with the given \meta{text}. + This is an independent \refEnv{tcolorbox} which is formatted by several + inherited properties of the enclosing box, by further settings from + \refKey{/tcb/subtitle style}, and by the given \meta{options}. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[title=My title, + colback=red!5!white, + colframe=red!75!black, + fonttitle=\bfseries] + This is a \textbf{tcolorbox}. +\tcbsubtitle[before skip=\baselineskip]% + {My subtitle} + Further text. +\end{tcolorbox} +\end{dispExample*} +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[title=My title, + colback=red!5!white, + colframe=red!75!black, + colbacktitle=yellow!50!red, + coltitle=red!25!black, + fonttitle=\bfseries] + This is a \textbf{tcolorbox}. +\tcbsubtitle[before skip=\baselineskip]% + {My subtitle} + Further text. +\end{tcolorbox} +\end{dispExample*} +\end{docCommand} + +\begin{docTcbKey}[][doc new=2014-10-10]{subtitle style}{=\meta{options}}{no default, initially empty} + Adds |tcolorbox| \meta{options} to the settings for \refCom{tcbsubtitle}. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[title=My title, + colback=red!5!white, + colframe=red!75!black, + colbacktitle=yellow!50!red, + coltitle=red!25!black, + fonttitle=\bfseries, + subtitle style={boxrule=0.4pt, + colback=yellow!50!red!25!white} ] + This is a \textbf{tcolorbox}. +\tcbsubtitle{My subtitle} + Further text. +\tcbsubtitle{Second subtitle} + Further text. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} \clearpage \subsection{Lower Part} @@ -2172,6 +2230,47 @@ This behavior is controlled by the keys |before| and |after|. Used to set the |\pgfsetbaseline| value of the resulting |tcolorbox|. \end{docTcbKey} +\clearpage + +\begin{docTcbKey}[][doc new=2014-10-10]{before skip}{=\meta{length}}{style, no default} + Inserts some vertical space of the given \meta{length} before the colored box. + This style sets \refKey{/tcb/before}. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +Some text. +\begin{tcolorbox}[before skip=1cm, + colframe=red!50!white] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-10-10]{after skip}{=\meta{length}}{style, no default} + Inserts some vertical space of the given \meta{length} after the colored box. + This style sets \refKey{/tcb/after}. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\begin{tcolorbox}[after skip=1cm, + colframe=red!50!white] + This is a \textbf{tcolorbox}. +\end{tcolorbox} +Some text. +\end{dispExample*} +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2014-10-10]{beforeafter skip}{=\meta{length}}{style, no default} + Inserts some vertical space of the given \meta{length} before \emph{and} after the colored box. + This style sets \refKey{/tcb/before} and \refKey{/tcb/after}. +\begin{dispExample*}{sbs,lefthand ratio=0.6} +\tcbset{beforeafter skip=0pt, + colframe=red!50!white} +\begin{tcolorbox} + This is a \textbf{tcolorbox}. +\end{tcolorbox} +\begin{tcolorbox} + Second box. +\end{tcolorbox} +\end{dispExample*} +\end{docTcbKey} + \clearpage \subsection{Bounding 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 52fce65f388..0cc49b12c16 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex @@ -97,7 +97,7 @@ For |minted| \cite{rudolph:2011a} support, load: \end{xdocEnvironment}} -\begin{docEnvironment}[doclang/environment content=key description,doc updated=2014-09-19]{docKey}{\oarg{key path}\oarg{options}\marg{name}\marg{parameters}\marg{description}} +\begin{docEnvironment}[doclang/environment content=key description,doc updated=2014-09-29]{docKey}{\oarg{key path}\oarg{options}\marg{name}\marg{parameters}\marg{description}} Documents a key with given \meta{name} and an optional \meta{key path}. The given \meta{options} are set with \refCom{tcbset}. This key takes mandatory or optional \meta{parameters} as value @@ -112,7 +112,7 @@ For |minted| \cite{rudolph:2011a} support, load: \end{docEnvironment} -\begin{docEnvironment}[doclang/environment content=key description,doc updated=2014-09-19]{docKey*}{\oarg{key path}\oarg{options}\marg{name}\marg{parameters}\marg{description}} +\begin{docEnvironment}[doclang/environment content=key description,doc updated=2014-09-29]{docKey*}{\oarg{key path}\oarg{options}\marg{name}\marg{parameters}\marg{description}} Identical to \refEnv{docKey}, but without index entry. \end{docEnvironment} @@ -131,7 +131,7 @@ A feasible value for \refKey{/foo/footitle} is \docValue{foovalue}. \end{docCommand} -\begin{docCommand}{docAuxCommand}{\marg{name}} +\begin{docCommand}[doc updated=2014-10-09]{docAuxCommand}{\marg{name}} Documents an auxiliary or minor \LaTeX\ macro with given \meta{name} where \meta{name} is written without backslash. This macro is automatically indexed. @@ -140,7 +140,7 @@ The macro \docAuxCommand{fooaux} holds some interesting data. \end{dispExample} \end{docCommand} -\begin{docCommand}{docAuxCommand*}{\marg{name}} +\begin{docCommand}[doc updated=2014-10-09]{docAuxCommand*}{\marg{name}} Identical to \refCom{docAuxCommand}, but without index entry. \end{docCommand} @@ -200,6 +200,7 @@ This is a \meta{text}. \end{dispExample} \end{docCommand} + \begin{docCommand}{marg}{\marg{text}} Macro from |ltxdoc| \cite{carlisle:2007a} to typeset a \meta{text} with curly brackets as a mandatory argument. The library overwrites the original macro. @@ -229,7 +230,7 @@ This is an optional \oarg{argument}. {\let\xdispExample\dispExample \let\endxdispExample\enddispExample -\begin{docEnvironment}{dispExample}{} +\begin{docEnvironment}[doc updated=2014-10-10]{dispExample}{} Creates a colored box based on a \refEnv{tcolorbox}. It displays the environment content as source code in the upper part and as compiled text in the lower part of the box. @@ -250,7 +251,7 @@ This is a \LaTeX\ example. {\let\xdispExample\dispExample \let\endxdispExample\enddispExample -\begin{docEnvironment}{dispExample*}{\marg{options}} +\begin{docEnvironment}[doc updated=2014-10-10]{dispExample*}{\marg{options}} The starred version of \refEnv{dispExample} takes \refEnv{tcolorbox} \meta{options} as parameter. These \meta{options} are executed after \refKey{/tcb/docexample}. \begin{xdispExample} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf index e491f7bc7d5..5ac8006b1fd 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf differ diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index da6e97c717e..b61ddcb75a3 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -90,15 +90,14 @@ \makeatletter \newrobustcmd{\tcbIndexPrintSkinCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@key}{Skin}} \newrobustcmd{\tcbIndexPrintSkinC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@key}} +\def\tcb@index@Skin#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintSkinCA{#1}}\index{Skins\idx@level#1\idx@actual\tcbIndexPrintSkinC{#1}}\fi}% - -\def\index@Skin#1{\index{#1\idx@actual\tcbIndexPrintSkinCA{#1}}\index{Skins\idx@level#1\idx@actual\tcbIndexPrintSkinC{#1}}} \newenvironment{docSkin}[1]{\begin{tcb@manual@entry}% \begin{tcb@doc@head}{colback=magenta!5!white,interior style=fill}% - \hypertarget{skin:#1}{\tcb@Print@Key{/tcb/skin=}\tcb@Print@Val{#1}\index@Skin{#1}\protected@edef\@currentlabel{#1}\label{skin:#1}\hfill(skin)}% + \hypertarget{skin:#1}{\tcb@Print@Key{/tcb/skin=}\tcb@Print@Val{#1}\tcb@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}} +\def\refSkin{\tcb@ref@doc{skin}} \makeatother \newtcolorbox{marker}[1][]{marker,#1} @@ -106,8 +105,8 @@ \renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1} \renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1} -\def\version{3.20}% -\def\datum{2014/09/22}% +\def\version{3.21}% +\def\datum{2014/10/10}% \makeindex \hypersetup{ @@ -136,7 +135,7 @@ % tcolorbox macros moretexcs={% core endtcolorbox,endtcbverbatimwrite,newtcolorbox,newtcbox,newtcboxfit,tcbusetemp,tcbtitle,tcbtitletext, - tcblower,tcbox,tcboxfit,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite,tcbsetforeverylayer, + tcblower,tcbox,tcboxfit,tcbset,tcbuselibrary,tcolorbox,tcbverbatimwrite,tcbsetforeverylayer,tcbsubtitle, % listings endtcblisting,newtcblisting,newtcbinputlisting, tcblisting,tcbinputlisting,tcbuselistingtext,tcbuselistinglisting,tcbusetemplisting, @@ -308,8 +307,8 @@ %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.abstract} - +%\includeonly{tcolorbox.doc.documentation,tcolorbox.doc.index} +%\includeonly{tcolorbox.doc.coreoptions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} -- cgit v1.2.3