tcolorbox (21feb14)

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

21 files changed, 382 insertions, 143 deletions

diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
index 64e18b57952..09fefc3cdde 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 2.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %%
 %% -------------------------------------------------------------------------------------------
 %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -412,3 +412,21 @@ version 2.70 (2014/02/06)
     'doc head', 'doc head command', 'doc head environment', 'doc head key',
     'doc description', 'doc into index', 'value', 'values'
 
+version 2.71 (2014/02/21)
+- bug fix: sidebyside setting with empty left hand side caused false positioning
+- new options:
+  'external', 'remake'
+- library 'listings':
+  * new options:
+    'comment side listing', 'listing side comment', 'comment above listing',
+    'listing above comment', 'comment outside listing', 'listing outside comment',
+    'image comment',
+- library 'documentation':
+  * automatic inclusion of the 'skins' library
+  * inclusion of 'makeidx' made dependent on the existence of '\printindex'
+  * new options:
+    'keys', 'index colorize', 'index annotate',
+    'color command', 'color environment', 'color key', 'color value', 'color color'
+
+
+
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README
index 097953248de..c4bb263c551 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 2.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %%
 %% -------------------------------------------------------------------------------------------
 %% 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 492f0a76a7e..40fd4ce9b05 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
index dd185f81369..5fd04ca11bd 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 2.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% 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 cac968f3641..b2770352663 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -2664,6 +2664,22 @@ do \emph{not} use |\tikzexternaldisable| in front of the |tcolorbox|.
 \refKey{/tcb/shield externalize} is deactivated automatically inside a |tikzpicture|.
 \end{marker}
 
+\begin{docTcbKey}{external}{=\meta{file name}}{no default, initially unset}
+  Convenience option which calls |\tikzsetnextfilename|\marg{file name}. Typically,
+  it may be used inside the option list of a |tcolorbox| to set the
+  externalization \meta{file name} for the first |tikzpicture| which is discovered
+  \emph{inside} the box content.
+  The package |tikz| \cite{tantau:2013a} or the library \mylib{skins} has to be loaded to use this option.
+  Additionally, |\usetikzlibrary{external}| has to be used.
+\end{docTcbKey}
+
+\begin{docTcbKey}{remake}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+  Convenience option which calls |/tikz/external/remake next|. Typically,
+  it may be used inside the option list of a |tcolorbox| to force the remake
+  of the first |tikzpicture| which is discovered \emph{inside} the box content.
+  The package |tikz| \cite{tantau:2013a} or the library \mylib{skins} has to be loaded to use this option.
+  Additionally, |\usetikzlibrary{external}| has to be used.
+\end{docTcbKey}
 
 
 \subsection{Miscellaneous}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
index 2b6e64f95c3..b1fe8a9d02d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
@@ -13,8 +13,15 @@ The library is loaded by a package option or inside the preamble by:
   \tcbuselibrary{documentation}
 \end{dispListing}
 This also loads the library \mylib{listings}, see \Vref{sec:listings},
+the library \mylib{skins}, see \Vref{sec:skins},
 and a bunch of packages, namely
-|doc|, |pifont|, |marvosym|, |hyperref|, |makeidx|, and |refcount|.
+|doc|, |pifont|, |marvosym|, |makeidx|, |refcount|, and |hyperref|.
+
+\begin{marker}
+The package |makeidx| is loaded only, if \docAuxCommand*{printindex} is
+\emph{not} already defined. Therefore, one can include an alternative to |makeidx| like
+|imakeidx| \emph{before} the library |documentation| is used.
+\end{marker}
 
 For UTF-8 support, load:
 \begin{dispListing}
@@ -29,6 +36,7 @@ For |minted| \cite{rudolph:2011a} support, load:
 
 
 \subsection{Macros of the Library}
+\enlargethispage*{15mm}
 \begin{docEnvironment}[doclang/environment content=command description]{docCommand}{\oarg{options}\marg{name}\marg{parameters}}
   Documents a \LaTeX\ macro with given \meta{name} where \meta{name} is
   written without backslash. The given \meta{options} are set with \refCom{tcbset}.
@@ -142,21 +150,21 @@ The environment \docAuxEnvironment{fooauxenv} holds some interesting data.
 \end{dispExample}
 \end{docCommand}
 
-\begin{docCommand}{docAuxEnvironment*}{\marg{name}}
+\begin{docCommand}{docAuxEnvironment*}{\oarg{key path}\marg{name}}
   Identical to \refCom{docAuxEnvironment}, but without index entry.
 \end{docCommand}
 
 
-\begin{docCommand}{docAuxKey}{\marg{name}}
-  Documents an auxiliary key with given \meta{name} including path.
+\begin{docCommand}{docAuxKey}{\oarg{key path}\marg{name}}
+  Documents an auxiliary key with given \meta{name} and an optional \meta{key path}.
   It is automatically indexed.
 \begin{dispExample}
-The key \docAuxEnvironment{/foo/fooaux} holds some interesting data.
+The key \docAuxKey[foo]{fooaux} holds some interesting data.
 \end{dispExample}
 \end{docCommand}
 
 
-\begin{docCommand}{docAuxKey*}{\marg{name}}
+\begin{docCommand}{docAuxKey*}{\oarg{key path}\marg{name}}
   Identical to \refCom{docAuxKey}, but without index entry.
 \end{docCommand}
 
@@ -169,7 +177,7 @@ The color \docColor{foocolor} is available.
 \end{dispExample}
 \end{docCommand}
 
-\begin{docCommand}{docAuxColor*}{\marg{name}}
+\begin{docCommand}{docColor*}{\marg{name}}
   Identical to \refCom{docColor}, but without index entry.
 \end{docCommand}
 
@@ -381,7 +389,7 @@ Some pages back, one can see \refAuxcs{fooaux} as an example.
 
 %
 \begin{docCommand}{colDef}{\marg{text}}
-Sets \meta{text} with the definition color, see \refKey{/tcb/color definition}.
+Sets \meta{text} with the command color, see \refKey{/tcb/color command}.
 \begin{dispExample}
 This is my \colDef{text}.
 \end{dispExample}
@@ -438,8 +446,30 @@ This is my \colOpt{text}.
   Used for \refKey{/tcb/listing engine}|=minted| only.
 \end{docTcbKey}
 
+
+\begin{docTcbKey}{color command}{=\meta{color}}{no default, initially |Definition|}
+  Sets the highlight color used by macro definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color environment}{=\meta{color}}{no default, initially |Definition|}
+  Sets the highlight color used by environment definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color key}{=\meta{color}}{no default, initially |Definition|}
+  Sets the highlight color used by key definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color value}{=\meta{color}}{no default, initially |Definition|}
+  Sets the highlight color used by value definitions.
+\end{docTcbKey}
+
+\begin{docTcbKey}{color color}{=\meta{color}}{no default, initially |Definition|}
+  Sets the highlight color used by color definitions.
+\end{docTcbKey}
+
 \begin{docTcbKey}{color definition}{=\meta{color}}{no default, initially |Definition|}
-  Sets the highlight color used by macro and key definitions.
+  Sets the highlight color for \refKey{/tcb/color command}, \refKey{/tcb/color environment},
+  \refKey{/tcb/color key}, \refKey{/tcb/color value}, and \refKey{/tcb/color color}.
 \end{docTcbKey}
 
 \begin{docTcbKey}{color option}{=\meta{color}}{no default, initially |Option|}
@@ -474,7 +504,7 @@ This is my \colOpt{text}.
   \end{itemize}
 \end{docTcbKey}
 
-\clearpage
+
 \begin{docTcbKey}{index actual}{=\meta{character}}{no default, initially |@|}
   Sets the character for 'actual' in automatic indexing.
 \end{docTcbKey}
@@ -494,7 +524,7 @@ This is my \colOpt{text}.
   \refKey{/tcb/index level}.
 \end{docTcbKey}
 
-%\enlargethispage*{20mm}
+
 \begin{docTcbKey}{index german settings}{}{style, no value}
   Sets the |makeindex| values recommended for German language texts.
   This is identical to setting the following:
@@ -503,7 +533,19 @@ This is my \colOpt{text}.
 \end{dispListing}
 \end{docTcbKey}
 
+\begin{docTcbKey}{index annotate}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
+  If set to |true|, the index entries are annotated with short descriptions
+  given by \refKey{/tcb/doclang/environment}, \refKey{/tcb/doclang/key},
+  and others.
+\end{docTcbKey}
+
+\begin{docTcbKey}{index colorize}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+  If set to |true|, the index entries colorized according to the color
+  settings given by \refKey{/tcb/color environment}, \refKey{/tcb/color key},
+  and others.
+\end{docTcbKey}
 
+\clearpage
 The following keys are provided for language specific settings.
 The English language is predefined.
 
@@ -535,6 +577,10 @@ The English language is predefined.
   Text used in the index for keys.
 \end{langTcbKey}
 
+\begin{langTcbKey}{keys}{=\meta{text}}{no default, initially |Keys|}
+  Heading text used in the index for keys.
+\end{langTcbKey}
+
 \begin{langTcbKey}{value}{=\meta{text}}{no default, initially |value|}
   Text used in the index for values.
 \end{langTcbKey}
@@ -551,7 +597,6 @@ The English language is predefined.
   Short text for page references.
 \end{langTcbKey}
 
-
 \clearpage
 \begin{docTcbKey}{doc left}{=\meta{length}}{no default, initially |2em|}
   Sets the left hand offset of the documentation texts from
@@ -586,6 +631,7 @@ The English language is predefined.
 \end{dispExample}
 \end{docTcbKey}
 
+\enlargethispage*{10mm}
 \begin{docTcbKey}{doc right indent}{=\meta{length}}{no default, initially |0pt|}
   Sets the right hand indent of documentation heads from
   \refEnv{docCommand}, \refEnv{docEnvironment}, \refEnv{docKey}, etc, to \meta{length}.
@@ -670,7 +716,6 @@ hand side if too long. Linebreaks can be used inside the \meta{text}.
   instead of \refEnv{docCommand}.
 \end{docTcbKey}
 
-%\clearpage
 
 
 \subsection{Predefined Colors of the Library}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
index 08c6309378b..6627745ba61 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
@@ -508,7 +508,7 @@ This is a \LaTeX\ example.
 
 \begin{docTcbKey}{comment}{=\meta{text}}{no default, initially empty}
   Records a comment with \meta{text} as content. The comment is displayed
-  only in conjunction with \refKey{/tcb/listing and comment}
+   e.\,g.\ in conjunction with \refKey{/tcb/listing and comment}
   and \refKey{/tcb/comment and listing}.
 \begin{dispExample}
 \begin{tcblisting}{comment={This comment is really only a comment},
@@ -519,6 +519,19 @@ This is a \textbf{tcolorbox}.
 \end{docTcbKey}
 
 
+\begin{docTcbKey}{image comment}{=\marg{options}\marg{filename}}{style, no default, initially unset}
+  Uses an image denoted by \meta{filename} as \textit{comment} for the listing.
+  The image is included by the standard |\includegraphics| macro with
+  given \meta{options}.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing side comment,
+  image comment={width=2.5cm}{example-image-a.pdf},center lower}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+\clearpage
 \begin{docTcbKey}{listing and comment}{}{no value}
   Typesets the environment content as listing in the upper part and
   a given comment in the lower part.
@@ -599,6 +612,64 @@ This is a \LaTeX\ example.
 
 
 \clearpage
+\begin{docTcbKey}{listing side comment}{}{no value}
+Typesets the environment content side by side as listing in the left (upper)
+part and a given comment in the right (lower) part.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing side comment,
+  righthand width=1.5cm,image comment={width=1.5cm}{example-image-a.pdf}}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{comment side listing}{}{no value}
+Typesets the environment content side by side with a given comment in the left (upper)
+part and as listing in the right (lower) part.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,comment side listing,
+  lefthand width=1.5cm,image comment={width=1.5cm}{example-image-a.pdf}}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\enlargethispage*{2cm}
+\begin{docTcbKey}{listing outside comment}{}{no value}
+Typesets the environment content side by side as listing in a |tcolorbox|
+and a given comment outside the box in the right part of the page.
+Nevertheless, the outside text is treated as \emph{lower} part of the
+|tcolorbox| and can be formatted with all lower part options.
+The space partitioning is done with the side by side options from
+Section \ref{subsec:sidebyside}, see page \pageref{subsec:sidebyside}.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing outside comment,
+  righthand width=1.5cm,image comment={width=1.5cm}{example-image-a.pdf}}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{comment outside listing}{}{no value}
+Typesets the environment content side by side as listing in a |tcolorbox|
+and a given comment outside the box in the left part of the page.
+Nevertheless, the outside text is treated as \emph{lower} part of the
+|tcolorbox| and can be formatted with all lower part options.
+The space partitioning is done with the side by side options from
+Section \ref{subsec:sidebyside}, see page \pageref{subsec:sidebyside}.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,comment outside listing,
+  lefthand width=1.5cm,image comment={width=1.5cm}{example-image-a.pdf}}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\clearpage
 \begin{docTcbKey}{listing above text}{}{no value}
   Typesets the environment content as listing in a |tcolorbox|
   and as compiled text outside and below the box.
@@ -628,6 +699,38 @@ This is a \LaTeX\ example.
 
 
 \clearpage
+\begin{docTcbKey}{listing above comment}{}{no value}
+  Typesets the environment content as listing in a |tcolorbox|
+  and a given comment outside and below the box.
+  The outside text is treated as \emph{lower} part of the
+  |tcolorbox| and can be formatted with all lower part options.
+  The distance between box and comment is controlled by \refKey{/tcb/middle}.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,listing above comment,
+  center lower,image comment={width=3cm}{example-image-a.pdf}}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{comment above listing}{}{no value}
+  Typesets the environment content as listing in a |tcolorbox|
+  and a given comment outside and above the box.
+  The outside text is treated as \emph{lower} part of the
+  |tcolorbox| and can be formatted with all lower part options.
+  The distance between box and comment is controlled by \refKey{/tcb/middle}.
+\begin{dispExample}
+\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,comment above listing,
+  center lower,image comment={width=3cm}{example-image-a.pdf}}
+This is a \LaTeX\ example.
+\end{tcblisting}
+\end{dispExample}
+\end{docTcbKey}
+
+
+
+\clearpage
 \subsection{Creation of \LaTeX\ Tutorials}\label{sec:latextutorial}
 The following source code gives a guideline for the creation of \LaTeX\ tutorials.
 In the next section, a framework for \LaTeX\ exercises is described.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index ee6a8991e70..1c29db55d11 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
index bc9dbc13e84..a62aa250081 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 2.70 (2014/02/06)
+%% The LaTeX package tcolorbox - version 2.71 (2014/02/21)
 %% tcolorbox.tex: Manual
 %%
 %% -------------------------------------------------------------------------------------------
@@ -23,7 +23,7 @@
 \usepackage[T1]{fontenc}
 \usepackage[latin1]{inputenc}
 \usepackage[english]{babel}
-\usepackage{lmodern,parskip,array,ifthen,calc,makeidx}
+\usepackage{lmodern,parskip,array,ifthen,calc}
 \usepackage{amsmath,amssymb}
 \usepackage[svgnames,table,hyperref]{xcolor}
 \usepackage{tikz}
@@ -64,9 +64,16 @@
 \usepackage{changepage}
 \strictpagecheck
 
-\usepackage[all]{tcolorbox}
+\providecommand{\tcbpkgprefix}{}
+\usepackage[all]{\tcbpkgprefix tcolorbox}
 
-\tcbset{skin=enhanced,doc head={colback=yellow!10!white,interior style=fill}}
+\tcbset{skin=enhanced,
+  doc head={colback=yellow!10!white,interior style=fill},
+  doc head key={colback=magenta!5!white,interior style=fill},
+  color key=DarkViolet,
+  color value=Teal,
+  color color=Teal,
+  index colorize,index annotate}
 \urlstyle{sf}
 
 \tcbmakedocSubKey{docTcbKey}{tcb}
@@ -74,10 +81,15 @@
 \tcbmakedocSubKey{newTcbKey}{tcb/new}
 
 \makeatletter
-\def\index@Skin#1{\index{#1\idx@actual\texttt{#1} Skin}\index{Skins\idx@level#1\idx@actual\texttt{#1}}}
+\newrobustcmd{\tcbIndexPrintSkinCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@key}{Skin}}
+\newrobustcmd{\tcbIndexPrintSkinC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@key}}
+\def\tcb@Print@Skin#1{\textcolor{\kvtcb@col@key}{\ttfamily\bfseries#1}}
+
+
+\def\index@Skin#1{\index{#1\idx@actual\tcbIndexPrintSkinCA{#1}}\index{Skins\idx@level#1\idx@actual\tcbIndexPrintSkinC{#1}}}
 \newenvironment{docSkin}[1]{\begin{tcb@manual@entry}%
   \begin{tcb@doc@head}{}%
-  \hypertarget{skin:#1}{\texttt{/tcb/skin=}\tcb@disp@com{#1}\index@Skin{#1}\protected@edef\@currentlabel{#1}\label{skin:#1}\hfill(skin)}%
+  \hypertarget{skin:#1}{\texttt{/tcb/skin=}\tcb@Print@Skin{#1}\index@Skin{#1}\protected@edef\@currentlabel{#1}\label{skin:#1}\hfill(skin)}%
   \end{tcb@doc@head}}%
   {\end{tcb@manual@entry}}
 \def\refSkin#1{\tcb@ref@doc{skin:#1}}
@@ -85,8 +97,8 @@
 
 \newtcolorbox{marker}[1][]{marker,#1}
 
-\def\version{2.70}%
-\def\datum{2014/02/06}%
+\def\version{2.71}%
+\def\datum{2014/02/21}%
 \makeindex
 
 \hypersetup{
@@ -125,7 +137,7 @@
     % documentation
     brackets,
     colDef,colOpt,cs,
-    docAuxCommand,docColor,
+    docAuxCommand,docColor,docAuxEnvironment,docAuxKey,
     meta,marg,
     oarg,
     refCom,refEnv,refKey,
@@ -270,9 +282,8 @@
 \end{tcbverbatimwrite}
 \input{\jobname_preamble_J.tex}
 
-
 %\tcbset{draftmode}
-%\includeonly{tcolorbox.doc.documentation}
+%\includeonly{tcolorbox.doc.coreoptions}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \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 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%