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/doc/latex/collectbox/collectbox.pdf | Bin 492729 -> 161644 bytes .../source/latex/collectbox/collectbox.dtx | 45 +++++++++++++-------- .../source/latex/collectbox/collectbox.ins | 2 +- .../texmf-dist/tex/latex/collectbox/collectbox.sty | 23 +++++++---- 4 files changed, 44 insertions(+), 26 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf b/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf index 826643add31..b88ced112c5 100644 Binary files a/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf and b/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf differ diff --git a/Master/texmf-dist/source/latex/collectbox/collectbox.dtx b/Master/texmf-dist/source/latex/collectbox/collectbox.dtx index 4eba7ce7c34..9286a59bdee 100644 --- a/Master/texmf-dist/source/latex/collectbox/collectbox.dtx +++ b/Master/texmf-dist/source/latex/collectbox/collectbox.dtx @@ -21,16 +21,13 @@ % % \iffalse %<*driver> -\ProvidesFile{collectbox.dtx} -% -% -%<*driver> +\ProvidesFile{collectbox.dtx}[2011/07/30 v0.2a DTX File of collectbox] \documentclass{ydoc} -\usepackage{collectbox}[2011/07/23] +\usepackage{collectbox}[2011/07/30] \EnableCrossrefs \CodelineIndex \RecordChanges -%\OnlyDescription +\OnlyDescription \begin{document} \DocInput{collectbox.dtx} \PrintChanges @@ -61,6 +58,7 @@ % \changes{v0.1}{2011/07/18}{First release.} % \changes{v0.2}{2011/07/20}{Added \cs{collectboxto} and \cs{@collectboxto} macros.} % \changes{v0.2}{2011/07/23}{Added \cs{collectboxcheckenv}.} +% \changes{v0.2a}{2011/07/30}{Small bugfix.} % % \DoNotIndex{\newcommand,\newenvironment} % @@ -108,10 +106,10 @@ % Colored content will be correctly handled. % % This package should be (soon) part of the standard distributions TeXLive and MikTeX and can be installed over the -% provided package manager (i.e.\ TeXLive: |tlmgr install collectcell|). +% provided package manager (i.e.\ with TeXLive: |tlmgr install collectcell|). % This package can be also manually unpacked from |collectbox.dtx| by compiling the file |collectbox.ins| with \LaTeX\ or \TeX. % This documentation can be created by compiling |collectbox.dtx| using pdf\LaTeX\ in DVI or PDF mode. -% The unpackaged package file |collectbox.sty| should be copied to a newly created directory |$TEXMF/tex/latex/collectbox/| under Linux +% The unpackaged package file |collectbox.sty| should be copied to a newly created directory named |$TEXMF/tex/latex/collectbox/| under Linux % or |%TEXMF%\tex\latex\collectbox\| under MS Windows where |$TEXMF| and |%TEXMF%| represents the local \TeX\ tree. % The documentation and README file can be copied to |$TEXMF/doc/latex/collectbox/|. % Some \TeX\ distributions require to update the list of files in the \TeX\ tree, e.g.\ by running |texmf $TEXMF| afterwards. @@ -276,11 +274,11 @@ % \section{Implementation} % % \iffalse -%<*package> +%<*collectbox> % \fi % \begin{macrocode} \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] % \end{macrocode} % % \begin{macro}{\collectedbox} @@ -425,7 +423,7 @@ % to trigger the |\aftergroup| code. % \begin{macrocode} \def\collectbox@arg#1{% - \collectbox@begin#1\egroup + #1\egroup } % \end{macrocode} % \end{macro} @@ -439,11 +437,11 @@ \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 } @@ -451,6 +449,19 @@ % \end{macro} % % +% \begin{macro}{\collectbox@protecteddef} +% \begin{macrocode} +\begingroup +\expandafter\ifx\csname protected\endcsname\relax + \let\collectbox@protecteddef\def% +\else + \gdef\collectbox@protecteddef{\protected\def}% +\fi +\endgroup +% \end{macrocode} +% \end{macro} +% +% % \begin{macro}{\collectbox@code} % Global storage macro for user code. % \begin{macrocode} @@ -564,7 +575,7 @@ % \endinput % \iffalse -% +% % \fi % % \Finale diff --git a/Master/texmf-dist/source/latex/collectbox/collectbox.ins b/Master/texmf-dist/source/latex/collectbox/collectbox.ins index b76de3b20fb..500163b4af6 100644 --- a/Master/texmf-dist/source/latex/collectbox/collectbox.ins +++ b/Master/texmf-dist/source/latex/collectbox/collectbox.ins @@ -25,7 +25,7 @@ and the derived file collectbox.sty. \keepsilent \generate{% - \file{collectbox.sty}{\from{collectbox.dtx}{package}}% + \file{collectbox.sty}{\from{collectbox.dtx}{collectbox}}% } \obeyspaces 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