diff options
author | Karl Berry <karl@freefriends.org> | 2015-08-12 21:23:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-08-12 21:23:27 +0000 |
commit | 5b8b7632d3ecba2ae1d2dfb54484a383ea1fbaa0 (patch) | |
tree | c4006d45270b76ee0613d5558a43b1ed4f9a012e | |
parent | 7d81ef46f5d95bac727558627bf18cd0a0cd58cd (diff) |
tcolorbox (12aug15)
git-svn-id: svn://tug.org/texlive/trunk@38107 c570f23f-e606-0410-a88d-b1316a301751
25 files changed, 79 insertions, 72 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 9e7a157d6b2..50207ac2bca 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -813,3 +813,9 @@ version 3.71 (2015/07/23) - bug fix: An error introduced in 3.70 broke all code without 'breakable' library - bug fix: library 'external': spurious blank in source input removed - documentation extended + +version 3.72 (2015/08/12) +- bug fix: bounding box changes and boxed title additions were not considered + correctly by 'height fixed for' or 'height fill' (resulting in wrong page breaks) +- library loading made compatible with expl3 +- cosmetic documentation changes diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 6f98cbe48dc..628e7c3236e 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf Binary files differindex b6b17e7ca74..62dfd0d07e5 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index 00977dbf0d3..1726eda2ce3 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- 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 927d0e41b1e..da880a96f3e 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex @@ -101,7 +101,7 @@ For |minted| \cite{rudolph:2011a} support, load: Identical to \refEnv{docEnvironment}, but without index entry. \end{xdocEnvironment}} - +\clearpage \begin{docEnvironment}[doclang/environment content=key description,doc updated=2014-09-29]{docKey}{\oarg{key path}\oarg{options}\marg{name}\marg{parameters}\marg{description}} Documents a key with given \meta{name} and an optional \meta{key path}. The given \meta{options} are set with \refCom{tcbset}. @@ -161,6 +161,7 @@ The environment \docAuxEnvironment{fooauxenv} holds some interesting data. Identical to \refCom{docAuxEnvironment}, but without index entry. \end{docCommand} +\clearpage \begin{docCommand}{docAuxKey}{\oarg{key path}\marg{name}} Documents an auxiliary key with given \meta{name} and an optional \meta{key path}. @@ -176,7 +177,6 @@ The key \docAuxKey[foo]{fooaux} holds some interesting data. \end{docCommand} -\clearpage \begin{docCommand}[doc new=2015-01-08]{docCounter}{\marg{name}} Documents a counter with given \meta{name}. The counter is automatically indexed. \begin{dispExample} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.magazine.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.magazine.tex index fd4d197c829..a7ad64842fd 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.magazine.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.magazine.tex @@ -80,7 +80,6 @@ extensive use of large box arrays may eat up \TeX's available memory and registers. \end{marker} - \subsection{Creation and Resetting of Box Arrays}\label{subsec:magazine_creation} \begin{docCommand}[doc new=2015-07-13]{newboxarray}{\marg{name}} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty index 9d5b346bedd..0ee04a9db88 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty @@ -90,7 +90,19 @@ \def\refSkin{\tcb@ref@doc{skin}} \makeatother -\newtcolorbox{marker}[1][]{marker,#1} +\newtcolorbox{marker}[1][]{enhanced, + before skip=2mm,after skip=3mm, + boxrule=0.4pt,left=5mm,right=2mm,top=1mm,bottom=1mm, + colback=yellow!50, + colframe=yellow!20!black, + sharp corners,rounded corners=southeast,arc is angular,arc=3mm, + underlay={% + \path[fill=tcbcol@back!80!black] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); + \path[draw=tcbcol@frame,shorten <=-0.05mm,shorten >=-0.05mm] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); + \path[fill=yellow!50!black,draw=none] (interior.south west) rectangle node[white]{\Huge\bfseries !} ([xshift=4mm]interior.north west); + }, + drop fuzzy shadow,#1} + \renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1} \renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1} @@ -167,6 +179,9 @@ \definecolor{Blue_Dark}{rgb}{0.078431,0.188235,0.615686} +\definecolor{Blue_Dark}{rgb}{0.090196,0.211765,0.364706} +\definecolor{Blue_Bright}{rgb}{0.858824,0.898039,0.945098} + \tcbset{ documentation listing style=mydocumentation,% sbs/.style={sidebyside,before lower app={\tcbset{sidebyside=false}}},% @@ -179,10 +194,10 @@ }, base example/.style={bicolor, beforeafter example,arc is angular, - colback=white,opacityback=0.87, fontlower=\footnotesize, - frame style={top color=Green_Dark,bottom color=Blue_Dark}, - colbacklower=ExampleBack!5!white, + colframe=Blue_Dark, + colback=Blue_Bright, + colbacklower=white, drop fuzzy shadow, }, docexample/.style={base example,% diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 85b71e0969a..d5ac845aa6f 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index 7e6dbb3e4f4..63676d8e5e7 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -35,8 +35,8 @@ \setlength{\bibitemsep}{\smallskipamount} \addbibresource{tcolorbox.doc.bib} -\def\version{3.71}% -\def\datum{2015/07/23}% +\def\version{3.72}% +\def\datum{2015/08/12}% \makeindex \hypersetup{ @@ -49,7 +49,7 @@ \usepackage{pgfplots} %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.skins} +%\includeonly{tcolorbox.doc.breakable} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index df169d63357..de2bf3eba98 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -280,7 +280,7 @@ \tcb@breakat@init% \tcbset{compress page=#1}% \tcb@comp@h@page% - \tcbset{height=\tcb@h@page,after=\eject}% + \tcbset{height=\tcb@h@page-\kvtcb@bbtop@stand-\kvtcb@bbbottom@stand,after=\eject}% } \def\tcb@height@fill@unbroken@normal{\tcb@height@fill@unbroken{none}} @@ -723,7 +723,7 @@ \def\tcb@break@ch@fixed{% \ifdim\tcb@natheight<\tcb@h@page\relax% - \tcbdimto\kvtcb@height@fixed{\tcb@h@page}% + \tcbdimto\kvtcb@height@fixed{\tcb@h@page-\kvtcb@bbtop-\kvtcb@bbbottom}% \tcb@ch@fixed% \else% \tcb@ch@natural% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index d05e66d5cb0..be7196723b1 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \tcbuselibrary{listings,skins,xparse,external} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index a9abf0d2ae3..7945d795ed9 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} { \catcode`\"=12 diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 24088f8a942..d5d412ea6a3 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index e09e6360dc0..3278d4ef3a9 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \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 eb4dcaf1e77..a57aefc1924 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \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 277c2eaae56..47c3fca19a7 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \RequirePackage{pdftexcmds} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index f0cb634ad6a..db350d6077c 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \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 9f254602be9..e1a2fa6d656 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% 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.71} +\tcb@set@library@version{3.72} \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 afec5bd3ac7..35a48daf35d 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 366d57383a0..7d5824683b6 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \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 c0ec72ef34c..36f1ff98536 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \RequirePackage{tikz}[2010/10/13] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index dde02bc0643..d6b2e45b51f 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \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 5ee60e94f83..08d28f4eafe 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \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 b5548ce8400..d2016c6f9ce 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.71} +\tcb@set@library@version{3.72} \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 488492ebd14..1af05b4a59f 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.71 (2015/07/23) +%% The LaTeX package tcolorbox - version 3.72 (2015/08/12) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2015/07/23 version 3.71 text color boxes] -\def\tcb@version{3.71} +\ProvidesPackage{tcolorbox}[2015/08/12 version 3.72 text color boxes] +\def\tcb@version{3.72} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -1913,13 +1913,13 @@ \def\tcb@set@library@version#1{% \def\tcb@library@version{#1}% - \typeout{Library (tcolorbox): '\tcb@library@inload' version '\tcb@library@version'} + \typeout{Library (tcolorbox): '\@currname' version '\tcb@library@version'} \tcb@check@library@version% } \def\tcb@check@library@version{% \ifx\tcb@library@version\tcb@version\else% - \tcb@error{tcolorbox version '\tcb@version' loads library '\tcb@library@inload' with version '\tcb@library@version'}% + \tcb@error{tcolorbox version '\tcb@version' loads library '\@currname' with version '\tcb@library@version'}% {tcolorbox is not installed correctly. At least one library is not compatible to the main package.}% \fi% } @@ -1929,28 +1929,17 @@ \providecommand{\tcbpkgprefix}{} -\def\tcb@input@library@in#1{% - \input\tcbpkgprefix#1\relax% -} - -\let\tcb@input@library=\tcb@input@library@in% - -\def\tcb@input@library@ex#1{% - \let\tcb@input@library=\tcb@input@library@in% - \edef\tcb@at@catcode{\the\catcode`@}% - \catcode`\@11\relax% - \tcb@input@library@in{#1}% - \catcode`\@\tcb@at@catcode\relax% - \let\tcb@input@library=\tcb@input@library@ex% -} - \def\tcb@load@library#1#2{% \pgfkeysifdefined{/tcb/libload/#1}{}{% \pgfkeyssetvalue{/tcb/libload/#1}{}% - \def\tcb@library@inload{#2}% + \@pushfilename% + \xdef\@currname{#2}% + \makeatletter% \def\tcb@library@version{-}% - \tcb@input@library{#2}% - \tcb@check@library@version}% + \input\tcbpkgprefix#2\relax% + \tcb@check@library@version% + \@popfilename% + }% } \def\tcb@add@library#1#2{% @@ -1983,6 +1972,4 @@ \tcb@add@library@style{all}{many,minted,listingsutf8,external,magazine,documentation} \ProcessOptions* -\edef\tcb@temp{\noexpand\tcbuselibrary{\tcb@optionlist}} -\tcb@temp -\let\tcb@input@library=\tcb@input@library@ex% +\begingroup\edef\x{\endgroup\noexpand\tcbuselibrary{\tcb@optionlist}}\x |