1 files changed, 25 insertions, 26 deletions
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'.