oberdiek update (14sep07)

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

56 files changed, 3200 insertions, 457 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
index 3c4fecd90b2..d8bad96e21f 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
@@ -25,7 +25,8 @@
 %% 
 %% This work consists of the main source file alphalph.dtx
 %% and the derived files
-%%    alphalph.sty, alphalph.pdf, alphalph.ins, alphalph.drv.
+%%    alphalph.sty, alphalph.pdf, alphalph.ins, alphalph.drv,
+%%    alphalph-test1.tex, alphalph-test2.tex, alphalph-test3.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,197 +80,348 @@
   \fi
 \expandafter\x\csname ver@alphalph.sty\endcsname
 \ProvidesPackage{alphalph}%
-  [2007/04/11 v1.5 Converting numbers to letters (HO)]
-\expandafter\edef\csname aa@atcode\endcsname{\the\catcode`\@ }
-\catcode`\@=11
+  [2007/04/11 v2.0 Converting numbers to letters (HO)]
+\expandafter\edef\csname AlPh@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\AlPh@AtEnd{%
+    \AlPh@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{59}{12}% ;
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{91}{12}% [
+\TMP@EnsureCode{93}{12}% ]
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{124}{12}% |
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input infwarerr.sty\relax
+  \input intcalc.sty\relax
+\else
+  \RequirePackage{infwarerr}[2007/09/09]%
+  \RequirePackage{intcalc}[2007/09/09]%
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname numexpr\endcsname\relax
+  \catcode124=9 % '!': ignore
+  \catcode43=14 % '+': comment
+\else
+  \catcode124=14 % '!': comment
+  \catcode43=9   % '+': ignore
+\fi
+\def\AlPh@Error#1{%
+  \begingroup
+    \escapechar=92 % backslash
+    \@PackageError{alphalph}{#1}\@ehc
+  \endgroup
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname @ifdefinable\endcsname\relax
+  \def\AlPh@IfDefinable#1#2{%
+    \ifcase\ifx#1\@undefined\else\ifx#1\relax\else1\fi\fi0 %
+      #2%
+    \else
+      \AlPh@Error{%
+        Command \string#1 already defined%
+      }%
+    \fi
+  }%
+\else
+  \let\AlPh@IfDefinable\@ifdefinable
+\fi
 \long\def\@ReturnAfterElseFi#1\else#2\fi{\fi#1}
 \long\def\@ReturnAfterFi#1\fi{\fi#1}
-\def\aa@alph#1{%
+\expandafter\ifx\csname @gobblefour\endcsname\relax
+  \long\def\@gobblefour#1#2#3#4{}%
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname kernel@ifnextchar\endcsname\relax
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname @ifnextchar\endcsname\relax
+    \def\AlPh@IfOptArg#1#2{%
+      \def\AlPh@TempA{#1}%
+      \def\AlPh@TempB{#2}%
+      \futurelet\AlPh@Token\AlPh@IfOptArgNext
+    }%
+    \let\AlPh@BracketLeft=[%]
+    \def\AlPh@IfOptArgNext{%
+      \ifx\AlPh@Token\AlPh@BracketLeft
+        \expandafter\AlPh@TempA
+      \else
+        \expandafter\AlPh@TempB
+      \fi
+    }%
+  \else
+    \def\AlPh@IfOptArg{\@ifnextchar[}%]
+  \fi
+\else
+  \def\AlPh@IfOptArg{\kernel@ifnextchar[}%]
+\fi
+\def\alphalph@Alph#1{%
   \ifcase#1%
     @%
-  \or a\or b\or c\or d\or e\or f\or g\or h\or i\or j\or k\or l\or m%
-  \or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z%
+  \or A\or B\or C\or D\or E\or F\or G\or H\or I\or J\or K\or L\or M%
+  \or N\or O\or P\or Q\or R\or S\or T\or U\or V\or W\or X\or Y\or Z%
   \else
+    \AlPh@ctrerr
     @%
   \fi
 }
-\def\aa@Alph#1{%
+\def\alphalph@alph#1{%
   \ifcase#1%
     @%
-  \or A\or B\or C\or D\or E\or F\or G\or H\or I\or J\or K\or L\or M%
-  \or N\or O\or P\or Q\or R\or S\or T\or U\or V\or W\or X\or Y\or Z%
+  \or a\or b\or c\or d\or e\or f\or g\or h\or i\or j\or k\or l\or m%
+  \or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z%
   \else
+    \AlPh@ctrerr
     @%
   \fi
 }
-\def\alphalph{\aa@callmake\aa@alph}
-\def\AlphAlph{\aa@callmake\aa@Alph}
-\def\aa@callmake#1#2{%
-  \expandafter\aa@make\expandafter{\number#2}#1%
+\def\AlPh@ctrerr{}
+\def\AlPh@GetNumberOfSymbols#1{%
+  \AlPh@TestNumber1!{#1}%
+  \ifAlPh@Unavailable
+    \def\AlPh@Number{0}%
+    \AlPh@Error{No symbols found}%
+  \else
+    \def\AlPh@Number{1}%
+    \AlPh@ExpSearch2!{#1}%
+  \fi
 }
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname numexpr\endcsname\relax
-  \def\aa@make#1#2{%
-    \ifnum#1<1 %
-    \else
-      \@ReturnAfterFi{%
-        \aa@process1;#1;1..#2%
-      }%
-    \fi
-  }%
-  \def\aa@process#1;#2;{%
-    \ifnum#1=#2 %
-      \expandafter\aa@getresult
-    \else
-      \@ReturnAfterFi{%
-        \expandafter\aa@process\number\aa@inc{#1}\aa@alphinc{;#2;}%
-      }%
-    \fi
-  }%
-  \def\aa@getresult#1..#2{%
-    \aa@@getresult!#2#1..%
-  }%
-  \def\aa@@getresult#1!#2#3.{%
-    \ifx\\#3\\%
-      \@ReturnAfterElseFi{#1}% ready
-    \else
-      \@ReturnAfterFi{%
-        \expandafter\expandafter\expandafter\expandafter
-        \expandafter\expandafter\expandafter
-        \aa@@getresult
-        \expandafter\expandafter\expandafter\expandafter
-        #2{#3}#1!#2%
-      }%
-    \fi
-  }%
-  \def\aa@inc#1{%
-    \ifnum#1<9 %
-      \aa@nextdigit{#1}%
-    \else
-      \aa@reverse#1!!%
-    \fi
-  }%
-  \def\aa@nextdigit#1{\ifcase#1 1\or2\or3\or4\or5\or6\or7\or8\or9\fi}%
-  \def\aa@reverse#1#2!#3!{%
-    \ifx\\#2\\%
-      \aa@addone#1#3!!%
-    \else
-      \@ReturnAfterFi{%
-        \aa@reverse#2!#1#3!%
-      }%
+\newif\ifAlPh@Unavailable
+\def\AlPh@Unavailabletrue{%
+  \global\let\ifAlPh@Unavailable\iftrue
+}
+\def\AlPh@Unavailablefalse{%
+  \global\let\ifAlPh@Unavailable\iffalse
+}
+\def\AlPh@TestNumber#1!#2{%
+  \AlPh@Unavailablefalse
+  \begingroup
+    \setbox0=\hbox{%
+      \begingroup % color
+        \let\@ctrerr\AlPh@Unavailabletrue
+        \let\AlPh@ctrerr\AlPh@Unavailabletrue
+        #2{#1}%
+      \endgroup
+    }%
+    \ifdim\wd0=0pt %
+      \AlPh@Unavailabletrue
     \fi
-  }%
-  \def\aa@addone#1#2!#3!{%
-    \ifnum#1<9 %
-      \expandafter\aa@lastreverse\number\aa@nextdigit#1 #2!#3!%
+  \endgroup
+}
+\def\AlPh@ExpSearch#1!#2{%
+  \let\AlPh@Next\relax
+  \AlPh@TestNumber#1!{#2}%
+  \ifAlPh@Unavailable
+    \expandafter\AlPh@BinSearch\AlPh@Number!#1!{#2}%
+  \else
+    \def\AlPh@Number{#1}%
+    \ifnum#1>1073741823 %
+      \AlPh@TestNumber2147483647!{#2}%
+      \ifAlPh@Unavailable
+        \AlPh@BinSearch#1!2147483647!{#2}%
+      \else
+        \def\AlPh@Number{0}%
+        \AlPh@Error{%
+          Maximal symbol number not found%
+        }%
+      \fi
     \else
-      \@ReturnAfterFi{%
-        \ifx\\#2\\%
-          10#3%
-        \else
-          \@ReturnAfterFi{%
-            \aa@addone#2!0#3!%
-          }%
-        \fi
+      \def\AlPh@Next{%
+        \expandafter\AlPh@ExpSearch\number\intcalcShl{#1}!{#2}%
       }%
     \fi
-  }%
-  \def\aa@lastreverse#1#2!#3!{%
-    \ifx\\#2\\%
-      #1#3%
+  \fi
+  \AlPh@Next
+}
+\def\AlPh@BinSearch#1!#2!#3{%
+  \expandafter\AlPh@ProcessBinSearch
+  \number\intcalcShr{\intcalcAdd{#1}{#2}}!%
+  #1!#2!{#3}%
+}
+\def\AlPh@ProcessBinSearch#1!#2!#3!#4{%
+  \let\AlPh@Next\relax
+  \ifnum#1>#2 %
+    \ifnum#1<#3 %
+      \AlPh@TestNumber#1!{#4}%
+      \ifAlPh@Unavailable
+        \def\AlPh@Next{%
+          \AlPh@BinSearch#2!#1!{#4}%
+        }%
+      \else
+        \def\AlPh@Next{%
+          \AlPh@BinSearch#1!#3!{#4}%
+        }%
+      \fi
     \else
-      \@ReturnAfterFi{%
-        \aa@lastreverse#2!#1#3!%
-      }%
+      \def\AlPh@Number{#2}%
     \fi
+  \else
+    \def\AlPh@Number{#2}%
+  \fi
+  \AlPh@Next
+}
+\def\AlPh@CheckPositive#1!#2{%
+  \ifnum#1<1 %
+    \expandafter\@gobblefour
+  \fi
+  #2{#1}%
+}
+\def\AlPh@Method@alph#1#2#3{%
+  \expandafter\AlPh@CheckPositive
+|   \number#3!%
++   \the\numexpr#3!%
+    \AlPh@ProcessAlph
+    {#1}{#2}%
+}
+\def\AlPh@ProcessAlph#1#2#3{%
+  \ifnum#1>#2 %
+    \@ReturnAfterElseFi{%
+      \expandafter\AlPh@StepAlph\number
+        \intcalcInc{%
+          \intcalcMod{\intcalcDec{#1}}{#2}%
+        }%
+      \expandafter!\number
+        \intcalcDiv{\intcalcDec{#1}}{#2}%
+      !{#2}{#3}%
+    }%
+  \else
+    \@ReturnAfterFi{%
+      #3{#1}%
+    }%
+  \fi
+}
+\def\AlPh@StepAlph#1!#2!#3#4{%
+  \AlPh@ProcessAlph{#2}{#3}{#4}%
+  #4{#1}%
+}
+\def\AlPh@Method@wrap#1#2#3{%
+  \expandafter\AlPh@CheckPositive
+|   \number#3!%
++   \the\numexpr#3!%
+    \AlPh@ProcessWrap
+    {#1}{#2}%
+}
+\def\AlPh@ProcessWrap#1#2#3{%
+  \ifnum#1>#2 %
+    \@ReturnAfterElseFi{%
+      \expandafter\AlPh@StepWrap\number
+        \intcalcInc{\intcalcMod{\intcalcDec{#1}}{#2}}%
+      !{#3}%
+    }%
+  \else
+    \@ReturnAfterFi{%
+      #3{#1}%
+    }%
+  \fi
+}
+\def\AlPh@StepWrap#1!#2{%
+  #2{#1}%
+}
+\def\AlPh@Method@mult#1#2#3{%
+  \expandafter\AlPh@CheckPositive
+|   \number#3!%
++   \the\numexpr#3!%
+    \AlPh@ProcessMult
+    {#1}{#2}%
+}
+\def\AlPh@ProcessMult#1#2#3{%
+  \ifnum#1>#2 %
+    \@ReturnAfterElseFi{%
+      \expandafter\AlPh@StepMult\romannumeral
+        \intcalcInc{\intcalcDiv{\intcalcDec{#1}}{#2}}%
+        000%
+      \expandafter!\number
+        \intcalcInc{\intcalcMod{\intcalcDec{#1}}{#2}}%
+      !{#3}%
+    }%
+  \else
+    \@ReturnAfterFi{%
+      #3{#1}%
+    }%
+  \fi
+}
+\def\AlPh@StepMult#1#2!#3!#4{%
+  \ifx\\#2\\%
+  \else
+    \@ReturnAfterFi{%
+      \AlPh@StepMult#2!#3!{#4}%
+    }%
+  \fi
+  #4{#3}%
+}
+\AlPh@IfDefinable\newalphalph{%
+  \def\newalphalph#1{%
+    \AlPh@IfOptArg{%
+      \AlPh@newalphalph{#1}%
+    }{%
+      \AlPh@newalphalph{#1}[alph]%
+    }%
   }%
-  \def\aa@alphinc#1#2.{%
-    \ifx\\#2\\%
-      \@ReturnAfterElseFi{%
-        #11..% ready
-      }%
-    \else
-      \@ReturnAfterFi{%
-        \ifnum#2<26 %
-          \@ReturnAfterElseFi{%
-            \expandafter\aa@alphinclast\expandafter
-              {\number\aa@inc{#2}}{#1}%
-          }%
-        \else
-          \@ReturnAfterFi{%
-            \aa@alphinc{#11.}%
+}
+\def\AlPh@newalphalph#1[#2]#3#4{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname AlPh@Method@#2\endcsname\relax
+    \AlPh@Error{%
+      Unknown method %
+|     `#2'%
++     `\detokenize{#2}'%
+    }%
+  \else
+    \ifx\\#4\\%
+      \AlPh@GetNumberOfSymbols{#3}%
+      \ifcase\AlPh@Number
+      \else
+        \begingroup
+          \escapechar=92 % backslash
+          \@PackageInfo{alphalph}{%
+            Number of symbols for \string#1 is \AlPh@Number
           }%
-        \fi
-      }%
-    \fi
-  }%
-  \def\aa@alphinclast#1#2{#2#1.}%
-  \newcommand*{\newalphalph}[3]{%
-    \PackageError{alphalph}{%
-      \string\newalphalph\space requires e-TeX%
-    }\@ehc
-\else
-  \def\aa@make#1#2{%
-    \ifnum#1<1 %
-    \else
-      \@ReturnAfterFi{%
-        \aa@eprocess#1;#2%
-      }%
-    \fi
-  }%
-  \def\aa@eprocess#1;#2{%
-    \ifnum#1<27 %
-      \@ReturnAfterElseFi{%
-        #2{#1}%
-      }%
+        \endgroup
+        \expandafter\AlPh@NewAlphAlph
+        \csname AlPh@Method@#2\expandafter\endcsname
+        \AlPh@Number!{#1}{#3}%
+      \fi
     \else
-      \@ReturnAfterFi{%
-        \expandafter\aa@eprocess\number\numexpr(#1-14)/26%
-          \expandafter\expandafter\expandafter;%
-          \expandafter\expandafter\expandafter#2%
-          #2{\numexpr#1-((#1-14)/26)*26}%
-      }%
+      \expandafter\AlPh@NewAlphAlph
+      \csname AlPh@Method@#2\expandafter\endcsname
+|     \number#4!%
++     \the\numexpr#4!%
+      {#1}{#3}%
     \fi
-  }%
-  \def\aa@gen@callmake#1#2#3{%
-    \expandafter\aa@gen@make\expandafter{\number#3}#1{#2}%
-  }%
-  \def\aa@gen@make#1#2#3{%
-    \ifnum#1<1 %
+  \fi
+}%
+\def\AlPh@NewAlphAlph#1#2!#3#4{%
+  \AlPh@IfDefinable#3{%
+    \ifnum#2>0 %
+      \def#3{#1{#2}{#4}}%
     \else
-      \@ReturnAfterFi{%
-        \aa@gen@eprocess{#3}#1;#2%
-      }%
-    \fi
-  }%
-  \def\aa@gen@eprocess#1#2;#3{%
-    \ifnum#2>#1 %
-      \@ReturnAfterElseFi{%
-        \expandafter\aa@gen@eprocess\expandafter{%
-          \number#1\expandafter
+      \AlPh@Error{%
+          Definition of \string#3 failed,\MessageBreak
+          because number of symbols (#2) is not positive%
         }%
-        \number\numexpr(#2-(\aa@half{#1}+1))/#1%
-        \expandafter\expandafter\expandafter;%
-        \expandafter\expandafter\expandafter#3%
-        #3{\numexpr#2-((#2-(\aa@half{#1}+1))/#1)*#1\relax}%
-      }%
-    \else
-      \@ReturnAfterFi{%
-        #3{#2}%
-      }%
     \fi
   }%
-  \def\aa@half#1{%
-    \number\dimexpr.5\dimexpr #1sp\relax\relax
-  }%
-  \newcommand*{\newalphalph}[3]{%
-    \newcommand*{#1}{}%
-    \edef#1{%
-      \noexpand\aa@gen@callmake\noexpand#2{\number\numexpr#3}%
-    }%
-  }%
-\fi
-\catcode`\@=\aa@atcode
+}
+\newalphalph\AlphAlph\alphalph@Alph{26}
+\newalphalph\alphalph\alphalph@alph{26}
+\AlPh@AtEnd
 \endinput
 %%
 %% End of file `alphalph.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
index a8cb607840b..3ff4abf7d23 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
@@ -26,7 +26,7 @@
 %% and the derived files
 %%    atbegshi.sty, atbegshi.pdf, atbegshi.ins, atbegshi.drv,
 %%    atbegshi-example.tex, atbegshi-test1.tex,
-%%    atbegshi-test2.tex.
+%%    atbegshi-test2.tex, atbegshi-test3.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -80,35 +80,33 @@
   \fi
 \expandafter\x\csname ver@atbegshi.sty\endcsname
 \ProvidesPackage{atbegshi}%
-  [2007/06/06 v1.5 At begin shipout hook (HO)]
-\expandafter\edef\csname AtBegShi@End\endcsname{%
-  \catcode40 \the\catcode40\relax % (
-  \catcode41 \the\catcode41\relax % )
-  \catcode44 \the\catcode44\relax % ,
-  \catcode45 \the\catcode45\relax % -
-  \catcode46 \the\catcode46\relax % .
-  \catcode58 \the\catcode58\relax % :
-  \catcode61 \the\catcode61\relax % =
-  \catcode64 \the\catcode64\relax % @
-  \catcode94 \the\catcode94\relax % ^
-  \catcode96 \the\catcode96\relax % `
-  \noexpand\endinput
+  [2007/09/09 v1.6 At begin shipout hook (HO)]
+\expandafter\edef\csname AtBegShi@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
 }
-\catcode40 12 % (
-\catcode41 12 % )
-\catcode44 12 % ,
-\catcode45 12 % -
-\catcode46 12 % .
-\catcode58 12 % :
-\catcode61 12 % =
 \catcode64 11 % @
-\catcode94 7  % ^
-\catcode96 12 % `
+\def\TMP@EnsureCode#1#2{%
+  \edef\AtBegShi@AtEnd{%
+    \AtBegShi@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{94}{7}% ^(superscript)
+\TMP@EnsureCode{96}{12}% `
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \input infwarerr.sty\relax
 \else
-  \RequirePackage{infwarerr}%
+  \RequirePackage{infwarerr}[2007/09/09]%
 \fi
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname @ifdefinable\endcsname\relax
@@ -352,7 +350,8 @@ X \endgroup
 \def\AtBegShi@AbortIfUndefined#1{%
   \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname#1\endcsname\relax
-    \expandafter\AtBegShi@End
+    \AtBegShi@AtEnd
+    \expandafter\endinput
   \fi
 }
 \AtBegShi@AbortIfUndefined{currentgrouplevel}
@@ -612,7 +611,7 @@ X \endgroup
 }{%
   \AtBeginDocument{\AtBegShi@PatchMemoir}%
 }
-\AtBegShi@End
+\AtBegShi@AtEnd
 \endinput
 %%
 %% End of file `atbegshi.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
index a71b8678285..20b21707ce4 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
@@ -25,7 +25,8 @@
 %% This work consists of the main source file catchfile.dtx
 %% and the derived files
 %%    catchfile.sty, catchfile.pdf, catchfile.ins, catchfile.drv,
-%%    catchfile-test1.tex, catchfile-test2.tex.
+%%    catchfile-test1.tex, catchfile-test2.tex,
+%%    catchfile-test3.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,27 +80,30 @@
   \fi
 \expandafter\x\csname ver@catchfile.sty\endcsname
 \ProvidesPackage{catchfile}%
-  [2007/05/30 v1.0 Catches the contents of a file (HO)]
-\expandafter\edef\csname CatchFile@End\endcsname{%
-  \catcode44 \the\catcode44\relax % ,
-  \catcode45 \the\catcode45\relax % -
-  \catcode46 \the\catcode46\relax % .
-  \catcode61 \the\catcode61\relax % =
-  \catcode64 \the\catcode64\relax % @
-  \catcode96 \the\catcode96\relax % `
-  \noexpand\endinput
+  [2007/09/09 v1.1 Catches the contents of a file (HO)]
+\expandafter\edef\csname CatchFile@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
 }
-\catcode44 12 % ,
-\catcode45 12 % -
-\catcode46 12 % .
-\catcode61 12 % =
 \catcode64 11 % @
-\catcode96 12 % `
+\def\TMP@EnsureCode#1#2{%
+  \edef\CatchFile@AtEnd{%
+    \CatchFile@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{96}{12}% `
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \input infwarerr.sty\relax
 \else
-  \RequirePackage{infwarerr}%
+  \RequirePackage{infwarerr}[2007/09/09]%
 \fi
 \begingroup
   \escapechar=92\relax
@@ -112,7 +116,8 @@
       package loading is aborted%
     }\@ehd
     \endgroup
-    \expandafter\CatchFile@End
+    \CatchFile@AtEnd
+    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -135,7 +140,8 @@
     package loading is aborted%
   }\@ehd
   \csname endgroup\endcsname
-  \CatchFile@End
+  \CatchFile@AtEnd
+  \endinput
 \endgroup
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname IfFileExists\endcsname\relax
@@ -226,7 +232,7 @@
 \lowercase{\endgroup
   \def\CatchFile@EOF{AB}%
 }
-\CatchFile@End
+\CatchFile@AtEnd
 \endinput
 %%
 %% End of file `catchfile.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/engord.sty b/Master/texmf-dist/tex/generic/oberdiek/engord.sty
index 10ce62ce22d..57d5b2c2c99 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/engord.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/engord.sty
@@ -25,7 +25,8 @@
 %% 
 %% This work consists of the main source file engord.dtx
 %% and the derived files
-%%    engord.sty, engord.pdf, engord.ins, engord.drv.
+%%    engord.sty, engord.pdf, engord.ins, engord.drv,
+%%    engord-test1.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,9 +80,27 @@
   \fi
 \expandafter\x\csname ver@engord.sty\endcsname
 \ProvidesPackage{engord}%
-  [2007/04/26 v1.4 Provides the ifpdf switch (HO)]
-\expandafter\chardef\csname EO@atcode\endcsname\catcode`\@
-\catcode`\@=11 %
+  [2007/09/09 v1.5 Provides the ifpdf switch (HO)]
+\expandafter\edef\csname EO@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\EO@AtEnd{%
+    \EO@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{36}{3}% $
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{94}{7}% ^(superscript)
+\TMP@EnsureCode{96}{12}% `
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname newcommand\endcsname\relax
   \def\EO@def{\def}%
@@ -95,7 +114,7 @@
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \input infwarerr.sty\relax
 \else
-  \RequirePackage{infwarerr}%
+  \RequirePackage{infwarerr}[2007/09/09]%
 \fi
 \newif\ifengordraise
 \engordraisetrue
@@ -197,7 +216,7 @@
     #2\EO@ord{#1}%
   \fi
 }
-\catcode`\@=\EO@atcode
+\EO@AtEnd
 \endinput
 %%
 %% End of file `engord.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
index 3aea8c29d5e..8759319a8ab 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
@@ -25,7 +25,8 @@
 %% This work consists of the main source file etexcmds.dtx
 %% and the derived files
 %%    etexcmds.sty, etexcmds.pdf, etexcmds.ins, etexcmds.drv,
-%%    etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex.
+%%    etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex,
+%%    etexcmds-test4.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,25 +80,28 @@
   \fi
 \expandafter\x\csname ver@etexcmds.sty\endcsname
 \ProvidesPackage{etexcmds}%
-  [2007/05/06 v1.0 Providing prefix for e-TeX command names (HO)]
-\expandafter\edef\csname etexcmds@End\endcsname{%
-  \catcode44 \the\catcode44\relax % ,
-  \catcode45 \the\catcode45\relax % -
-  \catcode46 \the\catcode46\relax % .
-  \catcode61 \the\catcode61\relax % =
-  \catcode64 \the\catcode64\relax % @
-  \noexpand\endinput
+  [2007/09/09 v1.1 Providing prefix for e-TeX command names (HO)]
+\expandafter\edef\csname etexcmds@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
 }
-\catcode44 12 % ,
-\catcode45 12 % -
-\catcode46 12 % .
-\catcode61 12 % =
 \catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\etexcmds@AtEnd{%
+    \etexcmds@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{61}{12}% =
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \input infwarerr.sty\relax
 \else
-  \RequirePackage{infwarerr}%
+  \RequirePackage{infwarerr}[2007/09/09]%
 \fi
 \newif\ifetex@unexpanded
 \begingroup
@@ -132,7 +136,7 @@
     \fi
   \fi
 \fi
-\InfWarErr@End
+\etexcmds@AtEnd
 \endinput
 %%
 %% End of file `etexcmds.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty
index 40f7d8a5fd0..3823e4329ea 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty
@@ -25,7 +25,8 @@
 %% This work consists of the main source file iflang.dtx
 %% and the derived files
 %%    iflang.sty, iflang.pdf, iflang.ins, iflang.drv,
-%%    iflang-test1.tex, iflang-test2.tex, iflang-test3.tex.
+%%    iflang-test1.tex, iflang-test2.tex, iflang-test3.tex,
+%%    iflang-test4.tex, iflang-test5.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,20 +80,26 @@
   \fi
 \expandafter\x\csname ver@iflang.sty\endcsname
 \ProvidesPackage{iflang}%
-  [2007/04/26 v1.3 Language checks (HO)]
-\expandafter\edef\csname IfLang@endinput\endcsname{%
-  \catcode39 \the\catcode39\relax % '
-  \catcode40 \the\catcode40\relax % (
-  \catcode41 \the\catcode41\relax % )
-  \catcode61 \the\catcode61\relax % =
-  \catcode64 \the\catcode64\relax % @
-  \noexpand\endinput
+  [2007/09/09 v1.4 Language checks (HO)]
+\expandafter\edef\csname IfLang@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
 }
-\catcode39 12\relax % '
-\catcode40 12\relax % (
-\catcode41 12\relax % )
-\catcode61 12\relax % =
-\catcode64 11\relax % @
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\IfLang@AtEnd{%
+    \IfLang@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{61}{12}% =
 \expandafter\ifx\csname @firstoftwo\endcsname\relax
   \long\def\@firstoftwo#1#2{#1}%
 \fi
@@ -135,7 +142,7 @@
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \input infwarerr.sty\relax
 \else
-  \RequirePackage{infwarerr}%
+  \RequirePackage{infwarerr}[2007/09/09]%
 \fi
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname uselanguage\endcsname\relax
@@ -227,7 +234,7 @@
   }%
   \def\IfLanguageName#1{%
     \ifnum\IfLang@IfDefined{languagename}{%
-            \if\expandafter\IfLang@strequal\expandafter%
+            \if\expandafter\IfLang@StrEqual\expandafter%
                            {\languagename}{#1}%
               0%
             \else
@@ -261,7 +268,7 @@
     }%
   }%
 \fi
-\IfLang@endinput
+\IfLang@AtEnd
 \endinput
 %%
 %% End of file `iflang.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty
index 178c394a798..e8fc6a89aa6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty
@@ -25,7 +25,8 @@
 %% 
 %% This work consists of the main source file ifpdf.dtx
 %% and the derived files
-%%    ifpdf.sty, ifpdf.pdf, ifpdf.ins, ifpdf.drv.
+%%    ifpdf.sty, ifpdf.pdf, ifpdf.ins, ifpdf.drv,
+%%    ifpdf-test1.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,7 +80,29 @@
   \fi
 \expandafter\x\csname ver@ifpdf.sty\endcsname
 \ProvidesPackage{ifpdf}%
-  [2006/02/20 v1.4 Provides the ifpdf switch (HO)]
+  [2007/09/09 v1.5 Provides the ifpdf switch (HO)]
+\expandafter\edef\csname ifpdf@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\ifpdf@AtEnd{%
+    \ifpdf@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{39}{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{94}{7}% ^
+\TMP@EnsureCode{96}{12}% `
 \begingroup
   \expandafter\ifx\csname ifpdf\endcsname\relax
   \else
@@ -103,6 +126,7 @@
       therefore package loading is aborted.%
     }%
     \endgroup
+    \ifpdf@AtEnd
     \expandafter\endinput
   \fi
 \endgroup
@@ -126,6 +150,7 @@
   \fi
   \x{ifpdf}{pdfTeX in pdf mode \ifpdf\else not \fi detected}%
 \endgroup
+\ifpdf@AtEnd
 \endinput
 %%
 %% End of file `ifpdf.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
index 0ef75ba37ea..08cfc14c54a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
@@ -25,7 +25,8 @@
 %% 
 %% This work consists of the main source file ifvtex.dtx
 %% and the derived files
-%%    ifvtex.sty, ifvtex.pdf, ifvtex.ins, ifvtex.drv.
+%%    ifvtex.sty, ifvtex.pdf, ifvtex.ins, ifvtex.drv,
+%%    ifvtex-test1.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,7 +80,30 @@
   \fi
 \expandafter\x\csname ver@ifvtex.sty\endcsname
 \ProvidesPackage{ifvtex}%
-  [2007/01/10 v1.2 Switches for detecting VTeX and its modes (HO)]
+  [2007/09/09 v1.3 Switches for detecting VTeX and its modes (HO)]
+\expandafter\edef\csname ifvtex@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\ifvtex@AtEnd{%
+    \ifvtex@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{39}{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}% ^
+\TMP@EnsureCode{96}{12}% `
 \begingroup
   \expandafter\ifx\csname ifvtex\endcsname\relax
   \else
@@ -103,6 +127,7 @@
       therefore package loading is aborted.%
     }%
     \endgroup
+    \ifvtex@AtEnd
     \expandafter\endinput
   \fi
 \endgroup
@@ -165,6 +190,7 @@
     detected%
   }%
 \endgroup
+\ifvtex@AtEnd
 \endinput
 %%
 %% End of file `ifvtex.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
index cd3c9538d20..7458694f251 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
@@ -25,7 +25,8 @@
 %% This work consists of the main source file infwarerr.dtx
 %% and the derived files
 %%    infwarerr.sty, infwarerr.pdf, infwarerr.ins, infwarerr.drv,
-%%    infwarerr-test1.tex, infwarerr-test2.tex.
+%%    infwarerr-test1.tex, infwarerr-test2.tex,
+%%    infwarerr-test3.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,34 +80,30 @@
   \fi
 \expandafter\x\csname ver@infwarerr.sty\endcsname
 \ProvidesPackage{infwarerr}%
-  [2007/06/14 v1.1 Providing info/warning/message (HO)]
-\expandafter\edef\csname InfWarErr@End\endcsname{%
-  \catcode39 \the\catcode39\relax % '
-  \catcode40 \the\catcode40\relax % (
-  \catcode41 \the\catcode41\relax % )
-  \catcode44 \the\catcode44\relax % ,
-  \catcode45 \the\catcode45\relax % -
-  \catcode46 \the\catcode46\relax % .
-  \catcode58 \the\catcode58\relax % :
-  \catcode60 \the\catcode60\relax % <
-  \catcode61 \the\catcode61\relax % =
-  \catcode62 \the\catcode62\relax % >
-  \catcode64 \the\catcode64\relax % @
-  \catcode94 \the\catcode94\relax % ^
-  \noexpand\endinput
+  [2007/09/09 v1.2 Providing info/warning/message (HO)]
+\expandafter\edef\csname InfWarErr@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
 }
-\catcode39 12 % '
-\catcode40 12 % (
-\catcode41 12 % )
-\catcode44 12 % ,
-\catcode45 12 % -
-\catcode46 12 % .
-\catcode58 12 % :
-\catcode60 12 % <
-\catcode61 12 % =
-\catcode62 12 % >
 \catcode64 11 % @
-\catcode94 7  % ^
+\def\TMP@EnsureCode#1#2{%
+  \edef\InfWarErr@AtEnd{%
+    \InfWarErr@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{94}{7}% ^
 \begingroup
   \let\x=Y%
   \def\check#1{%
@@ -142,8 +139,8 @@
   \let\@ClassWarningNoLine\ClassWarningNoLine
   \let\@PackageError\PackageError
   \let\@ClassError\ClassError
-  \csname fi\endcsname
-  \InfWarErr@End
+  \InfWarErr@AtEnd
+  \expandafter\endinput
 \fi
 \begingroup\expandafter\endgroup
 \ifcase\expandafter\ifx\csname inputlineno\endcsname\relax
@@ -273,7 +270,7 @@
     See the #1 class documentation for explanation.%
   }{#3}%
 }
-\InfWarErr@End
+\InfWarErr@AtEnd
 \endinput
 %%
 %% End of file `infwarerr.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty
new file mode 100644
index 00000000000..e92da6bba91
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty
@@ -0,0 +1,1569 @@
+%%
+%% This is file `intcalc.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% intcalc.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 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
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%% 
+%% This work consists of the main source file intcalc.dtx
+%% and the derived files
+%%    intcalc.sty, intcalc.pdf, intcalc.ins, intcalc.drv,
+%%    intcalc-test1.tex, intcalc-test2.tex, intcalc-test3.tex,
+%%    intcalc-test4.tex.
+%% 
+\begingroup
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \expandafter\let\expandafter\x\csname ver@intcalc.sty\endcsname
+  \ifcase 0%
+    \ifx\x\relax % plain
+    \else
+      \ifx\x\empty % LaTeX
+      \else
+        1%
+      \fi
+    \fi
+  \else
+    \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{intcalc}{The package is already loaded}%
+    \endgroup
+    \expandafter\endinput
+  \fi
+\endgroup
+\begingroup
+  \catcode40 12 % (
+  \catcode41 12 % )
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode47 12 % /
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+    \def\x#1#2#3[#4]{\endgroup
+      \immediate\write-1{Package: #3 #4}%
+      \xdef#1{#4}%
+    }%
+  \else
+    \def\x#1#2[#3]{\endgroup
+      #2[{#3}]%
+      \ifx#1\relax
+        \xdef#1{#3}%
+      \fi
+    }%
+  \fi
+\expandafter\x\csname ver@intcalc.sty\endcsname
+\ProvidesPackage{intcalc}%
+  [2007/09/09 v1.0 Expandable integer calculations (HO)]
+\expandafter\edef\csname IntCalc@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\IntCalc@AtEnd{%
+    \IntCalc@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{11}% : (letter!)
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{63}{14}% ? (comment!)
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname IntCalc@TestMode\endcsname\relax
+\else
+  \catcode63=9 % ? (ignore)
+\fi
+? \let\IntCalc@@TestMode\IntCalc@TestMode
+\def\IntCalc@Space{ }
+\def\IntCalc@Abs#1#2!{%
+  \ifx#1-%
+    #2%
+  \else
+    #1#2%
+  \fi
+}
+\def\IntCalc@Sgn#1#2!{%
+  \ifx#1-%
+    -1%
+  \else
+    \ifx#10%
+      0%
+    \else
+      1%
+    \fi
+  \fi
+}
+\def\IntCalc@Min#1!#2!{%
+  \ifnum#1<#2 %
+    #1%
+  \else
+    #2%
+  \fi
+}
+\def\IntCalc@Max#1!#2!{%
+  \ifnum#1>#2 %
+    #1%
+  \else
+    #2%
+  \fi
+}
+\def\IntCalc@Cmp#1!#2!{%
+  \ifnum#1=#2 %
+    0%
+  \else
+    \ifnum#1<#2 %
+      -%
+    \fi
+    1%
+  \fi
+}
+\def\IntCalc@Fac#1!{%
+  \ifcase#1 1% 0!
+  \or 1% 1!
+  \or 2% 2!
+  \or 6% 3!
+  \or 24% 4!
+  \or 120% 5!
+  \or 720% 6!
+  \or 5040% 7!
+  \or 40320% 8!
+  \or 362880% 9!
+  \or 3628800% 10!
+  \or 39916800% 11!
+  \or 479001600% 12!
+  \else
+    \ifnum#1<\z@
+      0\IntCalcError:FacNegative%
+    \else
+      0\IntCalcError:FacOverflow%
+    \fi
+  \fi
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname numexpr\endcsname\relax
+\else
+  \def\intcalcInv#1{%
+    \number-\the\numexpr#1\relax\IntCalc@Space
+  }%
+  \def\intcalcAbs#1{%
+    \number\expandafter\IntCalc@Abs\the\numexpr#1! %
+  }%
+  \def\intcalcSgn#1{%
+    \number\expandafter\IntCalc@Sgn\the\numexpr#1! %
+  }%
+  \def\intcalcMin#1#2{%
+    \number\expandafter\IntCalc@Min
+    \the\numexpr#1\expandafter!%
+    \the\numexpr#2! %
+  }%
+  \def\intcalcMax#1#2{%
+    \number\expandafter\IntCalc@Max
+    \the\numexpr#1\expandafter!%
+    \the\numexpr#2! %
+  }%
+  \def\intcalcCmp#1#2{%
+    \number\expandafter\IntCalc@Cmp
+    \the\numexpr#1\expandafter!\the\numexpr#2! %
+  }%
+  \def\intcalcInc#1{%
+    \the\numexpr#1+1\relax
+  }%
+  \def\intcalcDec#1{%
+    \the\numexpr#1-1\relax
+  }%
+  \def\intcalcAdd#1#2{%
+    \the\numexpr#1+(#2)\relax
+  }%
+  \def\intcalcSub#1#2{%
+    \the\numexpr#1-(#2)\relax
+  }%
+  \def\intcalcShl#1{%
+    \number\expandafter\IntCalc@Shl\the\numexpr#1! %
+  }%
+  \def\IntCalc@Shl#1#2!{%
+    \ifx#1-%
+      0\IntCalcError:ShlNegativeNumber%
+    \else
+      \the\numexpr#1#2*2\relax
+    \fi
+  }%
+  \def\intcalcShr#1{%
+    \number\expandafter\IntCalc@Shr\the\numexpr#1! %
+  }%
+  \def\IntCalc@Shr#1#2!{%
+    \ifx#1-%
+      0\IntCalcError:ShrNegativeNumber%
+    \else
+      \ifodd#1#2 %
+        \the\numexpr(#1#2-1)/2\relax
+      \else
+        \the\numexpr#1#2/2\relax
+      \fi
+    \fi
+  }%
+  \def\intcalcMul#1#2{%
+    \the\numexpr(#1)*(#2)\relax
+  }%
+  \def\intcalcSqr#1{%
+    \number\expandafter\IntCalc@Sqr\the\numexpr#1! %
+  }%
+  \def\IntCalc@Sqr#1!{%
+    \the\numexpr#1*#1\relax
+  }%
+  \def\intcalcFac#1{%
+    \number\expandafter\IntCalc@Fac\the\numexpr#1! %
+  }%
+  \def\intcalcPow#1#2{%
+    \number\expandafter\IntCalc@Pow
+    \the\numexpr#1\expandafter!%
+    \the\numexpr#2! %
+  }%
+  \def\IntCalc@Pow#1#2!#3#4!{%
+    \ifcase#3#4 % power = 0
+      1%
+    \or % power = 1
+      #1#2%
+    \or % power = 2
+      \the\numexpr#1#2*#1#2\relax
+    \else
+      \ifcase#1#2 % basis = 0, power <> 0
+        0%
+        \ifx#3-% power < 0
+          0\IntCalcError:DivisionByZero%
+        \fi
+      \or
+        1% basis = 1
+      \else
+        \ifnum#1#2=\m@ne % basis = -1
+          \ifodd#3#4 %
+            -%
+          \fi
+          1%
+        \else % |basis| > 1
+          \ifx#3-% power < 0
+            0%
+          \else % power > 2
+            \IntCalc@PowRec#1#2!#3#4!1!%
+          \fi
+        \fi
+      \fi
+    \fi
+  }%
+  \def\IntCalc@PowRec#1!#2!#3!{%
+    \ifnum#2=\@ne
+      \the\numexpr#1*#3\relax
+    \else
+      \ifodd#2 %
+        \expandafter\IntCalc@PowRec
+        \the\numexpr#1*#1\expandafter!%
+        \the\numexpr(#2-1)/2\expandafter!%
+        \the\numexpr#1*#3\expandafter\expandafter\expandafter!%
+      \else
+        \expandafter\IntCalc@PowRec
+        \the\numexpr#1*#1\expandafter!%
+        \the\numexpr(#2-1)/2\expandafter!%
+        \number#3\expandafter\expandafter\expandafter!%
+      \fi
+    \fi
+  }%
+  \def\intcalcDiv#1#2{%
+    \number\expandafter\IntCalc@Div
+    \the\numexpr#1\expandafter!%
+    \the\numexpr#2! %
+  }%
+  \def\IntCalc@Div#1!#2!{%
+    \ifcase#2 %
+      0\IntCalcError:DivisionByZero%
+    \else
+      \ifcase#1 %
+        0%
+      \else
+        \expandafter\IntCalc@@Div
+        \romannumeral 0%
+        \ifnum#1<\z@
+          \expandafter-\number-#1%
+        \else
+          \expandafter+\number#1%
+        \fi
+        \expandafter!%
+        \romannumeral 0%
+        \ifnum#2<\z@
+          \expandafter-\number-#2%
+        \else
+          \expandafter+\number#2%
+        \fi
+        !%
+      \fi
+    \fi
+  }%
+  \def\IntCalc@@Div#1#2!#3#4!{%
+    #1#3%
+    \the\numexpr(#2-(#4-1)/2)/#4\relax
+  }%
+  \def\intcalcMod#1#2{%
+    \number\expandafter\IntCalc@Mod
+    \the\numexpr#1\expandafter!%
+    \the\numexpr#2! %
+  }%
+  \def\IntCalc@Mod#1!#2!{%
+    \ifcase#2 %
+      0\IntCalcError:DivisionByZero%
+    \else
+      \ifcase#1 %
+        0%
+      \else
+        \expandafter\IntCalc@@Mod
+        \romannumeral 0%
+        \ifnum#1<\z@
+          \expandafter-\number-#1%
+        \else
+          \expandafter+\number#1%
+        \fi
+        \expandafter!%
+        \romannumeral 0%
+        \ifnum#2<\z@
+          \expandafter-\number-#2%
+        \else
+          \expandafter+\number#2%
+        \fi
+        !%
+      \fi
+    \fi
+  }%
+  \def\IntCalc@@Mod#1#2!#3#4!{%
+    \if#3+%
+      \if#1+%
+        \the\numexpr#2-\IntCalc@@Div+#2!+#4!*#4\relax
+      \else
+        \expandafter\IntCalc@ModX
+        \the\numexpr-#2+\IntCalc@@Div+#2!+#4!*#4!#4!%
+      \fi
+    \else
+      -%
+      \if#1+%
+        \expandafter\IntCalc@ModX
+        \the\numexpr-#2+\IntCalc@@Div+#2!+#4!*#4!#4!%
+      \else
+        \the\numexpr#2-\IntCalc@@Div+#2!+#4!*#4\relax
+      \fi
+    \fi
+  }%
+  \def\IntCalc@ModX#1!#2!{%
+    \ifcase#1 %
+      0%
+    \else
+      \the\numexpr#1+#2\relax
+    \fi
+  }%
+  \IntCalc@AtEnd
+  \expandafter\endinput
+\fi
+\def\intcalcInv#1{%
+  \number\expandafter\IntCalc@Inv\number-#1! %
+}
+\def\IntCalc@Inv#1!{#1}
+\def\intcalcAbs#1{%
+  \number\expandafter\IntCalc@Abs\number#1! %
+}
+\def\intcalcSgn#1{%
+  \number\expandafter\IntCalc@Sgn\number#1! %
+}
+\def\intcalcMin#1#2{%
+  \number\expandafter\IntCalc@Min
+  \number\number#1\expandafter!\number#2! %
+}
+\def\intcalcMax#1#2{%
+  \number\expandafter\IntCalc@Max
+  \number\number#1\expandafter!\number#2! %
+}
+\def\intcalcCmp#1#2{%
+  \number\expandafter\IntCalc@Cmp
+  \number\number#1\expandafter!\number#2! %
+}%
+\def\intcalcInc#1{%
+  \number\expandafter\IntCalc@IncSwitch\number#1! %
+}
+\def\IntCalc@IncSwitch#1#2!{%
+  \ifx#1-%
+    -%
+    \csname IntCalc@Empty%
+    \IntCalc@Dec#2!%
+  \else
+    \csname IntCalc@Empty%
+    \IntCalc@Inc#1#2!%
+  \fi
+}
+\def\intcalcDec#1{%
+  \number\expandafter\IntCalc@DecSwitch\number#1! %
+}
+\def\IntCalc@DecSwitch#1#2!{%
+  \ifx#1-%
+    -%
+    \csname IntCalc@Empty%
+    \expandafter\IntCalc@Inc#2!%
+  \else
+    \ifx#10%
+      -1%
+    \else
+      \csname IntCalc@Empty%
+      \IntCalc@Dec#1#2!%
+    \fi
+  \fi
+}
+\def\IntCalc@Inc#1#2{%
+  \ifx#2!%
+    \csname IntCalc@IncDigit#1\endcsname1%
+  \else
+    \csname IntCalc@IncDigit#1%
+    \expandafter\IntCalc@Inc\expandafter#2%
+  \fi
+}
+\def\IntCalc@Temp#1#2{%
+  \expandafter\def\csname IntCalc@IncDigit#1\endcsname##1{%
+    \endcsname
+    0%
+    \ifcase##1 %
+      #1%
+    \else
+      #2%
+    \fi
+  }%
+}
+\IntCalc@Temp 01
+\IntCalc@Temp 12
+\IntCalc@Temp 23
+\IntCalc@Temp 34
+\IntCalc@Temp 45
+\IntCalc@Temp 56
+\IntCalc@Temp 67
+\IntCalc@Temp 78
+\IntCalc@Temp 89
+\expandafter\def\csname IntCalc@IncDigit9\endcsname#1{%
+  \expandafter\endcsname
+  \ifcase#1 %
+    09%
+  \else
+    10%
+  \fi
+}
+\def\IntCalc@Dec#1#2{%
+  \ifx#2!%
+    \csname IntCalc@DecDigit#1\endcsname1%
+  \else
+    \csname IntCalc@DecDigit#1%
+    \expandafter\IntCalc@Dec\expandafter#2%
+  \fi
+}
+\def\IntCalc@Temp#1#2{%
+  \expandafter\def\csname IntCalc@DecDigit#1\endcsname##1{%
+    \endcsname
+    0%
+    \ifcase##1 %
+      #1%
+    \else
+      #2%
+    \fi
+  }%
+}
+\IntCalc@Temp 98
+\IntCalc@Temp 87
+\IntCalc@Temp 76
+\IntCalc@Temp 65
+\IntCalc@Temp 54
+\IntCalc@Temp 43
+\IntCalc@Temp 32
+\IntCalc@Temp 21
+\IntCalc@Temp 10
+\expandafter\def\csname IntCalc@DecDigit0\endcsname#1{%
+  \expandafter\endcsname
+  \ifcase#1 %
+    00%
+  \else
+    19%
+  \fi
+}
+\def\intcalcAdd#1#2{%
+  \number
+    \expandafter\IntCalc@AddSwitch
+    \number\number#1\expandafter!%
+    \number#2!%
+  \IntCalc@Space
+}
+\def\intcalcSub#1#2{%
+  \number
+    \expandafter\IntCalc@AddSwitch
+    \number\number#1\expandafter!%
+    \number-\number#2!%
+  \IntCalc@Space
+}
+\def\IntCalc@AddSwitch#1!#2!{%
+  \ifnum#1<\z@
+    \ifnum#2<\z@
+      -%
+      \ifnum#1<#2 %
+        \expandafter\IntCalc@Add\number-#1\expandafter!%
+        \IntCalc@Gobble#2!%
+      \else
+        \expandafter\IntCalc@Add\number-#2\expandafter!%
+        \IntCalc@Gobble#1!%
+      \fi
+    \else
+      \ifnum-#1>#2 %
+        -%
+        \expandafter\IntCalc@Sub\IntCalc@Gobble#1!#2!%
+      \else
+        \expandafter\IntCalc@Sub\number#2\expandafter!%
+        \IntCalc@Gobble#1!%
+      \fi
+    \fi
+  \else
+    \ifnum#2<\z@
+      \ifnum#1>-#2 %
+        \expandafter\IntCalc@Sub\number#1\expandafter!%
+        \IntCalc@Gobble#2!%
+      \else
+        -%
+        \expandafter\IntCalc@Sub\IntCalc@Gobble#2!#1!%
+      \fi
+    \else
+      \ifnum#1>#2 %
+        \IntCalc@Add#1!#2!%
+      \else
+        \IntCalc@Add#2!#1!%
+      \fi
+    \fi
+  \fi
+}
+\def\IntCalc@Add#1!#2!{%
+  \ifcase#2 %
+    #1%
+  \else
+    \IntCalc@@Add#1!#2!000000000\IntCalc@Space
+  \fi
+}
+\def\IntCalc@Sub#1!#2!{%
+  \ifnum#1=#2 %
+    0%
+  \else
+    \IntCalc@@Sub#1!#2!000000000\IntCalc@Space
+  \fi
+}
+\def\IntCalc@@Add#1!#2#3!{%
+  \ifx\IntCalc@Empty#3\IntCalc@Empty
+    \@ReturnAfterElseFi{%
+      \IntCalc@@@Add!!#1!#2%
+    }%
+  \else
+    \@ReturnAfterFi{%
+      \IntCalc@@Add#1!#3!#2%
+    }%
+  \fi
+}
+\def\IntCalc@@Sub#1!#2#3!{%
+  \ifx\IntCalc@Empty#3\IntCalc@Empty
+    \@ReturnAfterElseFi{%
+      \IntCalc@@@Sub!!#1!#2%
+    }%
+  \else
+    \@ReturnAfterFi{%
+      \IntCalc@@Sub#1!#3!#2%
+    }%
+  \fi
+}
+\def\IntCalc@@@Add#1!#2!#3#4!#5{%
+  \ifx\IntCalc@Empty#4\IntCalc@Empty
+    \csname IntCalc@Empty%
+    \@ReturnAfterElseFi{%
+      \IntCalc@ProcessAdd#1#3!#5#2%
+    }%
+  \else
+    \@ReturnAfterFi{%
+      \IntCalc@@@Add#1#3!#5#2!#4!%
+    }%
+  \fi
+}
+\def\IntCalc@@@Sub#1!#2!#3#4!#5{%
+  \ifx\IntCalc@Empty#4\IntCalc@Empty
+    \csname IntCalc@Gobble%
+    \@ReturnAfterElseFi{%
+      \IntCalc@ProcessSub#1#3!#5#2%
+    }%
+  \else
+    \@ReturnAfterFi{%
+      \IntCalc@@@Sub#1#3!#5#2!#4!%
+    }%
+  \fi
+}
+\def\IntCalc@ProcessAdd#1#2!#3#4{%
+  \ifx\IntCalc@Empty#2\IntCalc@Empty
+    \csname IntCalc@AddDigit#1\endcsname#3%
+    \romannumeral0#4%
+  \else
+    \csname IntCalc@AddDigit#1\csname IntCalc@DigitCarry#3%
+    \@ReturnAfterFi{%
+      \IntCalc@ProcessAdd#2!#4%
+    }%
+  \fi
+}
+\def\IntCalc@ProcessSub#1#2!#3#4{%
+  \ifx\IntCalc@Empty#2\IntCalc@Empty
+    \csname IntCalc@SubDigit#1\endcsname#3%
+    \romannumeral0#4%
+  \else
+    \csname IntCalc@SubDigit#1\csname IntCalc@DigitCarry#3%
+    \@ReturnAfterFi{%
+      \IntCalc@ProcessSub#2!#4%
+    }%
+  \fi
+}
+\def\IntCalc@Temp#1#2{%
+  \expandafter\def\csname IntCalc@DigitCarry#1\endcsname##1{%
+    \ifcase##1 %
+      \endcsname#1%
+    \else
+      \endcsname#2%
+    \fi
+  }%
+}
+\IntCalc@Temp 01
+\IntCalc@Temp 12
+\IntCalc@Temp 23
+\IntCalc@Temp 34
+\IntCalc@Temp 45
+\IntCalc@Temp 56
+\IntCalc@Temp 67
+\IntCalc@Temp 78
+\IntCalc@Temp 89
+\IntCalc@Temp 9{{10}}
+\expandafter\def\csname IntCalc@AddDigit0\endcsname#1{%
+  \ifnum#1>9 %
+    \endcsname10%
+  \else
+    \endcsname0#1%
+  \fi
+}
+\def\IntCalc@Temp#1#2#3{%
+  \expandafter\def\csname IntCalc@AddDigit#1\endcsname##1{%
+    \ifnum##1>#2 %
+      \endcsname 1%
+    \else
+      \endcsname 0%
+    \fi
+    \ifcase##1 #1% 0
+    #3%
+    \else #1% 10
+    \fi
+  }%
+}
+\IntCalc@Temp 18{%
+  \or 2% 1
+  \or 3% 2
+  \or 4% 3
+  \or 5% 4
+  \or 6% 5
+  \or 7% 6
+  \or 8% 7
+  \or 9% 8
+  \or 0% 9
+}%
+\IntCalc@Temp 27{%
+  \or 3% 1
+  \or 4% 2
+  \or 5% 3
+  \or 6% 4
+  \or 7% 5
+  \or 8% 6
+  \or 9% 7
+  \or 0% 8
+  \or 1% 9
+}%
+\IntCalc@Temp 36{%
+  \or 4% 1
+  \or 5% 2
+  \or 6% 3
+  \or 7% 4
+  \or 8% 5
+  \or 9% 6
+  \or 0% 7
+  \or 1% 8
+  \or 2% 9
+}%
+\IntCalc@Temp 45{%
+  \or 5% 1
+  \or 6% 2
+  \or 7% 3
+  \or 8% 4
+  \or 9% 5
+  \or 0% 6
+  \or 1% 7
+  \or 2% 8
+  \or 3% 9
+}%
+\IntCalc@Temp 54{%
+  \or 6% 1
+  \or 7% 2
+  \or 8% 3
+  \or 9% 4
+  \or 0% 5
+  \or 1% 6
+  \or 2% 7
+  \or 3% 8
+  \or 4% 9
+}%
+\IntCalc@Temp 63{%
+  \or 7% 1
+  \or 8% 2
+  \or 9% 3
+  \or 0% 4
+  \or 1% 5
+  \or 2% 6
+  \or 3% 7
+  \or 4% 8
+  \or 5% 9
+}%
+\IntCalc@Temp 72{%
+  \or 8% 1
+  \or 9% 2
+  \or 0% 3
+  \or 1% 4
+  \or 2% 5
+  \or 3% 6
+  \or 4% 7
+  \or 5% 8
+  \or 6% 9
+}%
+\IntCalc@Temp 81{%
+  \or 9% 1
+  \or 0% 2
+  \or 1% 3
+  \or 2% 4
+  \or 3% 5
+  \or 4% 6
+  \or 5% 7
+  \or 6% 8
+  \or 7% 9
+}%
+\IntCalc@Temp 90{%
+  \or 0% 1
+  \or 1% 2
+  \or 2% 3
+  \or 3% 4
+  \or 4% 5
+  \or 5% 6
+  \or 6% 7
+  \or 7% 8
+  \or 8% 9
+}%
+\def\IntCalc@Temp#1#2{%
+  \expandafter\def\csname IntCalc@SubDigit#1\endcsname##1{%
+    \ifnum##1>#1 %
+      \endcsname 1%
+    \else
+      \endcsname 0%
+    \fi
+    \ifcase##1 #1% 0
+    #2%
+    \else #1% 10
+    \fi
+  }%
+}
+\IntCalc@Temp 0{%
+  \or 9% 1
+  \or 8% 2
+  \or 7% 3
+  \or 6% 4
+  \or 5% 5
+  \or 4% 6
+  \or 3% 7
+  \or 2% 8
+  \or 1% 9
+}
+\IntCalc@Temp 1{%
+  \or 0% 1
+  \or 9% 2
+  \or 8% 3
+  \or 7% 4
+  \or 6% 5
+  \or 5% 6
+  \or 4% 7
+  \or 3% 8
+  \or 2% 9
+}
+\IntCalc@Temp 2{%
+  \or 1% 1
+  \or 0% 2
+  \or 9% 3
+  \or 8% 4
+  \or 7% 5
+  \or 6% 6
+  \or 5% 7
+  \or 4% 8
+  \or 3% 9
+}
+\IntCalc@Temp 3{%
+  \or 2% 1
+  \or 1% 2
+  \or 0% 3
+  \or 9% 4
+  \or 8% 5
+  \or 7% 6
+  \or 6% 7
+  \or 5% 8
+  \or 4% 9
+}
+\IntCalc@Temp 4{%
+  \or 3% 1
+  \or 2% 2
+  \or 1% 3
+  \or 0% 4
+  \or 9% 5
+  \or 8% 6
+  \or 7% 7
+  \or 6% 8
+  \or 5% 9
+}
+\IntCalc@Temp 5{%
+  \or 4% 1
+  \or 3% 2
+  \or 2% 3
+  \or 1% 4
+  \or 0% 5
+  \or 9% 6
+  \or 8% 7
+  \or 7% 8
+  \or 6% 9
+}
+\IntCalc@Temp 6{%
+  \or 5% 1
+  \or 4% 2
+  \or 3% 3
+  \or 2% 4
+  \or 1% 5
+  \or 0% 6
+  \or 9% 7
+  \or 8% 8
+  \or 7% 9
+}
+\IntCalc@Temp 7{%
+  \or 6% 1
+  \or 5% 2
+  \or 4% 3
+  \or 3% 4
+  \or 2% 5
+  \or 1% 6
+  \or 0% 7
+  \or 9% 8
+  \or 8% 9
+}
+\IntCalc@Temp 8{%
+  \or 7% 1
+  \or 6% 2
+  \or 5% 3
+  \or 4% 4
+  \or 3% 5
+  \or 2% 6
+  \or 1% 7
+  \or 0% 8
+  \or 9% 9
+}
+\IntCalc@Temp 9{%
+  \or 8% 1
+  \or 7% 2
+  \or 6% 3
+  \or 5% 4
+  \or 4% 5
+  \or 3% 6
+  \or 2% 7
+  \or 1% 8
+  \or 0% 9
+}
+\def\intcalcShl#1{%
+  \number\expandafter\IntCalc@ShlSwitch\number#1! %
+}
+\def\IntCalc@ShlSwitch#1!{%
+  \ifnum#1<\z@
+    0\IntCalcError:ShlNegativeNumber%
+  \else
+    \csname IntCalc@Empty%
+    \IntCalc@Shl#1!%
+  \fi
+}
+\def\IntCalc@Shl#1#2{%
+  \ifx#2!%
+    \csname IntCalc@ShlDigit#1\endcsname0%
+  \else
+    \csname IntCalc@ShlDigit#1%
+    \@ReturnAfterFi{%
+      \IntCalc@Shl#2%
+    }%
+  \fi
+}
+\expandafter\def\csname IntCalc@ShlDigit0\endcsname{%
+  \endcsname0%
+}
+\def\IntCalc@Temp#1#2#3#4#5{%
+  \expandafter\def\csname IntCalc@ShlDigit#1\endcsname##1{%
+    \expandafter\endcsname
+    \ifcase##1 %
+      #2#3%
+    \else
+      #4#5%
+    \fi
+  }%
+}
+\IntCalc@Temp 10203
+\IntCalc@Temp 20405
+\IntCalc@Temp 30607
+\IntCalc@Temp 40809
+\IntCalc@Temp 51011
+\IntCalc@Temp 61213
+\IntCalc@Temp 71415
+\IntCalc@Temp 81617
+\IntCalc@Temp 91819
+\def\intcalcShr#1{%
+  \number\expandafter\IntCalc@ShrSwitch\number#1! %
+}
+\def\IntCalc@ShrSwitch#1!{%
+  \ifnum#1<\z@
+    0\IntCalcError:ShrNegativeNumber%
+  \else
+    \IntCalc@Shr#1!%
+  \fi
+}
+\def\IntCalc@Shr#1#2{%
+  \IntCalc@ShrDigit#1!%
+  \ifx#2!%
+  \else
+    \@ReturnAfterFi{%
+      \ifodd#1 %
+        \@ReturnAfterElseFi{%
+          \IntCalc@Shr{1#2}%
+        }%
+      \else
+        \expandafter\IntCalc@Shr\expandafter#2%
+      \fi
+    }%
+  \fi
+}
+\def\IntCalc@ShrDigit#1!{%
+  \ifcase#1 0% 0
+  \or 0% 1
+  \or 1% 2
+  \or 1% 3
+  \or 2% 4
+  \or 2% 5
+  \or 3% 6
+  \or 3% 7
+  \or 4% 8
+  \or 4% 9
+  \or 5% 10
+  \or 5% 11
+  \or 6% 12
+  \or 6% 13
+  \or 7% 14
+  \or 7% 15
+  \or 8% 16
+  \or 8% 17
+  \or 9% 18
+  \or 9% 19
+  \fi
+}
+\def\IntCalc@Tim#1#2{%
+  \number
+    \ifcase#2 % 0
+      0%
+    \or % 1
+      #1%
+    \else % 2-9
+      \csname IntCalc@Empty%
+      \IntCalc@ProcessTim#2#1!%
+    \fi
+  \IntCalc@Space
+}
+\def\IntCalc@ProcessTim#1#2#3{%
+  \ifx#3!%
+    \csname IntCalc@TimDigit#2\endcsname#10%
+  \else
+    \csname IntCalc@TimDigit#2\csname IntCalc@Param#1%
+    \@ReturnAfterFi{%
+      \IntCalc@ProcessTim#1#3%
+    }%
+  \fi
+}
+\def\IntCalc@Temp#1{%
+  \expandafter\def\csname IntCalc@Param#1\endcsname{%
+    \endcsname#1%
+  }%
+}
+\IntCalc@Temp 0%
+\IntCalc@Temp 1%
+\IntCalc@Temp 2%
+\IntCalc@Temp 3%
+\IntCalc@Temp 4%
+\IntCalc@Temp 5%
+\IntCalc@Temp 6%
+\IntCalc@Temp 7%
+\IntCalc@Temp 8%
+\IntCalc@Temp 9%
+\expandafter\def\csname IntCalc@TimDigit0\endcsname#1#2{%
+  \endcsname
+  0#2%
+}
+\expandafter\def\csname IntCalc@TimDigit1\endcsname#1#2{%
+  \ifcase#2 %
+    \endcsname 0#1%
+  \else
+    \csname IntCalc@AddDigit#1\endcsname #2%
+  \fi
+}
+\def\IntCalc@Temp#1#2{%
+  \expandafter\def\csname IntCalc@TimDigit#1\endcsname##1{%
+    \expandafter\IntCalc@TimDigitCarry
+    \number
+      \ifcase##1 0% 0
+      #2%
+      \fi
+    !%
+  }%
+}
+\IntCalc@Temp 2{%
+  \or  2% 1
+  \or  4% 2
+  \or  6% 3
+  \or  8% 4
+  \or 10% 5
+  \or 12% 6
+  \or 14% 7
+  \or 16% 8
+  \or 18% 9
+}
+\IntCalc@Temp 3{%
+  \or  3% 1
+  \or  6% 2
+  \or  9% 3
+  \or 12% 4
+  \or 15% 5
+  \or 18% 6
+  \or 21% 7
+  \or 24% 8
+  \or 27% 9
+}
+\IntCalc@Temp 4{%
+  \or  4% 1
+  \or  8% 2
+  \or 12% 3
+  \or 16% 4
+  \or 20% 5
+  \or 24% 6
+  \or 28% 7
+  \or 32% 8
+  \or 36% 9
+}
+\IntCalc@Temp 5{%
+  \or  5% 1
+  \or 10% 2
+  \or 15% 3
+  \or 20% 4
+  \or 25% 5
+  \or 30% 6
+  \or 35% 7
+  \or 40% 8
+  \or 45% 9
+}
+\IntCalc@Temp 6{%
+  \or  6% 1
+  \or 12% 2
+  \or 18% 3
+  \or 24% 4
+  \or 30% 5
+  \or 36% 6
+  \or 42% 7
+  \or 48% 8
+  \or 54% 9
+}
+\IntCalc@Temp 7{%
+  \or  7% 1
+  \or 14% 2
+  \or 21% 3
+  \or 28% 4
+  \or 35% 5
+  \or 42% 6
+  \or 49% 7
+  \or 56% 8
+  \or 63% 9
+}
+\IntCalc@Temp 8{%
+  \or  8% 1
+  \or 16% 2
+  \or 24% 3
+  \or 32% 4
+  \or 40% 5
+  \or 48% 6
+  \or 56% 7
+  \or 64% 8
+  \or 72% 9
+}
+\IntCalc@Temp 9{%
+  \or  9% 1
+  \or 18% 2
+  \or 27% 3
+  \or 36% 4
+  \or 45% 5
+  \or 54% 6
+  \or 63% 7
+  \or 72% 8
+  \or 81% 9
+}
+\def\IntCalc@TimDigitCarry#1!{%
+  \ifnum#1<10 %
+    \csname IntCalc@AddDigit#1\expandafter\endcsname
+  \else
+    \@ReturnAfterFi{%
+      \IntCalc@@TimDigitCarry#1!%
+    }%
+  \fi
+}
+\def\IntCalc@@TimDigitCarry#1#2!#3{%
+  \csname IntCalc@DigitCarry#1%
+  \csname IntCalc@AddDigit#2\endcsname #3%
+}
+\def\intcalcMul#1#2{%
+  \number
+    \expandafter\IntCalc@MulSwitch
+    \number\number#1\expandafter!%
+    \number#2!%
+  \IntCalc@Space
+}
+\def\IntCalc@MulSwitch#1!#2!{%
+  \ifnum#1<\z@
+    \ifnum#2<\z@
+      \ifnum#1<#2 %
+        \expandafter\IntCalc@Mul\number-#1\expandafter!%
+        \IntCalc@Gobble#2!%
+      \else
+        \expandafter\IntCalc@Mul\number-#2\expandafter!%
+        \IntCalc@Gobble#1!%
+      \fi
+    \else
+      -%
+      \ifnum-#1>#2 %
+        \expandafter\IntCalc@Mul\IntCalc@Gobble#1!#2!%
+      \else
+        \expandafter\IntCalc@Mul\number#2\expandafter!%
+        \IntCalc@Gobble#1!%
+      \fi
+    \fi
+  \else
+    \ifnum#2<\z@
+      -%
+      \ifnum#1>-#2 %
+        \expandafter\IntCalc@Mul\number#1\expandafter!%
+        \IntCalc@Gobble#2!%
+      \else
+        \expandafter\IntCalc@Mul\IntCalc@Gobble#2!#1!%
+      \fi
+    \else
+      \ifnum#1>#2 %
+        \IntCalc@Mul#1!#2!%
+      \else
+        \IntCalc@Mul#2!#1!%
+      \fi
+    \fi
+  \fi
+}
+\def\IntCalc@Mul#1!#2!{%
+  \ifcase#2 %
+    0%
+  \or
+    #1%
+  \or
+    \csname IntCalc@Empty%
+    \expandafter\IntCalc@Shl#1!%
+  \else
+    \ifnum#2<10 %
+      \IntCalc@Tim{#1}#2%
+    \else
+      \IntCalc@ProcessMul!#2!#1!%
+    \fi
+  \fi
+}
+\def\IntCalc@ProcessMul#1!#2#3!#4!{%
+  \ifx\IntCalc@Empty#3\IntCalc@Empty
+    \expandafter\IntCalc@Add\number
+    #10\expandafter\expandafter\expandafter!%
+    \IntCalc@Tim{#4}#2!%
+  \else
+    \ifx\IntCalc@Empty#1\IntCalc@Empty
+      \expandafter\expandafter\expandafter\IntCalc@ProcessMul
+      \IntCalc@Tim{#4}#2!%
+      #3!#4!%
+    \else
+      \expandafter\IntCalc@ProcessMul\number
+      \expandafter\IntCalc@Add\number%
+      #10\expandafter\expandafter\expandafter!%
+      \IntCalc@Tim{#4}#2!!%
+      #3!#4!%
+    \fi
+  \fi
+}
+\def\intcalcSqr#1{%
+  \number\expandafter\IntCalc@Sqr\number#1! %
+}
+\def\IntCalc@Sqr#1#2!{%
+  \ifx#1-%
+    \IntCalc@Mul#2!#2!%
+  \else
+    \IntCalc@Mul#1#2!#1#2!%
+  \fi
+}
+\def\intcalcFac#1{%
+  \number\expandafter\IntCalc@Fac\number#1! %
+}
+\def\intcalcPow#1#2{%
+  \number\expandafter\IntCalc@Pow
+  \number\number#1\expandafter!%
+  \number#2! %
+}
+\def\IntCalc@Pow#1#2!#3#4!{%
+  \ifcase#3#4 % power = 0
+    1%
+  \or % power = 1
+    #1#2%
+  \or % power = 2
+    \ifx#1-%
+      \IntCalc@Mul#2!#2!%
+    \else
+      \IntCalc@Mul#1#2!#1#2!%
+    \fi
+  \else
+    \ifcase#1#2 % basis = 0, power <> 0
+      0%
+      \ifx#3-% power < 0
+        0\IntCalcError:DivisionByZero%
+      \fi
+    \or
+      1% basis = 1
+    \else
+      \ifnum#1#2=\m@ne % basis = -1
+        \ifodd#3#4 %
+          -%
+        \fi
+        1%
+      \else % |basis| > 1
+        \ifx#3-% power < 0
+          0%
+        \else % power > 2
+          \ifx#1-% basis < 0
+            \ifodd#3#4 %
+              -%
+            \fi
+            \IntCalc@PowRec#2!#3#4!1!%
+          \else
+            \IntCalc@PowRec#1#2!#3#4!1!%
+          \fi
+        \fi
+      \fi
+    \fi
+  \fi
+}
+\def\IntCalc@PowRec#1!#2!#3!{%
+  \ifnum#2=\@ne
+    \ifnum#1>#3 %
+      \IntCalc@Mul#1!#3!%
+    \else
+      \IntCalc@Mul#3!#1!%
+    \fi
+  \else
+    \expandafter\IntCalc@PowRec
+    \number\IntCalc@Mul#1!#1!\expandafter!%
+    \number\intcalcShr{#2}\expandafter!%
+    \number
+    \ifodd#2 %
+      \ifnum#1>#3 %
+        \IntCalc@Mul#1!#3!%
+      \else
+        \IntCalc@Mul#3!#1!%
+      \fi
+    \else
+      #3%
+    \fi
+    \expandafter!%
+  \fi
+}
+\def\intcalcDiv#1#2{%
+  \number\expandafter\IntCalc@Div
+  \number\number#1\expandafter!%
+  \number#2! %
+}
+\def\IntCalc@Div#1!#2!{%
+  \ifcase#2 %
+    0\IntCalcError:DivisionByZero%
+  \else
+    \ifcase#1 %
+      0%
+    \else
+      \expandafter\IntCalc@DivSwitch
+      \number#1\expandafter!%
+      \number#2!%
+    \fi
+  \fi
+}
+\def\IntCalc@DivSwitch#1!#2!{%
+  \ifnum#1<\z@
+    \ifnum#2<\z@
+      \expandafter\IntCalc@@Div\number-#1\expandafter!%
+      \IntCalc@Gobble#2!%
+    \else
+      -%
+      \expandafter\IntCalc@@Div\IntCalc@Gobble#1!#2!%
+    \fi
+  \else
+    \ifnum#2<\z@
+      -%
+      \expandafter\IntCalc@@Div\number#1\expandafter!%
+      \IntCalc@Gobble#2!%
+    \else
+      \IntCalc@@Div#1!#2!%
+    \fi
+  \fi
+}
+\def\IntCalc@@Div#1!#2!{%
+  \ifnum#1>#2 %
+    \ifcase#2 % 0 already catched
+?     \IntCalcError:ThisCannotHappen%
+    \or % 1
+      #1%
+    \or % 2
+      \IntCalc@Shr#1!%
+    \else
+      \IntCalc@DivStart!#1!#2!#2!%
+    \fi
+  \else
+    \ifnum#1=#2 %
+      1%
+    \else
+      0%
+    \fi
+  \fi
+}
+\def\IntCalc@DivStart#1!#2#3!#4#5{%
+  \ifx#5!%
+    \@ReturnAfterElseFi{%
+      \IntCalc@DivStartI{#1#2}#3=!%
+    }%
+  \else
+    \@ReturnAfterFi{%
+      \IntCalc@DivStart{#1#2}!#3!#5%
+    }%
+  \fi
+}
+\def\IntCalc@DivStartI#1!#2!{%
+  \expandafter\IntCalc@DivStartII
+  \number#2\expandafter\expandafter\expandafter!%
+  \intcalcShl{#2}!%
+  #1!%
+}
+\def\IntCalc@DivStartII#1!#2!{%
+  \expandafter\IntCalc@DivStartIII
+  \number#1\expandafter!%
+  \number#2\expandafter\expandafter\expandafter!%
+  \intcalcShl{#2}!%
+}
+\def\IntCalc@DivStartIII#1!#2!#3!{%
+  \expandafter\IntCalc@DivStartIV
+  \number#1\expandafter!%
+  \number#2\expandafter!%
+  \number#3\expandafter!%
+  \number\IntCalc@Add#3!#2!\expandafter\expandafter\expandafter!%
+  \intcalcShl{#3}!%
+}
+\def\IntCalc@DivStartIV#1!#2!#3!#4!#5!#6!{%
+  \IntCalc@ProcessDiv#6!#1!#2!#3!#4!#5!/%
+}
+\def\IntCalc@ProcessDiv#1#2#3!#4!#5!#6!#7!#8!#9/{%
+  #9%
+  \ifnum#1<#4 % 0
+    0%
+    \ifx#2=%
+    \else
+      \IntCalc@ProcessDiv{#1#2}#3!#4!#5!#6!#7!#8!%
+    \fi
+  \else % 1-9
+    \ifnum#1<#5 % 1
+      1%
+      \ifx#2=%
+      \else
+        \expandafter\IntCalc@ProcessDiv\expandafter{%
+          \number\IntCalc@Sub#1!#4!%
+          #2%
+        }#3!#4!#5!#6!#7!#8!%
+      \fi
+    \else % 2-9
+      \ifnum#1<#7 % 2 3 4 5
+        \ifnum#1<#6 % 2 3
+          \@ReturnAfterElseFi{%
+            \expandafter\IntCalc@@ProcessDiv
+            \number\IntCalc@Sub#1!#5!!%
+            23%
+          }%
+        \else % 4 5
+          \@ReturnAfterFi{%
+            \expandafter\IntCalc@@ProcessDiv
+            \number\IntCalc@Sub#1!#6!!%
+            45%
+          }%
+        \fi
+        #2#3!#4!#5!#6!#7!#8!%
+      \else % 6 7 8 9
+        \ifnum#1<#8 % 6 7
+          \@ReturnAfterElseFi{%
+            \expandafter\IntCalc@@ProcessDiv
+            \number\IntCalc@Sub#1!#7!!%
+            67%
+          }%
+        \else % 8 9
+          \@ReturnAfterFi{%
+            \expandafter\IntCalc@@ProcessDiv
+            \number\IntCalc@Sub#1!#8!!%
+            89%
+          }%
+        \fi
+        #2#3!#4!#5!#6!#7!#8!%
+      \fi
+    \fi
+  \fi
+  \ifx#2=%
+    \expandafter\IntCalc@Gobble
+  \fi
+  /%
+}
+\def\IntCalc@@ProcessDiv#1!#2#3#4#5!#6!{%
+  \ifnum#1<#6 %
+    #2%
+    \@ReturnAfterElseFi{%
+      \ifx#4=%
+        \expandafter\IntCalc@CleanupIV
+      \else
+        \@ReturnAfterFi{%
+          \IntCalc@ProcessDiv{#1#4}#5!#6!%
+        }%
+      \fi
+    }%
+  \else
+    #3%
+    \@ReturnAfterFi{%
+      \ifx#4=%
+        \expandafter\IntCalc@CleanupIV
+      \else
+        \@ReturnAfterFi{%
+          \expandafter\IntCalc@ProcessDiv\expandafter{%
+            \number\IntCalc@Sub#1!#6!\IntCalc@Space
+            #4%
+          }#5!#6!%
+        }%
+      \fi
+    }%
+  \fi
+}
+\def\IntCalc@CleanupIV#1!#2!#3!#4!{}
+\def\intcalcMod#1#2{%
+  \number\expandafter\IntCalc@Mod
+  \number\number#1\expandafter!%
+  \number#2! %
+}
+\def\IntCalc@Mod#1!#2!{%
+  \ifcase#2 %
+    0\IntCalcError:DivisionByZero%
+  \else
+    \ifnum#2<\z@
+      -%
+      \expandafter\IntCalc@Mod
+      \number-#1\expandafter!%
+      \number-#2!%
+    \else
+      \ifcase#1 %
+        0%
+      \else
+        \ifcase#2 % 0 already catched
+?         \IntCalcError:ThisCannotHappen%
+        \or % 1
+          0%
+        \or % 2
+          \ifodd#1 %
+            1%
+          \else
+            0%
+          \fi
+        \else
+          \ifnum#1<\z@
+            \expandafter\IntCalc@ModShift
+            \number-%
+              \expandafter\IntCalc@Sub
+              \number\IntCalc@Gobble#1\expandafter!%
+              \number\intcalcMul{#2}{%
+                \expandafter\IntCalc@Div\IntCalc@Gobble#1!#2!%
+              }!%
+            !#2!%
+          \else
+            \expandafter\IntCalc@Sub\number#1\expandafter!%
+            \number\intcalcMul{#2}{\IntCalc@Div#1!#2!}!%
+          \fi
+        \fi
+      \fi
+    \fi
+  \fi
+}
+\def\IntCalc@ModShift#1!#2!{%
+  \ifnum#1<\z@
+    \expandafter\IntCalc@Sub\number#2\expandafter!%
+    \IntCalc@Gobble#1!%
+  \else
+    #1%
+  \fi
+}
+\def\IntCalc@Empty{}
+\def\IntCalc@Gobble#1{}
+\long\def\@ReturnAfterFi#1\fi{\fi#1}%
+\long\def\@ReturnAfterElseFi#1\else#2\fi{\fi#1}%
+\IntCalc@AtEnd
+
+
+\endinput
+%%
+%% End of file `intcalc.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
index 049795da254..a93b927516e 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.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
@@ -25,7 +25,7 @@
 %% This work consists of the main source file kvsetkeys.dtx
 %% and the derived files
 %%    kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv,
-%%    kvsetkeys-example.tex.
+%%    kvsetkeys-example.tex, kvsetkeys-test1.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,25 +79,26 @@
   \fi
 \expandafter\x\csname ver@kvsetkeys.sty\endcsname
 \ProvidesPackage{kvsetkeys}%
-  [2006/10/19 v1.1 Key value parser with default handler support (HO)]
-\expandafter\edef\csname KVS@endinput\endcsname{%
-  \catcode39 \the\catcode39 % '
-  \catcode44 \the\catcode44 % ,
-  \catcode61 \the\catcode61 % =
-  \catcode64 \the\catcode64 % @
-  \catcode94 \the\catcode94 % ^
-  \catcode96 \the\catcode96 % `
-  \catcode126 \the\catcode126 % ~
-  \relax
-  \noexpand\endinput
+  [2007/09/09 v1.2 Key value parser with default handler support (HO)]
+\expandafter\edef\csname KVS@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
 }
-\catcode39 12 % '
-\catcode44 12 % ,
-\catcode61 12 % =
 \catcode64 11 % @
-\catcode94 7 % ^
-\catcode96 12 % `
-\catcode126 13 % ~
+\def\TMP@EnsureCode#1#2{%
+  \edef\KVS@AtEnd{%
+    \KVS@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{94}{7}% ^ (superscript)
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{126}{13}% ~ (active)
 \def\KVS@empty{}
 \long\def\@ReturnAfterFi#1\fi{\fi#1}
 \def\kv@normalize#1{%
@@ -316,16 +317,11 @@
 \def\KVS@set@family@handler#1\@nil#{%
   \expandafter\def\csname KVS@#1@handler\endcsname##1##2%
 }
-\expandafter\ifx\csname MessageBreak\endcsname\relax
-  \def\MessageBreak{^^J}%
-\fi
-\expandafter\ifx\csname @ehc\endcsname\relax
-  \def\@ehc{%
-    Try typing \space\string<return\string> %
-    \space to proceed.\MessageBreak
-    If that doesn't work, type \space X %
-    \string<return\string> \space to quit\string.%
-  }%
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input infwarerr.sty\relax
+\else
+  \RequirePackage{infwarerr}[2007/09/09]%
 \fi
 \def\kv@error@novalue{%
   \kv@error@generic{No value specified for}%
@@ -334,37 +330,18 @@
   \kv@error@generic{Undefined}%
 }
 \def\kv@error@generic#1#2#3{%
-  \begingroup
-    \newlinechar=10 %
-    \def\MessageBreak{^^J}%
-    \expandafter\ifx\csname PackageError\endcsname\relax
-      \edef\x{%
-        \errhelp{%
-          The keyval family of the key `#3' is `#2'.\MessageBreak
-          \MessageBreak
-          \@ehc
-        }%
-      }%
-      \x
-      \errmessage{kvsetkeys: #1 key `#3'}%
-    \else
-      \edef\x{%
-        \noexpand\PackageError{kvsetkeys}{%
-           #1 key `#3'%
-        }{%
-          The keyval family of the key `#3' is `#2'.\MessageBreak
-          \MessageBreak
-          \@ehc
-        }%
-      }%
-      \x
-    \fi
-  \endgroup
-}%
+  \@PackageError{kvsetkeys}{%
+    #1 key `#3'%
+  }{%
+    The keyval family of the key `#3' is `#2'.\MessageBreak
+    \MessageBreak
+    \@ehc
+  }%
+}
 \def\kvsetkeys#1#2{%
   \kv@parse{#2}{\kv@processor@default{#1}}%
 }
-\KVS@endinput
+\KVS@AtEnd
 \endinput
 %%
 %% End of file `kvsetkeys.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty
new file mode 100644
index 00000000000..22de5ac04b1
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty
@@ -0,0 +1,265 @@
+%%
+%% This is file `pdfcol.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% pdfcol.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 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
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%% 
+%% This work consists of the main source file pdfcol.dtx
+%% and the derived files
+%%    pdfcol.sty, pdfcol.pdf, pdfcol.ins, pdfcol.drv,
+%%    pdfcol-test1.tex, pdfcol-test2.tex, pdfcol-test3.tex.
+%% 
+\begingroup
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \expandafter\let\expandafter\x\csname ver@pdfcol.sty\endcsname
+  \ifcase 0%
+    \ifx\x\relax % plain
+    \else
+      \ifx\x\empty % LaTeX
+      \else
+        1%
+      \fi
+    \fi
+  \else
+    \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{pdfcol}{The package is already loaded}%
+    \endgroup
+    \expandafter\endinput
+  \fi
+\endgroup
+\begingroup
+  \catcode40 12 % (
+  \catcode41 12 % )
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode47 12 % /
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+    \def\x#1#2#3[#4]{\endgroup
+      \immediate\write-1{Package: #3 #4}%
+      \xdef#1{#4}%
+    }%
+  \else
+    \def\x#1#2[#3]{\endgroup
+      #2[{#3}]%
+      \ifx#1\relax
+        \xdef#1{#3}%
+      \fi
+    }%
+  \fi
+\expandafter\x\csname ver@pdfcol.sty\endcsname
+\ProvidesPackage{pdfcol}%
+  [2007/09/09 v1.0 Maintaining additional color stacks for pdfTeX (HO)]
+\expandafter\edef\csname PDFCOL@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\PDFCOL@AtEnd{%
+    \PDFCOL@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{96}{12}% `
+\newif\ifpdfcolAvailable
+\pdfcolAvailabletrue
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \def\PDFCOL@RequirePackage#1[#2]{\input #1.sty\relax}%
+\else
+  \def\PDFCOL@RequirePackage#1[#2]{%
+    \RequirePackage{#1}[{#2}]%
+  }%
+\fi
+\PDFCOL@RequirePackage{infwarerr}[2007/09/09]
+\PDFCOL@RequirePackage{ifpdf}[2007/09/09]
+\ifpdf
+  \def\PDFCOL@Message{%
+    \@PackageWarningNoLine{pdfcol}%
+  }%
+\else
+  \pdfcolAvailablefalse
+  \def\PDFCOL@Message{%
+    \@PackageInfoNoLine{pdfcol}%
+  }%
+  \PDFCOL@Message{%
+    Interface disabled because of missing PDF mode of pdfTeX%
+  }%
+\fi
+\ifpdfcolAvailable
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname pdfcolorstack\endcsname\relax
+    \pdfcolAvailablefalse
+    \PDFCOL@Message{%
+      Interface disabled because of too old pdfTeX.\MessageBreak
+      Required is version 1.40+ for \string\pdfcolorstack
+    }%
+  \fi
+\fi
+\ifpdfcolAvailable
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname pdfcolorstack\endcsname\relax
+    \pdfcolAvailablefalse
+    \PDFCOL@Message{%
+      Interface disabled because of too old pdfTeX.\MessageBreak
+      Required is version 1.40+ for \string\pdfcolorstackinit
+    }%
+  \fi
+\fi
+\ifpdfcolAvailable
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname @pdfcolorstack\endcsname\relax
+    \begingroup\expandafter\expandafter\expandafter\endgroup
+    \expandafter\ifx\csname ver@color.sty\endcsname\relax
+      \begingroup\expandafter\expandafter\expandafter\endgroup
+      \expandafter\ifx\csname documentclass\endcsname\relax
+      \else
+        \RequirePackage[pdftex]{color}\relax
+      \fi
+    \fi
+    \begingroup\expandafter\expandafter\expandafter\endgroup
+    \expandafter\ifx\csname @pdfcolorstack\endcsname\relax
+      \pdfcolAvailablefalse
+      \PDFCOL@Message{%
+        Interface disabled because `pdftex.def'\MessageBreak
+        is not loaded or it is too old.\MessageBreak
+        Required is version 0.04b or greater%
+      }%
+    \fi
+  \fi
+\fi
+\let\pdfcolAvailabletrue\relax
+\let\pdfcolAvailablefalse\relax
+\ifpdfcolAvailable
+  \let\pdfcolErrorNoStacks\relax
+  \expandafter\ifx\csname pdfcol@Value\endcsname\relax
+    \def\pdfcol@Value{0 g 0 G}%
+  \fi
+  \expandafter\ifx\csname pdfcol@LiteralModifier\endcsname\relax
+    \def\pdfcol@LiteralModifier{direct}%
+  \fi
+  \def\pdfcolInitStack#1{%
+    \expandafter\ifx\csname pdfcol@Stack@#1\endcsname\relax
+      \global\expandafter\chardef\csname pdfcol@Stack@#1\endcsname=%
+          \pdfcolorstackinit\pdfcol@LiteralModifier{\pdfcol@Value}%
+          \relax
+      \@PackageInfo{pdfcol}{%
+        New color stack `#1' = \number\csname pdfcol@Stack@#1\endcsname
+      }%
+    \else
+      \@PackageError{pdfcol}{%
+        Stack `#1' is already defined%
+      }\@ehc
+    \fi
+  }%
+  \def\pdfcolIfStackExists#1{%
+    \expandafter\ifx\csname pdfcol@Stack@#1\endcsname\relax
+      \expandafter\@secondoftwo
+    \else
+      \expandafter\@firstoftwo
+    \fi
+  }%
+  \expandafter\ifx\csname @firstoftwo\endcsname\relax
+    \long\def\@firstoftwo#1#2{#1}%
+  \fi
+  \expandafter\ifx\csname @secondoftwo\endcsname\relax
+    \long\def\@secondoftwo#1#2{#2}%
+  \fi
+  \def\pdfcolSwitchStack#1{%
+    \pdfcolIfStackExists{#1}{%
+      \expandafter\let\expandafter\@pdfcolorstack
+                      \csname pdfcol@Stack@#1\endcsname
+    }{%
+      \pdfcol@ErrorNoStack{#1}%
+    }%
+  }%
+  \def\pdfcolSetCurrent#1{%
+    \ifx\\#1\\%
+      \pdfcolorstack\@pdfcolorstack current\relax
+    \else
+      \pdfcolIfStackExists{#1}{%
+        \pdfcolorstack\csname pdfcol@Stack@#1\endcsname current\relax
+      }{%
+        \pdfcol@ErrorNoStack{#1}%
+      }%
+    \fi
+  }%
+  \def\pdfcol@ErrorNoStack#1{%
+    \@PackageError{pdfcol}{Stack `#1' does not exists}\@ehc
+  }%
+\else
+  \def\pdfcolErrorNoStacks{%
+    \@PackageError{pdfcol}{%
+      Color stacks are not available%
+    }{%
+      Update pdfTeX (1.40) and `pdftex.def' (0.04b) %
+          if necessary.\MessageBreak
+      Ensure that `pdftex.def' is loaded %
+          (package `color' or `xcolor').\MessageBreak
+      Further messages can be found in TeX's %
+          protocol file `\jobname.log'.\MessageBreak
+      \MessageBreak
+      \@ehc
+    }%
+    \global\let\pdfcolErrorNoStacks\relax
+  }%
+  \def\PDFCOL@Disabled{%
+    \PDFCOL@Message{%
+      pdfTeX's color stacks are not available%
+    }%
+    \global\let\PDFCOL@Disabled\relax
+  }%
+  \def\pdfcolInitStack#1{%
+    \PDFCOL@Disabled
+  }%
+  \long\def\pdfcolIfStackExists#1#2#3{#3}%
+  \def\pdfcolSwitchStack#1{%
+    \PDFCOL@Disabled
+  }%
+  \def\pdfcolSetCurrent#1{%
+    \PDFCOL@Disabled
+  }%
+\fi
+\PDFCOL@AtEnd
+\endinput
+%%
+%% End of file `pdfcol.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty
index 264c0712954..b44eb644bfc 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty
@@ -349,7 +349,7 @@
   }%
   |gdef|pc@EscapeRemove#1\#2#3|@nil{%
     #1#2%
-    |ifx|\#3|\%
+    |ifx|\#3|\%%
     |else
       |@ReturnAfterFi{%
         |pc@EscapeRemove#3|@nil
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
index 985e0f2c24f..337c582dc75 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
@@ -26,32 +26,8 @@
 %% and the derived files
 %%    pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv,
 %%    pdfescape-test1.tex, pdfescape-test2.tex,
-%%    pdfescape-test3.tex.
+%%    pdfescape-test3.tex, pdfescape-test4.tex.
 %% 
-\expandafter\edef\csname PE@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
-\catcode64 11 % @
-\def\PE@EnsureCode#1#2#3{%
-  \edef\PE@AtEnd{%
-    \PE@AtEnd
-    #1#2 \the#1#2\relax
-  }%
-  #1#2 #3\relax
-}
-\PE@EnsureCode\catcode{0}{12}% ^^@
-\PE@EnsureCode\catcode{34}{12}% "
-\PE@EnsureCode\catcode{42}{12}% *
-\PE@EnsureCode\catcode{45}{12}% -
-\PE@EnsureCode\catcode{46}{12}% .
-\PE@EnsureCode\catcode{60}{12}% <
-\PE@EnsureCode\catcode{61}{12}% =
-\PE@EnsureCode\catcode{62}{12}% >
-\PE@EnsureCode\catcode{94}{7}% ^
-\PE@EnsureCode\catcode{96}{12}% `
-\PE@EnsureCode\uccode{34}{0}% "
-\PE@EnsureCode\uccode{48}{0}% 0
-\PE@EnsureCode\uccode{61}{0}% =
 \begingroup
   \catcode44 12 % ,
   \catcode45 12 % -
@@ -104,10 +80,35 @@
   \fi
 \expandafter\x\csname ver@pdfescape.sty\endcsname
 \ProvidesPackage{pdfescape}%
-  [2007/04/21 v1.4 Provides hex, PDF name and string conversions (HO)]
+  [2007/09/09 v1.6 Provides hex, PDF name and string conversions (HO)]
+\expandafter\edef\csname PE@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2#3{%
+  \edef\PE@AtEnd{%
+    \PE@AtEnd
+    #1#2 \the#1#2\relax
+  }%
+  #1#2 #3\relax
+}
+\TMP@EnsureCode\catcode{0}{12}% ^^@
+\TMP@EnsureCode\catcode{34}{12}% "
+\TMP@EnsureCode\catcode{39}{12}% '
+\TMP@EnsureCode\catcode{42}{12}% *
+\TMP@EnsureCode\catcode{45}{12}% -
+\TMP@EnsureCode\catcode{46}{12}% .
+\TMP@EnsureCode\catcode{60}{12}% <
+\TMP@EnsureCode\catcode{61}{12}% =
+\TMP@EnsureCode\catcode{62}{12}% >
+\TMP@EnsureCode\catcode{94}{7}% ^
+\TMP@EnsureCode\catcode{96}{12}% `
+\TMP@EnsureCode\uccode{34}{0}% "
+\TMP@EnsureCode\uccode{48}{0}% 0
+\TMP@EnsureCode\uccode{61}{0}% =
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname detokenize\endcsname\relax
-  \long\def\PE@sanitize#1#2{%
+  \long\def\EdefSanitize#1#2{%
     \begingroup
       \csname @safe@activestrue\endcsname
       \edef#1{#2}%
@@ -125,7 +126,7 @@
     \let\PE@onelevel@sanitize\@onelevel@sanitize
   \fi
 \else
-  \long\def\PE@sanitize#1#2{%
+  \long\def\EdefSanitize#1#2{%
     \begingroup
       \csname @safe@activestrue\endcsname
       \edef#1{#2}%
@@ -137,6 +138,7 @@
     \edef#1{\detokenize\expandafter{#1}}%
   }%
 \fi
+\let\PE@sanitize\EdefSanitize
 \begingroup
   \catcode`\ =12\relax%
 \def\x{\endgroup\def\PE@space@other{ }}\x\relax
@@ -156,7 +158,7 @@
 }
 \long\def\@ReturnAfterFi#1\fi{\fi#1}
 \def\EdefUnescapeName#1#2{%
-  \PE@sanitize#1{#2}%
+  \EdefSanitize#1{#2}%
   \PE@SanitizeSpaceOther#1%
   \PE@UnescapeName#1%
   \PE@onelevel@sanitize#1%
@@ -256,7 +258,7 @@
   \fi
 }
 \def\EdefUnescapeString#1#2{%
-  \PE@sanitize#1{#2}%
+  \EdefSanitize#1{#2}%
   \PE@SanitizeSpaceOther#1%
   \PE@NormalizeLineEnd#1%
   \PE@UnescapeString#1%
@@ -390,21 +392,21 @@
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdfescapehex\endcsname\relax
   \long\def\EdefEscapeHex#1#2{%
-    \PE@sanitize#1{#2}%
+    \EdefSanitize#1{#2}%
     \PE@SanitizeSpaceOther#1%
     \PE@EscapeHex#1%
   }%
   \def\EdefUnescapeHex#1#2{%
-    \PE@sanitize#1{#2}%
+    \EdefSanitize#1{#2}%
     \PE@UnescapeHex#1%
   }%
   \long\def\EdefEscapeName#1#2{%
-    \PE@sanitize#1{#2}%
+    \EdefSanitize#1{#2}%
     \PE@SanitizeSpaceOther#1%
     \PE@EscapeName#1%
   }%
   \long\def\EdefEscapeString#1#2{%
-    \PE@sanitize#1{#2}%
+    \EdefSanitize#1{#2}%
     \PE@SanitizeSpaceOther#1%
     \PE@EscapeString#1%
   }%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
index 661aab5272c..870697befed 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-ascii.def}[2007/06/16 v1.1 stringenc: US-ASCII]
+\ProvidesFile{se-ascii.def}[2007/09/09 v1.2 stringenc: US-ASCII]
 \expandafter\gdef\csname\SE@PrefixTo ascii\endcsname#1#2#3#4{%
   \ifnum"#1#2#3<8 %
     \SE@ResultAdd{#3#4}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
index c3e84e2bfff..e1734571ef8 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp1250.def}[2007/06/16 v1.1 stringenc: cp1250]
+\ProvidesFile{se-cp1250.def}[2007/09/09 v1.2 stringenc: cp1250]
 \def\SE@this{cp1250}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def
index b74c777e6eb..08cc42397d6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp1251.def}[2007/06/16 v1.1 stringenc: cp1251]
+\ProvidesFile{se-cp1251.def}[2007/09/09 v1.2 stringenc: cp1251]
 \def\SE@this{cp1251}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def
index 0be0cb205e8..a10cfa7d64c 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp1252.def}[2007/06/16 v1.1 stringenc: cp1252]
+\ProvidesFile{se-cp1252.def}[2007/09/09 v1.2 stringenc: cp1252]
 \expandafter\gdef\csname\SE@PrefixTo cp1252\endcsname#1#2#3#4{%
   \ifcase\ifnum"#1#2=\SE@zero
            \ifnum"#3#4<"80 %
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
index f83649f71e5..7f0abe81f3f 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp1257.def}[2007/06/16 v1.1 stringenc: cp1257]
+\ProvidesFile{se-cp1257.def}[2007/09/09 v1.2 stringenc: cp1257]
 \def\SE@this{cp1257}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def
index a41e4e125ae..b7ddfdd825c 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp437.def}[2007/06/16 v1.1 stringenc: cp437]
+\ProvidesFile{se-cp437.def}[2007/09/09 v1.2 stringenc: cp437]
 \def\SE@this{cp437}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def
index e30e570070d..cd57f1b8750 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp850.def}[2007/06/16 v1.1 stringenc: cp850]
+\ProvidesFile{se-cp850.def}[2007/09/09 v1.2 stringenc: cp850]
 \def\SE@this{cp850}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def
index a62ab1ae935..582be4fd3a7 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp852.def}[2007/06/16 v1.1 stringenc: cp852]
+\ProvidesFile{se-cp852.def}[2007/09/09 v1.2 stringenc: cp852]
 \def\SE@this{cp852}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def
index 6faa4e877a4..fb98b68485f 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp855.def}[2007/06/16 v1.1 stringenc: cp855]
+\ProvidesFile{se-cp855.def}[2007/09/09 v1.2 stringenc: cp855]
 \def\SE@this{cp855}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def
index bd986eaabf0..4c97d7eecc3 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp858.def}[2007/06/16 v1.1 stringenc: cp858]
+\ProvidesFile{se-cp858.def}[2007/09/09 v1.2 stringenc: cp858]
 \def\SE@this{cp858}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def
index a979f4a4afd..3c8ade1f4e5 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp865.def}[2007/06/16 v1.1 stringenc: cp865]
+\ProvidesFile{se-cp865.def}[2007/09/09 v1.2 stringenc: cp865]
 \def\SE@this{cp865}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def
index 64dbc25934a..08b2e0c151d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-cp866.def}[2007/06/16 v1.1 stringenc: cp866]
+\ProvidesFile{se-cp866.def}[2007/09/09 v1.2 stringenc: cp866]
 \def\SE@this{cp866}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def
index ae824b27955..73c4f3caa17 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-dec-mcs.def}[2007/06/16 v1.1 stringenc: DEC-MCS]
+\ProvidesFile{se-dec-mcs.def}[2007/09/09 v1.2 stringenc: DEC-MCS]
 \def\SE@this{dec-mcs}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def
index d2ca66b314b..7f050203240 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-1.def}[2007/06/16 v1.1 stringenc: ISO-8859-1]
+\ProvidesFile{se-iso-8859-1.def}[2007/09/09 v1.2 stringenc: ISO-8859-1]
 \expandafter\gdef\csname\SE@PrefixTo iso-8859-1\endcsname#1#2#3#4{%
   \ifcase\ifnum"#1#2=\SE@zero
            \ifnum"#3#4<"80 %
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def
index 21b0e851490..09d4d64de20 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-10.def}[2007/06/16 v1.1 stringenc: ISO-8859-10]
+\ProvidesFile{se-iso-8859-10.def}[2007/09/09 v1.2 stringenc: ISO-8859-10]
 \def\SE@this{iso-8859-10}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def
index bd0c99a007f..2e2022f678b 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-11.def}[2007/06/16 v1.1 stringenc: ISO-8859-11]
+\ProvidesFile{se-iso-8859-11.def}[2007/09/09 v1.2 stringenc: ISO-8859-11]
 \def\SE@this{iso-8859-11}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def
index 7091a9eefb2..458a192b12c 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-13.def}[2007/06/16 v1.1 stringenc: ISO-8859-13]
+\ProvidesFile{se-iso-8859-13.def}[2007/09/09 v1.2 stringenc: ISO-8859-13]
 \def\SE@this{iso-8859-13}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def
index ccf215f97b2..bc267bfb83e 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-14.def}[2007/06/16 v1.1 stringenc: ISO-8859-14]
+\ProvidesFile{se-iso-8859-14.def}[2007/09/09 v1.2 stringenc: ISO-8859-14]
 \def\SE@this{iso-8859-14}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def
index 7a69f3b6a37..5b76e8b31db 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-15.def}[2007/06/16 v1.1 stringenc: ISO-8859-15]
+\ProvidesFile{se-iso-8859-15.def}[2007/09/09 v1.2 stringenc: ISO-8859-15]
 \def\SE@this{iso-8859-15}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def
index 9e373085bce..237b52740c4 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-16.def}[2007/06/16 v1.1 stringenc: ISO-8859-16]
+\ProvidesFile{se-iso-8859-16.def}[2007/09/09 v1.2 stringenc: ISO-8859-16]
 \def\SE@this{iso-8859-16}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def
index 56d601cd745..568475018f8 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-2.def}[2007/06/16 v1.1 stringenc: ISO-8859-2]
+\ProvidesFile{se-iso-8859-2.def}[2007/09/09 v1.2 stringenc: ISO-8859-2]
 \def\SE@this{iso-8859-2}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def
index 9ae91962b34..380de149dc3 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-3.def}[2007/06/16 v1.1 stringenc: ISO-8859-3]
+\ProvidesFile{se-iso-8859-3.def}[2007/09/09 v1.2 stringenc: ISO-8859-3]
 \def\SE@this{iso-8859-3}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def
index d7fc3442a18..332d4b559f1 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-4.def}[2007/06/16 v1.1 stringenc: ISO-8859-4]
+\ProvidesFile{se-iso-8859-4.def}[2007/09/09 v1.2 stringenc: ISO-8859-4]
 \def\SE@this{iso-8859-4}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def
index 31c5eb2a1e8..49ffc4247ae 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-5.def}[2007/06/16 v1.1 stringenc: ISO-8859-5]
+\ProvidesFile{se-iso-8859-5.def}[2007/09/09 v1.2 stringenc: ISO-8859-5]
 \def\SE@this{iso-8859-5}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def
index b8478652157..2bda08178f0 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-6.def}[2007/06/16 v1.1 stringenc: ISO-8859-6]
+\ProvidesFile{se-iso-8859-6.def}[2007/09/09 v1.2 stringenc: ISO-8859-6]
 \def\SE@this{iso-8859-6}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def
index 0857ab35690..abee5520fcf 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-7.def}[2007/06/16 v1.1 stringenc: ISO-8859-7]
+\ProvidesFile{se-iso-8859-7.def}[2007/09/09 v1.2 stringenc: ISO-8859-7]
 \def\SE@this{iso-8859-7}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def
index ff4a1b4d1b1..a89e7bee45e 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-8.def}[2007/06/16 v1.1 stringenc: ISO-8859-8]
+\ProvidesFile{se-iso-8859-8.def}[2007/09/09 v1.2 stringenc: ISO-8859-8]
 \def\SE@this{iso-8859-8}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def
index 4b0a995ba95..ce4ed07d93f 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-iso-8859-9.def}[2007/06/16 v1.1 stringenc: ISO-8859-9]
+\ProvidesFile{se-iso-8859-9.def}[2007/09/09 v1.2 stringenc: ISO-8859-9]
 \def\SE@this{iso-8859-9}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def
index 2b06b3c7fa3..7f21b1dd755 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-koi8-r.def}[2007/06/16 v1.1 stringenc: KOI8-R]
+\ProvidesFile{se-koi8-r.def}[2007/09/09 v1.2 stringenc: KOI8-R]
 \def\SE@this{koi8-r}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def
index 8dc9795a2d6..1c059d3713d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-mac-centeuro.def}[2007/06/16 v1.1 stringenc: Mac OS Central European]
+\ProvidesFile{se-mac-centeuro.def}[2007/09/09 v1.2 stringenc: Mac OS Central European]
 \def\SE@this{mac-centeuro}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def
index d3d63f466ea..b60ec02d105 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-mac-cyrillic.def}[2007/06/16 v1.1 stringenc: Mac OS Cyrillic]
+\ProvidesFile{se-mac-cyrillic.def}[2007/09/09 v1.2 stringenc: Mac OS Cyrillic]
 \def\SE@this{mac-cyrillic}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def
index 0f3a604dc65..cbf1a67bae6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-mac-roman.def}[2007/06/16 v1.1 stringenc: Mac OS Roman]
+\ProvidesFile{se-mac-roman.def}[2007/09/09 v1.2 stringenc: Mac OS Roman]
 \def\SE@this{mac-roman}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def
index d1c7f2d8ef4..868d2ada602 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-nextstep.def}[2007/06/16 v1.1 stringenc: NextStep]
+\ProvidesFile{se-nextstep.def}[2007/09/09 v1.2 stringenc: NextStep]
 \def\SE@this{nextstep}
 \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
                        \SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def
index c91ed403f47..4828c682011 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-pdfdoc.def}[2007/06/16 v1.1 stringenc: PDFDocEncoding]
+\ProvidesFile{se-pdfdoc.def}[2007/09/09 v1.2 stringenc: PDFDocEncoding]
 \expandafter\gdef\csname\SE@PrefixTo pdfdoc\endcsname#1#2#3#4{%
   \ifcase\ifnum"#1#2#3#4<256 %
            \ifnum"#1#2#3#4>160 %
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
index c387c965faf..162cd25c837 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-utf16le.def}[2007/06/16 v1.1 stringenc: UTF-16LE]
+\ProvidesFile{se-utf16le.def}[2007/09/09 v1.2 stringenc: UTF-16LE]
 \expandafter\gdef\csname\SE@PrefixTo utf16le\endcsname#1#2#3#4{%
   \SE@ResultAdd{#3#4#1#2}%
 }
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def
index bb380c9942b..ddd097fa8b5 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-utf32be.def}[2007/06/16 v1.1 stringenc: UTF-32BE]
+\ProvidesFile{se-utf32be.def}[2007/09/09 v1.2 stringenc: UTF-32BE]
 \expandafter\gdef\csname\SE@PrefixTo utf32be\endcsname#1#2#3#4{%
   \SE@ResultAdd{0000#1#2#3#4}%
 }
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
index 716b7049385..e75b2f2b332 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-utf32le.def}[2007/06/16 v1.1 stringenc: UTF-32LE]
+\ProvidesFile{se-utf32le.def}[2007/09/09 v1.2 stringenc: UTF-32LE]
 \expandafter\gdef\csname\SE@PrefixTo utf32le\endcsname#1#2#3#4{%
   \SE@ResultAdd{#3#4#1#20000}%
 }
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
index 6f8e680ca5d..161b69724c5 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
@@ -39,7 +39,7 @@
 %%    se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
 %%    stringenc-test2.tex.
 %% 
-\ProvidesFile{se-utf8.def}[2007/06/16 v1.1 stringenc: UTF-8]
+\ProvidesFile{se-utf8.def}[2007/09/09 v1.2 stringenc: UTF-8]
 \expandafter\gdef\csname\SE@PrefixTo utf8\endcsname#1#2#3#4{%
   \ifnum"#1#2#3#4<"80 %
     \SE@ResultAdd{#3#4}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty
index b6035381354..99c3bc51b24 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty
@@ -26,7 +26,8 @@
 %% This work consists of the main source file setouterhbox.dtx
 %% and the derived files
 %%    setouterhbox.sty, setouterhbox.pdf, setouterhbox.ins, setouterhbox.drv,
-%%    setouterhbox-example.tex.
+%%    setouterhbox-example.tex, setouterhbox-test1.tex,
+%%    setouterhbox-test2.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -80,13 +81,35 @@
   \fi
 \expandafter\x\csname ver@setouterhbox.sty\endcsname
 \ProvidesPackage{setouterhbox}%
-  [2007/05/17 v1.6 Set hbox in outer horizontal mode (HO)]
+  [2007/09/09 v1.7 Set hbox in outer horizontal mode (HO)]
+\expandafter\edef\csname setouterhboxAtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\setouterhboxAtEnd{%
+    \setouterhboxAtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{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{96}{12}% `
 \newbox\setouterhboxBox
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \input infwarerr.sty\relax
 \else
-  \RequirePackage{infwarerr}%
+  \RequirePackage{infwarerr}[2007/09/09]%
 \fi
 \edef\setouterhboxFailure#1#2{%
   \expandafter\noexpand\csname @PackageError\endcsname
@@ -232,6 +255,7 @@ E   \egroup
 \expandafter\endgroup
 \ifx\x\fmtname
 \else
+  \setouterhboxAtEnd
   \expandafter\endinput
 \fi
 \DeclareOption{hyperref}{%
@@ -240,6 +264,7 @@ E   \egroup
   }%
 }
 \ProcessOptions\relax
+\setouterhboxAtEnd
 \endinput
 %%
 %% End of file `setouterhbox.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty
new file mode 100644
index 00000000000..8f0941c541d
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty
@@ -0,0 +1,646 @@
+%%
+%% This is file `soulutf8.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% soulutf8.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 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
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%% 
+%% This work consists of the main source file soulutf8.dtx
+%% and the derived files
+%%    soulutf8.sty, soulutf8.pdf, soulutf8.ins, soulutf8.drv,
+%%    soulutf8-test1.tex, soulutf8-test2.tex, soulutf8-test3.tex,
+%%    soulutf8-test4.tex, soulutf8-test5.tex.
+%% 
+\begingroup
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \expandafter\let\expandafter\x\csname ver@soulutf8.sty\endcsname
+  \ifcase 0%
+    \ifx\x\relax % plain
+    \else
+      \ifx\x\empty % LaTeX
+      \else
+        1%
+      \fi
+    \fi
+  \else
+    \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{soulutf8}{The package is already loaded}%
+    \endgroup
+    \expandafter\endinput
+  \fi
+\endgroup
+\begingroup
+  \catcode40 12 % (
+  \catcode41 12 % )
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode47 12 % /
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+    \def\x#1#2#3[#4]{\endgroup
+      \immediate\write-1{Package: #3 #4}%
+      \xdef#1{#4}%
+    }%
+  \else
+    \def\x#1#2[#3]{\endgroup
+      #2[{#3}]%
+      \ifx#1\relax
+        \xdef#1{#3}%
+      \fi
+    }%
+  \fi
+\expandafter\x\csname ver@soulutf8.sty\endcsname
+\ProvidesPackage{soulutf8}%
+  [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)]
+\expandafter\edef\csname SOuL@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\SOuL@AtEnd{%
+    \SOuL@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{34}{12}% "
+\TMP@EnsureCode{36}{3}% $
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{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}% ^
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{126}\active % ~
+\TMP@EnsureCode{128}{12}% ^^80
+\TMP@EnsureCode{147}{12}% ^^93
+\TMP@EnsureCode{148}{12}% ^^94
+\TMP@EnsureCode{160}{12}% ^^a0
+\TMP@EnsureCode{194}{12}% ^^c2
+\TMP@EnsureCode{226}{12}% ^^e2
+\ifx\documentclass\@undefined
+  \expandafter\ifx\csname SOUL@\endcsname\relax
+    \let\SOuL@orgDeclareRobustCommand\DeclareRobustCommand
+    \let\SOuL@orgnewcommand          \newcommand
+    \let\SOuL@orgDeclareOption       \DeclareOption
+    \let\SOuL@orgPackageError        \PackageError
+    \def\SOuL@restorelatexcmds{%
+      \let\DeclareRobustCommand\SOuL@orgDeclareRobustCommand
+      \let\newcommand          \SOuL@orgnewcommand
+      \let\DeclareOption       \SOuL@orgDeclareOption
+      \let\PackageError        \SOuL@orgPackageError
+    }%
+    \input soul.sty\relax
+    \SOuL@restorelatexcmds
+  \fi
+  \input infwarerr.sty\relax
+  \let\SOuL@orgSOUL@error\SOUL@error
+  \def\SOUL@error{%
+    \begingroup
+      \let\PackageError\@PackageError
+      \SOuL@orgSOUL@error
+    \endgroup
+  }%
+  \input etexcmds.sty\relax
+  \expandafter\ifx\csname @onelevel@sanitize\endcsname\relax
+    \def\@onelevel@sanitize#1{%
+      \edef#1{%
+        \expandafter\strip@prefix\meaning#1%
+      }%
+    }%
+    \def\strip@prefix#1>{}%
+  \fi
+\else
+  \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{soul}}%
+  \ProcessOptions\relax
+  \RequirePackage{soul}[2003/11/17]%
+  \RequirePackage{infwarerr}[2007/09/09]%
+  \RequirePackage{etexcmds}[2007/09/09]%
+\fi
+\ifetex@unexpanded
+  \catcode33=14 % '!': comment
+  \catcode43=9  % '+': ignore
+\else
+  \catcode33=9  % '!': ignore
+  \catcode43=14 % '+': comment
+\fi
+\def\SOuL@redefine#1{%
+  \begingroup
+    \def\SOuL@cmd{#1}%
+    \afterassignment\SOuL@cmdcheck
+    \def\SOuL@temp
+}
+\def\SOuL@cmdcheck{%
+    \expandafter\ifx\SOuL@cmd\SOuL@temp
+    \else
+      \edef\SOuL@temp*{\expandafter\string\SOuL@cmd}%
+      \@PackageWarningNoLine{soulutf8}{%
+        Command \SOuL@temp* has changed.\MessageBreak
+        Supported versions of package `soul': 2003/11/17.\MessageBreak
+        Depending on the unknown changes the redefinition\MessageBreak
+        of \SOuL@temp* may not behave correctly%
+      }%
+    \fi
+  \expandafter\endgroup
+  \expandafter\def\SOuL@cmd
+}
+\SOuL@redefine\SOUL@eval{%
+  \def\SOUL@n*##1{\SOUL@scan}%
+  \if\noexpand\SOUL@@\SOUL@spc
+  \else
+    \SOUL@ignorespacesfalse
+  \fi
+  \ifnum\SOUL@minus=\thr@@
+    \SOUL@flushminus
+  \else\ifnum\SOUL@comma=\tw@
+    \SOUL@flushcomma
+  \else\ifnum\SOUL@apo=\tw@
+    \SOUL@flushapo
+  \else\ifnum\SOUL@grave=\tw@
+    \SOUL@flushgrave
+  \fi\fi\fi\fi
+  \ifx\SOUL@@-\else\SOUL@flushminus\fi
+  \ifx\SOUL@@,\else\SOUL@flushcomma\fi
+  \ifx\SOUL@@'\else\SOUL@flushapo\fi
+  \ifx\SOUL@@`\else\SOUL@flushgrave\fi
+  \ifx\SOUL@@-%
+    \advance\SOUL@minus\@ne
+  \else\ifx\SOUL@@,%
+    \advance\SOUL@comma\@ne
+  \else\ifx\SOUL@@'%
+    \advance\SOUL@apo\@ne
+  \else\ifx\SOUL@@`%
+    \advance\SOUL@grave\@ne
+  \else
+    \SOUL@flushminus
+    \SOUL@flushcomma
+    \SOUL@flushapo
+    \SOUL@flushgrave
+    \ifx\SOUL@@\SOUL@stop
+      \def\SOUL@n*{%
+        \SOUL@doword
+        \SOUL@eventuallyexhyphen\null
+      }%
+    \else\ifx\SOUL@@\par
+      \def\SOUL@n*\par{\par\leavevmode\SOUL@scan}%
+    \else\if\noexpand\SOUL@@\SOUL@spc
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen\null
+      \ifSOUL@ignorespaces
+      \else
+        \SOUL@everyspace{}%
+      \fi
+      \def\SOUL@n* {\SOUL@scan}%
+    \else\ifx\SOUL@@\\%
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen\null
+      \SOUL@everyspace{\unskip\nobreak\hfil\break}%
+      \SOUL@ignorespacestrue
+    \else\ifx\SOUL@@~%
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen\null
+      \SOUL@everyspace{\nobreak}%
+    \else\ifx\SOUL@@\slash
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen{/}%
+      \SOUL@exhyphen{/}%
+    \else\ifx\SOUL@@\mbox
+      \def\SOUL@n*{\SOUL@addprotect}%
+    \else\ifx\SOUL@@\hbox
+      \def\SOUL@n*{\SOUL@addprotect}%
+    \else\ifx\SOUL@@\soulomit
+      \def\SOUL@n*\soulomit##1{%
+        \SOUL@doword
+        {\spaceskip\SOUL@spaceskip##1}%
+        \SOUL@scan
+      }%
+    \else\ifx\SOUL@@\break
+      \SOUL@doword
+      \break
+    \else\ifx\SOUL@@\linebreak
+      \SOUL@doword
+      \SOUL@everyspace{\linebreak}%
+    \else\ifcat\bgroup\noexpand\SOUL@@
+      \def\SOUL@n*{\SOUL@addgroup{}}%
+    \else\ifcat$\noexpand\SOUL@@
+      \def\SOUL@n*{\SOUL@addmath}%
+    \else
+      \def\SOUL@n*{\SOUL@dotoken}%
+    \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+  \fi\fi\fi\fi
+  \SOUL@n*%
+}{%
+  \def\SOUL@n*##1{\SOUL@scan}%
+  \if\noexpand\SOUL@@\SOUL@spc
+  \else
+    \SOUL@ignorespacesfalse
+  \fi
+  \ifnum\SOUL@minus=\thr@@
+    \SOUL@flushminus
+  \else\ifnum\SOUL@comma=\tw@
+    \SOUL@flushcomma
+  \else\ifnum\SOUL@apo=\tw@
+    \SOUL@flushapo
+  \else\ifnum\SOUL@grave=\tw@
+    \SOUL@flushgrave
+  \fi\fi\fi\fi
+  \ifx\SOUL@@-\else\SOUL@flushminus\fi
+  \ifx\SOUL@@,\else\SOUL@flushcomma\fi
+  \ifx\SOUL@@'\else\SOUL@flushapo\fi
+  \ifx\SOUL@@`\else\SOUL@flushgrave\fi
+  \ifx\SOUL@@-%
+    \advance\SOUL@minus\@ne
+  \else\ifx\SOUL@@,%
+    \advance\SOUL@comma\@ne
+  \else\ifx\SOUL@@'%
+    \advance\SOUL@apo\@ne
+  \else\ifx\SOUL@@`%
+    \advance\SOUL@grave\@ne
+  \else
+    \SOUL@flushminus
+    \SOUL@flushcomma
+    \SOUL@flushapo
+    \SOUL@flushgrave
+    \ifx\SOUL@@\SOUL@stop
+      \def\SOUL@n*{%
+          \SOUL@doword
+          \SOUL@eventuallyexhyphen\null
+      }%
+    \else\ifx\SOUL@@\par
+      \def\SOUL@n*\par{\par\leavevmode\SOUL@scan}%
+    \else\if\noexpand\SOUL@@\SOUL@spc
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen\null
+      \ifSOUL@ignorespaces
+      \else
+        \SOUL@everyspace{}%
+      \fi
+      \def\SOUL@n* {\SOUL@scan}%
+    \else\ifx\SOUL@@\\%
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen\null
+      \SOUL@everyspace{\unskip\nobreak\hfil\break}%
+      \SOUL@ignorespacestrue
+    \else\ifx\SOUL@@~%
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen\null
+      \SOUL@everyspace{\nobreak}%
+    \else\ifx\SOUL@@\slash
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen{/}%
+      \SOUL@exhyphen{/}%
+    \else\ifx\SOUL@@\mbox
+      \def\SOUL@n*{\SOUL@addprotect}%
+    \else\ifx\SOUL@@\hbox
+      \def\SOUL@n*{\SOUL@addprotect}%
+    \else\ifx\SOUL@@\soulomit
+      \def\SOUL@n*\soulomit##1{%
+        \SOUL@doword
+        {\spaceskip\SOUL@spaceskip##1}%
+        \SOUL@scan
+      }%
+    \else\ifx\SOUL@@\break
+      \SOUL@doword
+      \break
+    \else\ifx\SOUL@@\linebreak
+      \SOUL@doword
+      \SOUL@everyspace{\linebreak}%
+    \else\ifcat\bgroup\noexpand\SOUL@@
+      \def\SOUL@n*{\SOUL@addgroup{}}%
+    \else\ifcat$\noexpand\SOUL@@
+      \def\SOUL@n*{\SOUL@addmath}%
+    \else
+      \SOuL@analyzeutfviii
+      \ifcase\SOuL@octets
+        \SOuL@analyzeutfviiix
+      \fi
+      \ifcase\SOuL@octets
+        \def\SOUL@n*{\SOUL@dotoken}%
+      \or % 1
+      \or % 2
+        \def\SOUL@n*{\SOuL@addtwooctets}%
+      \or % 3
+        \def\SOUL@n*{\SOuL@addthreeoctets}%
+      \or % 4
+        \def\SOUL@n*{\SOuL@addfouroctets}%
+      \fi
+    \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+  \fi\fi\fi\fi
+  \SOUL@n*%
+}
+\def\SOuL@defsanitizedstring#1#2{%
+  \expandafter\def\csname SOuL@string#1\endcsname{#2}%
+  \expandafter\@onelevel@sanitize\csname SOuL@string#1\endcsname
+}
+\SOuL@defsanitizedstring{UTFviii}{UTFviii@}
+\SOuL@defsanitizedstring{octets}{@octets}
+\SOuL@defsanitizedstring{two}{two}
+\SOuL@defsanitizedstring{three}{three}
+\SOuL@defsanitizedstring{four}{four}
+\SOuL@defsanitizedstring{macrocolon}{macro:}
+\SOuL@defsanitizedstring{csnameu}{csname u8-}
+\SOuL@defsanitizedstring{undeferr}{utf@viii@undeferr}
+\def\SOuL@stringendash{^^e2^^80^^93}
+\def\SOuL@stringemdash{^^e2^^80^^94}
+\def\SOuL@stringnobreakspace{^^c2^^a0}
+\edef\SOuL@charhash{\string #}
+\edef\SOuL@chartwo{\string 2}
+\edef\SOuL@charthree{\string 3}
+\def\SOuL@empty{}
+\begingroup
+  \edef\x{\endgroup
+    \def\noexpand\SOuL@analyzeutfviii{%
+      \noexpand\expandafter\noexpand\SOuL@checkutfviii
+      \noexpand\meaning\noexpand\SOUL@@
+      \SOuL@stringUTFviii\SOuL@stringoctets
+      \noexpand\@nil
+    }%
+    \def\noexpand\SOuL@checkutfviii
+      ##1\SOuL@stringUTFviii##2\SOuL@stringoctets##3\noexpand\@nil
+  }%
+\x{%
+  \def\SOuL@temp{#2}%
+  \chardef\SOuL@octets=%
+      \ifx\SOuL@temp\SOuL@stringtwo
+        \tw@
+      \else\ifx\SOuL@temp\SOuL@stringthree
+        \thr@@
+      \else\ifx\SOuL@temp\SOuL@stringfour
+        4 %
+      \else
+        \z@
+      \fi\fi\fi
+}
+\begingroup
+  \edef\x{\endgroup
+    \def\noexpand\SOuL@analyzeutfviiix{%
+      \noexpand\expandafter\noexpand\SOuL@checkutfviiix
+      \noexpand\meaning\noexpand\SOUL@@
+      \SOuL@stringmacrocolon\SOuL@charhash1{}{}{}{}%
+      \SOuL@stringcsnameu\SOuL@stringundeferr
+      \noexpand\@nil
+    }%
+    \def\noexpand\SOuL@checkutfviiix
+      ##1\SOuL@stringmacrocolon\SOuL@charhash1##2##3##4##5##6%
+      \SOuL@stringcsnameu##7\SOuL@stringundeferr##8\noexpand\@nil
+  }%
+\x{%
+  \def\SOuL@temp{#7}%
+  \ifx\SOuL@temp\SOuL@empty
+    \chardef\SOuL@octets=\z@
+  \else
+    \def\SOuL@temp{#5}%
+    \ifx\SOuL@temp\SOuL@charthree
+      \chardef\SOuL@octets=4 %
+    \else
+      \def\SOuL@temp{#3}%
+      \ifx\SOuL@temp\SOuL@chartwo
+        \chardef\SOuL@octets=\thr@@
+      \else
+        \chardef\SOuL@octets=\tw@
+      \fi
+    \fi
+  \fi
+}
+\def\SOuL@addtwooctets#1#2{%
+  \def\SOuL@temp{#1#2}%
+  \@onelevel@sanitize\SOuL@temp
+  \ifx\SOuL@temp\SOuL@stringnobreakspace
+    \SOUL@doword
+    \SOUL@eventuallyexhyphen\null
+    \SOUL@everyspace{\nobreak}%
+    \let\SOuL@next\SOUL@scan
+  \else
+    \def\SOuL@next{%
+!     \SOUL@addtoken{{\noexpand#1\noexpand#2}}%
++     \SOUL@addtoken{{\etex@unexpanded{#1#2}}}%
+    }%
+  \fi
+  \SOuL@next
+}
+\def\SOuL@addthreeoctets#1#2#3{%
+  \def\SOuL@temp{#1#2#3}%
+  \@onelevel@sanitize\SOuL@temp
+  \ifx\SOuL@temp\SOuL@stringendash
+    \SOUL@doword
+    \SOUL@eventuallyexhyphen{-}%
+    \SOUL@exhyphen{--}%
+    \let\SOuL@next\SOUL@scan
+  \else
+    \ifx\SOuL@temp\SOuL@stringemdash
+      \SOUL@doword
+      \SOUL@eventuallyexhyphen{-}%
+      \SOUL@exhyphen{---}%
+      \let\SOuL@next\SOUL@scan
+    \else
+      \def\SOuL@next{%
+!       \SOUL@addtoken{{\noexpand#1\noexpand#2\noexpand#3}}%
++       \SOUL@addtoken{{\etex@unexpanded{#1#2#3}}}%
+      }%
+    \fi
+  \fi
+  \SOuL@next
+}
+\def\SOuL@addfouroctets#1#2#3#4{%
+! \SOUL@addtoken{{\noexpand#1\noexpand#2\noexpand#3\noexpand#4}}%
++ \SOUL@addtoken{{\etex@unexpanded{#1#2#3#4}}}%
+}
+\SOuL@redefine\SOUL@splittoken#1#2\SOUL@stop{%
+  \global\SOUL@token={#1}%
+  \global\SOUL@word={#2}%
+}#1{%
+  \global\SOUL@token={#1}%
+  \SOuL@remainingtoken\relax
+}
+\def\SOuL@remainingtoken#1\SOUL@stop{%
+  \global\SOUL@word=\expandafter{\@gobble#1}%
+}
+\SOuL@redefine\SOUL@flushcomma{%
+  \ifcase\SOUL@comma
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word,}}\x
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word{{,,}}}}\x
+  \fi
+  \SOUL@comma\z@
+}{%
+  \ifcase\SOUL@comma
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word,}}\x
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word{,,}}}\x
+  \fi
+  \SOUL@comma\z@
+}
+\SOuL@redefine\SOUL@flushapo{%
+  \ifcase\SOUL@apo
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word'}}\x
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word{{''}}}}\x
+  \fi
+  \SOUL@apo\z@
+}{%
+  \ifcase\SOUL@apo
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word'}}\x
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word{''}}}\x
+  \fi
+  \SOUL@apo\z@
+}
+\SOuL@redefine\SOUL@flushgrave{%
+  \ifcase\SOUL@grave
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word`}}\x
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word{{``}}}}\x
+  \fi
+  \SOUL@grave\z@
+}{%
+  \ifcase\SOUL@grave
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word`}}\x
+  \or
+    \edef\x{\SOUL@word={\the\SOUL@word{``}}}\x
+  \fi
+  \SOUL@grave\z@
+}
+\SOuL@redefine\SOUL@addgroup#1#2{%
+  {%
+    \let\protect\noexpand
+    \edef\x{%
+      \global\SOUL@word={%
+        \the\SOUL@word
+        {{\noexpand#1#2}}%
+      }%
+    }%
+    \x
+  }%
+  \SOUL@scan
+}#1#2{%
+  \begingroup
+    \let\protect\noexpand
+    \edef\x{\endgroup
+      \SOUL@word={%
+        \the\SOUL@word
+!       {\noexpand#1{#2}}%
++       {\etex@unexpanded{#1{#2}}}%
+      }%
+    }%
+  \x
+  \SOUL@scan
+}
+\SOuL@redefine\SOUL@addmath$#1${%
+  {%
+    \let\protect\noexpand
+    \edef\x{%
+      \global\SOUL@word={%
+        \the\SOUL@word
+        {{\hbox{$#1$}}}%
+      }%
+    }%
+    \x
+  }%
+  \SOUL@scan
+}$#1${%
+  \begingroup
+    \let\protect\noexpand
+    \edef\x{\endgroup
+      \SOUL@word={%
+        \the\SOUL@word
+!       {\hbox{$#1$}}%
++       {\etex@unexpanded{\hbox{$#1$}}}%
+      }%
+    }%
+  \x
+  \SOUL@scan
+}
+\SOuL@redefine\SOUL@addprotect#1#2{%
+  {%
+    \let\protect\noexpand
+    \edef\x{%
+      \global\SOUL@word={%
+        \the\SOUL@word
+        {{\hbox{#2}}}%
+      }%
+    }%
+    \x
+  }%
+  \SOUL@scan
+}#1#2{%
+  \begingroup
+    \let\protect\noexpand
+    \edef\x{\endgroup
+      \SOUL@word={%
+        \the\SOUL@word
+!       {\hbox{#2}}%
++       {\etex@unexpanded{\hbox{#2}}}%
+      }%
+    }%
+  \x
+  \SOUL@scan
+}
++ \SOuL@redefine\SOUL@addtoken#1{%
++   \edef\x{%
++     \SOUL@word={%
++       \the\SOUL@word
++       \noexpand#1%
++     }%
++   }%
++   \x
++   \SOUL@scan
++ }#1{%
++   \edef\x{%
++     \SOUL@word={%
++       \the\SOUL@word
++       \etex@unexpanded{#1}%
++     }%
++   }%
++   \x
++   \SOUL@scan
++ }%
+\SOuL@AtEnd
+\endinput
+%%
+%% End of file `soulutf8.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
index dc1df3cb697..9ed85d874c8 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
@@ -91,47 +91,48 @@
   \fi
 \expandafter\x\csname ver@stringenc.sty\endcsname
 \ProvidesPackage{stringenc}%
-  [2007/06/16 v1.1 Converts strings between encodings (HO)]
+  [2007/09/09 v1.2 Converts strings between encodings (HO)]
 \expandafter\edef\csname SE@AtEnd\endcsname{%
   \catcode64 \the\catcode64\relax
 }
 \catcode64 11 % @
-\def\SE@EnsureCode#1#2#3{%
+\def\TMP@EnsureCode#1#2#3{%
   \edef\SE@AtEnd{%
     \SE@AtEnd
     #1#2 \the#1#2\relax
   }%
   #1#2 #3\relax
 }
-\SE@EnsureCode\catcode{34}{12}% "
-\SE@EnsureCode\catcode{36}{3}% $
-\SE@EnsureCode\catcode{38}{4}% &
-\SE@EnsureCode\catcode{39}{12}% '
-\SE@EnsureCode\catcode{40}{12}% (
-\SE@EnsureCode\catcode{41}{12}% )
-\SE@EnsureCode\catcode{42}{12}% *
-\SE@EnsureCode\catcode{43}{12}% +
-\SE@EnsureCode\catcode{44}{12}% ,
-\SE@EnsureCode\catcode{45}{12}% -
-\SE@EnsureCode\catcode{46}{12}% .
-\SE@EnsureCode\catcode{58}{12}% :
-\SE@EnsureCode\catcode{60}{12}% <
-\SE@EnsureCode\catcode{61}{12}% =
-\SE@EnsureCode\catcode{62}{12}% >
-\SE@EnsureCode\catcode{91}{12}% [
-\SE@EnsureCode\catcode{93}{12}% ]
-\SE@EnsureCode\catcode{94}{7}% ^
-\SE@EnsureCode\catcode{96}{12}% `
-\SE@EnsureCode\uccode{34}{0}% "
-\SE@EnsureCode\uccode{48}{0}% 0
-\SE@EnsureCode\uccode{61}{0}% =
+\TMP@EnsureCode\catcode{34}{12}% "
+\TMP@EnsureCode\catcode{36}{3}% $
+\TMP@EnsureCode\catcode{38}{4}% &
+\TMP@EnsureCode\catcode{39}{12}% '
+\TMP@EnsureCode\catcode{40}{12}% (
+\TMP@EnsureCode\catcode{41}{12}% )
+\TMP@EnsureCode\catcode{42}{12}% *
+\TMP@EnsureCode\catcode{43}{12}% +
+\TMP@EnsureCode\catcode{44}{12}% ,
+\TMP@EnsureCode\catcode{45}{12}% -
+\TMP@EnsureCode\catcode{46}{12}% .
+\TMP@EnsureCode\catcode{47}{12}% /
+\TMP@EnsureCode\catcode{58}{12}% :
+\TMP@EnsureCode\catcode{60}{12}% <
+\TMP@EnsureCode\catcode{61}{12}% =
+\TMP@EnsureCode\catcode{62}{12}% >
+\TMP@EnsureCode\catcode{91}{12}% [
+\TMP@EnsureCode\catcode{93}{12}% ]
+\TMP@EnsureCode\catcode{94}{7}% ^
+\TMP@EnsureCode\catcode{96}{12}% `
+\TMP@EnsureCode\uccode{34}{0}% "
+\TMP@EnsureCode\uccode{48}{0}% 0
+\TMP@EnsureCode\uccode{61}{0}% =
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \input infwarerr.sty\relax
   \input pdfescape.sty\relax
 \else
-  \RequirePackage{infwarerr}%
-  \RequirePackage{pdfescape}%
+  \RequirePackage{infwarerr}[2007/09/09]%
+  \RequirePackage{pdfescape}[2007/09/09]%
 \fi
 \def\SE@Empty{}
 \long\def\SE@FirstOfOne#1{#1}
@@ -156,7 +157,7 @@
 }
 \def\SE@ConvertTo#1#2#3{%
   \let\SE@result\SE@Empty
-  \PE@sanitize\SE@encoding{#3}%
+  \EdefSanitize\SE@encoding{#3}%
   \expandafter\ifx\csname\SE@PrefixTo\SE@encoding\endcsname\relax
     \StringEncodingLoad\SE@encoding
   \fi
@@ -244,7 +245,7 @@
 }
 \def\SE@ConvertFrom#1#2#3{%
   \let\SE@result\SE@Empty
-  \PE@sanitize\SE@encoding{#3}%
+  \EdefSanitize\SE@encoding{#3}%
   \expandafter\ifx\csname\SE@PrefixFrom\SE@encoding\endcsname\relax
     \StringEncodingLoad\SE@encoding
   \fi
@@ -506,15 +507,15 @@ $ \fi
 & \fi
 }
 \def\StringEncodingConvert#1#2#3#4{%
-  \PE@sanitize\SE@from{#3}%
-  \PE@sanitize\SE@to{#4}%
+  \EdefSanitize\SE@from{#3}%
+  \EdefSanitize\SE@to{#4}%
   \expandafter\ifx\csname SE@alias@\SE@from\endcsname\relax
   \else
-    \PE@sanitize\SE@from{\csname SE@alias@\SE@from\endcsname}%
+    \EdefSanitize\SE@from{\csname SE@alias@\SE@from\endcsname}%
   \fi
   \expandafter\ifx\csname SE@alias@\SE@to\endcsname\relax
   \else
-    \PE@sanitize\SE@to{\csname SE@alias@\SE@to\endcsname}%
+    \EdefSanitize\SE@to{\csname SE@alias@\SE@to\endcsname}%
   \fi
   \ifx\SE@to\SE@utfxvi
     \let\SE@to\SE@utfxvibe
@@ -577,12 +578,12 @@ $ \fi
   \StringEncodingSuccessFailure
 }
 \newif\ifSE@TestMode
-\PE@sanitize\SE@utfxvi{utf16}
-\PE@sanitize\SE@utfxvibe{utf16be}
-\PE@sanitize\SE@utfxvile{utf16le}
-\PE@sanitize\SE@utfxxxii{utf32}
-\PE@sanitize\SE@utfxxxiibe{utf32be}
-\PE@sanitize\SE@utfxxxiile{utf32le}
+\EdefSanitize\SE@utfxvi{utf16}
+\EdefSanitize\SE@utfxvibe{utf16be}
+\EdefSanitize\SE@utfxvile{utf16le}
+\EdefSanitize\SE@utfxxxii{utf32}
+\EdefSanitize\SE@utfxxxiibe{utf32be}
+\EdefSanitize\SE@utfxxxiile{utf32le}
 \def\SE@CheckByteOrderTwo{%
   \expandafter\SE@@CheckByteOrderTwo\SE@result0000\@nil
 }
diff --git a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty
index eb7cbbbff80..34f66343644 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty
@@ -25,7 +25,8 @@
 %% 
 %% This work consists of the main source file telprint.dtx
 %% and the derived files
-%%    telprint.sty, telprint.pdf, telprint.ins, telprint.drv.
+%%    telprint.sty, telprint.pdf, telprint.ins, telprint.drv,
+%%    telprint-test1.tex.
 %% 
 \begingroup
   \catcode44 12 % ,
@@ -79,14 +80,35 @@
   \fi
 \expandafter\x\csname ver@telprint.sty\endcsname
 \ProvidesPackage{telprint}%
-  [2007/04/11 v1.8 Formatting of German phone numbers (HO)]
-\ifx\telprint\UnDeFiNeD
-\else\endinput\fi
+  [2007/09/09 v1.9 Formatting of German phone numbers (HO)]
+\expandafter\edef\csname TELAtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\TELAtEnd{%
+    \TELAtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{36}{3}% $
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{126}{13}% ~ (active)
 \ifx\DeclareRobustCommand\UnDeFiNeD
   \def\DeclareRobustCommand*#1[1]{\def#1##1}%
   \def\TELreset{\let\DeclareRobustCommand=\UnDeFiNeD}%
-  \immediate\write-1{%
-    Package `telprint' warning: %
+  \input infwarerr.sty\relax
+  \@PackageInfo{telprint}{%
     Macros are not robust!%
   }%
 \else
@@ -177,6 +199,7 @@
   \TELsplit#1{}\TELsplitEND
 }
 \TELreset\let\TELreset=\UnDeFiNeD
+\TELAtEnd
 \endinput
 %%
 %% End of file `telprint.sty'.