summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-12 00:29:07 +0000
committerKarl Berry <karl@freefriends.org>2014-12-12 00:29:07 +0000
commitcc801e6495901e37af9ce71175f2aeca72eec887 (patch)
treec2f748a7b29de843446120b63c803747feda0ba4 /Master
parentd3c71523d218025e9f651a4a83de8cdff48f2b73 (diff)
tcolorbox (11dec14)
git-svn-id: svn://tug.org/texlive/trunk@35788 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/CHANGES8
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/README2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdfbin361359 -> 361340 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex22
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.quickref.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdfbin5191152 -> 5195793 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex55
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex28
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty15
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
23 files changed, 130 insertions, 58 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
index dd351303a03..90cbe5be46e 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.32 (2014/12/01)
+%% The LaTeX package tcolorbox - version 3.33 (2014/12/11)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -685,3 +685,9 @@ version 3.31 (2014/11/28)
version 3.32 (2014/12/01)
- bug fix for 'crefname' and 'Crefname' options (cleveref support)
+
+version 3.33 (2014/12/11)
+- The nobreak settings after a heading are respected now for breakable and
+ unbreakable boxes. Use the new option 'ignore nobreak' to restore the old
+ behavior.
+- vertical skip of two successive tcbraster environments fixed
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README
index 7cb6295d8fa..04958c4bbfa 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.32 (2014/12/01)
+%% The LaTeX package tcolorbox - version 3.33 (2014/12/11)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
index a15f730c1a0..657c6a12c8a 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
index 1ba3b4240f8..3826fc0b4f3 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.32 (2014/12/01)
+%% The LaTeX package tcolorbox - version 3.33 (2014/12/11)
%% 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 9af1eaa1d8f..0600d0b753e 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -2276,7 +2276,9 @@ This behavior is controlled by the keys |before| and |after|.
\begin{docTcbKey}{before}{=\meta{code}}{no default, initially see \refKey{/tcb/autoparskip}}
Sets the \meta{code} which is executed before the colored box.
- It is not used for floating boxes.
+ It is not used for floating boxes.
+ Also, it is not used, if the box follows a heading immediately
+ and \refKey{/tcb/ignore nobreak} is set to \docValue{false}.
\end{docTcbKey}
\begin{docTcbKey}{after}{=\meta{code}}{no default, initially see \refKey{/tcb/autoparskip}}
@@ -2484,6 +2486,20 @@ Some text.
\end{docTcbKey}
+\begin{docTcbKey}[][doc new=2014-12-11]{ignore nobreak}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+After a heading, \LaTeX\ tries to avoid a break by setting a |nobreak| boolean value.
+Starting from version |3.33|, the \refKey{/tcb/before} respectively \refKey{/tcb/before skip}
+settings are not used after a heading, if \refKey{/tcb/ignore nobreak} is
+set to \docValue{false}. Further, a \refKey{/tcb/breakable} box will also try to
+avoid a break between a heading and a directly following first part of a
+break sequence.
+
+Set \refKey{/tcb/ignore nobreak} to \docValue{true}, if |nobreak| should be
+ignored as prior to version |3.33|. Also, this setting may be used locally to
+enforce the \refKey{/tcb/before} setting.
+\end{docTcbKey}
+
+
\clearpage
\subsection{Bounding Box}
@@ -3217,8 +3233,8 @@ This issues:\\
If set to |true|, the even/odd page testing from the package |changepage|
is applied. The \refKey{/tcb/toggle enlargement} check
and the \refKey{/tcb/toggle left and right} check
-will use the
-|\ifoddpage| macro from this package.
+will use the |\ifoddpage| macro from this package or another package like
+|ifoddpage|.
This options is independent from \refKey{/tcb/phantom}.
Note that you have to include the package |changepage| by hand\footnote{If |changepage| is
not included, a compilation error will arise.}:
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.quickref.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.quickref.tex
index 53625465073..c678aeac285 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.quickref.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.quickref.tex
@@ -5,7 +5,7 @@
\makeatletter
\begin{tcolorbox}[enhanced,title={tcolorbox},
- left skip=1cm,right skip=1cm,before skip=1cm,after skip=1cm,
+ enlarge top initially by=1cm,enlarge bottom finally by=1cm,left skip=1cm,right skip=1cm,
colframe=red!50!black!30!white,colback=red!10!white!40!white,
colbacktitle=red!30!white,colupper=black!20!white,
code={\appto\kvtcb@shadow{%
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index 719927ac027..c1a0def7ca9 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
index f8e5ae390ec..a0594ad9f26 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.32 (2014/12/01)
+%% The LaTeX package tcolorbox - version 3.33 (2014/12/11)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -106,8 +106,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.32}%
-\def\datum{2014/12/01}%
+\def\version{3.33}%
+\def\datum{2014/12/11}%
\makeindex
\hypersetup{
@@ -376,7 +376,7 @@
%\tcbset{draftmode}
-%\includeonly{tcolorbox.doc.theorems}
+%\includeonly{tcolorbox.doc.quickref}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\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 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,
}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index d0746895080..06faa0d213f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -922,6 +922,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'scripttex', "die 'skipping, nosell license'",
'selnolig', "&MAKEflatten",
'seminar', "&MAKEflatten",
+ 'serbian-lig', "die 'skipping, await request'",
'serbianc', "die 'skipping, use babel-serbianc'",
'serbianpart', "die 'skipping, await request'",
'serial', "die 'skipping, koma, 1999'",
@@ -2710,6 +2711,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
'toptesi' => 'logo.*', # legalities unknown
'tree-dvips' => 'avm.*', # author no response
'turabian' => 'userguide.pdf', # no source
+ 'ucs' => 'languages.ps.gz', # no source
'xskak' => 'xskak.pdf', # no source
'xymtex' => 'doc/.*\.pdf$', # no source
'yannisgr' => '^(digits|gen_acc)\.mf' # levy dup