From 2118d800123cf8fa32417baf540007e78c70f4ec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 Jun 2015 17:45:23 +0000 Subject: tcolorbox (12jun15) git-svn-id: svn://tug.org/texlive/trunk@37530 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 14 ++++-------- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 4 ++-- .../tex/latex/tcolorbox/tcbexternal.code.tex | 25 +++++++++++++--------- .../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/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 | 15 ++++++++----- 15 files changed, 53 insertions(+), 49 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 2ff4905fc0d..5f64cdc8db0 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -256,20 +256,14 @@ \tcb@multicolfalse% \fi}% \ifx\kvtcb@float\@empty% - \if@nobreak% + \iftcb@nobreak{% \let\tcb@nobreak@warning\tcb@do@nobreak@warning% \iftcb@ignorenobreak% \kvtcb@beforebox% \else% \tcb@handle@nobreak% \fi% - \else% - %\ifnum\lastnodetype=-1\relax% - % \lineskip=0pt% - %\else% - \kvtcb@beforebox% - %\fi% - \fi% + }{\kvtcb@beforebox}% \def\kvtcb@beforebox{\parskip\z@\nointerlineskip\noindent}% \noindent% applies parskip \vskip\lineskip{\parskip\z@\par\vskip\z@}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 38f30e33d86..1e88e7ebc6f 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \tcbuselibrary{listings,skins,xparse,external} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index d62bec68285..0c8879ef2d8 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,8 +17,7 @@ %% %% This work consists of all files listed in README %% -%\makeatletter -\tcb@set@library@version{3.60} +\tcb@set@library@version{3.61} { \catcode`\"=12 @@ -58,11 +57,10 @@ \@onlypreamble\tcbEXTERNALIZE \def\tcbexternal@setbasename#1{% - \gdef\tcbexternal@basename{#1}% - \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@job@name{\expandonce{\tcbexternal@prefix}\expandonce{\tcbexternal@basename}}}\x% - \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@job@mdfive{\expandonce{\tcbexternal@job@name.md5}}}\x% - \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@job@source{\expandonce{\tcbexternal@job@name.tex}}}\x% - \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@job@pdf{\expandonce{\tcbexternal@job@name.pdf}}}\x% + \edef\tcbexternal@job@name{\expandonce{\tcbexternal@prefix}\expandonce{#1}}% + \edef\tcbexternal@job@mdfive{\expandonce{\tcbexternal@job@name.md5}}% + \edef\tcbexternal@job@source{\expandonce{\tcbexternal@job@name.tex}}% + \edef\tcbexternal@job@pdf{\expandonce{\tcbexternal@job@name.pdf}}% } \def\tcbexternal@corecompile{% @@ -159,6 +157,12 @@ \newenvironment{tcbexternal}[2][]{% \tcbset{external/.cd,#1,name=#2}% + \@ifundefined{@tcbexternal@JN@\tcbexternal@job@name}{% + \global\@namedef{@tcbexternal@JN@\tcbexternal@job@name}{}% + }{% + \tcb@error{External job name '\tcbexternal@job@name' already used}% + {Give a new unique name to the current external job.}% + }% \begingroup% \let\tcb@verbatim@begin@hook=\tcbexternal@out@begin% \let\tcb@verbatim@end@hook=\tcbexternal@out@end% @@ -193,7 +197,7 @@ \long\def\new@tcb@externalizetcolorbox#1#2#3#4{% \new@tcb@externalizeenvironment{#1}{#2}% {preamble tcbset={force nobeforeafter},#3}% - {\tcbset{#4}\tcb@set@normal@unbroken@beforeafter\tcb@before@unbroken}% + {\tcb@apply@box@options{#4}\tcb@set@normal@unbroken@beforeafter\tcb@before@unbroken}% {\tcb@after@unbroken}% } @@ -217,7 +221,7 @@ external/.cd, % runner/.code={% - \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@run@tex{\expandonce{#1}}}\x% + \edef\tcbexternal@run@tex{\expandonce{#1}}% }, % prefix/.store in=\tcbexternal@prefix, @@ -233,6 +237,7 @@ PassOptionsToPackage/.code 2 args={\appto\tcbexternal@preclass{\PassOptionsToPackage{#1}{#2}}}, PassOptionsToClass/.code 2 args={\appto\tcbexternal@preclass{\PassOptionsToClass{#1}{#2}}}, externalize/.code={}, + -/.style={externalize=false}, % force remake/.is choice, force remake/true/.code={\let\tcbexternal@compile=\tcbexternal@corecompile}, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index e2d3a0ef20d..2278704e1bd 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 e3bd47ba849..1ab10750e15 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 a7c4eeecbd6..b5c0c49bc62 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 b1a5f9288bd..790dc23e240 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 b4d2e0e54a1..0c77b8734ed 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 d54ba8a8f54..8915d284fc3 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 ef527cd803e..7fb7882b929 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 c060ed92e05..e9631f3209b 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 5503e8bc889..1ada60de63a 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 64db47670b8..4e383fe12c6 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 52fddb93403..661cdacc5ca 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% 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.60} +\tcb@set@library@version{3.61} \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 da7be0e6c4f..96cbddf15b6 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.60 (2015/05/07) +%% The LaTeX package tcolorbox - version 3.61 (2015/06/12) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2015/05/07 version 3.60 text color boxes] -\def\tcb@version{3.60} +\ProvidesPackage{tcolorbox}[2015/06/12 version 3.61 text color boxes] +\def\tcb@version{3.61} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -865,6 +865,11 @@ \long\def\tcb@apply@box@options#1{% \tcbset{#1}\tcb@lateoptions@hook\tcb@afteroptions@hook% + \if@nobreak% + \let\iftcb@nobreak\@firstoftwo% + \else% + \let\iftcb@nobreak\@secondoftwo% + \fi% } \long\def\tcb@@icolorbox[#1]{% @@ -1381,11 +1386,11 @@ \def\tcb@set@normal@unbroken@beforeafter{% \let\tcb@before@unbroken=\kvtcb@beforebox% - \if@nobreak% + \iftcb@nobreak{% \iftcb@ignorenobreak\else% \let\tcb@before@unbroken=\kvtcb@beforebox@nobreak% \fi% - \fi% + }{}% \let\tcb@after@unbroken=\kvtcb@afterbox% } -- cgit v1.2.3