[latex3-commits] [git/LaTeX3-latex3-latex3] master: Rename new \tl_trim_spaces:nN to \tl_trim_spaces_apply:nN (18646a0)
Bruno Le Floch
bruno at le-floch.fr
Thu Apr 12 16:35:19 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/18646a09fd0f00900375b3d06268464129873b03
>---------------------------------------------------------------
commit 18646a09fd0f00900375b3d06268464129873b03
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Thu Apr 12 10:34:15 2018 -0400
Rename new \tl_trim_spaces:nN to \tl_trim_spaces_apply:nN
>---------------------------------------------------------------
18646a09fd0f00900375b3d06268464129873b03
l3kernel/l3clist.dtx | 6 +++---
l3kernel/l3keys.dtx | 5 ++++-
l3kernel/l3prop.dtx | 2 +-
l3kernel/l3tl.dtx | 19 ++++++++++---------
l3kernel/testfiles/m3expl001.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.tlg | 4 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.tlg | 4 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 4 ++--
l3packages/xparse/xparse.dtx | 4 ++--
l3trial/l3str-format-new/l3str-format-new.dtx | 2 +-
16 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index eed80e1..48fe785 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -929,8 +929,8 @@
% \begin{macrocode}
\cs_new:Npn \@@_trim_spaces_generic:nw #1#2 ,
{
- \tl_trim_spaces:oN { \use_none:n #2 }
- { \@@_trim_spaces_generic:nn } {#1}
+ \tl_trim_spaces_apply:oN { \use_none:n #2 }
+ \@@_trim_spaces_generic:nn {#1}
}
\cs_new:Npn \@@_trim_spaces_generic:nn #1#2 { #2 {#1} }
% \end{macrocode}
@@ -1800,7 +1800,7 @@
}
}
\cs_new:Npn \@@_item_n_end:n #1 #2 \q_stop
- { \tl_trim_spaces:nN {#1} { \@@_item_n_strip:n } }
+ { \tl_trim_spaces_apply:nN {#1} \@@_item_n_strip:n }
\cs_new:Npn \@@_item_n_strip:n #1 { \@@_item_n_strip:w #1 , }
\cs_new:Npn \@@_item_n_strip:w #1 , { \exp_not:n {#1} }
% \end{macrocode}
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 4009970..8beab59 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1090,7 +1090,10 @@
% a set of braces.
% \begin{macrocode}
\cs_new_protected:Npn \@@_def:Nn #1#2
- { \tl_set:Nx #1 { \tl_trim_spaces:oN { \use_none:n #2 } \@@_def_aux:n } }
+ {
+ \tl_set:Nx #1
+ { \tl_trim_spaces_apply:oN { \use_none:n #2 } \@@_def_aux:n }
+ }
\cs_new:Npn \@@_def_aux:n #1
{ \@@_def_aux:w #1 \q_stop }
\cs_new:Npn \@@_def_aux:w #1 \q_stop { \exp_not:n {#1} }
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index ea1fb04..f8c953a 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -675,7 +675,7 @@
}
\cs_new:Npn \@@_from_keyval_split:Nw #1#2 =
{
- \tl_trim_spaces:oN { \use_none:n #2 } #1
+ \tl_trim_spaces_apply:oN { \use_none:n #2 } #1
\q_nil
}
\cs_new:Npn \@@_from_keyval_key:n #1
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index b6b85ac..61f189a 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -769,14 +769,15 @@
% \end{texnote}
% \end{function}
%
-% \begin{function}[added = 2018-03-29, EXP]
-% {\tl_trim_spaces:nN, \tl_trim_spaces:oN}
+% \begin{function}[added = 2018-04-12, EXP]
+% {\tl_trim_spaces_apply:nN, \tl_trim_spaces_apply:oN}
% \begin{syntax}
-% \cs{tl_trim_spaces:nN} \Arg{token list} \meta{function}
+% \cs{tl_trim_spaces_apply:nN} \Arg{token list} \meta{function}
% \end{syntax}
-% Removes any leading and trailing explicit space characters
-% (explicit tokens with character code~$32$ and category code~$10$)
-% from the \meta{token list} and passes the result to the \meta{function}.
+% Removes any leading and trailing explicit space characters (explicit
+% tokens with character code~$32$ and category code~$10$) from the
+% \meta{token list} and passes the result to the \meta{function} as an
+% \texttt{n}-type argument.
% \end{function}
%
% \begin{function}[added = 2011-07-09]
@@ -2367,7 +2368,7 @@
% \end{macro}
%
% \begin{macro}{\tl_trim_spaces:n, \tl_trim_spaces:o}
-% \begin{macro}{\tl_trim_spaces:nN, \tl_trim_spaces:oN}
+% \begin{macro}{\tl_trim_spaces_apply:nN, \tl_trim_spaces_apply:oN}
% \begin{macro}
% {
% \tl_trim_spaces:N, \tl_trim_spaces:c,
@@ -2384,9 +2385,9 @@
\cs_new:Npn \tl_trim_spaces:n #1
{ \@@_trim_spaces:nn { \q_mark #1 } \exp_not:o }
\cs_generate_variant:Nn \tl_trim_spaces:n { o }
-\cs_new:Npn \tl_trim_spaces:nN #1#2
+\cs_new:Npn \tl_trim_spaces_apply:nN #1#2
{ \@@_trim_spaces:nn { \q_mark #1 } { \exp_args:No #2 } }
-\cs_generate_variant:Nn \tl_trim_spaces:nN { o }
+\cs_generate_variant:Nn \tl_trim_spaces_apply:nN { o }
\cs_new_protected:Npn \tl_trim_spaces:N #1
{ \tl_set:Nx #1 { \exp_args:No \tl_trim_spaces:n {#1} } }
\cs_new_protected:Npn \tl_gtrim_spaces:N #1
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 30d557c..07d4f43 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -535,8 +535,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 966aedd..8579d73 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -534,8 +534,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 4bcad71..ef9f9d6 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -534,8 +534,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 3bc0d73..867c0ff 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -534,8 +534,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index ce74212..5012194 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -534,8 +534,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 30d557c..07d4f43 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -535,8 +535,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 966aedd..8579d73 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -534,8 +534,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 4bcad71..ef9f9d6 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -534,8 +534,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 3bc0d73..867c0ff 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -534,8 +534,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index ce74212..5012194 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -534,8 +534,8 @@ Defining \__tl_reverse_items:nwNwn on line ...
Defining \__tl_reverse_items:wn on line ...
Defining \tl_trim_spaces:n on line ...
Defining \tl_trim_spaces:o on line ...
-Defining \tl_trim_spaces:nN on line ...
-Defining \tl_trim_spaces:oN on line ...
+Defining \tl_trim_spaces_apply:nN on line ...
+Defining \tl_trim_spaces_apply:oN on line ...
Defining \tl_trim_spaces:N on line ...
Defining \tl_gtrim_spaces:N on line ...
Defining \tl_trim_spaces:c on line ...
diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index e023e95..d5e8053 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -1813,7 +1813,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_single_char_check:n #1
{
- \exp_args:Nx \tl_if_single_token:nTF { \tl_trim_spaces:n {#1} }
+ \tl_trim_spaces_apply:nN {#1} \tl_if_single_token:nTF
{
\group_begin:
\tex_escapechar:D = 92 \scan_stop:
@@ -3915,7 +3915,7 @@
% local must be closed.
% \begin{macrocode}
\cs_new_protected:Npn \@@_check_definable:nNT #1
- { \exp_args:Nx \@@_check_definable_aux:nN { \tl_trim_spaces:n {#1} } }
+ { \tl_trim_spaces_apply:nN {#1} \@@_check_definable_aux:nN }
\group_begin:
\char_set_catcode_active:n { `? }
\cs_new_protected:Npn \@@_check_definable_aux:nN #1#2
diff --git a/l3trial/l3str-format-new/l3str-format-new.dtx b/l3trial/l3str-format-new/l3str-format-new.dtx
index 9e9ac49..98dfc56 100644
--- a/l3trial/l3str-format-new/l3str-format-new.dtx
+++ b/l3trial/l3str-format-new/l3str-format-new.dtx
@@ -303,7 +303,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_format_keyval_strip_do:nn #1
{
- \tl_trim_spaces:oN { \use_none:n #1 }
+ \tl_trim_spaces_apply:oN { \use_none:n #1 }
\@@_format_keyval_strip:n
\q_stop
}
More information about the latex3-commits
mailing list