generalise better catcode defenses

1 files changed, 11 insertions, 26 deletions

diff --git a/luatex.dtx b/luatex.dtx
index 2e82699..2a03561 100644
--- a/luatex.dtx
+++ b/luatex.dtx
@@ -156,10 +156,10 @@ See source file '\inFileName' for licence and contact information.
 %
 %    \subsection{Preliminaries}
 %
-%    Catcode defenses.
+%    Catcode defenses and reload protection.
 %
 %    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
+\begingroup\catcode61\catcode48\catcode32=10\relax% = and space
   \catcode123 1 % {
   \catcode125 2 % }
   \catcode 35 6 % #
@@ -168,44 +168,30 @@ See source file '\inFileName' for licence and contact information.
   \def\y#1 #2 {%
     \toks0\expandafter{\the\toks0 \catcode#1 \the\catcode#1}%
     \edef\x{\x \catcode#1 #2}}%
-  \y  13  5 % endlinechar
+  \y  13  5 % carriage return
   \y  61 12 % =
   \y  32 10 % space
   \y 123  1 % {
   \y 125  2 % }
   \y  35  6 % #
-  \y  10 12 % ^^J
-  \y  33 12 % !
-  \y  34 12 % "
-  \y  36  3 % $ $
+  \y  64 11 % @ (letter)
   \y  39 12 % '
   \y  40 12 % (
   \y  41 12 % )
-  \y  42 12 % *
-  \y  43 12 % +
-  \y  44 12 % ,
   \y  45 12 % -
   \y  46 12 % .
   \y  47 12 % /
   \y  58 12 % :
-  \y  60 12 % <
-  \y  64 11 % @ (letter)
-  \y  62 12 % >
   \y  91 12 % [
   \y  93 12 % ]
   \y  94  7 % ^
-  \y  95 12 % _ (other)
   \y  96 12 % `
   \toks0\expandafter{\the\toks0 \relax\noexpand\endinput}%
-  \edef\y#1{\endgroup\edef#1{\the\toks0}\x\relax}%
-\expandafter\y\csname lltxb@luatex@endinput\endcsname
-%    \end{macrocode}
-%
-%    Reload protection, especially for \plaintex.
-%
-%    \begin{macrocode}
-                \csname lltxb@luatex@loaded\endcsname
-\expandafter\let\csname lltxb@luatex@loaded\endcsname\lltxb@luatex@endinput
+  \edef\y#1{\noexpand\expandafter\endgroup%
+    \noexpand\ifx#1\relax \edef#1{\the\toks0}\x\relax%
+    \noexpand\else \noexpand\expandafter\noexpand\endinput%
+    \noexpand\fi}%
+\expandafter\y\csname luatex@sty@endinput\endcsname%
 %    \end{macrocode}
 %
 %    Package declaration.
@@ -243,8 +229,7 @@ See source file '\inFileName' for licence and contact information.
     This package can only be used with the LuaTeX engine^^J%
     (command `lualatex' or `luatex').^^J%
     Package loading has been stopped to prevent additional errors.}
-  \lltxb@luatex@endinput%
-  \expandafter\endinput
+  \expandafter\luatex@sty@endinput%
 \fi
 %    \end{macrocode}
 %
@@ -303,7 +288,7 @@ See source file '\inFileName' for licence and contact information.
 %    This is the end, my friend\dots the end.
 %
 %    \begin{macrocode}
-\lltxb@luatex@endinput%
+\luatex@sty@endinput%
 %</texpackage>
 %    \end{macrocode}
 %