[latex3-commits] [git/LaTeX3-latex3-latex3] master: Rename \str_if_eq_x:nn(TF) as \str_if_eq:ee(TF) (8fcb571)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Jun 18 22:07:22 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/8fcb571ddda61c01773d9746d32cecdbe63afb26
>---------------------------------------------------------------
commit 8fcb571ddda61c01773d9746d32cecdbe63afb26
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Jun 18 21:07:22 2018 +0100
Rename \str_if_eq_x:nn(TF) as \str_if_eq:ee(TF)
>---------------------------------------------------------------
8fcb571ddda61c01773d9746d32cecdbe63afb26
l3experimental/xgalley/l3galley.dtx | 2 +-
l3kernel/CHANGELOG.md | 4 +--
l3kernel/l3basics.dtx | 2 +-
l3kernel/l3fp-aux.dtx | 6 ++--
l3kernel/l3fp-expo.dtx | 2 +-
l3kernel/l3fp-parse.dtx | 6 ++--
l3kernel/l3obsolete.txt | 4 +++
l3kernel/l3prop.dtx | 8 ++---
l3kernel/l3regex.dtx | 4 +--
l3kernel/l3skip.dtx | 2 +-
l3kernel/l3str.dtx | 49 ++++++++++++++-----------------
l3kernel/l3token.dtx | 4 +--
l3kernel/l3unicode.dtx | 6 ++--
l3kernel/testfiles/m3basics001.lvt | 2 +-
l3kernel/testfiles/m3expl001.luatex.tlg | 16 ++++++----
l3kernel/testfiles/m3expl001.ptex.tlg | 16 ++++++----
l3kernel/testfiles/m3expl001.tlg | 16 ++++++----
l3kernel/testfiles/m3expl001.uptex.tlg | 16 ++++++----
l3kernel/testfiles/m3expl001.xetex.tlg | 16 ++++++----
l3kernel/testfiles/m3expl003.luatex.tlg | 16 ++++++----
l3kernel/testfiles/m3expl003.ptex.tlg | 16 ++++++----
l3kernel/testfiles/m3expl003.tlg | 16 ++++++----
l3kernel/testfiles/m3expl003.uptex.tlg | 16 ++++++----
l3kernel/testfiles/m3expl003.xetex.tlg | 16 ++++++----
l3kernel/testfiles/m3prg001.lvt | 2 +-
l3kernel/testfiles/m3sort002.lvt | 2 +-
l3kernel/testfiles/m3str001.lvt | 38 ++++++++++++------------
l3kernel/testfiles/m3str001.tlg | 2 +-
l3kernel/testfiles/m3str003.lvt | 2 +-
l3kernel/testfiles/m3tl006.lvt | 36 +++++++++++------------
l3kernel/testfiles/m3tlist002.lvt | 6 ++--
l3packages/xparse/xparse.dtx | 8 ++---
l3trial/l3bigint/l3bigint.dtx | 14 ++++-----
l3trial/l3check/l3check.dtx | 2 +-
34 files changed, 206 insertions(+), 167 deletions(-)
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index 12bde66..7b47d1d 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -1173,7 +1173,7 @@
}
\cs_new_protected:Npn \@@_par_aux:N #1
{
- \str_if_eq_x:nnF {#1} { \s_@@_par_omit }
+ \str_if_eq:nnF {#1} { \s_@@_par_omit }
{
\@@_par_auxii:
#1
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index b36cd4f..751b879 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -9,11 +9,11 @@ this project uses date-based 'snapshot' version identifiers.
## Added
- `\lua_escape:e`, `\lua_now:e` and `\lua_shipout_e:n`
-- `\str_case:ee(TF)`
+- `\str_case:ee(TF)` and `\str_if_eq:ee(TF)`
## Deprecated
- `\lua_escape_x:n`, `\lua_now_x:n` and `\lua_shipout_x:n`
-- `\str_case_x:nn(TF)`
+- `\str_case_x:nn(TF)` and `\str_if_eq_x:nn(TF)`
## [2018-06-14]
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 44a2afa..a058653 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -3256,7 +3256,7 @@
{
\bool_if:NTF #3
{
- \str_if_eq_x:nnF { }
+ \str_if_eq:eeF { }
{ \tl_map_function:nN {#2} \@@_generate_from_signature:n }
{
\__kernel_msg_error:nnx { kernel } { non-base-function }
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index 639e126..3d9af5e 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -1238,17 +1238,17 @@
%
% \subsection{Fast string comparison}
%
-% \begin{macro}{\@@_str_if_eq_x:nn}
+% \begin{macro}{\@@_str_if_eq:nn}
% A private version of the low-level string comparison function. As
% the nature of the arguments is restricted and as speed is of the essence,
% this version does not seek to deal with |#| tokens.
% No \pkg{l3sys} or \pkg{l3luatex} just yet so we have to define in terms of
% primitives.
% \begin{macrocode}
-\cs_new:Npn \@@_str_if_eq_x:nn #1#2 { \tex_strcmp:D {#1} {#2} }
+\cs_new:Npn \@@_str_if_eq:nn #1#2 { \tex_strcmp:D {#1} {#2} }
\sys_if_engine_luatex:T
{
- \cs_set:Npn \@@_str_if_eq_x:nn #1#2
+ \cs_set:Npn \@@_str_if_eq:nn #1#2
{
\tex_directlua:D
{
diff --git a/l3kernel/l3fp-expo.dtx b/l3kernel/l3fp-expo.dtx
index b07da9d..068ad85 100644
--- a/l3kernel/l3fp-expo.dtx
+++ b/l3kernel/l3fp-expo.dtx
@@ -995,7 +995,7 @@
\cs_new:Npn \@@_pow_normal_o:ww
\s_@@ \@@_chk:w 1 #1#2#3; \s_@@ \@@_chk:w #4#5
{
- \if_int_compare:w \@@_str_if_eq_x:nn { #2 #3 }
+ \if_int_compare:w \@@_str_if_eq:nn { #2 #3 }
{ 1 {1000} {0000} {0000} {0000} } = 0 \exp_stop_f:
\if_int_compare:w #4 #1 = 32 \exp_stop_f:
\exp_after:wN \@@_case_return_ii_o:ww
diff --git a/l3kernel/l3fp-parse.dtx b/l3kernel/l3fp-parse.dtx
index aca31d7..296cd86 100644
--- a/l3kernel/l3fp-parse.dtx
+++ b/l3kernel/l3fp-parse.dtx
@@ -1752,7 +1752,7 @@
\if_catcode:w \scan_stop: \exp_not:N #1
\if_meaning:w \scan_stop: #1
\if_int_compare:w
- \@@_str_if_eq_x:nn { \s_@@ } { \exp_not:N #1 }
+ \@@_str_if_eq:nn { \s_@@ } { \exp_not:N #1 }
= 0 \exp_stop_f:
0
\__kernel_msg_expandable_error:nnn
@@ -1766,7 +1766,7 @@
\fi:
\else:
\if_int_compare:w
- \@@_str_if_eq_x:nn { \int_value:w #1 } { \tex_the:D #1 }
+ \@@_str_if_eq:nn { \int_value:w #1 } { \tex_the:D #1 }
= 0 \exp_stop_f:
\int_value:w #1
\else:
@@ -2260,7 +2260,7 @@
{
\if_catcode:w \scan_stop: \exp_not:N #2
\if_int_compare:w
- \@@_str_if_eq_x:nn { \s_@@_mark } { \exp_not:N #2 }
+ \@@_str_if_eq:nn { \s_@@_mark } { \exp_not:N #2 }
= 0 \exp_stop_f:
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_parse_infix_mark:NNN
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index eda4c32..3c588bc 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -65,6 +65,10 @@ Function Expires end
\str_case_x:nnF 2019
\str_case_x:nnT 2019
\str_case_x:nnTF 2019
+\str_if_eq_x:nnF 2019
+\str_if_eq_x:nnT 2019
+\str_if_eq_x:nnTF 2019
+\str_if_eq_x_p:nn 2019
\tl_show_analysis:N 2019
\tl_show_analysis:n 2019
\token_new:Nn 2018
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 9c6c4e6..6910c76 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -861,7 +861,7 @@
}
\cs_new:Npn \@@_item_Nn:nwwn #1#2 \@@_pair:wn #3 \s_@@ #4
{
- \str_if_eq_x:nnTF {#1} {#3}
+ \str_if_eq:eeTF {#1} {#3}
{ \prg_break:n { \exp_not:n {#4} } }
{ \@@_item_Nn:nwwn {#1} }
}
@@ -1034,10 +1034,10 @@
% but \cs{@@_split:NnTF} is non-expandable.
%
% Instead, the key is compared to each key in turn using
-% \cs{str_if_eq:nn}, which is expandable. To terminate the mapping,
+% \cs{str_if_eq:ee}, which is expandable. To terminate the mapping,
% we append to the property list the key that is searched for. This
% second \cs{tl_to_str:n} is not expanded at the start, but only when
-% included in the \cs{str_if_eq:nn}. It cannot make the breaking
+% included in the \cs{str_if_eq:ee}. It cannot make the breaking
% mechanism choke, because the arbitrary token list material is
% enclosed in braces. The second argument of \cs{@@_if_in:nwwn} is
% most often empty. When the \meta{key} is found in the list,
@@ -1058,7 +1058,7 @@
}
\cs_new:Npn \@@_if_in:nwwn #1#2 \@@_pair:wn #3 \s_@@ #4
{
- \str_if_eq:nnTF {#1} {#3}
+ \str_if_eq:eeTF {#1} {#3}
{ \@@_if_in:N }
{ \@@_if_in:nwwn {#1} }
}
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 7f452ee..44e64b9 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -6468,7 +6468,7 @@
{ Missing~right~brace~inserted~for~'\iow_char:N\\u'~escape. }
{
LaTeX~
- \str_if_eq_x:nnTF { } {#2}
+ \str_if_eq:eeTF { } {#2}
{ reached~the~end~of~the~string~ }
{ encountered~an~escaped~alphanumeric~character '\iow_char:N\\#2'~ }
when~parsing~the~argument~of~an~
@@ -6628,7 +6628,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_msg_repeated:nnN #1#2#3
{
- \str_if_eq_x:nnF { #1 #2 } { 1 0 }
+ \str_if_eq:eeF { #1 #2 } { 1 0 }
{
, ~ repeated ~
\int_case:nnF {#2}
diff --git a/l3kernel/l3skip.dtx b/l3kernel/l3skip.dtx
index 8069b0d..0c8e602 100644
--- a/l3kernel/l3skip.dtx
+++ b/l3kernel/l3skip.dtx
@@ -1942,7 +1942,7 @@
% \begin{macrocode}
\prg_new_conditional:Npnn \skip_if_eq:nn #1#2 { p , T , F , TF }
{
- \str_if_eq_x:nnTF { \skip_eval:n { #1 } } { \skip_eval:n { #2 } }
+ \str_if_eq:eeTF { \skip_eval:n { #1 } } { \skip_eval:n { #2 } }
{ \prg_return_true: }
{ \prg_return_false: }
}
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 302a1ca..284a72c 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -302,10 +302,11 @@
% in the same order.
% \end{function}
%
-% \begin{function}[EXP,pTF]
+% \begin{function}[EXP,pTF, updated = 2018-06-18]
% {
% \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:vn, \str_if_eq:nv
+% \str_if_eq:nV, \str_if_eq:VV, \str_if_eq:vn, \str_if_eq:nv,
+% \str_if_eq:ee
% }
% \begin{syntax}
% \cs{str_if_eq_p:nn} \Arg{tl_1} \Arg{tl_2}
@@ -321,21 +322,6 @@
% is logically \texttt{true}.
% \end{function}
%
-% \begin{function}[EXP,pTF, added = 2012-06-05]{\str_if_eq_x:nn}
-% \begin{syntax}
-% \cs{str_if_eq_x_p:nn} \Arg{tl_1} \Arg{tl_2}
-% \cs{str_if_eq_x:nnTF} \Arg{tl_1} \Arg{tl_2} \Arg{true code} \Arg{false code}
-% \end{syntax}
-% Fully expands the two \meta{token lists} and converts them to \meta{strings}, then
-% compares these on a character by character basis:
-% it is \texttt{true} if the two \meta{strings} contain the same
-% characters in the same order. Thus for example
-% \begin{verbatim}
-% \str_if_eq_x_p:nn { abc } { \tl_to_str:n { abc } }
-% \end{verbatim}
-% is logically \texttt{true}.
-% \end{function}
-%
% \begin{function}[TF, added = 2017-10-08]{\str_if_in:Nn, \str_if_in:cn}
% \begin{syntax}
% \cs{str_if_in:NnTF} \meta{str~var} \Arg{token list} \Arg{true code} \Arg{false code}
@@ -1006,7 +992,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[EXP]{\@@_if_eq_x:nn}
+% \begin{macro}[EXP]{\@@_if_eq:nn}
% \begin{macro}[EXP]{\@@_escape:n}
% String comparisons rely on the primitive \cs[index=pdfstrcmp]{(pdf)strcmp} if available:
% \LuaTeX{} does not have it, so emulation is required. As the net result
@@ -1016,16 +1002,16 @@
% the necessary Lua code is loaded in \pkg{l3boostrap}.
% The need to detokenize and force
% expansion of input arises from the case where a |#| token is used in the
-% input, \emph{e.g.}~|\__str_if_eq_x:nn {#} { \tl_to_str:n {#} }|, which
+% input, \emph{e.g.}~|\__str_if_eq:nn {#} { \tl_to_str:n {#} }|, which
% otherwise would fail as \cs{tex_luaescapestring:D} does not double
% such tokens.
% \begin{macrocode}
-\cs_new:Npn \@@_if_eq_x:nn #1#2 { \tex_strcmp:D {#1} {#2} }
+\cs_new:Npn \@@_if_eq:nn #1#2 { \tex_strcmp:D {#1} {#2} }
\cs_if_exist:NT \tex_luatexversion:D
{
\cs_set_eq:NN \lua_escape:e \tex_luaescapestring:D
\cs_set_eq:NN \lua_now:e \tex_directlua:D
- \cs_set:Npn \@@_if_eq_x:nn #1#2
+ \cs_set:Npn \@@_if_eq:nn #1#2
{
\lua_now:e
{
@@ -1050,7 +1036,7 @@
% {
% \str_if_eq:nn, \str_if_eq:Vn, \str_if_eq:on, \str_if_eq:nV,
% \str_if_eq:no, \str_if_eq:VV,
-% \str_if_eq_x:nn
+% \str_if_eq:ee
% }
% Modern engines provide a direct way of comparing two token lists,
% but returning a number. This set of conditionals therefore make life
@@ -1060,15 +1046,15 @@
\prg_new_conditional:Npnn \str_if_eq:nn #1#2 { p , T , F , TF }
{
\if_int_compare:w
- \@@_if_eq_x:nn { \exp_not:n {#1} } { \exp_not:n {#2} }
+ \@@_if_eq:nn { \exp_not:n {#1} } { \exp_not:n {#2} }
= 0 \exp_stop_f:
\prg_return_true: \else: \prg_return_false: \fi:
}
\prg_generate_conditional_variant:Nnn \str_if_eq:nn
{ 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 }
+\prg_new_conditional:Npnn \str_if_eq:ee #1#2 { p , T , F , TF }
{
- \if_int_compare:w \@@_if_eq_x:nn {#1} {#2} = 0 \exp_stop_f:
+ \if_int_compare:w \@@_if_eq:nn {#1} {#2} = 0 \exp_stop_f:
\prg_return_true: \else: \prg_return_false: \fi:
}
% \end{macrocode}
@@ -1082,7 +1068,7 @@
\prg_new_conditional:Npnn \str_if_eq:NN #1#2 { p , TF , T , F }
{
\if_int_compare:w
- \@@_if_eq_x:nn { \tl_to_str:N #1 } { \tl_to_str:N #2 }
+ \@@_if_eq:nn { \tl_to_str:N #1 } { \tl_to_str:N #2 }
= 0 \exp_stop_f: \prg_return_true: \else: \prg_return_false: \fi:
}
\prg_generate_conditional_variant:Nnn \str_if_eq:NN
@@ -1176,7 +1162,7 @@
{ \@@_case:ew {#1} #2 {#1} { } \q_mark {#3} \q_mark {#4} \q_stop }
\cs_new:Npn \@@_case:ew #1#2#3
{
- \str_if_eq_x:nnTF {#1} {#2}
+ \str_if_eq:eeTF {#1} {#2}
{ \@@_case_end:nw {#3} }
{ \@@_case:ew {#1} }
}
@@ -1901,6 +1887,7 @@
% \subsection{Deprecated functions}
%
% \begin{macro}[EXP, deprecated = 2019-12-31, noTF]{\str_case_x:nn}
+% \begin{macro}[EXP, deprecated = 2019-12-31, pTF]{\str_if_eq_x:nn}
% For removal after 2019-12-31.
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \str_case:ee }
@@ -1927,6 +1914,14 @@
\exp:w
\@@_case:eeTF {#1} {#2}
}
+\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \str_if_eq_p:ee }
+\cs_new:Npn \str_if_eq_x_p:nn { \str_if_eq_p:ee }
+\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \str_if_eq:eeT }
+\cs_new:Npn \str_if_eq_x:nnT { \str_if_eq:eeT }
+\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \str_if_eq:eeF }
+\cs_new:Npn \str_if_eq_x:nnF { \str_if_eq:eeF }
+\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \str_if_eq:eeTF }
+\cs_new:Npn \str_if_eq_x:nnTF { \str_if_eq:eeTF }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index 9f3bb46..0de5a13 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1957,7 +1957,7 @@
% function cannot be defined on the fly because tests must remain
% expandable): instead the first argument of the auxiliary (plus the
% delimiter to avoid complications with trailing spaces) is compared
-% using \cs{str_if_eq_x:nnTF} to the result of applying
+% using \cs{str_if_eq:eeTF} to the result of applying
% \cs{token_to_str:N} to a control sequence. Second, the
% \tn{meaning} of primitives such as \tn{dimen} or \tn{dimendef}
% starts in the same way as registers such as
@@ -2005,7 +2005,7 @@
\exp_not:N \prg_return_false:
\exp_not:N \else:
}
- \exp_not:N \str_if_eq_x:nnTF
+ \exp_not:N \str_if_eq:eeTF
{
\exp_not:N \exp_after:wN
\exp_not:c { @@_delimit_by_ #2 :w }
diff --git a/l3kernel/l3unicode.dtx b/l3kernel/l3unicode.dtx
index e45aaec..18b6fea 100644
--- a/l3kernel/l3unicode.dtx
+++ b/l3kernel/l3unicode.dtx
@@ -163,7 +163,7 @@
{
\tl_if_blank:nF {#1}
{
- \str_if_eq_x:nnF { \tl_head:n {#1} } { \c_hash_str }
+ \str_if_eq:eeF { \tl_head:n {#1} } { \c_hash_str }
{ \@@_data_auxi:w #1 \q_stop }
}
}
@@ -205,9 +205,9 @@
{
\tl_if_blank:nF {#1}
{
- \str_if_eq_x:nnTF { \tl_head:n {#1} } { \c_hash_str }
+ \str_if_eq:eeTF { \tl_head:n {#1} } { \c_hash_str }
{
- \str_if_eq_x:nnT
+ \str_if_eq:eeT
{#1}
{ \c_hash_str \c_space_tl Conditional~Mappings }
{ \ior_map_break: }
diff --git a/l3kernel/testfiles/m3basics001.lvt b/l3kernel/testfiles/m3basics001.lvt
index f817370..ca70c6b 100644
--- a/l3kernel/testfiles/m3basics001.lvt
+++ b/l3kernel/testfiles/m3basics001.lvt
@@ -43,7 +43,7 @@
\cs_if_exist_use:cF { scan_stop: } { \FALSE }
\cs_if_exist_use:cT { scan_stop: } { \ERROR }
\cs_if_exist_use:cTF { scan_stop: } { \ERROR } { \FALSE }
- \str_if_eq_x:nnTF { \token_to_meaning:N \UNDEFINED } { undefined }
+ \str_if_eq:eeTF { \token_to_meaning:N \UNDEFINED } { undefined }
{ \TRUE } { \ERROR }
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 2d6cbf4..7ba87a4 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -726,7 +726,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \__str_escape:n on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
@@ -760,10 +760,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -917,6 +917,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3522,7 +3526,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 47dd577..d30f0b0 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -763,7 +763,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -796,10 +796,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -953,6 +953,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3815,7 +3819,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index ddb441f..348e154 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -763,7 +763,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -796,10 +796,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -953,6 +953,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3815,7 +3819,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 01cdff1..8e6eac3 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -763,7 +763,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -796,10 +796,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -953,6 +953,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3815,7 +3819,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 8318345..c71bc0d 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -763,7 +763,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -796,10 +796,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -953,6 +953,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3553,7 +3557,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 2d6cbf4..7ba87a4 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -726,7 +726,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \__str_escape:n on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
@@ -760,10 +760,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -917,6 +917,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3522,7 +3526,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 47dd577..d30f0b0 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -763,7 +763,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -796,10 +796,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -953,6 +953,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3815,7 +3819,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index ddb441f..348e154 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -763,7 +763,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -796,10 +796,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -953,6 +953,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3815,7 +3819,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 01cdff1..8e6eac3 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -763,7 +763,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -796,10 +796,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -953,6 +953,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3815,7 +3819,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 8318345..c71bc0d 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -763,7 +763,7 @@ Defining \str_if_empty_p:c on line ...
Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
-Defining \__str_if_eq_x:nn on line ...
+Defining \__str_if_eq:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -796,10 +796,10 @@ 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 ...
-Defining \str_if_eq_x:nnTF on line ...
+Defining \str_if_eq_p:ee on line ...
+Defining \str_if_eq:eeT on line ...
+Defining \str_if_eq:eeF on line ...
+Defining \str_if_eq:eeTF on line ...
Defining \str_if_eq_p:NN on line ...
Defining \str_if_eq:NNTF on line ...
Defining \str_if_eq:NNT on line ...
@@ -953,6 +953,10 @@ Defining \str_case_x:nn on line ...
Defining \str_case_x:nnT on line ...
Defining \str_case_x:nnF on line ...
Defining \str_case_x:nnTF 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 ...
+Defining \str_if_eq_x:nnTF on line ...
Defining \quark_new:N on line ...
Defining \q_nil on line ...
Defining \q_mark on line ...
@@ -3553,7 +3557,7 @@ Defining \__fp_small_int_normal:NnwTF on line ...
Defining \__fp_small_int_test:NnnwNw on line ...
Defining \__fp_expand:n on line ...
Defining \__fp_expand_loop:nwnN on line ...
-Defining \__fp_str_if_eq_x:nn on line ...
+Defining \__fp_str_if_eq:nn on line ...
Defining \__fp_func_to_name:N on line ...
Defining \__fp_func_to_name_aux:w on line ...
Defining message LaTeX/kernel/misused-fp on line ...
diff --git a/l3kernel/testfiles/m3prg001.lvt b/l3kernel/testfiles/m3prg001.lvt
index d754538..b8fb02c 100644
--- a/l3kernel/testfiles/m3prg001.lvt
+++ b/l3kernel/testfiles/m3prg001.lvt
@@ -46,7 +46,7 @@
\exp_args:No \exp_not:o { \prg_replicate:nn{1}{YES} } \NEWLINE
[ \exp_args:No \exp_not:o { \prg_replicate:nn{0}{\ERROR} } ] \NEWLINE
\exp_args:No \exp_not:o { \prg_replicate:nn{7}{YES} } \NEWLINE
- \str_if_eq_x:nnTF
+ \str_if_eq:eeTF
{ \exp_args:No \exp_not:o { \prg_replicate:nn {1234} {x} } }
{
\exp_args:No \exp_not:o { \prg_replicate:nn { 526} {x} }
diff --git a/l3kernel/testfiles/m3sort002.lvt b/l3kernel/testfiles/m3sort002.lvt
index 0762236..071996e 100644
--- a/l3kernel/testfiles/m3sort002.lvt
+++ b/l3kernel/testfiles/m3sort002.lvt
@@ -39,7 +39,7 @@
\OMIT
\prg_set_conditional:Npnn \test_compare:nn #1#2 { TF }
{
- \if_int_compare:w \__str_if_eq_x:nn {#1} {#2} > 0 \exp_stop_f:
+ \if_int_compare:w \__str_if_eq:nn {#1} {#2} > 0 \exp_stop_f:
\prg_return_false:
\else:
\prg_return_true:
diff --git a/l3kernel/testfiles/m3str001.lvt b/l3kernel/testfiles/m3str001.lvt
index 4b458bb..97daab7 100644
--- a/l3kernel/testfiles/m3str001.lvt
+++ b/l3kernel/testfiles/m3str001.lvt
@@ -27,30 +27,30 @@
\group_end:
\TIMO
-\TESTEXP { str_if_eq_x:nnTF }
+\TESTEXP { str_if_eq:eeTF }
{
- \str_if_eq_x:nnTF { abc } { abc } { \TRUE } { \ERROR } \NEWLINE
- \str_if_eq_x:nnTF { \l_tmpa_tl } { abc } { \TRUE } { \ERROR } \NEWLINE
- \str_if_eq_x:nnTF { \l_tmpa_tl } { \l_tmpb_tl } { \ERROR } { \FALSE } \NEWLINE
- \str_if_eq_x:nnTF { \l_tmpa_tl } { \g_tmpa_tl } { \ERROR } { \FALSE } \NEWLINE
- \str_if_eq_x:nnTF { \l_tmpa_tl } { \g_tmpb_tl } { \TRUE } { \ERROR } \NEWLINE
- \str_if_eq_x:nnTF { # } { \tl_to_str:n { # } } { \TRUE } { \ERROR } \NEWLINE
+ \str_if_eq:eeTF { abc } { abc } { \TRUE } { \ERROR } \NEWLINE
+ \str_if_eq:eeTF { \l_tmpa_tl } { abc } { \TRUE } { \ERROR } \NEWLINE
+ \str_if_eq:eeTF { \l_tmpa_tl } { \l_tmpb_tl } { \ERROR } { \FALSE } \NEWLINE
+ \str_if_eq:eeTF { \l_tmpa_tl } { \g_tmpa_tl } { \ERROR } { \FALSE } \NEWLINE
+ \str_if_eq:eeTF { \l_tmpa_tl } { \g_tmpb_tl } { \TRUE } { \ERROR } \NEWLINE
+ \str_if_eq:eeTF { # } { \tl_to_str:n { # } } { \TRUE } { \ERROR } \NEWLINE
\SEPARATOR
\NEWLINE
- \str_if_eq_x:nnT { abc } { abc } { \TRUE } \NEWLINE
- \str_if_eq_x:nnT { \l_tmpa_tl } { abc } { \TRUE } \NEWLINE
- \str_if_eq_x:nnT { \l_tmpa_tl } { \l_tmpb_tl } { \ERROR } \NEWLINE
- \str_if_eq_x:nnT { \l_tmpa_tl } { \g_tmpa_tl } { \ERROR } \NEWLINE
- \str_if_eq_x:nnT { \l_tmpa_tl } { \g_tmpb_tl } { \TRUE } \NEWLINE
- \str_if_eq_x:nnT { # } { \tl_to_str:n { # } } { \TRUE } \NEWLINE
+ \str_if_eq:eeT { abc } { abc } { \TRUE } \NEWLINE
+ \str_if_eq:eeT { \l_tmpa_tl } { abc } { \TRUE } \NEWLINE
+ \str_if_eq:eeT { \l_tmpa_tl } { \l_tmpb_tl } { \ERROR } \NEWLINE
+ \str_if_eq:eeT { \l_tmpa_tl } { \g_tmpa_tl } { \ERROR } \NEWLINE
+ \str_if_eq:eeT { \l_tmpa_tl } { \g_tmpb_tl } { \TRUE } \NEWLINE
+ \str_if_eq:eeT { # } { \tl_to_str:n { # } } { \TRUE } \NEWLINE
\SEPARATOR
\NEWLINE
- \str_if_eq_x:nnF { abc } { abc } { \ERROR } \NEWLINE
- \str_if_eq_x:nnF { \l_tmpa_tl } { abc } { \ERROR } \NEWLINE
- \str_if_eq_x:nnF { \l_tmpa_tl } { \l_tmpb_tl } { \FALSE } \NEWLINE
- \str_if_eq_x:nnF { \l_tmpa_tl } { \g_tmpa_tl } { \FALSE } \NEWLINE
- \str_if_eq_x:nnF { \l_tmpa_tl } { \g_tmpb_tl } { \ERROR } \NEWLINE
- \str_if_eq_x:nnF { # } { \tl_to_str:n { # } } { \ERROR } \NEWLINE
+ \str_if_eq:eeF { abc } { abc } { \ERROR } \NEWLINE
+ \str_if_eq:eeF { \l_tmpa_tl } { abc } { \ERROR } \NEWLINE
+ \str_if_eq:eeF { \l_tmpa_tl } { \l_tmpb_tl } { \FALSE } \NEWLINE
+ \str_if_eq:eeF { \l_tmpa_tl } { \g_tmpa_tl } { \FALSE } \NEWLINE
+ \str_if_eq:eeF { \l_tmpa_tl } { \g_tmpb_tl } { \ERROR } \NEWLINE
+ \str_if_eq:eeF { # } { \tl_to_str:n { # } } { \ERROR } \NEWLINE
}
\TESTEXP { str_if_eq:nnTF }
diff --git a/l3kernel/testfiles/m3str001.tlg b/l3kernel/testfiles/m3str001.tlg
index 2c95fd6..6ba5d67 100644
--- a/l3kernel/testfiles/m3str001.tlg
+++ b/l3kernel/testfiles/m3str001.tlg
@@ -2,7 +2,7 @@ This is a generated file for the LaTeX (2e + expl3) validation system.
Don't change this file in any respect.
Author: Joseph Wright
============================================================
-TEST 1: str_if_eq_x:nnTF
+TEST 1: str_if_eq:eeTF
============================================================
TRUE
TRUE
diff --git a/l3kernel/testfiles/m3str003.lvt b/l3kernel/testfiles/m3str003.lvt
index 4e8f69d..4170b25 100644
--- a/l3kernel/testfiles/m3str003.lvt
+++ b/l3kernel/testfiles/m3str003.lvt
@@ -236,7 +236,7 @@
{
\str_if_eq:NNTF \l_foo_str \l_bar_str { \TRUE } { \ERROR } ~
\str_if_eq:NNTF \l_foo_str \c_backslash_str { \ERROR } { \FALSE } ~
- \str_if_eq_x:nnTF { \l_foo_str } { a~b \iow_char:N \\ par ~ # }
+ \str_if_eq:eeTF { \l_foo_str } { a~b \iow_char:N \\ par ~ # }
{ \TRUE } { \ERROR }
}
diff --git a/l3kernel/testfiles/m3tl006.lvt b/l3kernel/testfiles/m3tl006.lvt
index ac14483..d582161 100644
--- a/l3kernel/testfiles/m3tl006.lvt
+++ b/l3kernel/testfiles/m3tl006.lvt
@@ -200,33 +200,33 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\TESTEXP{str_head}{
- \str_if_eq_x:nnF { \str_head:n {} } { } ?
- \str_if_eq_x:nnF { \str_head:n {~} } { ~ } ?
- \str_if_eq_x:nnF
+ \str_if_eq:eeF { \str_head:n {} } { } ?
+ \str_if_eq:eeF { \str_head:n {~} } { ~ } ?
+ \str_if_eq:eeF
{ \exp_args:Nf \str_head:n { \prg_replicate:nn {5} {~} } }
{ ~ } ?
- \str_if_eq_x:nnF { \str_head:n {^^65} } { e } ?
- \str_if_eq_x:nnF { \str_head:n {~\foo} } { ~ } ?
- \str_if_eq_x:nnF { \str_head:n { \* ~ } } { \iow_char:N \\ } ?
- \str_if_eq_x:nnF { \str_head:n { ~*~ } } { ~ } ?
- \str_if_eq_x:nnF { \str_head:n { A B } } { A } ?
- \str_if_eq_x:nnF { \str_head:n { { } } } { \iow_char:N \{ } ?
+ \str_if_eq:eeF { \str_head:n {^^65} } { e } ?
+ \str_if_eq:eeF { \str_head:n {~\foo} } { ~ } ?
+ \str_if_eq:eeF { \str_head:n { \* ~ } } { \iow_char:N \\ } ?
+ \str_if_eq:eeF { \str_head:n { ~*~ } } { ~ } ?
+ \str_if_eq:eeF { \str_head:n { A B } } { A } ?
+ \str_if_eq:eeF { \str_head:n { { } } } { \iow_char:N \{ } ?
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\TESTEXP{str_tail}{
- \str_if_eq_x:nnF { \str_tail:n {} } { } ?
- \str_if_eq_x:nnF { \str_tail:n {~} } { } ?
- \str_if_eq_x:nnF
+ \str_if_eq:eeF { \str_tail:n {} } { } ?
+ \str_if_eq:eeF { \str_tail:n {~} } { } ?
+ \str_if_eq:eeF
{ \exp_args:Nf \str_tail:n { \prg_replicate:nn {5} {~} } }
{ \prg_replicate:nn {3} {~} } ?
- \str_if_eq_x:nnF { \str_tail:n {^^65} } { } ?
- \str_if_eq_x:nnF { \str_tail:n {~\foo} } { \exp_not:N \foo } ?
- \str_if_eq_x:nnF { \str_tail:n { \* ~ } } { * ~ } ?
- \str_if_eq_x:nnF { \str_tail:n { ~*~ } } { *~ } ?
- \str_if_eq_x:nnF { \str_tail:n { A B } } { B } ?
- \str_if_eq_x:nnF { \str_tail:n { { } } } { \iow_char:N \} } ?
+ \str_if_eq:eeF { \str_tail:n {^^65} } { } ?
+ \str_if_eq:eeF { \str_tail:n {~\foo} } { \exp_not:N \foo } ?
+ \str_if_eq:eeF { \str_tail:n { \* ~ } } { * ~ } ?
+ \str_if_eq:eeF { \str_tail:n { ~*~ } } { *~ } ?
+ \str_if_eq:eeF { \str_tail:n { A B } } { B } ?
+ \str_if_eq:eeF { \str_tail:n { { } } } { \iow_char:N \} } ?
}
\END
diff --git a/l3kernel/testfiles/m3tlist002.lvt b/l3kernel/testfiles/m3tlist002.lvt
index 1674e68..1207741 100644
--- a/l3kernel/testfiles/m3tlist002.lvt
+++ b/l3kernel/testfiles/m3tlist002.lvt
@@ -59,9 +59,9 @@
\TIMO
\TEST{str_if_eq~variants}{
- \str_if_eq_x:nnTF {\l_tmpd_tl}{\l_tmpc_tl} {\TRUE}{\FALSE}
- \str_if_eq_x:nnT {\l_tmpd_tl}{\l_tmpc_tl} {\TRUE}
- \str_if_eq_x:nnF {\l_tmpd_tl}{\l_tmpc_tl Z} {\FALSE}
+ \str_if_eq:eeTF {\l_tmpd_tl}{\l_tmpc_tl} {\TRUE}{\FALSE}
+ \str_if_eq:eeT {\l_tmpd_tl}{\l_tmpc_tl} {\TRUE}
+ \str_if_eq:eeF {\l_tmpd_tl}{\l_tmpc_tl Z} {\FALSE}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index adcaad4..549dbc1 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -2630,7 +2630,7 @@
\tl_if_blank:oTF { \use_none:n ##1 }
{ \@@_add_arg:o { \use_none:n ##1 } }
{
- \str_if_eq_x:nnTF
+ \str_if_eq:eeTF
{ \exp_not:o { \use_none:n ##1 } }
{ { \exp_not:o { \use_ii:nnn ##1 \q_nil } } }
{ \@@_add_arg:o { \use_ii:nn ##1 } }
@@ -3326,7 +3326,7 @@
% hence are not considered as characters.
% \begin{macrocode}
\cs_new_protected:Npn \@@_grab_v_token_if_char:NTF #1
- { \str_if_eq_x:nnTF { } { \str_tail:n {#1} } }
+ { \str_if_eq:eeTF { } { \str_tail:n {#1} } }
% \end{macrocode}
% \end{macro}
%
@@ -3456,7 +3456,7 @@
\tl_if_blank:oTF { \use_none:nn #1#2 }
{ \@@_put_arg_expandable:ow { \use_none:nn #1#2 } }
{
- \str_if_eq_x:nnTF
+ \str_if_eq:eeTF
{ \exp_not:o { \use_none:nn #1#2 } }
{ { \exp_not:o { \use_iii:nnnn #1#2 \q_nil } } }
{ \@@_put_arg_expandable:ow { \use_iii:nnn #1#2 } }
@@ -3511,7 +3511,7 @@
\tl_if_blank:oTF { \use_none:n #4 }
{ \@@_put_arg_expandable:ow { \use_none:n #4 } }
{
- \str_if_eq_x:nnTF
+ \str_if_eq:eeTF
{ \exp_not:o { \use_none:n #4 } }
{ { \exp_not:o { \use_ii:nnn #4 \q_nil } } }
{ \@@_put_arg_expandable:ow { \use_ii:nn #4 } }
diff --git a/l3trial/l3bigint/l3bigint.dtx b/l3trial/l3bigint/l3bigint.dtx
index e9b1a58..9fa6c8f 100644
--- a/l3trial/l3bigint/l3bigint.dtx
+++ b/l3trial/l3bigint/l3bigint.dtx
@@ -621,15 +621,15 @@
% In particular, copies of primitives and internal commands from other
% packages.
%
-% \begin{macro}{\@@_str_cmp_x:nn}
+% \begin{macro}{\@@_str_cmp:nn}
% As in \pkg{l3fp}, we use a private string comparison set up here. Note
% that in this case we do need non-zero return values: no other string
% comparison requires this.
% \begin{macrocode}
-\cs_new:Npn \@@_str_cmp_x:nn #1#2 { \tex_strcmp:D {#1} {#2} }
+\cs_new:Npn \@@_str_cmp:nn #1#2 { \tex_strcmp:D {#1} {#2} }
\cs_if_exist:NT \tex_luatexversion:D
{
- \cs_set:Npn \@@_str_cmp_x:nn #1#2
+ \cs_set:Npn \@@_str_cmp:nn #1#2
{
\lua_now:e
{
@@ -1359,7 +1359,7 @@
\cs_new:Npn \@@_parse_infix:NN #1 #2
{
\if_catcode:w \scan_stop: \exp_not:N #2
- \str_if_eq_x:nnTF { \s_@@_mark } { \exp_not:N #2 }
+ \str_if_eq:eeTF { \s_@@_mark } { \exp_not:N #2 }
{ \exp_after:wN \@@_parse_infix_mark:NNN }
{ \exp_after:wN \@@_parse_infix_juxtapose:N }
\else:
@@ -2472,7 +2472,7 @@
\int_compare:nNnTF { #2 1 } = { #5 1 }
{
\int_compare:nNnTF {#1} = {#4}
- { \@@_str_cmp_x:nn {#3} {#6} }
+ { \@@_str_cmp:nn {#3} {#6} }
{ \int_compare:nNnF {#1} > {#4} { - } 1 }
}
{ \int_compare:nNnF { #2 1 } > { #5 1 } { - } 1 }
@@ -2543,7 +2543,7 @@
{ \@@_case:nw {#1} #2 {#1} { } \q_mark {#3} \q_mark {#4} \q_stop }
\cs_new:Npn \@@_case:nw #1#2#3
{
- \str_if_eq_x:nnTF {#1} { \bigint_eval:n {#2} }
+ \str_if_eq:eeTF {#1} { \bigint_eval:n {#2} }
{ \@@_case_end:nw {#3} }
{ \@@_case:nw {#1} }
}
@@ -2605,7 +2605,7 @@
\or: \prg_return_true:
\or:
\if_int_compare:w
- \@@_str_cmp_x:nn {#3} { 00000021 47483648 }
+ \@@_str_cmp:nn {#3} { 00000021 47483648 }
= - 1 \exp_stop_f:
\prg_return_true:
\else:
diff --git a/l3trial/l3check/l3check.dtx b/l3trial/l3check/l3check.dtx
index 0247aef..93f7d44 100644
--- a/l3trial/l3check/l3check.dtx
+++ b/l3trial/l3check/l3check.dtx
@@ -1339,7 +1339,7 @@
{
\check_is_function:N #1
\check_is_function:N #2
- \str_if_eq_x:nnF { \check_signature:N #2 } { Npn }
+ \str_if_eq:eeF { \check_signature:N #2 } { Npn }
{
\@@_error:nnnn { bad-signature }
{ \cs_generate_from_arg_count:NNnn } { Npn } {#1}
More information about the latex3-commits
mailing list