tcolorbox (31mar14)

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

13 files changed, 358 insertions, 186 deletions

diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index c0682b5a397..bfb14903208 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.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% tcbbreakable.code.tex: Code for breakable colorboxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{2.72}
+\tcb@set@library@version{2.80}
 
 \let\tcb@parboxrestore@true=\tcb@parboxrestore
 \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize}
@@ -245,13 +245,13 @@
     \let\tcb@after@middle=\tcb@after@first%
     \let\tcb@after@last=\kvtcb@afterbox%
   \else%
-    \edef\float@start{\noexpand\@float{tcbfloat}[\kvtcb@float]}%
-    \let\tcb@before@first=\float@start%
-    \let\tcb@before@middle=\float@start%
-    \let\tcb@before@last=\float@start%
-    \let\tcb@after@first=\end@float%
-    \let\tcb@after@middle=\end@float%
-    \let\tcb@after@last=\end@float%
+    \edef\tcb@float@env@start{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]}%
+    \let\tcb@before@first=\tcb@float@env@start%
+    \let\tcb@before@middle=\tcb@float@env@start%
+    \let\tcb@before@last=\tcb@float@env@start%
+    \let\tcb@after@first=\tcb@float@env@end%
+    \let\tcb@after@middle=\tcb@float@env@end%
+    \let\tcb@after@last=\tcb@float@env@end%
   \fi%
   %
   \edef\kvtcb@skin@@first{\kvtcb@skin@first}%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 5d73558c30b..0837c7e36bd 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.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% tcbdocumentation.code.tex: Code for LaTeX documentations
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{2.72}
+\tcb@set@library@version{2.80}
 
 \tcbuselibrary{listings,skins}
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index e402dd7da14..6906177bf6d 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 2.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \newdimen\tcbfitdim
 \newdimen\tcb@lowerfitdim
@@ -326,12 +326,10 @@
   \tcb@draw@color@box%
 }
 
-
 \newcommand{\tcboxfit}[2][]{%
   \tcb@ox{capture=fitbox,#1}{#2}%
 }
 
-
 \long\def\tcb@newtcboxfit#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcboxfit[#2,options@for=#1]}}
 
 \long\def\tcb@newtcboxfit@#1[#2]#3{\expandafter\tcb@newcommand\csname#1\endcsname[#2]{\tcboxfit[#3,options@for=#1]}}
@@ -342,37 +340,17 @@
   \@ifnextchar[{\tcb@newtcboxfit@@{#1}[#2]}{\tcb@newtcboxfit@{#1}[#2]}}
 
 \long\def\tcb@new@tcboxfit#1{%
-  \preto\tcb@new@colopt{savedelimiter=#1}%
-  \cslet{tcb@opt@#1}{\tcb@new@colopt}%
   \@ifnextchar[{\tcb@new@tcboxfit@{#1}}{\tcb@newtcboxfit{#1}}}
 
-\long\def\tcb@new@tcboxfit@bs#1{%
-  \edef\tcb@temp{\noexpand\tcb@new@tcboxfit{\tcb@remove@bs{#1}}}%
-  \tcb@temp%
-}
-
-\long\def\tcb@new@tcboxfit@opt#1#2{%
-  \tcb@proc@options@init{#2}{#1}%
-  \tcb@new@tcboxfit{#1}%
-}
-
-\long\def\tcb@new@tcboxfit@opt@bs[#1]#2{%
-  \edef\tcb@temp{\noexpand\tcb@new@tcboxfit@opt{\tcb@remove@bs{#2}}}%
-  \tcb@temp{#1}%
-}
-
-\long\def\new@tcboxfit{%
-  \def\tcb@new@colopt{}%
-  \@ifnextchar[{\tcb@new@tcboxfit@opt@bs}{\tcb@new@tcboxfit@bs}}
-
-\long\def\newtcboxfit{%
+\def\newtcboxfit{%
   \let\tcb@newcommand\newcommand%
-  \new@tcboxfit}
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcboxfit%
+  \tcb@process@newcommand}
 
-\long\def\renewtcboxfit{%
+\def\renewtcboxfit{%
   \let\tcb@newcommand\renewcommand%
-  \new@tcboxfit}
-
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcboxfit%
+  \tcb@process@newcommand}
 
 \tcbset{%
   reset@fitting/.style={%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index 7771431555e..d6a056574f0 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.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \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 f958c8fec7a..de560bf5ccd 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.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \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 a5f68b1ce2c..3e7b8326273 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 2.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \def\tcbuselistingtext{\input{\kvtcb@listingfile}}%
 \def\tcbuselistingcomment{\kvtcb@listingcomment}%
@@ -81,8 +81,8 @@
   \ifx\kvtcb@float\@empty%
     \newenvironment{tcb@sbsfloat}{\kvtcb@beforebox}{\kvtcb@afterbox}%
   \else%
-    \edef\float@start{\noexpand\@float{tcbfloat}[\kvtcb@float]}%
-    \newenvironment{tcb@sbsfloat}{\float@start}{\end@float}%
+    \edef\tcb@float@env@start{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]}%
+    \newenvironment{tcb@sbsfloat}{\tcb@float@env@start}{\tcb@float@env@end}%
   \fi%
 }
 
@@ -172,7 +172,6 @@
   \begingroup\tcbverbatimwrite{\kvtcb@listingfile}%
 }{\endtcbverbatimwrite\endgroup}
 
-
 \long\def\tcb@newtcblisting#1#2{\tcb@newenvironment{#1}{\tcblisting{#2,options@for=#1}}{\endtcblisting}}
 
 \long\def\tcb@newtcblisting@#1[#2]#3{\tcb@newenvironment{#1}[#2]{\tcblisting{#3,options@for=#1}}{\endtcblisting}}
@@ -182,27 +181,18 @@
 \long\def\tcb@new@tcblisting@#1[#2]{%
   \@ifnextchar[{\tcb@newtcblisting@@{#1}[#2]}{\tcb@newtcblisting@{#1}[#2]}}
 
-\long\def\tcb@new@tcblisting#1{%
-  \preto\tcb@new@colopt{savedelimiter=#1}%
-  \cslet{tcb@opt@#1}{\tcb@new@colopt}%
+\def\tcb@new@tcblisting#1{%
   \@ifnextchar[{\tcb@new@tcblisting@{#1}}{\tcb@newtcblisting{#1}}}
 
-\long\def\tcb@new@tcblisting@opt[#1]#2{%
-  \tcb@proc@options@init{#1}{#2}%
-  \tcb@new@tcblisting{#2}%
-}
-
-\long\def\new@tcblisting{%
-  \def\tcb@new@colopt{}%
-  \@ifnextchar[{\tcb@new@tcblisting@opt}{\tcb@new@tcblisting}}
-
-\long\def\newtcblisting{%
+\def\newtcblisting{%
   \let\tcb@newenvironment\newenvironment%
-  \new@tcblisting}
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcblisting%
+  \tcb@process@newenvironment}
 
-\long\def\renewtcblisting{%
+\def\renewtcblisting{%
   \let\tcb@newenvironment\renewenvironment%
-  \new@tcblisting}
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcblisting%
+  \tcb@process@newenvironment}
 
 \long\def\tcb@newtcbinputlisting#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcbinputlisting{#2,options@for=#1}}}
 
@@ -213,39 +203,18 @@
 \long\def\tcb@new@tcbinputlisting@#1[#2]{%
   \@ifnextchar[{\tcb@newtcbinputlisting@@{#1}[#2]}{\tcb@newtcbinputlisting@{#1}[#2]}}
 
-\long\def\tcb@new@tcbinputlisting#1{%
-  \preto\tcb@new@colopt{savedelimiter=#1}%
-  \cslet{tcb@opt@#1}{\tcb@new@colopt}%
+\def\tcb@new@tcbinputlisting#1{%
   \@ifnextchar[{\tcb@new@tcbinputlisting@{#1}}{\tcb@newtcbinputlisting{#1}}}
 
-
-\long\def\tcb@new@tcbinputlisting@bs#1{%
-  \edef\tcb@temp{\noexpand\tcb@new@tcbinputlisting{\tcb@remove@bs{#1}}}%
-  \tcb@temp%
-}
-
-\long\def\tcb@new@tcbinputlisting@opt#1#2{%
-  \tcb@proc@options@init{#2}{#1}%
-  \tcb@new@tcbinputlisting{#1}%
-}
-
-\long\def\tcb@new@tcbinputlisting@opt@bs[#1]#2{%
-  \edef\tcb@temp{\noexpand\tcb@new@tcbinputlisting@opt{\tcb@remove@bs{#2}}}%
-  \tcb@temp{#1}%
-}
-
-\long\def\new@tcbinputlisting{%
-  \def\tcb@new@colopt{}%
-  \@ifnextchar[{\tcb@new@tcbinputlisting@opt@bs}{\tcb@new@tcbinputlisting@bs}}
-
-\long\def\newtcbinputlisting{%
+\def\newtcbinputlisting{%
   \let\tcb@newcommand\newcommand%
-  \new@tcbinputlisting}
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcbinputlisting%
+  \tcb@process@newcommand}
 
-\long\def\renewtcbinputlisting{%
+\def\renewtcbinputlisting{%
   \let\tcb@newcommand\renewcommand%
-  \new@tcbinputlisting}
-
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcbinputlisting%
+  \tcb@process@newcommand}
 
 \tcbset{%
   reset@listingscore/.style={%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index f18a89e55df..c7842f2fcc4 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.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \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 8c65eda686b..9e165ec1d33 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 2.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \RequirePackage{minted}[2011/09/17]
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index 9a234d42a41..49f9ba6c6d0 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.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \RequirePackage{tikz}[2010/10/13]
 
@@ -827,26 +827,33 @@
 
 \def\tcb@setratiorobust#1#2#3{\ifdim\dimexpr#3<1pt\tcb@setratio#1{#2}{1pt}\else\tcb@setratio#1{#2}{#3}\fi}
 
-\def\tcb@comp@wm@stretch{%
-  \tcb@setratiorobust\tcb@scale@x{\dimexpr\kvtcb@watermark@factor\dimexpr\tcb@innerwidth\relax\relax}{\wd\tcb@waterbox}%
-  \tcb@setratiorobust\tcb@scale@y{\dimexpr\kvtcb@watermark@factor\dimexpr\tcb@innerheight\relax\relax}{\ht\tcb@waterbox+\dp\tcb@waterbox}%
+\def\tcb@comp@waterbox@stretch#1#2#3{%
+  \tcb@setratiorobust\tcb@scale@x{#1\dimexpr#2}{\wd\tcb@waterbox}%
+  \tcb@setratiorobust\tcb@scale@y{#1\dimexpr#3}{\ht\tcb@waterbox+\dp\tcb@waterbox}%
 }
 
-\def\tcb@comp@wm@zoom{%
-  \tcb@setratiorobust\tcb@scale@x{\dimexpr\kvtcb@watermark@factor\dimexpr\tcb@innerwidth\relax\relax}{\wd\tcb@waterbox}%
-  \tcb@setratiorobust\tcb@scale@y{\dimexpr\kvtcb@watermark@factor\dimexpr\tcb@innerheight\relax\relax}{\ht\tcb@waterbox+\dp\tcb@waterbox}%
+\def\tcb@comp@waterbox@zoom#1#2#3{%
+  \tcb@comp@waterbox@stretch{#1}{#2}{#3}%
   \ifdim\dimexpr\tcb@scale@x pt\relax<\dimexpr\tcb@scale@y pt\relax\let\tcb@scale@y=\tcb@scale@x\else\let\tcb@scale@x=\tcb@scale@y\fi%
 }
 
-\def\tcb@comp@wm@overzoom{%
-  \tcb@setratiorobust\tcb@scale@x{\dimexpr\kvtcb@watermark@factor\dimexpr\tcb@innerwidth\relax\relax}{\wd\tcb@waterbox}%
-  \tcb@setratiorobust\tcb@scale@y{\dimexpr\kvtcb@watermark@factor\dimexpr\tcb@innerheight\relax\relax}{\ht\tcb@waterbox+\dp\tcb@waterbox}%
+\def\tcb@comp@waterbox@overzoom#1#2#3{%
+  \tcb@comp@waterbox@stretch{#1}{#2}{#3}%
   \ifdim\dimexpr\tcb@scale@x pt\relax>\dimexpr\tcb@scale@y pt\relax\let\tcb@scale@y=\tcb@scale@x\else\let\tcb@scale@x=\tcb@scale@y\fi%
 }
 
+\def\tcb@comp@waterbox@shrink#1#2#3{%
+  \tcb@comp@waterbox@zoom{#1}{#2}{#3}%
+  \ifdim\dimexpr\tcb@scale@x pt\relax>1pt\relax%
+    \edef\tcb@scale@x{1}\edef\tcb@scale@y{1}%
+  \fi%
+}
+
+\def\tcb@box@scaled@waterbox{\scalebox{\tcb@scale@x}[\tcb@scale@y]{\box\tcb@waterbox}}
+
 \def\tcb@drawspec@watermark@@noclip{%
   \tcb@comp@wm%
-  \node[opacity=\kvtcb@watermark@opacity,anchor=center] at (interior) {\scalebox{\tcb@scale@x}[\tcb@scale@y]{\box\tcb@waterbox}};%
+  \node[opacity=\kvtcb@watermark@opacity,anchor=center] at (interior) {\tcb@box@scaled@waterbox};%
 }
 
 \def\tcb@drawspec@watermark@@clip{%
@@ -873,9 +880,11 @@
 \tcbset{%
   watermark opacity/.store in=\kvtcb@watermark@opacity,%
   watermark color/.store in=\kvtcb@watermark@color,%
-  watermark zoom/.code={\def\kvtcb@watermark@factor{#1}\let\tcb@comp@wm=\tcb@comp@wm@zoom},%
-  watermark overzoom/.code={\def\kvtcb@watermark@factor{#1}\let\tcb@comp@wm=\tcb@comp@wm@overzoom},%
-  watermark stretch/.code={\def\kvtcb@watermark@factor{#1}\let\tcb@comp@wm=\tcb@comp@wm@stretch},%
+%
+  watermark stretch/.code={\def\tcb@comp@wm{\tcb@comp@waterbox@stretch{#1}{\tcb@innerwidth}{\tcb@innerheight}}},%
+  watermark zoom/.code={\def\tcb@comp@wm{\tcb@comp@waterbox@zoom{#1}{\tcb@innerwidth}{\tcb@innerheight}}},%
+  watermark overzoom/.code={\def\tcb@comp@wm{\tcb@comp@waterbox@overzoom{#1}{\tcb@innerwidth}{\tcb@innerheight}}},%
+  watermark shrink/.code={\def\tcb@comp@wm{\tcb@comp@waterbox@shrink{#1}{\tcb@innerwidth}{\tcb@innerheight}}},%
 %
   watermark tikz/.style={overlay={\tcb@drawspec@watermark@tikz{#1}}},
   watermark tikz on/.style args={#1 is #2}{overlay #1={\tcb@drawspec@watermark@tikz{#2}}},%
@@ -933,7 +942,9 @@
 
 \tikzset{%
   fill image opacity/.store in=\tcb@tikz@fill@graphics@opacity,%
-  fill image opacity=1.0,%
+  fill image opacity=1,%
+  fill image scale/.store in=\tcb@tikz@fill@graphics@scale,%
+  fill image scale=1,%
   fill image options/.store in=\tcb@tikz@fill@graphics@options,%
   fill image options=,%
   fill plain image/.style={path picture={%
@@ -941,35 +952,27 @@
   }},
   fill stretch image/.style={path picture={%
     \tcb@process@ppbb@wh%
-    \node at (path picture bounding box.center) {\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options,width=\tcb@ppbb@width,height=\tcb@ppbb@height]{#1}};
+    \node at (path picture bounding box.center) {\expandafter\includegraphics\expandafter[\tcb@tikz@fill@graphics@options,%
+      width=\the\dimexpr\tcb@tikz@fill@graphics@scale\dimexpr\tcb@ppbb@width\relax,%
+      height=\the\dimexpr\tcb@tikz@fill@graphics@scale\dimexpr\tcb@ppbb@height\relax]{#1}};
   }},
   fill overzoom image/.style={path picture={%
     \tcb@process@ppbb@wh%
     \tcb@set@waterbox@to@graphics{#1}%
-    \tcb@setratiorobust\tcb@scale@x{\tcb@ppbb@width}{\wd\tcb@waterbox}%
-    \tcb@setratiorobust\tcb@scale@y{\tcb@ppbb@height}{\ht\tcb@waterbox+\dp\tcb@waterbox}%
-    \ifdim\dimexpr\tcb@scale@x pt\relax>\dimexpr\tcb@scale@y pt\relax\let\tcb@scale@y=\tcb@scale@x\else\let\tcb@scale@x=\tcb@scale@y\fi%
-    \node at (path picture bounding box.center) {\scalebox{\tcb@scale@x}[\tcb@scale@y]{\box\tcb@waterbox}};%
+    \tcb@comp@waterbox@overzoom{\tcb@tikz@fill@graphics@scale}{\tcb@ppbb@width}{\tcb@ppbb@height}%
+    \node at (path picture bounding box.center) {\tcb@box@scaled@waterbox};%
   }},
   fill zoom image/.style={path picture={%
     \tcb@process@ppbb@wh%
     \tcb@set@waterbox@to@graphics{#1}%
-    \tcb@setratiorobust\tcb@scale@x{\tcb@ppbb@width}{\wd\tcb@waterbox}%
-    \tcb@setratiorobust\tcb@scale@y{\tcb@ppbb@height}{\ht\tcb@waterbox+\dp\tcb@waterbox}%
-    \ifdim\dimexpr\tcb@scale@x pt\relax<\dimexpr\tcb@scale@y pt\relax\let\tcb@scale@y=\tcb@scale@x\else\let\tcb@scale@x=\tcb@scale@y\fi%
-    \node at (path picture bounding box.center) {\scalebox{\tcb@scale@x}[\tcb@scale@y]{\box\tcb@waterbox}};%
+    \tcb@comp@waterbox@zoom{\tcb@tikz@fill@graphics@scale}{\tcb@ppbb@width}{\tcb@ppbb@height}%
+    \node at (path picture bounding box.center) {\tcb@box@scaled@waterbox};%
   }},
   fill shrink image/.style={path picture={%
     \tcb@process@ppbb@wh%
     \tcb@set@waterbox@to@graphics{#1}%
-    \tcb@setratiorobust\tcb@scale@x{\tcb@ppbb@width}{\wd\tcb@waterbox}%
-    \tcb@setratiorobust\tcb@scale@y{\tcb@ppbb@height}{\ht\tcb@waterbox+\dp\tcb@waterbox}%
-    \ifdim\dimexpr\tcb@scale@x pt\relax<\dimexpr\tcb@scale@y pt\relax\let\tcb@scale@y=\tcb@scale@x\else\let\tcb@scale@x=\tcb@scale@y\fi%
-    \ifdim\dimexpr\tcb@scale@x pt\relax<1pt\relax%
-      \node at (path picture bounding box.center) {\scalebox{\tcb@scale@x}[\tcb@scale@y]{\box\tcb@waterbox}};%
-    \else%
-      \node at (path picture bounding box.center) {\box\tcb@waterbox};%
-    \fi%
+    \tcb@comp@waterbox@shrink{\tcb@tikz@fill@graphics@scale}{\tcb@ppbb@width}{\tcb@ppbb@height}%
+    \node at (path picture bounding box.center) {\tcb@box@scaled@waterbox};%
   }},
   fill tile image/.style={path picture={%
     \tcb@process@ppbb%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
index aeceaf8b208..6e13a79ad82 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 2.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \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 894d72c9bdf..b3545a560b4 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.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% 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{2.72}
+\tcb@set@library@version{2.80}
 
 \RequirePackage{amsmath}
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
new file mode 100644
index 00000000000..97affc0ad60
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
@@ -0,0 +1,226 @@
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
+%% tcbhooks.code.tex: Code for adding hooks
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `author-maintained'.
+%%
+%% This work consists of all files listed in README
+%%
+%\makeatletter
+\tcb@set@library@version{2.80}
+
+\RequirePackage{xparse}[2013/12/31]
+
+\tcbset{%
+  IfNoValueTF/.code args={#1#2#3}{\IfNoValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+  IfValueTF/.code args={#1#2#3}{\IfValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+  IfBooleanTF/.code args={#1#2#3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+  verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm}
+}
+
+%-- tcolorbox --
+\long\def\tcb@New@TColorBox#1#2#3{%
+  \tcb@newenvironment{#1}{#2}{\tcolorbox[#3,options@for=#1]}{\endtcolorbox}}
+
+\def\DeclareTColorBox{%
+  \let\tcb@newenvironment\DeclareDocumentEnvironment%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TColorBox%
+  \tcb@process@newenvironment}
+
+\def\NewTColorBox{%
+  \let\tcb@newenvironment\NewDocumentEnvironment%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TColorBox%
+  \tcb@process@newenvironment}
+
+\def\RenewTColorBox{%
+  \let\tcb@newenvironment\RenewDocumentEnvironment%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TColorBox%
+  \tcb@process@newenvironment}
+
+\def\ProvideTColorBox{%
+  \let\tcb@newenvironment\ProvideDocumentEnvironment%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TColorBox%
+  \tcb@process@newenvironment}
+
+%-- tcolorbox (total) --
+\long\def\tcb@New@TotalTColorBox#1#2#3#4{%
+  \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\begin{tcolorbox}[#3,options@for=#1]#4\end{tcolorbox}}}
+
+\def\DeclareTotalTColorBox{%
+  \let\tcb@newcommand\DeclareDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTColorBox%
+  \tcb@process@newcommand}
+
+\def\NewTotalTColorBox{%
+  \let\tcb@newcommand\NewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTColorBox%
+  \tcb@process@newcommand}
+
+\def\RenewTotalTColorBox{%
+  \let\tcb@newcommand\RenewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTColorBox%
+  \tcb@process@newcommand}
+
+\def\ProvideTotalTColorBox{%
+  \let\tcb@newcommand\ProvideDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTColorBox%
+  \tcb@process@newcommand}
+
+%-- tcbox --
+\long\def\tcb@New@TCBox#1#2#3{%
+  \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcbox[#3,options@for=#1]}}
+
+\def\DeclareTCBox{%
+  \let\tcb@newcommand\DeclareDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBox%
+  \tcb@process@newcommand}
+
+\def\NewTCBox{%
+  \let\tcb@newcommand\NewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBox%
+  \tcb@process@newcommand}
+
+\def\RenewTCBox{%
+  \let\tcb@newcommand\RenewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBox%
+  \tcb@process@newcommand}
+
+\def\ProvideTCBox{%
+  \let\tcb@newcommand\ProvideDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBox%
+  \tcb@process@newcommand}
+
+%-- tcbox (total) --
+\long\def\tcb@New@TotalTCBox#1#2#3#4{%
+  \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcbox[#3,options@for=#1]{#4}}}
+
+\def\DeclareTotalTCBox{%
+  \let\tcb@newcommand\DeclareDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBox%
+  \tcb@process@newcommand}
+
+\def\NewTotalTCBox{%
+  \let\tcb@newcommand\NewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBox%
+  \tcb@process@newcommand}
+
+\def\RenewTotalTCBox{%
+  \let\tcb@newcommand\RenewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBox%
+  \tcb@process@newcommand}
+
+\def\ProvideTotalTCBox{%
+  \let\tcb@newcommand\ProvideDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBox%
+  \tcb@process@newcommand}
+
+\DeclareTotalTCBox{\tcboxverb}{ O{} v }{verbatim,#1}{#2}
+
+%-- tcboxfit --
+\long\def\tcb@New@TCBoxFit#1#2#3{%
+  \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcboxfit[#3,options@for=#1]}}
+
+\def\DeclareTCBoxFit{%
+  \let\tcb@newcommand\DeclareDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBoxFit%
+  \tcb@process@newcommand}
+
+\def\NewTCBoxFit{%
+  \let\tcb@newcommand\NewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBoxFit%
+  \tcb@process@newcommand}
+
+\def\RenewTCBoxFit{%
+  \let\tcb@newcommand\RenewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBoxFit%
+  \tcb@process@newcommand}
+
+\def\ProvideTCBoxFit{%
+  \let\tcb@newcommand\ProvideDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBoxFit%
+  \tcb@process@newcommand}
+
+\long\def\tcb@New@TotalTCBoxFit#1#2#3#4{%
+  \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcboxfit[#3,options@for=#1]{#4}}}
+
+\def\DeclareTotalTCBoxFit{%
+  \let\tcb@newcommand\DeclareDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBoxFit%
+  \tcb@process@newcommand}
+
+\def\NewTotalTCBoxFit{%
+  \let\tcb@newcommand\NewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBoxFit%
+  \tcb@process@newcommand}
+
+\def\RenewTotalTCBoxFit{%
+  \let\tcb@newcommand\RenewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBoxFit%
+  \tcb@process@newcommand}
+
+\def\ProvideTotalTCBoxFit{%
+  \let\tcb@newcommand\ProvideDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TotalTCBoxFit%
+  \tcb@process@newcommand}
+
+
+%-- tcblisting --
+\long\def\tcb@New@TCBListing#1#2#3{%
+  \tcb@newenvironment{#1}{#2}{\tcblisting{#3,options@for=#1}}{\endtcblisting}}
+
+\def\DeclareTCBListing{%
+  \let\tcb@newenvironment\DeclareDocumentEnvironment%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBListing%
+  \tcb@process@newenvironment}
+
+\def\NewTCBListing{%
+  \let\tcb@newenvironment\NewDocumentEnvironment%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBListing%
+  \tcb@process@newenvironment}
+
+\def\RenewTCBListing{%
+  \let\tcb@newenvironment\RenewDocumentEnvironment%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBListing%
+  \tcb@process@newenvironment}
+
+\def\ProvideTCBListing{%
+  \let\tcb@newenvironment\ProvideDocumentEnvironment%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBListing%
+  \tcb@process@newenvironment}
+
+%-- tcbinputlisting --
+\long\def\tcb@New@TCBInputListing#1#2#3{%
+  \expandafter\tcb@newcommand\csname#1\endcsname{#2}{\tcbinputlisting{#3,options@for=#1}}%
+}
+
+\def\DeclareTCBInputListing{%
+  \let\tcb@newcommand\DeclareDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBInputListing%
+  \tcb@process@newcommand}
+
+\def\NewTCBInputListing{%
+  \let\tcb@newcommand\NewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBInputListing%
+  \tcb@process@newcommand}
+
+\def\RenewTCBInputListing{%
+  \let\tcb@newcommand\RenewDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBInputListing%
+  \tcb@process@newcommand}
+
+\def\ProvideTCBInputListing{%
+  \let\tcb@newcommand\ProvideDocumentCommand%
+  \let\tcb@process@newtcolorbox@continue\tcb@New@TCBInputListing%
+  \tcb@process@newcommand}
+
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index c6c39d25d05..4789a631490 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.72 (2014/03/18)
+%% The LaTeX package tcolorbox - version 2.80 (2014/03/31)
 %% tcolorbox.sty: Text color boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2014/03/18 version 2.72 text color boxes]
-\def\tcb@version{2.72}
+\ProvidesPackage{tcolorbox}[2014/03/31 version 2.80 text color boxes]
+\def\tcb@version{2.80}
 
 \RequirePackage{pgf}[2008/01/15]
 \RequirePackage{verbatim}[2003/08/22]
@@ -187,8 +187,10 @@
   savelowerto/.store in=\kvtcb@savelowerto,
   savedelimiter/.estore in=\kvtcb@savedelimiter,
   floatplacement/.store in=\kvtcb@floatplacement,
-  float/.store in=\kvtcb@float,
+  float/.code={\def\kvtcb@float{#1}\def\tcb@float@env@begin{\@float}\def\tcb@float@env@end{\end@float}},
   float/.default=\kvtcb@floatplacement,
+  float*/.code={\def\kvtcb@float{#1}\def\tcb@float@env@begin{\@dblfloat}\def\tcb@float@env@end{\end@dblfloat}},
+  float*/.default=\kvtcb@floatplacement,
   nofloat/.style={float=},
   before/.code={\def\kvtcb@beforebox{#1}\let\tcb@use@autoparskip=\relax},
   after/.code={\def\kvtcb@afterbox{#1}\let\tcb@use@autoparskip=\relax},
@@ -973,8 +975,8 @@
   \ifx\kvtcb@float\@empty%
   \newenvironment{tcb@float}{\kvtcb@beforebox}{\kvtcb@afterbox}%
   \else%
-    \edef\float@start{\noexpand\@float{tcbfloat}[\kvtcb@float]}%
-    \newenvironment{tcb@float}{\float@start}{\end@float}%
+    \edef\tcb@float@env@start{\noexpand\tcb@float@env@begin{tcbfloat}[\kvtcb@float]}%
+    \newenvironment{tcb@float}{\tcb@float@env@start}{\tcb@float@env@end}%
   \fi%
   \setcounter{tcbbreakpart}{1}%
   % computation of total height
@@ -1109,7 +1111,7 @@
   \appto\tcb@new@colopt{,code={\let\tcbcounter=\@empty\let\thetcbcounter=\@empty}}%
 }%
 
-\def\tcb@proc@options@init#1#2{%
+\long\def\tcb@proc@options@init#1#2{%
   \tcbset{new/.cd,reset@new,#1}%
   \tcb@proc@counter{#2}%
   \ifx\kvtcb@new@listof\@empty%
@@ -1121,6 +1123,22 @@
   \kvtcb@init@hook%
 }%
 
+\long\def\tcb@process@newtcolorbox#1#2{%
+  \def\tcb@new@colopt{}%
+  \long\def\temp@a{#2}%
+  \ifx\temp@a\@empty\relax%
+  \else%
+    \tcb@proc@options@init{#2}{#1}%
+  \fi%
+  \preto\tcb@new@colopt{savedelimiter=#1}%
+  \cslet{tcb@opt@#1}{\tcb@new@colopt}%
+  \tcb@process@newtcolorbox@continue{#1}%
+}
+
+\newcommand\tcb@process@newenvironment[2][]{%
+  \tcb@process@newtcolorbox{#2}{#1}%
+}
+
 \long\def\tcb@newtcolorbox#1#2{\tcb@newenvironment{#1}{\tcolorbox[#2,options@for=#1]}{\endtcolorbox}}
 
 \long\def\tcb@newtcolorbox@#1[#2]#3{\tcb@newenvironment{#1}[#2]{\tcolorbox[#3,options@for=#1]}{\endtcolorbox}}
@@ -1130,27 +1148,19 @@
 \long\def\tcb@new@tcolorbox@#1[#2]{%
   \@ifnextchar[{\tcb@newtcolorbox@@{#1}[#2]}{\tcb@newtcolorbox@{#1}[#2]}}
 
-\long\def\tcb@new@tcolorbox#1{%
-  \preto\tcb@new@colopt{savedelimiter=#1}%
-  \cslet{tcb@opt@#1}{\tcb@new@colopt}%
+\def\tcb@new@tcolorbox#1{%
   \@ifnextchar[{\tcb@new@tcolorbox@{#1}}{\tcb@newtcolorbox{#1}}}
 
-\long\def\tcb@new@tcolorbox@opt[#1]#2{%
-  \tcb@proc@options@init{#1}{#2}%
-  \tcb@new@tcolorbox{#2}%
-}
-
-\long\def\new@tcolorbox{%
-  \def\tcb@new@colopt{}%
-  \@ifnextchar[{\tcb@new@tcolorbox@opt}{\tcb@new@tcolorbox}}
-
-\long\def\newtcolorbox{%
+\def\newtcolorbox{%
   \let\tcb@newenvironment\newenvironment%
-  \new@tcolorbox}
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcolorbox%
+  \tcb@process@newenvironment}
 
-\long\def\renewtcolorbox{%
+\def\renewtcolorbox{%
   \let\tcb@newenvironment\renewenvironment%
-  \new@tcolorbox}
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcolorbox%
+  \tcb@process@newenvironment}
+
 
 % auxiliary code to remove a leading backspace
 \newcommand{\tcb@remove@bs}[1]{%
@@ -1167,6 +1177,10 @@
   -\number\fi\expandafter\z@}
 \newcommand{\tcb@remove@bs@aux@iii}[1]{\z@}
 
+\newcommand\tcb@process@newcommand[2][]{%
+  \edef\tcb@temp{\noexpand\tcb@process@newtcolorbox{\tcb@remove@bs{#2}}}%
+  \tcb@temp{#1}%
+}
 
 \long\def\tcb@newtcbox#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcbox[#2,options@for=#1]}}
 
@@ -1177,38 +1191,19 @@
 \long\def\tcb@new@tcbox@#1[#2]{%
   \@ifnextchar[{\tcb@newtcbox@@{#1}[#2]}{\tcb@newtcbox@{#1}[#2]}}
 
-\long\def\tcb@new@tcbox#1{%
-  \preto\tcb@new@colopt{savedelimiter=#1}%
-  \cslet{tcb@opt@#1}{\tcb@new@colopt}%
+\def\tcb@new@tcbox#1{%
   \@ifnextchar[{\tcb@new@tcbox@{#1}}{\tcb@newtcbox{#1}}}
 
-
-\long\def\tcb@new@tcbox@bs#1{%
-  \edef\tcb@temp{\noexpand\tcb@new@tcbox{\tcb@remove@bs{#1}}}%
-  \tcb@temp%
-}
-
-\long\def\tcb@new@tcbox@opt#1#2{%
-  \tcb@proc@options@init{#2}{#1}%
-  \tcb@new@tcbox{#1}%
-}
-
-\long\def\tcb@new@tcbox@opt@bs[#1]#2{%
-  \edef\tcb@temp{\noexpand\tcb@new@tcbox@opt{\tcb@remove@bs{#2}}}%
-  \tcb@temp{#1}%
-}
-
-\long\def\new@tcbox{%
-  \def\tcb@new@colopt{}%
-  \@ifnextchar[{\tcb@new@tcbox@opt@bs}{\tcb@new@tcbox@bs}}
-
-\long\def\newtcbox{%
+\def\newtcbox{%
   \let\tcb@newcommand\newcommand%
-  \new@tcbox}
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcbox%
+  \tcb@process@newcommand}
 
-\long\def\renewtcbox{%
+\def\renewtcbox{%
   \let\tcb@newcommand\renewcommand%
-  \new@tcbox}
+  \let\tcb@process@newtcolorbox@continue\tcb@new@tcbox%
+  \tcb@process@newcommand}
+
 
 \def\tcb@addcontentsline#1#2{%
   \ifx\kvtcb@listentry\@empty%
@@ -1385,8 +1380,9 @@
 \tcb@add@library{breakable}{tcbbreakable.code.tex}
 \tcb@add@library{hooks}{tcbhooks.code.tex}
 \tcb@add@library{fitting}{tcbfitting.code.tex}
+\tcb@add@library{xparse}{tcbxparse.code.tex}
 
-\tcb@add@library@style{many}{skins,breakable,hooks,theorems,fitting}
+\tcb@add@library@style{many}{skins,breakable,hooks,theorems,fitting,xparse}
 \tcb@add@library@style{most}{many,listingsutf8}
 \tcb@add@library@style{all}{many,minted,listingsutf8,documentation}