tcolorbox (21feb14)

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

12 files changed, 161 insertions, 115 deletions

diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index e1aca3d2ed2..01af1193ad8 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \let\tcb@parboxrestore@true=\tcb@parboxrestore
 \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 62037191692..5164150c79b 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% tcbdocumentation.code.tex: Code for LaTeX documentations
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,16 +17,16 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{2.70}
+\tcb@set@library@version{2.71}
 
-\tcbuselibrary{listings}
+\tcbuselibrary{listings,skins}
 
 \RequirePackage{doc}[2010/02/04]
 \RequirePackage{pifont}[2005/04/12]
 \RequirePackage{marvosym}[2011/07/20]
-\RequirePackage{hyperref}[2012/02/06]
-\RequirePackage{makeidx}[2000/03/29]
+\ifdefined\printindex\else\RequirePackage{makeidx}[2000/03/29]\fi
 \RequirePackage{refcount}[2011/10/16]
+\RequirePackage{hyperref}[2012/02/06]
 
 \definecolor{Option}{rgb}{0.118,0.546,0.222}
 \definecolor{Definition}{rgb}{0.784,0.06,0.176}
@@ -34,8 +34,8 @@
 \definecolor{ExampleBack}{rgb}{0.963,0.971,0.994}
 \definecolor{Hyperlink}{rgb}{0.281,0.275,0.485}
 
-\def\colDef#1{\textcolor{\kvtcb@coldef}{#1}}
-\def\colOpt#1{\textcolor{\kvtcb@colopt}{#1}}
+\def\colDef#1{\textcolor{\kvtcb@col@command}{#1}}
+\def\colOpt#1{\textcolor{\kvtcb@col@opt}{#1}}
 
 \lstdefinestyle{tcbdocumentation}{language={[LaTeX]TeX},
     aboveskip={0\p@ \@plus 6\p@},
@@ -61,6 +61,8 @@
   \colOpt{{\ttfamily[}\meta{#1}{\ttfamily]}}}
 
 \newif\iftcb@doc@toindex
+\newif\iftcb@doc@colorize
+\newif\iftcb@doc@annotate
 
 % language specific texts
 \tcbset{
@@ -71,6 +73,7 @@
   environment/.store in=\kvtcb@text@env,
   environments/.store in=\kvtcb@text@envs,
   key/.store in=\kvtcb@text@key,
+  keys/.store in=\kvtcb@text@keys,
   index/.store in=\kvtcb@text@index,
   pageshort/.store in=\kvtcb@text@pageshort,
   value/.store in=\kvtcb@text@value,
@@ -83,8 +86,13 @@
   documentation listing style/.style={documentation listing options={style=#1}},%
   documentation minted style/.store in=\kvtcb@docmintstyle,
   documentation minted options/.store in=\kvtcb@docmintoptions,
-  color option/.store in=\kvtcb@colopt,
-  color definition/.store in=\kvtcb@coldef,
+  color command/.store in=\kvtcb@col@command,
+  color environment/.store in=\kvtcb@col@environment,
+  color key/.store in=\kvtcb@col@key,
+  color value/.store in=\kvtcb@col@value,
+  color color/.store in=\kvtcb@col@color,
+  color definition/.style={color command={#1},color environment={#1},color key={#1},color value={#1},color color={#1}},
+  color option/.store in=\kvtcb@col@opt,
   color hyperlink/.store in=\kvtcb@colhyper,
   color frame/.store in=\kvtcb@colhyper,
   before example/.store in=\kvtcb@beforeexample,
@@ -93,6 +101,8 @@
   index quote/.store in=\idx@quote,
   index level/.store in=\idx@level,
   index format/.store in=\idx@format,
+  index colorize/.is if=tcb@doc@colorize,%
+  index annotate/.is if=tcb@doc@annotate,%
   doc left/.dimstore in=\kvtcb@doc@left,
   doc right/.dimstore in=\kvtcb@doc@right,
   doc left indent/.dimstore in=\kvtcb@doc@indentleft,
@@ -105,6 +115,7 @@
   doc into index/.is if=tcb@doc@toindex,%
 }
 
+
 % styles
 \tcbset{
   docexample/.style={colframe=ExampleFrame,colback=ExampleBack,fontlower=\footnotesize},
@@ -116,7 +127,7 @@
     color=color,colors=Colors,
     environment content=environment content,
     environment=environment,environments=Environments,
-    key=key,
+    key=key,keys=Keys,
     index=Index,
     pageshort={P.},
     value=value,values=Values}},
@@ -161,16 +172,41 @@
   \tcb@layer@pushup\tcbset{docexample,#1}\tcbwritetemp%
   }{\enddispListing}
 
-
 % index auxiliary macros
-\def\tcb@index@Col#1{\iftcb@doc@toindex\index{#1\idx@actual\texttt{#1} \kvtcb@text@color}\index{\kvtcb@text@colors\idx@level#1\idx@actual\texttt{#1}}\fi}
-\def\tcb@index@Com#1{\iftcb@doc@toindex\index{#1\idx@actual\cs{#1}}\fi}
-\def\tcb@index@Env#1{\iftcb@doc@toindex\index{#1\idx@actual\texttt{#1} \kvtcb@text@env}\index{\kvtcb@text@envs\idx@level#1\idx@actual\texttt{#1}}\fi}
-\def\tcb@index@Key#1{\iftcb@doc@toindex\index{#1\idx@actual\texttt{#1} \kvtcb@text@key}\fi}%
-\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\tcb@index@Key{#2}\index{#1\idx@actual\texttt{/#1/}\idx@level#2\idx@actual\texttt{#2}}\fi}%
-\def\tcb@index@Val#1{\iftcb@doc@toindex\index{#1\idx@actual\texttt{#1} \kvtcb@text@value}\index{\kvtcb@text@values\idx@level#1\idx@actual\texttt{#1}}\fi}
+\def\tcb@Index@Print@CA#1#2#3{%
+  \iftcb@doc@colorize\textcolor{#2}{\texttt{#1}}\else\texttt{#1}\fi%
+  \iftcb@doc@annotate\ #3\fi%
+}
+
+\def\tcb@Index@Print@C#1#2{%
+  \iftcb@doc@colorize\textcolor{#2}{\texttt{#1}}\else\texttt{#1}\fi%
+}
+
+\newrobustcmd{\tcbIndexPrintComC}[1]{\tcb@Index@Print@C{\cs{#1}}{\kvtcb@col@command}}
+\def\tcb@Print@Com#1{\textcolor{\kvtcb@col@command}{\ttfamily\bfseries\cs{#1}}}
+
+\newrobustcmd{\tcbIndexPrintEnvCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@environment}{\kvtcb@text@env}}
+\newrobustcmd{\tcbIndexPrintEnvC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@environment}}
+\def\tcb@Print@Env#1{\textcolor{\kvtcb@col@environment}{\ttfamily\bfseries#1}}
 
-\def\tcb@disp@com#1{\colDef{\ttfamily\bfseries#1}}
+\newrobustcmd{\tcbIndexPrintKeyCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@key}{\kvtcb@text@key}}
+\newrobustcmd{\tcbIndexPrintKeyC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@key}}
+\def\tcb@Print@Key#1{\textcolor{\kvtcb@col@key}{\ttfamily\bfseries#1}}
+
+\newrobustcmd{\tcbIndexPrintValCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@value}{\kvtcb@text@value}}
+\newrobustcmd{\tcbIndexPrintValC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@value}}
+\def\tcb@Print@Val#1{\textcolor{\kvtcb@col@value}{\ttfamily\bfseries#1}}
+
+\newrobustcmd{\tcbIndexPrintColCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@color}{\kvtcb@text@color}}
+\newrobustcmd{\tcbIndexPrintColC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@color}}
+\def\tcb@Print@Col#1{\textcolor{\kvtcb@col@color}{\ttfamily\bfseries#1}}
+
+\def\tcb@index@Com#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintComC{#1}}\fi}
+\def\tcb@index@Env#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintEnvCA{#1}}\index{\kvtcb@text@envs\idx@level#1\idx@actual\tcbIndexPrintEnvC{#1}}\fi}
+\def\tcb@index@Key#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintKeyCA{#1}}\index{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{#1}}\fi}%
+\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\index{#2\idx@actual\tcbIndexPrintKeyCA{#2}}\index{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{/#1/}\idx@level#2\idx@actual\tcbIndexPrintKeyC{#2}}\fi}%
+\def\tcb@index@Val#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintValCA{#1}}\index{\kvtcb@text@values\idx@level#1\idx@actual\tcbIndexPrintValC{#1}}\fi}
+\def\tcb@index@Col#1{\iftcb@doc@toindex\index{#1\idx@actual\tcbIndexPrintColCA{#1}}\index{\kvtcb@text@colors\idx@level#1\idx@actual\tcbIndexPrintColC{#1}}\fi}
 
 \def\brackets#1{{\ttfamily\char`\{}#1{\ttfamily\char`\}}}
 
@@ -202,7 +238,7 @@
 \newenvironment{docCommand}[3][]{\tcbset{#1}%
   \begin{tcb@manual@entry}%
   \begin{tcb@doc@head}{doc@head@command}%
-  \tcb@disp@com{\cs{#2}}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\cs{#2}}\label{com:#2}{\ttfamily #3}%
+  \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\cs{#2}}\label{com:#2}{\ttfamily #3}%
   \tcb@doc@do@description%
   \end{tcb@doc@head}}%
   {\end{tcb@manual@entry}}
@@ -212,9 +248,9 @@
 \newenvironment{docEnvironment}[3][]{\tcbset{#1}%
   \begin{tcb@manual@entry}%
   \begin{tcb@doc@head}{doc@head@environment}%
-  \strut\cs{begin}\brackets{\tcb@disp@com{#2}}\tcb@index@Env{#2}\protected@edef\@currentlabel{#2}\label{env:#2}{\ttfamily #3}\par%
+  \strut\cs{begin}\brackets{\tcb@Print@Env{#2}}\tcb@index@Env{#2}\protected@edef\@currentlabel{#2}\label{env:#2}{\ttfamily #3}\par%
   \strut~~\meta{\kvtcb@text@envcontent}\par%
-  \strut\cs{end}\brackets{\tcb@disp@com{#2}}%
+  \strut\cs{end}\brackets{\tcb@Print@Env{#2}}%
   \tcb@doc@do@description%
   \end{tcb@doc@head}}%
   {\end{tcb@manual@entry}}
@@ -225,8 +261,8 @@
   \tcbset{doc description={#4}}%
   \begin{tcb@doc@head}{doc@head@key}%
   \ifx#1\@empty%
-  \tcb@disp@com{#2}\tcb@index@Key{#2}\protected@edef\@currentlabel{#2}\label{key:#2}{\ttfamily #3}%
-  \else\tcb@disp@com{/#1/#2}\tcb@index@KeyPath{#1}{#2}\protected@edef\@currentlabel{/#1/#2}\label{key:/#1/#2}{\ttfamily #3}%
+  \tcb@Print@Key{#2}\tcb@index@Key{#2}\protected@edef\@currentlabel{#2}\label{key:#2}{\ttfamily #3}%
+  \else\tcb@Print@Key{/#1/#2}\tcb@index@KeyPath{#1}{#2}\protected@edef\@currentlabel{/#1/#2}\label{key:/#1/#2}{\ttfamily #3}%
   \fi%
   \tcb@doc@do@description%
   \end{tcb@doc@head}}%
@@ -242,24 +278,35 @@
   \newenvironment{#1*}{\bgroup\tcb@doc@toindexfalse\begin{#1}}{\end{#1}\egroup}%
 }
 
-\def\docAuxCommand@#1{\tcb@disp@com{\cs{#1}}\tcb@index@Com{#1}}%
-\def\docAuxCommand@star#1{\tcb@disp@com{\cs{#1}}}%
+\def\docAuxCommand@#1{\tcbIndexPrintComC{#1}\tcb@index@Com{#1}}%
+\def\docAuxCommand@star#1{\tcbIndexPrintComC{#1}}%
 \def\docAuxCommand{\@ifstar\docAuxCommand@star\docAuxCommand@}
 
-\def\docAuxEnvironment@#1{\tcb@disp@com{#1}\tcb@index@Env{#1}}%
-\def\docAuxEnvironment@star#1{\tcb@disp@com{#1}}%
+\def\docAuxEnvironment@#1{\tcb@Print@Env{#1}\tcb@index@Env{#1}}%
+\def\docAuxEnvironment@star#1{\tcb@Print@Env{#1}}%
 \def\docAuxEnvironment{\@ifstar\docAuxEnvironment@star\docAuxEnvironment@}
 
-\def\docAuxKey@#1{\tcb@disp@com{#1}\tcb@index@Key{#1}}%
-\def\docAuxKey@star#1{\tcb@disp@com{#1}}%
+\newcommand{\docAuxKey@}[2][\@empty]{%
+  \ifx#1\@empty%
+    \tcb@Print@Key{#2}\tcb@index@Key{#2}%
+  \else%
+    \tcb@Print@Key{/#1/#2}\tcb@index@KeyPath{#1}{#2}%
+  \fi}%
+
+\newcommand{\docAuxKey@star}[2][\@empty]{%
+  \ifx#1\@empty%
+    \tcb@Print@Key{#2}%
+  \else%
+    \tcb@Print@Key{/#1/#2}%
+  \fi}%
 \def\docAuxKey{\@ifstar\docAuxKey@star\docAuxKey@}
 
-\def\docColor@#1{\tcb@disp@com{#1}\tcb@index@Col{#1}}%
-\def\docColor@star#1{\tcb@disp@com{#1}}%
+\def\docColor@#1{\tcb@Print@Col{#1}\tcb@index@Col{#1}}%
+\def\docColor@star#1{\tcb@Print@Col{#1}}%
 \def\docColor{\@ifstar\docColor@star\docColor@}
 
-\def\docValue@#1{\tcb@disp@com{#1}\tcb@index@Val{#1}}%
-\def\docValue@star#1{\tcb@disp@com{#1}}%
+\def\docValue@#1{\tcb@Print@Val{#1}\tcb@index@Val{#1}}%
+\def\docValue@star#1{\tcb@Print@Val{#1}}%
 \def\docValue{\@ifstar\docValue@star\docValue@}
 
 \setrefcountdefault{-1}
@@ -307,7 +354,6 @@
   \def\noindexing{\let\index=\@gobble}%
 }
 
-
 \def\tcb@doc@index@pgfsection{%
   \def\index@prologue{\section*{\kvtcb@text@index}\addcontentsline{toc}{section}{\kvtcb@text@index}%
     \par\noindent%
@@ -320,10 +366,8 @@
   \tcb@doc@index@pgf@%
 }
 
-
 \let\tcb@doc@index@pgf=\tcb@doc@index@pgfsection%
 
-
 \def\tcb@doc@index@doc{%
   \let\tcb@index@Com=\SpecialMainIndex%%
   \let\tcb@index@Env=\SpecialMainEnvIndex%
@@ -352,6 +396,8 @@
     doc head=,
     doc description=,
     doc into index=true,
+    index colorize=false,
+    index annotate=true,
     },
   initialize@reset=reset@documentation,
 }
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index 89b411d52a9..2ea25e52ac9 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \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 f39b877d3c6..585483e9493 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \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 366520111d9..3485a370bfc 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \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 4401fd0a840..588279e58d2 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,54 +18,44 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{2.70}
+\tcb@set@library@version{2.71}
 
 \def\tcbuselistingtext{\input{\kvtcb@listingfile}}%
+\def\tcbuselistingcomment{\kvtcb@listingcomment}%
+\def\tcb@listing@listing{\tcbuselistinglisting}
 
-\def\tcb@listing@listingAndText{%
+\def\tcb@listing@listingAndOther{%
    \tcbuselistinglisting%
    \tcblower%
-   \tcbuselistingtext%
+   \tcb@use@listing@other%
 }
 
-\def\tcb@listing@listingAndComment{%
-   \tcbuselistinglisting%
-   \tcblower%
-   \kvtcb@listingcomment%
-}
-
-\def\tcb@listing@textAndListing{%
-   \tcbuselistingtext%
-   \tcblower%
-   \tcbuselistinglisting%
-}
-
-\def\tcb@listing@commentAndListing{%
-   \kvtcb@listingcomment%
+\def\tcb@listing@otherAndListing{%
+   \tcb@use@listing@other%
    \tcblower%
    \tcbuselistinglisting%
 }
 
-\def\tcb@listing@listing{%
-  \tcbuselistinglisting%
+\def\tcb@use@lower@outside#1{%
+  \tcb@minipage{#1}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces%
+  \begingroup\tcb@layer@inc\tcb@use@listing@other\tcb@layer@dec\endgroup%
+  \unskip\kvtcb@after@lower\endminipage%
 }
 
-\def\tcb@inputlisting@out@textAboveListing{%
+\def\tcb@inputlisting@out@otherAboveListing{%
   \kvtcb@beforebox\noindent%
-  \iftcb@lowervisible\tcb@minipage{\kvtcb@width}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces%
-     \begingroup\tcb@layer@inc\tcbuselistingtext\tcb@layer@dec\endgroup%
-     \unskip\kvtcb@after@lower\endminipage%
-     \par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent%
-     \fi%
+  \iftcb@lowervisible%
+    \tcb@use@lower@outside{\kvtcb@width}%
+    \par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent%
+  \fi%
   \begin{tcolorbox}[before=]\tcbuselistinglisting\end{tcolorbox}%
 }
 
-\def\tcb@inputlisting@out@listingAboveText{%
+\def\tcb@inputlisting@out@listingAboveOther{%
   \begin{tcolorbox}[after=]\tcbuselistinglisting\end{tcolorbox}%
   \iftcb@lowervisible\par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent%
-    \tcb@minipage{\kvtcb@width}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces%
-     \begingroup\tcb@layer@inc\tcbuselistingtext\tcb@layer@dec\endgroup%
-     \unskip\kvtcb@after@lower\endminipage\fi%
+    \tcb@use@lower@outside{\kvtcb@width}%
+  \fi%
   \kvtcb@afterbox%
 }
 
@@ -87,28 +77,28 @@
   \fi%
 }
 
-\def\tcb@inputlisting@out@listingAndText{%
+\def\tcb@inputlisting@out@listingAndOther{%
   \tcb@inputlisting@out@prepare%
   \tcbdimto\tcb@w@outside{\tcb@w@lower}%
   \tcbdimto\tcb@w@inside{\tcb@width-\tcb@w@lower-\kvtcb@sbs@gap}%
   \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}%
   \tcb@minipage{\tcb@w@inside}%
   \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}%
-  \endminipage\hfill%
-  \iftcb@lowervisible\tcb@minipage{\tcb@w@outside}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces%
-    \begingroup\tcb@layer@inc\tcbuselistingtext\tcb@layer@dec\endgroup%
-    \unskip\kvtcb@after@lower\endminipage\fi%
+  \endminipage\hspace{\kvtcb@sbs@gap}\hfill%
+  \iftcb@lowervisible%
+    \tcb@use@lower@outside{\tcb@w@outside}%
+  \fi%
   \end{minipage}\end{tcb@sbsfloat}%
 }
 
-\def\tcb@inputlisting@out@textAndListing{%
+\def\tcb@inputlisting@out@otherAndListing{%
   \tcb@inputlisting@out@prepare%
   \tcbdimto\tcb@w@outside{\tcb@w@upper}%
   \tcbdimto\tcb@w@inside{\tcb@width-\tcb@w@upper-\kvtcb@sbs@gap}%
   \begin{tcb@sbsfloat}\begin{minipage}{\tcb@width}%
-  \iftcb@lowervisible\tcb@minipage{\tcb@w@outside}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces%
-    \begingroup\tcb@layer@inc\tcbuselistingtext\tcb@layer@dec\endgroup%
-    \unskip\kvtcb@after@lower\endminipage\fi\hfill%
+  \iftcb@lowervisible%
+    \tcb@use@lower@outside{\tcb@w@outside}%
+  \fi\hspace{\kvtcb@sbs@gap}\hfill%
   \tcb@minipage{\tcb@w@inside}%
   \begin{tcolorbox}[width=\tcb@w@inside,nobeforeafter,nofloat,sidebyside=false]\tcbuselistinglisting\end{tcolorbox}%
   \endminipage%
@@ -119,29 +109,36 @@
   \begin{tcolorbox}[capture=\tcb@listing@capture]\tcb@listing@process\end{tcolorbox}%
 }
 
-\let\tcb@inputlisting\tcb@inputlisting@inside
-
-\def\tcb@set@listing@process#1{%
-  \let\tcb@inputlisting\tcb@inputlisting@inside%
-  \let\tcb@listing@process=#1%
-}
-
 \tcbset{%
   listing file/.store in=\kvtcb@listingfile,%
   comment/.store in=\kvtcb@listingcomment,%
-  listing and text/.code={\tcb@set@listing@process{\tcb@listing@listingAndText}},%
-  text and listing/.code={\tcb@set@listing@process{\tcb@listing@textAndListing}},%
-  listing and comment/.code={\tcb@set@listing@process{\tcb@listing@listingAndComment}},%
-  comment and listing/.code={\tcb@set@listing@process{\tcb@listing@commentAndListing}},%
-  listing only/.code={\tcb@set@listing@process{\tcb@listing@listing}},%
-  text only/.code={\tcb@set@listing@process{\tcbuselistingtext}},%
-  text above listing/.code={\let\tcb@inputlisting\tcb@inputlisting@out@textAboveListing},%
-  listing above text/.code={\let\tcb@inputlisting\tcb@inputlisting@out@listingAboveText},%
+  listing@process@inside/.code 2 args={%
+    \let\tcb@inputlisting\tcb@inputlisting@inside%
+    \let\tcb@listing@process=#1%
+    \let\tcb@use@listing@other=#2},%
+  listing@process@outside/.code 2 args={%
+    \let\tcb@inputlisting=#1%
+    \let\tcb@use@listing@other=#2},%
+  listing only/.style={listing@process@inside={\tcb@listing@listing}{\tcbuselistingtext}},%
+  text only/.style={listing@process@inside={\tcbuselistingtext}{\tcbuselistingtext}},%
+  listing and text/.style={listing@process@inside={\tcb@listing@listingAndOther}{\tcbuselistingtext}},%
+  text and listing/.style={listing@process@inside={\tcb@listing@otherAndListing}{\tcbuselistingtext}},%
+  text above listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAboveListing}{\tcbuselistingtext}},%
+  listing above text/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther}{\tcbuselistingtext}},%
+  text outside listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAndListing}{\tcbuselistingtext}},%
+  listing outside text/.style={listing@process@outside={\tcb@inputlisting@out@listingAndOther}{\tcbuselistingtext}},%
   text side listing/.style={sidebyside,text and listing},%
   listing side text/.style={sidebyside,listing and text},%
-  text outside listing/.code={\let\tcb@inputlisting\tcb@inputlisting@out@textAndListing},%
-  listing outside text/.code={\let\tcb@inputlisting\tcb@inputlisting@out@listingAndText},%
-  listing engine/.is choice,
+  listing and comment/.style={listing@process@inside={\tcb@listing@listingAndOther}{\tcbuselistingcomment}},%
+  comment and listing/.style={listing@process@inside={\tcb@listing@otherAndListing}{\tcbuselistingcomment}},%
+  comment above listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAboveListing}{\tcbuselistingcomment}},%
+  listing above comment/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther}{\tcbuselistingcomment}},%
+  comment outside listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAndListing}{\tcbuselistingcomment}},%
+  listing outside comment/.style={listing@process@outside={\tcb@inputlisting@out@listingAndOther}{\tcbuselistingcomment}},%
+  comment side listing/.style={sidebyside,comment and listing},%
+  listing side comment/.style={sidebyside,listing and comment},%
+  listing engine/.is choice,%
+  image comment/.style 2 args={comment={\includegraphics[#1]{#2}}},
 }
 
 \newenvironment{tcblisting}[1]{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index 80393ee5702..70305d3b656 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \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 1a20c11733f..4918a3db3a5 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \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 3c58bf1940b..255f2c015fe 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \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 2e8009cf1b8..92482269544 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \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 4cae6984bd6..db6a6014950 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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.70}
+\tcb@set@library@version{2.71}
 
 \RequirePackage{amsmath}
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index 325ae9945a2..b14d0379342 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.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% tcolorbox.sty: Text color boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2014/02/06 version 2.70 text color boxes]
-\def\tcb@version{2.70}
+\ProvidesPackage{tcolorbox}[2014/02/21 version 2.71 text color boxes]
+\def\tcb@version{2.71}
 
 \RequirePackage{pgf}[2008/01/15]
 \RequirePackage{verbatim}[2003/08/22]
@@ -359,6 +359,9 @@
   shield externalize/true/.code={\let\tcb@shield@externalize=\tcb@shield@@externalize},
   shield externalize/false/.code={\let\tcb@shield@externalize=\relax},
   shield externalize/.default=true,
+  external/.code={\tikzsetnextfilename{#1}},
+  remake/.code={\tikzset{external/remake next={#1}}},
+  remake/.default=true,
   lower separated/.is if=tcb@lowerseparated,
   options@for/.code={\letcs\tcb@new@colop{tcb@opt@#1}\pgfkeysalsofrom\tcb@new@colop},
   list entry/.store in=\kvtcb@listentry,
@@ -896,7 +899,7 @@
 
 \def\tcb@sbs@mix{%
   \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper@real}
-    \noindent\unhbox\tcb@upperbox\hspace{\kvtcb@sbs@gap}%
+    \noindent\unhbox\tcb@upperbox\hspace{\kvtcb@sbs@gap}\hfill%
     \iftcb@hasLower%
       \iftcb@lowervisible\unhbox\tcb@lowerbox%
       \else%