oberdiek update 11/11

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

1 files changed, 21 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
index f4ffe6090aa..e897304c64e 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
@@ -26,7 +26,8 @@
 %% and the derived files
 %%    pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv,
 %%    pdfescape-test1.tex, pdfescape-test2.tex,
-%%    pdfescape-test3.tex, pdfescape-test4.tex.
+%%    pdfescape-test3.tex, pdfescape-test4.tex,
+%%    pdfescape-test5.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -44,6 +45,9 @@
       \fi
     \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.}%
@@ -57,6 +61,7 @@
   \fi
 \endgroup
 \begingroup
+  \catcode35 6 % #
   \catcode40 12 % (
   \catcode41 12 % )
   \catcode44 12 % ,
@@ -65,6 +70,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
     \def\x#1#2#3[#4]{\endgroup
       \immediate\write-1{Package: #3 #4}%
@@ -80,7 +87,7 @@
   \fi
 \expandafter\x\csname ver@pdfescape.sty\endcsname
 \ProvidesPackage{pdfescape}%
-  [2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)]
+  [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)]
 \expandafter\edef\csname PE@AtEnd\endcsname{%
   \catcode64 \the\catcode64\relax
 }
@@ -98,6 +105,7 @@
 \TMP@EnsureCode\catcode{42}{12}% *
 \TMP@EnsureCode\catcode{45}{12}% -
 \TMP@EnsureCode\catcode{46}{12}% .
+\TMP@EnsureCode\catcode{47}{12}% /
 \TMP@EnsureCode\catcode{60}{12}% <
 \TMP@EnsureCode\catcode{61}{12}% =
 \TMP@EnsureCode\catcode{62}{12}% >
@@ -391,7 +399,13 @@
   \PE@DeString
 }
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfescapehex\endcsname\relax
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input pdftexcmds.sty\relax
+\else
+  \RequirePackage{pdftexcmds}[2007/11/11]%
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdf@escapehex\endcsname\relax
   \long\def\EdefEscapeHex#1#2{%
     \EdefSanitize#1{#2}%
     \PE@SanitizeSpaceOther#1%
@@ -420,16 +434,16 @@
     \expandafter\def\expandafter#1\expandafter{#1}%
   }%
   \long\def\EdefEscapeHex#1#2{%
-    \PE@edefbabel#1\pdfescapehex{#2}%
+    \PE@edefbabel#1\pdf@escapehex{#2}%
   }%
   \def\EdefUnescapeHex#1#2{%
-    \PE@edefbabel#1\pdfunescapehex{#2}%
+    \PE@edefbabel#1\pdf@unescapehex{#2}%
   }%
   \long\def\EdefEscapeName#1#2{%
-    \PE@edefbabel#1\pdfescapename{#2}%
+    \PE@edefbabel#1\pdf@escapename{#2}%
   }%
   \long\def\EdefEscapeString#1#2{%
-    \PE@edefbabel#1\pdfescapestring{#2}%
+    \PE@edefbabel#1\pdf@escapestring{#2}%
   }%
   \PE@AtEnd
   \expandafter\endinput