[latex3-commits] [git/LaTeX3-latex3-latex3] master: Some \str_if_eq_x:nn(TF) to simple variants (9ada3cc)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Jun 18 21:33:18 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/9ada3cc75739cbab6c35609a0f071ab766aff6a1
>---------------------------------------------------------------
commit 9ada3cc75739cbab6c35609a0f071ab766aff6a1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Jun 18 20:09:20 2018 +0100
Some \str_if_eq_x:nn(TF) to simple variants
>---------------------------------------------------------------
9ada3cc75739cbab6c35609a0f071ab766aff6a1
l3experimental/l3color/l3color.dtx | 4 ++--
l3experimental/l3str/l3str-convert.dtx | 8 ++++----
l3kernel/l3doc.dtx | 6 +++---
l3kernel/l3msg.dtx | 2 +-
l3kernel/l3prop.dtx | 6 +++---
l3kernel/l3regex.dtx | 6 +++---
l3kernel/l3sys.dtx | 6 +++---
l3kernel/l3token.dtx | 2 +-
l3trial/xfont/xfss.dtx | 2 +-
9 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/l3experimental/l3color/l3color.dtx b/l3experimental/l3color/l3color.dtx
index 83f70fb..183fa38 100644
--- a/l3experimental/l3color/l3color.dtx
+++ b/l3experimental/l3color/l3color.dtx
@@ -359,7 +359,7 @@
\cs_generate_variant:Nn \@@_convert:nnN { VV }
\cs_new_protected:Npn \@@_convert:nnnN #1#2#3#4
{
- \str_if_eq_x:nnT {#1} { spot } % TO DO!!!
+ \str_if_eq:nnT {#1} { spot } % TO DO!!!
{ }
\tl_set:Nx #4
{ \use:c { @@_convert_ #1 _ #2 :w } #3 ~ 0 ~ 0 ~ 0 \q_stop }
@@ -551,7 +551,7 @@
\@@_extract:nNN {#2} \l_@@_next_model_tl \l_@@_next_value_tl
\tl_if_eq:NNF \l_@@_model_tl \l_@@_next_model_tl
{
- \str_if_eq_x:nnT { \l_@@_model_tl } { gray }
+ \str_if_eq:VnT \l_@@_model_tl { gray }
{
\use:x
{
diff --git a/l3experimental/l3str/l3str-convert.dtx b/l3experimental/l3str/l3str-convert.dtx
index 98d71e9..4e235c7 100644
--- a/l3experimental/l3str/l3str-convert.dtx
+++ b/l3experimental/l3str/l3str-convert.dtx
@@ -2257,10 +2257,10 @@
}
\cs_new_protected:Npn \@@_decode_utf_xvi_bom:NN #1#2
{
- \str_if_eq_x:nnTF { #1#2 } { ^^ff ^^fe }
+ \str_if_eq:nnTF { #1#2 } { ^^ff ^^fe }
{ \@@_decode_utf_xvi:Nw 2 }
{
- \str_if_eq_x:nnTF { #1#2 } { ^^fe ^^ff }
+ \str_if_eq:nnTF { #1#2 } { ^^fe ^^ff }
{ \@@_decode_utf_xvi:Nw 1 }
{ \@@_decode_utf_xvi:Nw 1 #1#2 }
}
@@ -2548,10 +2548,10 @@
}
\cs_new_protected:Npn \@@_decode_utf_xxxii_bom:NNNN #1#2#3#4
{
- \str_if_eq_x:nnTF { #1#2#3#4 } { ^^ff ^^fe ^^00 ^^00 }
+ \str_if_eq:nnTF { #1#2#3#4 } { ^^ff ^^fe ^^00 ^^00 }
{ \@@_decode_utf_xxxii:Nw 2 }
{
- \str_if_eq_x:nnTF { #1#2#3#4 } { ^^00 ^^00 ^^fe ^^ff }
+ \str_if_eq:nnTF { #1#2#3#4 } { ^^00 ^^00 ^^fe ^^ff }
{ \@@_decode_utf_xxxii:Nw 1 }
{ \@@_decode_utf_xxxii:Nw 1 #1#2#3#4 }
}
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index d8346b8..9122a59 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -2191,7 +2191,7 @@ and all files in that bundle must be distributed together.
\tl_greplace_all:Nno \g_@@_base_name_tl
{ ~ } { \c_catcode_other_space_tl }
\seq_get:NN #1 \l_@@_tmpa_tl
- \str_if_eq_x:nnTF { \l_@@_tmpa_tl } { \scan_stop: }
+ \str_if_eq:VnTF \l_@@_tmpa_tl { \scan_stop: }
{
\seq_gclear:N \g_@@_variants_seq
\@@_names_typeset_auxii:x { \g_@@_base_name_tl }
@@ -2296,7 +2296,7 @@ and all files in that bundle must be distributed together.
#1
{
\l_@@_tmpa_tl
- \str_if_eq_x:nnF { \l_@@_tmpb_tl } { \scan_stop: }
+ \str_if_eq:VnF \l_@@_tmpb_tl { \scan_stop: }
{ : \l_@@_tmpb_tl }
\bool_if:NT \l_@@_macro_TF_bool { TF }
}
@@ -3983,7 +3983,7 @@ and all files in that bundle must be distributed together.
\tl_if_empty:nTF {#3}
{ { } { } { } }
{
- \str_if_eq_x:nnTF {#3} { TeX }
+ \str_if_eq:nnTF {#3} { TeX }
{
{ TeX~and~LaTeX2e }
{ \string\TeX{}~and~\string\LaTeXe{} }
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 1bfa2be..e4a7a54 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -1429,7 +1429,7 @@
\seq_put_right:Nn \l_@@_class_loop_seq {#1}
\prop_get:cnNT { l_@@_redirect_ #1 _prop } {#3} \l_@@_class_tl
{
- \str_if_eq_x:nnF { \l_@@_class_tl } {#1}
+ \str_if_eq:VnF \l_@@_class_tl {#1}
{
\tl_if_eq:NNTF \l_@@_class_tl \l_@@_current_class_tl
{
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index f31874d..9c6c4e6 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -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_x:nn}, which is expandable. To terminate the mapping,
+% \cs{str_if_eq:nn}, 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_x:nn}. It cannot make the breaking
+% included in the \cs{str_if_eq:nn}. 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_x:nnTF {#1} {#3}
+ \str_if_eq:nnTF {#1} {#3}
{ \@@_if_in:N }
{ \@@_if_in:nwwn {#1} }
}
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index ef665de..7f452ee 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -1612,7 +1612,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_escape_x_test:N #1
{
- \str_if_eq_x:nnTF {#1} { break } { ; }
+ \str_if_eq:nnTF {#1} { break } { ; }
{
\if_charcode:w \c_space_token #1
\exp_after:wN \@@_escape_x_test:N
@@ -1640,7 +1640,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_escape_x:N #1
{
- \str_if_eq_x:nnTF {#1} { break } { ; }
+ \str_if_eq:nnTF {#1} { break } { ; }
{
\@@_hexadecimal_use:NTF #1
{ ; \@@_escape_loop:N }
@@ -1657,7 +1657,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_escape_x_loop:N #1
{
- \str_if_eq_x:nnTF {#1} { break }
+ \str_if_eq:nnTF {#1} { break }
{ ; \@@_escape_x_loop_error:n { } {#1} }
{
\@@_hexadecimal_use:NTF #1
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index 35e352e..9191c2e 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -237,7 +237,7 @@
\tl_map_inline:nn { { luatex } { pdftex } { ptex } { uptex } { xetex } }
{
\@@_const:nn { sys_if_engine_ #1 }
- { \str_if_eq_x_p:nn \c_sys_engine_str {#1} }
+ { \str_if_eq_p:Vn \c_sys_engine_str {#1} }
}
% \end{macrocode}
% \end{variable}
@@ -261,9 +261,9 @@
{ dvi }
}
\@@_const:nn { sys_if_output_dvi }
- { \str_if_eq_x_p:nn \c_sys_output_str { dvi } }
+ { \str_if_eq_p:Vn \c_sys_output_str { dvi } }
\@@_const:nn { sys_if_output_pdf }
- { \str_if_eq_x_p:nn \c_sys_output_str { pdf } }
+ { \str_if_eq_p:Vn \c_sys_output_str { pdf } }
% \end{macrocode}
% \end{variable}
% \end{macro}
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index 9da2ac6..9f3bb46 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1855,7 +1855,7 @@
##1 \tl_to_str:n { ma } ##2 \c_colon_str ##3 \exp_not:N \q_stop
}
{
- \str_if_eq_x:nnTF { #2 } { cro }
+ \str_if_eq:nnTF { #2 } { cro }
{ \prg_return_true: }
{ \prg_return_false: }
}
diff --git a/l3trial/xfont/xfss.dtx b/l3trial/xfont/xfss.dtx
index 1c3515e..e58a6c5 100644
--- a/l3trial/xfont/xfss.dtx
+++ b/l3trial/xfont/xfss.dtx
@@ -696,7 +696,7 @@
\msg_new:nnnn {xfss} {invalid-in-math}
{Command \token_to_str:N #1 \ invalid in math mode}
{%
- \str_if_eq_x:nnTF {\exp_not:N #1} { \relax }
+ \str_if_eq:onTF {\exp_not:N #1} { \relax }
{%
Please define a new math alphabet
if you want to use a special font in math mode%
More information about the latex3-commits
mailing list