1 files changed, 28 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty
index 9e71c2bc074..75f8d14ce0b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty
@@ -32,28 +32,37 @@
 %%    accsupp-example1.tex, accsupp-example2.tex,
 %%    accsupp-test1.tex.
 %% 
-\begingroup
-  \catcode123 1 % {
-  \catcode125 2 % }
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+  \catcode13=5 % ^^M
+  \endlinechar=13 %
+  \catcode123=1 % {
+  \catcode125=2 % }
+  \catcode64=11 % @
   \def\x{\endgroup
     \expandafter\edef\csname ACCSUPP@AtEnd\endcsname{%
-      \catcode35 \the\catcode35\relax
-      \catcode64 \the\catcode64\relax
-      \catcode123 \the\catcode123\relax
-      \catcode125 \the\catcode125\relax
+      \endlinechar=\the\endlinechar\relax
+      \catcode13=\the\catcode13\relax
+      \catcode32=\the\catcode32\relax
+      \catcode35=\the\catcode35\relax
+      \catcode61=\the\catcode61\relax
+      \catcode64=\the\catcode64\relax
+      \catcode123=\the\catcode123\relax
+      \catcode125=\the\catcode125\relax
     }%
   }%
-\x
-\catcode35 6 % #
-\catcode64 11 % @
-\catcode123 1 % {
-\catcode125 2 % }
+\x\catcode61\catcode48\catcode32=10\relax%
+\catcode13=5 % ^^M
+\endlinechar=13 %
+\catcode35=6 % #
+\catcode64=11 % @
+\catcode123=1 % {
+\catcode125=2 % }
 \def\TMP@EnsureCode#1#2{%
   \edef\ACCSUPP@AtEnd{%
     \ACCSUPP@AtEnd
-    \catcode#1 \the\catcode#1\relax
+    \catcode#1=\the\catcode#1\relax
   }%
-  \catcode#1 #2\relax
+  \catcode#1=#2\relax
 }
 \TMP@EnsureCode{10}{12}% ^^J
 \TMP@EnsureCode{33}{12}% !
@@ -67,13 +76,12 @@
 \TMP@EnsureCode{47}{12}% /
 \TMP@EnsureCode{58}{12}% :
 \TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{61}{12}% =
 \TMP@EnsureCode{62}{12}% >
 \TMP@EnsureCode{94}{7}% ^ (superscript)
 \TMP@EnsureCode{96}{12}% `
 \TMP@EnsureCode{254}{12}% ^^fe
 \TMP@EnsureCode{255}{12}% ^^ff
-\g@addto@macro\ACCSUPP@AtEnd{\endinput}
+\edef\ACCSUPP@AtEnd{\ACCSUPP@AtEnd\noexpand\endinput}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{accsupp}%
   [2010/01/16 v0.3 Accessibility support by marked content (HO)]
@@ -150,21 +158,21 @@
       \let\ACCSUPP@driver\ACCSUPP@temp
     \fi
   \fi
-\fi
+\fi%
 \ifx\ACCSUPP@driver\relax
   \PackageError{accsupp}{%
     Missing driver option.\MessageBreak
     Package loading is aborted%
   }\@ehc
   \expandafter\ACCSUPP@AtEnd
-\fi
+\fi%
 \InputIfFileExists{accsupp-\ACCSUPP@driver.def}{}{%
   \PackageError{accsupp}{%
     Unsupported driver `\ACCSUPP@driver'.\MessageBreak
     Package loading is aborted%
   }\@ehc
   \ACCSUPP@AtEnd
-}
+}%
 \DeclareBoolOption{unicode}
 \DeclareStringOption[page]{pdfliteral}
 \DeclareStringOption{Lang}
@@ -299,7 +307,7 @@
   }%
   \edef#1{(\ACCSUPP@temp)}%
 }
-\ACCSUPP@AtEnd
+\ACCSUPP@AtEnd%
 \endinput
 %%
 %% End of file `accsupp.sty'.