summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-21 21:42:12 +0000
committerKarl Berry <karl@freefriends.org>2016-10-21 21:42:12 +0000
commit0053cd050a19b56080873ca8a2466e9df6f168cf (patch)
treec7aa8fbff1aebd96d0025a2829ebe45fc298dd57
parent05bb2899192e4cc6ce500eb5715cb05f19cf1c24 (diff)
tcolorbox (21oct16)
git-svn-id: svn://tug.org/texlive/trunk@42322 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/CHANGES15
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/README2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdfbin458241 -> 458032 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex80
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdfbin6835148 -> 6845440 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex9
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex7
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex6
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex24
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty30
26 files changed, 162 insertions, 79 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES
index 51810f6bce2..f652f8f0301 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -926,3 +926,16 @@ version 3.94 (2016/07/14)
- library 'external':
* implementation improved for lualatex and xelatex
* new macro '\tcbiffileprocess'
+
+version 3.95 (2016/10/21)
+- The behaviors of 'after upper' and 'after lower' are reverted back to
+ prior version 3.80 to have an automatic \unskip inserted.
+ Therefore, 'after upper*' and 'after lower*' are deprecated now.
+- new option 'void'
+- library 'skins':
+ '\tcbincludegraphics' made compatible with 'height fill' boxes.
+- library 'minted':
+ now, included source files are searched for in relation to an optional
+ 'output-directory' and also locally.
+- library 'documentation':
+ Language settings are not longer reset to English for embedded boxes.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README
index bec78a4d6b2..e42973c5a98 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2016 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 583c0021d80..112019c58b4 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
index 565e0488b9e..61ecb12e82a 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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 713dde66f2e..dde34abfeb1 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -1686,15 +1686,15 @@ This is a \textbf{tcolorbox} where the text area has a height of 2cm.
If this option is used several times, then the \refKey{/tcb/height} is
also increased several times.
\begin{dispExample}
-\tcbset{height=1cm,
+\tcbset{height=2cm,
valign=center,width=(\linewidth-2mm)/2,
before=,after=\hfill,colframe=blue!75!black,colback=white}
\begin{tcolorbox}
- This box has a height of 1cm.
+ This box has a height of 2cm.
\end{tcolorbox}
\begin{tcolorbox}[add to height=1cm]
- This box has a height of 2cm.
+ This box has a height of 3cm.
\end{tcolorbox}
\end{dispExample}
\end{docTcbKey}
@@ -1731,7 +1731,7 @@ Also see \refKey{/tcb/text fill}.
\begin{marker}
Note that the library \mylib{breakable} has to be loaded to use this key!
\end{marker}
-This height control key is only applicable to unbreakable boxes but it
+This height control key is only applicable to unbreakable boxes, but it
uses code from the library \mylib{breakable}.
The counterpart for breakable boxes is \refKey{/tcb/height fixed for}.
@@ -2076,7 +2076,7 @@ This is a \textbf{tcolorbox}.
\end{docTcbKey}
-\begin{docTcbKey}[][doc updated=2015-11-27]{after upper}{=\meta{code}}{no default, initially unset}
+\begin{docTcbKey}[][doc updated=2016-10-21]{after upper}{=\meta{code}}{no default, initially unset}
The given \meta{code} is placed \emph{after} the content of the upper part.
\begin{dispExample}
\tcbset{after upper={\par\hfill\textit{Read more next week}},
@@ -2086,21 +2086,26 @@ This is a \textbf{tcolorbox}.
This is a \textbf{tcolorbox}.
\end{tcolorbox}
\end{dispExample}
-\end{docTcbKey}
-\begin{docTcbKey}[][doc new=2015-11-27]{after upper*}{=\meta{code}}{no default, initially unset}
- An |\unskip| and the given \meta{code} is placed \emph{after} the content of the upper part.
\begin{dispExample}
-\begin{tcolorbox}[before upper=\flqq,after upper*=\frqq,
+\begin{tcolorbox}[before upper=\flqq,after upper=\frqq,
colback=red!5!white,colframe=red!75!black]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
\end{dispExample}
\begin{marker}
-Prior to version 3.80, \refKey{/tcb/after upper} had the functionality
-of \refKey{/tcb/after upper*}.
+An |\unskip| is placed in front of the given \meta{code}.
+From version 3.80 to 3.94, this |\unskip| was omitted to avoid certain
+problems which (hopefully) should not occur with the new improved code.
\end{marker}
+
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new and updated={2016-10-21}{2016-10-21}]{after upper*}{=\meta{code}}{no default, initially unset}
+ Alias for \refKey{/tcb/after upper}.
+ From version 3.80 to 3.94, it prepended an |\unskip| to the given \meta{code}.
+ Now, this key is considered to be deprecated.
\end{docTcbKey}
@@ -2120,7 +2125,7 @@ This is the lower part.
\end{docTcbKey}
-\begin{docTcbKey}[][doc updated=2015-11-27]{after lower}{=\meta{code}}{no default, initially unset}
+\begin{docTcbKey}[][doc updated=2016-10-21]{after lower}{=\meta{code}}{no default, initially unset}
The given \meta{code} is placed \emph{after} the content of the lower part.
\begin{dispExample}
\begin{tcolorbox}[before lower=$,after lower=$,
@@ -2130,13 +2135,9 @@ This is a \textbf{tcolorbox}.
\sin^2(x)+\cos^2(x)=1.
\end{tcolorbox}
\end{dispExample}
-\end{docTcbKey}
-
-\begin{docTcbKey}[][doc new=2015-11-27]{after lower*}{=\meta{code}}{no default, initially unset}
- An |\unskip| and the given \meta{code} is placed \emph{after} the content of the lower part.
\begin{dispExample}
-\begin{tcolorbox}[after lower*=\ \textit{This is the end.},
+\begin{tcolorbox}[after lower=\ \textit{This is the end.},
colback=red!5!white,colframe=red!75!black]
This is a \textbf{tcolorbox}.
\tcblower
@@ -2145,12 +2146,20 @@ This is the lower part.
\end{dispExample}
\begin{marker}
-Prior to version 3.80, \refKey{/tcb/after lower} had the functionality
-of \refKey{/tcb/after lower*}.
+An |\unskip| is placed in front of the given \meta{code}.
+From version 3.80 to 3.94, this |\unskip| was omitted to avoid certain
+problems which (hopefully) should not occur with the new improved code.
\end{marker}
\end{docTcbKey}
+\begin{docTcbKey}[][doc new and updated={2016-10-21}{2016-10-21}]{after lower*}{=\meta{code}}{no default, initially unset}
+ Alias for \refKey{/tcb/after lower}.
+ From version 3.80 to 3.94, it prepended an |\unskip| to the given \meta{code}.
+ Now, this key is considered to be deprecated.
+\end{docTcbKey}
+
+
\clearpage
\begin{marker}
If \refKey{/tcb/text fill} is used, one cannot have a lower part
@@ -3949,3 +3958,36 @@ This is a \textbf{tcolorbox}.
\end{tcolorbox}
\end{dispExample}
\end{docTcbKey}
+
+
+\clearpage
+\begin{docTcbKey}[][doc new=2016-10-21]{void}{}{no value, initially unset}
+ Annihilates the current |tcolorbox| as far as possible.
+ Basically, this comments out the whole |tcolorbox| by using a key.
+ If the option list of the current |tcolorbox| contains arbitrary code with global
+ impact (like counter settings), these actions are not undone automatically.
+ Nevertheless, the effects of \refKey{/tcb/phantom}, \refKey{/tcb/step},
+ \refKey{/tcb/new/auto counter}, etc., are removed by \refKey{/tcb/void}.
+
+\begin{dispExample}
+A%
+ \begin{tcolorbox}[
+ title=This box is completely removed by the following key,
+ void
+ ]
+ This is a \textbf{tcolorbox}.
+ \end{tcolorbox}
+B
+\end{dispExample}
+
+\begin{marker}
+ This option key cannot be applied for every situation.
+ For example, if several box environments with the same environment name
+ are nested, for the outer environment \refKey{/tcb/void} cannot be used,
+ since the end of the inner environment will be misinterpreted as
+ end of the outer environment.
+\end{marker}
+
+
+
+\end{docTcbKey}
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 505950f2f83..24db4b03d24 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
@@ -673,6 +673,8 @@ instead. Also see \refKey{/tcb/docexample}.
The following keys are provided for language specific settings.
The English language is predefined.
+\refKey{/tcb/reset} does not reset these language settings.\tcbdocmarginnote{\tcbdocupdated{2016-10-21}}
+
\begin{docTcbKey}{english language}{}{style, no value}
Sets all language specific settings to English.
\end{docTcbKey}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index 62f93aa83c8..e864984f19d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
index 4f9238d2115..24317856014 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -23,6 +23,7 @@
% arara: pdflatex: { shell: yes }
% arara: pdflatex: { shell: yes }
% arara: pdflatex: { shell: yes, synctex: yes }
+% arara: pdflatex: { shell: yes, synctex: yes }
%
\documentclass[a4paper,11pt]{ltxdoc}
@@ -42,8 +43,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{3.94}%
-\def\datum{2016/07/14}%
+\def\version{3.95}%
+\def\datum{2016/10/21}%
\makeindex
\hypersetup{
@@ -56,7 +57,7 @@
\usepackage{pgfplots}
%\tcbset{draftmode}
-%\includeonly{tcolorbox.doc.listings}
+%\includeonly{tcolorbox.doc.documentation}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index b5936ffd193..4f49995650a 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\let\tcb@parboxrestore@true=\tcb@parboxrestore
\let\tcb@parboxrestore@false\tcb@parbox@false@settings
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index b514fac092c..2a22308c2bf 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% 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.94}
+\tcb@set@library@version{3.95}
\tcbuselibrary{listings,skins,xparse,external}
@@ -469,8 +469,6 @@
\tcbset{%
reset@documentation/.style={%
index command=\index,%
- index format=pgf,
- english language,
documentation listing style=tcbdocumentation,
index default settings,
color option=Option,
@@ -490,6 +488,8 @@
doc marginnote=,
},
initialize@reset=reset@documentation,
+ index format=pgf,
+ english language,
}
% deprecated
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
index 22938134556..1b8007ef0cb 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% tcbexternal.code.tex: Code for externalization
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.94}
+\tcb@set@library@version{3.95}
\tcbuselibrary{pro@cessing}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index e4196e72458..4e079ccef35 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
@@ -257,8 +257,7 @@
\tcb@set@color{tcbcol@upper}%
\begin{tcb@savebox}{\tcb@upperbox}{##1}%
\kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont%
-% \kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper%
- \kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\kvtcb@after@upper%
+ \kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\ifvmode\else\unskip\fi\kvtcb@after@upper%
\end{tcb@savebox}%
\tcb@reset@color%
\advance\count@ 1\relax%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index 001d3a0f26b..09eebf59d18 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\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 05ae51bc857..4e688db6918 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\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 84a7edc429b..f35d49cc7e8 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% 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.94}
+\tcb@set@library@version{3.95}
\tcbuselibrary{pro@cessing}
@@ -42,7 +42,7 @@
\newenvironment{tcb@lower@outside}[1]{%
\tcbset{savedelimiter=tcb@lower@outside}\tcb@minipage{#1}%
\color{tcbcol@lower}\kvtcb@fontlower\kvtcb@halignlower\kvtcb@before@lower\ignorespaces}%
- {\kvtcb@after@lower\endminipage}
+ {\ifvmode\else\unskip\fi\kvtcb@after@lower\endminipage}
\def\tcb@use@listing@other@reset{%
\tcbset{every box on layer 1/.style={reset,every box}}%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index afc31d98309..7d113e55432 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\RequirePackage{listingsutf8}[2011/11/10]
\tcbuselibrary{listings}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
index dff4369a280..4fb8094aeaf 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 3.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% tcbmagazine.code.tex: Code for box sets and magazine styles
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.94}
+\tcb@set@library@version{3.95}
\tcbuselibrary{breakable}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
index 4d9cfecd05e..49d84486484 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\RequirePackage{minted}[2011/09/17]
@@ -34,7 +34,9 @@
\fi%
\toks@=\expandafter{#1}%
\edef\tcb@temp{\noexpand\inputminted[\the\toks@]}%
- \tcb@temp{#2}{\minted@outputdir#3}%
+ \IfFileExists{\minted@outputdir#3}%
+ {\tcb@temp{#2}{\minted@outputdir#3}}%
+ {\tcb@temp{#2}{#3}}%
}
\def\tcb@minted@uselistinglisting{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex
index c24e493096f..581d1f243e1 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 3.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% tcbprocessing.code.tex: Code for conditional processing
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.94}
+\tcb@set@library@version{3.95}
\RequirePackage{pdftexcmds}
\RequirePackage{shellesc}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
index 4d4c02ca597..517ffdd74d7 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\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 6fa5bef8e62..db327334ec8 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\RequirePackage{tikz}[2010/10/13]
@@ -1711,10 +1711,22 @@
\x{\imagepath}%
\end{tcolorbox}%
\else%
- \begin{tcolorbox}%
- \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth]}%
- \x{\imagepath}%
- \end{tcolorbox}%
+ \ifdefempty\tcb@height@adjust{%
+ \begin{tcolorbox}%
+ \begingroup\edef\x{\endgroup\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth]}%
+ \x{\imagepath}%
+ \end{tcolorbox}%
+ }{% height fill
+ \begin{tcolorbox}[underlay={%
+ \begin{tcbclipinterior}%
+ \begingroup\edef\x{\endgroup\noexpand\tikzset{fill image options={\expandonce\kvtcb@graphics@options}}}\x%
+ \path[fill zoom image={\imagepath}]
+ ([xshift=\kvtcb@boxsep+\kvtcb@leftupper,yshift=\kvtcb@boxsep+\kvtcb@bottom]interior.south west) rectangle
+ ([xshift=-\kvtcb@boxsep-\kvtcb@rightupper,yshift=-\kvtcb@boxsep-\kvtcb@top]interior.north east);
+ \end{tcbclipinterior}%
+ }]%
+ \end{tcolorbox}%
+ }%
\fi%
}%
}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
index 537ad9fe6fd..5a606e2c145 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\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 8203e2dc108..cc03011904f 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/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{3.94}
+\tcb@set@library@version{3.95}
\RequirePackage{amsmath}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex
index 302de99d103..1f812319862 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 3.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% tcbvignette.code.tex: Code for ornamental frames
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{3.94}
+\tcb@set@library@version{3.95}
\tcbuselibrary{skins}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
index f884b978e92..be73677cf7c 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% 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.94}
+\tcb@set@library@version{3.95}
\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 f398fd14b7a..aa7a56d80fb 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.94 (2016/07/14)
+%% The LaTeX package tcolorbox - version 3.95 (2016/10/21)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2016/07/14 version 3.94 text color boxes]
-\def\tcb@version{3.94}
+\ProvidesPackage{tcolorbox}[2016/10/21 version 3.95 text color boxes]
+\def\tcb@version{3.95}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -497,10 +497,10 @@
after title/.store in=\kvtcb@after@title,%
before upper/.store in=\kvtcb@before@upper,%
after upper/.store in=\kvtcb@after@upper,%
- after upper*/.style={after upper={\ifvmode\else\unskip\fi#1}},%
+ after upper*/.style={after upper={#1}},%
before lower/.store in=\kvtcb@before@lower,%
after lower/.store in=\kvtcb@after@lower,%
- after lower*/.style={after lower={\ifvmode\else\unskip\fi#1}},%
+ after lower*/.style={after lower={#1}},%
center title/.style={halign title=flush center},%
center upper/.style={halign upper=flush center},%
center lower/.style={halign lower=flush center},%
@@ -578,6 +578,7 @@
capture/.store in=\kvtcb@capture,%
hbox/.style={capture=hbox},%
minipage/.style={capture=minipage},%
+ void/.style={capture=v@@d,capture/.code=,options@for/.code=,code={\def\tcbinputlisting@core{}}},
check odd page/.is if=tcb@checkpage,
if odd page/.code 2 args={%
\tcbset{check odd page}%
@@ -823,7 +824,7 @@
\let\tcb@after@box=\kvtcb@after@upper%
% switch for lower box
\def\tcblower{%
- \tcb@after@box%
+ \ifvmode\else\unskip\fi\tcb@after@box%
\end{tcb@savebox}%
\tcb@set@color{tcbcol@lower}%
\unless\iftcb@sidebyside%
@@ -871,6 +872,16 @@
\Collect@Body\tcbox@inner@hbox@collected%
}
+\def\tcb@@end@v@@d{%
+ \endcomment%
+ \tcb@layer@dec%
+}
+
+\def\tcb@@capture@v@@d{%
+ \let\endtcolorbox\tcb@@end@v@@d%
+ \comment%
+}
+
\long\def\tcbox@inner@hbox@collected#1{%
\tcbox@inner@hbox{#1}%
\tcb@finalize@environment%
@@ -997,7 +1008,7 @@
\let\tcolorbox\tcb@colorbox
\def\tcb@endboxanddraw{%
- \tcb@after@box%
+ \ifvmode\else\unskip\fi\tcb@after@box%
\end{tcb@savebox}%
\tcb@reset@color%
\tcb@draw@color@box%
@@ -1623,7 +1634,7 @@
\tcb@set@@phantom%
\colorlet{tcbcol@origin}{.}%
\tcb@set@color{tcbcol@upper}%
- \sbox\tcb@upperbox{\tcb@embed@tcbox{\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\kvtcb@after@upper}}%
+ \sbox\tcb@upperbox{\tcb@embed@tcbox{\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\ifvmode\else\unskip\fi\kvtcb@after@upper}}%
\tcb@reset@color%
\tcbdimto\tcb@val@raisebase{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}%
\tcbdimto\kvtcb@width{\wd\tcb@upperbox+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}%
@@ -1641,12 +1652,13 @@
\tcb@set@@dimensions%
\colorlet{tcbcol@origin}{.}%
\tcb@set@color{tcbcol@upper}%
- \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\kvtcb@after@upper\end{tcb@savebox}%
+ \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\ifvmode\else\unskip\fi\kvtcb@after@upper\end{tcb@savebox}%
\tcb@reset@color%
\tcb@hasLowerfalse%
\tcb@draw@color@box%
}
+\long\def\tcbox@inner@v@@d#1{}%
\long\def\tcb@ox#1#2{%
\begingroup%