1 files changed, 28 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
index 06d3294fd9c..8f576770434 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: pdfescape
-%% Version: 2011/04/04 v1.12
+%% Version: 2011/11/25 v1.13
 %% 
 %% Copyright (C) 2007, 2010, 2011 by
 %%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -104,7 +104,7 @@
   \fi
 \expandafter\x\csname ver@pdfescape.sty\endcsname
 \ProvidesPackage{pdfescape}%
-  [2011/04/04 v1.12 Provides string conversions (HO)]%
+  [2011/11/25 v1.13 Implements pdfTeX's escape features (HO)]%
 \begingroup\catcode61\catcode48\catcode32=10\relax%
   \catcode13=5 % ^^M
   \endlinechar=13 %
@@ -139,6 +139,8 @@
 }
 \TMP@EnsureCode\catcode{0}{12}% ^^@
 \TMP@EnsureCode\catcode{34}{12}% "
+\TMP@EnsureCode\catcode{36}{3}% $
+\TMP@EnsureCode\catcode{38}{4}% &
 \TMP@EnsureCode\catcode{39}{12}% '
 \TMP@EnsureCode\catcode{42}{12}% *
 \TMP@EnsureCode\catcode{45}{12}% -
@@ -436,12 +438,35 @@
 }
 \def\PE@OctII#1#2{%
   \ifcase\PE@TestOctDigit#2%
-    \def\PE@next{\PE@OctAll{#1#2}}%
+    \def\PE@next{\PE@OctIII#1#2}%
   \else
     \def\PE@next{\PE@OctAll{#1}#2}%
   \fi
   \PE@next
 }
+\ltx@IfUndefined{numexpr}{%
+  \catcode`\$=9 %
+  \catcode`\&=14 %
+}{%
+  \catcode`\$=14 %
+  \catcode`\&=9 %
+}
+\def\PE@OctIII#1#2#3{%
+  \ifnum#1<4 %
+    \def\PE@next{\PE@OctAll{#1#2#3}}%
+  \else
+$   \count\ltx@cclv#1 %
+$   \advance\count\ltx@cclv -4 %
+    \edef\PE@next{%
+      \noexpand\PE@OctAll{%
+$       \the\count\ltx@cclv
+&       \the\numexpr#1-4\relax
+        #2#3%
+      }%
+    }%
+  \fi
+  \PE@next
+}
 \def\PE@OctAll#1{%
   \uccode\ltx@zero='#1\relax
   \uppercase{%