[latex3-commits] [git/LaTeX3-latex3-latex3] peek: Move \peek_N_type:TF to stable (ef71523)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Apr 2 11:55:06 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : peek
Link : https://github.com/latex3/latex3/commit/ef715237d71627377a40d2101189312f03a97817
>---------------------------------------------------------------
commit ef715237d71627377a40d2101189312f03a97817
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Apr 2 10:55:06 2019 +0100
Move \peek_N_type:TF to stable
>---------------------------------------------------------------
ef715237d71627377a40d2101189312f03a97817
l3kernel/CHANGELOG.md | 1 +
l3kernel/l3candidates.dtx | 91 -------------------------------
l3kernel/l3token.dtx | 91 +++++++++++++++++++++++++++++++
l3kernel/testfiles/m3expl001.luatex.tlg | 12 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 12 ++--
l3kernel/testfiles/m3expl001.tlg | 12 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 12 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 12 ++--
l3kernel/testfiles/m3expl003.luatex.tlg | 12 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 12 ++--
l3kernel/testfiles/m3expl003.tlg | 12 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 12 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 12 ++--
13 files changed, 152 insertions(+), 151 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 0251206..853202a 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -9,6 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
### Changed
+- Moved `\peek_B_type:TF` to stable
- Moved `\tl_if_single_token:n(TF)` to stable
## [2019-03-26]
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 10c1185..93e7631 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1324,26 +1324,6 @@
% and |#3| and |#4| empty.
% \end{function}
%
-% \begin{function}[TF, updated = 2012-12-20]{\peek_N_type:}
-% \begin{syntax}
-% \cs{peek_N_type:TF} \Arg{true code} \Arg{false code}
-% \end{syntax}
-% Tests if the next \meta{token} in the input stream can be safely
-% grabbed as an \texttt{N}-type argument. The test is \meta{false}
-% if the next \meta{token} is either an explicit or implicit
-% begin-group or end-group token (with any character code), or
-% an explicit or implicit space character (with character code $32$
-% and category code $10$), or an outer token (never used in \LaTeX3)
-% and \meta{true} in all other cases.
-% Note that a \meta{true} result ensures that the next \meta{token} is
-% a valid \texttt{N}-type argument. However, if the next \meta{token}
-% is for instance \cs{c_space_token}, the test takes the
-% \meta{false} branch, even though the next \meta{token} is in fact
-% a valid \texttt{N}-type argument. The \meta{token} is left
-% in the input stream after the \meta{true code} or \meta{false code}
-% (as appropriate to the result of the test).
-% \end{function}
-%
% \begin{function}[added = 2018-09-23]
% {
% \peek_catcode_collect_inline:Nn,
@@ -4331,77 +4311,6 @@
%<@@=peek>
% \end{macrocode}
%
-% \begin{macro}[TF]{\peek_N_type:}
-% \begin{macro}
-% {\@@_execute_branches_N_type:, \@@_N_type:w, \@@_N_type_aux:nnw}
-% All tokens are \texttt{N}-type tokens, except in four cases:
-% begin-group tokens, end-group tokens, space tokens with character
-% code~$32$, and outer tokens. Since \cs{l_peek_token} might be
-% outer, we cannot use the convenient \cs{bool_if:nTF} function, and
-% must resort to the old trick of using \tn{ifodd} to expand a set of
-% tests. The \texttt{false} branch of this test is taken if the token
-% is one of the first three kinds of non-\texttt{N}-type tokens
-% (explicit or implicit), thus we call \cs{@@_false:w}. In the
-% \texttt{true} branch, we must detect outer tokens, without impacting
-% performance too much for non-outer tokens. The first filter is to
-% search for \texttt{outer} in the \tn{meaning} of \cs{l_peek_token}.
-% If that is absent, \cs{use_none_delimit_by_q_stop:w} cleans up, and
-% we call \cs{@@_true:w}. Otherwise, the token can be a non-outer
-% macro or a primitive mark whose parameter or replacement text
-% contains \texttt{outer}, it can be the primitive \tn{outer}, or it
-% can be an outer token. Macros and marks would have \texttt{ma} in
-% the part before the first occurrence of \texttt{outer}; the meaning
-% of \tn{outer} has nothing after \texttt{outer}, contrarily to outer
-% macros; and that covers all cases, calling \cs{@@_true:w} or
-% \cs{@@_false:w} as appropriate. Here, there is no \meta{search
-% token}, so we feed a dummy \cs{scan_stop:} to the
-% \cs{@@_token_generic:NNTF} function.
-% \begin{macrocode}
-\group_begin:
- \cs_set_protected:Npn \@@_tmp:w #1 \q_stop
- {
- \cs_new_protected:Npn \@@_execute_branches_N_type:
- {
- \if_int_odd:w
- \if_catcode:w \exp_not:N \l_peek_token { 0 \exp_stop_f: \fi:
- \if_catcode:w \exp_not:N \l_peek_token } 0 \exp_stop_f: \fi:
- \if_meaning:w \l_peek_token \c_space_token 0 \exp_stop_f: \fi:
- 1 \exp_stop_f:
- \exp_after:wN \@@_N_type:w
- \token_to_meaning:N \l_peek_token
- \q_mark \@@_N_type_aux:nnw
- #1 \q_mark \use_none_delimit_by_q_stop:w
- \q_stop
- \exp_after:wN \@@_true:w
- \else:
- \exp_after:wN \@@_false:w
- \fi:
- }
- \cs_new_protected:Npn \@@_N_type:w ##1 #1 ##2 \q_mark ##3
- { ##3 {##1} {##2} }
- }
- \exp_after:wN \@@_tmp:w \tl_to_str:n { outer } \q_stop
-\group_end:
-\cs_new_protected:Npn \@@_N_type_aux:nnw #1 #2 #3 \fi:
- {
- \fi:
- \tl_if_in:noTF {#1} { \tl_to_str:n {ma} }
- { \@@_true:w }
- { \tl_if_empty:nTF {#2} { \@@_true:w } { \@@_false:w } }
- }
-\cs_new_protected:Npn \peek_N_type:TF
- {
- \@@_token_generic:NNTF
- \@@_execute_branches_N_type: \scan_stop:
- }
-\cs_new_protected:Npn \peek_N_type:T
- { \@@_token_generic:NNT \@@_execute_branches_N_type: \scan_stop: }
-\cs_new_protected:Npn \peek_N_type:F
- { \@@_token_generic:NNF \@@_execute_branches_N_type: \scan_stop: }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \begin{variable}{\l_@@_collect_tl}
% \begin{macrocode}
\tl_new:N \l_@@_collect_tl
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index 2e3d25e..bcca896 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -931,6 +931,26 @@
% (as appropriate to the result of the test).
% \end{function}
%
+% \begin{function}[TF, updated = 2012-12-20]{\peek_N_type:}
+% \begin{syntax}
+% \cs{peek_N_type:TF} \Arg{true code} \Arg{false code}
+% \end{syntax}
+% Tests if the next \meta{token} in the input stream can be safely
+% grabbed as an \texttt{N}-type argument. The test is \meta{false}
+% if the next \meta{token} is either an explicit or implicit
+% begin-group or end-group token (with any character code), or
+% an explicit or implicit space character (with character code $32$
+% and category code $10$), or an outer token (never used in \LaTeX3)
+% and \meta{true} in all other cases.
+% Note that a \meta{true} result ensures that the next \meta{token} is
+% a valid \texttt{N}-type argument. However, if the next \meta{token}
+% is for instance \cs{c_space_token}, the test takes the
+% \meta{false} branch, even though the next \meta{token} is in fact
+% a valid \texttt{N}-type argument. The \meta{token} is left
+% in the input stream after the \meta{true code} or \meta{false code}
+% (as appropriate to the result of the test).
+% \end{function}
+%
% \section{Description of all possible tokens}
% \label{sec:l3token:all-tokens}
%
@@ -2405,6 +2425,77 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[TF]{\peek_N_type:}
+% \begin{macro}
+% {\@@_execute_branches_N_type:, \@@_N_type:w, \@@_N_type_aux:nnw}
+% All tokens are \texttt{N}-type tokens, except in four cases:
+% begin-group tokens, end-group tokens, space tokens with character
+% code~$32$, and outer tokens. Since \cs{l_peek_token} might be
+% outer, we cannot use the convenient \cs{bool_if:nTF} function, and
+% must resort to the old trick of using \tn{ifodd} to expand a set of
+% tests. The \texttt{false} branch of this test is taken if the token
+% is one of the first three kinds of non-\texttt{N}-type tokens
+% (explicit or implicit), thus we call \cs{@@_false:w}. In the
+% \texttt{true} branch, we must detect outer tokens, without impacting
+% performance too much for non-outer tokens. The first filter is to
+% search for \texttt{outer} in the \tn{meaning} of \cs{l_peek_token}.
+% If that is absent, \cs{use_none_delimit_by_q_stop:w} cleans up, and
+% we call \cs{@@_true:w}. Otherwise, the token can be a non-outer
+% macro or a primitive mark whose parameter or replacement text
+% contains \texttt{outer}, it can be the primitive \tn{outer}, or it
+% can be an outer token. Macros and marks would have \texttt{ma} in
+% the part before the first occurrence of \texttt{outer}; the meaning
+% of \tn{outer} has nothing after \texttt{outer}, contrarily to outer
+% macros; and that covers all cases, calling \cs{@@_true:w} or
+% \cs{@@_false:w} as appropriate. Here, there is no \meta{search
+% token}, so we feed a dummy \cs{scan_stop:} to the
+% \cs{@@_token_generic:NNTF} function.
+% \begin{macrocode}
+\group_begin:
+ \cs_set_protected:Npn \@@_tmp:w #1 \q_stop
+ {
+ \cs_new_protected:Npn \@@_execute_branches_N_type:
+ {
+ \if_int_odd:w
+ \if_catcode:w \exp_not:N \l_peek_token { 0 \exp_stop_f: \fi:
+ \if_catcode:w \exp_not:N \l_peek_token } 0 \exp_stop_f: \fi:
+ \if_meaning:w \l_peek_token \c_space_token 0 \exp_stop_f: \fi:
+ 1 \exp_stop_f:
+ \exp_after:wN \@@_N_type:w
+ \token_to_meaning:N \l_peek_token
+ \q_mark \@@_N_type_aux:nnw
+ #1 \q_mark \use_none_delimit_by_q_stop:w
+ \q_stop
+ \exp_after:wN \@@_true:w
+ \else:
+ \exp_after:wN \@@_false:w
+ \fi:
+ }
+ \cs_new_protected:Npn \@@_N_type:w ##1 #1 ##2 \q_mark ##3
+ { ##3 {##1} {##2} }
+ }
+ \exp_after:wN \@@_tmp:w \tl_to_str:n { outer } \q_stop
+\group_end:
+\cs_new_protected:Npn \@@_N_type_aux:nnw #1 #2 #3 \fi:
+ {
+ \fi:
+ \tl_if_in:noTF {#1} { \tl_to_str:n {ma} }
+ { \@@_true:w }
+ { \tl_if_empty:nTF {#2} { \@@_true:w } { \@@_false:w } }
+ }
+\cs_new_protected:Npn \peek_N_type:TF
+ {
+ \@@_token_generic:NNTF
+ \@@_execute_branches_N_type: \scan_stop:
+ }
+\cs_new_protected:Npn \peek_N_type:T
+ { \@@_token_generic:NNT \@@_execute_branches_N_type: \scan_stop: }
+\cs_new_protected:Npn \peek_N_type:F
+ { \@@_token_generic:NNF \@@_execute_branches_N_type: \scan_stop: }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 9f9b6ed..30a8290 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2260,6 +2260,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6199,12 +6205,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 64c8ae3..71d55cc 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2556,6 +2556,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6240,12 +6246,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index c887062..a38ad8b 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2556,6 +2556,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6540,12 +6546,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 13fe109..22b2721 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2556,6 +2556,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6537,12 +6543,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 1870647..e15d415 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2301,6 +2301,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6207,12 +6213,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 9f9b6ed..30a8290 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2260,6 +2260,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6199,12 +6205,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 64c8ae3..71d55cc 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2556,6 +2556,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6240,12 +6246,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index c887062..a38ad8b 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2556,6 +2556,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6540,12 +6546,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 13fe109..22b2721 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2556,6 +2556,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6537,12 +6543,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 1870647..e15d415 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2301,6 +2301,12 @@ 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 ...
+Defining \__peek_execute_branches_N_type: on line ...
+Defining \__peek_N_type:w on line ...
+Defining \__peek_N_type_aux:nnw on line ...
+Defining \peek_N_type:TF on line ...
+Defining \peek_N_type:T on line ...
+Defining \peek_N_type:F on line ...
Defining \s__prop on line ...
Defining \__prop_pair:wn on line ...
Defining \l__prop_internal_tl on line ...
@@ -6207,12 +6213,6 @@ Defining \__tl_range_unbraced:w on line ...
Defining \__tl_range_collect_braced:w on line ...
Defining \__tl_range_collect_unbraced:w on line ...
Defining \c_catcode_active_space_tl on line ...
-Defining \__peek_execute_branches_N_type: on line ...
-Defining \__peek_N_type:w on line ...
-Defining \__peek_N_type_aux:nnw on line ...
-Defining \peek_N_type:TF on line ...
-Defining \peek_N_type:T on line ...
-Defining \peek_N_type:F on line ...
Defining \l__peek_collect_tl on line ...
Defining \peek_catcode_collect_inline:Nn on line ...
Defining \peek_charcode_collect_inline:Nn on line ...
More information about the latex3-commits
mailing list