tcolorbox (12jun15)

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

28 files changed, 101 insertions, 78 deletions

diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
index 418ebecc0ff..03ab06e6547 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %%
 %% -------------------------------------------------------------------------------------------
 %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -765,7 +765,15 @@ version 3.60 (2015/05/07)
   * new option: 'smart shadow arc'
 - library 'documentation':
   package 'doc' removed from list of required packages
-- new library 'external':
+- library 'external':
   * new options:
     'environment with percent', 'preamble tcbset', 'preclass', 'clear preclass',
     'PassOptionsToPackage', 'PassOptionsToClass'
+
+version 3.61 (2015/06/12)
+- bug fix: nobreak settings after a heading were sometimes ignored depending
+  on the box content
+- library 'external':
+  * now throws an error if the same external job name is used twice
+  * new option: '-'
+- documentation bug fixes
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README
index 95be77a5160..b3d92ba258e 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %%
 %% -------------------------------------------------------------------------------------------
 %% 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 97635460443..32eeb7fd28e 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 828e6abc215..529a43bebd5 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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 7780d5bf743..6405686ced9 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -213,7 +213,7 @@ and an optional \emph{lower part}. These parts are separated by
   Feasible values for \meta{mode} are:
   \begin{itemize}
   \item\docValue{visible}: usual type setting of the upper part,
-  \item\docValue{invisible}: empty space instead of the uooer part contents.
+  \item\docValue{invisible}: empty space instead of the upper part contents.
   \end{itemize}
 \begin{exdispExample}{upperbox}
 \begin{tcolorbox}[upperbox=invisible,colback=white]
@@ -1312,7 +1312,7 @@ outer arc   & auto   & auto   & auto  & auto  & 0.0pt & 0.0pt \\
   \item\docValue{none}: no switching.
   \item\docValue{forced}: the values of the left and right rules and spaces are switched.
   \item\docValue{evenpage}: if the page is an even page, the values of the left and
-    right rules and spaces are switched. It is recommended that one use this setting in
+    right rules and spaces are switched. It is recommended that you use this setting in
     conjunction with \refKey{/tcb/check odd page}.
   \end{itemize}
 \begin{dispListing}
@@ -3015,7 +3015,7 @@ This is a \textbf{tcolorbox}.
   \item\docValue{none}: no switching.
   \item\docValue{forced}: the values of the left and right enlargement are switched.
   \item\docValue{evenpage}: if the page is an even page, the values of the left and
-    right enlargement are switched. It is recommended that one use this setting in
+    right enlargement are switched. It is recommended that you use this setting in
     conjunction with \refKey{/tcb/check odd page}.
     %Note that the page number detection may
     %fail in certain cases. For these cases, use the |forced| value.
@@ -3082,7 +3082,7 @@ Lorem \tcbox{ipsum} dolor sit amet, consectetuer adipiscing elit.
 \begin{docTcbKey}[][doc updated=2014-09-19]{extrude left by}{=\meta{length}}{style, no default, initially unset}
   The (upper part of the) colored box is extruded by the given \meta{length} to the left side.
   The inner width and the bounding box is kept unchanged and the operation
-  is additiv!
+  is additive!
 \begin{dispExample}
 \tcbset{enhanced,colframe=red,colback=yellow!25!white,
   frame style={opacity=0.25},interior style={opacity=0.5},
@@ -3098,7 +3098,7 @@ Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
 \begin{docTcbKey}[][doc updated=2014-09-19]{extrude right by}{=\meta{length}}{style, no default, initially unset}
   The (upper part of the) colored box is extruded by the given \meta{length} to the right side.
   The inner width and the bounding box is kept unchanged and the operation
-  is additiv!
+  is additive!
 \begin{dispExample}
 \tcbset{enhanced,colframe=red,colback=yellow!25!white,
   frame style={opacity=0.25},interior style={opacity=0.5},
@@ -3115,7 +3115,7 @@ Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
 \begin{docTcbKey}{extrude top by}{=\meta{length}}{style, no default, initially unset}
   The (upper part of the) colored box is extruded by the given \meta{length} to the top side.
   The inner width and the bounding box is kept unchanged and the operation
-  is additiv!
+  is additive!
 \begin{dispExample}
 \tcbset{enhanced,colframe=red,colback=yellow!25!white,
   frame style={opacity=0.25},interior style={opacity=0.5},
@@ -3131,7 +3131,7 @@ Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
 \begin{docTcbKey}{extrude bottom by}{=\meta{length}}{style, no default, initially unset}
   The (upper part of the) colored box is extruded by the given \meta{length} to the bottom side.
   The inner width and the bounding box is kept unchanged and the operation
-  is additiv!
+  is additive!
 \begin{dispExample}
 \tcbset{enhanced,colframe=red,colback=yellow!25!white,
   frame style={opacity=0.25},interior style={opacity=0.5},
@@ -3147,7 +3147,7 @@ Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
 \begin{docTcbKey}{extrude by}{=\meta{length}}{style, no default, initially unset}
   The (upper part of the) colored box is extruded by the given \meta{length} to all sides.
   The inner width and the bounding box is kept unchanged and the operation
-  is additiv!
+  is additive!
 \begin{dispExample}
 \tcbset{enhanced,colframe=red,colback=yellow!25!white,
   frame style={opacity=0.25},interior style={opacity=0.5},
@@ -3175,7 +3175,7 @@ Here, footnote texts are administrated to find their intended place
 and specific layer dependent options may be set by changing
 \refKey{/tcb/every box on layer n}.
 If needed, the number of managed layers can be increased by setting
-\refCom{tcbsetmanagedlayer} to a higher value than 4.
+\refCom{tcbsetmanagedlayer} to a higher value than~4.
 
 The following styles have a considerable influence on how layered boxes
 are processed. Note especially that nested boxes are getting a
@@ -3369,7 +3369,7 @@ This is a tcolorbox.
   a |minipage|. In a |minipage| or |parbox|, paragraphs are formatted slightly different
   as the main text. If the key value is set to |false|, the normal main text
   behavior is restored. In some situations, this has some unwanted side
-  effects. It is recommended that one use this experimental setting only
+  effects. It is recommended that you use this experimental setting only
   where you really want to have this feature.
 \end{docTcbKey}
 
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
index 0d570cf1337..2fb061ff2d7 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
@@ -31,7 +31,7 @@ The main differences between \tikzname\ externalization and \mylib{external} are
   |tikzpicture| environments. But these snippets have to be stand-alone without
   dependencies to the rest of the document.
 \end{itemize}
-Why should one use \mylib{external} instead of the more powerful \tikzname\ |external|?
+Why should somebody use \mylib{external} instead of the more powerful \tikzname\ |external|?
 One reason could be compilation speed, but the main reason for creating the
 library at all was that \tikzname\ |external| tends to choke on complicated
 documents where the sophisticated mechanism stumbles. Since \mylib{external} does
@@ -45,6 +45,12 @@ Use \refKey{/tcb/external/force remake} to force compilation in this case
 or simply delete the externalized snippets.
 \end{marker}
 
+\begin{marker}
+To use the externalization options, the compiler has to be called with the
+|-shell-escape| permission to authorize potentially dangerous system calls.
+Be warned that this is a security risk.
+\end{marker}
+
 
 \clearpage
 \subsection{Preparation of a Document for Externalization}\label{subsec:external_preparation}
@@ -124,10 +130,14 @@ The necessity is given, if a compiled pdf file is missing or the
 |md5| checksum of the source snippet has changed.
 \end{extTcbKey}
 
-\begin{extTcbKey}[][doc new=2015-03-11]{!}{}{style}
+\enlargethispage*{1cm}
+\begin{extTcbKey}[][doc new=2015-03-11]{\tcbexclamation}{}{style}
   Shortcut for setting \refKey{/tcb/external/force remake} to |true|.
 \end{extTcbKey}
 
+\begin{extTcbKey}[][doc new=2015-06-12]{-}{}{style}
+  Shortcut for setting \refKey{/tcb/external/externalize} to |false|.
+\end{extTcbKey}
 
 
 \subsection{Marking Externalization Snippets}\label{subsec:external_marking}
@@ -315,7 +325,7 @@ mandatory parameter, see \refEnv{tcbexternal}.
 \end{dispExample}
 
 
-\begin{docTcbKey}[][doc new=2015-03-11]{externalize listing!}{=\meta{name}}{style, no default}
+\begin{docTcbKey}[][doc new=2015-03-11]{externalize listing\tcbexclamation}{=\meta{name}}{style, no default}
 Combination of \refKey{/tcb/externalize listing} and \refKey{/tcb/external/force remake}.
 \end{docTcbKey}
 
@@ -331,7 +341,7 @@ Combination of \refKey{/tcb/externalize listing} and \refKey{/tcb/external/force
 \end{dispExample}
 \end{docTcbKey}
 
-\begin{docTcbKey}[][doc new=2015-03-11]{externalize example!}{=\meta{name}}{style, no default}
+\begin{docTcbKey}[][doc new=2015-03-11]{externalize example\tcbexclamation}{=\meta{name}}{style, no default}
 Combination of \refKey{/tcb/externalize example} and \refKey{/tcb/external/force remake}.
 \end{docTcbKey}
 
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex
index 96141a8b313..ec1eea7044d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex
@@ -18,7 +18,7 @@ Particularly, they can be used for
 \bigskip
 \begin{marker}
 Typically, these options may generate counters and alike.
-It is \textbf{strongly} recommended that one use initialization options inside
+It is \textbf{strongly} recommended that you use initialization options inside
 the preamble only. Otherwise, you may get trouble when using \LaTeX's |\include| features.
 \end{marker}
 
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.recording.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.recording.tex
index 639402e98e0..2bbdcb9deeb 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.recording.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.recording.tex
@@ -7,7 +7,7 @@ The package provides some macros and options to take \emph{records} during
 compilation. This is done by \LaTeX\ file operations to save some data
 to a file for later usage. The main application scenario is depicted in
 \Vref{sec:recording-exercises} where
-informations about example solutions are recorded and read again
+information about example solutions is recorded and read again
 in \Vref{sec:recording-solutions}.
 
 \subsection{Makros}\label{sec:recording-makros}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
index 4df9532fc30..8a5ed614604 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
@@ -206,3 +206,5 @@
 \pdfstringdefDisableCommands{%
   \def\mylib#1{'#1'}%
 }
+
+\newrobustcmd*{\tcbexclamation}{!}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
index 00421e26e2f..0191440bb5f 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
@@ -1867,7 +1867,7 @@ This is a tcolorbox.
 \subsubsection{Generic Shadows}
 \begin{docTcbKey}{shadow}{=\marg{xshift}\marg{yshift}\marg{offset}\marg{options}}{no default}
   Adds a new shadow to the stack of shadows.
-  This shadow is follows the outline of the |tcolorbox| but is shifted by
+  This shadow follows the outline of the |tcolorbox| but is shifted by
   \meta{xshift} and \meta{yshift}. The \meta{offset} value is a distance value
   from the frame outline.  A positive \meta{offset} value shrinks the shadow
   and a negative \meta{offset} value enlarges the shadow.
@@ -1923,7 +1923,7 @@ This is a tcolorbox.
 \begin{docTcbKey}{fuzzy shadow}{=\marg{xshift}\marg{yshift}\marg{offset}\marg{step}\marg{options}}{no default}
   Adds a new fuzzy shadow to the stack of shadows. Actually, this option
   adds several shadows which appear like a shadow with a fuzzy border.
-  This fuzzy shadow is follows the outline of the |tcolorbox| but is shifted by
+  This fuzzy shadow follows the outline of the |tcolorbox| but is shifted by
   \meta{xshift} and \meta{yshift}. The \meta{offset} value is a distance value
   from the frame outline.  A positive \meta{offset} value shrinks the shadow
   and a negative \meta{offset} value enlarges the shadow.
@@ -2017,7 +2017,7 @@ Normal shadow arc
 \begin{docTcbKey}{lifted shadow}{=\marg{xshift}\marg{yshift}\marg{bend}\marg{step}\marg{options}}{no default}
   Adds a new lifted shadow to the stack of shadows. Actually, this option
   adds several shadows which appear like a shadow with a fuzzy border.
-  This lifted shadow is follows the outline of the |tcolorbox| but is shifted by
+  This lifted shadow follows the outline of the |tcolorbox| but is shifted by
   \meta{xshift} and \meta{yshift} on the lower left corner and by
   $-$\meta{xshift} and \meta{yshift} on the lower right corner.
   Additionally, there is a \meta{bend} in the middle.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex
index a201785ca08..b7213211436 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex
@@ -272,7 +272,7 @@ This is a tcolorbox.
   leftrule=0pt,rightrule=0pt,toprule=0.3mm,bottomrule=0.3mm,boxsep=0.5mm,
   colback=#1!10!white,colframe=#1!50!black,#3}{#2}
 
-To set a word \textbf{bold} in \myverb{\LaTeX}, one uses
+To set a word \textbf{bold} in \myverb{\LaTeX}, use
 \myverb[green]{\textbf{bold}}. Alternatively, write
 \myverb[yellow]{{\bfseries bold}}.
 In \myverb[blue]{\LaTeX}[enhanced,fuzzy halo], other font settings are
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index 239f0e296f1..08f886c0722 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 1872de9aba5..b272ceec6eb 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% tcolorbox.tex: Manual
 %%
 %% -------------------------------------------------------------------------------------------
@@ -19,7 +19,6 @@
 %% This work consists of all files listed in README
 %%
 \documentclass[a4paper,11pt]{ltxdoc}
-%\documentclass[a4paper,11pt]{report}
 
 \usepackage{tcolorbox.doc.s_main}
 \tcbEXTERNALIZE
@@ -36,8 +35,8 @@
 \setlength{\bibitemsep}{\smallskipamount}
 \addbibresource{tcolorbox.doc.bib}
 
-\def\version{3.60}%
-\def\datum{2015/05/07}%
+\def\version{3.61}%
+\def\datum{2015/06/12}%
 \makeindex
 
 \hypersetup{
@@ -50,7 +49,7 @@
 \usepackage{pgfplots}
 
 %\tcbset{draftmode}
-%\includeonly{tcolorbox.doc.skins}
+%\includeonly{tcolorbox.doc.external}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \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 2ff4905fc0d..5f64cdc8db0 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% tcbbreakable.code.tex: Code for breakable colorboxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{3.60}
+\tcb@set@library@version{3.61}
 
 \let\tcb@parboxrestore@true=\tcb@parboxrestore
 \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent}
@@ -256,20 +256,14 @@
       \tcb@multicolfalse%
     \fi}%
   \ifx\kvtcb@float\@empty%
-    \if@nobreak%
+    \iftcb@nobreak{%
       \let\tcb@nobreak@warning\tcb@do@nobreak@warning%
       \iftcb@ignorenobreak%
         \kvtcb@beforebox%
       \else%
         \tcb@handle@nobreak%
       \fi%
-    \else%
-      %\ifnum\lastnodetype=-1\relax%
-      %  \lineskip=0pt%
-      %\else%
-        \kvtcb@beforebox%
-      %\fi%
-    \fi%
+    }{\kvtcb@beforebox}%
     \def\kvtcb@beforebox{\parskip\z@\nointerlineskip\noindent}%
     \noindent% applies parskip
     \vskip\lineskip{\parskip\z@\par\vskip\z@}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 38f30e33d86..1e88e7ebc6f 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% tcbdocumentation.code.tex: Code for LaTeX documentations
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{3.60}
+\tcb@set@library@version{3.61}
 
 \tcbuselibrary{listings,skins,xparse,external}
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
index d62bec68285..0c8879ef2d8 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% tcbexternal.code.tex: Code for externalization
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,8 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-%\makeatletter
-\tcb@set@library@version{3.60}
+\tcb@set@library@version{3.61}
 
 {
 \catcode`\"=12
@@ -58,11 +57,10 @@
 \@onlypreamble\tcbEXTERNALIZE
 
 \def\tcbexternal@setbasename#1{%
-  \gdef\tcbexternal@basename{#1}%
-  \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@job@name{\expandonce{\tcbexternal@prefix}\expandonce{\tcbexternal@basename}}}\x%
-  \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@job@mdfive{\expandonce{\tcbexternal@job@name.md5}}}\x%
-  \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@job@source{\expandonce{\tcbexternal@job@name.tex}}}\x%
-  \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@job@pdf{\expandonce{\tcbexternal@job@name.pdf}}}\x%
+  \edef\tcbexternal@job@name{\expandonce{\tcbexternal@prefix}\expandonce{#1}}%
+  \edef\tcbexternal@job@mdfive{\expandonce{\tcbexternal@job@name.md5}}%
+  \edef\tcbexternal@job@source{\expandonce{\tcbexternal@job@name.tex}}%
+  \edef\tcbexternal@job@pdf{\expandonce{\tcbexternal@job@name.pdf}}%
 }
 
 \def\tcbexternal@corecompile{%
@@ -159,6 +157,12 @@
 
 \newenvironment{tcbexternal}[2][]{%
   \tcbset{external/.cd,#1,name=#2}%
+  \@ifundefined{@tcbexternal@JN@\tcbexternal@job@name}{%
+      \global\@namedef{@tcbexternal@JN@\tcbexternal@job@name}{}%
+    }{%
+      \tcb@error{External job name '\tcbexternal@job@name' already used}%
+        {Give a new unique name to the current external job.}%
+    }%
   \begingroup%
   \let\tcb@verbatim@begin@hook=\tcbexternal@out@begin%
   \let\tcb@verbatim@end@hook=\tcbexternal@out@end%
@@ -193,7 +197,7 @@
 \long\def\new@tcb@externalizetcolorbox#1#2#3#4{%
   \new@tcb@externalizeenvironment{#1}{#2}%
     {preamble tcbset={force nobeforeafter},#3}%
-    {\tcbset{#4}\tcb@set@normal@unbroken@beforeafter\tcb@before@unbroken}%
+    {\tcb@apply@box@options{#4}\tcb@set@normal@unbroken@beforeafter\tcb@before@unbroken}%
     {\tcb@after@unbroken}%
 }
 
@@ -217,7 +221,7 @@
   external/.cd,
   %
   runner/.code={%
-    \begingroup\edef\x{\endgroup\noexpand\def\noexpand\tcbexternal@run@tex{\expandonce{#1}}}\x%
+    \edef\tcbexternal@run@tex{\expandonce{#1}}%
   },
   %
   prefix/.store in=\tcbexternal@prefix,
@@ -233,6 +237,7 @@
   PassOptionsToPackage/.code 2 args={\appto\tcbexternal@preclass{\PassOptionsToPackage{#1}{#2}}},
   PassOptionsToClass/.code 2 args={\appto\tcbexternal@preclass{\PassOptionsToClass{#1}{#2}}},
   externalize/.code={},
+  -/.style={externalize=false},
   %
   force remake/.is choice,
   force remake/true/.code={\let\tcbexternal@compile=\tcbexternal@corecompile},
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index e2d3a0ef20d..2278704e1bd 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \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 e3bd47ba849..1ab10750e15 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \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 a7c4eeecbd6..b5c0c49bc62 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \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 b1a5f9288bd..790dc23e240 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \RequirePackage{pdftexcmds}
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index b4d2e0e54a1..0c77b8734ed 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \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 d54ba8a8f54..8915d284fc3 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \RequirePackage{minted}[2011/09/17]
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
index ef527cd803e..7fb7882b929 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \newcounter{tcbrastercolumn}
 \newcounter{tcbrasterrow}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index c060ed92e05..e9631f3209b 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \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 5503e8bc889..1ada60de63a 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \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 64db47670b8..4e383fe12c6 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 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% 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{3.60}
+\tcb@set@library@version{3.61}
 
 \RequirePackage{amsmath}
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
index 52fddb93403..661cdacc5ca 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% tcbxparse.code.tex: Code for xparse features
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{3.60}
+\tcb@set@library@version{3.61}
 
 \RequirePackage{xparse}[2013/12/31]
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index da7be0e6c4f..96cbddf15b6 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 3.60 (2015/05/07)
+%% The LaTeX package tcolorbox - version 3.61 (2015/06/12)
 %% tcolorbox.sty: Text color boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2015/05/07 version 3.60 text color boxes]
-\def\tcb@version{3.60}
+\ProvidesPackage{tcolorbox}[2015/06/12 version 3.61 text color boxes]
+\def\tcb@version{3.61}
 
 \RequirePackage{pgf}[2008/01/15]
 \RequirePackage{verbatim}[2003/08/22]
@@ -865,6 +865,11 @@
 
 \long\def\tcb@apply@box@options#1{%
   \tcbset{#1}\tcb@lateoptions@hook\tcb@afteroptions@hook%
+  \if@nobreak%
+    \let\iftcb@nobreak\@firstoftwo%
+  \else%
+    \let\iftcb@nobreak\@secondoftwo%
+  \fi%
 }
 
 \long\def\tcb@@icolorbox[#1]{%
@@ -1381,11 +1386,11 @@
 
 \def\tcb@set@normal@unbroken@beforeafter{%
   \let\tcb@before@unbroken=\kvtcb@beforebox%
-  \if@nobreak%
+  \iftcb@nobreak{%
     \iftcb@ignorenobreak\else%
       \let\tcb@before@unbroken=\kvtcb@beforebox@nobreak%
     \fi%
-  \fi%
+  }{}%
   \let\tcb@after@unbroken=\kvtcb@afterbox%
 }