From 33526e1dcce800a5967a3113e832201f73b1124c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Nov 2014 23:30:05 +0000 Subject: tcolorbox (28nov14) git-svn-id: svn://tug.org/texlive/trunk@35686 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tcolorbox/tcbbreakable.code.tex | 4 +- .../tex/latex/tcolorbox/tcbdocumentation.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/tcbminted.code.tex | 4 +- .../tex/latex/tcolorbox/tcbraster.code.tex | 12 +++++- .../tex/latex/tcolorbox/tcbskins.code.tex | 39 +++++++++++++++--- .../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 | 48 +++++++++++++++++++--- 14 files changed, 108 insertions(+), 35 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index c68230e2954..c8669f2dea9 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index a527cff86cf..d650b5e9561 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 fb8177184b0..2d0832d3979 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 881969b1c3e..8c7bc5ab4b6 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 87c3bf72de3..3dde90ea421 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 e812ba74f20..d693e1e4280 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 53ef49b102b..a201563c981 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 0775f4ce12d..677cb554e4e 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 c38fe7eb326..a2855744436 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -102,6 +102,7 @@ \setcounter{tcbrastercolumn}{1}% \setcounter{tcbrasterrow}{1}% \tcbset{every box on layer \the\numexpr\number\c@tcblayer+1\relax/.code={% + \tcbset{raster every box/.try}% \ifodd\c@tcbrastercolumn\relax% \tcbset{raster odd column/.try}% \else% @@ -148,6 +149,12 @@ \tcb@raster@set@size{height=\tcb@raster@box@height}% \fi% \tcb@raster@ehg@start% + \let\tcb@end@raster\@empty% + \ifinner\ifhmode% + \color@vbox% + \hsize=\kvtcb@raster@width% + \let\tcb@end@raster\color@endbox% + \fi\fi%& {\par\nointerlineskip% \addvspace{\the\dimexpr\kvtcb@raster@skip@before-\parskip\relax}}% \kvtcb@raster@halign\noindent% @@ -164,6 +171,7 @@ \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\parskip\relax}% \fi% \endgroup% + \tcb@end@raster% \setcounter{tcbrastercolumn}{\tcb@raster@save@column}% \setcounter{tcbrasterrow}{\tcb@raster@save@row}% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 1c895583237..91fc0316a47 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \RequirePackage{tikz}[2010/10/13] @@ -1636,12 +1636,39 @@ }% } +\def\tcb@scanfilename#1#2{% + \begingroup% + \everyeof{\noexpand}% + \endlinechar -1% + \catcode`\_=11% + \catcode`\~=11% + \edef\x{\scantokens\expandafter{#2}}% + \expandafter\endgroup% + \expandafter\def\expandafter #1\expandafter{\x}% +}% + + \def\tcb@include@graphics@preparefile#1{% - \def\imagename{\detokenize{#1}}% - \ifx\kvtcb@graphics@directory\@empty% - \edef\imagepath{#1}% + \tcb@scanfilename\tcb@temp{#1}% + \filename@parse{\tcb@temp}% + \ifx\filename@ext\relax% + \let\imagename\filename@base% + \else% + \def\imagename{\filename@base\Gin@sepdefault\filename@ext}% + \fi% + \ifdefined\grffile@Ginclude@graphics% + % grffile package loaded + \ifx\kvtcb@graphics@directory\@empty% + \def\imagepath{#1}% + \else% + \def\imagepath{\kvtcb@graphics@directory/#1}% + \fi% \else% - \edef\imagepath{\expandonce\kvtcb@graphics@directory/\noexpand#1}% + \ifx\kvtcb@graphics@directory\@empty% + \edef\imagepath{#1}% + \else% + \edef\imagepath{\kvtcb@graphics@directory/#1}% + \fi% \fi% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index fda058f95e9..0478a70be6e 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 d8f14fa29c8..f30a8570389 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 520dc58bd58..2b6ccd375f4 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% 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.30} +\tcb@set@library@version{3.31} \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 f6cbdad0d8d..8f18cd54613 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.30 (2014/11/17) +%% The LaTeX package tcolorbox - version 3.31 (2014/11/28) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/11/17 version 3.30 text color boxes] -\def\tcb@version{3.30} +\ProvidesPackage{tcolorbox}[2014/11/28 version 3.31 text color boxes] +\def\tcb@version{3.31} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -144,6 +144,15 @@ notitle/.style={title=}, adjust text/.store in=\kvtcb@adjusttext, adjusted title/.style={title={#1\vphantom{\kvtcb@adjusttext}}}, + squeezed title/.style={title={% + \setbox\z@=\color@hbox#1\color@endbox% + \ifdim\wd\z@>\linewidth\relax% + \resizebox{\linewidth}{\height}{\unhbox\z@}% + \else% + \unhbox\z@% + \fi% + }}, + squeezed title*/.style={squeezed title={#1\vphantom{\kvtcb@adjusttext}}},% detach title/.code=\tcb@detach@title@code,% attach title/.code=\tcb@attach@title@code,% attach title to upper/.style={detach title,before upper={\tcbtitle#1}}, @@ -433,6 +442,7 @@ step and label/.style 2 args={phantom={\refstepcounter{#1}\tcb@set@label{#2}}},% step/.style={phantom={\refstepcounter{#1}}},% label/.style={phantom={\tcb@set@label{#1}}},% + phantomlabel/.style={phantom={\ifdefined\phantomsection\phantomsection\fi\tcb@set@label{#1}}},% label type/.store in=\kvtcvb@label@type,% no label type/.style={label type=},% add to list/.style 2 args={phantom={\tcb@addcontentsline{#1}{#2}}}, @@ -593,8 +603,6 @@ \let\tcb@startbox\tcb@savelowerbox% \let\endtcolorbox\tcb@endboxanddraw% \else% - \IfFileExists{\kvtcb@savelowerto}{% - \tcb@savelowerbox\input{\kvtcb@savelowerto}\end{tcb@savebox}}{}% \let\tcb@startbox\tcb@lowerverbatim% \expandafter\let\csname end\kvtcb@savedelimiter\expandafter\endcsname\csname tcb@endlowerverbatimanddraw\endcsname% \fi% @@ -1473,6 +1481,8 @@ \def\tcb@endlowerverbatimanddraw{% \tcb@endlowerverbatim% + \IfFileExists{\kvtcb@savelowerto}{% + \tcb@savelowerbox\input{\kvtcb@savelowerto}\end{tcb@savebox}}{}% \tcb@draw@color@box% \tcb@finalize@environment% } @@ -1499,6 +1509,34 @@ \def\tcbusetemp{\input{\kvtcb@tempfile}} +% recording + +\newwrite\tcb@record@out + +\def\tcb@null#1{} +\newcommand{\tcb@record}[1]{\immediate\write\tcb@record@out{#1}} + +\newcommand{\tcbstartrecording}[1][\jobname.records]{% + \let\tcbrecord\tcb@record% + \edef\tcb@record@file{#1}% + \immediate\openout\tcb@record@out\tcb@record@file% +} + +\newcommand{\tcbstoprecording}{% + \immediate\closeout\tcb@record@out% + \let\tcbrecord\tcb@null% +} + +\tcbset{% + record/.style={phantom={\tcbrecord{#1}}}, + no recording/.code={\let\tcbrecord\tcb@null}, + no recording +} + +\newcommand{\tcbinputrecords}[1][\tcb@record@file]{% + \IfFileExists{#1}{\input{#1}}{\tcb@error{record file `#1' not found}{The record file `#1' was not found}}% +} + \tcb@new@skin{standard}{frame engine=standard,interior titled engine=standard, interior engine=standard,segmentation engine=standard,title engine=standard, graphical environment=pgfpicture,geometry nodes=false, -- cgit v1.2.3