1 files changed, 30 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/kvoptions-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/kvoptions-test1.tex
index 09f47741097..08223de7752 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/kvoptions-test1.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/kvoptions-test1.tex
@@ -30,7 +30,8 @@
 %%    kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv,
 %%    kvoptions-patch.sty, example-mycolorsetup.sty,
 %%    kvoptions-test1.tex, kvoptions-test2.tex,
-%%    kvoptions-test3.tex.
+%%    kvoptions-test3.tex, kvoptions-test4.tex,
+%%    kvoptions-test4.sty.
 %% 
 %% No we don't need the option 'color'.
 %% With color support option 'emphcolor' will dynamically
@@ -88,6 +89,22 @@
     \advance\count@ 1 %
   \repeat
 }
+\def\RangeCatcodeCheck#1#2#3{%
+  \count@=#1\relax
+  \loop
+    \ifnum#3=\catcode\count@
+    \else
+      \errmessage{%
+        Character \the\count@\space
+        with wrong catcode \the\catcode\count@\space
+        instead of \number#3%
+      }%
+    \fi
+  \ifnum\count@<#2\relax
+    \advance\count@ 1 %
+  \repeat
+}
+\def\space{ }
 \expandafter\ifx\csname LoadCommand\endcsname\relax
   \def\LoadCommand{\input kvoptions.sty\relax}%
 \fi
@@ -98,15 +115,20 @@
   \RangeCatcodeInvalid{123}{255}%
   \catcode`\@=12 %
   \catcode`\\=0 %
-  \catcode`\{=1 %
-  \catcode`\}=2 %
-  \catcode`\#=6 %
-  \catcode`\[=12 %
-  \catcode`\]=12 %
   \catcode`\%=14 %
-  \catcode`\ =10 %
-  \catcode13=5 %
   \LoadCommand
+  \RangeCatcodeCheck{0}{36}{15}%
+  \RangeCatcodeCheck{37}{37}{14}%
+  \RangeCatcodeCheck{38}{47}{15}%
+  \RangeCatcodeCheck{48}{57}{12}%
+  \RangeCatcodeCheck{58}{63}{15}%
+  \RangeCatcodeCheck{64}{64}{12}%
+  \RangeCatcodeCheck{65}{90}{11}%
+  \RangeCatcodeCheck{91}{91}{15}%
+  \RangeCatcodeCheck{92}{92}{0}%
+  \RangeCatcodeCheck{93}{96}{15}%
+  \RangeCatcodeCheck{97}{122}{11}%
+  \RangeCatcodeCheck{123}{255}{15}%
   \RestoreCatcodes
 }
 \Test