[latex3-commits] [git/LaTeX3-latex3-latex3] xparse: Use 'xparse-generic' as core name (6ff9262ae)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : xparse
Link       : https://github.com/latex3/latex3/commit/6ff9262ae0e94f21ed6b5bf190e18c630dbefc59

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

commit 6ff9262ae0e94f21ed6b5bf190e18c630dbefc59
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 12 10:17:06 2020 +0100

    Use 'xparse-generic' as core name


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

6ff9262ae0e94f21ed6b5bf190e18c630dbefc59
 l3packages/xfp/testfiles/xfp000.tlg       |  2 +-
 l3packages/xparse/build.lua               |  2 +-
 l3packages/xparse/testfiles/xparse000.tlg |  2 +-
 l3packages/xparse/testfiles/xparse006.lvt |  2 +-
 l3packages/xparse/xparse.dtx              | 12 +++++++-----
 l3packages/xparse/xparse.ins              |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/l3packages/xfp/testfiles/xfp000.tlg b/l3packages/xfp/testfiles/xfp000.tlg
index f6e6fa92d..76cdae68e 100644
--- a/l3packages/xfp/testfiles/xfp000.tlg
+++ b/l3packages/xfp/testfiles/xfp000.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 Author: Bruno Le Floch
 (xfp.sty (xparse.sty
 Package: xparse ....-..-.. L3 Experimental document command parser
-(xparse.tex
+(xparse-generic.tex
 \l__xparse_current_arg_int=\count...
 \g__xparse_grabber_int=\count...
 \l__xparse_m_args_int=\count...
diff --git a/l3packages/xparse/build.lua b/l3packages/xparse/build.lua
index 014886b0f..489b4db35 100644
--- a/l3packages/xparse/build.lua
+++ b/l3packages/xparse/build.lua
@@ -7,7 +7,7 @@
 bundle = "l3packages"
 module = "xparse"
 
-installfiles = {"xparse.ltx", "xparse.sty", "xparse.tex"}
+installfiles = {"xparse.ltx", "xparse.sty", "xparse-generic.tex"}
 
 -- Location of main directory: use Unix-style path separators
 maindir = "../.."
diff --git a/l3packages/xparse/testfiles/xparse000.tlg b/l3packages/xparse/testfiles/xparse000.tlg
index 3923341c9..6443924a6 100644
--- a/l3packages/xparse/testfiles/xparse000.tlg
+++ b/l3packages/xparse/testfiles/xparse000.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 Author: Bruno Le Floch
 (xparse.sty
 Package: xparse ....-..-.. L3 Experimental document command parser
-(xparse.tex
+(xparse-generic.tex
 \l__xparse_current_arg_int=\count...
 \g__xparse_grabber_int=\count...
 \l__xparse_m_args_int=\count...
diff --git a/l3packages/xparse/testfiles/xparse006.lvt b/l3packages/xparse/testfiles/xparse006.lvt
index ce5422237..39d2a774f 100644
--- a/l3packages/xparse/testfiles/xparse006.lvt
+++ b/l3packages/xparse/testfiles/xparse006.lvt
@@ -10,7 +10,7 @@
 \debug_on:n { check-declarations , deprecation , log-functions }
 \ExplSyntaxOff
 % \RequirePackage{xparse}
-\input xparse.tex
+\input xparse-generic.tex
 
 \begin{document}
 
diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index 841fa5082..0f1a8482b 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -1019,22 +1019,24 @@
 % \end{variable}
 % \end{variable}
 %
+%    \begin{macrocode}
+%</package>
+%    \end{macrocode}
+%
 % \subsection{Reload check}
 %
 % A simple reload check.
 %    \begin{macrocode}
+%<*core>
 \cs_if_exist:NT \NewDocumentCommand
   { \file_input_stop: }
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%</package>
+%</core>
 %    \end{macrocode}
 %
 %  Load the core code.
 %    \begin{macrocode}
 %<*2ekernel|package>
-\file_input:n { xparse.tex }
+\file_input:n { xparse-generic.tex }
 %</2ekernel|package>
 %    \end{macrocode}
 %
diff --git a/l3packages/xparse/xparse.ins b/l3packages/xparse/xparse.ins
index e316ee04a..17a94782a 100644
--- a/l3packages/xparse/xparse.ins
+++ b/l3packages/xparse/xparse.ins
@@ -42,7 +42,7 @@ and all files in that bundle must be distributed together.
 
 \keepsilent
 
-\generate{\file{xparse.tex}{\from{xparse.dtx}{core}}
+\generate{\file{xparse-generic.tex}{\from{xparse.dtx}{core}}
           \file{xparse.sty}{\from{xparse.dtx}{package}}
           \file{xparse.ltx}{\from{xparse.dtx}{2ekernel}}}