From ca8a3b699546b5989ac38dc20c506fd09506da0c Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Tue, 2 Aug 2011 19:42:53 +0000 Subject: collectbox 2011/07/30 v0.2a git-svn-id: svn://tug.org/texlive/trunk@23355 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/collectbox/collectbox.sty | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/collectbox') diff --git a/Master/texmf-dist/tex/latex/collectbox/collectbox.sty b/Master/texmf-dist/tex/latex/collectbox/collectbox.sty index 7e9c8f860c2..79e58b3fc0c 100644 --- a/Master/texmf-dist/tex/latex/collectbox/collectbox.sty +++ b/Master/texmf-dist/tex/latex/collectbox/collectbox.sty @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% collectbox.dtx (with options: `package') +%% collectbox.dtx (with options: `collectbox') %% %% Copyright (C) 2011 by Martin Scharrer %% @@ -26,7 +26,7 @@ %% and the derived file collectbox.sty. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{collectbox}[2011/07/23 v0.2 Collect macro arguments as boxes] +\ProvidesPackage{collectbox}[2011/07/30 v0.2a Collect macro arguments as boxes] \newsavebox\collectedbox \newcommand*\collectbox{% \@ifstar @@ -87,19 +87,26 @@ \collectbox@bgroup } \def\collectbox@arg#1{% - \collectbox@begin#1\egroup + #1\egroup } \def\collectbox@end{% \collectbox@endgroup \egroup - \def\BOXCONTENT{\usebox\collectedbox}% - \def\width{\wd\collectedbox}% - \def\height{\ht\collectedbox}% - \def\depth{\dp\collectedbox}% - \let\totalheight\@ovri + \collectbox@protecteddef\BOXCONTENT{\usebox\collectedbox}% + \collectbox@protecteddef\width{\wd\collectedbox}% + \collectbox@protecteddef\height{\ht\collectedbox}% + \collectbox@protecteddef\depth{\dp\collectedbox}% + \collectbox@protecteddef\totalheight{\@ovri}% \totalheight\height \advance\totalheight\depth } +\begingroup +\expandafter\ifx\csname protected\endcsname\relax + \let\collectbox@protecteddef\def% +\else + \gdef\collectbox@protecteddef{\protected\def}% +\fi +\endgroup \let\collectbox@code\empty \newcommand\collectboxto[1]{% \@ifnextchar[% -- cgit v1.2.3