oberdiek update (5sep09)

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

1 files changed, 17 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
index d5d42dabc7e..fa69e6efe07 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
@@ -35,29 +35,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@pdfescape.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{pdfescape}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \expandafter\ifx\csname PackageInfo\endcsname\relax
-      \def\x#1#2{%
-        \immediate\write-1{Package #1 Info: #2.}%
-      }%
-    \else
-      \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-    \fi
-    \x{pdfescape}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -70,6 +67,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax