tcolorbox (23apr13)

git-svn-id: svn://tug.org/texlive/trunk@30073 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 50 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index db889791249..5e1a42ea4cd 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 2.20 (2013/04/17)
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23)
 %% tcbbreakable.code.tex: Code for breakable colorboxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -20,8 +20,6 @@
 \makeatletter
 \def\tcblibrary@breakable@loaded{}
 
-\let\tcb@drawcolorbox@standalone=\tcb@drawcolorbox
-
 \let\tcb@parboxrestore@true=\tcb@parboxrestore
 \def\tcb@parboxrestore@false{\vskip-\parskip}
 
@@ -209,7 +207,11 @@
     \tcbdimto\tcb@split@dim{\tcb@split@dim-\tcb@h@upper-\tcb@h@segment}
     \ifdim\tcb@split@dim<\kvtcb@breakminlines\baselineskip\relax%
       \tcb@sdraw@U%
+      \iftcb@lowerspace%
       \let\tcb@split@next=\tcb@split@SL%
+      \else%
+      \let\tcb@split@next=\tcb@split@USL%
+      \fi%
     \else
       \tcb@split@lower@box%
       \tcb@sdraw@USL%
@@ -249,7 +251,11 @@
       \tcbdimto\tcb@split@dim{\tcb@split@dim-\tcb@h@upper-\tcb@h@segment}
       \ifdim\tcb@split@dim<\kvtcb@breakminlines\baselineskip\relax%
         \tcb@sdraw@U%
+        \iftcb@lowerspace%
         \let\tcb@split@next=\tcb@split@SL%
+        \else%
+        \let\tcb@split@next=\tcb@split@USL%
+        \fi%
       \else
         \tcb@split@lower@box%
         \tcb@sdraw@USL%
@@ -430,10 +436,6 @@
     \let\tcb@savebox=\tcb@vbox%
     \let\endtcb@savebox=\endtcb@vbox%
     \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable},
-  breakable@false/.code={%
-    \let\tcb@savebox=\tcb@lrbox%
-    \let\endtcb@savebox=\endtcb@lrbox%
-    \let\tcb@drawcolorbox=\tcb@drawcolorbox@standalone},
   breakable/.style={breakable@#1},
   breakable/.default=true,%
   unbreakable/.style={breakable=false},%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 890a5f349dd..b14d5f73c5e 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 2.20 (2013/04/17)
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23)
 %% tcbdocumentation.code.tex: Code for LaTeX documentations
 %%
 %% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index eedab8df24e..1bda22de6c2 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 2.20 (2013/04/17)
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23)
 %% tcbhooks.code.tex: Code for adding hooks
 %%
 %% -------------------------------------------------------------------------------------------
@@ -20,12 +20,15 @@
 \makeatletter
 \def\tcblibrary@hooks@loaded{}
 
+% expandonce from etoolbox
+\newcommand{\tcb@expandonce}[1]{\unexpanded\expandafter{#1}}
+
 % slim version of etoolbox'es more general macro
 \newcommand{\tcb@appto}[2]{%
   \ifx#1\relax%
   \edef#1{\unexpanded{#2}}%
   \else%
-  \edef#1{\expandonce#1\unexpanded{#2}}%
+  \edef#1{\tcb@expandonce#1\unexpanded{#2}}%
   \fi}
 
 % slim version of etoolbox'es more general macro
@@ -33,7 +36,7 @@
   \ifx#1\relax%
   \edef#1{\unexpanded{#2}}%
   \else%
-  \edef#1{\unexpanded{#2}\expandonce#1}%
+  \edef#1{\unexpanded{#2}\tcb@expandonce#1}%
   \fi}
 
 \tcbset{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
index 18827d89ba8..3f6dae4c39e 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 2.20 (2013/04/17)
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23)
 %% tcblistings.code.tex: Code for colorboxes with listings
 %%
 %% -------------------------------------------------------------------------------------------
@@ -163,4 +163,14 @@
   \tcb@temp{\kvtcb@tempfile}%
 }%
 
+\long\def\tcb@newtcblisting#1#2{\newenvironment{#1}{\tcblisting{savedelimiter=#1,#2}}{\endtcblisting}}
 
+\long\def\tcb@new@tcblisting#1[#2]#3{\newenvironment{#1}[#2]{\tcblisting{savedelimiter=#1,#3}}{\endtcblisting}}
+
+\long\def\tcb@new@@tcblisting#1[#2][#3]#4{\newenvironment{#1}[#2][#3]{\tcblisting{savedelimiter=#1,#4}}{\endtcblisting}}
+
+\long\def\new@tcblisting#1[#2]{%
+  \@ifnextchar[{\tcb@new@@tcblisting{#1}[#2]}{\tcb@new@tcblisting{#1}[#2]}}
+
+\long\def\newtcblisting#1{%
+  \@ifnextchar[{\new@tcblisting{#1}}{\tcb@newtcblisting{#1}}}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index 7ef2d51ad74..617febb25f7 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 2.20 (2013/04/17)
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23)
 %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
 %%
 %% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index aab07bdf7bc..75a6c71eccc 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 2.20 (2013/04/17)
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23)
 %% tcbskins.code.tex: Code for colorboxes with different skins
 %%
 %% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
index 09cc57d8c8d..da525707d72 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 2.20 (2013/04/17)
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23)
 %% tcbtheorems.code.tex: Code for theorems in colorboxes
 %%
 %% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index 9954b1f9a9c..847f31b842e 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 2.20 (2013/04/17)
+%% The LaTeX package tcolorbox - version 2.21 (2013/04/23)
 %% tcolorbox.sty: Text color boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2013/04/17 version 2.20 text color boxes]
+\ProvidesPackage{tcolorbox}[2013/04/23 version 2.21 text color boxes]
 
 \RequirePackage{pgf}[2008/01/15]
 \RequirePackage{verbatim}[2003/08/22]
@@ -254,7 +254,12 @@
   righthand width/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightwidth},
   lefthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@leftratio},
   righthand ratio/.code={\def\kvtcb@sbs@ratio{#1}\let\tcb@sbs@quota=\tcb@sbs@quota@rightratio},
-}
+  breakable@false/.code={%
+    \let\tcb@savebox=\tcb@lrbox%
+    \let\endtcb@savebox=\endtcb@lrbox%
+    \let\tcb@drawcolorbox=\tcb@drawcolorbox@standalone},
+  code/.code={#1},
+  }
 
 \tcbset{notitle,width=\linewidth,boxsep=1mm,boxrule=0.5mm,adjust text={\"Apgjy},
   left=4mm,right=4mm,top=2mm,bottom=2mm,middle=2mm,arc=1mm,lowerbox=visible,
@@ -639,10 +644,11 @@
   \end{\kvtcb@graphenv}\end{tcb@float}%
 }
 
+\let\tcb@drawcolorbox@standalone=\tcb@drawcolorbox
 
 \newcommand{\tcbox}[2][]{%
   \begingroup%
-  \tcbset{#1,unbreakable}%
+  \tcbset{#1,breakable@false}%
   \setbox0=\hbox{\begingroup\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#2\kvtcb@after@upper\endgroup}%
   \tcbdimto{\tcb@temp@wd}{\wd0}%
   \tcbdimto{\tcb@temp@dp}{\dp0+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand}%
@@ -655,7 +661,17 @@
   \endgroup%
 }
 
+\long\def\tcb@newtcolorbox#1#2{\newenvironment{#1}{\tcolorbox[savedelimiter=#1,#2]}{\endtcolorbox}}
+
+\long\def\tcb@new@tcolorbox#1[#2]#3{\newenvironment{#1}[#2]{\tcolorbox[savedelimiter=#1,#3]}{\endtcolorbox}}
+
+\long\def\tcb@new@@tcolorbox#1[#2][#3]#4{\newenvironment{#1}[#2][#3]{\tcolorbox[savedelimiter=#1,#4]}{\endtcolorbox}}
+
+\long\def\new@tcolorbox#1[#2]{%
+  \@ifnextchar[{\tcb@new@@tcolorbox{#1}[#2]}{\tcb@new@tcolorbox{#1}[#2]}}
 
+\long\def\newtcolorbox#1{%
+  \@ifnextchar[{\new@tcolorbox{#1}}{\tcb@newtcolorbox{#1}}}
 
 % verbatim output as in 'verbatim'