oberdiek update 11/11

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

1 files changed, 34 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty
index 664b8e46a12..16927659a5c 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty
@@ -44,6 +44,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 +60,7 @@
   \fi
 \endgroup
 \begingroup
+  \catcode35 6 % #
   \catcode40 12 % (
   \catcode41 12 % )
   \catcode44 12 % ,
@@ -65,6 +69,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,11 +86,23 @@
   \fi
 \expandafter\x\csname ver@bigintcalc.sty\endcsname
 \ProvidesPackage{bigintcalc}%
-  [2007/09/27 v1.0 Expandable big integer calculations (HO)]
-\expandafter\edef\csname BIC@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+  [2007/11/11 v1.1 Expandable big integer calculations (HO)]
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname BIC@AtEnd\endcsname{%
+      \catcode35 \the\catcode35\relax
+      \catcode64 \the\catcode64\relax
+      \catcode123 \the\catcode123\relax
+      \catcode125 \the\catcode125\relax
+    }%
+  }%
+\x
+\catcode35 6 % #
 \catcode64 11 % @
+\catcode123 1 % {
+\catcode125 2 % }
 \def\TMP@EnsureCode#1#2{%
   \edef\BIC@AtEnd{%
     \BIC@AtEnd
@@ -100,6 +118,7 @@
 \TMP@EnsureCode{42}{12}% *
 \TMP@EnsureCode{43}{12}% +
 \TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
 \TMP@EnsureCode{47}{12}% /
 \TMP@EnsureCode{58}{11}% : (letter!)
 \TMP@EnsureCode{60}{12}% <
@@ -128,7 +147,13 @@
   }%
 \x{ }
 \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
   \def\BIC@Expand#1{%
     \romannumeral0%
     \BIC@@Expand#1!\@nil{}%
@@ -160,8 +185,10 @@
   \fi
 \else
   \def\BIC@Expand#1{%
-    \pdfunescapehex{%
-      \expandafter\BIC@StripHexSpace\pdfescapehex{#1}20\@nil
+    \romannumeral0\expandafter\expandafter\expandafter\BIC@Space
+    \pdf@unescapehex{%
+      \expandafter\expandafter\expandafter
+      \BIC@StripHexSpace\pdf@escapehex{#1}20\@nil
     }%
   }%
   \def\BIC@StripHexSpace#120#2\@nil{%