From ad9e1b89835ba40880b3b5d0c153577ce2b5d1e3 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 16 Dec 2014 23:10:42 +0000
Subject: tcolorbox (16dec14)

git-svn-id: svn://tug.org/texlive/trunk@35843 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty')

diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index 81e50e27a06..a2d9502d1cc 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.33 (2014/12/11)
+%% The LaTeX package tcolorbox - version 3.34 (2014/12/16)
 %% tcolorbox.sty: Text color boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2014/12/11 version 3.33 text color boxes]
-\def\tcb@version{3.33}
+\ProvidesPackage{tcolorbox}[2014/12/16 version 3.34 text color boxes]
+\def\tcb@version{3.34}
 
 \RequirePackage{pgf}[2008/01/15]
 \RequirePackage{verbatim}[2003/08/22]
@@ -227,21 +227,22 @@
   nobeforeafter/.style={before=,after=},
   before skip/.style={before={%
     \par\nointerlineskip\lineskip=0pt%
-    \addvspace{\the\dimexpr#1-\parskip\relax}%
+    \addvspace{\glueexpr#1-\parskip}%
     \noindent%
     }},
   after skip/.style={after={%
     \par\nointerlineskip%
-    \addvspace{\the\dimexpr#1-\parskip\relax}%
+    \addvspace{\glueexpr#1-\parskip}%
     }},
   beforeafter skip/.style={before skip={#1},after skip={#1}},
+  before nobreak/.store in=\kvtcb@beforebox@nobreak,
   lowerbox/.is choice,
   lowerbox/visible/.code={\tcb@lowerignoredfalse\tcb@lowervisibletrue},
   lowerbox/invisible/.code={\tcb@lowerignoredfalse\tcb@lowervisiblefalse},
   lowerbox/ignored/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse},
-  natural height/.code={\tcb@fixedheightfalse\let\tcb@ch=\tcb@ch@natural},
-  height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed},
-  text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed},
+  natural height/.code={\tcb@fixedheightfalse\let\tcb@ch=\tcb@ch@natural\let\tcb@height@adjust\@empty},
+  height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed\let\tcb@height@adjust\@empty},
+  text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed\let\tcb@height@adjust\@empty},
   add to height/.code={\ifdefined\kvtcb@height@fixed\tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+(#1)}\fi},
   height plus/.dimstore in=\kvtcb@height@fixed@plus,%
   height from/.style args={#1 to #2}{height={#1},height plus={#2-#1}},%
@@ -1163,7 +1164,7 @@
     \let\tcb@before@unbroken=\kvtcb@beforebox%
     \if@nobreak%
       \iftcb@ignorenobreak\else%
-        \let\tcb@before@unbroken=\@empty%
+        \let\tcb@before@unbroken=\kvtcb@beforebox@nobreak%
       \fi%
     \fi%
     \let\tcb@after@unbroken=\kvtcb@afterbox%
@@ -1579,7 +1580,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,ignore nobreak=false,
+    subtitle style=,title filled=false,every float=,ignore nobreak=false,before nobreak=\noindent,
   },
   initialize@reset=reset@core,
 }
-- 
cgit v1.2.3

