storebox (21oct11)

git-svn-id: svn://tug.org/texlive/trunk@24355 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 11 deletions

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}%
 }