From 5b8b7632d3ecba2ae1d2dfb54484a383ea1fbaa0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 12 Aug 2015 21:23:27 +0000 Subject: tcolorbox (12aug15) git-svn-id: svn://tug.org/texlive/trunk@38107 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 8 ++--- .../tex/latex/tcolorbox/tcbdocumentation.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbexternal.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbfitting.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbhooks.code.tex | 4 +-- .../tex/latex/tcolorbox/tcblistings.code.tex | 4 +-- .../tex/latex/tcolorbox/tcblistingscore.code.tex | 4 +-- .../tex/latex/tcolorbox/tcblistingsutf8.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbmagazine.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbminted.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbraster.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbskins.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbskinsjigsaw.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbtheorems.code.tex | 4 +-- .../tex/latex/tcolorbox/tcbxparse.code.tex | 4 +-- .../texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 39 ++++++++-------------- 16 files changed, 45 insertions(+), 58 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tcolorbox') 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 -- cgit v1.2.3