From 2385abbf2b7e9cee66fd032dcc7ca204808f1135 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Feb 2014 23:22:11 +0000 Subject: tcolorbox (6feb14) git-svn-id: svn://tug.org/texlive/trunk@32886 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 6 +- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 173 +++++++++++++++------ .../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 | 4 +- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 42 ++++- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 53 +++++-- 12 files changed, 226 insertions(+), 80 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tcolorbox') 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 +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% 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 +%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% 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, -- cgit v1.2.3