diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/storebox/storebox.pdf | bin | 164216 -> 164161 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/storebox/storebox.dtx | 40 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/storebox/storebox.sty | 24 |
3 files changed, 35 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/storebox/storebox.pdf b/Master/texmf-dist/doc/latex/storebox/storebox.pdf Binary files differindex 88d67ab34f7..ac19f07603d 100644 --- a/Master/texmf-dist/doc/latex/storebox/storebox.pdf +++ b/Master/texmf-dist/doc/latex/storebox/storebox.pdf diff --git a/Master/texmf-dist/source/latex/storebox/storebox.dtx b/Master/texmf-dist/source/latex/storebox/storebox.dtx index e690526682c..b81f06d36dd 100644 --- a/Master/texmf-dist/source/latex/storebox/storebox.dtx +++ b/Master/texmf-dist/source/latex/storebox/storebox.dtx @@ -24,10 +24,10 @@ %<*driver> \ProvidesFile{storebox.dtx}[% %<=*DATE> - 2011/09/22 + 2011/10/21 %<=/DATE> %<=*VERSION> - v1.0 + v1.1 %<=/VERSION> DTX file for storebox] \documentclass{ydoc} @@ -44,7 +44,7 @@ %</driver> % \fi % -% \CheckSum{132} +% \CheckSum{137} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -65,6 +65,7 @@ % % \changes{v0.99}{2011/08/05}{Converted to DTX file.} % \changes{v1.0}{2011/09/22}{First release.} +% \changes{v1.1}{2011/10/21}{Fixed issue with \env{storebox} environment with new \pkg{collectbox} version.} % % \DoNotIndex{\newcommand,\newenvironment} % @@ -211,11 +212,13 @@ % \begin{macro}{\storebox} % \begin{macrocode} \newcommand*\storebox{% - \collectboxcheckenv{storebox}% - \ifcollectboxenv + \begingroup + \def\@tempa{storebox}% + \ifx\@currenvir\@tempa \endgroup \expandafter\@storebox@env \else + \endgroup \expandafter\@storebox \fi } @@ -245,7 +248,7 @@ \def\@storebox@env#1{% \edef\@tempa{% \setbox\collectedbox\hbox\bgroup% - \def\noexpand\@tempa{\noexpand#1}% + \def\noexpand\the@storebox{\noexpand#1}% }% \@tempa \begingroup @@ -259,6 +262,18 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\endstorebox} +% \begin{macrocode} +\def\endstorebox{% + \unskip + \endgroup + \color@endgroup +} +% \end{macrocode} +% \end{macro} +% +% +% % \begin{macro}{\@storebox@env@end} % This ends the box assignment and stores the box as PDF xform. % Then the given control sequence is set to the xform number. @@ -268,7 +283,7 @@ \egroup \pdfxform\collectedbox \endgroup - \mathchardef\expandafter\noexpand\@tempa=\pdflastxform + \mathchardef\expandafter\noexpand\the@storebox=\pdflastxform }% \@tempa } @@ -276,17 +291,6 @@ % \end{macro} % % -% \begin{macro}{\endstorebox} -% \begin{macrocode} -\def\endstorebox{% - \unskip - \endgroup - \color@endgroup -} -% \end{macrocode} -% \end{macro} -% -% % \begin{macro}{\newstorebox} % \begin{macrocode} \newcommand*\newstorebox[1]{% diff --git a/Master/texmf-dist/tex/latex/storebox/storebox.sty b/Master/texmf-dist/tex/latex/storebox/storebox.sty index 4666417a38b..9de1791cad4 100644 --- a/Master/texmf-dist/tex/latex/storebox/storebox.sty +++ b/Master/texmf-dist/tex/latex/storebox/storebox.sty @@ -16,8 +16,8 @@ %% and the derived filebase storebox.sty. %% \ProvidesPackage{storebox}[% - 2011/09/22 - v1.0 + 2011/10/21 + v1.1 Store and reuse boxes in a file size efficient way] \DeclareOption{disable}{\let\ifstorebox\iffalse} \DeclareOption{enable}{\let\ifstorebox\iftrue} @@ -29,11 +29,13 @@ \fi \RequirePackage{collectbox}[2011/08/04] \newcommand*\storebox{% - \collectboxcheckenv{storebox}% - \ifcollectboxenv + \begingroup + \def\@tempa{storebox}% + \ifx\@currenvir\@tempa \endgroup \expandafter\@storebox@env \else + \endgroup \expandafter\@storebox \fi } @@ -45,7 +47,7 @@ \def\@storebox@env#1{% \edef\@tempa{% \setbox\collectedbox\hbox\bgroup% - \def\noexpand\@tempa{\noexpand#1}% + \def\noexpand\the@storebox{\noexpand#1}% }% \@tempa \begingroup @@ -56,20 +58,20 @@ \def\@currenvir{storebox\empty}% \ignorespaces } +\def\endstorebox{% + \unskip + \endgroup + \color@endgroup +} \def\@storebox@env@end{% \edef\@tempa{% \egroup \pdfxform\collectedbox \endgroup - \mathchardef\expandafter\noexpand\@tempa=\pdflastxform + \mathchardef\expandafter\noexpand\the@storebox=\pdflastxform }% \@tempa } -\def\endstorebox{% - \unskip - \endgroup - \color@endgroup -} \newcommand*\newstorebox[1]{% \@ifdefinable{#1}{\let#1\relax}% } |