From cc801e6495901e37af9ce71175f2aeca72eec887 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Dec 2014 00:29:07 +0000 Subject: tcolorbox (11dec14) git-svn-id: svn://tug.org/texlive/trunk@35788 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 55 ++++++++++++++++++---- .../tex/latex/tcolorbox/tcbdocumentation.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/tcbminted.code.tex | 4 +- .../tex/latex/tcolorbox/tcbraster.code.tex | 28 ++++++----- .../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 ++++-- 14 files changed, 95 insertions(+), 47 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 359a3ac1a1c..b63aeffa74f 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -219,7 +219,35 @@ \newif\iftcb@multicol \newif\iftcb@vfillbeforefirst +\def\tcb@do@nobreak@warning{% + \iftcb@ignorenobreak% + \tcb@warning{Using nobreak failed. You should set `ignore nobreak=false' to avoid this}% + \else% + \tcb@warning{Using nobreak failed. Try to enlarge `lines before break' or set page breaks manually}% + \fi% +} + +\def\tcb@handle@nobreak{% + \tcb@enlbreak@init% + \tcb@breakat@init% + \tcb@comp@h@page% + \tcbdimto\tcb@h@page{\tcb@h@page-1.5\baselineskip-\parskip-\lineskip}% security surcharge + \tcb@comp@h@total@standalone% + \tcb@check@for@final@box% + \iftcb@final@box% + \else% + \ifdim\dimexpr\tcb@h@page-\tcb@h@padding-\tcb@h@padtitle<\kvtcb@breakminlines\baselineskip\relax% + \tcbdimto\tcb@h@page{\tcb@h@page+3.5\baselineskip+\parskip+\lineskip}% + \vspace{\tcb@h@page}% + {\parskip\z@\nointerlineskip\noindent}% + \vspace{-\tcb@h@page}% + \par% + \fi% + \fi% +} + \def\tcb@prepare@break@operation{% + \let\tcb@nobreak@warning\@empty% \@ifundefined{columnbreak}{\tcb@multicolfalse}{% \ifnum\doublecol@number>\z@ % \tcb@multicoltrue% @@ -227,7 +255,16 @@ \tcb@multicolfalse% \fi}% \ifx\kvtcb@float\@empty% - \kvtcb@beforebox% + \if@nobreak% + \let\tcb@nobreak@warning\tcb@do@nobreak@warning% + \iftcb@ignorenobreak% + \kvtcb@beforebox% + \else% + \tcb@handle@nobreak% + \fi% + \else% + \kvtcb@beforebox% + \fi% \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 @@ -274,25 +311,26 @@ \tcb@check@for@final@box% \iftcb@final@box% \tcb@drawcolorbox@standalone% - \else + \else% \iftcb@break@allowed% \ifdim\dimexpr\tcb@h@page-\tcb@h@padding-\tcb@h@padtitle<\kvtcb@breakminlines\baselineskip\relax% \iftcb@multicol\columnbreak\else\pagebreak\fi% + \tcb@nobreak@warning% \tcb@enlbreak@init\tcb@break@allowedfalse% \tcb@comp@h@page% \tcb@check@for@final@box% \iftcb@final@box% \tcb@drawcolorbox@standalone% - \else + \else% \let\tcb@split@next=\tcb@split@first% - \fi + \fi% \else% \let\tcb@split@next=\tcb@split@first% - \fi + \fi% \else% \let\tcb@split@next=\tcb@split@first% \fi% - \fi + \fi% \tcb@split@next% } @@ -437,6 +475,7 @@ \tcbdimto\tcb@h@upper{\ht\tcb@upperbox+\dp\tcb@upperbox}% \tcbdimto\tcb@h@lower{\ht\tcb@lowerbox+\dp\tcb@lowerbox}% \iftcb@multicol\columnbreak\else\pagebreak\fi% + \tcb@nobreak@warning% \tcb@enlbreak@init\tcb@break@allowedfalse% \let\tcb@split@next=\tcb@split@start% \else% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index f94b8ce6ed6..5804c94084d 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \tcbuselibrary{listings,skins,xparse} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index af1ccd4ac32..cc842d49efd 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 d0912dcebc7..3016200d9e5 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 d47f2c31d9c..b7cea0db61a 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 8c62c19380a..18996460531 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 8333794d33a..b3c86516b5a 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 50065a45b17..7e945c8dba0 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 737069a0357..227f3338115 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -125,13 +125,12 @@ }}% \tcbset{#1}% \tcbset@late@options{% - before={\unskip\ifnum\c@tcbrastercolumn>1 \kern\kvtcb@raster@xskip\else\kern\kvtcb@raster@skip@left\fi}, + before={\unskip\ifnum\c@tcbrastercolumn>1 \kern\kvtcb@raster@xskip\else% + \ifnum\c@tcbrasterrow>1 \parindent\z@\parskip\z@\par\nointerlineskip\addvspace{\the\dimexpr\kvtcb@raster@yskip\relax}\noindent\fi% + \kern\kvtcb@raster@skip@left\fi}, after={% \ifnum\c@tcbrastercolumn=\kvtcb@raster@columns\relax% \kern\kvtcb@raster@skip@right% - \parindent\z@\parskip\z@\par\nointerlineskip% - \addvspace{\the\dimexpr\kvtcb@raster@yskip\relax}% - \noindent% \setcounter{tcbrastercolumn}{1}\addtocounter{tcbrasterrow}{1}% \aftergroup\tcb@raster@ehg@continue% \else% @@ -155,8 +154,15 @@ \hsize=\kvtcb@raster@width% \let\tcb@end@raster\color@endbox% \fi\fi%& - {\par\nointerlineskip% - \addvspace{\the\dimexpr\kvtcb@raster@skip@before-\parskip\relax}}% + \if@nobreak% + \iftcb@ignorenobreak% + {\par\nointerlineskip% + \addvspace{\the\dimexpr\kvtcb@raster@skip@before-\parskip\relax}}% + \fi% + \else% + {\par\nointerlineskip% + \addvspace{\the\dimexpr\kvtcb@raster@skip@before-\parskip\relax}}% + \fi% \kvtcb@raster@halign\noindent% }{% \unskip% @@ -165,11 +171,7 @@ \fi% \begingroup% \par\nointerlineskip% - \ifnum\c@tcbrastercolumn=1 % - \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\kvtcb@raster@yskip-\parskip\relax}% - \else% - \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\parskip\relax}% - \fi% + \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\parskip\relax}% \endgroup% \tcb@end@raster% \setcounter{tcbrastercolumn}{\tcb@raster@save@column}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 8b20a558ef8..9c114557808 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 8846eb7b7a6..89c0fda8520 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 bf3ffc7c1cc..8ccfbd11fbf 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 d281fce999b..83f94d5c7d0 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% 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.32} +\tcb@set@library@version{3.33} \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 df6aae73224..81e50e27a06 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.32 (2014/12/01) +%% The LaTeX package tcolorbox - version 3.33 (2014/12/11) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/12/01 version 3.32 text color boxes] -\def\tcb@version{3.32} +\ProvidesPackage{tcolorbox}[2014/12/11 version 3.33 text color boxes] +\def\tcb@version{3.33} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -37,6 +37,7 @@ \newif\iftcb@lowerseparated \newif\iftcb@titlefilled \newif\iftcb@fixedheight +\newif\iftcb@ignorenobreak \newbox\tcb@titlebox \newbox\tcb@upperbox @@ -487,6 +488,7 @@ middle=0pt,arc=0pt,outer arc=0pt}, on line/.style={tcbox raise base,nobeforeafter}, shape@of@skin/.store in=\tcb@shapeofskin, + ignore nobreak/.is if=tcb@ignorenobreak,% } \def\kvtcb@beforebox{} @@ -1159,6 +1161,11 @@ % floats \ifx\kvtcb@float\@empty% \let\tcb@before@unbroken=\kvtcb@beforebox% + \if@nobreak% + \iftcb@ignorenobreak\else% + \let\tcb@before@unbroken=\@empty% + \fi% + \fi% \let\tcb@after@unbroken=\kvtcb@afterbox% \else% \edef\tcb@before@unbroken{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]\noexpand\kvtcb@everyfloat}% @@ -1572,7 +1579,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, - subtitle style=,title filled=false,every float=,height fill=false, + subtitle style=,title filled=false,every float=,height fill=false,ignore nobreak=false, }, initialize@reset=reset@core, } -- cgit v1.2.3