1 files changed, 78 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
index e7b9e0a0f57..5e42e7bbe0c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
@@ -79,6 +79,7 @@
 \keepsilent
 \askforoverwritefalse
 
+\let\MetaPrefix\relax
 \preamble
 
 This is a generated file.
@@ -105,6 +106,7 @@ and the derived files
    kvoptions-test1.tex, kvoptions-test2.tex.
 
 \endpreamble
+\let\MetaPrefix\DoubleperCent
 
 \generate{%
   \file{kvoptions.ins}{\from{kvoptions.dtx}{install}}%
@@ -127,6 +129,10 @@ and the derived files
 \Msg{*}
 \Msg{*     kvoptions.sty, kvoptions-patch.sty}
 \Msg{*}
+\Msg{* And install the following script file:}
+\Msg{*}
+\Msg{*     }
+\Msg{*}
 \Msg{* To produce the documentation run the file `kvoptions.drv'}
 \Msg{* through LaTeX.}
 \Msg{*}
@@ -144,14 +150,14 @@ and the derived files
 \ProvidesFile{kvoptions.drv}%
   [2007/10/18 v3.0 Keyval support for LaTeX options (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}[2007/10/21]
+\usepackage{holtxdoc}[2007/11/11]
 \begin{document}
   \DocInput{kvoptions.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1866}
+% \CheckSum{1978}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -974,6 +980,9 @@ and the derived files
       \fi
     \fi
   \else
+    \catcode35 6 % #
+    \catcode123 1 % {
+    \catcode125 2 % }
     \expandafter\ifx\csname PackageInfo\endcsname\relax
       \def\x#1#2{%
         \immediate\write-1{Package #1 Info: #2.}%
@@ -990,6 +999,7 @@ and the derived files
 %    Package identification:
 %    \begin{macrocode}
 \begingroup
+  \catcode35 6 % #
   \catcode40 12 % (
   \catcode41 12 % )
   \catcode44 12 % ,
@@ -998,6 +1008,8 @@ and the derived files
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
     \def\x#1#2#3[#4]{\endgroup
       \immediate\write-1{Package: #3 #4}%
@@ -1019,10 +1031,22 @@ and the derived files
 % \paragraph{Catcodes}
 %
 %    \begin{macrocode}
-\expandafter\edef\csname KVO@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname KVO@AtEnd\endcsname{%
+      \catcode35 \the\catcode35\relax
+      \catcode64 \the\catcode64\relax
+      \catcode123 \the\catcode123\relax
+      \catcode125 \the\catcode125\relax
+    }%
+  }%
+\x
+\catcode35 6 % #
 \catcode64 11 % @
+\catcode123 1 % {
+\catcode125 2 % }
 \def\TMP@EnsureCode#1#2{%
   \edef\KVO@AtEnd{%
     \KVO@AtEnd
@@ -1834,10 +1858,22 @@ and the derived files
 %    \begin{macrocode}
 %<*patch>
 \NeedsTeXFormat{LaTeX2e}
-\expandafter\edef\csname KVO@AtEnd\endcsname{%
-  \catcode64 \the\catcode64\relax
-}
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname KVO@AtEnd\endcsname{%
+      \catcode35 \the\catcode35\relax
+      \catcode64 \the\catcode64\relax
+      \catcode123 \the\catcode123\relax
+      \catcode125 \the\catcode125\relax
+    }%
+  }%
+\x
+\catcode35 6 % #
 \catcode64 11 % @
+\catcode123 1 % {
+\catcode125 2 % }
 \def\TMP@EnsureCode#1#2{%
   \edef\KVO@AtEnd{%
     \KVO@AtEnd
@@ -2382,7 +2418,39 @@ and the derived files
 %<*test1>
 %    \end{macrocode}
 %    \begin{macrocode}
+\catcode`\{=1 %
+\catcode`\}=2 %
+\catcode`\#=6 %
 \catcode`\@=11 %
+\expandafter\ifx\csname count@\endcsname\relax
+  \countdef\count@=255 %
+\fi
+\expandafter\ifx\csname @gobble\endcsname\relax
+  \long\def\@gobble#1{}%
+\fi
+\expandafter\ifx\csname @firstofone\endcsname\relax
+  \long\def\@firstofone#1{#1}%
+\fi
+\expandafter\ifx\csname loop\endcsname\relax
+  \expandafter\@firstofone
+\else
+  \expandafter\@gobble
+\fi
+{%
+  \def\loop#1\repeat{%
+    \def\body{#1}%
+    \iterate
+  }%
+  \def\iterate{%
+    \body
+      \let\next\iterate
+    \else
+      \let\next\relax
+    \fi
+    \next
+  }%
+  \let\repeat=\fi
+}%
 \def\RestoreCatcodes{}
 \count@=0 %
 \loop
@@ -2391,7 +2459,7 @@ and the derived files
     \catcode\the\count@=\the\catcode\count@\relax
   }%
 \ifnum\count@<255 %
-  \advance\count@\@ne
+  \advance\count@ 1 %
 \repeat
 
 \def\RangeCatcodeInvalid#1#2{%
@@ -2399,7 +2467,7 @@ and the derived files
   \loop
     \catcode\count@=15 %
   \ifnum\count@<#2\relax
-    \advance\count@\@ne
+    \advance\count@ 1 %
   \repeat
 }
 \def\Test{%