[latex3-commits] [git/LaTeX3-latex3-latex2e] cmd: Integrate ltcmd to the kernel (4620c382)

[Joseph Wright]

Repository : https://github.com/latex3/latex2e
On branch  : cmd
Link       : https://github.com/latex3/latex2e/commit/4620c382db529b64244a99a5f8f17a6537f4f82b

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

commit 4620c382db529b64244a99a5f8f17a6537f4f82b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Nov 25 18:56:59 2020 +0000

    Integrate ltcmd to the kernel
    
    This means xparse.ltx is no longer required for an
    up-to-date kernel. We will need to adjust latex3 but
    that should come later: it will involved a frozen xparse-<date>.sty and xparse.ltx, with most of the
    sources removed.


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

4620c382db529b64244a99a5f8f17a6537f4f82b
 base/changes.txt      | 11 +++++++++++
 base/doc/source2e.tex |  2 ++
 base/format.ins       |  1 +
 base/ltcmd.dtx        |  5 +++++
 base/ltexpl.dtx       | 33 +++++++++++++++++++++------------
 5 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 1fccb579..944e536c 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,17 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2020-11-25  Joseph Wright  <Joseph.Wright at latex-project.org>
+
+	* ltexpl.dtx
+           Adjust for full xparse integration
+
+        * ltcmd.dtx
+          New file to replace loading xparse
+
+        * usrguide3.tex
+          New file to document ltcmd
+
 2020-10-26  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* ltmiscen.dtx (subsection{Environments}):
diff --git a/base/doc/source2e.tex b/base/doc/source2e.tex
index e74c424d..5f93ba3b 100644
--- a/base/doc/source2e.tex
+++ b/base/doc/source2e.tex
@@ -246,6 +246,8 @@ page_precedence "rnaA"
 
  \DocInclude{ltexpl}   % L3 programming layer integration
 
+ \DocInclude{ltcmd}   % Document commands (L3 module)
+
  \DocInclude{ltdefns}  % Initial definitions.
 
  \DocInclude{lthooks}  % Hook management (L3 module)
diff --git a/base/format.ins b/base/format.ins
index 8796d16d..1df52880 100644
--- a/base/format.ins
+++ b/base/format.ins
@@ -165,6 +165,7 @@ the system are in the document `cfgguide.tex'.
 % This is done as soon as possible here before \texttt{ltdefns.dtx} so that
 % we have the extensions as soon as possible.
           \from{ltexpl.dtx}{2ekernel}         % expl3-based extensions
+          \from{ltcmd.dtx}{2ekernel}
           \from{ltdefns.dtx}{2ekernel}
           \from{lthooks.dtx}{2ekernel}        % L3 layer module
           \from{ltalloc.dtx}{2ekernel}
diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx
index 0ccff062..36ab0da1 100644
--- a/base/ltcmd.dtx
+++ b/base/ltcmd.dtx
@@ -3969,6 +3969,11 @@
 \ExplSyntaxOff
 %    \end{macrocode}
 %
+% We need to stop DocStrip treating |@@| in a special way at this point.
+%    \begin{macrocode}
+%<@@=>
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %</2ekernel>
 %    \end{macrocode}
diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index 15485477..ac667d81 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltexpl.dtx}
-             [2020/11/24 v1.2g LaTeX Kernel (expl3-dependent code)]
+             [2020/11/25 v1.3 LaTeX Kernel (expl3-dependent code)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltexpl.dtx}
@@ -53,7 +53,7 @@
 % \fi
 %
 %
-% \changes{v1.2d}{2020/08/21}{Dropped unused command}
+% \changes{v1.3}{2020/11/25}{Dropped unused command}
 %
 % \section{\pkg{expl3}-dependent code}
 %
@@ -132,7 +132,7 @@
 %    refined version!
 %    \begin{macrocode}
 %<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease>\IncludeInRelease{2021/05/01}%
 %<latexrelease>                 {expl3}{Pre-load expl3}%
 \expandafter\ifx\csname tex\string _let:D\endcsname\relax
   \expandafter\@firstofone
@@ -202,17 +202,26 @@
         \@@end  % die
 %</latexrelease>
       }%
-      {%
-        \input expl3.ltx
-        \ifdefined\NewDocumentCommand
-        \else
-          \IfFileExists{xparse.ltx}
-            {\input xparse.ltx }
-            {}%
-         \fi
-      }%
+      {\input expl3.ltx }%
   }
 %<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% To support roll-forward for the case where \textsf{xparse} is fully
+% integrated into the kernel, we do not need to repeate the complex test
+% above as we can simply look for the marker command.
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease>                 {expl3}{Pre-load expl3}
+%<latexrelease>\@ifundefined{ExplSynaxOn}
+%<latexrelease>  {}
+%<latexrelease>  {%
+%<latexrelease>    \IfFileExists{xparse.ltx}
+%<latexrelease>      {\input xparse.ltx }
+%<latexrelease>      {}%
+%<latexrelease>  }
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>
 %<latexrelease>
 %<latexrelease>\IncludeInRelease{2020/02/02}%
 %<latexrelease>                 {expl3}{Pre-load expl3}%