[latex3-commits] [latex3/latex3] main, seq-filter: Revert to \__kernel_tl_set:Nx (1f45ced8b)

github at latex-project.org github at latex-project.org
Wed Jan 10 08:26:05 CET 2024


Repository : https://github.com/latex3/latex3
On branches: main,seq-filter
Link       : https://github.com/latex3/latex3/commit/1f45ced8bc3c881736ad153a3debf8ada275608b

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

commit 1f45ced8bc3c881736ad153a3debf8ada275608b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Jan 10 07:26:05 2024 +0000

    Revert to \__kernel_tl_set:Nx
    
    Following team discussion re. low-level behaviour here.


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

1f45ced8bc3c881736ad153a3debf8ada275608b
 l3kernel/l3candidates.dtx       |  2 +-
 l3kernel/l3clist.dtx            | 14 +++++++-------
 l3kernel/l3debug.dtx            | 14 +++++++-------
 l3kernel/l3doc.dtx              | 28 ++++++++++++++--------------
 l3kernel/l3file.dtx             | 32 ++++++++++++++++----------------
 l3kernel/l3fp-assign.dtx        |  2 +-
 l3kernel/l3kernel-functions.dtx |  4 ++--
 l3kernel/l3keys.dtx             | 12 ++++++------
 l3kernel/l3prop.dtx             |  4 ++--
 l3kernel/l3regex.dtx            | 14 +++++++-------
 l3kernel/l3seq.dtx              | 34 +++++++++++++++++-----------------
 l3kernel/l3str-convert.dtx      |  2 +-
 l3kernel/l3str.dtx              | 10 +++++-----
 l3kernel/l3tl-build.dtx         |  4 ++--
 l3kernel/l3tl.dtx               | 38 +++++++++++++++++++-------------------
 15 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 05e3fdc23..01e766f37 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -128,7 +128,7 @@
 %   hence in the \texttt{e}-expanding assignment.
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_set_filter:NNn
-  { \@@_set_filter:NNNn \__kernel_tl_set:Ne }
+  { \@@_set_filter:NNNn \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \seq_gset_filter:NNn
   { \@@_set_filter:NNNn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_set_filter:NNNn #1#2#3#4
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index 7b64db986..c20c836da 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -1067,7 +1067,7 @@
 %   in the case of an empty comma-list.
 %    \begin{macrocode}
 \cs_new_protected:Npn \clist_set_from_seq:NN
-  { \@@_set_from_seq:NNNN \clist_clear:N  \__kernel_tl_set:Ne  }
+  { \@@_set_from_seq:NNNN \clist_clear:N  \__kernel_tl_set:Nx  }
 \cs_new_protected:Npn \clist_gset_from_seq:NN
   { \@@_set_from_seq:NNNN \clist_gclear:N \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_set_from_seq:NNNN #1#2#3#4
@@ -1108,7 +1108,7 @@
 %   a little work to do.
 %    \begin{macrocode}
 \cs_new_protected:Npn \clist_concat:NNN
-  { \@@_concat:NNNN \__kernel_tl_set:Ne }
+  { \@@_concat:NNNN \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \clist_gconcat:NNN
   { \@@_concat:NNNN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_concat:NNNN #1#2#3#4
@@ -1155,7 +1155,7 @@
 %   }
 %    \begin{macrocode}
 \cs_new_protected:Npn \clist_set:Nn #1#2
-  { \__kernel_tl_set:Ne #1 { \@@_sanitize:n {#2} } }
+  { \__kernel_tl_set:Nx #1 { \@@_sanitize:n {#2} } }
 \cs_new_protected:Npn \clist_gset:Nn #1#2
   { \__kernel_tl_gset:Ne #1 { \@@_sanitize:n {#2} } }
 \cs_generate_variant:Nn \clist_set:Nn  { NV , Ne , c , cV , ce }
@@ -1295,7 +1295,7 @@
 %   result can safely be an empty comma list.
 %    \begin{macrocode}
 \cs_new_protected:Npn \clist_pop:NN
-  { \@@_pop:NNN \__kernel_tl_set:Ne }
+  { \@@_pop:NNN \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \clist_gpop:NN
   { \@@_pop:NNN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_pop:NNN #1#2#3
@@ -1342,7 +1342,7 @@
   }
 \prg_generate_conditional_variant:Nnn \clist_get:NN { c } { T , F , TF }
 \prg_new_protected_conditional:Npnn \clist_pop:NN #1#2 { T , F , TF }
-  { \@@_pop_TF:NNN \__kernel_tl_set:Ne #1 #2 }
+  { \@@_pop_TF:NNN \__kernel_tl_set:Nx #1 #2 }
 \prg_new_protected_conditional:Npnn \clist_gpop:NN #1#2 { T , F , TF }
   { \@@_pop_TF:NNN \__kernel_tl_gset:Ne #1 #2 }
 \cs_new_protected:Npn \@@_pop_TF:NNN #1#2#3
@@ -1473,7 +1473,7 @@
 %   the second step removes it.
 %    \begin{macrocode}
 \cs_new_protected:Npn \clist_remove_all:Nn
-  { \@@_remove_all:NNNn \clist_set_from_seq:NN \__kernel_tl_set:Ne }
+  { \@@_remove_all:NNNn \clist_set_from_seq:NN \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \clist_gremove_all:Nn
   { \@@_remove_all:NNNn \clist_gset_from_seq:NN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_remove_all:NNNn #1#2#3#4
@@ -1529,7 +1529,7 @@
 %   \texttt{N}-type comma lists, but the slow-down is not too bad.
 %    \begin{macrocode}
 \cs_new_protected:Npn \clist_reverse:N #1
-  { \__kernel_tl_set:Ne #1 { \exp_args:No \clist_reverse:n {#1} } }
+  { \__kernel_tl_set:Nx #1 { \exp_args:No \clist_reverse:n {#1} } }
 \cs_new_protected:Npn \clist_greverse:N #1
   { \__kernel_tl_gset:Ne #1 { \exp_args:No \clist_reverse:n {#1} } }
 \cs_generate_variant:Nn \clist_reverse:N { c }
diff --git a/l3kernel/l3debug.dtx b/l3kernel/l3debug.dtx
index 423ffd557..25ccc00a5 100644
--- a/l3kernel/l3debug.dtx
+++ b/l3kernel/l3debug.dtx
@@ -220,7 +220,7 @@
   }
 \cs_set_protected:Npn \debug_resume:
   {
-    \__kernel_tl_set:Ne \l_@@_suspended_tl
+    \__kernel_tl_set:Nx \l_@@_suspended_tl
       { \tl_tail:N \l_@@_suspended_tl }
     \tl_if_empty:NT \l_@@_suspended_tl
       {
@@ -510,11 +510,11 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_generate_parameter_list:NNN #1#2#3
   {
-    \__kernel_tl_set:Ne \l_@@_internal_tl
+    \__kernel_tl_set:Nx \l_@@_internal_tl
       { \exp_last_unbraced:Nf \use_ii:nnn \cs_split_function:N #1 }
-    \__kernel_tl_set:Ne #2
+    \__kernel_tl_set:Nx #2
       { \exp_args:NV \@@_build_parm_text:n \l_@@_internal_tl }
-    \__kernel_tl_set:Ne #3
+    \__kernel_tl_set:Nx #3
       { \exp_args:NV \@@_build_arg_list:n \l_@@_internal_tl }
   }
 \cs_new:Npn \@@_build_parm_text:n #1
@@ -790,7 +790,7 @@
 %
 %
 %    \begin{macrocode}
-\cs_gset_protected:Npn \__kernel_tl_set:Ne  { \cs_set_nopar:Npe }
+\cs_gset_protected:Npn \__kernel_tl_set:Nx  { \cs_set_nopar:Npe }
 \cs_gset_protected:Npn \__kernel_tl_gset:Ne { \cs_gset_nopar:Npe }
 %    \end{macrocode}
 %
@@ -842,7 +842,7 @@
       \str_set_eq:NN
       \str_put_left:Nn
       \str_put_right:Nn
-      \__kernel_tl_set:Ne
+      \__kernel_tl_set:Nx
       \tl_clear:N
       \tl_set_eq:NN
       \tl_put_left:Nn
@@ -1069,7 +1069,7 @@
     {
       \@@_trace_push:nnN { regex } { 1 } \@@_escape_use:nnnn
       \group_begin:
-        \__kernel_tl_set:Ne \l_@@_internal_a_tl
+        \__kernel_tl_set:Nx \l_@@_internal_a_tl
           { \@@_trace_pop:nnN { regex } { 1 } \@@_escape_use:nnnn }
         \use_none:nnn
     }
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index d8a1b5d35..29a06e7e8 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -1054,7 +1054,7 @@ and all files in that bundle must be distributed together.
 \cs_new_protected:Npn \@@_trim_right:Nn #1#2
   {
     \cs_set:Npn \@@_tmp:w ##1 #2 ##2 \q_stop { \exp_not:n {##1} }
-    \__kernel_tl_set:Ne #1 { \exp_after:wN \@@_tmp:w #1 #2 \q_stop }
+    \__kernel_tl_set:Nx #1 { \exp_after:wN \@@_tmp:w #1 #2 \q_stop }
   }
 \cs_generate_variant:Nn \@@_trim_right:Nn { No }
 %    \end{macrocode}
@@ -1274,14 +1274,14 @@ and all files in that bundle must be distributed together.
     \@@_if_almost_str:nTF {#1}
       {
         \@@_key_get_base_TF:nN {#1} \l_@@_tmpa_tl
-        \__kernel_tl_set:Ne #2
+        \__kernel_tl_set:Nx #2
           { \@@_split_function_do:on \l_@@_tmpa_tl { \@@_base_form_aux:nnN } }
       }
       { \tl_set:Nn #2 {#1} }
   }
 \cs_new:Npe \@@_key_get_base_TF:nN #1#2
   {
-    \__kernel_tl_set:Ne #2 { \exp_not:N \tl_to_str:n {#1} }
+    \__kernel_tl_set:Nx #2 { \exp_not:N \tl_to_str:n {#1} }
     \tl_if_in:NoF #2 { \tl_to_str:n {:} }
       { \exp_not:N \prg_break: }
     \tl_if_in:onT { #2 z } { \tl_to_str:n {TF} z }
@@ -2006,7 +2006,7 @@ and all files in that bundle must be distributed together.
         \verbatim at font
         \@@_if_almost_str:VT \l_@@_cmd_tl
           {
-            \__kernel_tl_set:Ne \l_@@_cmd_tl { \tl_to_str:N \l_@@_cmd_tl }
+            \__kernel_tl_set:Nx \l_@@_cmd_tl { \tl_to_str:N \l_@@_cmd_tl }
             \bool_if:NT \g_@@_cs_break_bool
               {
                 \regex_replace_all:nnN
@@ -2028,13 +2028,13 @@ and all files in that bundle must be distributed together.
           {
             \quark_if_no_value:NF \l_@@_cmd_index_tl
               {
-                \__kernel_tl_set:Ne \l_@@_cmd_tl
+                \__kernel_tl_set:Nx \l_@@_cmd_tl
                   { \c_backslash_str \exp_not:o { \l_@@_cmd_index_tl } }
               }
             \exp_args:No \@@_key_get:n { \l_@@_cmd_tl }
             \quark_if_no_value:NF \l_@@_cmd_module_tl
               {
-                \__kernel_tl_set:Ne \l_@@_index_module_tl
+                \__kernel_tl_set:Nx \l_@@_index_module_tl
                   { \tl_to_str:N \l_@@_cmd_module_tl }
               }
             \@@_special_index_module:ooonN
@@ -2150,7 +2150,7 @@ and all files in that bundle must be distributed together.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_get_hyper_target:nN #1#2
   {
-    \__kernel_tl_set:Ne #2 { \tl_to_str:n {#1} }
+    \__kernel_tl_set:Nx #2 { \tl_to_str:n {#1} }
     \tl_replace_all:NVn #2 \c_underscore_str { / }
     \tl_remove_all:NV   #2 \c_backslash_str
     \tl_put_left:Nn #2 { doc/function// }
@@ -2173,7 +2173,7 @@ and all files in that bundle must be distributed together.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_names_get_seq:nN #1#2
   {
-    \__kernel_tl_set:Ne \l_@@_tmpa_tl { \tl_to_str:n {#1} }
+    \__kernel_tl_set:Nx \l_@@_tmpa_tl { \tl_to_str:n {#1} }
     \bool_if:NTF \l_@@_names_verb_bool
       {
         \seq_clear:N #2
@@ -3059,7 +3059,7 @@ and all files in that bundle must be distributed together.
           \l_@@_macro_do_not_index_tl
         \exp_args:NNV \seq_set_from_clist:Nn
           \l_@@_tmpa_seq \l_@@_macro_do_not_index_tl
-        \__kernel_tl_set:Ne \l_@@_macro_do_not_index_tl
+        \__kernel_tl_set:Nx \l_@@_macro_do_not_index_tl
           { \seq_use:Nn \l_@@_tmpa_seq { , } }
         \exp_args:NV \DoNotIndex \l_@@_macro_do_not_index_tl
       }
@@ -4375,7 +4375,7 @@ and all files in that bundle must be distributed together.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_special_index_set:Nn #1#2
   {
-    \__kernel_tl_set:Ne #1 { \tl_to_str:n {#2} }
+    \__kernel_tl_set:Nx #1 { \tl_to_str:n {#2} }
     \@@_if_almost_str:nTF {#2}
       {
         \tl_replace_all:Nen #1 { \tl_to_str:n { __ } }
@@ -4393,7 +4393,7 @@ and all files in that bundle must be distributed together.
                 \token_to_str:N \verb * \verbatimchar
               }
           }
-        \__kernel_tl_set:Ne #1
+        \__kernel_tl_set:Nx #1
           {
             \token_to_str:N \verb * \verbatimchar
             #1 \verbatimchar
@@ -4444,7 +4444,7 @@ and all files in that bundle must be distributed together.
 \cs_new_protected:Npe \@@_key_get:n #1
   {
     \exp_not:N \@@_key_get_base:nN {#1} \exp_not:N \l_@@_index_macro_tl
-    \__kernel_tl_set:Ne \exp_not:N \l_@@_index_key_tl
+    \__kernel_tl_set:Nx \exp_not:N \l_@@_index_key_tl
       { \exp_not:N \tl_to_str:N \exp_not:N \l_@@_index_macro_tl }
     \tl_clear:N \exp_not:N \l_@@_index_module_tl
     \tl_if_in:NnTF \exp_not:N \l_@@_index_key_tl { \tl_to_str:n { __ } }
@@ -4466,7 +4466,7 @@ and all files in that bundle must be distributed together.
   }
 \cs_new_protected:Npn \@@_key_pop:
   {
-    \__kernel_tl_set:Ne \l_@@_index_key_tl
+    \__kernel_tl_set:Nx \l_@@_index_key_tl
       { \tl_tail:N \l_@@_index_key_tl }
   }
 %    \end{macrocode}
@@ -4481,7 +4481,7 @@ and all files in that bundle must be distributed together.
   {
     \cs_set:Npn \@@_tmpa:w ##1 #1 ##2 \q_stop
       { \exp_not:n {##1} }
-    \__kernel_tl_set:Ne \l_@@_index_module_tl
+    \__kernel_tl_set:Nx \l_@@_index_module_tl
       { \exp_after:wN \@@_tmpa:w \l_@@_index_module_tl #1 \q_stop }
   }
 \cs_new_protected:Npn \@@_key_drop_underscores:
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index c715b4da6..f70ad6add 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -1212,7 +1212,7 @@
       { \@@_open_stream:Nn #1 {#2} }
       {
         \@@_new:N #1
-        \__kernel_tl_set:Ne \l_@@_stream_tl { \int_eval:n {#1} }
+        \__kernel_tl_set:Nx \l_@@_stream_tl { \int_eval:n {#1} }
         \@@_open_stream:Nn #1 {#2}
       }
   }
@@ -1687,14 +1687,14 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \iow_open:Nn #1#2
   {
-    \__kernel_tl_set:Ne \l_@@_file_name_tl
+    \__kernel_tl_set:Nx \l_@@_file_name_tl
       { \__kernel_file_name_sanitize:n {#2} }
     \iow_close:N #1
     \seq_gpop:NNTF \g_@@_streams_seq \l_@@_stream_tl
       { \@@_open_stream:NV #1 \l_@@_file_name_tl }
       {
         \@@_new:N #1
-        \__kernel_tl_set:Ne \l_@@_stream_tl { \int_eval:n {#1} }
+        \__kernel_tl_set:Nx \l_@@_stream_tl { \int_eval:n {#1} }
         \@@_open_stream:NV #1 \l_@@_file_name_tl
       }
   }
@@ -1966,7 +1966,7 @@
 \cs_new:Npn \@@_unindent:w { }
 \cs_new_protected:Npn \@@_set_indent:n #1
   {
-    \__kernel_tl_set:Ne \l_@@_one_indent_tl
+    \__kernel_tl_set:Nx \l_@@_one_indent_tl
       { \exp_args:No \__kernel_str_to_other_fast:n { \tl_to_str:n {#1} } }
     \int_set:Nn \l_@@_one_indent_int
       { \str_count:N \l_@@_one_indent_tl }
@@ -2143,7 +2143,7 @@
 %   \cs{iow_wrap:nnnN}.
 %    \begin{macrocode}
       \cs_set_eq:NN \protect \token_to_str:N
-      \__kernel_tl_set:Ne \l_@@_wrap_tl {#1}
+      \__kernel_tl_set:Nx \l_@@_wrap_tl {#1}
       \cs_set_eq:NN \iow_wrap_allow_break: \@@_wrap_allow_break_error:
       \cs_set_eq:NN \iow_indent:n \@@_indent_error:n
 %    \end{macrocode}
@@ -2151,8 +2151,8 @@
 %   then convert to a string) and initialize the target count for lines
 %   (the first line has target count \cs{l_iow_line_count_int} instead).
 %    \begin{macrocode}
-      \__kernel_tl_set:Ne \l_@@_newline_tl { \iow_newline: #2 }
-      \__kernel_tl_set:Ne \l_@@_newline_tl { \tl_to_str:N \l_@@_newline_tl }
+      \__kernel_tl_set:Nx \l_@@_newline_tl { \iow_newline: #2 }
+      \__kernel_tl_set:Nx \l_@@_newline_tl { \tl_to_str:N \l_@@_newline_tl }
       \int_set:Nn \l_@@_line_target_int
         { \l_iow_line_count_int - \str_count:N \l_@@_newline_tl + 1 }
 %    \end{macrocode}
@@ -2192,12 +2192,12 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_wrap_do:
   {
-    \__kernel_tl_set:Ne \l_@@_wrap_tl
+    \__kernel_tl_set:Nx \l_@@_wrap_tl
       {
         \exp_args:No \__kernel_str_to_other_fast:n \l_@@_wrap_tl
         \c_@@_wrap_end_marker_tl
       }
-    \__kernel_tl_set:Ne \l_@@_wrap_tl
+    \__kernel_tl_set:Nx \l_@@_wrap_tl
       {
         \exp_after:wN \@@_wrap_fix_newline:w \l_@@_wrap_tl
           ^^J \q_@@_nil ^^J \s_@@_stop
@@ -2461,7 +2461,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_wrap_allow_break:n #1
   {
-    \__kernel_tl_set:Ne \l_@@_line_tl
+    \__kernel_tl_set:Nx \l_@@_line_tl
       { \l_@@_line_tl \@@_wrap_trim:N \l_@@_line_part_tl }
     \bool_set_false:N \l_@@_line_break_bool
     \tl_if_empty:NTF \l_@@_line_part_tl
@@ -2492,7 +2492,7 @@
     \tl_put_right:Ne \l_@@_line_tl { \l_@@_line_part_tl }
     \bool_set_false:N \l_@@_line_break_bool
     \int_sub:Nn \l_@@_indent_int { \l_@@_one_indent_int }
-    \__kernel_tl_set:Ne \l_@@_indent_tl
+    \__kernel_tl_set:Nx \l_@@_indent_tl
       { \exp_after:wN \@@_unindent:w \l_@@_indent_tl }
     \@@_wrap_chunk:nw {#1}
   }
@@ -2531,9 +2531,9 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_wrap_store_do:n #1
   {
-    \__kernel_tl_set:Ne \l_@@_line_tl
+    \__kernel_tl_set:Nx \l_@@_line_tl
       { \l_@@_line_tl \l_@@_line_part_tl }
-    \__kernel_tl_set:Ne \l_@@_wrap_tl
+    \__kernel_tl_set:Nx \l_@@_wrap_tl
       {
         \l_@@_wrap_tl
         \l_@@_newline_tl
@@ -3132,7 +3132,7 @@
 \cs_generate_variant:Nn \file_get_full_name:nN { V }
 \prg_new_protected_conditional:Npnn \file_get_full_name:nN #1#2 { T , F , TF }
   {
-    \__kernel_tl_set:Ne #2
+    \__kernel_tl_set:Nx #2
       { \file_full_name:n {#1} }
     \tl_if_empty:NTF #2
       { \prg_return_false: }
@@ -3312,7 +3312,7 @@
   { V } { T , F , TF }
 \cs_new_protected:Npn \@@_get_details:nnN #1#2#3
   {
-    \__kernel_tl_set:Ne #3
+    \__kernel_tl_set:Nx #3
       { \use:c { file_ #2 :n } {#1} }
     \tl_if_empty:NTF #3
       { \prg_return_false: }
@@ -3334,7 +3334,7 @@
 \prg_new_protected_conditional:Npnn \file_get_hex_dump:nnnN #1#2#3#4
   { T , F , TF }
   {
-    \__kernel_tl_set:Ne #4
+    \__kernel_tl_set:Nx #4
       { \file_hex_dump:nnn {#1} {#2} {#3} }
     \tl_if_empty:NTF #4
       { \prg_return_false: }
diff --git a/l3kernel/l3fp-assign.dtx b/l3kernel/l3fp-assign.dtx
index 578453788..4671bb40d 100644
--- a/l3kernel/l3fp-assign.dtx
+++ b/l3kernel/l3fp-assign.dtx
@@ -82,7 +82,7 @@
 %   assignments.
 %    \begin{macrocode}
 \cs_new_protected:Npn \fp_set:Nn   #1#2
-  { \__kernel_tl_set:Ne #1 { \exp_not:f { \@@_parse:n {#2} } } }
+  { \__kernel_tl_set:Nx #1 { \exp_not:f { \@@_parse:n {#2} } } }
 \cs_new_protected:Npn \fp_gset:Nn  #1#2
   { \__kernel_tl_gset:Ne #1 { \exp_not:f { \@@_parse:n {#2} } } }
 \cs_new_protected:Npn \fp_const:Nn #1#2
diff --git a/l3kernel/l3kernel-functions.dtx b/l3kernel/l3kernel-functions.dtx
index 509abeedd..80a3ac683 100644
--- a/l3kernel/l3kernel-functions.dtx
+++ b/l3kernel/l3kernel-functions.dtx
@@ -498,9 +498,9 @@
 %   only a single expansion.
 % \end{function}
 %
-% \begin{function}{\__kernel_tl_set:Ne, \__kernel_tl_gset:Ne}
+% \begin{function}{\__kernel_tl_set:Nx, \__kernel_tl_gset:Ne}
 %   \begin{syntax}
-%     \cs{__kernel_tl_set:Ne} \meta{tl~var} \Arg{tokens}
+%     \cs{__kernel_tl_set:Nx} \meta{tl~var} \Arg{tokens}
 %   \end{syntax}
 %   Fully expands \meta{tokens} and assigns the result to \meta{tl~var}.
 %   \meta{tokens} must be given in braces and there must be no token between
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 9919abfd8..c2fe5ae3f 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -2853,8 +2853,8 @@
   {
     \clist_clear:N \l_@@_unused_clist
     \@@_set_known:nnn {#2} {#3} {#4}
-    \__kernel_tl_set:Ne #5 { \exp_not:o \l_@@_unused_clist }
-    \__kernel_tl_set:Ne \l_@@_unused_clist { \exp_not:n {#1} }
+    \__kernel_tl_set:Nx #5 { \exp_not:o \l_@@_unused_clist }
+    \__kernel_tl_set:Nx \l_@@_unused_clist { \exp_not:n {#1} }
   }
 \cs_new_protected:Npn \keys_set_known:nn #1#2
   { \@@_set_known:nnn \q_@@_no_value {#1} {#2} }
@@ -2931,8 +2931,8 @@
   {
     \clist_clear:N \l_@@_unused_clist
     \@@_set_filter:nnnn {#2} {#3} {#4} {#5}
-    \__kernel_tl_set:Ne #6 { \exp_not:o \l_@@_unused_clist }
-    \__kernel_tl_set:Ne \l_@@_unused_clist { \exp_not:n {#1} }
+    \__kernel_tl_set:Nx #6 { \exp_not:o \l_@@_unused_clist }
+    \__kernel_tl_set:Nx \l_@@_unused_clist { \exp_not:n {#1} }
   }
 \cs_new_protected:Npn \keys_set_filter:nnn #1#2#3
   {\@@_set_filter:nnnn \q_@@_no_value {#1} {#2} {#3} }
@@ -3044,7 +3044,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_set_keyval:nnn #1#2#3
   {
-    \__kernel_tl_set:Ne \l_keys_path_str
+    \__kernel_tl_set:Nx \l_keys_path_str
       {
         \tl_if_blank:nF {#1}
           { #1 / }
@@ -3325,7 +3325,7 @@
   }
 \cs_new_protected:Npn \@@_store_unused_aux:
   {
-    \__kernel_tl_set:Ne \l_@@_relative_tl
+    \__kernel_tl_set:Nx \l_@@_relative_tl
       { \exp_args:No \@@_trim_spaces:n \l_@@_relative_tl }
     \use:e
       {
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index f8bb23e76..0a9077eeb 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -1266,7 +1266,7 @@
 %   updated entry is placed at the same spot as the original \meta{key}
 %   in the property list, preserving the order of entries.
 %    \begin{macrocode}
-\cs_new_protected:Npn \prop_put:Nnn  { \@@_put:NNnn \__kernel_tl_set:Ne }
+\cs_new_protected:Npn \prop_put:Nnn  { \@@_put:NNnn \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \prop_gput:Nnn { \@@_put:NNnn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_put:NNnn #1#2#3#4
   {
@@ -1329,7 +1329,7 @@
 %   convert the key to a string using \cs{tl_to_str:n}.
 %    \begin{macrocode}
 \cs_new_protected:Npn \prop_put_if_new:Nnn
-  { \@@_put_if_new:NNnn \__kernel_tl_set:Ne }
+  { \@@_put_if_new:NNnn \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \prop_gput_if_new:Nnn
   { \@@_put_if_new:NNnn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_put_if_new:NNnn #1#2#3#4
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 0f61a3fe0..6542fc114 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -1538,7 +1538,7 @@
   {
     \int_compare:nNnTF \l_@@_curr_catcode_int = 0
       {
-        \__kernel_tl_set:Ne \l_@@_internal_a_tl
+        \__kernel_tl_set:Nx \l_@@_internal_a_tl
           { \scan_stop: \@@_curr_cs_to_str: \scan_stop: }
         \tl_if_in:noTF { \scan_stop: #1 \scan_stop: }
           \l_@@_internal_a_tl
@@ -3130,12 +3130,12 @@
     \@@_two_if_eq:NNNNTF #5 #6 \@@_compile_special:N ^
       {
         \bool_set_false:N \l_@@_internal_bool
-        \__kernel_tl_set:Ne \l_@@_internal_a_tl { \if_false: } \fi:
+        \__kernel_tl_set:Nx \l_@@_internal_a_tl { \if_false: } \fi:
           \@@_compile_class_posix_loop:w
       }
       {
         \bool_set_true:N \l_@@_internal_bool
-        \__kernel_tl_set:Ne \l_@@_internal_a_tl { \if_false: } \fi:
+        \__kernel_tl_set:Nx \l_@@_internal_a_tl { \if_false: } \fi:
           \@@_compile_class_posix_loop:w #5 #6
       }
   }
@@ -3532,7 +3532,7 @@
   {
     \@@_compile_end:
     \flag_clear:n { @@_cs }
-    \__kernel_tl_set:Ne \l_@@_internal_a_tl
+    \__kernel_tl_set:Nx \l_@@_internal_a_tl
       {
         \exp_after:wN \@@_compile_cs_aux:Nn \l_@@_internal_regex
         \q_@@_nil \q_@@_nil \q_@@_recursion_stop
@@ -3621,7 +3621,7 @@
     \@@_two_if_eq:NNNNTF #2 #3 \@@_compile_special:N \c_left_brace_str
       {
         \tl_set:Nn \l_@@_internal_b_tl {#1}
-        \__kernel_tl_set:Ne \l_@@_internal_a_tl { \if_false: } \fi:
+        \__kernel_tl_set:Nx \l_@@_internal_a_tl { \if_false: } \fi:
         \@@_compile_u_loop:NN
       }
       {
@@ -7231,7 +7231,7 @@
             \@@_replacement_balance_one_match:n
               { \l_@@_zeroth_submatch_int }
           }
-        \__kernel_tl_set:Ne \l_@@_internal_a_tl
+        \__kernel_tl_set:Nx \l_@@_internal_a_tl
           {
             \@@_replacement_do_one_match:n
               { \l_@@_zeroth_submatch_int }
@@ -7280,7 +7280,7 @@
             { \l_@@_submatch_int - 1 }
             \@@_replacement_balance_one_match:n
         }
-      \__kernel_tl_set:Ne \l_@@_internal_a_tl
+      \__kernel_tl_set:Nx \l_@@_internal_a_tl
         {
           \int_step_function:nnnN
             { \l_@@_min_submatch_int }
diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index debdd8139..fb2e0044a 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -1238,12 +1238,12 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_set_from_clist:NN #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \s_@@ \clist_map_function:NN #2 \@@_wrap_item:n }
   }
 \cs_new_protected:Npn \seq_set_from_clist:Nn #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \s_@@ \clist_map_function:nN {#2} \@@_wrap_item:n }
   }
 \cs_new_protected:Npn \seq_gset_from_clist:NN #1#2
@@ -1322,11 +1322,11 @@
 %   braces which are outermost after space trimming.
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_set_split:Nnn
-  { \@@_set_split:NNNnn \__kernel_tl_set:Ne \tl_trim_spaces:n }
+  { \@@_set_split:NNNnn \__kernel_tl_set:Nx \tl_trim_spaces:n }
 \cs_new_protected:Npn \seq_gset_split:Nnn
   { \@@_set_split:NNNnn \__kernel_tl_gset:Ne \tl_trim_spaces:n }
 \cs_new_protected:Npn \seq_set_split_keep_spaces:Nnn
-  { \@@_set_split:NNNnn \__kernel_tl_set:Ne \exp_not:n }
+  { \@@_set_split:NNNnn \__kernel_tl_set:Nx \exp_not:n }
 \cs_new_protected:Npn \seq_gset_split_keep_spaces:Nnn
   { \@@_set_split:NNNnn \__kernel_tl_gset:Ne \exp_not:n }
 \cs_new_protected:Npn \@@_set_split:NNNnn #1#2#3#4#5
@@ -1348,7 +1348,7 @@
             \@@_set_split_end:
             \@@_set_split:Nw #2 \prg_do_nothing:
           }
-        \__kernel_tl_set:Ne \l_@@_internal_a_tl { \l_@@_internal_a_tl }
+        \__kernel_tl_set:Nx \l_@@_internal_a_tl { \l_@@_internal_a_tl }
       }
     #1 #3 { \s_@@ \l_@@_internal_a_tl }
   }
@@ -1422,7 +1422,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_put_left:Nn #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       {
         \exp_not:n { \s_@@ \@@_item:n {#2} }
         \exp_not:f { \exp_after:wN \@@_put_left_aux:w #1 }
@@ -1553,7 +1553,7 @@
 %   \texttt{e}-type expansion (|#1 #2 {#2}|) ensures that nothing is lost.
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_remove_all:Nn
-  { \@@_remove_all_aux:NNn \__kernel_tl_set:Ne }
+  { \@@_remove_all_aux:NNn \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \seq_gremove_all:Nn
   { \@@_remove_all_aux:NNn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_remove_all_aux:NNn #1#2#3
@@ -1599,13 +1599,13 @@
 %   last argument \cs{use_ii:nn} vs \cs{use_i:nn}.
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_set_item:Nnn #1#2#3
-  { \@@_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_set:Ne \use_i:nn }
+  { \@@_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_set:Nx \use_i:nn }
 \cs_new_protected:Npn \seq_gset_item:Nnn #1#2#3
   { \@@_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_gset:Ne \use_i:nn }
 \cs_generate_variant:Nn \seq_set_item:Nnn { c }
 \cs_generate_variant:Nn \seq_gset_item:Nnn { c }
 \prg_new_protected_conditional:Npnn \seq_set_item:Nnn #1#2#3 { TF , T , F }
-  { \@@_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_set:Ne \use_ii:nn }
+  { \@@_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_set:Nx \use_ii:nn }
 \prg_new_protected_conditional:Npnn \seq_gset_item:Nnn #1#2#3 { TF , T , F }
   { \@@_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_gset:Ne \use_ii:nn }
 \prg_generate_conditional_variant:Nnn \seq_set_item:Nnn { c } { TF , T , F }
@@ -1729,7 +1729,7 @@
 %   from the stack, and the memory consumption becomes linear.
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_reverse:N
-  { \@@_reverse:NN \__kernel_tl_set:Ne }
+  { \@@_reverse:NN \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \seq_greverse:N
   { \@@_reverse:NN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_reverse:NN #1 #2
@@ -1912,7 +1912,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_get_left:NN #1#2
   {
-    \__kernel_tl_set:Ne #2
+    \__kernel_tl_set:Nx #2
       {
         \exp_after:wN \@@_get_left:wnw
         #1 \@@_item:n { \q_no_value } \s_@@_stop
@@ -1964,7 +1964,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_get_right:NN #1#2
   {
-    \__kernel_tl_set:Ne #2
+    \__kernel_tl_set:Nx #2
       {
         \exp_after:wN \use_i_ii:nnn
         \exp_after:wN \@@_get_right_loop:nw
@@ -2005,7 +2005,7 @@
 %   finally stops the loop.
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_pop_right:NN
-  { \@@_pop:NNNN \@@_pop_right:NNN \__kernel_tl_set:Ne }
+  { \@@_pop:NNNN \@@_pop_right:NNN \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \seq_gpop_right:NN
   { \@@_pop:NNNN \@@_pop_right:NNN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_pop_right:NNN #1#2#3
@@ -2019,7 +2019,7 @@
         #2
         {
           \if_false: { \fi: }
-          \__kernel_tl_set:Ne #3
+          \__kernel_tl_set:Nx #3
         }
         { } \use_none:nn
     \cs_set_eq:NN \@@_item:n \@@_tmp:w
@@ -2067,7 +2067,7 @@
   { \@@_pop_TF:NNNN \@@_pop_left:NNN \tl_gset:Nn #1 #2 }
 \prg_new_protected_conditional:Npnn \seq_pop_right:NN #1#2
   { T , F , TF }
-  { \@@_pop_TF:NNNN \@@_pop_right:NNN \__kernel_tl_set:Ne #1 #2 }
+  { \@@_pop_TF:NNNN \@@_pop_right:NNN \__kernel_tl_set:Nx #1 #2 }
 \prg_new_protected_conditional:Npnn \seq_gpop_right:NN #1#2
   { T , F , TF }
   { \@@_pop_TF:NNNN \@@_pop_right:NNN \__kernel_tl_gset:Ne #1 #2 }
@@ -2396,7 +2396,7 @@
 %   semantics.
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_set_map_e:NNn
-  { \@@_set_map_e:NNNn \__kernel_tl_set:Ne }
+  { \@@_set_map_e:NNNn \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \seq_gset_map_e:NNn
   { \@@_set_map_e:NNNn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_set_map_e:NNNn #1#2#3#4
@@ -2415,7 +2415,7 @@
 %   <inline function>.
 %    \begin{macrocode}
 \cs_new_protected:Npn \seq_set_map:NNn
-  { \@@_set_map:NNNn \__kernel_tl_set:Ne }
+  { \@@_set_map:NNNn \__kernel_tl_set:Nx }
 \cs_new_protected:Npn \seq_gset_map:NNn
   { \@@_set_map:NNNn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \@@_set_map:NNNn #1#2#3#4
diff --git a/l3kernel/l3str-convert.dtx b/l3kernel/l3str-convert.dtx
index 90eb26afb..4565ec9be 100644
--- a/l3kernel/l3str-convert.dtx
+++ b/l3kernel/l3str-convert.dtx
@@ -468,7 +468,7 @@
 %   an empty result for the input $-1$.
 %    \begin{macrocode}
 \group_begin:
-  \__kernel_tl_set:Ne \l_@@_internal_tl { \tl_to_str:n { 0123456789ABCDEF } }
+  \__kernel_tl_set:Nx \l_@@_internal_tl { \tl_to_str:n { 0123456789ABCDEF } }
   \tl_map_inline:Nn \l_@@_internal_tl
     {
       \tl_map_inline:Nn \l_@@_internal_tl
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index dbb218051..cd5de316e 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -999,7 +999,7 @@
 %   to prevent further expansion.
 %    \begin{macrocode}
 \cs_new_protected:Npn \str_set:Nn #1#2
-  { \__kernel_tl_set:Ne #1 { \__kernel_tl_to_str:w {#2} } }
+  { \__kernel_tl_set:Nx #1 { \__kernel_tl_to_str:w {#2} } }
 \cs_gset_protected:Npn \str_gset:Nn #1#2
   { \__kernel_tl_gset:Ne #1 { \__kernel_tl_to_str:w {#2} } }
 \cs_new_protected:Npn \str_const:Nn #1#2
@@ -1009,7 +1009,7 @@
   }
 \cs_new_protected:Npn \str_put_left:Nn #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \__kernel_tl_to_str:w {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
   }
 \cs_new_protected:Npn \str_gput_left:Nn #1#2
@@ -1019,7 +1019,7 @@
   }
 \cs_new_protected:Npn \str_put_right:Nn #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \__kernel_exp_not:w \exp_after:wN {#1} \__kernel_tl_to_str:w {#2} }
   }
 \cs_new_protected:Npn \str_gput_right:Nn #1#2
@@ -1061,11 +1061,11 @@
 %   hide in braces.
 %    \begin{macrocode}
 \cs_new_protected:Npn \str_replace_once:Nnn
-  { \@@_replace:NNNnn \prg_do_nothing: \__kernel_tl_set:Ne  }
+  { \@@_replace:NNNnn \prg_do_nothing: \__kernel_tl_set:Nx  }
 \cs_new_protected:Npn \str_greplace_once:Nnn
   { \@@_replace:NNNnn \prg_do_nothing: \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \str_replace_all:Nnn
-  { \@@_replace:NNNnn \@@_replace_next:w \__kernel_tl_set:Ne  }
+  { \@@_replace:NNNnn \@@_replace_next:w \__kernel_tl_set:Nx  }
 \cs_new_protected:Npn \str_greplace_all:Nnn
   { \@@_replace:NNNnn \@@_replace_next:w \__kernel_tl_gset:Ne }
 \cs_generate_variant:Nn \str_replace_once:Nnn  { c }
diff --git a/l3kernel/l3tl-build.dtx b/l3kernel/l3tl-build.dtx
index 8cc6ef202..7aad99e4f 100644
--- a/l3kernel/l3tl-build.dtx
+++ b/l3kernel/l3tl-build.dtx
@@ -293,7 +293,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_build_end:N #1
   {
-    \@@_build_get:NNN \__kernel_tl_set:Ne #1 #1
+    \@@_build_get:NNN \__kernel_tl_set:Nx #1 #1
     \exp_args:Nc \@@_build_end_loop:NN { \cs_to_str:N #1 ' } \tl_clear:N
   }
 \cs_new_protected:Npn \tl_build_gend:N #1
@@ -316,7 +316,7 @@
 % \begin{macro}{\tl_build_get_intermediate:NN}
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_build_get_intermediate:NN
-  { \@@_build_get:NNN \__kernel_tl_set:Ne }
+  { \@@_build_get:NNN \__kernel_tl_set:Nx }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 0249c36ae..291293739 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -1346,11 +1346,11 @@
 %
 % \subsection{Functions}
 %
-% \begin{macro}{\__kernel_tl_set:Ne,\__kernel_tl_gset:Ne}
+% \begin{macro}{\__kernel_tl_set:Nx,\__kernel_tl_gset:Ne}
 %   These two are supplied to get better performance for macros which would
 %   otherwise use \cs{tl_set:Ne} or \cs{tl_gset:Ne} internally.
 %    \begin{macrocode}
-\cs_new_eq:NN \__kernel_tl_set:Ne  \cs_set_nopar:Npe
+\cs_new_eq:NN \__kernel_tl_set:Nx  \cs_set_nopar:Npe
 \cs_new_eq:NN \__kernel_tl_gset:Ne \cs_gset_nopar:Npe
 %    \end{macrocode}
 % \end{macro}
@@ -1444,7 +1444,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_concat:NNN #1#2#3
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       {
         \__kernel_exp_not:w \exp_after:wN {#2}
         \__kernel_exp_not:w \exp_after:wN {#3}
@@ -1519,9 +1519,9 @@
 %   by hand as it is used quite a lot.
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_set:Nn #1#2
-  { \__kernel_tl_set:Ne #1 { \__kernel_exp_not:w {#2} } }
+  { \__kernel_tl_set:Nx #1 { \__kernel_exp_not:w {#2} } }
 \cs_new_protected:Npn \tl_set:No #1#2
-  { \__kernel_tl_set:Ne #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
+  { \__kernel_tl_set:Nx #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
 \cs_new_protected:Npn \tl_gset:Nn #1#2
   { \__kernel_tl_gset:Ne #1 { \__kernel_exp_not:w {#2} } }
 \cs_new_protected:Npn \tl_gset:No #1#2
@@ -1556,22 +1556,22 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_put_left:Nn #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \__kernel_exp_not:w {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
   }
 \cs_new_protected:Npn \tl_put_left:NV #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \exp_not:V #2 \__kernel_exp_not:w \exp_after:wN {#1} }
   }
 \cs_new_protected:Npn \tl_put_left:Nv #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \exp_not:v {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
   }
 \cs_new_protected:Npn \tl_put_left:Ne #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       {
         \__kernel_exp_not:w \tex_expanded:D { {#2} }
         \__kernel_exp_not:w \exp_after:wN {#1}
@@ -1579,7 +1579,7 @@
   }
 \cs_new_protected:Npn \tl_put_left:No #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       {
         \__kernel_exp_not:w \exp_after:wN {#2}
         \__kernel_exp_not:w \exp_after:wN {#1}
@@ -1649,20 +1649,20 @@
 % The same on the right.
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_put_right:Nn #1#2
-  { \__kernel_tl_set:Ne #1 { \__kernel_exp_not:w \exp_after:wN { #1 #2 } } }
+  { \__kernel_tl_set:Nx #1 { \__kernel_exp_not:w \exp_after:wN { #1 #2 } } }
 \cs_new_protected:Npn \tl_put_right:NV #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \__kernel_exp_not:w \exp_after:wN {#1} \exp_not:V #2 }
   }
 \cs_new_protected:Npn \tl_put_right:Nv #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       { \__kernel_exp_not:w \exp_after:wN {#1} \exp_not:v {#2} }
   }
 \cs_new_protected:Npn \tl_put_right:Ne #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       {
         \__kernel_exp_not:w \exp_after:wN {#1}
         \__kernel_exp_not:w \tex_expanded:D { {#2} }
@@ -1670,7 +1670,7 @@
   }
 \cs_new_protected:Npn \tl_put_right:No #1#2
   {
-    \__kernel_tl_set:Ne #1
+    \__kernel_tl_set:Nx #1
       {
         \__kernel_exp_not:w \exp_after:wN {#1}
         \__kernel_exp_not:w \exp_after:wN {#2}
@@ -2041,11 +2041,11 @@
 %   the \meta{tl~var} by \meta{token list}.
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_replace_once:Nnn
-  { \@@_replace:NnNNNnn \q_@@_mark ? \@@_replace_wrap:w \__kernel_tl_set:Ne  }
+  { \@@_replace:NnNNNnn \q_@@_mark ? \@@_replace_wrap:w \__kernel_tl_set:Nx  }
 \cs_new_protected:Npn \tl_greplace_once:Nnn
   { \@@_replace:NnNNNnn \q_@@_mark ? \@@_replace_wrap:w \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \tl_replace_all:Nnn
-  { \@@_replace:NnNNNnn \q_@@_mark ? \@@_replace_next:w \__kernel_tl_set:Ne  }
+  { \@@_replace:NnNNNnn \q_@@_mark ? \@@_replace_next:w \__kernel_tl_set:Nx  }
 \cs_new_protected:Npn \tl_greplace_all:Nnn
   { \@@_replace:NnNNNnn \q_@@_mark ? \@@_replace_next:w \__kernel_tl_gset:Ne }
 \cs_generate_variant:Nn \tl_replace_once:Nnn
@@ -2904,7 +2904,7 @@
   { \@@_trim_spaces:nn { \@@_trim_mark: #1 } { \exp_args:No #2 } }
 \cs_generate_variant:Nn \tl_trim_spaces_apply:nN { o }
 \cs_new_protected:Npn \tl_trim_spaces:N #1
-  { \__kernel_tl_set:Ne #1 { \exp_args:No \tl_trim_spaces:n {#1} } }
+  { \__kernel_tl_set:Nx #1 { \exp_args:No \tl_trim_spaces:n {#1} } }
 \cs_new_protected:Npn \tl_gtrim_spaces:N #1
   { \__kernel_tl_gset:Ne #1 { \exp_args:No \tl_trim_spaces:n {#1} } }
 \cs_generate_variant:Nn \tl_trim_spaces:N  { c }
@@ -3481,7 +3481,7 @@
 %   which stops the \texttt{f}-expansion.
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_reverse:N #1
-  { \__kernel_tl_set:Ne #1 { \exp_args:No \tl_reverse:n { #1 } } }
+  { \__kernel_tl_set:Nx #1 { \exp_args:No \tl_reverse:n { #1 } } }
 \cs_new_protected:Npn \tl_greverse:N #1
   { \__kernel_tl_gset:Ne #1 { \exp_args:No \tl_reverse:n { #1 } } }
 \cs_generate_variant:Nn \tl_reverse:N  { c }





More information about the latex3-commits mailing list.