[latex3-commits] [latex3/latex3] main: Switch from x- to e-type in l3str (70b649a07)
github at latex-project.org
github at latex-project.org
Tue Oct 10 12:59:28 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/70b649a078bb6397b25535552e5c58428fc6ab47
>---------------------------------------------------------------
commit 70b649a078bb6397b25535552e5c58428fc6ab47
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Sep 26 07:27:16 2023 +0100
Switch from x- to e-type in l3str
Surprisingly easy: a lot of the work was already done in a previous commit.
>---------------------------------------------------------------
70b649a078bb6397b25535552e5c58428fc6ab47
l3experimental/l3bitset/l3bitset.dtx | 8 +++----
l3experimental/l3graphics/l3graphics.dtx | 2 +-
l3kernel/l3file.dtx | 2 +-
l3kernel/l3keys.dtx | 4 ++--
l3kernel/l3msg.dtx | 8 +++----
l3kernel/l3str-convert.dtx | 2 +-
l3kernel/l3str.dtx | 36 ++++++++++++++++----------------
l3kernel/l3sys.dtx | 14 ++++++-------
l3kernel/testfiles/m3str003.lvt | 4 ++--
l3packages/xparse/xparse.dtx | 2 +-
10 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/l3experimental/l3bitset/l3bitset.dtx b/l3experimental/l3bitset/l3bitset.dtx
index e971c43ff..40f30a5c6 100644
--- a/l3experimental/l3bitset/l3bitset.dtx
+++ b/l3experimental/l3bitset/l3bitset.dtx
@@ -337,13 +337,13 @@
% then inserting an $1$. It is not checked if the value was already $1$.
% \begin{macrocode}
\cs_new_protected:Npn \@@_set_true:Nn #1#2
- { \@@_set:NNnN \str_set:Nx #1 {#2} 1 }
+ { \@@_set:NNnN \str_set:Ne #1 {#2} 1 }
\cs_new_protected:Npn \@@_gset_true:Nn #1#2
- { \@@_set:NNnN \str_gset:Nx #1 {#2} 1 }
+ { \@@_set:NNnN \str_gset:Ne #1 {#2} 1 }
\cs_new_protected:Npn \@@_set_false:Nn #1#2
- { \@@_set:NNnN \str_set:Nx #1 {#2} 0 }
+ { \@@_set:NNnN \str_set:Ne #1 {#2} 0 }
\cs_new_protected:Npn \@@_gset_false:Nn #1#2
- { \@@_set:NNnN \str_gset:Nx #1 {#2} 0 }
+ { \@@_set:NNnN \str_gset:Ne #1 {#2} 0 }
\cs_new_protected:Npn \@@_set:NNnN #1#2#3#4
{
\int_compare:nNnT {#3} > { 0 }
diff --git a/l3experimental/l3graphics/l3graphics.dtx b/l3experimental/l3graphics/l3graphics.dtx
index d20599258..4b5f55a64 100644
--- a/l3experimental/l3graphics/l3graphics.dtx
+++ b/l3experimental/l3graphics/l3graphics.dtx
@@ -552,7 +552,7 @@
\cs_if_exist:cTF { @@_backend_include_ #1 :n }
{
\tl_set_eq:NN \l_@@_final_name_str \l_@@_full_name_str
- \str_set:Nx \l_@@_full_name_str
+ \str_set:Ne \l_@@_full_name_str
{ \exp_args:NV \__kernel_file_name_quote:n \l_@@_full_name_str }
\exp_args:NnV \use:c { @@_backend_getbb_ #1 :n }
\l_@@_full_name_str
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 9e4ef57e0..e2687cca3 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -3983,7 +3983,7 @@
% \begin{macrocode}
\sys_if_engine_luatex:TF
{
- \str_const:Nx \c_sys_platform_str
+ \str_const:Ne \c_sys_platform_str
{ \tex_directlua:D { tex.print(os.type) } }
}
{
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index f305e6986..ecfb2d7d7 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1749,7 +1749,7 @@
\cs_generate_variant:Nn \keys_define:nn { ne , nx }
\cs_new_protected:Npn \@@_define:nnn #1#2#3
{
- \str_set:Nx \l_@@_module_str { \@@_trim_spaces:n {#2} }
+ \str_set:Ne \l_@@_module_str { \@@_trim_spaces:n {#2} }
\keyval_parse:NNn \@@_define:n \@@_define:nn {#3}
\str_set:Nn \l_@@_module_str {#1}
}
@@ -2761,7 +2761,7 @@
{ \exp_args:No \@@_set:nnn \l_@@_module_str {#1} {#2} }
\cs_new_protected:Npn \@@_set:nnn #1#2#3
{
- \str_set:Nx \l_@@_module_str { \@@_trim_spaces:n {#2} }
+ \str_set:Ne \l_@@_module_str { \@@_trim_spaces:n {#2} }
\keyval_parse:NNn \@@_set_keyval:n \@@_set_keyval:nn {#3}
\str_set:Nn \l_@@_module_str {#1}
}
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index c5b835894..9d773bc91 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -986,8 +986,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_interrupt:NnnnN #1#2#3#4#5
{
- \str_set:Nx \l_@@_text_str { #1 {#2} }
- \str_set:Nx \l_@@_name_str { \msg_module_name:n {#2} }
+ \str_set:Ne \l_@@_text_str { #1 {#2} }
+ \str_set:Ne \l_@@_name_str { \msg_module_name:n {#2} }
\cs_if_eq:cNTF
{ \c_@@_more_text_prefix_tl #2 / #3 }
\@@_no_more_text:nnnn
@@ -1452,8 +1452,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_info_aux:NNnnnnnn #1#2#3#4#5#6#7#8
{
- \str_set:Nx \l_@@_text_str { #2 {#3} }
- \str_set:Nx \l_@@_name_str { \msg_module_name:n {#3} }
+ \str_set:Ne \l_@@_text_str { #2 {#3} }
+ \str_set:Ne \l_@@_name_str { \msg_module_name:n {#3} }
#1 { }
\iow_wrap:nenN
{
diff --git a/l3kernel/l3str-convert.dtx b/l3kernel/l3str-convert.dtx
index cfad22563..18b5e437e 100644
--- a/l3kernel/l3str-convert.dtx
+++ b/l3kernel/l3str-convert.dtx
@@ -1664,7 +1664,7 @@
% (and including) \texttt{del}, are converted to octal. One backslash
% is added before each parenthesis and backslash.
% \begin{macrocode}
-\str_const:Nx \c_@@_escape_string_str
+\str_const:Ne \c_@@_escape_string_str
{ \c_backslash_str ( ) }
\cs_new_protected:Npn \@@_convert_escape_string:
{ \@@_convert_gmap:N \@@_escape_string_char:N }
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index d5412546e..eab508b3b 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1060,7 +1060,7 @@
\msg_error:nne { kernel } { empty-search-pattern } {#5}
}
{
- \use:x
+ \use:e
{
\exp_not:n { \@@_replace_aux:NNNnnn #1 #2 #3 }
{ \tl_to_str:N #3 }
@@ -1216,7 +1216,7 @@
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \str_if_in:Nn #1#2 { T , F , TF }
{
- \use:x
+ \use:e
{ \tl_if_in:nnTF { \tl_to_str:N #1 } { \tl_to_str:n {#2} } }
{ \prg_return_true: } { \prg_return_false: }
}
@@ -1224,7 +1224,7 @@
{ c } { T , F , TF }
\prg_new_protected_conditional:Npnn \str_if_in:nn #1#2 { T , F , TF }
{
- \use:x
+ \use:e
{ \tl_if_in:nnTF { \tl_to_str:n {#1} } { \tl_to_str:n {#2} } }
{ \prg_return_true: } { \prg_return_false: }
}
@@ -1370,7 +1370,7 @@
\int_gincr:N \g__kernel_prg_map_int
\cs_gset_protected:cpn
{ @@_map_ \int_use:N \g__kernel_prg_map_int :w } ##1 {#2}
- \use:x
+ \use:e
{
\exp_not:N \@@_map_inline:NN
\exp_not:c { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
@@ -1391,7 +1391,7 @@
}
\cs_new_protected:Npn \str_map_variable:nNn #1#2#3
{
- \use:x
+ \use:e
{
\exp_not:n { \@@_map_variable:NnN #2 {#3} }
\__kernel_str_to_other_fast:n {#1}
@@ -2122,19 +2122,19 @@
% For all of those strings, use \cs{cs_to_str:N} to get characters with
% the correct category code without worries
% \begin{macrocode}
-\str_const:Nx \c_ampersand_str { \cs_to_str:N \& }
-\str_const:Nx \c_atsign_str { \cs_to_str:N \@ }
-\str_const:Nx \c_backslash_str { \cs_to_str:N \\ }
-\str_const:Nx \c_left_brace_str { \cs_to_str:N \{ }
-\str_const:Nx \c_right_brace_str { \cs_to_str:N \} }
-\str_const:Nx \c_circumflex_str { \cs_to_str:N \^ }
-\str_const:Nx \c_colon_str { \cs_to_str:N \: }
-\str_const:Nx \c_dollar_str { \cs_to_str:N \$ }
-\str_const:Nx \c_hash_str { \cs_to_str:N \# }
-\str_const:Nx \c_percent_str { \cs_to_str:N \% }
-\str_const:Nx \c_tilde_str { \cs_to_str:N \~ }
-\str_const:Nx \c_underscore_str { \cs_to_str:N \_ }
-\str_const:Nx \c_zero_str { 0 }
+\str_const:Ne \c_ampersand_str { \cs_to_str:N \& }
+\str_const:Ne \c_atsign_str { \cs_to_str:N \@ }
+\str_const:Ne \c_backslash_str { \cs_to_str:N \\ }
+\str_const:Ne \c_left_brace_str { \cs_to_str:N \{ }
+\str_const:Ne \c_right_brace_str { \cs_to_str:N \} }
+\str_const:Ne \c_circumflex_str { \cs_to_str:N \^ }
+\str_const:Ne \c_colon_str { \cs_to_str:N \: }
+\str_const:Ne \c_dollar_str { \cs_to_str:N \$ }
+\str_const:Ne \c_hash_str { \cs_to_str:N \# }
+\str_const:Ne \c_percent_str { \cs_to_str:N \% }
+\str_const:Ne \c_tilde_str { \cs_to_str:N \~ }
+\str_const:Ne \c_underscore_str { \cs_to_str:N \_ }
+\str_const:Ne \c_zero_str { 0 }
% \end{macrocode}
% \end{variable}
%
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index d763903a8..86d8af2f6 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -419,7 +419,7 @@
% Set up the engine tests on the basis exactly one test should be true.
% Mainly a case of looking for the appropriate marker primitive.
% \begin{macrocode}
-\str_const:Nx \c_sys_engine_str
+\str_const:Ne \c_sys_engine_str
{
\cs_if_exist:NT \tex_luatexversion:D { luatex }
\cs_if_exist:NT \tex_pdftexversion:D { pdftex }
@@ -456,7 +456,7 @@
% \begin{macrocode}
\group_begin:
\cs_set_eq:NN \lua_now:e \tex_directlua:D
- \str_const:Nx \c_sys_engine_exec_str
+ \str_const:Ne \c_sys_engine_exec_str
{
\sys_if_engine_pdftex:T { pdf }
\sys_if_engine_xetex:T { xe }
@@ -474,7 +474,7 @@
tex
}
\group_end:
-\str_const:Nx \c_sys_engine_format_str
+\str_const:Ne \c_sys_engine_format_str
{
\cs_if_exist:NTF \fmtname
{
@@ -513,7 +513,7 @@
% Various different engines, various different ways to extract the
% data!
% \begin{macrocode}
-\str_const:Nx \c_sys_engine_version_str
+\str_const:Ne \c_sys_engine_version_str
{
\str_case:on \c_sys_engine_str
{
@@ -602,7 +602,7 @@
\tl_if_blank:nF {#1}
{ \tl_gset:Nn \g_@@_backend_tl {#1} }
\@@_load_backend_check:N \g_@@_backend_tl
- \str_const:Nx \c_sys_backend_str { \g_@@_backend_tl }
+ \str_const:Ne \c_sys_backend_str { \g_@@_backend_tl }
\__kernel_sys_configuration_load:n
{ l3backend- \c_sys_backend_str }
}
@@ -948,7 +948,7 @@ end
% \begin{macrocode}
\@@_everyjob:n
{
- \str_const:Nx \c_sys_timestamp_str
+ \str_const:Ne \c_sys_timestamp_str
{
\cs_if_exist:NTF \tex_directlua:D
{ \tex_directlua:D { tex.print(pdf.getcreationdate()) } }
@@ -1109,7 +1109,7 @@ end
% \begin{macrocode}
\@@_finalise:n
{
- \str_const:Nx \c_sys_output_str
+ \str_const:Ne \c_sys_output_str
{
\int_compare:nNnTF
{ \cs_if_exist_use:NF \tex_pdfoutput:D { 0 } } > { 0 }
diff --git a/l3kernel/testfiles/m3str003.lvt b/l3kernel/testfiles/m3str003.lvt
index 2f4289056..e8b3b22cd 100644
--- a/l3kernel/testfiles/m3str003.lvt
+++ b/l3kernel/testfiles/m3str003.lvt
@@ -62,7 +62,7 @@
\TIMO
\TEST { str_set/gset }
- { % missing test for :Nx assignments!
+ { % missing test for :Ne assignments!
{
\str_set:Nn \l_apar_str { a~#\par }
\tl_if_eq:NNTF \l_apar_str \c_apar_tl { \TRUE } { \ERROR }
@@ -223,7 +223,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\OMIT
\str_set:Nn \l_foo_str { a~b \par # }
-\str_set:Nx \l_bar_str
+\str_set:Ne \l_bar_str
{
a \c_catcode_other_space_tl b
\c_backslash_str par \c_catcode_other_space_tl
diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index 97d91fb57..596f4a791 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -1399,7 +1399,7 @@
\cs_gset_protected:Npn \@@_get_arg_spec_error:n #1
{
\bool_set_true:N \l_@@_environment_bool
- \str_set:Nx \l_@@_environment_str {#1}
+ \str_set:Ne \l_@@_environment_str {#1}
\@@_get_arg_spec_error_aux:n
{ \cs_if_exist:cTF { \l_@@_environment_str } }
}
More information about the latex3-commits
mailing list.