tcolorbox (17nov14)

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

14 files changed, 533 insertions, 166 deletions

diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index a5d87614def..c68230e2954 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \let\tcb@parboxrestore@true=\tcb@parboxrestore
 \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent}
@@ -155,7 +155,7 @@
   \else%
     \tcb@hasTitletrue%
     \tcbdimto\tcb@w@title{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@lefttitle-\kvtcb@righttitle}%
-    \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@followingtitle\end{tcb@savebox}%
+    \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@followingtitle\end{tcb@savebox}%
     \tcbdimto\tcb@h@title{\ht\tcb@titlebox+\dp\tcb@titlebox}%
     \tcbdimto\tcb@h@padtitle{\kvtcb@title@rule+\kvtcb@boxsep*2+\kvtcb@toptitle+\kvtcb@bottomtitle+\tcb@h@title}%
   \fi%
@@ -245,9 +245,11 @@
   \tcbset{height=\tcb@h@page}%
 }
 
+\def\tcb@use@after@lastbox{\bgroup\tcb@after@lastbox\egroup}
+
 \def\tcb@drawcolorbox@breakable{%
   \tcb@prepare@break@operation%
-  \let\tcb@after@lastbox=\kvtcb@afterbox%
+  \global\let\tcb@after@lastbox=\kvtcb@afterbox%
   \let\kvtcb@afterbox=\@empty%
   \begingroup%
     \parskip\z@%
@@ -256,8 +258,9 @@
     \topskip\z@%
     \tcb@split@start%
   \endgroup%
+  \color{.}% hack for some special cases
   \ifx\kvtcb@float\@empty%
-    \tcb@after@lastbox%
+    \aftergroup\tcb@use@after@lastbox%
   \fi%
 }
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 7b9da97ff49..a527cff86cf 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \tcbuselibrary{listings,skins,xparse}
 
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index 31cbfd9a835..fb8177184b0 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \newdimen\tcbfitdim
 \newdimen\tcb@lowerfitdim
@@ -255,7 +255,7 @@
   %
   \def\tcb@fit@@boxsave##1{%
     \begin{tcb@savebox}{\tcb@upperbox}{##1}%
-      \color{\kvtcb@colupper}%
+      \color{tcbcol@upper}%
       \kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont%
       \kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper%
     \end{tcb@savebox}%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index 98115a07e74..881969b1c3e 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \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 64695f2aede..87c3bf72de3 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \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 ba4ba48df05..e812ba74f20 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,9 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{3.22}
+\tcb@set@library@version{3.30}
+
+\RequirePackage{pdftexcmds}
 
 \def\tcbuselistingtext{\input{\kvtcb@listingfile}}%
 \def\tcbuselistingcomment{\kvtcb@listingcomment}%
@@ -38,21 +40,23 @@
 
 \newenvironment{tcb@lower@outside}[1]{%
   \tcbset{savedelimiter=tcb@lower@outside}\tcb@minipage{#1}%
-  \color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces}%
+  \color{tcbcol@lower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces}%
   {\unskip\kvtcb@after@lower\endminipage}
 
+\def\tcb@use@listing@other@reset{%
+  \tcbset{every box on layer 1/.style={reset,every box}}%
+  \tcb@use@listing@other}
+
 \def\tcb@use@lower@outside#1{%
   \setbox\z@=\hbox{\begin{tcb@lower@outside}{#1}%
-    \stepcounter{tcblayer}%
-    \tcb@use@listing@other%
-    \addtocounter{tcblayer}{-1}%
+    \tcb@use@listing@other@reset%
   \end{tcb@lower@outside}}%
   \tcbdimto{\tcb@temp@wd}{\wd\z@}%
   \unhbox\z@%
 }
 
 \def\tcb@inputlisting@out@otherAboveListing{%
-  \kvtcb@beforebox\noindent%
+  {\kvtcb@beforebox}\noindent%
   \iftcb@lowervisible%
     \tcb@use@lower@outside{\kvtcb@width}%
     \par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent%
@@ -60,14 +64,29 @@
   \begin{tcolorbox}[before=,savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}%
 }
 
+\def\tcb@inputlisting@out@otherAboveListing@Decoupled{%
+  \iftcb@lowervisible%
+    {\par\tcb@use@listing@other@reset\par}%
+  \fi%
+  \begin{tcolorbox}[savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}%
+}
+
 \def\tcb@inputlisting@out@listingAboveOther{%
   \begin{tcolorbox}[after=,savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}%
   \iftcb@lowervisible\par\vskip-\parskip\vspace*{\kvtcb@middle}\noindent%
     \tcb@use@lower@outside{\kvtcb@width}%
   \fi%
-  \kvtcb@afterbox%
+  {\kvtcb@afterbox}%
 }
 
+\def\tcb@inputlisting@out@listingAboveOther@Decoupled{%
+  \begin{tcolorbox}[savedelimiter=tcolorbox]\tcbuselistinglisting\end{tcolorbox}%
+  \iftcb@lowervisible%
+    {\par\tcb@use@listing@other@reset\par}%
+  \fi%
+}
+
+
 \newenvironment{tcb@outside@environment}{%
   \tcb@before@unbroken%
   \begin{minipage}{\tcb@width}}%
@@ -129,6 +148,17 @@
   \begin{tcolorbox}[capture=\tcb@listing@capture,savedelimiter=tcolorbox]\tcb@listing@process\end{tcolorbox}%
 }
 
+\long\def\tcb@run@system@command#1{%
+  \ifcase\pdf@shellescape\relax
+    \tcb@error{You must invoke LaTeX with the -shell-escape flag}{Pass the -shell-escape flag to LaTeX.}%
+  \or\or
+    \tcb@warning{System call with restricted shell escape may fail}%
+  \fi%
+  \filename@parse{\kvtcb@listingfile}\immediate\write18{#1}%
+  \relax%
+}
+
+
 \tcbset{%
   listing file/.store in=\kvtcb@listingfile,%
   comment/.store in=\kvtcb@listingcomment,%
@@ -141,10 +171,13 @@
     \let\tcb@use@listing@other=#2},%
   listing only/.style={listing@process@inside={\tcb@listing@listing}{\tcbuselistingtext}},%
   text only/.style={listing@process@inside={\tcbuselistingtext}{\tcbuselistingtext}},%
+  comment only/.style={listing@process@inside={\tcbuselistingcomment}{\tcbuselistingcomment}},%
   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}},%
+  text above* listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAboveListing@Decoupled}{\tcbuselistingtext}},%
   listing above text/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther}{\tcbuselistingtext}},%
+  listing above* text/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther@Decoupled}{\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},%
@@ -152,28 +185,62 @@
   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}},%
+  comment above* listing/.style={listing@process@outside={\tcb@inputlisting@out@otherAboveListing@Decoupled}{\tcbuselistingcomment}},%
   listing above comment/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther}{\tcbuselistingcomment}},%
+  listing above* comment/.style={listing@process@outside={\tcb@inputlisting@out@listingAboveOther@Decoupled}{\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}}},
+  image comment/.style 2 args={comment={\includegraphics[#1]{#2}}},%
+  comment style/.store in=\kvtcb@commentstyle,%
+  tcbimage comment/.style={comment={\let\tcb@trans@commentstyle\kvtcb@commentstyle\tcbincludegraphics[code={\pgfkeysalsofrom\tcb@trans@commentstyle}]{#1}}},
+  pdf extension/.store in=\kvtcb@pdf@extension,%
+  pdf comment/.style={comment={\let\tcb@trans@commentstyle\kvtcb@commentstyle\filename@parse{#1}\edef\tcb@trans@commentfile{\filename@area\filename@base.\kvtcb@pdf@extension}%
+    \begin{tcbraster}[raster halign=center,sharp corners,size=tight,colback=white,code={\pgfkeysalsofrom\tcb@trans@commentstyle}]\tcbincludepdf{\tcb@trans@commentfile}\end{tcbraster}}},
+  pdf comment/.default={\kvtcb@listingfile},
+  process code/.code={\appto\tcb@listing@process@hook{#1}},%
+  no process/.code={\def\tcb@listing@process@hook{}},%
+  compilable listing/.style={listing file={\jobname-listing-\thetcblistingcount}},
+  run system command/.style={process code={\tcb@run@system@command{#1}}},%
+  run@system@command/.style 2 args={run system command={#1\space#2\space\filename@area\filename@base}},%
+  run pdflatex/.style={run@system@command={pdflatex}{#1}},%
+  run xelatex/.style={run@system@command={xelatex}{#1}},%
+  run lualatex/.style={run@system@command={lualatex}{#1}},%
+  run makeindex/.style={run@system@command={makeindex}{#1}},%
+  run bibtex/.style={run@system@command={bibtex}{#1}},%
+  run biber/.style={run@system@command={biber}{#1}},%
+  run arara/.style={run@system@command={arara}{#1}},%
+  run latex/.style={run@system@command={latex}{#1}},%
+  run dvips/.style={run@system@command={dvips}{#1}},%
+  run ps2pdf/.style={run system command={ps2pdf\space#1\space\filename@area\filename@base.ps}},%
+}
+
+\def\tcbinputlisting@core{%
+  \tcb@listing@process@hook%
+  \let\tcb@listing@capture=\kvtcb@capture%
+  \tcb@inputlisting%
 }
 
+\newcounter{tcblisting}
+
 \newenvironment{tcblisting}[1]{%
-  \def\tcblisting@box{\tcbinputlisting{#1}}%
+  \stepcounter{tcblisting}\edef\thetcblistingcount{\thetcblisting}%
+  \tcb@layer@pushup%
+  \tcb@apply@box@options{capture=minipage,#1}%
   \begingroup\tcbverbatimwrite{\kvtcb@listingfile}%
 }{\endtcbverbatimwrite\endgroup%
-  \tcblisting@box%
+  \tcbinputlisting@core%
 }
 
 \long\def\tcbinputlisting#1{%
   \begingroup%
+  \stepcounter{tcblisting}\edef\thetcblistingcount{\thetcblisting}%
   \tcb@layer@pushup%
-  \tcbset{capture=minipage,#1}\tcb@afteroptions@hook%
-  \let\tcb@listing@capture=\kvtcb@capture%
-  \tcb@inputlisting\endgroup%
+  \tcb@apply@box@options{capture=minipage,#1}%
+  \tcbinputlisting@core%
+  \endgroup%
 }
 
 \newenvironment{tcboutputlisting}{%
@@ -227,8 +294,8 @@
 \tcbset{%
   reset@listingscore/.style={%
     listing file=\jobname.listing,
-    comment=,
-    listing and text,
+    comment=, listing and text,
+    no process,comment style=,pdf extension=pdf,
   },
   initialize@reset=reset@listingscore,
 }
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index 4c84604223b..53ef49b102b 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \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 f9c57560fc6..0775f4ce12d 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \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
new file mode 100644
index 00000000000..c38fe7eb326
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
@@ -0,0 +1,184 @@
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
+%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `author-maintained'.
+%%
+%% This work consists of all files listed in README
+%%
+\tcb@set@library@version{3.30}
+
+\newcounter{tcbrastercolumn}
+\newcounter{tcbrasterrow}
+\newcounter{tcbraster}
+
+\newrobustcmd{\thetcbrasternum}{\the\numexpr(\c@tcbrasterrow-1)*\kvtcb@raster@columns+\c@tcbrastercolumn\relax}
+
+\def\tcb@raster@ehg@all{%
+  \tcbset{equal height group={\kvtcb@raster@ehgid}}%
+}
+
+\def\tcb@raster@ehg@row{%
+  \tcbset{equal height group={\kvtcb@raster@ehgid @\number\c@tcbrasterrow}}%
+}
+
+
+\tcbset{%
+  raster columns/.store in=\kvtcb@raster@columns,
+  raster rows/.store in=\kvtcb@raster@rows,
+  raster width/.store in=\kvtcb@raster@width,
+  raster height/.store in=\kvtcb@raster@height,
+  %
+  raster before skip/.store in=\kvtcb@raster@skip@before,
+  raster after skip/.store in=\kvtcb@raster@skip@after,
+  raster left skip/.store in=\kvtcb@raster@skip@left,
+  raster right skip/.store in=\kvtcb@raster@skip@right,
+  %
+  raster column skip/.store in=\kvtcb@raster@xskip,
+  raster row skip/.store in=\kvtcb@raster@yskip,
+  %
+  raster@halign/.store in=\kvtcb@raster@halign,
+  raster halign/.is choice,
+  raster halign/center/.style={raster@halign=\centering},
+  raster halign/left/.style={raster@halign=\raggedright},
+  raster halign/right/.style={raster@halign=\raggedleft},
+  %
+  raster valign/.store in=\kvtcb@raster@valign,
+  %
+  raster equal height group/.store in=\kvtcb@raster@ehgid,%
+  raster equal height/.is choice,
+  raster equal height/.default=all,
+  raster equal height/none/.code={\let\tcb@raster@ehg@start\@empty%
+    \let\tcb@raster@ehg@continue\@empty},%
+  raster equal height/rows/.code={\let\tcb@raster@ehg@start\tcb@raster@ehg@row%
+    \let\tcb@raster@ehg@continue\tcb@raster@ehg@row},%
+  raster equal height/all/.code={\let\tcb@raster@ehg@start\tcb@raster@ehg@all%
+    \let\tcb@raster@ehg@continue\@empty},%
+  %
+  raster force size/.is choice,%
+  raster force size/.default=true,%
+  raster force size/true/.code={\let\tcb@raster@set@size\tcbset@late@options},%
+  raster force size/false/.code={\let\tcb@raster@set@size\tcbset},%
+}
+
+\tcbset{
+  raster reset/.style={
+    raster width=\linewidth,raster height=0pt,
+    raster before skip=2mm, raster after skip=2mm,
+    raster columns=2,raster rows=2,
+    raster column skip=2mm,raster row skip=2mm,
+    raster left skip=0pt,raster right skip=0pt,
+    raster halign=left,raster valign=center,
+    raster equal height=none,
+    raster equal height group={REG@\tcb@raster@number},
+    raster force size,},
+  raster reset
+}
+
+\setcounter{tcbraster}{0}
+
+\let\tcb@raster@change@minipage\@empty
+\let\tcb@raster@change@fitbox\@empty
+\def\tcb@raster@change@hbox{\tcbset{capture=minipage}}
+
+\newenvironment{tcbraster}[1][]{%
+  \tcb@layer@pushup%
+  \stepcounter{tcbraster}%
+  \edef\tcb@raster@number{\number\c@tcbraster}%
+  \edef\tcb@raster@save@column{\number\c@tcbrastercolumn}%
+  \edef\tcb@raster@save@row{\number\c@tcbrasterrow}%
+  \let\tcb@raster@change@fitbox\@empty%
+  \setcounter{tcbrastercolumn}{1}%
+  \setcounter{tcbrasterrow}{1}%
+  \tcbset{every box on layer \the\numexpr\number\c@tcblayer+1\relax/.code={%
+    \ifodd\c@tcbrastercolumn\relax%
+      \tcbset{raster odd column/.try}%
+    \else%
+      \tcbset{raster even column/.try}%
+    \fi%
+    \tcbset{raster column \number\c@tcbrastercolumn/.try}%
+    \ifodd\c@tcbrasterrow\relax%
+      \tcbset{raster odd row/.try}%
+    \else%
+      \tcbset{raster even row/.try}%
+    \fi%
+    \tcbset{raster row \number\c@tcbrasterrow/.try}%
+    \ifodd\thetcbrasternum\relax%
+      \tcbset{raster odd number/.try}%
+    \else%
+      \tcbset{raster even number/.try}%
+    \fi%
+    \tcbset{raster row \number\c@tcbrasterrow\space column \number\c@tcbrastercolumn/.try}%
+    \tcbset{raster number \thetcbrasternum/.try}%
+  }}%
+  \tcbset{#1}%
+  \tcbset@late@options{%
+    before={\unskip\ifnum\c@tcbrastercolumn>1 \kern\kvtcb@raster@xskip\else\kern\kvtcb@raster@skip@left\fi},
+    after={%
+      \ifnum\c@tcbrastercolumn=\kvtcb@raster@columns\relax%
+        \kern\kvtcb@raster@skip@right%
+        \parindent\z@\parskip\z@\par\nointerlineskip%
+        \addvspace{\the\dimexpr\kvtcb@raster@yskip\relax}%
+        \noindent%
+        \setcounter{tcbrastercolumn}{1}\addtocounter{tcbrasterrow}{1}%
+        \aftergroup\tcb@raster@ehg@continue%
+      \else%
+        \stepcounter{tcbrastercolumn}%
+      \fi},%
+    box align=\kvtcb@raster@valign,%
+  }%
+  \tcbdimto\tcb@raster@box@width{(\kvtcb@raster@width+\kvtcb@raster@xskip-\kvtcb@raster@skip@left-\kvtcb@raster@skip@right)/\kvtcb@raster@columns-\kvtcb@raster@xskip}%
+  \tcb@raster@set@size{%
+    code={\csuse{tcb@raster@change@\kvtcb@capture}},
+    width=\tcb@raster@box@width,
+  }%
+  \ifdim\dimexpr\kvtcb@raster@height>0pt\relax%
+    \tcbdimto\tcb@raster@box@height{(\kvtcb@raster@height+\kvtcb@raster@yskip-0.001pt)/\kvtcb@raster@rows-\kvtcb@raster@yskip}%
+    \tcb@raster@set@size{height=\tcb@raster@box@height}%
+  \fi%
+  \tcb@raster@ehg@start%
+  {\par\nointerlineskip%
+  \addvspace{\the\dimexpr\kvtcb@raster@skip@before-\parskip\relax}}%
+  \kvtcb@raster@halign\noindent%
+}{%
+  \unskip%
+  \ifnum\c@tcbrastercolumn>1 %
+    \kern\kvtcb@raster@skip@right%
+  \fi%
+  \begingroup%
+  \par\nointerlineskip%
+  \ifnum\c@tcbrastercolumn=1 %
+    \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\kvtcb@raster@yskip-\parskip\relax}%
+  \else%
+   \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\parskip\relax}%
+  \fi%
+  \endgroup%
+  \setcounter{tcbrastercolumn}{\tcb@raster@save@column}%
+  \setcounter{tcbrasterrow}{\tcb@raster@save@row}%
+}
+
+\newcommand{\tcbitem@following}[1][]{%
+  \end{tcolorbox}\begin{tcolorbox}[#1]%
+}
+
+\newcommand{\tcbitem@first}[1][]{%
+  \let\tcbitem=\tcbitem@following%
+  \begin{tcolorbox}[#1]%
+}
+
+\newenvironment{tcbitemize}[1][]{%
+  \begin{tcbraster}[#1]%
+  \let\tcb@raster@change@fitbox=\tcb@raster@change@hbox%
+  \let\tcbitem=\tcbitem@first%
+}{\end{tcolorbox}\end{tcbraster}}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index 4bf2713601f..1c895583237 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \RequirePackage{tikz}[2010/10/13]
 
@@ -109,9 +109,9 @@
 }
 
 \tikzset{%
-  tcb fill frame/.style={fill=\kvtcb@colframe,fill opacity=\kvtcb@opacityframe,tcb@spec,frame@style},%
-  tcb fill interior/.style={fill=\kvtcb@colback,fill opacity=\kvtcb@opacityback,tcb@spec,interior@style},%
-  tcb fill title/.style={fill=\kvtcb@colbacktitle,fill opacity=\kvtcb@opacitybacktitle,tcb@spec,title@style},%
+  tcb fill frame/.style={fill=tcbcol@frame,fill opacity=\kvtcb@opacityframe,tcb@spec,frame@style},%
+  tcb fill interior/.style={fill=tcbcol@back,fill opacity=\kvtcb@opacityback,tcb@spec,interior@style},%
+  tcb fill title/.style={fill=tcbcol@backtitle,fill opacity=\kvtcb@opacitybacktitle,tcb@spec,title@style},%
 }
 
 % fill frame
@@ -166,10 +166,10 @@
 % draw segmentation line
 \def\tcb@drawlower@path{%
   \iftcb@sidebyside%
-    \path[draw=\kvtcb@colframe,fill opacity=\kvtcb@opacityframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
+    \path[draw=tcbcol@frame,fill opacity=\kvtcb@opacityframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
     (segmentation.north)--(segmentation.south);%
   \else%
-    \path[draw=\kvtcb@colframe,fill opacity=\kvtcb@opacityframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
+    \path[draw=tcbcol@frame,fill opacity=\kvtcb@opacityframe,dash pattern=on 1mm off 1mm,dash phase=0.5mm,tcb@spec,segmentation@style]
     (segmentation.west)--(segmentation.east);%
   \fi%
 }
@@ -256,7 +256,7 @@
 }
 
 \def\tcb@drawspec@T{%
-  \tcb@pathbase{top color=\kvtcb@colframe,bottom color=\kvtcb@colback,fill opacity=\kvtcb@opacitybacktitle}{[yshift=-0.01pt]interior.north west}{[yshift=0.01pt]title.south east}%
+  \tcb@pathbase{top color=tcbcol@frame,bottom color=tcbcol@back,fill opacity=\kvtcb@opacitybacktitle}{[yshift=-0.01pt]interior.north west}{[yshift=0.01pt]title.south east}%
   {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}%
 }
 
@@ -270,7 +270,7 @@
 \def\tcb@drawframe@spartan{%
   \begin{pgfscope}%
   \pgfpathrectangle{\pgfpointorigin}{\pgfqpoint{\tcb@width}{\tcb@height}}%
-  \pgfsetfillcolor{\kvtcb@colframe}%
+  \pgfsetfillcolor{tcbcol@frame}%
   \pgfsetfillopacity{\kvtcb@opacityframe}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -280,7 +280,7 @@
   \begin{pgfscope}%
   \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
    {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight\relax}}%
-  \pgfsetfillcolor{\kvtcb@colback}%
+  \pgfsetfillcolor{tcbcol@back}%
   \pgfsetfillopacity{\kvtcb@opacityback}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -290,7 +290,7 @@
   \begin{pgfscope}%
   \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\kvtcb@bottom@rule}}%
    {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\tcb@height-\kvtcb@top@rule\relax}}%
-  \pgfsetfillcolor{\kvtcb@colback}%
+  \pgfsetfillcolor{tcbcol@back}%
   \pgfsetfillopacity{\kvtcb@opacityback}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -300,7 +300,7 @@
   \begin{pgfscope}%
   \pgfpathrectanglecorners{\pgfqpoint{\kvtcb@left@rule}{\the\dimexpr\kvtcb@bottom@rule+\tcb@innerheight+\kvtcb@title@rule\relax}}%
    {\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\the\dimexpr\tcb@height-\kvtcb@top@rule\relax}}%
-  \pgfsetfillcolor{\kvtcb@colbacktitle}%
+  \pgfsetfillcolor{tcbcol@backtitle}%
   \pgfsetfillopacity{\kvtcb@opacitybacktitle}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -317,7 +317,7 @@
   \pgfpathmoveto{\pgfqpoint{\kvtcb@left@rule}{\tcb@seg@pos}}%
   \pgfpathlineto{\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}%
   \fi%
-  \pgfsetcolor{\kvtcb@colframe}%
+  \pgfsetcolor{tcbcol@frame}%
   \pgfsetstrokeopacity{\kvtcb@opacityframe}%
   \pgfusepath{stroke}%
   \end{pgfscope}%
@@ -371,7 +371,7 @@
   @title style/.code={\tikzset{title@style/.style={#1}}},%
   title style/.style={title filled,@title style={#1}},
   title hidden/.style={title style={draw=none,fill=none}},
-  colbacklower/.store in=\kvtcb@colbacklower,%
+  colbacklower/.colorlet=tcbcol@backlower,%
   clear@spec/.code={\tcb@spec{}},%
   tikz/.code={\appto\tcb@tikz@option@hook{,#1}},%
   tikz reset/.code={\let\tcb@tikz@option@hook\@empty},%
@@ -504,30 +504,30 @@
   interior titled code={%
     \iftcb@lowerseparated%
       \ifcase\tcb@segment@state%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@path}%
       \or%
-      \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT%
+      \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT%
       \else%
-      {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@path}%
+      {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@path}%
       \fi%
     \else%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@path}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@path}%
     \fi\tcb@spec{}},
   interior code={%
     \iftcb@lowerseparated%
       \ifcase\tcb@segment@state%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@path}%
       \or%
-      \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UR%
+      \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UR%
       \else%
-      {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@path}%
+      {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@path}%
       \fi%
     \else%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@path}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@path}%
     \fi\tcb@spec{}},
   segmentation code={\iftcb@sidebyside%
-    \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else%
-    \tcb@drawspec@sbs@A{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LR{fill=\kvtcb@colbacklower}\fi\tcb@spec{}},%
+    \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=tcbcol@backlower}\else%
+    \tcb@drawspec@sbs@A{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LR{fill=tcbcol@backlower}\fi\tcb@spec{}},%
   skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolorlast}
 
 \tcbset{bicolor/.style={skin=bicolor}}
@@ -537,30 +537,30 @@
   interior titled code={%
     \iftcb@lowerseparated%
       \ifcase\tcb@segment@state%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathfirst}%
       \or%
-      \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT%
+      \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT%
       \else%
-      {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathfirst}%
+      {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathfirst}%
       \fi%
     \else%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathfirst}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathfirst}%
     \fi\tcb@spec{}},
   interior code={%
     \iftcb@lowerseparated%
       \ifcase\tcb@segment@state%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathfirst}%
       \or%
-      \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UR%
+      \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UR%
       \else%
-      {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathfirst}%
+      {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathfirst}%
       \fi%
     \else%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathfirst}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathfirst}%
     \fi\tcb@spec{}},
   segmentation code={\iftcb@sidebyside%
-    \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else%
-    \tcb@drawspec@sbs@C{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LS{fill=\kvtcb@colbacklower}\fi\tcb@spec{}},%
+    \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=tcbcol@backlower}\else%
+    \tcb@drawspec@sbs@C{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LS{fill=tcbcol@backlower}\fi\tcb@spec{}},%
   skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolormiddle}
 
 \tcb@new@skin{bicolormiddle}{base@middle,%
@@ -568,30 +568,30 @@
   interior titled code={%
     \iftcb@lowerseparated%
       \ifcase\tcb@segment@state%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathmiddle}%
       \or%
-      \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT%
+      \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT%
       \else%
-      {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathmiddle}%
+      {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathmiddle}%
       \fi%
     \else%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathmiddle}%
     \fi\tcb@spec{}},%
   interior code={%
     \iftcb@lowerseparated%
       \ifcase\tcb@segment@state%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathmiddle}%
       \or%
-      \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@US%
+      \tcb@spec{fill=tcbcol@back}\tcb@drawspec@US%
       \else%
-      {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathmiddle}%
+      {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathmiddle}%
       \fi%
     \else%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathmiddle}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathmiddle}%
     \fi\tcb@spec{}},
   segmentation code={\iftcb@sidebyside%
-    \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else%
-    \tcb@drawspec@sbs@E{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LS{fill=\kvtcb@colbacklower}\fi\tcb@spec{}},%
+    \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=tcbcol@backlower}\else%
+    \tcb@drawspec@sbs@E{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LS{fill=tcbcol@backlower}\fi\tcb@spec{}},%
   skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolormiddle}
 
 \tcb@new@skin{bicolorlast}{base@last,%
@@ -599,34 +599,34 @@
   interior titled code={%
     \iftcb@lowerseparated%
       \ifcase\tcb@segment@state
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathlast}%
       \or%
-      \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@UT%
+      \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT%
       \else%
-      {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithtitle@pathlast}%
+      {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathlast}%
       \fi%
     \else%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathlast}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathlast}%
     \fi\tcb@spec{}},
   interior code={%
     \iftcb@lowerseparated%
       \ifcase\tcb@segment@state%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathlast}%
       \or%
-      \tcb@spec{fill=\kvtcb@colback}\tcb@drawspec@US%
+      \tcb@spec{fill=tcbcol@back}\tcb@drawspec@US%
       \else
-      {\tcb@spec{fill=\kvtcb@colbacklower}\tcb@drawwithouttitle@pathlast}%
+      {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathlast}%
       \fi%
     \else%
-      {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}%
+      {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathlast}%
     \fi\tcb@spec{}},%
   segmentation code={\iftcb@sidebyside%
-    \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else%
-    \tcb@drawspec@sbs@F{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LR{fill=\kvtcb@colbacklower}\fi\tcb@spec{}},%
+    \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=tcbcol@backlower}\else%
+    \tcb@drawspec@sbs@F{fill=tcbcol@backlower}\fi\else\tcb@drawspec@LR{fill=tcbcol@backlower}\fi\tcb@spec{}},%
   skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast}
 
 
-\tikzset{beamer@color/.style={top color=\kvtcb@colback,bottom color=\kvtcb@colback!85!black}}
+\tikzset{beamer@color/.style={top color=tcbcol@back,bottom color=tcbcol@back!85!black}}
 
 \tcb@new@skin{beamer}{base@unbroken,%
   frame engine=path,interior titled engine=empty,interior engine=empty,segmentation engine=empty,title engine=path,%
@@ -738,12 +738,12 @@
   \iftcb@sidebyside%
   \tcb@drawlower@path%
   \else%
-  \path[left color=\kvtcb@colframe!75!white,right color=\kvtcb@colframe!75!white!25!\kvtcb@colback,segmentation@style]
+  \path[left color=tcbcol@frame!75!white,right color=tcbcol@frame!75!white!25!tcbcol@back,segmentation@style]
     ([yshift={-\kvtcb@middle/4}]segmentation.west) rectangle ([yshift={\kvtcb@middle/4}]segmentation.east);
   \fi%
 }
 
-\tikzset{widget@color/.style={left color=\kvtcb@colframe!75!white,right color=\kvtcb@colframe!75!white!25!\kvtcb@colback}}
+\tikzset{widget@color/.style={left color=tcbcol@frame!75!white,right color=tcbcol@frame!75!white!25!tcbcol@back}}
 
 \tcb@new@skin{widget}{base@unbroken,%
   frame engine=path,interior titled engine=path,interior engine=path,segmentation engine=empty,title engine=empty,%
@@ -994,11 +994,11 @@
     detach title,
     code={\def\tcb@specialtitle@hook{%
       \ifx\tcbtitletext\@empty\else%
-      \let\tcb@trans@colframe\kvtcb@colframe%
-      \let\tcb@trans@colback\kvtcb@colbacktitle%
+      \colorlet{tcbtranscol@frame}{tcbcol@frame}%
+      \colorlet{tcbtranscol@back}{tcbcol@backtitle}%
       \let\tcb@trans@boxedstyle\kvtcb@style@boxedtitle%
-      \setbox\tcb@titlebox\color@hbox\bgroup\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox%
-      \setbox\tcb@titlebox\color@hbox\tcbox[colframe=\tcb@trans@colframe,colback=\tcb@trans@colback,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox%
+      \setbox\tcb@titlebox\color@hbox\bgroup\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox%
+      \setbox\tcb@titlebox\color@hbox\tcbox[colframe=tcbtranscol@frame,colback=tcbtranscol@back,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox%
       %
       \tcbdimto\tcboxedtitleheight{\ht\tcb@titlebox+\dp\tcb@titlebox}%
       \tcbdimto\tcboxedtitlewidth{\wd\tcb@titlebox}%
@@ -1270,8 +1270,8 @@
   enlarge top by=0mm,
   enlarge bottom by=0mm,
   width=\the\dimexpr\linewidth+1.6cm\relax,
-  frame style={top color=\kvtcb@colframe,bottom color=\kvtcb@colframe,middle color=yellow!75!\kvtcb@colframe},
-  title style={left color=\kvtcb@colframe,right color=\kvtcb@colframe,middle color=yellow!75!\kvtcb@colframe},
+  frame style={top color=tcbcol@frame,bottom color=tcbcol@frame,middle color=yellow!75!tcbcol@frame},
+  title style={left color=tcbcol@frame,right color=tcbcol@frame,middle color=yellow!75!tcbcol@frame},
   watermark tikz={\draw[line width=2mm] circle (1cm) node{\fontfamily{ptm}\fontseries{b}\fontsize{20mm}{20mm}\selectfont!};},
   watermark zoom=0.75,
 }}
@@ -1608,17 +1608,104 @@
   draftmode/false/.code=\tcbstopdraftmode,%
 }
 
+
+\def\tcb@include@graphics{%
+  \ifdefstring{\kvtcb@capture}{hbox}{%
+    \tcbox{%
+      \edef\tcb@temp{\noexpand\includegraphics[\expandonce\kvtcb@graphics@options]}%
+      \tcb@temp{\imagepath}%
+    }%
+  }{%
+    \iftcb@fixedheight%
+      \begin{tcolorbox}[underlay={%
+        \begin{tcbclipinterior}%
+        \edef\tcb@temp{\noexpand\tikzset{fill image options={\expandonce\kvtcb@graphics@options}}}%
+        \tcb@temp%
+        \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}%
+    \else%
+      \begin{tcolorbox}%
+        \edef\tcb@temp{\noexpand\includegraphics[\expandonce\kvtcb@graphics@options,width=\linewidth]}%
+        \tcb@temp{\imagepath}%
+      \end{tcolorbox}%
+    \fi%
+  }%
+}
+
+\def\tcb@include@graphics@preparefile#1{%
+  \def\imagename{\detokenize{#1}}%
+  \ifx\kvtcb@graphics@directory\@empty%
+    \edef\imagepath{#1}%
+  \else%
+    \edef\imagepath{\expandonce\kvtcb@graphics@directory/\noexpand#1}%
+  \fi%
+}
+
+\newcommand{\tcbincludegraphics}[2][]{%
+  \begingroup%
+  \tcb@layer@pushup%
+  \tcb@apply@box@options{enhanced,clip upper=true,valign=center,center upper,#1}%
+  \tcb@include@graphics@preparefile{#2}%
+  \edef\imagepage{1}%
+  \tcb@include@graphics%
+  \endgroup%
+}
+
+\def\tcb@set@pdfpages#1#2{%
+  \IfFileExists{#2}{%
+    \ifdef{\pdfximage}{%
+      \pdfximage{#2}%
+      \edef#1{\the\pdflastximagepages}%
+    }{%
+      \ifdef{\XeTeXpdfpagecount}{%
+        \edef#1{\the\XeTeXpdfpagecount #2 }%
+        \ifnum#1=0 %
+          \edef#1{1}%
+        \fi%
+      }{\tcb@error{For PDF support run pdflatex, xelatex, or lualatex}{%
+        Your compiler seems not to support PDF include files.}}%
+    }%
+  }{\tcb@error{PDF file `#2' not found}{The PDF file `#2' was not found}}%
+  \relax%
+}
+
+\newcommand{\tcbincludepdf}[2][]{%
+  \begingroup%
+  \tcb@layer@pushup%
+  \tcb@apply@box@options{enhanced,clip upper=true,valign=center,center upper,#1}%
+  \appto\kvtcb@graphics@options{,page=\imagepage}%
+  \tcb@include@graphics@preparefile{#2}%
+  \tcb@set@pdfpages\pdfpages{\imagepath}%
+  \foreach \imagepage in \kvtcb@graphics@pages%
+  {%
+    \tcb@include@graphics%
+  }%
+  \endgroup%
+}
+
+\tcbset{%
+  graphics options/.store in=\kvtcb@graphics@options,
+  graphics pages/.store in=\kvtcb@graphics@pages,
+  graphics directory/.store in=\kvtcb@graphics@directory,
+}
+
+
 \tcbset{%
   reset@skins/.style={%
     frame style=,interior style=,segmentation style=,@title style=,%
     colbacklower=black!15!white,%
     extend freelance=,extend freelancefirst=,extend freelancemiddle=,extend freelancelast=,%
     clear@spec,%
-    watermark opacity=1.00,watermark color=\kvtcb@colback!85!\kvtcb@colframe,%
+    watermark opacity=1.00,watermark color=tcbcol@back!85!tcbcol@frame,%
     watermark zoom=0.75,clip watermark,%
     clip title=false,clip upper=false,clip lower=false,%
     no borderline,no shadow,no underlay,no finish,tikz reset,at begin tikz reset,at end tikz reset,%
-    boxed title style=,hbox boxed title,code={\let\tcb@specialgeonodes@hook\relax}%
+    boxed title style=,hbox boxed title,code={\let\tcb@specialgeonodes@hook\relax},%
+    graphics options=,graphics pages={1,...,\pdfpages},graphics directory=,%
   },
   initialize@reset=reset@skins,
 }
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
index 72dbb7d3025..fda058f95e9 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \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 67f702a00c6..d8f14fa29c8 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \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 1b3a69f76a3..520dc58bd58 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% 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.22}
+\tcb@set@library@version{3.30}
 
 \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 93dd89e095a..f6cbdad0d8d 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.22 (2014/10/31)
+%% The LaTeX package tcolorbox - version 3.30 (2014/11/17)
 %% tcolorbox.sty: Text color boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2014/10/31 version 3.22 text color boxes]
-\def\tcb@version{3.22}
+\ProvidesPackage{tcolorbox}[2014/11/17 version 3.30 text color boxes]
+\def\tcb@version{3.30}
 
 \RequirePackage{pgf}[2008/01/15]
 \RequirePackage{verbatim}[2003/08/22]
@@ -36,6 +36,7 @@
 \newif\iftcb@hasPhantom
 \newif\iftcb@lowerseparated
 \newif\iftcb@titlefilled
+\newif\iftcb@fixedheight
 
 \newbox\tcb@titlebox
 \newbox\tcb@upperbox
@@ -52,6 +53,7 @@
 \pgfkeys{/tcb/.is family}
 
 \def\tcbset{\pgfqkeys{/tcb}}
+\long\def\tcbset@late@options#1{\appto\tcb@lateoptions@hook{\tcbset{#1}}}
 
 \def\tcb@dim@to#1#2{\def#1{\the\dimexpr#2\relax}}
 \def\tcbdimto#1#2{\edef#1{\the\dimexpr#2\relax}}
@@ -114,9 +116,10 @@
 \newcommand{\tcbsubskin}[3]{\tcb@new@skin{#1}{skin@#2,#3}}
 
 \pgfkeys{/handlers/.dimstore in/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\def#1{\the\dimexpr##1\relax}}}
+\pgfkeys{/handlers/.colorlet/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\colorlet{#1}{##1}}}
 
 \newcommand\tcbtitle{\ifx\tcbtitletext\@empty\else%
-  {\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi}
+  {\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi}
 
 \def\tcb@detach@title@code@{%
   \let\tcbtitletext\kvtcb@title%
@@ -148,6 +151,7 @@
   subtitle style/.store in=\kvtcb@subtitle@style,%
   width/.dimstore in=\kvtcb@width,
   text width/.style={width={#1+\kvtcb@left@rule+\kvtcb@right@rule+\kvtcb@boxsep*2+\kvtcb@leftupper+\kvtcb@rightupper}},%
+  add to width/.code={\tcbdimto\kvtcb@width{\kvtcb@width+(#1)}},%
   boxsep/.store in=\kvtcb@boxsep,
   toprule/.code={%
     \def\kvtcb@top@rule@stand{#1}%
@@ -186,12 +190,12 @@
   bottom/.store in=\kvtcb@bottom,
   bottomtitle/.store in=\kvtcb@bottomtitle,
   middle/.store in=\kvtcb@middle,
-  colback/.store in=\kvtcb@colback,
-  colframe/.store in=\kvtcb@colframe,
-  colupper/.store in=\kvtcb@colupper,
-  collower/.store in=\kvtcb@collower,
+  colback/.colorlet=tcbcol@back,
+  colframe/.colorlet=tcbcol@frame,
+  colupper/.colorlet=tcbcol@upper,
+  collower/.colorlet=tcbcol@lower,
   coltext/.style={colupper=#1,collower=#1},
-  coltitle/.store in=\kvtcb@coltitle,
+  coltitle/.colorlet=tcbcol@title,
   fonttitle/.store in=\kvtcb@fonttitle,
   fontupper/.store in=\kvtcb@fontupper,
   fontlower/.store in=\kvtcb@fontlower,
@@ -211,22 +215,24 @@
   parskip/.style={before={\par\pagebreak[0]\parindent=0pt},after={\par}},
   noparskip/.style={before={\par\smallskip\pagebreak[0]\parindent=0pt},after={\par\smallskip}},
   nobeforeafter/.style={before=,after=},
-  before skip/.style={before={\begingroup%
-    \parindent\z@\parskip\z@\par\nointerlineskip%
-    \addvspace{#1}\noindent%
-  \endgroup}},
-  after skip/.style={after={\begingroup%
-    \parindent\z@\parskip\z@\par\nointerlineskip%
-    \addvspace{#1}%
-  \endgroup}},
+  before skip/.style={before={%
+    \par\nointerlineskip\lineskip=0pt%
+    \addvspace{\the\dimexpr#1-\parskip\relax}%
+    \noindent%
+    }},
+  after skip/.style={after={%
+    \par\nointerlineskip%
+    \addvspace{\the\dimexpr#1-\parskip\relax}%
+    }},
   beforeafter skip/.style={before skip={#1},after skip={#1}},
   lowerbox/.is choice,
   lowerbox/visible/.code={\tcb@lowerignoredfalse\tcb@lowervisibletrue},
   lowerbox/invisible/.code={\tcb@lowerignoredfalse\tcb@lowervisiblefalse},
   lowerbox/ignored/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse},
-  natural height/.code={\let\tcb@ch=\tcb@ch@natural},
-  height/.code={\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed},
-  text height/.code={\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed},
+  natural height/.code={\tcb@fixedheightfalse\let\tcb@ch=\tcb@ch@natural},
+  height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed},
+  text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed},
+  add to height/.code={\ifdefined\kvtcb@height@fixed\tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+(#1)}\fi},
   height plus/.dimstore in=\kvtcb@height@fixed@plus,%
   height from/.style args={#1 to #2}{height={#1},height plus={#2-#1}},%
   height fill/.is choice,%
@@ -255,6 +261,9 @@
   grow to right by/.code={%
     \tcbdimto\kvtcb@width{\kvtcb@width+#1}%
     \pgfkeysalso{enlarge right by={-\the\dimexpr#1\relax}}},%
+  left skip/.style={grow to left by={-#1}},
+  right skip/.style={grow to right by={-#1}},
+  leftright skip/.style={left skip={#1},right skip={#1}},
   toggle enlargement/.is choice,
   toggle enlargement/none/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@none},
   toggle enlargement/evenpage/.code={\let\tcb@setbb@toggle=\tcb@setbb@toggle@evenpage},
@@ -365,7 +374,7 @@
   tabularx*/.style 2 args={%
     boxsep=0pt,top=0pt,bottom=0pt,leftupper=0pt,rightupper=0pt,
     toptitle=1mm,bottomtitle=1mm,boxrule=0.5mm,
-    before upper={\arrayrulecolor{\kvtcb@colframe}\def\arraystretch{1.1}#1%
+    before upper={\arrayrulecolor{tcbcol@frame}\def\arraystretch{1.1}#1%
       \tcb@hack@currenvir\tabularx{\linewidth}{#2}},
     after upper=\endtabularx\arrayrulecolor{black}},
   tabularx/.style={tabularx*={}{#1}},
@@ -385,6 +394,11 @@
   baseline/.store in=\kvtcb@baseline,%
   tcbox raise/.style={baseline=-#1},%
   tcbox raise base/.style={baseline=\tcb@val@raisebase},%
+  box align/.is choice,%
+  box align/bottom/.style={baseline=0pt},%
+  box align/top/.style={baseline=\tcb@height},%
+  box align/center/.style={baseline=\tcb@height/2},%
+  box align/base/.style={baseline=\tcb@val@raisebase},%
   shrink tight/.style={boxsep=0mm,top=-\kvtcb@top@rule@stand,bottom=-\kvtcb@bottom@rule@stand,left=-\kvtcb@left@rule,right=-\kvtcb@right@rule},%
   extrude left by/.code={\tcbdimto\kvtcb@leftupper{\kvtcb@leftupper+#1}\tcbdimto\kvtcb@bbleft{\kvtcb@bbleft-#1}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},%
   extrude right by/.code={\tcbdimto\kvtcb@rightupper{\kvtcb@rightupper+#1}\tcbdimto\kvtcb@bbright{\kvtcb@bbright-#1}\tcbdimto\kvtcb@width{\kvtcb@width+#1}},%
@@ -435,7 +449,7 @@
   list entry/.store in=\kvtcb@listentry,
   list text/.style={list entry={\protect\numberline{\thetcbcounter}{\ignorespaces #1}}},
   title filled/.is if=tcb@titlefilled,%
-  @colbacktitle/.store in=\kvtcb@colbacktitle,
+  @colbacktitle/.colorlet=tcbcol@backtitle,
   colbacktitle/.style={title filled,@colbacktitle={#1}},
   opacityupper/.store in=\kvtcb@opacityupper,
   opacitylower/.store in=\kvtcb@opacitylower,
@@ -550,7 +564,7 @@
   \ifx\kvtcb@title\@empty\tcb@hasTitlefalse\tcb@specialtitle@hook\else%
     \tcb@hasTitletrue%
     \tcbdimto\tcb@w@title{\tcb@temp-\kvtcb@lefttitle-\kvtcb@righttitle}%
-    \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{\kvtcb@coltitle}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}%
+    \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}%
   \fi%
 }
 
@@ -671,9 +685,13 @@
   \addtocounter{tcblayer}{-1}%
 }
 
+\long\def\tcb@apply@box@options#1{%
+  \tcbset{#1}\tcb@lateoptions@hook\tcb@afteroptions@hook%
+}
+
 \long\def\tcb@@icolorbox[#1]{%
   \tcb@layer@inc%
-  \tcbset{capture=minipage,#1}\tcb@height@adjust\tcb@afteroptions@hook%
+  \tcb@apply@box@options{capture=minipage,#1}\tcb@height@adjust%
   \tcb@hasLowerfalse%
   \csname tcb@@capture@\kvtcb@capture\endcsname%
 }
@@ -688,7 +706,7 @@
 }
 
 \def\tcb@finalize@environment{%
-  \color{.}% hack for some special cases
+  %\color{.}% hack for some special cases
   \tcb@layer@dec%
 }
 
@@ -740,27 +758,32 @@
 }
 
 \def\tcb@saveehg#1{%
-  \immediate\write\@auxout{\string\gdef\string\tcb@ehg@#1@height{\csname tcb@ehg@#1@current\endcsname}}%
+  \immediate\write\@auxout{\string\csgdef{tcb@ehg@height@#1}{\csuse{tcb@ehg@current@#1}}}%
 }
 
 \def\tcb@ehgadd#1{%
-  \@ifundefined{tcb@ehg@\tcb@ehgid @current}{%
-    \expandafter\xdef\csname tcb@ehg@\tcb@ehgid @current\endcsname{#1}%
+  \ifcsdef{tcb@ehg@current@\tcb@ehgid}{%
+    \ifdim\csuse{tcb@ehg@current@\tcb@ehgid}<#1\relax%
+      \csxdef{tcb@ehg@current@\tcb@ehgid}{#1}%
+    \fi%
+  }{%
+    \csxdef{tcb@ehg@current@\tcb@ehgid}{#1}%
     \edef\tcb@temp{\noexpand\AtEndDocument{\noexpand\tcb@saveehg{\tcb@ehgid}}}%
-    \tcb@temp}{%
-    \ifdim\csname tcb@ehg@\tcb@ehgid @current\endcsname<#1%
-    \expandafter\xdef\csname tcb@ehg@\tcb@ehgid @current\endcsname{#1}\fi}%
+    \tcb@temp%
+  }%
 }
 
 \def\tcb@ch@equalheight{%
   \tcb@ehgadd{\tcb@natheight}%
-  \@ifundefined{tcb@ehg@\tcb@ehgid @height}{%
-    \edef\tcb@height{\tcb@natheight}}{%
-    \ifdim\csname tcb@ehg@\tcb@ehgid @height\endcsname<\tcb@natheight%
+  \ifcsdef{tcb@ehg@height@\tcb@ehgid}{%
+    \ifdim\csuse{tcb@ehg@height@\tcb@ehgid}<\tcb@natheight\relax%
+      \edef\tcb@height{\tcb@natheight}%
+    \else%
+      \letcs{\tcb@height}{tcb@ehg@height@\tcb@ehgid}%
+    \fi%
+  }{%
     \edef\tcb@height{\tcb@natheight}%
-    \else
-    \edef\tcb@height{\csname tcb@ehg@\tcb@ehgid @height\endcsname}%
-    \fi}%
+  }%
   \iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi%
 }
 
@@ -878,7 +901,7 @@
 \def\tcb@drawframe@standard{%
   \begin{pgfscope}%
   \tcb@boundaryframe@standard%
-  \pgfsetfillcolor{\kvtcb@colframe}%
+  \pgfsetfillcolor{tcbcol@frame}%
   \pgfsetfillopacity{\kvtcb@opacityframe}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -888,7 +911,7 @@
 \def\tcb@drawframe@standardjigsaw{%
   \begin{pgfscope}%
   \tcb@boundaryframe@standardjigsaw%
-  \pgfsetfillcolor{\kvtcb@colframe}%
+  \pgfsetfillcolor{tcbcol@frame}%
   \pgfsetfillopacity{\kvtcb@opacityframe}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -898,7 +921,7 @@
 \def\tcb@drawwithtitle@standard{%
   \begin{pgfscope}%
   \tcb@boundaryinterior@title@standard%
-  \pgfsetfillcolor{\kvtcb@colback}%
+  \pgfsetfillcolor{tcbcol@back}%
   \pgfsetfillopacity{\kvtcb@opacityback}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -908,7 +931,7 @@
 \def\tcb@drawwithouttitle@standard{%
   \begin{pgfscope}%
   \tcb@boundaryinterior@notitle@standard%
-  \pgfsetfillcolor{\kvtcb@colback}%
+  \pgfsetfillcolor{tcbcol@back}%
   \pgfsetfillopacity{\kvtcb@opacityback}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -918,7 +941,7 @@
 \def\tcb@drawtitle@standard{%
   \begin{pgfscope}%
   \tcb@boundarytitle@standard%
-  \pgfsetfillcolor{\kvtcb@colbacktitle}%
+  \pgfsetfillcolor{tcbcol@backtitle}%
   \pgfsetfillopacity{\kvtcb@opacitybacktitle}%
   \pgfusepath{fill}%
   \end{pgfscope}%
@@ -937,7 +960,7 @@
   \pgfpathmoveto{\pgfqpoint{\kvtcb@left@rule}{\tcb@seg@pos}}%
   \pgfpathlineto{\pgfqpoint{\the\dimexpr\tcb@width-\kvtcb@right@rule\relax}{\tcb@seg@pos}}%
   \fi%
-  \pgfsetcolor{\kvtcb@colframe}%
+  \pgfsetcolor{tcbcol@frame}%
   \pgfsetstrokeopacity{\kvtcb@opacityframe}%
   \pgfusepath{stroke}%
   \end{pgfscope}%
@@ -1013,7 +1036,7 @@
     \pgfsetfillopacity{\kvtcb@opacitytitle}%
     \pgftext[x=\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@lefttitle\relax,
              y=\the\dimexpr\tcb@height-\kvtcb@top@rule-\kvtcb@boxsep-\kvtcb@toptitle\relax,
-             left,top]{\color{\kvtcb@coltitle}\box\tcb@titlebox}%
+             left,top]{\color{tcbcol@title}\box\tcb@titlebox}%
     \end{pgfscope}%
   \fi%
 }
@@ -1024,7 +1047,7 @@
   \pgfsetfillopacity{\kvtcb@opacityupper}%
   \csname tcb@dbox@\kvtcb@valign\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper\relax}%
           {\the\dimexpr\tcb@innerheight+\kvtcb@bottom@rule-\kvtcb@boxsep-\tcb@break@topsep-\kvtcb@top-\tcb@height@upper\relax}%
-          {\tcb@height@upper}{\tcb@upperbox}{\kvtcb@colupper}%
+          {\tcb@height@upper}{\tcb@upperbox}{tcbcol@upper}%
   \end{pgfscope}%
 }
 \let\tcb@tdraw@upper=\tcb@tdraw@upper@core
@@ -1035,7 +1058,7 @@
     \pgfsetfillopacity{\kvtcb@opacitylower}%
     \csname tcb@dbox@\kvtcb@valignlower\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftlower\relax}%
             {\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep+\tcb@break@bottomsep+\kvtcb@bottom\relax}%
-            {\tcb@height@lower}{\tcb@lowerbox}{\kvtcb@collower}%
+            {\tcb@height@lower}{\tcb@lowerbox}{tcbcol@lower}%
     \end{pgfscope}%
   \fi%
 }
@@ -1046,7 +1069,7 @@
     \tcbdimto{\tcb@temp@wd}{\tcb@w@upper-\wd\tcb@upperbox+\kvtcb@sbs@gap}%
     \noindent\unhbox\tcb@upperbox\kern\tcb@temp@wd%
     \iftcb@hasLower%
-      \iftcb@lowervisible\color{\kvtcb@collower}\unhbox\tcb@lowerbox%
+      \iftcb@lowervisible\color{tcbcol@lower}\unhbox\tcb@lowerbox%
       \else%
         \iftcb@lowerignored\else\rule[-\dp\tcb@lowerbox]{0pt}{\the\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox\relax}\fi%
       \fi%
@@ -1173,7 +1196,7 @@
 
 \long\def\tcbox@inner@hbox#1{%
   \tcbset{breakable@false,sidebyside=false}%
-  \sbox\tcb@upperbox{\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}%
+  \sbox\tcb@upperbox{\color{tcbcol@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}%
   \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}%
   \tcbdimto{\tcb@val@raisebase}{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}%
   \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}%
@@ -1186,7 +1209,7 @@
   \tcbset{breakable@false,sidebyside=false}%
   \let\tcb@val@raisebase=\tcb@zpt%
   \tcb@set@@dim@and@title%
-  \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}%
+  \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{tcbcol@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}%
   \tcbdimto{\tcb@temp@wd}{\wd\tcb@upperbox}%
   \tcbset{width=\the\dimexpr\tcb@temp@wd+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule\relax}%
   \tcb@hasLowerfalse%
@@ -1197,7 +1220,7 @@
 \long\def\tcb@ox#1#2{%
   \begingroup%
   \tcb@layer@inc%
-  \tcbset{#1}\tcb@height@adjust\tcb@afteroptions@hook%
+  \tcb@apply@box@options{#1}\tcb@height@adjust%
   \csname tcbox@inner@\kvtcb@capture\endcsname{#2}%
   \tcb@layer@dec%
   \endgroup%
@@ -1209,13 +1232,13 @@
 
 \newcommand{\tcbsubtitle}[2][]{%
   \begingroup%
-  \let\tcb@trans@colframe\kvtcb@colframe%
+  \colorlet{tcbtranscol@frame}{tcbcol@frame}%
   \iftcb@titlefilled%
-    \let\tcb@trans@colback\kvtcb@colbacktitle%
+    \colorlet{tcbtranscol@back}{tcbcol@backtitle}%
   \else%
-    \let\tcb@trans@colback\kvtcb@colframe%
+    \colorlet{tcbtranscol@back}{tcbcol@frame}%
   \fi%
-  \let\tcb@trans@colupper\kvtcb@coltitle%
+  \colorlet{tcbtranscol@upper}{tcbcol@title}%
   \let\tcb@trans@fontupper\kvtcb@fonttitle%
   \let\tcb@trans@boxsep\kvtcb@boxsep%
   \let\tcb@trans@left\kvtcb@leftupper%
@@ -1226,8 +1249,8 @@
   \let\tcb@trans@style\kvtcb@subtitle@style%
   \begin{tcolorbox}[sharp corners,
     before skip={0.5\baselineskip},after skip={0.5\baselineskip},
-    colframe=\tcb@trans@colframe,colback=\tcb@trans@colback,
-    colupper=\tcb@trans@colupper,fontupper=\tcb@trans@fontupper,
+    colframe=tcbtranscol@frame,colback=tcbtranscol@back,
+    colupper=tcbtranscol@upper,fontupper=\tcb@trans@fontupper,
     boxsep=\tcb@trans@boxsep,left=\tcb@trans@left,right=\tcb@trans@right,
     top=\tcb@trans@top,bottom=\tcb@trans@bottom,
     boxrule=\tcb@trans@rule,leftrule=0pt,rightrule=0pt,oversize,
@@ -1278,7 +1301,7 @@
     \csxdef{the\tcbcounter}{\kvtcb@new@freestyle}%
   \fi%
   \global\csletcs{thetcb@cnt@#1}{the\tcbcounter}%
-  \appto\tcb@new@colopt{,code={\letcs\tcbcounter{tcb@cnt@#1}\letcs\thetcbcounter{thetcb@cnt@#1}\preto\kvtcb@phantom{\refstepcounter{\tcbcounter}}}}%
+  \appto\tcb@new@colopt{,code={\letcs\tcbcounter{tcb@cnt@#1}\letcs\thetcbcounter{thetcb@cnt@#1}\stepcounter{\tcbcounter}\preto\kvtcb@phantom{\addtocounter{\tcbcounter}{-1}\refstepcounter{\tcbcounter}}}}%
 }
 
 \def\tcb@proc@counter@auto#1{%
@@ -1295,7 +1318,7 @@
 \def\tcb@proc@counter@from#1{%
   \csxdef{tcb@cnt@#1}{\kvtcb@new@counter}%
   \global\csletcs{thetcb@cnt@#1}{the\kvtcb@new@counter}%
-  \appto\tcb@new@colopt{,code={\letcs\tcbcounter{tcb@cnt@#1}\letcs\thetcbcounter{thetcb@cnt@#1}\preto\kvtcb@phantom{\refstepcounter{\tcbcounter}}}}%
+  \appto\tcb@new@colopt{,code={\letcs\tcbcounter{tcb@cnt@#1}\letcs\thetcbcounter{thetcb@cnt@#1}\stepcounter{\tcbcounter}\preto\kvtcb@phantom{\addtocounter{\tcbcounter}{-1}\refstepcounter{\tcbcounter}}}}%
 }
 
 \def\tcb@proc@counter@no#1{%
@@ -1492,7 +1515,8 @@
 \tcbset{%
   initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},%
   reset/.code={\tcb@reset},%
-  reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@},
+  reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@%
+    \let\tcb@lateoptions@hook\@empty},
     width=\linewidth,autoparskip,
     natural height,height plus=0pt,space to lower,valign=top,valign lower=top,
     size=normal,rounded corners,
@@ -1526,7 +1550,8 @@
 
 \def\tcb@check@library@version{%
   \ifx\tcb@library@version\tcb@version\else%
-  \PackageError{tcolorbox}{tcolorbox version '\tcb@version' loads library '\tcb@library@inload' with version '\tcb@library@version'}
+  \tcb@error{tcolorbox version '\tcb@version' loads library '\tcb@library@inload' with version '\tcb@library@version'}%
+    {tcolorbox is not installed correctly. At least one library is not compatible to the main package.}%
   \fi%
 }
 
@@ -1574,6 +1599,7 @@
 \tcb@add@library{minted}{tcbminted.code.tex}
 \tcb@add@library{theorems}{tcbtheorems.code.tex}
 \tcb@add@library{documentation}{tcbdocumentation.code.tex}
+\tcb@add@library{raster}{tcbraster.code.tex}
 \tcb@add@library{skins@jigsaw}{tcbskinsjigsaw.code.tex}
 \tcb@add@library{skins}{tcbskins.code.tex}
 \tcb@add@library{breakable}{tcbbreakable.code.tex}
@@ -1581,7 +1607,7 @@
 \tcb@add@library{fitting}{tcbfitting.code.tex}
 \tcb@add@library{xparse}{tcbxparse.code.tex}
 
-\tcb@add@library@style{many}{skins,breakable,hooks,theorems,fitting,xparse}
+\tcb@add@library@style{many}{raster,skins,breakable,hooks,theorems,fitting,xparse}
 \tcb@add@library@style{most}{many,listingsutf8}
 \tcb@add@library@style{all}{many,minted,listingsutf8,documentation}