From 2424697f076d786c0fff25ff543b5e0a432e03b4 Mon Sep 17 00:00:00 2001 From: Joseph Wright Date: Wed, 13 Dec 2017 10:26:44 +0000 Subject: [PATCH] Revert "Revert "Add missing \tl_if_novalue_p:n"" This reverts commit eae61aa4c08baa718ba2f7418caf28e09d382cd7. --- l3kernel/l3tl.dtx | 4 ++-- l3kernel/testfiles/m3expl001.luatex.tlg | 1 + l3kernel/testfiles/m3expl001.ptex.tlg | 1 + l3kernel/testfiles/m3expl001.tlg | 1 + l3kernel/testfiles/m3expl001.uptex.tlg | 1 + l3kernel/testfiles/m3expl001.xetex.tlg | 1 + l3kernel/testfiles/m3expl003.luatex.tlg | 1 + l3kernel/testfiles/m3expl003.ptex.tlg | 1 + l3kernel/testfiles/m3expl003.tlg | 1 + l3kernel/testfiles/m3expl003.uptex.tlg | 1 + l3kernel/testfiles/m3expl003.xetex.tlg | 1 + 11 files changed, 12 insertions(+), 2 deletions(-) diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx index 8f1a5beb49..ae74a8fdfa 100644 --- a/l3kernel/l3tl.dtx +++ b/l3kernel/l3tl.dtx @@ -2061,7 +2061,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[TF, EXP]{\tl_if_novalue:n} +% \begin{macro}[pTF, EXP]{\tl_if_novalue:n} % \begin{macro}[EXP]{\@@_if_novalue:w} % Tests for |-NoValue-|: this is similar to \cs{tl_if_in:nn} but set % up to be expandable and to check the value exactly. The question @@ -2070,7 +2070,7 @@ \use:x { \prg_new_conditional:Npnn \exp_not:N \tl_if_novalue:n ##1 - { T , F , TF } + { p , T , F , TF } { \exp_not:N \str_if_eq:onTF { diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg index f9069d3c85..f2938df1db 100644 --- a/l3kernel/testfiles/m3expl001.luatex.tlg +++ b/l3kernel/testfiles/m3expl001.luatex.tlg @@ -476,6 +476,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg index 0fb6d8b4f6..58509763ab 100644 --- a/l3kernel/testfiles/m3expl001.ptex.tlg +++ b/l3kernel/testfiles/m3expl001.ptex.tlg @@ -475,6 +475,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg index 44fed3e2ea..6b4237ddc1 100644 --- a/l3kernel/testfiles/m3expl001.tlg +++ b/l3kernel/testfiles/m3expl001.tlg @@ -475,6 +475,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg index 25cae1ab4e..c5a4f87120 100644 --- a/l3kernel/testfiles/m3expl001.uptex.tlg +++ b/l3kernel/testfiles/m3expl001.uptex.tlg @@ -475,6 +475,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg index c08750984a..f0f5e2ec42 100644 --- a/l3kernel/testfiles/m3expl001.xetex.tlg +++ b/l3kernel/testfiles/m3expl001.xetex.tlg @@ -475,6 +475,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg index f9069d3c85..f2938df1db 100644 --- a/l3kernel/testfiles/m3expl003.luatex.tlg +++ b/l3kernel/testfiles/m3expl003.luatex.tlg @@ -476,6 +476,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg index 0fb6d8b4f6..58509763ab 100644 --- a/l3kernel/testfiles/m3expl003.ptex.tlg +++ b/l3kernel/testfiles/m3expl003.ptex.tlg @@ -475,6 +475,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg index 44fed3e2ea..6b4237ddc1 100644 --- a/l3kernel/testfiles/m3expl003.tlg +++ b/l3kernel/testfiles/m3expl003.tlg @@ -475,6 +475,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg index 25cae1ab4e..c5a4f87120 100644 --- a/l3kernel/testfiles/m3expl003.uptex.tlg +++ b/l3kernel/testfiles/m3expl003.uptex.tlg @@ -475,6 +475,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ... diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg index c08750984a..f0f5e2ec42 100644 --- a/l3kernel/testfiles/m3expl003.xetex.tlg +++ b/l3kernel/testfiles/m3expl003.xetex.tlg @@ -475,6 +475,7 @@ Defining \tl_if_in:noF on line ... Defining \tl_if_in:VnTF on line ... Defining \tl_if_in:onTF on line ... Defining \tl_if_in:noTF on line ... +Defining \tl_if_novalue_p:n on line ... Defining \tl_if_novalue:nT on line ... Defining \tl_if_novalue:nF on line ... Defining \tl_if_novalue:nTF on line ...