[latex3-commits] [latex3/latex3] main: Extend pre-defined variants (e34ece41d)

github at latex-project.org github at latex-project.org
Wed May 24 19:25:47 CEST 2023


Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/e34ece41def79fe7885f7bd53086139ca677c3d3

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

commit e34ece41def79fe7885f7bd53086139ca677c3d3
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed May 24 18:25:11 2023 +0100

    Extend pre-defined variants
    
    This covers all of those currently in latex3/latex2e.
    
    I have 'rounded out' so full sets are added
    as appropriate.


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

e34ece41def79fe7885f7bd53086139ca677c3d3
 l3kernel/l3basics.dtx |  3 +-
 l3kernel/l3clist.dtx  | 32 +++++++++++++++------
 l3kernel/l3expan.dtx  | 15 ++++++++++
 l3kernel/l3keys.dtx   |  6 ++--
 l3kernel/l3prop.dtx   | 24 ++++++++--------
 l3kernel/l3tl.dtx     | 79 +++++++++++++++++++++++++++++----------------------
 6 files changed, 101 insertions(+), 58 deletions(-)

diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 43c198701..124a9df06 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -601,6 +601,7 @@
 % \begin{function}[updated = 2012-01-14]
 %   {
 %     \cs_generate_from_arg_count:NNnn,
+%     \cs_generate_from_arg_count:NNVo,
 %     \cs_generate_from_arg_count:cNnn,
 %     \cs_generate_from_arg_count:Ncnn
 %   }
@@ -870,7 +871,7 @@
 %   \end{texnote}
 % \end{function}
 %
-% \begin{function}[EXP, added = 2019-02-27]{\cs_replacement_spec:N}
+% \begin{function}[EXP, added = 2019-02-27]{\cs_replacement_spec:N, \cs_replacement_spec:c}
 %   \begin{syntax}
 %     \cs{cs_replacement_spec:N} \meta{token}
 %   \end{syntax}
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index f25ff9791..0200adc4b 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -241,12 +241,16 @@
 % \begin{function}[updated = 2011-09-05]
 %   {
 %     \clist_put_left:Nn,  \clist_put_left:NV,
+%     \clist_put_left:Nv,
 %     \clist_put_left:No,  \clist_put_left:Nx,
 %     \clist_put_left:cn,  \clist_put_left:cV,
+%     \clist_put_left:cv,
 %     \clist_put_left:co,  \clist_put_left:cx,
 %     \clist_gput_left:Nn, \clist_gput_left:NV,
+%     \clist_gput_left:Nv,
 %     \clist_gput_left:No, \clist_gput_left:Nx,
 %     \clist_gput_left:cn, \clist_gput_left:cV,
+%     \clist_gput_left:cv,
 %     \clist_gput_left:co, \clist_gput_left:cx
 %   }
 %   \begin{syntax}
@@ -264,12 +268,16 @@
 % \begin{function}[updated = 2011-09-05]
 %   {
 %     \clist_put_right:Nn,  \clist_put_right:NV,
+%     \clist_put_right:Nv,
 %     \clist_put_right:No,  \clist_put_right:Nx,
 %     \clist_put_right:cn,  \clist_put_right:cV,
+%     \clist_put_right:cv,
 %     \clist_put_right:co,  \clist_put_right:cx,
 %     \clist_gput_right:Nn, \clist_gput_right:NV,
+%     \clist_gput_right:cv,
 %     \clist_gput_right:No, \clist_gput_right:Nx,
 %     \clist_gput_right:cn, \clist_gput_right:cV,
+%     \clist_gput_right:cv,
 %     \clist_gput_right:co, \clist_gput_right:cx
 %   }
 %   \begin{syntax}
@@ -1158,16 +1166,20 @@
 % \begin{macro}
 %   {
 %     \clist_put_left:Nn, \clist_put_left:NV,
+%     \clist_put_left:Nv,
 %     \clist_put_left:No, \clist_put_left:Nx,
 %     \clist_put_left:cn, \clist_put_left:cV,
+%     \clist_put_left:cv,
 %     \clist_put_left:co, \clist_put_left:cx
 %   }
 % \UnitTested
 % \begin{macro}
 %   {
 %     \clist_gput_left:Nn, \clist_gput_left:NV,
+%     \clist_gput_left:Nv
 %     \clist_gput_left:No, \clist_gput_left:Nx,
 %     \clist_gput_left:cn, \clist_gput_left:cV,
+%     \clist_gput_left:cv,
 %     \clist_gput_left:co, \clist_gput_left:cx
 %   }
 % \UnitTested
@@ -1185,10 +1197,10 @@
     #2 \l_@@_internal_clist {#4}
     #1 #3 \l_@@_internal_clist #3
   }
-\cs_generate_variant:Nn \clist_put_left:Nn  {     NV , No , Nx }
-\cs_generate_variant:Nn \clist_put_left:Nn  { c , cV , co , cx }
-\cs_generate_variant:Nn \clist_gput_left:Nn {     NV , No , Nx }
-\cs_generate_variant:Nn \clist_gput_left:Nn { c , cV , co , cx }
+\cs_generate_variant:Nn \clist_put_left:Nn  {     NV , Nv , No , Nx }
+\cs_generate_variant:Nn \clist_put_left:Nn  { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \clist_gput_left:Nn {     NV , Nv , No , Nx }
+\cs_generate_variant:Nn \clist_gput_left:Nn { c , cV , cv , co , cx }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1197,16 +1209,20 @@
 % \begin{macro}
 %   {
 %     \clist_put_right:Nn, \clist_put_right:NV,
+%     \clist_put_right:Nv
 %     \clist_put_right:No, \clist_put_right:Nx,
 %     \clist_put_right:cn, \clist_put_right:cV,
+%     \clist_put_right:cv
 %     \clist_put_right:co, \clist_put_right:cx
 %   }
 % \UnitTested
 % \begin{macro}
 %   {
 %     \clist_gput_right:Nn, \clist_gput_right:NV,
+%     \clist_gput_right:Nv,
 %     \clist_gput_right:No, \clist_gput_right:Nx,
 %     \clist_gput_right:cn, \clist_gput_right:cV,
+%     \clist_gput_right:cv,
 %     \clist_gput_right:co, \clist_gput_right:cx
 %   }
 % \UnitTested
@@ -1221,10 +1237,10 @@
     #2 \l_@@_internal_clist {#4}
     #1 #3 #3 \l_@@_internal_clist
   }
-\cs_generate_variant:Nn \clist_put_right:Nn  {     NV , No , Nx }
-\cs_generate_variant:Nn \clist_put_right:Nn  { c , cV , co , cx }
-\cs_generate_variant:Nn \clist_gput_right:Nn {     NV , No , Nx }
-\cs_generate_variant:Nn \clist_gput_right:Nn { c , cV , co , cx }
+\cs_generate_variant:Nn \clist_put_right:Nn  {     NV , Nv , No , Nx }
+\cs_generate_variant:Nn \clist_put_right:Nn  { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \clist_gput_right:Nn {     NV , Nv , No , Nx }
+\cs_generate_variant:Nn \clist_gput_right:Nn { c , cV , cv , co , cx }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/l3kernel/l3expan.dtx b/l3kernel/l3expan.dtx
index 9288a5271..5dee1770a 100644
--- a/l3kernel/l3expan.dtx
+++ b/l3kernel/l3expan.dtx
@@ -2387,6 +2387,21 @@
 % \end{macro}
 % \end{macro}
 %
+% \subsection{Held-over variant generation}
+%
+% \begin{macro}{\tl_to_str:o}
+% \begin{macro}{\cs_generate_from_arg_count:NNnn}
+% \begin{macro}{\cs_replacement_spec:c}
+%   A couple of variants that are from early functions.
+%    \begin{macrocode}
+\cs_generate_variant:Nn \tl_to_str:n { o }
+\cs_generate_variant:Nn \cs_generate_from_arg_count:NNnn { NNVo }
+\cs_generate_variant:Nn \cs_replacement_spec:N { c }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 %    \begin{macrocode}
 %</package>
 %    \end{macrocode}
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index af3a8353b..ec0d91f0f 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -723,7 +723,7 @@
 % \section{Setting keys}
 %
 % \begin{function}[updated = 2017-11-14]
-%   {\keys_set:nn, \keys_set:nV, \keys_set:nv, \keys_set:no}
+%   {\keys_set:nn, \keys_set:nV, \keys_set:nv, \keys_set:no, \keys_set:nx}
 %   \begin{syntax}
 %     \cs{keys_set:nn} \Arg{module} \Arg{keyval list}
 %   \end{syntax}
@@ -2723,7 +2723,7 @@
 %
 % \begin{macro}
 %   {
-%     \keys_set:nn, \keys_set:nV, \keys_set:nv, \keys_set:no,
+%     \keys_set:nn, \keys_set:nV, \keys_set:nv, \keys_set:no, \keys_set:nx,
 %     \@@_set:nn
 %   }
 % \begin{macro}{\@@_set:nnn}
@@ -2749,7 +2749,7 @@
           { \exp_not:o \l_@@_relative_tl }
       }
   }
-\cs_generate_variant:Nn \keys_set:nn { nV , nv , no }
+\cs_generate_variant:Nn \keys_set:nn { nV , nv , no , nx }
 \cs_new_protected:Npn \@@_set:nn #1#2
   { \exp_args:No \@@_set:nnn \l_@@_module_str {#1} {#2} }
 \cs_new_protected:Npn \@@_set:nnn #1#2#3
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 259009a18..2e6d191ef 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -165,16 +165,16 @@
 %
 % \begin{function}[updated = 2012-07-09]
 %   {
-%     \prop_put:Nnn,  \prop_put:NnV,  \prop_put:Nno,  \prop_put:Nnx,
+%     \prop_put:Nnn,  \prop_put:NnV,  \prop_put:Nno,  \prop_put:Nne, \prop_put:Nnx,
 %     \prop_put:NVn,  \prop_put:NVV,  \prop_put:NVx,  \prop_put:Nvx,
 %     \prop_put:Non,  \prop_put:Noo,  \prop_put:Nxx,
-%     \prop_put:cnn,  \prop_put:cnV,  \prop_put:cno,  \prop_put:cnx,
+%     \prop_put:cnn,  \prop_put:cnV,  \prop_put:cno,  \prop_put:cne, \prop_put:cnx,
 %     \prop_put:cVn,  \prop_put:cVV,  \prop_put:cVx,  \prop_put:cvx,
 %     \prop_put:con,  \prop_put:coo,  \prop_put:cxx,
-%     \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nnx,
+%     \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nne, \prop_gput:Nnx,
 %     \prop_gput:NVn, \prop_gput:NVV, \prop_gput:NVx, \prop_gput:Nvx,
 %     \prop_gput:Non, \prop_gput:Noo, \prop_gput:Nxx,
-%     \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cnx,
+%     \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cne, \prop_gput:cnx,
 %     \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVx, \prop_gput:cvx,
 %     \prop_gput:con, \prop_gput:coo, \prop_gput:cxx
 %   }
@@ -1152,19 +1152,19 @@
 %
 % \begin{macro}[tested = m3prop002]
 %   {
-%     \prop_put:Nnn, \prop_put:NnV, \prop_put:Nno, \prop_put:Nnx,
+%     \prop_put:Nnn, \prop_put:NnV, \prop_put:Nno, \prop_put:Nne, \prop_put:Nnx,
 %     \prop_put:NVn, \prop_put:NVV, \prop_put:NVx, \prop_put:Nvx,
 %     \prop_put:Non, \prop_put:Noo, \prop_put:Nxx,
-%     \prop_put:cnn, \prop_put:cnV, \prop_put:cno, \prop_put:cnx,
+%     \prop_put:cnn, \prop_put:cnV, \prop_put:cno, \prop_put:cne, \prop_put:cnx,
 %     \prop_put:cVn, \prop_put:cVV, \prop_put:cVx, \prop_put:cvx,
 %     \prop_put:con, \prop_put:coo, \prop_put:cxx
 %   }
 % \begin{macro}[tested = m3prop002]
 %   {
-%     \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nnx,
+%     \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nne, \prop_gput:Nnx,
 %     \prop_gput:NVn, \prop_gput:NVV, \prop_hput:NVx, \prop_hput:Nvx,
 %     \prop_gput:Non, \prop_gput:Noo, \prop_gput:Nxx,
-%     \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cnx,
+%     \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cne, \prop_gput:cnx,
 %     \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVx, \prop_gput:cvx,
 %     \prop_gput:con, \prop_gput:coo, \prop_gput:cxx
 %   }
@@ -1196,13 +1196,13 @@
       { #1 #2 { \exp_not:o {#2} \l_@@_internal_tl } }
   }
 \cs_generate_variant:Nn \prop_put:Nnn
-  {     NnV , Nno , Nnx , NV , NVV , NVx , Nvx , No , Noo , Nxx }
+  {     NnV , Nno , Nne , Nnx , NV , NVV , NVx , Nvx , No , Noo , Nxx }
 \cs_generate_variant:Nn \prop_put:Nnn
-  { c , cnV , cno , cnx , cV , cVV , cVx , cvx , co , coo , cxx }
+  { c , cnV , cno , cne , cnx , cV , cVV , cVx , cvx , co , coo , cxx }
 \cs_generate_variant:Nn \prop_gput:Nnn
-  {     NnV , Nno , Nnx , NV , NVV , NVx , Nvx , No , Noo , Nxx }
+  {     NnV , Nno , Nne , Nnx , NV , NVV , NVx , Nvx , No , Noo , Nxx }
 \cs_generate_variant:Nn \prop_gput:Nnn
-  { c , cnV , cno , cnx , cV , cVV , cVx , cvx , co , coo , cxx }
+  { c , cnV , cno , cne , cnx , cV , cVV , cVx , cvx , co , coo , cxx }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 0794a8cce..a7bd19244 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -161,12 +161,12 @@
 %
 % \begin{function}
 %   {
-%     \tl_set:Nn, \tl_set:NV, \tl_set:Nv, \tl_set:No, \tl_set:Nf, \tl_set:Nx,
-%     \tl_set:cn, \tl_set:cV, \tl_set:cv, \tl_set:co, \tl_set:cf, \tl_set:cx,
+%     \tl_set:Nn, \tl_set:NV, \tl_set:Nv, \tl_set:No, \tl_set:Ne, \tl_set:Nf, \tl_set:Nx,
+%     \tl_set:cn, \tl_set:cV, \tl_set:cv, \tl_set:co, \tl_set:ce, \tl_set:cf, \tl_set:cx,
 %     \tl_gset:Nn, \tl_gset:NV, \tl_gset:Nv,
-%     \tl_gset:No, \tl_gset:Nf, \tl_gset:Nx,
+%     \tl_gset:No, \tl_gset:ce, \tl_gset:Nf, \tl_gset:Nx,
 %     \tl_gset:cn, \tl_gset:cV, \tl_gset:cv,
-%     \tl_gset:co, \tl_gset:cf, \tl_gset:cx
+%     \tl_gset:co, \tl_gset:ce, \tl_gset:cf, \tl_gset:cx
 %   }
 %   \begin{syntax}
 %     \cs{tl_set:Nn} \meta{tl~var} \Arg{tokens}
@@ -646,7 +646,7 @@
 %   \end{texnote}
 % \end{function}
 %
-% \begin{function}[updated = 2015-08-07]{\tl_show:n}
+% \begin{function}[updated = 2015-08-07]{\tl_show:n, \tl_show:x}
 %   \begin{syntax}
 %     \cs{tl_show:n} \Arg{token list}
 %   \end{syntax}
@@ -665,7 +665,7 @@
 %   \cs{tl_show:N} which displays the result in the terminal.
 % \end{function}
 %
-% \begin{function}[added = 2014-08-22, updated = 2015-08-07]{\tl_log:n}
+% \begin{function}[added = 2014-08-22, updated = 2015-08-07]{\tl_log:n, \tl_log:x}
 %   \begin{syntax}
 %     \cs{tl_log:n} \Arg{token list}
 %   \end{syntax}
@@ -1073,8 +1073,10 @@
 %
 % \begin{function}[updated = 2011-08-11]
 %   {
-%     \tl_replace_once:Nnn,  \tl_replace_once:cnn,
-%     \tl_greplace_once:Nnn, \tl_greplace_once:cnn
+%     \tl_replace_once:Nnn,  \tl_replace_once:Nxx,
+%     \tl_replace_once:Nnn,  \tl_replace_once:cxx,
+%     \tl_greplace_once:Nnn, \tl_greplace_once:Nxx
+%     \tl_greplace_once:cnn, \tl_greplace_once:cxx
 %   }
 %   \begin{syntax}
 %     \cs{tl_replace_once:Nnn} \meta{tl~var} \Arg{old tokens} \Arg{new tokens}
@@ -1088,8 +1090,10 @@
 %
 % \begin{function}[updated = 2011-08-11]
 %   {
-%     \tl_replace_all:Nnn, \tl_replace_all:cnn,
-%     \tl_greplace_all:Nnn, \tl_greplace_all:cnn
+%     \tl_replace_all:Nnn, \tl_replace_all:Nxx,
+%     \tl_replace_all:cnn, \tl_replace_all:cxx
+%     \tl_greplace_all:Nnn, \tl_greplace_all:Nxx,
+%     \tl_greplace_all:cnn, \tl_greplace_all:cxx
 %   }
 %   \begin{syntax}
 %     \cs{tl_replace_all:Nnn} \meta{tl~var} \Arg{old tokens} \Arg{new tokens}
@@ -1107,8 +1111,10 @@
 %
 % \begin{function}[updated = 2011-08-11]
 %   {
-%     \tl_remove_once:Nn,  \tl_remove_once:cn,
-%     \tl_gremove_once:Nn, \tl_gremove_once:cn
+%     \tl_remove_once:Nn,  \tl_remove_once:Nx,
+%     \tl_remove_once:cn,  \tl_remove_once:cx,
+%     \tl_gremove_once:Nn, \tl_gremove_once:Nx
+%     \tl_gremove_once:cn, \tl_gremove_once:cx
 %   }
 %   \begin{syntax}
 %     \cs{tl_remove_once:Nn} \meta{tl~var} \Arg{tokens}
@@ -1121,8 +1127,10 @@
 %
 % \begin{function}[updated = 2011-08-11]
 %   {
-%     \tl_remove_all:Nn,  \tl_remove_all:cn,
-%     \tl_gremove_all:Nn, \tl_gremove_all:cn
+%     \tl_remove_all:Nn,  \tl_remove_all:Nx,
+%     \tl_remove_all:cn,  \tl_remove_all:cx,
+%     \tl_gremove_all:Nn, \tl_gremove_all:Nx
+%     \tl_gremove_all:cn, \tl_gremove_all:cx
 %   }
 %   \begin{syntax}
 %     \cs{tl_remove_all:Nn} \meta{tl~var} \Arg{tokens}
@@ -1187,7 +1195,7 @@
 %   \end{texnote}
 % \end{function}
 %
-% \begin{function}[updated = 2015-08-11]{\tl_rescan:nn}
+% \begin{function}[updated = 2015-08-11]{\tl_rescan:nn, \tl_rescan:nV}
 %   \begin{syntax}
 %     \cs{tl_rescan:nn} \Arg{setup} \Arg{tokens}
 %   \end{syntax}
@@ -1439,15 +1447,15 @@
 %
 % \begin{macro}
 %   {
-%     \tl_set:Nn, \tl_set:NV, \tl_set:Nv, \tl_set:No, \tl_set:Nf, \tl_set:Nx,
-%     \tl_set:cn, \tl_set:cV, \tl_set:cv, \tl_set:co, \tl_set:cf, \tl_set:cx
+%     \tl_set:Nn, \tl_set:NV, \tl_set:Nv, \tl_set:No, \tl_set:Ne, \tl_set:Nf, \tl_set:Nx,
+%     \tl_set:cn, \tl_set:cV, \tl_set:cv, \tl_set:co, \tl_set:ce, \tl_set:cf, \tl_set:cx
 %   }
 % \begin{macro}
 %   {
 %     \tl_gset:Nn, \tl_gset:NV, \tl_gset:Nv,
-%     \tl_gset:No, \tl_gset:Nf, \tl_gset:Nx,
+%     \tl_gset:No, \tl_gset:Ne, \tl_gset:Nf, \tl_gset:Nx,
 %     \tl_gset:cn, \tl_gset:cV, \tl_gset:cv,
-%     \tl_gset:co, \tl_gset:cf, \tl_gset:cx
+%     \tl_gset:co, \tl_gset:ce, \tl_gset:cf, \tl_gset:cx
 %   }
 %   By using \cs{exp_not:n} token list variables can contain |#| tokens,
 %   which makes the token list registers provided by \TeX{}
@@ -1466,12 +1474,12 @@
   { \__kernel_tl_gset:Nx #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
 \cs_new_protected:Npn \tl_gset:Nx #1#2
   { \__kernel_tl_gset:Nx #1 {#2} }
-\cs_generate_variant:Nn \tl_set:Nn  {    NV , Nv , Nf }
-\cs_generate_variant:Nn \tl_set:Nn  { c, cV , cv , cf }
+\cs_generate_variant:Nn \tl_set:Nn  {    NV , Nv , Ne , Nf }
+\cs_generate_variant:Nn \tl_set:Nn  { c, cV , cv , ce , cf }
 \cs_generate_variant:Nn \tl_set:Nx  { c }
 \cs_generate_variant:Nn \tl_set:No  { c }
-\cs_generate_variant:Nn \tl_gset:Nn {    NV , Nv , Nf }
-\cs_generate_variant:Nn \tl_gset:Nn { c, cV , cv , cf }
+\cs_generate_variant:Nn \tl_gset:Nn {    NV , Nv , Ne , Nf }
+\cs_generate_variant:Nn \tl_gset:Nn { c, cV , cv , ce , cf }
 \cs_generate_variant:Nn \tl_gset:Nx { c }
 \cs_generate_variant:Nn \tl_gset:No { c }
 %    \end{macrocode}
@@ -1653,7 +1661,7 @@
 %     \tl_gset_rescan:Nnn, \tl_gset_rescan:Nno, \tl_gset_rescan:Nnx,
 %     \tl_gset_rescan:cnn, \tl_gset_rescan:cno, \tl_gset_rescan:cnx
 %   }
-% \begin{macro}{\tl_rescan:nn}
+% \begin{macro}{\tl_rescan:nn, \tl_rescan:nV}
 % \begin{macro}{\@@_rescan_aux:}
 % \begin{macro}{\@@_set_rescan:NNnn, \@@_set_rescan_multi:nNN}
 % \begin{macro}[EXP]{\@@_rescan:NNw}
@@ -1716,6 +1724,7 @@
     \exp_after:wN \@@_rescan_aux:
     \l_@@_internal_a_tl
   }
+\cs_generate_variant:Nn \tl_rescan:nn { nV }
 \exp_args:NNo \cs_new_protected:Npn \@@_rescan_aux:
   { \tl_clear:N \l_@@_internal_a_tl }
 \cs_new_protected:Npn \tl_set_rescan:Nnn
@@ -1893,10 +1902,10 @@
   { \@@_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:Nx }
-\cs_generate_variant:Nn \tl_replace_once:Nnn  { c }
-\cs_generate_variant:Nn \tl_greplace_once:Nnn { c }
-\cs_generate_variant:Nn \tl_replace_all:Nnn   { c }
-\cs_generate_variant:Nn \tl_greplace_all:Nnn  { c }
+\cs_generate_variant:Nn \tl_replace_once:Nnn  { Nxx , c , cxx }
+\cs_generate_variant:Nn \tl_greplace_once:Nnn { Nxx , c , cxx }
+\cs_generate_variant:Nn \tl_replace_all:Nnn   { Nxx , c , cxx }
+\cs_generate_variant:Nn \tl_greplace_all:Nnn  { Nxx , c , cxx }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -2089,8 +2098,8 @@
   { \tl_replace_once:Nnn #1 {#2} { } }
 \cs_new_protected:Npn \tl_gremove_once:Nn #1#2
   { \tl_greplace_once:Nnn #1 {#2} { } }
-\cs_generate_variant:Nn \tl_remove_once:Nn  { c }
-\cs_generate_variant:Nn \tl_gremove_once:Nn { c }
+\cs_generate_variant:Nn \tl_remove_once:Nn  { Nx , c , cx }
+\cs_generate_variant:Nn \tl_gremove_once:Nn { Nx , c , cx }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -2103,8 +2112,8 @@
   { \tl_replace_all:Nnn #1 {#2} { } }
 \cs_new_protected:Npn \tl_gremove_all:Nn #1#2
   { \tl_greplace_all:Nnn #1 {#2} { } }
-\cs_generate_variant:Nn \tl_remove_all:Nn  { c }
-\cs_generate_variant:Nn \tl_gremove_all:Nn { c }
+\cs_generate_variant:Nn \tl_remove_all:Nn  { Nx , c , cx }
+\cs_generate_variant:Nn \tl_gremove_all:Nn { Nx , c , cx }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3484,7 +3493,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\tl_show:n, \@@_show:n}
+% \begin{macro}{\tl_show:n, \tl_show:x, \@@_show:n}
 % \begin{macro}[EXP]{\@@_show:w}
 %   Many |show| functions are based on \cs{tl_show:n}.
 %   The argument of \cs{tl_show:n} is line-wrapped using
@@ -3504,6 +3513,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_show:n #1
   { \iow_wrap:nnnN { >~ \tl_to_str:n {#1} . } { } { } \@@_show:n }
+\cs_generate_variant:Nn \tl_show:n { x }
 \cs_new_protected:Npn \@@_show:n #1
   {
     \tl_set:Nf \l_@@_internal_a_tl { \@@_show:w #1 \s_@@_stop }
@@ -3521,12 +3531,13 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\tl_log:n}
+% \begin{macro}{\tl_log:n, \tl_log:x}
 %   Logging is much easier, simply line-wrap.  The |>~| and trailing
 %   period is there to match the output of \cs{tl_show:n}.
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_log:n #1
   { \iow_wrap:nnnN { > ~ \tl_to_str:n {#1} . } { } { } \iow_log:n }
+\cs_generate_variant:Nn \tl_log:n { x }
 %    \end{macrocode}
 % \end{macro}
 %





More information about the latex3-commits mailing list.