From affb17be9e5b6b56ddb689a42a9c83df881dd9b2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Aug 2011 00:10:34 +0000 Subject: collectbox (22aug11) git-svn-id: svn://tug.org/texlive/trunk@23671 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/collectbox/collectbox.pdf | Bin 490831 -> 174737 bytes .../source/latex/collectbox/collectbox.dtx | 9 ++++++--- .../texmf-dist/tex/latex/collectbox/collectbox.sty | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf b/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf index 72089e272eb..16df2b1f655 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 a87ed38f16b..9d6946a9f7a 100644 --- a/Master/texmf-dist/source/latex/collectbox/collectbox.dtx +++ b/Master/texmf-dist/source/latex/collectbox/collectbox.dtx @@ -21,9 +21,9 @@ % % \iffalse %<*driver> -\ProvidesFile{collectbox.dtx}[2011/08/06 v0.3 DTX File of collectbox] +\ProvidesFile{collectbox.dtx}[2011/08/11 v0.3a DTX File of collectbox] \documentclass{ydoc} -\usepackage{collectbox}[2011/08/06] +\usepackage{collectbox}[2011/08/11] \EnableCrossrefs \CodelineIndex \RecordChanges @@ -60,6 +60,7 @@ % \changes{v0.2}{2011/07/23}{Added \cs{collectboxcheckenv}.} % \changes{v0.2a}{2011/07/30}{Small bugfix.} % \changes{v0.3}{2011/08/06}{Some internal modifications required by related packages.} +% \changes{v0.3a}{2011/08/11}{Fixed issue with collectbox macros in the end-code of a collectbox environment.} % % \DoNotIndex{\newcommand,\newenvironment} % @@ -279,7 +280,7 @@ % \fi % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{collectbox}[2011/08/06 v0.3 Collect macro arguments as boxes] +\ProvidesPackage{collectbox}[2011/08/11 v0.3a Collect macro arguments as boxes] % \end{macrocode} % % \begin{macro}{\collectedbox} @@ -458,6 +459,8 @@ \collectbox@protecteddef\totalheight{\@ovri}% \totalheight\height \advance\totalheight\depth + \let\collectbox@endcode\relax + \let\collectbox@bgroup\collectbox@macro@bgroup } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/collectbox/collectbox.sty b/Master/texmf-dist/tex/latex/collectbox/collectbox.sty index f9981471f67..373b59e25ab 100644 --- a/Master/texmf-dist/tex/latex/collectbox/collectbox.sty +++ b/Master/texmf-dist/tex/latex/collectbox/collectbox.sty @@ -26,7 +26,7 @@ %% and the derived file collectbox.sty. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{collectbox}[2011/08/06 v0.3 Collect macro arguments as boxes] +\ProvidesPackage{collectbox}[2011/08/11 v0.3a Collect macro arguments as boxes] \newsavebox\collectedbox \newcommand*\collectbox{% \@ifstar @@ -101,6 +101,8 @@ \collectbox@protecteddef\totalheight{\@ovri}% \totalheight\height \advance\totalheight\depth + \let\collectbox@endcode\relax + \let\collectbox@bgroup\collectbox@macro@bgroup } \begingroup \expandafter\ifx\csname protected\endcsname\relax -- cgit v1.2.3