[latex3-commits] [git/LaTeX3-latex3-latex3] master: Make prg break functions public (a59ec56)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Mar 27 18:33:43 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/a59ec563a69ff9c9e5df71862642052f74cedcad
>---------------------------------------------------------------
commit a59ec563a69ff9c9e5df71862642052f74cedcad
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Mar 27 17:33:43 2018 +0100
Make prg break functions public
>---------------------------------------------------------------
a59ec563a69ff9c9e5df71862642052f74cedcad
l3kernel/l3basics.dtx | 12 ++++----
l3kernel/l3candidates.dtx | 10 +++----
l3kernel/l3file.dtx | 6 ++--
l3kernel/l3fp-aux.dtx | 10 +++----
l3kernel/l3fp-convert.dtx | 4 +--
l3kernel/l3fp-logic.dtx | 16 +++++------
l3kernel/l3fp-parse.dtx | 10 +++----
l3kernel/l3prg.dtx | 48 ++++++++++++++++++++-----------
l3kernel/l3prop.dtx | 8 +++---
l3kernel/l3regex.dtx | 18 ++++++------
l3kernel/l3seq.dtx | 12 ++++----
l3kernel/l3sort.dtx | 6 ++--
l3kernel/l3tl-analysis.dtx | 22 +++++++-------
l3kernel/l3tl-build.dtx | 4 +--
l3kernel/l3tl.dtx | 6 ++--
l3kernel/testfiles/m3expl001.luatex.tlg | 9 ++++--
l3kernel/testfiles/m3expl001.ptex.tlg | 9 ++++--
l3kernel/testfiles/m3expl001.tlg | 9 ++++--
l3kernel/testfiles/m3expl001.uptex.tlg | 9 ++++--
l3kernel/testfiles/m3expl001.xetex.tlg | 9 ++++--
l3kernel/testfiles/m3expl003.luatex.tlg | 9 ++++--
l3kernel/testfiles/m3expl003.ptex.tlg | 9 ++++--
l3kernel/testfiles/m3expl003.tlg | 9 ++++--
l3kernel/testfiles/m3expl003.uptex.tlg | 9 ++++--
l3kernel/testfiles/m3expl003.xetex.tlg | 9 ++++--
25 files changed, 163 insertions(+), 119 deletions(-)
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index ac184a9..60bcad6 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -3558,16 +3558,16 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_break_point:}
-% \begin{macro}{\@@_break:, \@@_break:n}
-% Very simple analogues of \cs{@@_break_point:Nn} and
+% \begin{macro}{\prg_break_point:}
+% \begin{macro}{\prg_break:, \prg_break:n}
+% Very simple analogues of \cs{prg_break_point:Nn} and
% \cs{@@_map_break:Nn}, for use in fast short-term recursions which
% are not mappings, do not need to support nesting, and in which
% nothing has to be done at the end of the loop.
% \begin{macrocode}
-\cs_new_eq:NN \@@_break_point: \prg_do_nothing:
-\cs_new:Npn \@@_break: #1 \@@_break_point: { }
-\cs_new:Npn \@@_break:n #1#2 \@@_break_point: {#1}
+\cs_new_eq:NN \prg_break_point: \prg_do_nothing:
+\cs_new:Npn \prg_break: #1 \prg_break_point: { }
+\cs_new:Npn \prg_break:n #1#2 \prg_break_point: {#1}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index a4c823a..ef4fb9c 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2193,7 +2193,7 @@
% \@@_mapthread_function:Nnnwnn
% }
% The idea is to first expand both sequences, adding the
-% usual |{ ? \__prg_break: } { }| to the end of each one. This is
+% usual |{ ? \prg_break: } { }| to the end of each one. This is
% most conveniently done in two steps using an auxiliary function.
% The mapping then throws away the first tokens of |#2| and |#5|,
% which for items in both sequences are \cs{s_@@}
@@ -2208,13 +2208,13 @@
\cs_new:Npn \@@_mapthread_function:wNN \s_@@ #1 \q_stop #2#3
{
\exp_after:wN \@@_mapthread_function:wNw #2 \q_stop #3
- #1 { ? \__prg_break: } { }
- \__prg_break_point:
+ #1 { ? \prg_break: } { }
+ \prg_break_point:
}
\cs_new:Npn \@@_mapthread_function:wNw \s_@@ #1 \q_stop #2
{
\@@_mapthread_function:Nnnwnn #2
- #1 { ? \__prg_break: } { }
+ #1 { ? \prg_break: } { }
\q_stop
}
\cs_new:Npn \@@_mapthread_function:Nnnwnn #1#2#3#4 \q_stop #5#6
@@ -2232,7 +2232,7 @@
% \begin{macro}{\seq_set_filter:NNn, \seq_gset_filter:NNn}
% \begin{macro}{\@@_set_filter:NNNn}
% Similar to \cs{seq_map_inline:Nn}, without a
-% \cs{__prg_break_point:} because the user's code
+% \cs{prg_break_point:} because the user's code
% is performed within the evaluation of a boolean expression,
% and skipping out of that would break horribly.
% The \cs{@@_wrap_item:n} function inserts the relevant
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 4d7fdfe..2e79eb5 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -904,7 +904,7 @@
% not exist then \TeX{} reports end-of-file. A search is made
% looking at each potential path in turn (starting from the current
% directory). The first location is of course treated as the correct
-% one: this is done by jumping to \cs{__prg_break_point:}. If nothing
+% one: this is done by jumping to \cs{prg_break_point:}. If nothing
% is found, |#2| is returned empty. A special case when there is no
% extension is that once the first location is found we test the
% existence of the file with |.tex| extension in that directory, and
@@ -924,7 +924,7 @@
}
%</package>
\str_clear:N \l__file_full_name_str
- \__prg_break_point:
+ \prg_break_point:
\str_if_empty:NF \l__file_full_name_str
{
\exp_args:NV \file_parse_full_name:nNNN \l__file_full_name_str
@@ -947,7 +947,7 @@
{ \tl_to_str:n {#1} \l__file_base_name_str }
\l__file_full_name_str
\__ior_open:No \g_@@_internal_ior \l__file_full_name_str
- \ior_if_eof:NF \g_@@_internal_ior { #2 { \__prg_break: } }
+ \ior_if_eof:NF \g_@@_internal_ior { #2 { \prg_break: } }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index fbe5a23..f7e763e 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -513,8 +513,8 @@
\cs_new:Npn \@@_tuple_count:w \s_@@_tuple \@@_tuple_chk:w #1 ;
{
\int_value:w \@@_int_eval:w 0
- \@@_tuple_count_loop:Nw #1 { ? \__prg_break: } ;
- \__prg_break_point:
+ \@@_tuple_count_loop:Nw #1 { ? \prg_break: } ;
+ \prg_break_point:
\@@_int_eval_end:
}
\cs_new:Npn \@@_tuple_count_loop:Nw #1#2;
@@ -539,14 +539,14 @@
% \begin{macrocode}
\cs_new:Npn \@@_array_if_all_fp:nTF #1
{
- \@@_array_if_all_fp_loop:w #1 { \s_@@ \__prg_break: } ;
- \__prg_break_point: \use_i:nn
+ \@@_array_if_all_fp_loop:w #1 { \s_@@ \prg_break: } ;
+ \prg_break_point: \use_i:nn
}
\cs_new:Npn \@@_array_if_all_fp_loop:w #1#2 ;
{
\@@_if_type_fp:NTwFw
#1 \@@_array_if_all_fp_loop:w
- \s_@@ { \__prg_break:n \use_iii:nnn }
+ \s_@@ { \prg_break:n \use_iii:nnn }
\q_stop
}
% \end{macrocode}
diff --git a/l3kernel/l3fp-convert.dtx b/l3kernel/l3fp-convert.dtx
index 55998c8..e4f6831 100644
--- a/l3kernel/l3fp-convert.dtx
+++ b/l3kernel/l3fp-convert.dtx
@@ -593,8 +593,8 @@
\@@_expand:n
{
{ \use_ii:nn }
- \@@_array_to_clist_loop:Nw #1 { ? \__prg_break: } ;
- \__prg_break_point:
+ \@@_array_to_clist_loop:Nw #1 { ? \prg_break: } ;
+ \prg_break_point:
}
}
}
diff --git a/l3kernel/l3fp-logic.dtx b/l3kernel/l3fp-logic.dtx
index 1d8809b..224ddd3 100644
--- a/l3kernel/l3fp-logic.dtx
+++ b/l3kernel/l3fp-logic.dtx
@@ -227,9 +227,9 @@
{
\int_value:w 0
\@@_tuple_compare_back_loop:w
- #1 { \s_@@ \__prg_break: } ; @
- #2 { \s_@@ \__prg_break: } ;
- \__prg_break_point:
+ #1 { \s_@@ \prg_break: } ; @
+ #2 { \s_@@ \prg_break: } ;
+ \prg_break_point:
\exp_stop_f:
}
{ 2 }
@@ -241,7 +241,7 @@
\if_int_compare:w
\@@_compare_back_any:ww #1 #2 ; #4 #5 ; = 0 \exp_stop_f:
\else:
- 2 \exp_after:wN \__prg_break:
+ 2 \exp_after:wN \prg_break:
\fi:
\@@_tuple_compare_back_loop:w #3 @
}
@@ -398,11 +398,11 @@
% \begin{macrocode}
\cs_new:Npn \@@_step:wwwN #1#2; #3#4; #5#6; #7
{
- \@@_if_type_fp:NTwFw #1 { } \s_@@ \__prg_break: \q_stop
- \@@_if_type_fp:NTwFw #3 { } \s_@@ \__prg_break: \q_stop
- \@@_if_type_fp:NTwFw #5 { } \s_@@ \__prg_break: \q_stop
+ \@@_if_type_fp:NTwFw #1 { } \s_@@ \prg_break: \q_stop
+ \@@_if_type_fp:NTwFw #3 { } \s_@@ \prg_break: \q_stop
+ \@@_if_type_fp:NTwFw #5 { } \s_@@ \prg_break: \q_stop
\use_i:nnnn { \@@_step_fp:wwwN #1#2; #3#4; #5#6; #7 }
- \__prg_break_point:
+ \prg_break_point:
\use:n
{
\@@_error:nfff { fp-step-tuple } { \fp_to_tl:n { #1#2 ; } }
diff --git a/l3kernel/l3fp-parse.dtx b/l3kernel/l3fp-parse.dtx
index e63ee6c..50b7807 100644
--- a/l3kernel/l3fp-parse.dtx
+++ b/l3kernel/l3fp-parse.dtx
@@ -2732,8 +2732,8 @@
\exp_after:wN {
\exp:w \exp_end_continue_f:w
\@@_tuple_map_loop_o:nw {#1} #2
- { \s_@@ \__prg_break: } ;
- \__prg_break_point:
+ { \s_@@ \prg_break: } ;
+ \prg_break_point:
\exp_after:wN } \exp_after:wN ;
}
\cs_new:Npn \@@_tuple_map_loop_o:nw #1#2#3 ;
@@ -2759,9 +2759,9 @@
\exp_after:wN {
\exp:w \exp_end_continue_f:w
\@@_tuple_mapthread_loop_o:nw {#1}
- #2 { \s_@@ \__prg_break: } ; @
- #3 { \s_@@ \__prg_break: } ;
- \__prg_break_point:
+ #2 { \s_@@ \prg_break: } ; @
+ #3 { \s_@@ \prg_break: } ;
+ \prg_break_point:
\exp_after:wN } \exp_after:wN ;
}
\cs_new:Npn \@@_tuple_mapthread_loop_o:nw #1#2#3 ; #4 @ #5#6 ;
diff --git a/l3kernel/l3prg.dtx b/l3kernel/l3prg.dtx
index 59cc1ea..49ce28e 100644
--- a/l3kernel/l3prg.dtx
+++ b/l3kernel/l3prg.dtx
@@ -689,6 +689,26 @@
% simply used as a recognizable marker for the \meta{type}.
% \end{function}
%
+% \subsection{Simple mappings}
+%
+% In addition to the more complex mappings above, non-nestable mappings are
+% used in a number of locations and support is provided for these.
+%
+% \begin{function}[EXP, added = 2018-03-27]{\prg_break_point:}
+% This copy of \cs{prg_do_nothing:} is used to mark the end of a fast
+% short-term recursion: the function \cs{prg_break:n} uses this to
+% break out of the loop.
+% \end{function}
+%
+% \begin{function}[EXP, added = 2018-03-27]{\prg_break:, \prg_break:n}
+% \begin{syntax}
+% \cs{prg_break:n} \Arg{code} \ldots{} \cs{prg_break_point:}
+% \end{syntax}
+% Breaks a recursion which has no \meta{ending code} and which is not
+% a user-breakable mapping (see for instance \cs{prop_get:Nn}), and
+% inserts the \meta{code} in the input stream.
+% \end{function}
+%
% \section{Internal programming functions}
%
% \begin{function}[updated = 2011-08-11, EXP]
@@ -722,21 +742,6 @@
% and variable mappings.
% \end{variable}
%
-% \begin{function}[EXP]{\__prg_break_point:}
-% This copy of \cs{prg_do_nothing:} is used to mark the end of a fast
-% short-term recursion: the function \cs{__prg_break:n} uses this to
-% break out of the loop.
-% \end{function}
-%
-% \begin{function}[EXP]{\__prg_break:, \__prg_break:n}
-% \begin{syntax}
-% \cs{__prg_break:n} \Arg{code} \ldots{} \cs{__prg_break_point:}
-% \end{syntax}
-% Breaks a recursion which has no \meta{ending code} and which is not
-% a user-breakable mapping (see for instance \cs{prop_get:Nn}), and
-% inserts the \meta{code} in the input stream.
-% \end{function}
-%
% \end{documentation}
%
% \begin{implementation}
@@ -1549,8 +1554,8 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@@_break_point:}
-% \begin{macro}{\@@_break:, \@@_break:n}
+% \begin{macro}{\prg_break_point:}
+% \begin{macro}{\prg_break:, \prg_break:n}
% Also done in \pkg{l3basics} as in format mode these are needed within
% \pkg{l3alloc}.
% \end{macro}
@@ -1559,14 +1564,23 @@
% \subsection{Deprecated functions}
%
% \begin{macro}[deprecated = 2019-12-31]{\@@_break_point:Nn}
+% \begin{macro}[deprecated = 2019-12-31]{\@@_break_point:}
% \begin{macro}[deprecated = 2019-12-31]{\@@_map_break:Nn}
+% \begin{macro}[deprecated = 2019-12-31]{\@@_break:}
+% \begin{macro}[deprecated = 2019-12-31]{\@@_break:n}
% Made public, but used by a few third-parties.
% \begin{macrocode}
\cs_new:Npn \@@_break_point:Nn { \prg_break_point:Nn }
+\cs_new:Npn \@@_break_point: { \prg_break_point: }
\cs_new:Npn \@@_map_break:Nn { \prg_map_break:Nn }
+\cs_new:Npn \@@_break: { \prg_break: }
+\cs_new:Npn \@@_break:n { \prg_break:n }
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macrocode}
%</initex|package>
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 13ff8d1..037d842 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -853,12 +853,12 @@
{
\exp_last_unbraced:Noo \@@_item_Nn:nwwn { \tl_to_str:n {#2} } #1
\@@_pair:wn \tl_to_str:n {#2} \s_@@ { }
- \__prg_break_point:
+ \prg_break_point:
}
\cs_new:Npn \@@_item_Nn:nwwn #1#2 \@@_pair:wn #3 \s_@@ #4
{
\str_if_eq_x:nnTF {#1} {#3}
- { \__prg_break:n { \exp_not:n {#4} } }
+ { \prg_break:n { \exp_not:n {#4} } }
{ \@@_item_Nn:nwwn {#1} }
}
\cs_generate_variant:Nn \prop_item:Nn { c }
@@ -1050,7 +1050,7 @@
\exp_last_unbraced:Noo \@@_if_in:nwwn { \tl_to_str:n {#2} } #1
\@@_pair:wn \tl_to_str:n {#2} \s_@@ { }
\q_recursion_tail
- \__prg_break_point:
+ \prg_break_point:
}
\cs_new:Npn \@@_if_in:nwwn #1#2 \@@_pair:wn #3 \s_@@ #4
{
@@ -1065,7 +1065,7 @@
\else:
\prg_return_true:
\fi:
- \__prg_break:
+ \prg_break:
}
\prg_generate_conditional_variant:Nnn \prop_if_in:Nn
{ NV , No , c , cV , co } { p , T , F , TF }
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 193109c..fb25070 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -1485,7 +1485,7 @@
\tl_set:Nx \l_@@_internal_b_tl
{
\exp_after:wN \@@_escape_loop:N \g_@@_internal_tl
- { break } \__prg_break_point:
+ { break } \prg_break_point:
}
\__tl_build_one:o \l_@@_internal_b_tl
\__tl_build_end:
@@ -1541,7 +1541,7 @@
% backslash. Spaces are ignored, and |\a|, |\e|, |\f|, |\n|, |\r|,
% |\t| take their meaning here.
% \begin{macrocode}
-\cs_new_eq:NN \@@_escape_break:w \__prg_break:
+\cs_new_eq:NN \@@_escape_break:w \prg_break:
\cs_new:cpn { @@_escape_/break:w }
{
\if_false: { \fi: }
@@ -4020,8 +4020,8 @@
{ \int_use:N \l_@@_capturing_group_int }
{ \int_use:N \l_@@_capturing_group_int }
#1
- { ?? \__prg_break:n } { }
- \__prg_break_point:
+ { ?? \prg_break:n } { }
+ \prg_break_point:
}
}
\cs_new_protected:Npn \@@_group_resetting_loop:nnNn #1#2#3#4
@@ -4673,7 +4673,7 @@
{ \l_@@_max_active_int - 1 }
\@@_match_one_active:n
}
- \__prg_break_point:
+ \prg_break_point:
\bool_set_false:N \l_@@_fresh_thread_bool %^^A was arg of break_point:n
\if_int_compare:w \l_@@_max_active_int > \l_@@_min_active_int
\if_int_compare:w \l_@@_curr_pos_int < \l_@@_max_pos_int
@@ -4907,7 +4907,7 @@
% empty match. Then mark that there was a successful match; it is
% empty if it is \enquote{fresh}; and we store the current position
% and submatches. The current step is then interrupted with
-% \cs{__prg_break:}, and only paths with higher precedence are
+% \cs{prg_break:}, and only paths with higher precedence are
% pursued further. The values stored here may be overwritten by a
% later success of a path with higher precedence.
% \begin{macrocode}
@@ -4921,7 +4921,7 @@
\int_set_eq:NN \l_@@_success_pos_int \l_@@_curr_pos_int
\prop_set_eq:NN \l_@@_success_submatches_prop
\l_@@_curr_submatches_prop
- \__prg_break:
+ \prg_break:
}
}
% \end{macrocode}
@@ -5031,13 +5031,13 @@
\exp_after:wN \@@_query_range_loop:ww
\int_value:w \@@_int_eval:w #1 \exp_after:wN ;
\int_value:w \@@_int_eval:w #2 ;
- \__prg_break_point:
+ \prg_break_point:
}
\cs_new:Npn \@@_query_range_loop:ww #1 ; #2 ;
{
\if_int_compare:w #1 < #2 \exp_stop_f:
\else:
- \exp_after:wN \__prg_break:
+ \exp_after:wN \prg_break:
\fi:
\@@_toks_use:w #1 \exp_stop_f:
\exp_after:wN \@@_query_range_loop:ww
diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index 0d30750..d01057c 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -1451,10 +1451,10 @@
#1
\group_end:
\prg_return_false:
- \__prg_break_point:
+ \prg_break_point:
}
\cs_new:Npn \@@_if_in:
- { \__prg_break:n { \group_end: \prg_return_true: } }
+ { \prg_break:n { \group_end: \prg_return_true: } }
\prg_generate_conditional_variant:Nnn \seq_if_in:Nn
{ NV , Nv , No , Nx , c , cV , cv , co , cx } { T , F , TF }
% \end{macrocode}
@@ -1668,7 +1668,7 @@
% \begin{macro}{\@@_item:wNn, \@@_item:nN, \@@_item:nnn}
% The idea here is to find the offset of the item from the left, then use
% a loop to grab the correct item. If the resulting offset is too large,
-% then the stop code |{ ? \__prg_break: } { }| is used by the auxiliary,
+% then the stop code |{ ? \prg_break: } { }| is used by the auxiliary,
% terminating the loop and returning nothing at all.
% \begin{macrocode}
\cs_new:Npn \seq_item:Nn #1
@@ -1678,8 +1678,8 @@
\exp_args:Nf \@@_item:nnn
{ \exp_args:Nf \@@_item:nN { \int_eval:n {#3} } #2 }
#1
- { ? \__prg_break: } { }
- \__prg_break_point:
+ { ? \prg_break: } { }
+ \prg_break_point:
}
\cs_new:Npn \@@_item:nN #1#2
{
@@ -1691,7 +1691,7 @@
{
\use_none:n #2
\int_compare:nNnTF {#1} = 1
- { \__prg_break:n { \exp_not:n {#3} } }
+ { \prg_break:n { \exp_not:n {#3} } }
{ \exp_args:Nf \@@_item:nnn { \int_eval:n { #1 - 1 } } }
}
\cs_generate_variant:Nn \seq_item:Nn { c }
diff --git a/l3kernel/l3sort.dtx b/l3kernel/l3sort.dtx
index 9ae5660..331bf3f 100644
--- a/l3kernel/l3sort.dtx
+++ b/l3kernel/l3sort.dtx
@@ -828,7 +828,7 @@
% each item. The \texttt{prepare} auxiliary receives the conditional
% as~|#1|, the prepared token list so far as~|#2|, the next prepared
% item as~|#3|, and the item after that as~|#4|. The loop ends
-% when~|#4| contains \cs{__prg_break_point:}, then the
+% when~|#4| contains \cs{prg_break_point:}, then the
% \texttt{prepare_end} auxiliary finds the prepared token list
% as~|#4|. The scene is then set up for \cs{@@_quick_split:NnNn},
% which sorts the prepared list and perform the post action placed
@@ -844,14 +844,14 @@
{
\@@_quick_prepare:Nnnn #2 { } { }
#1
- { \__prg_break_point: \@@_quick_prepare_end:NNNnw }
+ { \prg_break_point: \@@_quick_prepare_end:NNNnw }
\q_stop
}
}
}
\cs_new:Npn \@@_quick_prepare:Nnnn #1#2#3#4
{
- \__prg_break: #4 \__prg_break_point:
+ \prg_break: #4 \prg_break_point:
\@@_quick_prepare:Nnnn #1 { #2 #3 } { #1 {#4} }
}
\cs_new:Npn \@@_quick_prepare_end:NNNnw #1#2#3#4#5 \q_stop
diff --git a/l3kernel/l3tl-analysis.dtx b/l3kernel/l3tl-analysis.dtx
index 24ad677..cce127b 100644
--- a/l3kernel/l3tl-analysis.dtx
+++ b/l3kernel/l3tl-analysis.dtx
@@ -734,7 +734,7 @@
\tl_gset:Nx \g_@@_result_tl
{
\@@_b_loop:w 0; #1
- \__prg_break_point:
+ \prg_break_point:
}
}
\cs_new:Npn \@@_b_loop:w #1;
@@ -861,7 +861,7 @@
{
\fi:
\if_int_compare:w #1 = \l_@@_index_int
- \exp_after:wN \__prg_break:
+ \exp_after:wN \prg_break:
\fi:
\tex_the:D \tex_toks:D #1 \s__tl
\if_case:w \etex_gluestretch:D \tex_skip:D #1 \exp_stop_f:
@@ -971,8 +971,8 @@
\cs_new:Npn \@@_show:
{
\exp_after:wN \@@_show_loop:wNw \g_@@_result_tl
- \s__tl { ? \__prg_break: } \s__tl
- \__prg_break_point:
+ \s__tl { ? \prg_break: } \s__tl
+ \prg_break_point:
}
\cs_new:Npn \@@_show_loop:wNw #1 \s__tl #2 #3 \s__tl
{
@@ -1016,14 +1016,14 @@
{
\token_if_expandable:NF #1
{
- \token_if_chardef:NTF #1 \__prg_break: { }
- \token_if_mathchardef:NTF #1 \__prg_break: { }
- \token_if_dim_register:NTF #1 \__prg_break: { }
- \token_if_int_register:NTF #1 \__prg_break: { }
- \token_if_skip_register:NTF #1 \__prg_break: { }
- \token_if_toks_register:NTF #1 \__prg_break: { }
+ \token_if_chardef:NTF #1 \prg_break: { }
+ \token_if_mathchardef:NTF #1 \prg_break: { }
+ \token_if_dim_register:NTF #1 \prg_break: { }
+ \token_if_int_register:NTF #1 \prg_break: { }
+ \token_if_skip_register:NTF #1 \prg_break: { }
+ \token_if_toks_register:NTF #1 \prg_break: { }
\use_none:nnn
- \__prg_break_point:
+ \prg_break_point:
\use:n { \exp_after:wN = \tex_the:D #1 }
}
}
diff --git a/l3kernel/l3tl-build.dtx b/l3kernel/l3tl-build.dtx
index 333e1b9..5c34c6c 100644
--- a/l3kernel/l3tl-build.dtx
+++ b/l3kernel/l3tl-build.dtx
@@ -172,13 +172,13 @@
{
\exp_after:wN \@@_unpack_loop:w
\int_use:N \l_@@_start_index_int ;
- \__prg_break_point:
+ \prg_break_point:
}
}
\cs_new:Npn \@@_unpack_loop:w #1 ;
{
\if_int_compare:w #1 = \l_@@_index_int
- \exp_after:wN \__prg_break:
+ \exp_after:wN \prg_break:
\fi:
\tex_the:D \tex_toks:D #1 \exp_stop_f:
\@@_unpack_loop:f { \int_eval:n { #1 + 1 } }
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 653b487..70a45e3 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -2925,7 +2925,7 @@
{ \exp_args:Nf \@@_item_aux:nn { \int_eval:n {#2} } {#1} }
#1
\q_recursion_tail
- \__prg_break_point:
+ \prg_break_point:
}
\cs_new:Npn \@@_item_aux:nn #1#2
{
@@ -2935,9 +2935,9 @@
}
\cs_new:Npn \@@_item:nn #1#2
{
- \__quark_if_recursion_tail_break:nN {#2} \__prg_break:
+ \__quark_if_recursion_tail_break:nN {#2} \prg_break:
\int_compare:nNnTF {#1} = 1
- { \__prg_break:n { \exp_not:n {#2} } }
+ { \prg_break:n { \exp_not:n {#2} } }
{ \exp_args:Nf \@@_item:nn { \int_eval:n { #1 - 1 } } }
}
\cs_new:Npn \tl_item:Nn { \exp_args:No \tl_item:nn }
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 3b52152..b584a96 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -129,9 +129,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -2085,7 +2085,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 39166c3..60a9c7a 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -128,9 +128,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -1766,7 +1766,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 60d620b..248cda4 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -128,9 +128,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -1766,7 +1766,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index b47a864..3671c8f 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -128,9 +128,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -1766,7 +1766,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 7226d64..d30d920 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -128,9 +128,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -2083,7 +2083,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 3b52152..b584a96 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -129,9 +129,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -2085,7 +2085,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 39166c3..60a9c7a 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -128,9 +128,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -1766,7 +1766,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 60d620b..248cda4 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -128,9 +128,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -1766,7 +1766,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index b47a864..3671c8f 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -128,9 +128,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -1766,7 +1766,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 7226d64..d30d920 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -128,9 +128,9 @@ Defining \__kernel_show:NN on line ...
Defining \prg_do_nothing: on line ...
Defining \prg_break_point:Nn on line ...
Defining \prg_map_break:Nn on line ...
-Defining \__prg_break_point: on line ...
-Defining \__prg_break: on line ...
-Defining \__prg_break:n on line ...
+Defining \prg_break_point: on line ...
+Defining \prg_break: on line ...
+Defining \prg_break:n on line ...
Defining \__exp_arg_next:nnn on line ...
Defining \__exp_arg_next:Nnn on line ...
Defining \::: on line ...
@@ -2083,7 +2083,10 @@ Defining \group_align_safe_end: on line ...
Defining \g__kernel_prg_map_int on line ...
\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
+Defining \__prg_break_point: on line ...
Defining \__prg_map_break:Nn on line ...
+Defining \__prg_break: on line ...
+Defining \__prg_break:n on line ...
Defining \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
More information about the latex3-commits
mailing list