[latex3-commits] [latex3/latex3] e-type: Swtich from x-type to e-type in l3packages (86c6997b9)

[github at latex-project.org]

Repository : https://github.com/latex3/latex3
On branch  : e-type
Link       : https://github.com/latex3/latex3/commit/86c6997b9fbaaa447faa78b64c299b5762460002

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

commit 86c6997b9fbaaa447faa78b64c299b5762460002
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Sep 25 22:08:17 2023 +0100

    Swtich from x-type to e-type in l3packages
    
    The status of xparse-generic is not 100% clear,
    and the frozen .tex files are left unchanged.


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

86c6997b9fbaaa447faa78b64c299b5762460002
 l3packages/l3keys2e/l3keys2e.dtx          | 4 ++--
 l3packages/xparse/testfiles/xparse008.lvt | 2 +-
 l3packages/xtemplate/xtemplate.dtx        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/l3packages/l3keys2e/l3keys2e.dtx b/l3packages/l3keys2e/l3keys2e.dtx
index 5d2f16f8f..7c2ed197f 100644
--- a/l3packages/l3keys2e/l3keys2e.dtx
+++ b/l3packages/l3keys2e/l3keys2e.dtx
@@ -264,7 +264,7 @@
           {
             \clist_map_inline:cn { opt@ \@currname . \@currext }
               {
-                \keys_if_exist:nxTF {#1} { \@@_latexe_remove_equals:n {##1} }
+                \keys_if_exist:neTF {#1} { \@@_latexe_remove_equals:n {##1} }
                   { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} }
                   { \clist_put_right:Nn \@unusedoptionlist {##1} }
               }
@@ -284,7 +284,7 @@
   {
     \clist_map_inline:Nn \@classoptionslist
       {
-        \keys_if_exist:nxT {#1} { \@@_latexe_remove_equals:n {##1} }
+        \keys_if_exist:neT {#1} { \@@_latexe_remove_equals:n {##1} }
           {
             \clist_put_right:Nn \l_@@_latexe_options_clist {##1}
             \clist_remove_all:Nn \@unusedoptionlist {##1}
diff --git a/l3packages/xparse/testfiles/xparse008.lvt b/l3packages/xparse/testfiles/xparse008.lvt
index caecc65d2..7e7777715 100644
--- a/l3packages/xparse/testfiles/xparse008.lvt
+++ b/l3packages/xparse/testfiles/xparse008.lvt
@@ -13,7 +13,7 @@
 \AUTHOR{Phelype Oleinik}
 
 \ExplSyntaxOn
-\exp_args:Nx \use_ii_i:nn
+\exp_args:Ne \use_ii_i:nn
   { { \exp_not:o { \@declarecommandcopylisthook } } }
   { \regex_match:nnT { \c{__cmd_copy:NN} } }
   {
diff --git a/l3packages/xtemplate/xtemplate.dtx b/l3packages/xtemplate/xtemplate.dtx
index 25ef3030f..8292ce8c8 100644
--- a/l3packages/xtemplate/xtemplate.dtx
+++ b/l3packages/xtemplate/xtemplate.dtx
@@ -1601,7 +1601,7 @@
       {
         \tl_if_blank:nTF {#2}
           {
-            \exp_args:Nnnx \@@_parse_vars_elt_aux:nnn
+            \exp_args:Nnne \@@_parse_vars_elt_aux:nnn
               {#1} { global } { \tl_trim_spaces:n {#3} }
           }
           { \msg_error:nnn { xtemplate } { bad-variable } { #2 global #3 } }
@@ -2192,10 +2192,10 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_assign_choice:
   {
-    \@@_assign_choice_aux:xF
+    \@@_assign_choice_aux:eF
       { \l_@@_key_name_tl \c_space_tl \l_@@_value_tl }
       {
-        \@@_assign_choice_aux:xF
+        \@@_assign_choice_aux:eF
           { \l_@@_key_name_tl \c_space_tl unknown }
           {
             \prop_get:NoN \l_@@_keytypes_prop \l_@@_key_name_tl
@@ -2215,7 +2215,7 @@
       \l_@@_tmp_tl
       { \tl_put_right:No \l_@@_assignments_tl \l_@@_tmp_tl }
   }
-\cs_generate_variant:Nn \@@_assign_choice_aux:nF { x }
+\cs_generate_variant:Nn \@@_assign_choice_aux:nF { e }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}