[latex3-commits] [l3svn] r6120 - Only let \@@end to \END under LaTeXe in regression-test.tex

[noreply at latex-project.org]

Author: bruno
Date: 2015-09-29 19:44:31 +0200 (Tue, 29 Sep 2015)
New Revision: 6120

Modified:
   trunk/l3build/l3build.dtx
Log:
Only let \@@end to \END under LaTeXe in regression-test.tex

Before this change,

    \input regression-test
    \input expl3-generic

failed in plain TeX because \@@end was defined by
regression-test.tex, thus l3names.sty thought LaTeX2e was in use
and set \tex_input:D equal to \@@input, which was undefined:
loading the driver file using \tex_input:D then failed.


Modified: trunk/l3build/l3build.dtx
===================================================================
--- trunk/l3build/l3build.dtx	2015-09-29 16:30:24 UTC (rev 6119)
+++ trunk/l3build/l3build.dtx	2015-09-29 17:44:31 UTC (rev 6120)
@@ -1087,6 +1087,7 @@
 ^^\endgroup{}%
 %    \end{macrocode}
 % The test should end with |\END| or |\end{document}|
+% or |\bye| in plain \TeX{}.
 %    \begin{macrocode}
 \ifx\@@end\@undefined
   \let\@@@end\end
@@ -1105,7 +1106,11 @@
     \fi
     \LONGTYPEOUT{END-TEST-LOG}\@@@end
   }
-\let\@@end\END
+\ifx\@@end\@undefined
+  \let\end\END
+\else
+  \let\@@end\END
+\fi
 %    \end{macrocode}
 % After the |\START| should come declarations of the format and style
 % options being used.