oberdiek update 11/11

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

23 files changed, 366 insertions, 240 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def
index 5a42a35f271..b38b507b534 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def
@@ -26,11 +26,12 @@
 %% and the derived files
 %%    accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
 %%    accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
-%%    accsupp-example.tex.
+%%    accsupp-example1.tex, accsupp-example2.tex,
+%%    accsupp-test1.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{accsupp-dvipdfm.def}%
-  [2007/03/21 v0.1 accsupp driver for dvipdfm (HO)]%
+  [2007/11/14 v0.2 accsupp driver for dvipdfm (HO)]%
 \def\ACCSUPP@bdc{%
   \special{pdf:content \ACCSUPP@span BDC}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def
index 1e4dbde3444..9553f5bf209 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def
@@ -26,12 +26,13 @@
 %% and the derived files
 %%    accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
 %%    accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
-%%    accsupp-example.tex.
+%%    accsupp-example1.tex, accsupp-example2.tex,
+%%    accsupp-test1.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{accsupp-dvips.def}%
-  [2007/03/21 v0.1 accsupp driver for dvips (HO)]%
-\def\ACCSUPP@bdc#1{%
+  [2007/11/14 v0.2 accsupp driver for dvips (HO)]%
+\def\ACCSUPP@bdc{%
   \special{ps:[\ACCSUPP@span/BDC pdfmark}%
 }
 \def\ACCSUPP@emc{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def
index b1b1456aa90..38f90911ce9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def
@@ -26,11 +26,12 @@
 %% and the derived files
 %%    accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
 %%    accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
-%%    accsupp-example.tex.
+%%    accsupp-example1.tex, accsupp-example2.tex,
+%%    accsupp-test1.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{accsupp-pdftex.def}%
-  [2007/03/21 v0.1 accsupp driver for pdfTeX (HO)]%
+  [2007/11/14 v0.2 accsupp driver for pdfTeX (HO)]%
 \def\ACCSUPP@bdc{%
   \pdfliteral\ACCSUPP@pdfliteral{\ACCSUPP@span BDC}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty
index 14d38a33f10..a26caed005b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty
@@ -26,33 +26,54 @@
 %% and the derived files
 %%    accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
 %%    accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
-%%    accsupp-example.tex.
+%%    accsupp-example1.tex, accsupp-example2.tex,
+%%    accsupp-test1.tex.
 %% 
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname ACCSUPP@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\ACCSUPP@AtEnd{%
+    \ACCSUPP@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{94}{7}% ^ (superscript)
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{254}{12}% ^^fe
+\TMP@EnsureCode{255}{12}% ^^ff
+\g@addto@macro\ACCSUPP@AtEnd{\endinput}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{accsupp}%
-  [2007/03/21 v0.1 Accessibility support by marked content (HO)]%
-\edef\ACCSUPP@end{%
-  \catcode39 \the\catcode39 % '
-  \catcode40 \the\catcode40 % (
-  \catcode41 \the\catcode41 % )
-  \catcode60 \the\catcode60 % <
-  \catcode61 \the\catcode61 % =
-  \catcode62 \the\catcode62 % >
-  \catcode94 \the\catcode94 % ^
-  \catcode96 \the\catcode96 % `
-  \catcode254 \the\catcode254 % ^^FE
-  \catcode255 \the\catcode255 % ^^FF
-}
-\@makeother\(
-\@makeother\)
-\@makeother\'
-\@makeother\<
-\@makeother\=
-\@makeother\>
-\catcode94 = 7 %
-\@makeother\`
-\@makeother\^^fe
-\@makeother\^^ff
+  [2007/11/14 v0.2 Accessibility support by marked content (HO)]
 \RequirePackage{pdfescape}[2007/02/25]
 \RequirePackage{ifpdf}
 \RequirePackage{ifxetex}
@@ -65,11 +86,11 @@
   \@dblarg\ACCSUPP@@DefineDriverKey
 }
 \def\ACCSUPP@@DefineDriverKey[#1]#2{%
-  \define@key{ActTxt}{#2}[]{%
+  \define@key{ACCSUPP}{#2}[]{%
     \def\ACCSUPP@driver{#1}%
   }%
   \g@addto@macro\ACCSUPP@DisableOptions{%
-    \DisableKeyvalOption{ActTxt}{#2}%
+    \DisableKeyvalOption{ACCSUPP}{#2}%
   }%
 }
 \let\ACCSUPP@DisableOptions\@empty
@@ -79,6 +100,7 @@
 \ACCSUPP@DefineDriverKey{dvipdfm}
 \ACCSUPP@DefineDriverKey[dvipdfm]{dvipdfmx}
 \ACCSUPP@DefineDriverKey[dvipdfm]{xetex}
+\let\ACCSUPP@driver\relax
 \InputIfFileExists{accsupp.cfg}{}{}
 \providecommand*{\ActualTextDriverDefault}{dvips}
 \ifpdf
@@ -87,7 +109,9 @@
   \ifxetex
     \def\ACCSUPP@driver{dvipdfm}%
   \else
-    \let\ACCSUPP@driver\BookmarkDriverDefault
+    \ifx\ACCSUPP@driver\relax
+      \let\ACCSUPP@driver\ActualTextDriverDefault
+    \fi
   \fi
 \fi
 \ProcessKeyvalOptions*
@@ -107,7 +131,7 @@
       Wrong driver, pdfTeX is not running in PDF mode.\MessageBreak
       Package loading is aborted%
     }\@ehc
-    \expandafter\expandafter\expandafter\endinput
+    \expandafter\expandafter\expandafter\ACCSUPP@AtEnd
   \fi
   \def\ACCSUPP@temp{dvipdfm}%
   \ifxetex
@@ -121,12 +145,19 @@
     \fi
   \fi
 \fi
+\ifx\ACCSUPP@driver\relax
+  \PackageError{accsupp}{%
+    Missing driver option.\MessageBreak
+    Package loading is aborted%
+  }\@ehc
+  \expandafter\ACCSUPP@AtEnd
+\fi
 \InputIfFileExists{accsupp-\ACCSUPP@driver.def}{}{%
   \PackageError{accsupp}{%
     Unsupported driver `\ACCSUPP@driver'.\MessageBreak
     Package loading is aborted%
   }\@ehc
-  \endinput
+  \ACCSUPP@AtEnd
 }
 \DeclareBoolOption{unicode}
 \DeclareStringOption[page]{pdfliteral}
@@ -223,7 +254,7 @@
   }%
 }
 \def\ACCSUPP@method@pdfstringdef#1{%
-  \ifActText@unicode
+  \ifACCSUPP@unicode
     \@ifundefined{hypersetup}{}{%
       \hypersetup{unicode}%
     }%
@@ -234,11 +265,16 @@
     }\@ehc
     \let\ACCSUPP@temp\@empty
   }{%
-    \pdfstringdef\ACCSUPP@temp#1%
+    \begingroup
+      \setbox0=\hbox{%
+        \pdfstringdef\ACCSUPP@temp#1%
+        \global\let\ACCSUPP@temp\ACCSUPP@temp
+      }%
+    \endgroup
   }%
   \edef#1{(\ACCSUPP@temp)}%
 }
-\ACCSUPP@end
+\ACCSUPP@AtEnd
 \endinput
 %%
 %% End of file `accsupp.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty
index 47ce9af4d6d..11ec911e0c4 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty
@@ -41,10 +41,22 @@
 %%    askinclude-test23.tex, askinclude-test24.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\expandafter\edef\csname AskInc@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname AskInc@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\AskInc@AtEnd{%
     \AskInc@AtEnd
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty
index 4dbc977a358..e7287fe1901 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty
@@ -29,7 +29,7 @@
 %%    bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
 %% 
 \ProvidesPackage{bmpsize-base}%
-  [2007/05/01 v1.3 Basic part of bmpsize (HO)]%
+  [2007/11/11 v1.4 Basic part of bmpsize (HO)]%
 \RequirePackage{fp-basic}
 \RequirePackage{fp-snap}
 \long\def\@bmpsize@plain@loop#1\repeat{%
@@ -40,6 +40,7 @@
   \iterate
   \let\iterate\relax
 }
+\RequirePackage{pdftexcmds}[2007/11/11]
 \newif\ifbmpsize@ok
 \let\@bmpsize@ok\bmpsize@oktrue
 
@@ -74,7 +75,7 @@
 \def\@bmpsize@break#1\@bmpsize@loop#2{}
 
 \def\@bmpsize@size#1#2#3{%
-  \edef#3{\pdffilesize{#1}}%
+  \edef#3{\pdf@filesize{#1}}%
   \ifx#3\@empty
     \expandafter\@bmpsize@stop
   \fi
@@ -84,7 +85,7 @@
 }
 
 \def\@bmpsize@read#1#2#3{%
-  \edef\@bmpsize@buf{\pdffiledump offset#3length#2{#1}}%
+  \edef\@bmpsize@buf{\pdf@filedump{#3}{#2}{#1}}%
   \edef\@bmpsize@temp{%
     \noexpand\@bmpsize@check@byte{#2}\@bmpsize@buf{}{}\noexpand\\%
   }%
@@ -98,8 +99,7 @@
   \fi
   {%
     \edef\@bmpsize@buf{%
-      \pdffiledump offset\bmpsize@offset
-                   length\bmpsize@fillbuflength{#1}%
+      \pdf@filedump{\bmpsize@offset}{\bmpsize@fillbuflength}{#1}%
     }%
     \ifx\@bmpsize@buf\@empty
       \expandafter\@bmpsize@stop
@@ -117,13 +117,13 @@
 }
 
 \def\@bmpsize@iswhite#1{%
-  \ifnum\pdfstrcmp{#1}{09}=\z@
+  \ifnum\pdf@strcmp{#1}{09}=\z@
   \else
-    \ifnum\pdfstrcmp{#1}{0A}=\z@
+    \ifnum\pdf@strcmp{#1}{0A}=\z@
     \else
-      \ifnum\pdfstrcmp{#1}{0D}=\z@
+      \ifnum\pdf@strcmp{#1}{0D}=\z@
       \else
-        \ifnum\pdfstrcmp{#1}{20}=\z@
+        \ifnum\pdf@strcmp{#1}{20}=\z@
         \else
           1%
         \fi
@@ -133,10 +133,10 @@
   \space
 }
 \def\@bmpsize@isdigit#1{%
-  \ifnum\pdfstrcmp{#1}{30}<\z@
+  \ifnum\pdf@strcmp{#1}{30}<\z@
     1%
   \else
-    \ifnum\pdfstrcmp{#1}{39}>\z@
+    \ifnum\pdf@strcmp{#1}{39}>\z@
       1%
     \fi
   \fi
@@ -199,7 +199,7 @@
   \if@bmpsize@absnum
     \ifnum"\expandafter\@car#1\@nil>7 %
       \edef#1{\expandafter\@bmpsize@abs@byte#1\relax}%
-      \ifnum\pdfstrcmp{#1}{7FFFFFFF}=\z@
+      \ifnum\pdf@strcmp{#1}{7FFFFFFF}=\z@
         \let\@bmpsize@temp\@bmpsize@stop
       \else
         \def\@bmpsize@temp{\edef#1{\the\numexpr#1+1}}%
@@ -237,7 +237,7 @@
   \@bmpsize@grab#14%
   \@bmpsize@swap@maybe#1%
   \@bmpsize@abs@maybe#1%
-  \ifnum\pdfstrcmp{#1}{7FFFFFFF}>\z@
+  \ifnum\pdf@strcmp{#1}{7FFFFFFF}>\z@
     \expandafter\@bmpsize@stop
   \fi
   \edef#1{\number"#1}%
@@ -434,14 +434,14 @@
   \@bmpsize@grab\bmpsize@temp{8}%
   \@bmpsize@skip@four
   \@bmpsize@skip@four
-  \ifnum\pdfstrcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
   \@bmpsize@num@four\bmpsize@length
   \@bmpsize@grab\bmpsize@temp{4}%
   \@bmpsize@skip@four
-  \ifnum\pdfstrcmp{\bmpsize@temp}{49484452}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{49484452}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
@@ -454,7 +454,7 @@
     \@bmpsize@num@four\bmpsize@length
     \@bmpsize@grab\bmpsize@temp{4}%
     \@bmpsize@skip@four
-    \ifnum\pdfstrcmp{\bmpsize@temp}{49444154}=\z@
+    \ifnum\pdf@strcmp{\bmpsize@temp}{49444154}=\z@
       \expandafter\@firstofone
     \else
       \expandafter\@gobble
@@ -462,7 +462,7 @@
     {%
       \@bmpsize@stop
     }%
-    \ifnum\pdfstrcmp{\bmpsize@temp}{70485973}=\z@
+    \ifnum\pdf@strcmp{\bmpsize@temp}{70485973}=\z@
       \expandafter\@firstofone
     \else
       \expandafter\@gobble
@@ -495,7 +495,7 @@
   \@bmpsize@grab\bmpsize@temp{3}%
   \@bmpsize@skip@two
   \@bmpsize@skip@one
-  \ifnum\pdfstrcmp{\bmpsize@temp}{FFD8FF}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{FFD8FF}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
@@ -505,7 +505,7 @@
     \@bmpsize@read{#1}{4}{\bmpsize@offset}%
     \@bmpsize@grab\bmpsize@temp{1}%
     \@bmpsize@skip@one
-    \ifnum\pdfstrcmp{\bmpsize@temp}{FF}=\z@
+    \ifnum\pdf@strcmp{\bmpsize@temp}{FF}=\z@
     \else
       \expandafter\@bmpsize@stop
     \fi
@@ -541,7 +541,7 @@
           \@bmpsize@grab\bmpsize@temp{5}%
           \@bmpsize@skip@four
           \@bmpsize@skip@one
-          \ifnum\pdfstrcmp{\bmpsize@temp}{4A46494600}=\z@
+          \ifnum\pdf@strcmp{\bmpsize@temp}{4A46494600}=\z@
             \expandafter\@firstofone
           \else
             \expandafter\@gobble
@@ -592,7 +592,7 @@
           \@bmpsize@grab\bmpsize@temp{6}%
           \@bmpsize@skip@four
           \@bmpsize@skip@two
-          \ifnum\pdfstrcmp{\bmpsize@temp}{457869660000}=\z@
+          \ifnum\pdf@strcmp{\bmpsize@temp}{457869660000}=\z@
             \expandafter\@firstofone
           \else
             \expandafter\@gobble
@@ -601,7 +601,7 @@
             \edef\bmpsize@exifoffset{\the\numexpr\bmpsize@offset+10}%
             \@bmpsize@grab\bmpsize@temp{2}%
             \@bmpsize@skip@two
-            \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@
+            \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@
               \expandafter\@firstoftwo
             \else
               \expandafter\@secondoftwo
@@ -609,7 +609,7 @@
             {%
               \@bmpsize@bigendianfalse
             }{%
-              \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@
+              \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@
               \else
                 \expandafter\@bmpsize@stop
               \fi
@@ -801,7 +801,7 @@
   \@bmpsize@read{#1}{26}{0}%
   \@bmpsize@grab\bmpsize@temp{2}%
   \@bmpsize@skip@two
-  \ifnum\pdfstrcmp{\bmpsize@temp}{424D}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{424D}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
@@ -854,7 +854,7 @@
   \@bmpsize@grab\bmpsize@temp{3}%
   \@bmpsize@skip@two
   \@bmpsize@skip@one
-  \ifnum\pdfstrcmp{\bmpsize@temp}{474946}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{474946}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
@@ -884,7 +884,7 @@
   \@bmpsize@read{#1}{8}{0}%
   \@bmpsize@grab\bmpsize@temp{2}%
   \@bmpsize@skip@two
-  \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@
     \expandafter\@firstoftwo
   \else
     \expandafter\@secondoftwo
@@ -892,7 +892,7 @@
   {%
     \@bmpsize@bigendianfalse
   }{%
-    \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@
+    \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@
     \else
       \expandafter\@bmpsize@stop
     \fi
@@ -1015,16 +1015,16 @@
   \def\bmpsize@offset{3}%
   \@bmpsize@grab\bmpsize@temp{1}%
   \@bmpsize@skip@one
-  \ifnum\pdfstrcmp{\bmpsize@temp}{50}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{50}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
   \@bmpsize@grab\bmpsize@temp{1}%
   \@bmpsize@skip@one
-  \ifnum\pdfstrcmp{\bmpsize@temp}{31}<\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{31}<\z@
     \expandafter\@bmpsize@stop
   \fi
-  \ifnum\pdfstrcmp{\bmpsize@temp}{36}>\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{36}>\z@
     \expandafter\@bmpsize@stop
   \fi
   \@bmpsize@grab\bmpsize@temp{1}%
@@ -1047,7 +1047,7 @@
       \expandafter\@firstofone
     \fi
     {%
-      \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@
+      \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@
         \expandafter\@firstoftwo
       \else
         \expandafter\@secondoftwo
@@ -1057,7 +1057,7 @@
           \@bmpsize@fillbuf{#1}%
           \@bmpsize@grab\bmpsize@temp{1}%
           \@bmpsize@skip@one
-          \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+          \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
             \expandafter\@firstoftwo
           \else
             \expandafter\@secondoftwo
@@ -1065,7 +1065,7 @@
           {%
             \@bmpsize@break
           }{%
-            \ifnum\pdfstrcmp{\bmpsize@temp}{0D}=\z@
+            \ifnum\pdf@strcmp{\bmpsize@temp}{0D}=\z@
               \expandafter\@firstofone
             \else
               \expandafter\@gobble
@@ -1106,7 +1106,7 @@
       }%
     }%
   }%
-  \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}%
+  \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}%
   \@bmpsize@loop{%
     \@bmpsize@fillbuf{#1}%
     \@bmpsize@grab\bmpsize@temp{1}%
@@ -1146,7 +1146,7 @@
       }%
     }%
   }%
-  \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}%
+  \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}%
   \@bmpsize@ok
   \@bmpsize@stop
   \@nil
@@ -1160,7 +1160,7 @@
   \@bmpsize@grab\bmpsize@temp{3}%
   \@bmpsize@skip@two
   \@bmpsize@skip@one
-  \ifnum\pdfstrcmp{\bmpsize@temp}{50370A}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{50370A}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
@@ -1176,7 +1176,7 @@
     {%
       \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
     }{%
-      \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@
+      \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@
         \expandafter\@firstoftwo
       \else
         \expandafter\@secondoftwo
@@ -1188,7 +1188,7 @@
           \@bmpsize@grab\bmpsize@temp{1}%
           \@bmpsize@skip@one
           \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
-          \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+          \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
             \expandafter\@firstofone
           \else
             \expandafter\@gobble
@@ -1203,7 +1203,7 @@
         \@bmpsize@grab\bmpsize@head{5}%
         \@bmpsize@skip@four
         \@bmpsize@skip@one
-        \ifnum\pdfstrcmp{\bmpsize@head}{5749445448}=\z@
+        \ifnum\pdf@strcmp{\bmpsize@head}{5749445448}=\z@
           \expandafter\@firstoftwo
         \else
           \expandafter\@secondoftwo
@@ -1258,7 +1258,7 @@
             \@bmpsize@grab\bmpsize@temp{1}%
             \@bmpsize@skip@one
             \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
-            \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+            \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
               \expandafter\@firstofone
             \else
               \expandafter\@gobble
@@ -1267,12 +1267,12 @@
               \@bmpsize@break
             }%
           }%
-          \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}%
+          \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}%
         }{%
           \@bmpsize@grab\bmpsize@temp{1}%
           \@bmpsize@skip@one
           \@bmpsize@append\bmpsize@head\bmpsize@head\bmpsize@temp
-          \ifnum\pdfstrcmp{\bmpsize@head}{454E44484452}=\z@
+          \ifnum\pdf@strcmp{\bmpsize@head}{454E44484452}=\z@
             \expandafter\@firstoftwo
           \else
             \expandafter\@secondoftwo
@@ -1281,7 +1281,7 @@
             \@bmpsize@ok
             \@bmpsize@stop
           }{%
-            \ifnum\pdfstrcmp{\bmpsize@head}{484549474854}=\z@
+            \ifnum\pdf@strcmp{\bmpsize@head}{484549474854}=\z@
               \expandafter\@firstoftwo
             \else
               \expandafter\@secondoftwo
@@ -1336,7 +1336,7 @@
                 \@bmpsize@grab\bmpsize@temp{1}%
                 \@bmpsize@skip@one
                 \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
-                \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+                \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
                   \expandafter\@firstofone
                 \else
                   \expandafter\@gobble
@@ -1345,7 +1345,7 @@
                   \@bmpsize@break
                 }%
               }%
-              \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}%
+              \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}%
             }{%
               \@bmpsize@pushback\bmpsize@head
               \@bmpsize@loop{%
@@ -1353,7 +1353,7 @@
                 \@bmpsize@grab\bmpsize@temp{1}%
                 \@bmpsize@skip@one
                 \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
-                \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+                \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
                   \expandafter\@firstofone
                 \else
                   \expandafter\@gobble
@@ -1380,7 +1380,7 @@
   \@bmpsize@skip@four
   \@bmpsize@skip@one
   \def\bmpsize@offset{9}%
-  \ifnum\pdfstrcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
@@ -1388,7 +1388,7 @@
     \@bmpsize@fillbuf{#1}%
     \@bmpsize@grab\bmpsize@temp{1}%
     \@bmpsize@skip@one
-    \ifnum\pdfstrcmp{\bmpsize@temp}{22}=\z@
+    \ifnum\pdf@strcmp{\bmpsize@temp}{22}=\z@
       \expandafter\@firstofone
     \else
       \expandafter\@gobble
@@ -1396,7 +1396,7 @@
     {%
       \@bmpsize@break
     }%
-    \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@
+    \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@
       \expandafter\@firstofone
     \else
       \expandafter\@gobble
@@ -1405,7 +1405,7 @@
       \@bmpsize@fillbuf{#1}%
       \@bmpsize@grab\bmpsize@temp{1}%
       \@bmpsize@skip@one
-      \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@
+      \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@
         \expandafter\@firstofone
       \else
         \expandafter\@gobble
@@ -1415,7 +1415,7 @@
           \@bmpsize@fillbuf{#1}%
           \@bmpsize@grab\bmpsize@temp{1}%
           \@bmpsize@skip@one
-          \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@
+          \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@
             \expandafter\@firstofone
           \else
             \expandafter\@gobble
@@ -1425,7 +1425,7 @@
               \@bmpsize@fillbuf{#1}%
               \@bmpsize@grab\bmpsize@temp{1}%
               \@bmpsize@skip@one
-              \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@
+              \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@
                 \expandafter\@firstofone
               \else
                 \expandafter\@gobble
@@ -1433,7 +1433,7 @@
               {%
                 \@bmpsize@break
               }%
-              \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@
+              \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@
                 \expandafter\@gobble
               \else
                 \expandafter\@firstofone
@@ -1442,7 +1442,7 @@
                 \@bmpsize@break
               }%
             }%
-            \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@
+            \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@
               \expandafter\@firstofone
             \else
               \expandafter\@gobble
@@ -1503,7 +1503,7 @@
       }%
     }%
   }%
-  \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}%
+  \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}%
   \def\bmpsize@tempnum{}%
   \@bmpsize@loop{%
     \@bmpsize@fillbuf{#1}%
@@ -1552,7 +1552,7 @@
       }%
     }%
   }%
-  \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}%
+  \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}%
   \@bmpsize@ok
   \@bmpsize@stop
   \@nil
@@ -1564,13 +1564,13 @@
   \@bmpsize@read{#1}{16}{1}%
   \@bmpsize@grab\bmpsize@temp{1}%
   \@bmpsize@skip@one
-  \ifnum\pdfstrcmp{\bmpsize@temp}{00}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{00}=\z@
     \expandafter\@gobble
   \else
     \expandafter\@firstofone
   \fi
   {%
-    \ifnum\pdfstrcmp{\bmpsize@temp}{01}=\z@
+    \ifnum\pdf@strcmp{\bmpsize@temp}{01}=\z@
       \expandafter\@gobble
     \else
       \expandafter\@firstofone
@@ -1594,7 +1594,7 @@
   \@bmpsize@skip@four
   \@bmpsize@skip@four
   \@bmpsize@skip@two
-  \ifnum\pdfstrcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@
     \expandafter\@gobble
   \else
     \expandafter\@firstofone
@@ -1632,7 +1632,7 @@
   \@bmpsize@read{#1}{16}{0}%
   \@bmpsize@grab\bmpsize@temp{1}%
   \@bmpsize@skip@one
-  \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
@@ -1671,13 +1671,13 @@
   \@bmpsize@read{#1}{16}{0}%
   \@bmpsize@grab\bmpsize@temp{4}%
   \@bmpsize@skip@four
-  \ifnum\pdfstrcmp{\bmpsize@temp}{44616E4D}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{44616E4D}=\z@
     \expandafter\@gobble
   \else
     \expandafter\@firstofone
   \fi
   {%
-    \ifnum\pdfstrcmp{\bmpsize@temp}{4C696E53}=\z@
+    \ifnum\pdf@strcmp{\bmpsize@temp}{4C696E53}=\z@
     \else
       \expandafter\@bmpsize@stop
     \fi
@@ -1707,7 +1707,7 @@
   \@bmpsize@read{#1}{10}{0}%
   \@bmpsize@grab\bmpsize@temp{2}%
   \@bmpsize@skip@two
-  \ifnum\pdfstrcmp{\bmpsize@temp}{01DA}=\z@
+  \ifnum\pdf@strcmp{\bmpsize@temp}{01DA}=\z@
   \else
     \expandafter\@bmpsize@stop
   \fi
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def
index 042cd5f363c..e53ba4c1329 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def
@@ -29,7 +29,7 @@
 %%    bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
 %% 
 \ProvidesFile{bmpsize-dvipdfm.def}%
-  [2007/05/01 v1.3 Graphics bitmap driver for dvipdfm (HO)]%
+  [2007/11/11 v1.4 Graphics bitmap driver for dvipdfm (HO)]%
 \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{%
   \catcode44 \the\catcode44 % ,
   \catcode46 \the\catcode46 % .
@@ -51,10 +51,10 @@
   \@bmpsize@count=\z@
 }{}
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfescapestring\endcsname\relax
+\expandafter\ifx\csname pdf@escapestring\endcsname\relax
   \def\@bmpsize@pdfescapestring#1{#1}%
 \else
-  \let\@bmpsize@pdfescapestring\pdfescapestring
+  \let\@bmpsize@pdfescapestring\pdf@escapestring
 \fi
 \def\bmpsize@dvipdfm@factor{.99626}
 \def\Ginclude@bmp#1{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
index cf88f50f985..3737f24033b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
@@ -29,7 +29,7 @@
 %%    bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
 %% 
 \ProvidesFile{bmpsize-dvipdfmx.def}%
-  [2007/05/01 v1.3 Graphics bitmap driver for dvipdfmx (HO)]%
+  [2007/11/11 v1.4 Graphics bitmap driver for dvipdfmx (HO)]%
 \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{%
   \catcode44 \the\catcode44 % ,
   \catcode46 \the\catcode46 % .
@@ -51,10 +51,10 @@
   \@bmpsize@count=\z@
 }{}
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfescapestring\endcsname\relax
+\expandafter\ifx\csname pdf@escapestring\endcsname\relax
   \def\@bmpsize@pdfescapestring#1{#1}%
 \else
-  \let\@bmpsize@pdfescapestring\pdfescapestring
+  \let\@bmpsize@pdfescapestring\pdf@escapestring
 \fi
 \def\bmpsize@dvipdfmx@factor{1.3837}
 \def\Ginclude@bmp#1{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def
index 1582bec1cb2..41e6f77d692 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def
@@ -29,7 +29,7 @@
 %%    bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
 %% 
 \ProvidesFile{bmpsize-dvips.def}%
-  [2007/05/01 v1.3 Graphics bitmap driver for dvips (HO)]%
+  [2007/11/11 v1.4 Graphics bitmap driver for dvips (HO)]%
 \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{%
   \catcode44 \the\catcode44 % ,
   \catcode58 \the\catcode58 % :
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex
index 2639a1be762..001a8c7bc26 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex
+++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex
@@ -29,7 +29,7 @@
 %%    bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
 %% 
 \expandafter\ifx\csname NeedsTeXFormat\endcsname\relax
-\input miniltx
+  \input miniltx\relax
 \fi
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdfoutput\endcsname\relax
@@ -60,7 +60,7 @@
     \csname @@end\endcsname
     \end
   }{%
-    \ifnum\pdfstrcmp{\imagename}{opt}=\z@
+    \ifnum\pdf@strcmp{\imagename}{opt}=\z@
       \expandafter\optionmenu
     \else
       \startimg
@@ -130,7 +130,7 @@
     \fi
   }%
   \ifx\@found\@empty
-    \edef\@file@date{\pdffilemoddate{\imagename}}%
+    \edef\@file@date{\pdf@filemoddate{\imagename}}%
     \ifx\@file@date\@empty
       \msg{\space\space --> File not found <--}%
     \else
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty
index bc7be80416f..24140816d40 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty
@@ -29,24 +29,33 @@
 %%    bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
 %% 
 \ProvidesPackage{bmpsize}%
-  [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]%
+  [2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)]%
 \RequirePackage{ifpdf}
 \ifpdf
   \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}%
   \expandafter\endinput
 \fi
+\RequirePackage{pdftexcmds}[2007/11/11]
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdffiledump\endcsname\relax
+\expandafter\ifx\csname pdf@filedump\endcsname\relax
   \PackageError{bmpsize}{%
     You need pdfTeX 1.30.0 or newer%
   }{Package loading is aborted.}%
   \expandafter\endinput
 \fi
 
+\RequirePackage{infwarerr}[2007/09/09]
 \RequirePackage{graphics}
-\RequirePackage{keyval}
+\RequirePackage{keyval}\relax
+\expandafter\ifx\csname KV@errx\endcsname\relax
+  \def\KV@errx#1{%
+    \@PackageError{keyval}{#1}\@ehc
+  }%
+\fi
+\expandafter\ifx\csname KV@err\endcsname\relax
+  \let\KV@err\KV@errx
+\fi
 \RequirePackage{bmpsize-base}
-\RequirePackage{infwarerr}
 
 \InputIfFileExists{bmpsize-\Gin@driver}{}{}
 
@@ -72,18 +81,18 @@
 \x{ }
 \def\@bmpsize@read@resolution#1#2 #3 #4\@nil{%
   \ifcase 0\ifx\\#2\\1\fi
-           \ifnum\pdfstrcmp{#2}{\Gin@exclamation}=\z@
+           \ifnum\pdf@strcmp{#2}{\Gin@exclamation}=\z@
              \ifx\\#3\\1\fi
-             \ifnum\pdfstrcmp{#3}{\Gin@exclamation}=\z@
+             \ifnum\pdf@strcmp{#3}{\Gin@exclamation}=\z@
                1%
              \fi
            \fi
-    \ifcase\pdfstrcmp{#2}{\Gin@exclamation}\relax
+    \ifcase\pdf@strcmp{#2}{\Gin@exclamation}\relax
       \let\bmpsize@pixelx@default\Gin@exclamation
     \else
       \edef\bmpsize@pixelx@default{#2}%
     \fi
-    \ifcase\pdfstrcmp{#3}{\Gin@exclamation}\relax
+    \ifcase\pdf@strcmp{#3}{\Gin@exclamation}\relax
       \let\bmpsize@pixely@default\Gin@exclamation
     \else
       \ifx\\#3\\%
@@ -105,7 +114,7 @@
 
 \let\@bmpsize@org@setfile\Gin@setfile
 \def\Gin@setfile#1#2#3{%
-  \ifcase\pdfstrcmp{#1}{bmp}\relax
+  \ifcase\pdf@strcmp{#1}{bmp}\relax
     \expandafter\@firstofone
   \else
     \expandafter\@gobble
diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
index 1027a683717..ae71aad18a0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
@@ -31,8 +31,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{dtx-attach}
-  [2007/10/29 v2.1 Embed \string\jobname.dtx (HO)]%
-\RequirePackage{embedfile}[2007/10/29]
+  [2007/11/11 v2.2 Embed \string\jobname.dtx (HO)]%
+\RequirePackage{embedfile}[2007/11/11]
 \embedfile[%
   stringmethod=escape,%
   mimetype=plain/text,%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
index 833c0c2215f..25e7b2c9ef2 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
@@ -45,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.}%
@@ -58,6 +61,7 @@
   \fi
 \endgroup
 \begingroup
+  \catcode35 6 % #
   \catcode40 12 % (
   \catcode41 12 % )
   \catcode44 12 % ,
@@ -66,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}%
@@ -81,11 +87,23 @@
   \fi
 \expandafter\x\csname ver@embedfile.sty\endcsname
 \ProvidesPackage{embedfile}%
-  [2007/10/29 v2.1 embed files into PDF (HO)]
-\expandafter\edef\csname EmFi@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+  [2007/11/11 v2.2 embed files into PDF (HO)]
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname EmFi@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\EmFi@AtEnd{%
     \EmFi@AtEnd
@@ -130,8 +148,9 @@
   \EmFi@AtEnd
   \expandafter\endinput
 \fi
+\EmFi@RequirePackage{pdftexcmds}[2007/11/11]
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdffilesize\endcsname\relax
+\expandafter\ifx\csname pdf@filesize\endcsname\relax
   \EmFi@Error{%
     Unsupported pdfTeX version%
   }{%
@@ -140,7 +159,7 @@
   \EmFi@AtEnd
   \expandafter\endinput
 \fi
-\EmFi@RequirePackage{pdfescape}[2007/10/27]
+\EmFi@RequirePackage{pdfescape}[2007/11/11]
 \def\EmFi@temp#1{%
   \expandafter\EdefSanitize\csname EmFi@S@#1\endcsname{#1}%
 }
@@ -369,7 +388,7 @@
         \EmFi@convert\EmFi@title\EmFi@title
         \xdef\EmFi@schema{%
           \EmFi@schema
-          /\pdfescapename{\EmFi@key}<<%
+          /\pdf@escapename{\EmFi@key}<<%
             /Subtype/%
             \ifx\EmFi@type\EmFi@S@date D%
             \else\ifx\EmFi@type\EmFi@S@number N%
@@ -448,7 +467,7 @@
           \else
             \xdef\EmFi@sortkeys{%
               \EmFi@sortkeys
-              /\pdfescapename{#1}%
+              /\pdf@escapename{#1}%
             }%
             \ifx\EmFi@sortorders\empty
               \global\let\EmFi@sortorders\EmFi@temp
@@ -544,7 +563,7 @@
         \global\EmFi@initialfiletrue
       \fi
       \setkeys{EmFi}{#1}%
-      \expandafter\ifx\expandafter\\\pdffilesize{\EmFi@file}\\%
+      \expandafter\ifx\expandafter\\\pdf@filesize{\EmFi@file}\\%
         \EmFi@Error{%
           File `\EmFi@file' not found%
         }{%
@@ -570,12 +589,12 @@
           /Type/EmbeddedFile%
           \ifx\EmFi@mimetype\empty
           \else
-            /Subtype/\pdfescapename{\EmFi@mimetype}%
+            /Subtype/\pdf@escapename{\EmFi@mimetype}%
           \fi
           /Params<<%
-            /ModDate(\pdffilemoddate{\EmFi@file})%
-            /Size \pdffilesize{\EmFi@file}%
-            /CheckSum<\pdfmdfivesum file{\EmFi@file}>%
+            /ModDate(\pdf@filemoddate{\EmFi@file})%
+            /Size \pdf@filesize{\EmFi@file}%
+            /CheckSum<\pdf@filemdfivesum{\EmFi@file}>%
           >>%
         }file{\EmFi@file}\relax
         \EmFi@defobj{EmbeddedFile}%
@@ -584,7 +603,7 @@
             /Type/Filespec%
             \ifx\EmFi@filesystem\empty
             \else
-            /FS/\pdfescapename{\EmFi@filesystem}%
+            /FS/\pdf@escapename{\EmFi@filesystem}%
             \fi
             /F(\EmFi@@filespec)%
             \ifx\EmFi@@desc\empty
@@ -611,10 +630,10 @@
   \expandafter\ifx\csname EmFi@P@#1\endcsname\relax
     \expandafter\ifx\csname EmFi@V@#1\endcsname\relax
     \else
-      /\pdfescapename{#1}\csname EmFi@V@#1\endcsname
+      /\pdf@escapename{#1}\csname EmFi@V@#1\endcsname
     \fi
   \else
-    /\pdfescapename{#1}<<%
+    /\pdf@escapename{#1}<<%
       \expandafter\ifx\csname EmFi@V@#1\endcsname\relax
       \else
         /D\csname EmFi@V@#1\endcsname
@@ -624,22 +643,22 @@
   \fi
 }
 \def\EmFi@convert#1#2{%
-  \ifnum\pdfstrcmp{\EmFi@stringmethod}{psd}=0 %
+  \ifnum\pdf@strcmp{\EmFi@stringmethod}{psd}=0 %
     \pdfstringdef\EmFi@temp{#1}%
     \let#2\EmFi@temp
   \else
-    \edef#2{\pdfescapestring{#1}}%
+    \edef#2{\pdf@escapestring{#1}}%
   \fi
 }
 \global\let\EmFi@list\empty
 \def\EmFi@add#1#2{%
   \begingroup
-    \edef\key{\pdfescapehex{#1}}%
+    \edef\key{\pdf@escapehex{#1}}%
     \ifx\EmFi@list\empty
       \xdef\EmFi@list{\noexpand\do{\key}{#2}}%
     \else
       \def\do##1##2{%
-        \ifnum\pdfstrcmp{##1}{\key}>0 %
+        \ifnum\pdf@strcmp{##1}{\key}>0 %
           \edef\x{%
             \toks@{%
               \the\toks@%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index 096b22d4abd..41800a8805d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.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@epstopdf.sty\endcsname
 \ProvidesPackage{epstopdf}%
-  [2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)]
-\expandafter\edef\csname ETE@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+  [2007/11/11 v1.6 Conversion with epstopdf on the fly (HO)]
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname ETE@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\ETE@AtEnd{%
     \ETE@AtEnd
@@ -107,6 +125,7 @@
 \RequirePackage{infwarerr}[2007/09/09]
 \RequirePackage{grfext}\relax
 \RequirePackage{kvoptions}[2007/10/02]
+\RequirePackage{pdftexcmds}[2007/11/11]
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname Gin@setfile\endcsname\relax
   \@PackageWarningNoLine{epstopdf}{%
@@ -130,9 +149,9 @@
   \fi
 \endgroup
 \begingroup
-  \expandafter\ifx\csname pdfshellescape\endcsname\relax
+  \expandafter\ifx\csname pdf@shellescape\endcsname\relax
   \else
-    \ifnum\pdfshellescape>0 %
+    \ifnum\pdf@shellescape>0 %
     \else
       \@PackageWarningNoLine{epstopdf}{%
         Shell escape feature is not enabled%
@@ -150,7 +169,7 @@
 \ProcessKeyvalOptions*
 \newcommand*{\epstopdfsetup}{\setkeys{ETE}}
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdffilemoddate\endcsname\relax
+\expandafter\ifx\csname pdf@filemoddate\endcsname\relax
   \def\ETE@Make#1#2{%
     \ifETE@update
       \ETE@WarnModDate
@@ -168,7 +187,7 @@
 \else
   \def\ETE@Make#1#2{%
     \ifETE@update
-      \ifnum\pdfstrcmp{\pdffilemoddate{#1}}{\pdffilemoddate{#2}}>0 %
+      \ifnum\pdf@strcmp{\pdf@filemoddate{#1}}{\pdf@filemoddate{#2}}>0 %
         \expandafter\expandafter\expandafter\@firstofone
       \else
         \@PackageInfoNoLine{epstopdf}{%
@@ -182,8 +201,10 @@
   }%
   \def\ETE@FileInfo#1#2{%
     #1 file: <#2>%
-    \expandafter\ETE@Date\pdffilemoddate{#2}\@nil
-    \expandafter\ETE@Size\pdffilesize{#2}\@nil
+    \expandafter\expandafter\expandafter
+    \ETE@Date\pdf@filemoddate{#2}\@nil
+    \expandafter\expandafter\expandafter
+    \ETE@Size\pdf@filesize{#2}\@nil
   }%
   \def\ETE@Date#1\@nil{%
     \ifx\\#1\\%
@@ -254,7 +275,7 @@
         }%
       \fi
       \ETE@Make\SourceFile\OutputFile{%
-        \immediate\write18{\CommandLine}%
+        \pdf@system{\CommandLine}%
         \ifETE@verbose
           \@PackageInfoNoLine{epstopdf}{%
             \ETE@FileInfo{Result}\OutputFile
diff --git a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty
index 41817c91c0c..9aed33045ad 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty
@@ -43,6 +43,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.}%
@@ -56,6 +59,7 @@
   \fi
 \endgroup
 \begingroup
+  \catcode35 6 % #
   \catcode40 12 % (
   \catcode41 12 % )
   \catcode44 12 % ,
@@ -64,6 +68,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,10 +86,22 @@
 \expandafter\x\csname ver@grfext.sty\endcsname
 \ProvidesPackage{grfext}%
   [2007/09/30 v1.0 Managing graphics extensions (HO)]
-\expandafter\edef\csname grfext@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname grfext@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\grfext@AtEnd{%
     \grfext@AtEnd
diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
index da9cb1d01d1..f7a91e1ceae 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
@@ -28,7 +28,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{grffile}%
-  [2007/08/16 v1.5 Extended file name support for graphics (HO)]%
+  [2007/11/11 v1.6 Extended file name support for graphics (HO)]%
 \edef\grffile@RestoreCatcodes{%
   \catcode`\noexpand\=\the\catcode`\=\relax
   \catcode`\noexpand\:\the\catcode`\:\relax
@@ -67,8 +67,9 @@
 \DeclareDefaultOption{%
   \PassOptionsToPackage\CurrentOption{graphics}%
 }
+\RequirePackage{pdftexcmds}[2007/11/11]
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdffilesize\endcsname\relax
+\expandafter\ifx\csname pdf@filesize\endcsname\relax
   \grffile@spacefalse
   \let\grffile@space@disabled\@empty
   \def\grffile@spacetrue{%
@@ -98,7 +99,8 @@
   \else
     \ifx\grffile@inputencoding\@empty
       \expandafter\ifx\csname inputencodingname\endcsname\relax
-        \expandafter\ifx\csname CurrentInputEncodingOption\endcsname\relax
+        \expandafter\ifx\csname
+            CurrentInputEncodingOption\endcsname\relax
         \else
           \let\grffile@inputencoding\CurrentInputEncodingOption
         \fi
@@ -187,13 +189,13 @@
   }%
 }
 \def\grffile@IfFileExists#1{%
-  \expandafter\ifx\expandafter\\\pdffilesize{#1}\\%
+  \expandafter\ifx\expandafter\\\pdf@filesize{#1}\\%
     \let\reserved@a\@secondoftwo
     \ifx\input@path\@undefined
     \else
       \expandafter\@tfor\expandafter\reserved@b\expandafter
           :\expandafter=\input@path\do{%
-        \expandafter\ifx\expandafter\\\pdffilesize{\reserved@b#1}\\%
+        \expandafter\ifx\expandafter\\\pdf@filesize{\reserved@b#1}\\%
         \else
           \edef\grffile@file@found{\reserved@b#1}%
           \let\reserved@a\@firstoftwo
diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
index 75ab3f2dd14..b8acb55ee3e 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
@@ -28,7 +28,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{holtxdoc}%
-  [2007/10/21 v0.8 Private additional ltxdoc support (HO)]
+  [2007/11/11 v0.9 Private additional ltxdoc support (HO)]
 \RequirePackage[numbered]{hypdoc}
 \RequirePackage{array}
 \def\hld@info#1{%
@@ -137,6 +137,7 @@
 \providecommand*{\eTeX}{\mbox{$\varepsilon$-\TeX}}
 \providecommand*{\pdfTeX}{pdf\TeX}
 \providecommand*{\pdfLaTeX}{pdf\LaTeX}
+\providecommand*{\LuaTeX}{L\textsc{ua}\TeX}
 \def\@temp#1#2{%
   \providecommand*{#1}{%
     \begingroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty
index dec536d7d7f..54abda022f2 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -28,7 +28,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypdestopt}%
-  [2006/06/01 v2.0 Hyperref destination optimizer (HO)]%
+  [2007/11/11 v2.1 Hyperref destination optimizer (HO)]%
 \newif\ifHypDest@Verbose
 \DeclareOption{verbose}{\HypDest@Verbosetrue}
 \def\HypDest@VerboseInfo#1{%
@@ -40,7 +40,8 @@
 \DeclareOption{num}{\HypDest@namefalse}
 \DeclareOption{name}{\HypDest@nametrue}
 \ProcessOptions*\relax
-\RequirePackage{ifpdf}
+\RequirePackage{ifpdf}[2007/09/09]
+\RequirePackage{pdftexcmds}[2007/11/11]
 \ifpdf
 \else
   \PackageError{hypdestopt}{%
@@ -49,7 +50,7 @@
   \expandafter\endinput
 \fi
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfescapehex\endcsname\relax
+\expandafter\ifx\csname pdf@escapehex\endcsname\relax
   \PackageError{hypdestopt}{%
     This pdfTeX is too old, at least 1.30.0 is required%
   }\@ehc
@@ -116,7 +117,7 @@
   }%
   \newalphalph\HypDest@HexString\HypDest@HexChar{250}%
   \renewcommand*{\theHypDest}{%
-    \pdfunescapehex{\HypDest@HexString{\value{HypDest}}}%
+    \pdf@unescapehex{\HypDest@HexString{\value{HypDest}}}%
   }%
 \else
   \renewcommand*{\theHypDest}{%
@@ -128,7 +129,7 @@
   \begingroup
     \edef\x{%
       \expandafter\noexpand
-      \csname\HypDest@Prefix\pdfunescapehex{#1}\endcsname
+      \csname\HypDest@Prefix\pdf@unescapehex{#1}\endcsname
     }%
     \expandafter\ifx\x\relax
       \stepcounter{HypDest}%
@@ -136,12 +137,12 @@
       \let\on@line\@empty
       \ifHypDest@name
         \HypDest@VerboseInfo{%
-          Use: (\pdfunescapehex{#1}) -\string> %
-          0x\pdfescapehex{\x} (\number\value{HypDest})%
+          Use: (\pdf@unescapehex{#1}) -\string> %
+          0x\pdf@escapehex{\x} (\number\value{HypDest})%
         }%
       \else
         \HypDest@VerboseInfo{%
-          Use: (\pdfunescapehex{#1}) -\string> num \x
+          Use: (\pdf@unescapehex{#1}) -\string> num \x
         }%
       \fi
     \fi
@@ -156,7 +157,7 @@
   }%
   \if@filesw
     \immediate\write\@auxout{%
-      \string\HypDest@Use{\pdfescapehex{#1}}%
+      \string\HypDest@Use{\pdf@escapehex{#1}}%
     }%
   \fi
 }%
@@ -177,7 +178,7 @@
         \HypDest@Org@DestName{\csname\HypDest@Prefix#1\endcsname}{#2}%
         \HypDest@VerboseInfo{%
           DestName: (#1) %
-          0x\pdfescapehex{\csname\HypDest@Prefix#1\endcsname}%
+          0x\pdf@escapehex{\csname\HypDest@Prefix#1\endcsname}%
         }%
       }%
     }%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty
index 63e25908eb0..bbd9ce68e6a 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty
@@ -29,13 +29,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypdoc}%
-  [2007/04/11 v1.5 Hyper extensions for doc.sty (HO)]%
+  [2007/11/12 v1.6 Hyper extensions for doc.sty (HO)]%
 \newif\ifHD@numbered
 \DeclareOption{numbered}{\HD@numberedtrue}
 \ProcessOptions*\relax
-
 \RequirePackage{doc}
-
 \ifx\numexpr\@undefined
   \RequirePackage{calc}%
 \fi
@@ -55,12 +53,10 @@
   }},%
 }
 \RequirePackage{thumbpdf}
-
 \newcounter{HD@unique}
 \renewcommand{\theHD@unique}{%
   \number\value{HD@unique}%
 }
-
 \g@addto@macro\Hy@UseMaketitleInfos{%
   \@ifundefined{fileinfo}{}{%
     \ifx\@pdfsubject\@empty
@@ -68,7 +64,6 @@
     \fi
   }%
 }
-
 \pdfstringdefDisableCommands{%
   \let\thanks\@gobble
   \let\footnote\@gobble
@@ -77,9 +72,6 @@
   \let\scshape\@empty
   \def\and{and }%
 }
-
-%%% Bookmarks
-
 \def\HD@sectionpatch{%
   \ifHD@numbered
     \HD@@sectionpatch{section}%
@@ -96,7 +88,6 @@
   }%
 }
 \def\HD@disable@writebookmark#1#2#3#4#5{}
-
 \def\HD@guesstoclevel#1{%
   \expandafter\HD@@guesstoclevel#1\section\HD@end
 }
@@ -107,12 +98,8 @@
     \@nameuse{toclevel@\expandafter\@gobble\string#1\@empty}%
   }%
 }
-
 \let\HDorg@tableofcontents\tableofcontents
 \def\tableofcontents{%
-  % As first section the table of contents shouldn't
-  % go into the toc itself. Also a number looks too funny then.
-  % Just a bookmark is enough in this case.
   \begingroup
     \@ifundefined{c@section}{%
       \def\c@section{0}%
@@ -136,21 +123,19 @@
     \endgroup
   \fi
 }
-
 \let\HDorg@listoffigures\listoffigures
 \def\listoffigures{%
   \ifHD@numbered
   \else
     \stepcounter{HD@unique}%
     \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]%
-        {\contentsname}{toc\theHd@unique}%
+        {\contentsname}{toc\theHD@unique}%
   \fi
   \begingroup
     \HD@sectionpatch
     \HDorg@listoffigures
   \endgroup
 }
-
 \let\HDorg@listoftables\listoftables
 \def\listoftables{%
   \ifHD@numbered
@@ -164,7 +149,6 @@
     \HDorg@listoftables
   \endgroup
 }
-
 \let\HDorg@thebibliography\thebibliography
 \def\thebibliography{%
   \ifHD@numbered
@@ -176,7 +160,6 @@
   \HD@sectionpatch
   \HDorg@thebibliography
 }
-
 \let\HDorg@theindex\theindex
 \def\theindex{%
   \let\HDorg@index@prologue\index@prologue
@@ -216,7 +199,7 @@
   \ifx\HD@hfil\hfil
     \expandafter\HD@@@bfseries
   \fi
-}%
+}
 \def\HD@@@bfseries\hfil#1\hfil{%
   \ifx\\#1\\%
   \else
@@ -229,7 +212,6 @@
   \hfil#1\hfil
 }%
 \def\HD@margin{1mm}
-
 \let\HDorg@theglossary\theglossary
 \def\theglossary{%
   \let\HDorg@glossary@prologue\glossary@prologue
@@ -250,9 +232,6 @@
   \HDorg@theglossary
 }
 \providecommand*{\glossaryname}{Change History}
-
-%%% Index stuff
-
 \newcounter{HD@hypercount}
 \newlength{\HD@helplength}
 \newif\ifHD@savedest
@@ -287,10 +266,8 @@
 \def\HD@savedest@add#1{%
   \immediate\write\HD@savedest@out{\string~#1}%
 }
-
 \newif\ifHD@targetraise
 \HD@targetraisetrue
-
 \def\HD@target{%
   \ifHD@targetraise
     \ifhmode
@@ -319,14 +296,12 @@
   \fi
   \HD@next
 }
-
 \g@addto@macro\CodelineIndex{%
   \let\special@index\HD@codeline@wrindex
 }
 \g@addto@macro\PageIndex{%
   \let\special@index\HD@page@wrindex
 }
-
 \def\HD@codeline@wrindex#1{%
   \begingroup
     \let\HDorg@encapchar\encapchar
@@ -349,7 +324,6 @@
     \HDorg@index{#1\encapchar\encapchar\@nil}%
   \endgroup
 }
-
 \def\hdclindex#1#2#3{%
   \csname\ifx\\#2\\relax\else#2\fi\endcsname{%
     \hyperlink{HD.#1}{#3}%
@@ -361,7 +335,6 @@
     \hyperpage{#2}%
   }%
 }
-
 \let\HDorg@PrintDescribeMacro\PrintDescribeMacro
 \renewcommand\PrintDescribeMacro[1]{%
   \begingroup
@@ -373,7 +346,6 @@
     \HDorg@PrintDescribeMacro{#1}%
   \endgroup
 }
-
 \let\HDorg@PrintMacroName\PrintMacroName
 \renewcommand\PrintMacroName[1]{%
   \begingroup
@@ -385,7 +357,6 @@
     \HDorg@PrintMacroName{#1}%
   \endgroup
 }
-
 \let\HDorg@theCodelineNo\theCodelineNo
 \renewcommand*\theCodelineNo{%
   \settowidth{\HD@helplength}{\HDorg@theCodelineNo\ }%
@@ -400,11 +371,9 @@
   \fi
   \HDorg@theCodelineNo
 }
-
 \AtBeginDocument{%
   \let\HDorg@index\index
 }
-
 \let\HDorg@SpecialUsageIndex\SpecialUsageIndex
 \renewcommand*\SpecialUsageIndex[1]{%
   \@bsphack
@@ -419,7 +388,6 @@
   \endgroup
   \@esphack
 }
-
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname autoindex\endcsname\relax
 \else
@@ -438,7 +406,6 @@
     \@esphack
   }%
 \fi
-
 \let\HDorg@SpecialEnvIndex\SpecialEnvIndex
 \renewcommand*\SpecialEnvIndex[1]{%
   \@bsphack
@@ -452,7 +419,6 @@
   \endgroup
   \@esphack
 }
-
 \let\HDorg@SortIndex\SortIndex
 \renewcommand*{\SortIndex}[2]{%
   \@bsphack
@@ -462,9 +428,6 @@
   \endgroup
   \@esphack
 }
-
-%%% glossary stuff
-
 \let\HDorg@wrglossary\@wrglossary
 \def\@wrglossary#1{%
   \let\HDorg@encapchar\encapchar
@@ -474,9 +437,6 @@
   }%
   \HDorg@wrglossary{#1\encapchar\encapchar\@nil}%
 }
-
-%%% \MacroIndent automatically calculated
-
 \AtEndDocument{%
   \if@filesw
     \immediate\write\@auxout{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
index 975343b7574..121ec0bd309 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
@@ -33,10 +33,22 @@
 %% With color support option 'emphcolor' will dynamically
 %% change the color of \emph statements.
 \NeedsTeXFormat{LaTeX2e}
-\expandafter\edef\csname KVO@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname KVO@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\KVO@AtEnd{%
     \KVO@AtEnd
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
index 329903bff66..80c1a7565cb 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
@@ -48,6 +48,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.}%
@@ -61,6 +64,7 @@
   \fi
 \endgroup
 \begingroup
+  \catcode35 6 % #
   \catcode40 12 % (
   \catcode41 12 % )
   \catcode44 12 % ,
@@ -69,6 +73,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}%
@@ -85,10 +91,22 @@
 \expandafter\x\csname ver@kvoptions.sty\endcsname
 \ProvidesPackage{kvoptions}%
   [2007/10/18 v3.0 Keyval support for LaTeX options (HO)]
-\expandafter\edef\csname KVO@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname KVO@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\KVO@AtEnd{%
     \KVO@AtEnd
diff --git a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty
index 8df07faa148..2436cadbf2d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty
@@ -29,10 +29,22 @@
 %%    listingsutf8-test3.tex, listingsutf8-test4.tex,
 %%    listingsutf8-test5.tex.
 %% 
-\expandafter\edef\csname lstU@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname lstU@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\lstU@AtEnd{%
     \lstU@AtEnd
@@ -65,7 +77,7 @@
 \g@addto@macro\lstU@AtEnd{\endinput}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{listingsutf8}%
-  [2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)]
+  [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)]
 \DeclareOption*{%
   \PassOptionsToPackage\CurrentOption{listings}%
 }
@@ -76,6 +88,7 @@
     \RequirePackage{inputenc}%
   }{}%
 }
+\RequirePackage{pdftexcmds}[2007/11/11]
 \def\lstU@temp#1#2{%
   \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname #1\endcsname\relax
@@ -88,9 +101,9 @@
   \fi
 }
 \lstU@temp{scantokens}{It is provided by e-TeX}
-\lstU@temp{pdfunescapehex}{It is provided by pdfTeX >= 1.30}
-\lstU@temp{pdffiledump}{It is provided by pdfTeX >= 1.30}
-\lstU@temp{pdffilesize}{It is provided by pdfTeX >= 1.30}
+\lstU@temp{pdf@unescapehex}{It is provided by pdfTeX >= 1.30}
+\lstU@temp{pdf@filedump}{It is provided by pdfTeX >= 1.30}
+\lstU@temp{pdf@filesize}{It is provided by pdfTeX >= 1.30}
 \RequirePackage{stringenc}[2007/10/22]
 \newif\iflstU@utfviii
 \def\lstU@inputenc#1{%
@@ -111,8 +124,8 @@
 \def\lstU@input#1{%
   \iflstU@utfviii
     \edef\lstU@text{%
-      \pdfunescapehex{%
-        \pdffiledump length\pdffilesize{#1}{#1}%
+      \pdf@unescapehex{%
+        \pdf@filedump{0}{\pdf@filesize{#1}}{#1}%
       }%
     }%
     \StringEncodingConvert\lstU@text\lstU@text{utf8}\lst@inputenc
diff --git a/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty b/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty
index a6cf3ac5131..d5fde1b2825 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty
@@ -28,11 +28,12 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{stackrel}
-  [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]%
-\RequirePackage{etexcmds}
+  [2007/11/11 v1.2 Adding subscript option to stackrel (HO)]%
+\RequirePackage{etexcmds}[2007/09/09]
 \ifetex@unexpanded
+  \RequirePackage{pdftexcmds}[2007/11/11]%
   \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname pdfstrcmp\endcsname\relax
+  \expandafter\ifx\csname pdf@strcmp\endcsname\relax
     \newcommand*{\stack@relbin}[3][]{%
       \mathop{#3}\limits
       \edef\reserved@a{\etex@unexpanded{#1}}%
@@ -44,8 +45,8 @@
   \else
     \newcommand*{\stack@relbin}[3][]{%
       \mathop{#3}\limits
-      \ifcase\pdfstrcmp{\detokenize{#1}}{}\else_{#1}\fi
-      \ifcase\pdfstrcmp{\detokenize{#2}}{}\else^{#2}\fi
+      \ifcase\pdf@strcmp{\detokenize{#1}}{}\else_{#1}\fi
+      \ifcase\pdf@strcmp{\detokenize{#2}}{}\else^{#2}\fi
       \egroup
     }%
   \fi