[latex3-commits] [git/LaTeX3-latex3-latex2e] earlier-expl3: Load ltluatex as soon as possible (df6a9339)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/latex2e
On branch  : earlier-expl3
Link       : https://github.com/latex3/latex2e/commit/df6a93398d85d555a050a6d9a7fb410eef757e8c

>---------------------------------------------------------------

commit df6a93398d85d555a050a6d9a7fb410eef757e8c
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Fri Mar 20 22:13:50 2020 +0100

    Load ltluatex as soon as possible


>---------------------------------------------------------------

df6a93398d85d555a050a6d9a7fb410eef757e8c
 base/changes.txt      |  4 ++++
 base/doc/source2e.tex |  4 ++--
 base/format.ins       |  2 +-
 base/ltluatex.dtx     | 17 +++++++++--------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 26fa1d8b..ee34241b 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -29,6 +29,10 @@ are not part of the distribution.
 	  \@expl at pop@filename@@.
 	- Added temporary definitions for some kernel commands.
 
+2020-06-04  Marcel Krüger    <Marcel.Krueger at latex-project.org>
+
+  * format.ins: Load ltluatex.dtx before ltdefns.dtx
+
 2020-05-19  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* ltfssini.dtx (section{Custom series settings for main document families}):
diff --git a/base/doc/source2e.tex b/base/doc/source2e.tex
index ccb19a8b..3529d437 100644
--- a/base/doc/source2e.tex
+++ b/base/doc/source2e.tex
@@ -242,6 +242,8 @@ page_precedence "rnaA"
 
  \DocInclude{ltvers}   % Current version date
 
+ \DocInclude{ltluatex} % Luatex support
+
  \DocInclude{ltdefns}  % Initial definitions.
 
  \DocInclude{ltalloc}  % Allocation of counters and others.
@@ -318,8 +320,6 @@ page_precedence "rnaA"
 
  \DocInclude{lthyphen} % Hyphenation (hyphen.ltx).
 
- \DocInclude{ltluatex} % Luatex support
-
  \DocInclude{ltfinal}  % Last minute initialisations and dump
 
  \includeltpatch       % Corrections distributed after the full release
diff --git a/base/format.ins b/base/format.ins
index 940161ed..5d96b5e1 100644
--- a/base/format.ins
+++ b/base/format.ins
@@ -161,6 +161,7 @@ the system are in the document `cfgguide.tex'.
           \from{ltdirchk.dtx}{initex,2ekernel,dircheck}
           \from{ltplain.dtx}{2ekernel}
           \from{ltvers.dtx}{2ekernel}
+          \from{ltluatex.dtx}{2ekernel}
           \from{ltdefns.dtx}{2ekernel}
           \from{ltalloc.dtx}{2ekernel}
           \from{ltcntrl.dtx}{2ekernel}
@@ -196,7 +197,6 @@ the system are in the document `cfgguide.tex'.
           \from{ltpage.dtx}{2ekernel}
           \from{ltoutput.dtx}{2ekernel}
           \from{ltclass.dtx}{2ekernel,tracerollback}
-          \from{ltluatex.dtx}{2ekernel}
           \from{ltfinal.dtx}{2ekernel}}
    \file{tracefnt.sty}{%
           \from{ltfsstrc.dtx}{package,trace}}
diff --git a/base/ltluatex.dtx b/base/ltluatex.dtx
index 0ba89c5d..2e692a99 100644
--- a/base/ltluatex.dtx
+++ b/base/ltluatex.dtx
@@ -28,7 +28,7 @@
 \ProvidesFile{ltluatex.dtx}
 %</driver>
 %<*tex>
-[2020/03/07 v1.1m
+[2020/06/10 v1.1n
 %</tex>
 %<plain>  LuaTeX support for plain TeX (core)
 %<*tex>
@@ -406,6 +406,14 @@
 \fi
 %    \end{macrocode}
 %
+% \changes{v1.1n}{2020/06/10}{Define \cs{@gobble}/\cs{@firstofone} even for \LaTeX\ to allow early loading.}
+% Two simple \LaTeX\ macros from |ltdefns.dtx| have to be defined here
+% because ltdefns.dtx is not loaded yet when ltluatex.dtx is executed.
+%    \begin{macrocode}
+\long\def\@gobble#1{}
+\long\def\@firstofone#1{#1}
+%    \end{macrocode}
+%
 % \subsection{Older \LaTeX{}/Plain \TeX\ setup}
 %
 %    \begin{macrocode}
@@ -521,12 +529,6 @@
   \fi}%
 %    \end{macrocode}
 %
-% Two simple \LaTeX\ macros used in |ltlatex.sty|.
-%    \begin{macrocode}
-\long\def\@gobble#1{}
-\long\def\@firstofone#1{#1}
-%    \end{macrocode}
-%
 % Fix up allocations not to clash with |etex.src|.
 %
 %    \begin{macrocode}
@@ -544,7 +546,6 @@
 %</tex>
 %    \end{macrocode}
 %
-%
 % \subsection{Attributes}
 %
 % \begin{macro}{\newattribute}