[latex3-commits] [git/LaTeX3-latex3-latex3] master: Reimplement the ignore_spaces peek functions in terms of peek_spaces_remove (4f5c84c)
Bruno Le Floch
bruno at le-floch.fr
Mon Oct 1 15:15:31 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/4f5c84ca0544989118ef4ede8d63f0d4f4a634d4
>---------------------------------------------------------------
commit 4f5c84ca0544989118ef4ede8d63f0d4f4a634d4
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Mon Oct 1 15:15:31 2018 +0200
Reimplement the ignore_spaces peek functions in terms of peek_spaces_remove
No change in behaviour, hence no "updated" date
>---------------------------------------------------------------
4f5c84ca0544989118ef4ede8d63f0d4f4a634d4
l3kernel/l3candidates.dtx | 23 ----
l3kernel/l3token.dtx | 194 +++++++++++++------------------
l3kernel/testfiles/m3expl001.luatex.tlg | 35 +++---
l3kernel/testfiles/m3expl001.ptex.tlg | 35 +++---
l3kernel/testfiles/m3expl001.tlg | 35 +++---
l3kernel/testfiles/m3expl001.uptex.tlg | 35 +++---
l3kernel/testfiles/m3expl001.xetex.tlg | 35 +++---
l3kernel/testfiles/m3expl003.luatex.tlg | 35 +++---
l3kernel/testfiles/m3expl003.ptex.tlg | 35 +++---
l3kernel/testfiles/m3expl003.tlg | 35 +++---
l3kernel/testfiles/m3expl003.uptex.tlg | 35 +++---
l3kernel/testfiles/m3expl003.xetex.tlg | 35 +++---
12 files changed, 249 insertions(+), 318 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index c3e4e42..d32a391 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -5342,29 +5342,6 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\peek_spaces_remove:n, \@@_spaces_remove:}
-% 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_set:Npx \@@_false:w { \exp_not:n {#1} }
- \group_align_safe_begin:
- \cs_set:Npn \@@_true_aux:w { \peek_after:Nw \@@_spaces_remove: }
- \@@_true_aux:w
- }
-\cs_new_protected:Npn \@@_spaces_remove:
- {
- \if_meaning:w \l_peek_token \c_space_token
- \exp_after:wN \@@_true_remove:w
- \else:
- \group_align_safe_end:
- \exp_after:wN \@@_false:w
- \fi:
- }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index b5ed9de..b8b0450 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -2234,6 +2234,29 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\peek_spaces_remove:n, \@@_spaces_remove:}
+% 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_set:Npx \@@_false:w { \exp_not:n {#1} }
+ \group_align_safe_begin:
+ \cs_set:Npn \@@_true_aux:w { \peek_after:Nw \@@_spaces_remove: }
+ \@@_true_aux:w
+ }
+\cs_new_protected:Npn \@@_spaces_remove:
+ {
+ \if_meaning:w \l_peek_token \c_space_token
+ \exp_after:wN \@@_true_remove:w
+ \else:
+ \group_align_safe_end:
+ \exp_after:wN \@@_false:w
+ \fi:
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@@_token_generic_aux:NNNTF}
% The generic functions store the test token in both implicit and
% explicit modes, and the \texttt{true} and \texttt{false} code as
@@ -2366,131 +2389,72 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@@_ignore_spaces_execute_branches:}
-% This function removes one space token at a time, and calls
-% \cs{@@_execute_branches:} when encountering the first non-space
-% token. We directly use the primitive meaning test rather than
-% \cs{token_if_eq_meaning:NNTF} because \cs{l_peek_token} may be an
-% outer macro (coming from non-\LaTeX3 packages). Spaces are removed
-% using a side-effect of \texttt{f}-expansion:
-% |\exp:w \exp_end_continue_f:w| removes one space.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_ignore_spaces_execute_branches:
- {
- \if_meaning:w \l_peek_token \c_space_token
- \exp_after:wN \peek_after:Nw
- \exp_after:wN \@@_ignore_spaces_execute_branches:
- \exp:w \exp_end_continue_f:w
- \else:
- \exp_after:wN \@@_execute_branches:
- \fi:
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_def:nnnn}
-% \begin{macro}{\@@_def:nnnnn}
-% The public functions themselves cannot be defined using
-% \cs{prg_new_conditional:Npnn} and so a couple of auxiliary functions
-% are used. As a result, everything is done inside a group. As a result
-% things are a bit complicated.
-% \begin{macrocode}
-\group_begin:
- \cs_set:Npn \@@_def:nnnn #1#2#3#4
- {
- \@@_def:nnnnn {#1} {#2} {#3} {#4} { TF }
- \@@_def:nnnnn {#1} {#2} {#3} {#4} { T }
- \@@_def:nnnnn {#1} {#2} {#3} {#4} { F }
- }
- \cs_set:Npn \@@_def:nnnnn #1#2#3#4#5
- {
- \cs_new_protected:cpx { #1 #5 }
- {
- \tl_if_empty:nF {#2}
- { \exp_not:n { \cs_set_eq:NN \@@_execute_branches: #2 } }
- \exp_not:c { #3 #5 }
- \exp_not:n {#4}
- }
- }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{macro}[TF]
% {
-% \peek_catcode:N, \peek_catcode_ignore_spaces:N,
-% \peek_catcode_remove:N, \peek_catcode_remove_ignore_spaces:N
+% \peek_catcode:N,
+% \peek_catcode_remove:N,
+% \peek_charcode:N,
+% \peek_charcode_remove:N,
+% \peek_meaning:N,
+% \peek_meaning_remove:N,
% }
-% With everything in place the definitions can take place. First for
-% category codes.
-% \begin{macrocode}
- \@@_def:nnnn { peek_catcode:N }
- { }
- { @@_token_generic:NN }
- { \@@_execute_branches_catcode: }
- \@@_def:nnnn { peek_catcode_ignore_spaces:N }
- { \@@_execute_branches_catcode: }
- { @@_token_generic:NN }
- { \@@_ignore_spaces_execute_branches: }
- \@@_def:nnnn { peek_catcode_remove:N }
- { }
- { @@_token_remove_generic:NN }
- { \@@_execute_branches_catcode: }
- \@@_def:nnnn { peek_catcode_remove_ignore_spaces:N }
- { \@@_execute_branches_catcode: }
- { @@_token_remove_generic:NN }
- { \@@_ignore_spaces_execute_branches: }
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}[TF]
-% {
-% \peek_charcode:N, \peek_charcode_ignore_spaces:N,
-% \peek_charcode_remove:N, \peek_charcode_remove_ignore_spaces:N
-% }
-% Then for character codes.
+% The public functions themselves cannot be defined using
+% \cs{prg_new_conditional:Npnn}. Instead, the |TF|, |T|, |F| variants
+% are defined in terms of corresponding variants of
+% \cs{@@_token_generic:NNTF} or \cs{@@_token_remove_generic:NNTF},
+% with first argument one of \cs{@@_execute_branches_catcode:},
+% \cs{@@_execute_branches_charcode:}, or
+% \cs{@@_execute_branches_meaning:}.
% \begin{macrocode}
- \@@_def:nnnn { peek_charcode:N }
- { }
- { @@_token_generic:NN }
- { \@@_execute_branches_charcode: }
- \@@_def:nnnn { peek_charcode_ignore_spaces:N }
- { \@@_execute_branches_charcode: }
- { @@_token_generic:NN }
- { \@@_ignore_spaces_execute_branches: }
- \@@_def:nnnn { peek_charcode_remove:N }
- { }
- { @@_token_remove_generic:NN }
- { \@@_execute_branches_charcode: }
- \@@_def:nnnn { peek_charcode_remove_ignore_spaces:N }
- { \@@_execute_branches_charcode: }
- { @@_token_remove_generic:NN }
- { \@@_ignore_spaces_execute_branches: }
+\tl_map_inline:nn { { catcode } { charcode } { meaning } }
+ {
+ \tl_map_inline:nn { { } { _remove } }
+ {
+ \tl_map_inline:nn { { TF } { T } { F } }
+ {
+ \cs_new_protected:cpx { peek_ #1 ##1 :N ####1 }
+ {
+ \exp_not:c { @@_token ##1 _generic:NN ####1 }
+ \exp_not:c { @@_execute_branches_ #1 : }
+ }
+ }
+ }
+ }
% \end{macrocode}
% \end{macro}
+%
% \begin{macro}[TF]
% {
-% \peek_meaning:N, \peek_meaning_ignore_spaces:N,
-% \peek_meaning_remove:N, \peek_meaning_remove_ignore_spaces:N
+% \peek_catcode_ignore_spaces:N, \peek_catcode_remove_ignore_spaces:N,
+% \peek_charcode_ignore_spaces:N, \peek_charcode_remove_ignore_spaces:N,
+% \peek_meaning_ignore_spaces:N, \peek_meaning_remove_ignore_spaces:N
% }
-% Finally for meaning, with the group closed to remove the temporary
-% definition functions.
+% To ignore spaces, remove them using \cs{peek_spaces_remove:n}
+% before running the tests.
% \begin{macrocode}
- \@@_def:nnnn { peek_meaning:N }
- { }
- { @@_token_generic:NN }
- { \@@_execute_branches_meaning: }
- \@@_def:nnnn { peek_meaning_ignore_spaces:N }
- { \@@_execute_branches_meaning: }
- { @@_token_generic:NN }
- { \@@_ignore_spaces_execute_branches: }
- \@@_def:nnnn { peek_meaning_remove:N }
- { }
- { @@_token_remove_generic:NN }
- { \@@_execute_branches_meaning: }
- \@@_def:nnnn { peek_meaning_remove_ignore_spaces:N }
- { \@@_execute_branches_meaning: }
- { @@_token_remove_generic:NN }
- { \@@_ignore_spaces_execute_branches: }
-\group_end:
+\tl_map_inline:nn
+ {
+ { catcode } { catcode_remove }
+ { charcode } { charcode_remove }
+ { meaning } { meaning_remove }
+ }
+ {
+ \cs_new_protected:cpx { peek_#1_ignore_spaces:NTF } ##1##2##3
+ {
+ \peek_spaces_remove: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
+ { \exp_not:c { peek_#1:NT } ##1 {##2} }
+ }
+ \cs_new_protected:cpx { peek_#1_ignore_spaces:NF } ##1##2
+ {
+ \peek_spaces_remove:n
+ { \exp_not:c { peek_#1:NF } ##1 {##2} }
+ }
+ }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index de3ad4a..1bb4dc0 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2210,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2223,40 +2225,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6092,8 +6093,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 91a5bdb..e32819e 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2502,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2515,40 +2517,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6129,8 +6130,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index de46308..c62a485 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2502,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2515,40 +2517,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6330,8 +6331,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 2b12709..86fa388 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2502,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2515,40 +2517,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6327,8 +6328,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 6de4b9d..dd22d9a 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2247,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2260,40 +2262,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6096,8 +6097,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index de3ad4a..1bb4dc0 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2210,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2223,40 +2225,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6092,8 +6093,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 91a5bdb..e32819e 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2502,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2515,40 +2517,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6129,8 +6130,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index de46308..c62a485 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2502,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2515,40 +2517,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6330,8 +6331,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 2b12709..86fa388 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2502,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2515,40 +2517,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6327,8 +6328,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 6de4b9d..dd22d9a 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2247,6 +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_token_generic_aux:NNNTF on line ...
Defining \__peek_token_generic:NNTF on line ...
Defining \__peek_token_generic:NNT on line ...
@@ -2260,40 +2262,39 @@ Defining \__peek_execute_branches_charcode: on line ...
Defining \__peek_execute_branches_catcode_aux: on line ...
Defining \__peek_execute_branches_catcode_auxii:N on line ...
Defining \__peek_execute_branches_catcode_auxiii: on line ...
-Defining \__peek_ignore_spaces_execute_branches: on line ...
Defining \peek_catcode:NTF on line ...
Defining \peek_catcode:NT on line ...
Defining \peek_catcode:NF on line ...
-Defining \peek_catcode_ignore_spaces:NTF on line ...
-Defining \peek_catcode_ignore_spaces:NT on line ...
-Defining \peek_catcode_ignore_spaces:NF on line ...
Defining \peek_catcode_remove:NTF on line ...
Defining \peek_catcode_remove:NT on line ...
Defining \peek_catcode_remove:NF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_catcode_remove_ignore_spaces:NT on line ...
-Defining \peek_catcode_remove_ignore_spaces:NF on line ...
Defining \peek_charcode:NTF on line ...
Defining \peek_charcode:NT on line ...
Defining \peek_charcode:NF on line ...
-Defining \peek_charcode_ignore_spaces:NTF on line ...
-Defining \peek_charcode_ignore_spaces:NT on line ...
-Defining \peek_charcode_ignore_spaces:NF on line ...
Defining \peek_charcode_remove:NTF on line ...
Defining \peek_charcode_remove:NT on line ...
Defining \peek_charcode_remove:NF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
-Defining \peek_charcode_remove_ignore_spaces:NT on line ...
-Defining \peek_charcode_remove_ignore_spaces:NF on line ...
Defining \peek_meaning:NTF on line ...
Defining \peek_meaning:NT on line ...
Defining \peek_meaning:NF on line ...
-Defining \peek_meaning_ignore_spaces:NTF on line ...
-Defining \peek_meaning_ignore_spaces:NT on line ...
-Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove:NTF on line ...
Defining \peek_meaning_remove:NT on line ...
Defining \peek_meaning_remove:NF on line ...
+Defining \peek_catcode_ignore_spaces:NTF on line ...
+Defining \peek_catcode_ignore_spaces:NT on line ...
+Defining \peek_catcode_ignore_spaces:NF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_catcode_remove_ignore_spaces:NT on line ...
+Defining \peek_catcode_remove_ignore_spaces:NF on line ...
+Defining \peek_charcode_ignore_spaces:NTF on line ...
+Defining \peek_charcode_ignore_spaces:NT on line ...
+Defining \peek_charcode_ignore_spaces:NF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NTF on line ...
+Defining \peek_charcode_remove_ignore_spaces:NT on line ...
+Defining \peek_charcode_remove_ignore_spaces:NF on line ...
+Defining \peek_meaning_ignore_spaces:NTF on line ...
+Defining \peek_meaning_ignore_spaces:NT on line ...
+Defining \peek_meaning_ignore_spaces:NF on line ...
Defining \peek_meaning_remove_ignore_spaces:NTF on line ...
Defining \peek_meaning_remove_ignore_spaces:NT on line ...
Defining \peek_meaning_remove_ignore_spaces:NF on line ...
@@ -6096,8 +6097,6 @@ Defining \__peek_collect:NNn on line ...
Defining \__peek_collect_true:w on line ...
Defining \__peek_collect:N on line ...
Defining \__peek_collect_remove:nw on line ...
-Defining \peek_spaces_remove:n on line ...
-Defining \__peek_spaces_remove: on line ...
Defining \__kernel_deprecation_error:Nnn on line ...
Defining \__deprecation_primitive:NN on line ...
Defining \__deprecation_primitive:w on line ...
More information about the latex3-commits
mailing list