From c1b5bed49c0955a235c7709f9766a8c7b4c42472 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Oct 2015 23:02:22 +0000 Subject: tcolorbox (16oct15) git-svn-id: svn://tug.org/texlive/trunk@38662 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 9 ++++--- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 28 +++++++++++++------- .../tex/latex/tcolorbox/tcbexternal.code.tex | 4 +-- .../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/tcbmagazine.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbminted.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbraster.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbskins.code.tex | 4 +-- .../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 | 30 +++++++++++++++------- 16 files changed, 71 insertions(+), 48 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 de2bf3eba98..0a9ff5f4d43 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,10 +17,10 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.72} +\tcb@set@library@version{3.73} \let\tcb@parboxrestore@true=\tcb@parboxrestore -\def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} +\let\tcb@parboxrestore@false\tcb@parbox@false@settings % total height for boxes smaller than 0.4375\maxdimen and 0.4375\maxdimen else (ca 2.5m) \def\tcb@defToTotalHeightBreakable#1#2{% @@ -74,11 +74,12 @@ \color@begingroup% \textwidth\hsize% \columnwidth\hsize% - \csname tcb@parboxrestore@\kvtcv@parbox\endcsname% + \csname tcb@parboxrestore@\kvtcb@parbox\endcsname% \def\@mpfn{mpfootnote}% \def\thempfn{\thempfootnote}% \c@mpfootnote\z@% \let\@footnotetext\@mpfootnotetext% + \let\@listdepth\@mplistdepth \@mplistdepth\z@% \@setminipage\tcb@hyph@fix% \let\tcb@drawcolorbox\tcb@drawcolorbox@standalone% \let\FN@pp@footnote\@empty% disable perpage mode of 'footmisc' package diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index be7196723b1..afb70b05f3b 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \tcbuselibrary{listings,skins,xparse,external} @@ -145,6 +145,14 @@ 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}}, + before doc body command/.store in=\kvtcb@doc@body@command@before, + after doc body command/.store in=\kvtcb@doc@body@command@after, + before doc body environment/.store in=\kvtcb@doc@body@environment@before, + after doc body environment/.store in=\kvtcb@doc@body@environment@after, + before doc body key/.store in=\kvtcb@doc@body@key@before, + after doc body key/.store in=\kvtcb@doc@body@key@after, + before doc body/.style={before doc body command={#1},before doc body environment={#1},before doc body key={#1}}, + after doc body/.style={after doc body command={#1},after doc body environment={#1},after doc body key={#1}}, doc description/.store in=\kvtcb@doc@description,% doc into index/.is if=tcb@doc@toindex,% doc updated/.style={before upper={\tcbdocmarginnote{\tcbdocupdated{#1}}}}, @@ -302,8 +310,8 @@ \begin{tcb@doc@head}{doc@head@command}% \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}} + \end{tcb@doc@head}\tcbset{before upper=}\kvtcb@doc@body@command@before}% + {\kvtcb@doc@body@command@after\end{tcb@manual@entry}} \newenvironment{docCommand*}{\bgroup\tcb@doc@toindexfalse\begin{docCommand}}{\end{docCommand}\egroup} @@ -314,8 +322,8 @@ \strut~~\meta{\kvtcb@text@envcontent}\par% \strut\cs{end}\brackets{\tcb@Print@Env{#2}}% \tcb@doc@do@description% - \end{tcb@doc@head}\tcbset{before upper=}}% - {\end{tcb@manual@entry}} + \end{tcb@doc@head}\tcbset{before upper=}\kvtcb@doc@body@environment@before}% + {\kvtcb@doc@body@environment@after\end{tcb@manual@entry}} \newenvironment{docEnvironment*}{\bgroup\tcb@doc@toindexfalse\begin{docEnvironment}}{\end{docEnvironment}\egroup} @@ -329,8 +337,8 @@ \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}} + \end{tcb@doc@head}\tcbset{before upper=}\kvtcb@doc@body@key@before}% + {\kvtcb@doc@body@key@after\end{tcb@manual@entry}} \newenvironment{docKey*}{\bgroup\tcb@doc@toindexfalse\begin{docKey}}{\end{docKey}\egroup} @@ -403,7 +411,7 @@ \item\relax\footnotesize} {\endlist} -\newcommand{\tcbdocmarginnote}[2][]{ +\newcommand{\tcbdocmarginnote}[2][]{% \marginnote{% \begin{tcolorbox}[enhanced jigsaw,size=fbox,boxrule=1pt,leftrule=0pt,rightrule=0pt, arc=0pt,outer arc=1pt,boxsep=1pt,top=1pt,bottom=1pt, @@ -473,6 +481,8 @@ doc left indent=-2em, doc right indent=0pt, doc head=, + before doc body=, + after doc body=, doc description=, doc into index=true, index colorize=false, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 7945d795ed9..1f817d7beba 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.72} +\tcb@set@library@version{3.73} { \catcode`\"=12 diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index d5d412ea6a3..58565f323ae 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \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 3278d4ef3a9..f4e80932675 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \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 a57aefc1924..8923e27de03 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \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 47c3fca19a7..4e5cde12d15 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \RequirePackage{pdftexcmds} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index db350d6077c..1a07d852cc0 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex index e1a2fa6d656..b9735ea5fae 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.72} +\tcb@set@library@version{3.73} \tcbuselibrary{breakable} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 35a48daf35d..3bae53fb3a9 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 7d5824683b6..7e4e2f08733 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 36f1ff98536..70580b2eb81 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \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 d6b2e45b51f..edc382b4a2b 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \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 08d28f4eafe..dd4726b4811 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% 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.72} +\tcb@set@library@version{3.73} \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 d2016c6f9ce..775d526581d 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.72} +\tcb@set@library@version{3.73} \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 1af05b4a59f..ede4f486dc1 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.72 (2015/08/12) +%% The LaTeX package tcolorbox - version 3.73 (2015/10/16) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2015/08/12 version 3.72 text color boxes] -\def\tcb@version{3.72} +\ProvidesPackage{tcolorbox}[2015/10/16 version 3.73 text color boxes] +\def\tcb@version{3.73} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -407,7 +407,7 @@ title code/.default=\tcb@drawtitle@standard,% title empty/.style={@title code=}, % - geometry nodes/.store in=\kvtcv@geonodes, + geometry nodes/.store in=\kvtcb@geonodes, geometry nodes/.default=true,% set@extensions@preframe/.store in=\tcb@extensions@preframe,% set@extensions@postframe/.store in=\tcb@extensions@postframe,% @@ -420,7 +420,7 @@ skin first is subskin of/.style 2 args={skin@local@first/.style={skin@#1,#2},skin first=local@first},% skin middle is subskin of/.style 2 args={skin@local@middle/.style={skin@#1,#2},skin middle=local@middle},% skin last is subskin of/.style 2 args={skin@local@last/.style={skin@#1,#2},skin last=local@last},% - parbox/.store in=\kvtcv@parbox, + parbox/.store in=\kvtcb@parbox, parbox/.default=true,% hyphenationfix/.is choice,% hyphenationfix/.default=true,% @@ -632,12 +632,24 @@ \let\tcb@parboxrestore=\@parboxrestore +\def\tcb@parbox@false@settings{% + \noindent% + \linewidth\hsize% + \@totalleftmargin\z@% + \leftskip\z@skip% + \rightskip\z@skip% + \@rightskip\z@skip% +} + +\let\tcb@parbox@use@true\relax \def\tcb@parbox@use@false{% - \def\@parboxrestore{\noindent\linewidth\hsize\let\@parboxrestore=\tcb@parboxrestore\leavevmode}% + \def\@parboxrestore{% + \tcb@parbox@false@settings% + \let\@parboxrestore=\tcb@parboxrestore% + }% } \let\tcb@afteroptions@hook\@empty -\let\tcb@parbox@use@true\relax% \def\tcb@minipage@top{\minipage[t]} \let\tcb@minipage@center=\minipage @@ -654,7 +666,7 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a \@endpefalse - \csname tcb@parbox@use@\kvtcv@parbox\endcsname% + \csname tcb@parbox@use@\kvtcb@parbox\endcsname% \tcb@minipage#2\tcb@hyph@fix\ignorespaces} \def\endtcb@lrbox{\unskip\endminipage} @@ -1292,7 +1304,7 @@ \pgftext[x=0pt,y=\tcb@height-\baselineskip,left,top]{\box\tcb@phantombox}% \tcb@hasPhantomfalse% \fi% - \csname tcb@creategeonodes@\kvtcv@geonodes\endcsname% + \csname tcb@creategeonodes@\kvtcb@geonodes\endcsname% } \def\tcb@tdraw@title@core{% -- cgit v1.2.3