[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid one \str_if_eq_x:nnTF (68e636f)

Joseph Wright joseph.wright at morningstar2.co.uk
Mon Jun 18 18:26:42 CEST 2018 

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/68e636fc1fe0d028a13b3157ad3c3eabb204cea9

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

commit 68e636fc1fe0d028a13b3157ad3c3eabb204cea9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Jun 18 17:25:29 2018 +0100

    Avoid one \str_if_eq_x:nnTF
    
    These variants are likely useful anyway.


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

68e636fc1fe0d028a13b3157ad3c3eabb204cea9
 l3kernel/l3keys.dtx                     |    7 ++-----
 l3kernel/l3str.dtx                      |    4 ++--
 l3kernel/testfiles/m3expl001.luatex.tlg |    8 ++++++++
 l3kernel/testfiles/m3expl001.ptex.tlg   |    8 ++++++++
 l3kernel/testfiles/m3expl001.tlg        |    8 ++++++++
 l3kernel/testfiles/m3expl001.uptex.tlg  |    8 ++++++++
 l3kernel/testfiles/m3expl001.xetex.tlg  |    8 ++++++++
 l3kernel/testfiles/m3expl003.luatex.tlg |    8 ++++++++
 l3kernel/testfiles/m3expl003.ptex.tlg   |    8 ++++++++
 l3kernel/testfiles/m3expl003.tlg        |    8 ++++++++
 l3kernel/testfiles/m3expl003.uptex.tlg  |    8 ++++++++
 l3kernel/testfiles/m3expl003.xetex.tlg  |    8 ++++++++
 12 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index f711bf5..77f82f3 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1459,11 +1459,8 @@
     \cs_if_exist:cTF
       { \c_@@_type_root_tl \@@_parent:o \l_keys_path_tl }
       {
-        \str_if_eq_x:nnTF
-          {
-            \exp_not:v
-              { \c_@@_type_root_tl \@@_parent:o \l_keys_path_tl }
-          }
+        \str_if_eq:vnTF
+          { \c_@@_type_root_tl \@@_parent:o \l_keys_path_tl }
           { choice }
           {
             \__kernel_msg_error:nnxx { kernel } { nested-choice-key }
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 0c66841..81c00f5 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -305,7 +305,7 @@
 % \begin{function}[EXP,pTF]
 %   {
 %     \str_if_eq:nn, \str_if_eq:Vn, \str_if_eq:on, \str_if_eq:no,
-%     \str_if_eq:nV, \str_if_eq:VV
+%     \str_if_eq:nV, \str_if_eq:VV, \str_if_eq:vn, \str_if_eq:nv
 %   }
 %   \begin{syntax}
 %     \cs{str_if_eq_p:nn} \Arg{tl_1} \Arg{tl_2}
@@ -1088,7 +1088,7 @@
       \prg_return_true: \else: \prg_return_false: \fi:
   }
 \prg_generate_conditional_variant:Nnn \str_if_eq:nn
-  { V , o , nV , no , VV } { p , T , F , TF }
+  { V , v , o , nV , no , VV , nv } { p , T , F , TF }
 \prg_new_conditional:Npnn \str_if_eq_x:nn #1#2 { p , T , F , TF }
   {
     \if_int_compare:w \@@_if_eq_x:nn {#1} {#2} = 0 \exp_stop_f:
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index ca32ada..61215da 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -733,25 +733,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 3b49a0b..22b8a29 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -769,25 +769,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index ee3b7f3..1dfc53c 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -769,25 +769,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 8ddabe4..88ddf6f 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -769,25 +769,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 0dad117..9b4c9bd 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -769,25 +769,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index ca32ada..61215da 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -733,25 +733,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 3b49a0b..22b8a29 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -769,25 +769,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index ee3b7f3..1dfc53c 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -769,25 +769,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 8ddabe4..88ddf6f 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -769,25 +769,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 0dad117..9b4c9bd 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -769,25 +769,33 @@ Defining \str_if_eq:nnT on line ...
 Defining \str_if_eq:nnF on line ...
 Defining \str_if_eq:nnTF on line ...
 Defining \str_if_eq_p:Vn on line ...
+Defining \str_if_eq_p:vn on line ...
 Defining \str_if_eq_p:on on line ...
 Defining \str_if_eq_p:nV on line ...
 Defining \str_if_eq_p:no on line ...
 Defining \str_if_eq_p:VV on line ...
+Defining \str_if_eq_p:nv on line ...
 Defining \str_if_eq:VnT on line ...
+Defining \str_if_eq:vnT on line ...
 Defining \str_if_eq:onT on line ...
 Defining \str_if_eq:nVT on line ...
 Defining \str_if_eq:noT on line ...
 Defining \str_if_eq:VVT on line ...
+Defining \str_if_eq:nvT on line ...
 Defining \str_if_eq:VnF on line ...
+Defining \str_if_eq:vnF on line ...
 Defining \str_if_eq:onF on line ...
 Defining \str_if_eq:nVF on line ...
 Defining \str_if_eq:noF on line ...
 Defining \str_if_eq:VVF on line ...
+Defining \str_if_eq:nvF on line ...
 Defining \str_if_eq:VnTF on line ...
+Defining \str_if_eq:vnTF on line ...
 Defining \str_if_eq:onTF on line ...
 Defining \str_if_eq:nVTF on line ...
 Defining \str_if_eq:noTF on line ...
 Defining \str_if_eq:VVTF on line ...
+Defining \str_if_eq:nvTF on line ...
 Defining \str_if_eq_x_p:nn on line ...
 Defining \str_if_eq_x:nnT on line ...
 Defining \str_if_eq_x:nnF on line ...

More information about the latex3-commits mailing list