[latex3-commits] [git/LaTeX3-latex3-latex3] master: Rename \peek_spaces_remove:n to \peek_remove_spaces:n (e13937c)
Bruno Le Floch
bruno at le-floch.fr
Mon Oct 1 22:17:01 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/e13937cf2dbb79eb4ef888dfe48b9de8b4c0f83c
>---------------------------------------------------------------
commit e13937cf2dbb79eb4ef888dfe48b9de8b4c0f83c
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Mon Oct 1 22:17:01 2018 +0200
Rename \peek_spaces_remove:n to \peek_remove_spaces:n
>---------------------------------------------------------------
e13937cf2dbb79eb4ef888dfe48b9de8b4c0f83c
l3kernel/CHANGELOG.md | 2 +-
l3kernel/l3candidates.dtx | 4 ++--
l3kernel/l3token.dtx | 16 ++++++++--------
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 ++--
l3kernel/testfiles/m3peek001.lvt | 10 +++++-----
l3kernel/testfiles/m3peek001.tlg | 2 +-
l3packages/xparse/xparse.dtx | 2 +-
16 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 0893eef..1262c4b 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -10,7 +10,7 @@ this project uses date-based 'snapshot' version identifiers.
### Added
- `\g_msg_module_documentation_prop` (see #471)
-- `\peek_spaces_remove:n`
+- `\peek_remove_spaces:n`
### Fixed
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index d32a391..2bb0d20 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1500,9 +1500,9 @@
% \end{verbatim}
% \end{function}
%
-% \begin{function}[added = 2018-10-01]{\peek_spaces_remove:n}
+% \begin{function}[added = 2018-10-01]{\peek_remove_spaces:n}
% \begin{syntax}
-% \cs{peek_spaces_remove:n} \Arg{code}
+% \cs{peek_remove_spaces:n} \Arg{code}
% \end{syntax}
% Removes explicit and implicit space tokens (category code~$10$ and
% character code~$32$) from the input stream, then inserts \meta{code}.
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index b8b0450..2e3d004 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -2234,18 +2234,18 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\peek_spaces_remove:n, \@@_spaces_remove:}
+% \begin{macro}{\peek_remove_spaces:n, \@@_remove_spaces:}
% Repeatedly use \cs{@@_true_remove:w} to remove a space and call
% \cs{@@_true_aux:w}.
% \begin{macrocode}
-\cs_new_protected:Npn \peek_spaces_remove:n #1
+\cs_new_protected:Npn \peek_remove_spaces:n #1
{
\cs_set:Npx \@@_false:w { \exp_not:n {#1} }
\group_align_safe_begin:
- \cs_set:Npn \@@_true_aux:w { \peek_after:Nw \@@_spaces_remove: }
+ \cs_set:Npn \@@_true_aux:w { \peek_after:Nw \@@_remove_spaces: }
\@@_true_aux:w
}
-\cs_new_protected:Npn \@@_spaces_remove:
+\cs_new_protected:Npn \@@_remove_spaces:
{
\if_meaning:w \l_peek_token \c_space_token
\exp_after:wN \@@_true_remove:w
@@ -2429,7 +2429,7 @@
% \peek_charcode_ignore_spaces:N, \peek_charcode_remove_ignore_spaces:N,
% \peek_meaning_ignore_spaces:N, \peek_meaning_remove_ignore_spaces:N
% }
-% To ignore spaces, remove them using \cs{peek_spaces_remove:n}
+% To ignore spaces, remove them using \cs{peek_remove_spaces:n}
% before running the tests.
% \begin{macrocode}
\tl_map_inline:nn
@@ -2441,17 +2441,17 @@
{
\cs_new_protected:cpx { peek_#1_ignore_spaces:NTF } ##1##2##3
{
- \peek_spaces_remove:n
+ \peek_remove_spaces:n
{ \exp_not:c { peek_#1:NTF } ##1 {##2} {##3} }
}
\cs_new_protected:cpx { peek_#1_ignore_spaces:NT } ##1##2
{
- \peek_spaces_remove:n
+ \peek_remove_spaces:n
{ \exp_not:c { peek_#1:NT } ##1 {##2} }
}
\cs_new_protected:cpx { peek_#1_ignore_spaces:NF } ##1##2
{
- \peek_spaces_remove:n
+ \peek_remove_spaces:n
{ \exp_not:c { peek_#1:NF } ##1 {##2} }
}
}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 1bb4dc0..da07929 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2210,8 +2210,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index e32819e..1c72382 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2502,8 +2502,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index c62a485..c28b038 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2502,8 +2502,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 86fa388..2b3ef5c 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2502,8 +2502,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index dd22d9a..a7313ad 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2247,8 +2247,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 1bb4dc0..da07929 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2210,8 +2210,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index e32819e..1c72382 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2502,8 +2502,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index c62a485..c28b038 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2502,8 +2502,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 86fa388..2b3ef5c 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2502,8 +2502,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index dd22d9a..a7313ad 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2247,8 +2247,8 @@ Defining \__peek_tmp:w on line ...
Defining \peek_after:Nw on line ...
Defining \peek_gafter:Nw on line ...
Defining \__peek_true_remove:w on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
+Defining \peek_remove_spaces:n on line ...
+Defining \__peek_remove_spaces: on line ...
Defining \__peek_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
diff --git a/l3kernel/testfiles/m3peek001.lvt b/l3kernel/testfiles/m3peek001.lvt
index 3d5099b..5105a80 100644
--- a/l3kernel/testfiles/m3peek001.lvt
+++ b/l3kernel/testfiles/m3peek001.lvt
@@ -204,12 +204,12 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\char_set_lccode:nn { 32 } { `* }
-\TEST { peek_spaces_remove }
+\TEST { peek_remove_spaces }
{
- \use:n { \peek_spaces_remove:n { \tl_show:n } ~ \c_space_token } ~ \c_space_tl
- \if_false: { \fi: \peek_spaces_remove:n { \exp_after:wN \tl_show:n \token_to_str:N } }
- \use:x { \peek_spaces_remove:n { \tex_show:D } \c_catcode_other_space_tl }
- \tex_lowercase:D { \peek_spaces_remove:n { \tex_show:D } ~ }
+ \use:n { \peek_remove_spaces:n { \tl_show:n } ~ \c_space_token } ~ \c_space_tl
+ \if_false: { \fi: \peek_remove_spaces:n { \exp_after:wN \tl_show:n \token_to_str:N } }
+ \use:x { \peek_remove_spaces:n { \tex_show:D } \c_catcode_other_space_tl }
+ \tex_lowercase:D { \peek_remove_spaces:n { \tex_show:D } ~ }
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/l3kernel/testfiles/m3peek001.tlg b/l3kernel/testfiles/m3peek001.tlg
index 8974b97..4a8241a 100644
--- a/l3kernel/testfiles/m3peek001.tlg
+++ b/l3kernel/testfiles/m3peek001.tlg
@@ -202,7 +202,7 @@ TEST 10: peek collect
|\c_group_end_token \c_group_end_token \c_group_end_token |\a |
============================================================
============================================================
-TEST 11: peek_spaces_remove
+TEST 11: peek_remove_spaces
============================================================
> \c_space_tl .
<recently read> }
diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index 8fcba73..f232cba 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -3133,7 +3133,7 @@
\group_align_safe_begin:
\tex_escapechar:D = 92 \scan_stop:
\tl_clear:N \l_@@_v_arg_tl
- \peek_spaces_remove:n
+ \peek_remove_spaces:n
{
\peek_meaning_remove:NTF \c_group_begin_token
{
More information about the latex3-commits
mailing list