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 ++- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 4 +- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 135 ++++++++++----------- .../tex/latex/tcolorbox/tcbfitting.code.tex | 4 +- .../tex/latex/tcolorbox/tcbhooks.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistings.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingscore.code.tex | 4 +- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 4 +- .../tex/latex/tcolorbox/tcbminted.code.tex | 4 +- .../tex/latex/tcolorbox/tcbskins.code.tex | 6 +- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 4 +- .../tex/latex/tcolorbox/tcbxparse.code.tex | 4 +- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 51 +++++++- 21 files changed, 265 insertions(+), 116 deletions(-) (limited to 'Master') 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} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 3cc9dcea3d3..ac7e06059d9 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index badf3f59411..23d432c99e3 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \tcbuselibrary{listings,skins,xparse} @@ -61,6 +61,9 @@ \def\oarg#1{% \colOpt{{\ttfamily[}\meta{#1}{\ttfamily]}}} +\newrobustcmd\tcb@cs[1]{{\catcode`\_=12\relax\catcode`\@11\relax\ttfamily\char`\\\scantokens{#1}\unskip}} +\newrobustcmd\tcb@scantokens[1]{{\catcode`\_=12\relax\catcode`\@11\relax\ttfamily\scantokens{#1}\unskip}} + \newif\iftcb@doc@toindex \newif\iftcb@doc@colorize \newif\iftcb@doc@annotate @@ -152,8 +155,7 @@ menucolor=\kvtcb@colhyper }} - -\def\dispExample{\tcbset{docexample}\tcbwritetemp} +\def\dispExample{\tcb@layer@pushup\tcbset{docexample}\tcbwritetemp} \def\enddispExample{% \endtcbwritetemp% @@ -165,7 +167,7 @@ } \newenvironment{dispExample*}[1]{% - \tcbset{docexample,#1}\tcbwritetemp% + \tcb@layer@pushup\tcbset{docexample,#1}\tcbwritetemp% }{\enddispExample} \def\dispListing{\tcb@layer@pushup\tcbset{docexample}\tcbwritetemp} @@ -183,32 +185,36 @@ % index auxiliary macros \def\tcb@Index@Print@CA#1#2#3{% - \iftcb@doc@colorize\textcolor{#2}{\texttt{#1}}\else\texttt{#1}\fi% + \iftcb@doc@colorize\textcolor{#2}{\tcb@scantokens{#1}}\else\tcb@scantokens{#1}\fi% \iftcb@doc@annotate\ #3\fi% } \def\tcb@Index@Print@C#1#2{% - \iftcb@doc@colorize\textcolor{#2}{\texttt{#1}}\else\texttt{#1}\fi% + \iftcb@doc@colorize\textcolor{#2}{\tcb@scantokens{#1}}\else\tcb@scantokens{#1}\fi% +} + +\def\tcb@Index@Print@ComC#1#2{% + \iftcb@doc@colorize\textcolor{#2}{\tcb@cs{#1}}\else\tcb@cs{#1}\fi% } -\newrobustcmd{\tcbIndexPrintComC}[1]{\tcb@Index@Print@C{\cs{#1}}{\kvtcb@col@command}} -\def\tcb@Print@Com#1{\textcolor{\kvtcb@col@command}{\ttfamily\bfseries\cs{#1}}} +\newrobustcmd{\tcbIndexPrintComC}[1]{\tcb@Index@Print@ComC{#1}{\kvtcb@col@command}} +\def\tcb@Print@Com#1{\textcolor{\kvtcb@col@command}{\bfseries\tcb@cs{#1}}} \newrobustcmd{\tcbIndexPrintEnvCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@environment}{\kvtcb@text@env}} \newrobustcmd{\tcbIndexPrintEnvC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@environment}} -\def\tcb@Print@Env#1{\textcolor{\kvtcb@col@environment}{\ttfamily\bfseries#1}} +\def\tcb@Print@Env#1{\textcolor{\kvtcb@col@environment}{\bfseries\tcb@scantokens{#1}}} \newrobustcmd{\tcbIndexPrintKeyCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@key}{\kvtcb@text@key}} \newrobustcmd{\tcbIndexPrintKeyC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@key}} -\def\tcb@Print@Key#1{\textcolor{\kvtcb@col@key}{\ttfamily\bfseries#1}} +\def\tcb@Print@Key#1{\textcolor{\kvtcb@col@key}{\bfseries\tcb@scantokens{#1}}} \newrobustcmd{\tcbIndexPrintValCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@value}{\kvtcb@text@value}} \newrobustcmd{\tcbIndexPrintValC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@value}} -\def\tcb@Print@Val#1{\textcolor{\kvtcb@col@value}{\ttfamily\bfseries#1}} +\def\tcb@Print@Val#1{\textcolor{\kvtcb@col@value}{\bfseries\tcb@scantokens{#1}}} \newrobustcmd{\tcbIndexPrintColCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@color}{\kvtcb@text@color}} \newrobustcmd{\tcbIndexPrintColC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@color}} -\def\tcb@Print@Col#1{\textcolor{\kvtcb@col@color}{\ttfamily\bfseries#1}} +\def\tcb@Print@Col#1{\textcolor{\kvtcb@col@color}{\bfseries\tcb@scantokens{#1}}} \def\tcb@index@Com#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintComC{#1}}\fi} \def\tcb@index@Env#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintEnvCA{#1}}\index{\kvtcb@text@envs\idx@level#1\idx@actual\tcbIndexPrintEnvC{#1}}\fi} @@ -247,7 +253,7 @@ \newenvironment{docCommand}[3][]{\tcbset{#1}% \begin{tcb@manual@entry}% \begin{tcb@doc@head}{doc@head@command}% - \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\cs{#2}}\label{com:#2}{\ttfamily #3}% + \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\tcb@cs{#2}}\label{com:#2}{\ttfamily #3}% \tcb@doc@do@description% \end{tcb@doc@head}\tcbset{before upper=}}% {\end{tcb@manual@entry}} @@ -266,12 +272,15 @@ \newenvironment{docEnvironment*}{\bgroup\tcb@doc@toindexfalse\begin{docEnvironment}}{\end{docEnvironment}\egroup} -\NewDocumentEnvironment{docKey}{ O{\@empty} +O{} m m +m }{\tcbset{#2,doc description={#5}}% +\NewDocumentEnvironment{docKey}{ O{} +O{} m m +m }{\tcbset{#2,doc description={#5}}% \begin{tcb@manual@entry}% \begin{tcb@doc@head}{doc@head@key}% - \def\temp@a{#1}\ifx\temp@a\@empty% - \tcb@Print@Key{#3}\tcb@index@Key{#3}\protected@edef\@currentlabel{#3}\label{key:#2}{\ttfamily #4}% - \else\tcb@Print@Key{/#1/#3}\tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/#3}{\ttfamily #4}\fi% + \ifblank{#1}{% + \tcb@Print@Key{#3}\tcb@index@Key{#3}\protected@edef\@currentlabel{#3}\label{key:#3}{\ttfamily #4}% + }{% + \tcb@Print@Key{/#1/#3}% + \tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/#3}{\ttfamily #4}% + }% \tcb@doc@do@description% \end{tcb@doc@head}\tcbset{before upper=}}% {\end{tcb@manual@entry}} @@ -280,65 +289,57 @@ \def\tcbmakedocSubKey#1#2{% \NewDocumentEnvironment{#1}{ O{} +O{} m m +m }{% - \def\temp@a{##1}\ifx\temp@a\@empty% - \def\tcb@key@path{#2}\else\def\tcb@key@path{#2/##1}\fi% + \ifblank{##1}{\def\tcb@key@path{#2}}{\def\tcb@key@path{#2/##1}}% \begin{docKey}[\tcb@key@path][##2]{##3}{##4}{##5}}% {\end{docKey}}% \newenvironment{#1*}{\bgroup\tcb@doc@toindexfalse\begin{#1}}{\end{#1}\egroup}% } -\def\docAuxCommand@#1{\tcbIndexPrintComC{#1}\tcb@index@Com{#1}}% -\def\docAuxCommand@star#1{\tcbIndexPrintComC{#1}}% -\def\docAuxCommand{\@ifstar\docAuxCommand@star\docAuxCommand@} - -\def\docAuxEnvironment@#1{\tcb@Print@Env{#1}\tcb@index@Env{#1}}% -\def\docAuxEnvironment@star#1{\tcb@Print@Env{#1}}% -\def\docAuxEnvironment{\@ifstar\docAuxEnvironment@star\docAuxEnvironment@} - -\newcommand{\docAuxKey@}[2][]{% - \def\temp@a{#1}\ifx\temp@a\@empty% - \tcb@Print@Key{#2}\tcb@index@Key{#2}% - \else% - \tcb@Print@Key{/#1/#2}\tcb@index@KeyPath{#1}{#2}% - \fi}% - -\newcommand{\docAuxKey@star}[2][]{% - \def\temp@a{#1}\ifx\temp@a\@empty% - \tcb@Print@Key{#2}% - \else% - \tcb@Print@Key{/#1/#2}% - \fi}% -\def\docAuxKey{\@ifstar\docAuxKey@star\docAuxKey@} - -\def\docColor@#1{\tcb@Print@Col{#1}\tcb@index@Col{#1}}% -\def\docColor@star#1{\tcb@Print@Col{#1}}% -\def\docColor{\@ifstar\docColor@star\docColor@} - -\def\docValue@#1{\tcb@Print@Val{#1}\tcb@index@Val{#1}}% -\def\docValue@star#1{\tcb@Print@Val{#1}}% -\def\docValue{\@ifstar\docValue@star\docValue@} +\DeclareDocumentCommand\docAuxCommand{sm}{% + \tcb@Print@Com{#2}% + \IfBooleanTF{#1}{}{\tcb@index@Com{#2}}% +} -\setrefcountdefault{-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}} +\DeclareDocumentCommand\docAuxEnvironment{sm}{% + \tcb@Print@Env{#2}% + \IfBooleanTF{#1}{}{\tcb@index@Env{#2}}% +} -\def\tcb@ref@doc@star#1{\hyperref[#1]{\texttt{\ref*{#1}}}} +\DeclareDocumentCommand\docAuxKey{sO{}m}{% + \ifblank{#2}{% + \tcb@Print@Key{#3}% + \IfBooleanTF{#1}{}{\tcb@index@Key{#3}}% + }{% + \tcb@Print@Key{/#2/#3}% + \IfBooleanTF{#1}{}{\tcb@index@KeyPath{#2}{#3}}% +}} + +\DeclareDocumentCommand\docColor{sm}{% + \tcb@Print@Col{#2}% + \IfBooleanTF{#1}{}{\tcb@index@Col{#2}}% +} -\def\refCom@#1{\tcb@ref@doc{com:#1}} -\def\refCom@star#1{\tcb@ref@doc@star{com:#1}} -\def\refCom{\@ifstar\refCom@star\refCom@} +\DeclareDocumentCommand\docValue{sm}{% + \tcb@Print@Val{#2}% + \IfBooleanTF{#1}{}{\tcb@index@Val{#2}}% +} -\def\refEnv@#1{\tcb@ref@doc{env:#1}} -\def\refEnv@star#1{\tcb@ref@doc@star{env:#1}} -\def\refEnv{\@ifstar\refEnv@star\refEnv@} +\setrefcountdefault{-1} +\DeclareDocumentCommand\tcb@ref@doc{msm}{% + \hyperref[#1:#3]{\texttt{\ref*{#1:#3}}% + \IfBooleanTF{#2}{}{% + \ifnum\getpagerefnumber{#1:#3}=\thepage% + \else% + \textsuperscript{\ding{213}\,\kvtcb@text@pageshort\,\pageref*{#1:#3}}% + \fi}}% +} -\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\refCom{\tcb@ref@doc{com}} +\def\refEnv{\tcb@ref@doc{env}} +\def\refKey{\tcb@ref@doc{key}} -\def\refAux#1{\textcolor{\kvtcb@colhyper}{\ttfamily #1}} -\def\refAuxcs#1{\textcolor{\kvtcb@colhyper}{\cs{#1}}} +\def\refAux#1{\textcolor{\kvtcb@colhyper}{\tcb@scantokens{#1}}} +\def\refAuxcs#1{\textcolor{\kvtcb@colhyper}{\tcb@cs{#1}}} \newenvironment{absquote} {\list{}{\leftmargin2cm\rightmargin\leftmargin}% @@ -422,5 +423,3 @@ }, 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 1bdc416c4e5..fb6b9f5215f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \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 f7a67861239..64b6db45cf5 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \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 7169de937dc..9bd78cb3139 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \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 53b86a534cc..622e0eafad4 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% 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{3.20} +\tcb@set@library@version{3.21} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% \def\tcbuselistingcomment{\kvtcb@listingcomment}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 9754221198b..b209c5a84f1 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \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 56574f31d1a..e6741554ece 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \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 4ab546e513c..fff5f4ce095 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \RequirePackage{tikz}[2010/10/13] @@ -949,7 +949,7 @@ \tcbset{% before@boxed@title/.store in=\kvtcb@before@boxedtitle,% after@boxed@title/.store in=\kvtcb@after@boxedtitle,% - boxed title style/.store in=\kvtcb@style@boxedtitle,%.style={boxed@title@style/.style={#1}}, + boxed title style/.store in=\kvtcb@style@boxedtitle,% % varwidth boxed title/.style={before@boxed@title={\tcbdimto\tcb@w@title{#1}\begin{varwidth}{\tcb@w@title}},after@boxed@title={\end{varwidth}}},% varwidth boxed title/.default={\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule-\kvtcb@boxsep*2-\kvtcb@lefttitle-\kvtcb@righttitle}, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index 5253c506a43..5bd8f8178a6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \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 ebae94f0781..48809563ce0 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 0f28592d610..76b7acec17f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.20} +\tcb@set@library@version{3.21} \RequirePackage{xparse}[2013/12/31] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 4791a3c546f..d3f9a404674 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.20 (2014/09/22) +%% The LaTeX package tcolorbox - version 3.21 (2014/10/10) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/09/22 version 3.20 text color boxes] -\def\tcb@version{3.20} +\ProvidesPackage{tcolorbox}[2014/10/10 version 3.21 text color boxes] +\def\tcb@version{3.21} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -145,6 +145,7 @@ attach title/.code=\tcb@attach@title@code,% attach title to upper/.style={detach title,before upper={\tcbtitle#1}}, attach title to upper/.default=, + subtitle style/.store in=\kvtcb@subtitle@style,% width/.dimstore in=\kvtcb@width, boxsep/.store in=\kvtcb@boxsep, toprule/.code={% @@ -209,6 +210,15 @@ parskip/.style={before={\par\pagebreak[0]\parindent=0pt},after={\par}}, noparskip/.style={before={\par\smallskip\pagebreak[0]\parindent=0pt},after={\par\smallskip}}, nobeforeafter/.style={before=,after=}, + before skip/.style={before={\begingroup% + \parindent\z@\parskip\z@\par\nointerlineskip% + \addvspace{#1}\noindent% + \endgroup}}, + after skip/.style={after={\begingroup% + \parindent\z@\parskip\z@\par\nointerlineskip% + \addvspace{#1}% + \endgroup}}, + beforeafter skip/.style={before skip={#1},after skip={#1}}, lowerbox/.is choice, lowerbox/visible/.code={\tcb@lowerignoredfalse\tcb@lowervisibletrue}, lowerbox/invisible/.code={\tcb@lowerignoredfalse\tcb@lowervisiblefalse}, @@ -1190,6 +1200,36 @@ \tcb@ox{capture=hbox,#1}{#2}% } +\newcommand{\tcbsubtitle}[2][]{% + \begingroup% + \let\tcb@trans@colframe\kvtcb@colframe% + \iftcb@titlefilled% + \let\tcb@trans@colback\kvtcb@colbacktitle% + \else% + \let\tcb@trans@colback\kvtcb@colframe% + \fi% + \let\tcb@trans@colupper\kvtcb@coltitle% + \let\tcb@trans@fontupper\kvtcb@fonttitle% + \let\tcb@trans@boxsep\kvtcb@boxsep% + \let\tcb@trans@left\kvtcb@leftupper% + \let\tcb@trans@right\kvtcb@rightupper% + \let\tcb@trans@top\kvtcb@toptitle% + \let\tcb@trans@bottom\kvtcb@bottomtitle% + \let\tcb@trans@rule\kvtcb@title@rule% + \let\tcb@trans@style\kvtcb@subtitle@style% + \begin{tcolorbox}[sharp corners, + before skip={0.5\baselineskip},after skip={0.5\baselineskip}, + colframe=\tcb@trans@colframe,colback=\tcb@trans@colback, + colupper=\tcb@trans@colupper,fontupper=\tcb@trans@fontupper, + boxsep=\tcb@trans@boxsep,left=\tcb@trans@left,right=\tcb@trans@right, + top=\tcb@trans@top,bottom=\tcb@trans@bottom, + boxrule=\tcb@trans@rule,leftrule=0pt,rightrule=0pt,oversize, + code={\pgfkeysalsofrom\tcb@trans@style},#1]% + #2% + \end{tcolorbox}% + \endgroup% +} + \tcbset{% new/.cd,% @@ -1441,8 +1481,7 @@ \tcbset{% initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},% reset/.code={\tcb@reset},% - reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@% - \let\tcb@afteroptions@hook\@empty}, + 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, size=normal,rounded corners, @@ -1458,7 +1497,7 @@ lefthand ratio=0.5,check odd page=false,nophantom, shield externalize=false,list entry=,no label type, opacityupper=1.0,opacitylower=1.0,opacitytitle=1.0,opacityframe=1.0,opacityback=1.0,@opacitybacktitle=1.0, - title filled=false,every float=,height fill=false, + subtitle style=,title filled=false,every float=,height fill=false, }, initialize@reset=reset@core, } -- cgit v1.2.3