[latex3-commits] [git/LaTeX3-latex3-latex3] master: Add a variant (4fd517040)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/4fd517040fc856919b9c958c181dbfd49bed10d1

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

commit 4fd517040fc856919b9c958c181dbfd49bed10d1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Sep 20 07:39:41 2019 +0100

    Add a variant


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

4fd517040fc856919b9c958c181dbfd49bed10d1
 l3kernel/l3candidates.dtx               | 8 --------
 l3kernel/l3tl.dtx                       | 5 ++++-
 l3kernel/testfiles/m3expl001.luatex.tlg | 5 ++++-
 l3kernel/testfiles/m3expl001.ptex.tlg   | 5 ++++-
 l3kernel/testfiles/m3expl001.tlg        | 5 ++++-
 l3kernel/testfiles/m3expl001.uptex.tlg  | 5 ++++-
 l3kernel/testfiles/m3expl001.xetex.tlg  | 5 ++++-
 l3kernel/testfiles/m3expl003.luatex.tlg | 5 ++++-
 l3kernel/testfiles/m3expl003.ptex.tlg   | 5 ++++-
 l3kernel/testfiles/m3expl003.tlg        | 5 ++++-
 l3kernel/testfiles/m3expl003.uptex.tlg  | 5 ++++-
 l3kernel/testfiles/m3expl003.xetex.tlg  | 5 ++++-
 12 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 1990a8b2e..5f9426c3b 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2418,14 +2418,6 @@
 %<@@=tl>
 %    \end{macrocode}
 %
-% \begin{macro}[EXP, documented-as=\tl_if_head_eq_catcode:nNTF]
-%   {\tl_if_head_eq_catcode:oNTF}
-%   Extra variants.
-%    \begin{macrocode}
-\cs_generate_variant:Nn \tl_if_head_eq_catcode:nNTF { o }
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}[EXP]{\tl_lower_case:n, \tl_upper_case:n, \tl_mixed_case:n}
 % \begin{macro}[EXP]{\tl_lower_case:nn, \tl_upper_case:nn, \tl_mixed_case:nn}
 %   The user level functions here are all wrappers around the internal
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 96cfc1dfc..5f19e1ab4 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -957,7 +957,8 @@
 %   \end{texnote}
 % \end{function}
 %
-% \begin{function}[updated = 2012-07-09, EXP, pTF]{\tl_if_head_eq_catcode:nN}
+% \begin{function}[updated = 2012-07-09, EXP, pTF]
+%   {\tl_if_head_eq_catcode:nN, \tl_if_head_eq_catcode:oN}
 %   \begin{syntax}
 %     \cs{tl_if_head_eq_catcode_p:nN} \Arg{token list} \meta{test token}
 %     \cs{tl_if_head_eq_catcode:nNTF} \Arg{token list} \meta{test token}
@@ -3016,6 +3017,8 @@
       \prg_return_false:
     \fi:
   }
+\prg_generate_conditional_variant:Nnn \tl_if_head_eq_catcode:nN
+  { o } { p , TF , T , F }
 %    \end{macrocode}
 %   For \cs{tl_if_head_eq_meaning:nN}, again, detect special cases.  In
 %   the normal case, use \cs{tl_head:w}, with no \cs{exp_not:N} this
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index ad6a8f1a9..78780de82 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -623,6 +623,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6558,7 +6562,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 8fdea5860..3be529fef 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -622,6 +622,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6544,7 +6548,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 20751a203..f877fa77e 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -622,6 +622,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6544,7 +6548,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index e0b89455f..046c34386 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -622,6 +622,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6540,7 +6544,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index cbb9bd264..81b7535ad 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -622,6 +622,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6548,7 +6552,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index ad6a8f1a9..78780de82 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -623,6 +623,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6558,7 +6562,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 8fdea5860..3be529fef 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -622,6 +622,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6544,7 +6548,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 20751a203..f877fa77e 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -622,6 +622,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6544,7 +6548,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index e0b89455f..046c34386 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -622,6 +622,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6540,7 +6544,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index cbb9bd264..81b7535ad 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -622,6 +622,10 @@ Defining \tl_if_head_eq_catcode_p:nN on line ...
 Defining \tl_if_head_eq_catcode:nNT on line ...
 Defining \tl_if_head_eq_catcode:nNF on line ...
 Defining \tl_if_head_eq_catcode:nNTF on line ...
+Defining \tl_if_head_eq_catcode_p:oN on line ...
+Defining \tl_if_head_eq_catcode:oNTF on line ...
+Defining \tl_if_head_eq_catcode:oNT on line ...
+Defining \tl_if_head_eq_catcode:oNF on line ...
 Defining \tl_if_head_eq_meaning_p:nN on line ...
 Defining \tl_if_head_eq_meaning:nNT on line ...
 Defining \tl_if_head_eq_meaning:nNF on line ...
@@ -6548,7 +6552,6 @@ Defining \__char_codepoint_to_bytes_outputiv:nw on line ...
 Defining \__char_codepoint_to_bytes_output:nnn on line ...
 Defining \__char_codepoint_to_bytes_output:fnn on line ...
 Defining \__char_codepoint_to_bytes_end: on line ...
-Defining \tl_if_head_eq_catcode:oNTF on line ...
 Defining \tl_lower_case:n on line ...
 Defining \tl_upper_case:n on line ...
 Defining \tl_mixed_case:n on line ...