[latex3-commits] [git/LaTeX3-latex3-latex3] master: Update rest of L3 for \prg_break: change (9c1a44e)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Mar 27 23:33:52 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/9c1a44e744b8952f406ed79c61a1d80bf0069b4c
>---------------------------------------------------------------
commit 9c1a44e744b8952f406ed79c61a1d80bf0069b4c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Mar 27 22:33:52 2018 +0100
Update rest of L3 for \prg_break: change
This *might* show up an issue as a couple of other people use the break functions.
As they we internal, there's a limited amount we can do ...
>---------------------------------------------------------------
9c1a44e744b8952f406ed79c61a1d80bf0069b4c
l3experimental/l3str/l3str-convert.dtx | 74 ++++++++++++-------------
l3experimental/l3str/l3str-format.dtx | 6 +-
l3trial/l3fp-extras/l3fp-symbolic.dtx | 8 +--
l3trial/l3str-format-new/l3str-format-new.dtx | 8 +--
l3trial/l3tree/l3tree.dtx | 6 +-
5 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/l3experimental/l3str/l3str-convert.dtx b/l3experimental/l3str/l3str-convert.dtx
index 66a0136..c5a6131 100644
--- a/l3experimental/l3str/l3str-convert.dtx
+++ b/l3experimental/l3str/l3str-convert.dtx
@@ -371,14 +371,14 @@
\prg_new_conditional:Npnn \@@_if_contains_char:NN #1#2 { T , TF }
{
\exp_after:wN \@@_if_contains_char_aux:NN \exp_after:wN #2
- #1 { \__prg_break:n { ? \fi: } }
- \__prg_break_point:
+ #1 { \prg_break:n { ? \fi: } }
+ \prg_break_point:
\prg_return_false:
}
\prg_new_conditional:Npnn \@@_if_contains_char:nN #1#2 { TF }
{
- \@@_if_contains_char_aux:NN #2 #1 { \__prg_break:n { ? \fi: } }
- \__prg_break_point:
+ \@@_if_contains_char_aux:NN #2 #1 { \prg_break:n { ? \fi: } }
+ \prg_break_point:
\prg_return_false:
}
\cs_new:Npn \@@_if_contains_char_aux:NN #1#2
@@ -389,7 +389,7 @@
\@@_if_contains_char_aux:NN #1
}
\cs_new:Npn \@@_if_contains_char_true:
- { \__prg_break:n { \prg_return_true: \use_none:n } }
+ { \prg_break:n { \prg_return_true: \use_none:n } }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -561,8 +561,8 @@
{
\exp_after:wN \@@_convert_gmap_loop:NN
\exp_after:wN #1
- \g_@@_result_tl { ? \__prg_break: }
- \__prg_break_point:
+ \g_@@_result_tl { ? \prg_break: }
+ \prg_break_point:
}
}
\cs_new:Npn \@@_convert_gmap_loop:NN #1#2
@@ -586,8 +586,8 @@
{
\exp_after:wN \@@_convert_gmap_internal_loop:Nww
\exp_after:wN #1
- \g_@@_result_tl \s__tl \q_stop \__prg_break: \s__tl
- \__prg_break_point:
+ \g_@@_result_tl \s__tl \q_stop \prg_break: \s__tl
+ \prg_break_point:
}
}
\cs_new:Npn \@@_convert_gmap_internal_loop:Nww #1 #2 \s__tl #3 \s__tl
@@ -856,8 +856,8 @@
\cs_new:Npn \@@_convert_lowercase_alphanum:n #1
{
\exp_after:wN \@@_convert_lowercase_alphanum_loop:N
- \tl_to_str:n {#1} { ? \__prg_break: }
- \__prg_break_point:
+ \tl_to_str:n {#1} { ? \prg_break: }
+ \prg_break_point:
}
\cs_new:Npn \@@_convert_lowercase_alphanum_loop:N #1
{
@@ -932,8 +932,8 @@
\cs_new:Npn \@@_filter_bytes:n #1
{
\@@_filter_bytes_aux:N #1
- { ? \__prg_break: }
- \__prg_break_point:
+ { ? \prg_break: }
+ \prg_break_point:
}
\cs_new:Npn \@@_filter_bytes_aux:N #1
{
@@ -1036,8 +1036,8 @@
{
\__tl_gbuild_x:Nw \g_@@_result_tl
\exp_after:wN \@@_encode_native_loop:w
- \g_@@_result_tl \s__tl { \q_stop \__prg_break: } \s__tl
- \__prg_break_point:
+ \g_@@_result_tl \s__tl { \q_stop \prg_break: } \s__tl
+ \prg_break_point:
\__tl_build_end:
}
\cs_new_protected:Npn \@@_encode_native_loop:w #1 \s__tl #2 \s__tl
@@ -1195,12 +1195,12 @@
\int_zero:N \l_@@_internal_int
\exp_last_unbraced:Nx \@@_decode_eight_bit_load:nn
{ \tl_use:c { c_@@_encoding_#1_tl } }
- { \q_stop \__prg_break: } { }
- \__prg_break_point:
+ { \q_stop \prg_break: } { }
+ \prg_break_point:
\exp_last_unbraced:Nx \@@_decode_eight_bit_load_missing:n
{ \tl_use:c { c_@@_encoding_#1_missing_tl } }
- { \q_stop \__prg_break: }
- \__prg_break_point:
+ { \q_stop \prg_break: }
+ \prg_break_point:
\flag_clear:n { str_error }
\@@_convert_gmap:N \@@_decode_eight_bit_char:N
\@@_if_flag_error:nnx { str_error } { decode-8-bit } {#1}
@@ -1253,8 +1253,8 @@
\int_zero:N \l_@@_internal_int
\exp_last_unbraced:Nx \@@_encode_eight_bit_load:nn
{ \tl_use:c { c_@@_encoding_#1_tl } }
- { \q_stop \__prg_break: } { }
- \__prg_break_point:
+ { \q_stop \prg_break: } { }
+ \prg_break_point:
\flag_clear:n { str_error }
\@@_convert_gmap_internal:N \@@_encode_eight_bit_char:n
\@@_if_flag_error:nnx { str_error } { encode-8-bit } {#1}
@@ -1405,8 +1405,8 @@
\@@_output_byte:w "
\exp_last_unbraced:Nf \@@_unescape_hex_auxi:N
{ \tl_to_str:N \g_@@_result_tl }
- 0 { ? 0 - 1 \__prg_break: }
- \__prg_break_point:
+ 0 { ? 0 - 1 \prg_break: }
+ \prg_break_point:
\@@_output_end:
}
\@@_if_flag_error:nnx { str_error } { unescape-hex } { }
@@ -1484,8 +1484,8 @@
\tl_gset:Nx \g_@@_result_tl
{
\exp_after:wN #3 \g_@@_result_tl
- #1 ? { ? \__prg_break: }
- \__prg_break_point:
+ #1 ? { ? \prg_break: }
+ \prg_break_point:
}
\@@_if_flag_error:nnx { str_byte } { non-byte } { #2 }
\@@_if_flag_error:nnx { str_error } { unescape-#2 } { }
@@ -1576,14 +1576,14 @@
\tl_gset:Nx \g_@@_result_tl
{
\exp_after:wN \@@_unescape_string_newlines:wN
- \g_@@_result_tl \__prg_break: ^^M ?
- \__prg_break_point:
+ \g_@@_result_tl \prg_break: ^^M ?
+ \prg_break_point:
}
\tl_gset:Nx \g_@@_result_tl
{
\exp_after:wN \@@_unescape_string_loop:wNNN
- \g_@@_result_tl #1 ?? { ? \__prg_break: }
- \__prg_break_point:
+ \g_@@_result_tl #1 ?? { ? \prg_break: }
+ \prg_break_point:
}
\@@_if_flag_error:nnx { str_byte } { non-byte } { string }
\@@_if_flag_error:nnx { str_error } { unescape-string } { }
@@ -2026,7 +2026,7 @@
% need to check whether we reached the end of the string. In a correct
% \textsc{utf-8} string, this happens automatically when the
% \texttt{_start} auxiliary leaves its first argument in the input
-% stream: the end-marker begins with \cs{__prg_break:}, which ends
+% stream: the end-marker begins with \cs{prg_break:}, which ends
% the loop. On the other hand, if the end is reached when looking for
% a continuation byte, the \cs{use_none:n} |#3| construction removes
% the first token from the end-marker, and leaves the \texttt{_end}
@@ -2043,8 +2043,8 @@
\tl_gset:Nx \g_@@_result_tl
{
\exp_after:wN \@@_decode_utf_viii_start:N \g_@@_result_tl
- { \__prg_break: \@@_decode_utf_viii_end: }
- \__prg_break_point:
+ { \prg_break: \@@_decode_utf_viii_end: }
+ \prg_break_point:
}
\@@_if_flag_error:nnx { str_error } { utf8-decode } { }
}
@@ -2126,7 +2126,7 @@
\flag_raise:n { str_missing }
\flag_raise:n { str_error }
\int_use:N \c_@@_replacement_char_int \s__tl
- \__prg_break:
+ \prg_break:
}
% \end{macrocode}
% \end{macro}
@@ -2338,7 +2338,7 @@
{
\exp_after:wN \@@_decode_utf_xvi_pair:NN
#2 \q_nil \q_nil
- \__prg_break_point:
+ \prg_break_point:
}
\@@_if_flag_error:nnx { str_error } { utf16-decode } { }
}
@@ -2440,7 +2440,7 @@
\else:
\@@_decode_utf_xvi_error:nNN { end } #1 \prg_do_nothing:
\fi:
- \__prg_break:
+ \prg_break:
}
\cs_new:Npn \@@_decode_utf_xvi_extra:NNw #1#2 \s__tl #3 \s__tl
{ \@@_decode_utf_xvi_error:nNN { extra } #1#2 }
@@ -2625,7 +2625,7 @@
{
\exp_after:wN \@@_decode_utf_xxxii_loop:NNNN
#2 \s__stop \s__stop \s__stop \s__stop
- \__prg_break_point:
+ \prg_break_point:
}
\@@_if_flag_error:nnx { str_error } { utf32-decode } { }
}
@@ -2661,7 +2661,7 @@
#1 \s__tl
\int_use:N \c_@@_replacement_char_int \s__tl
}
- \__prg_break:
+ \prg_break:
}
% \end{macrocode}
% \end{macro}
diff --git a/l3experimental/l3str/l3str-format.dtx b/l3experimental/l3str/l3str-format.dtx
index 8075162..2be66e1 100644
--- a/l3experimental/l3str/l3str-format.dtx
+++ b/l3experimental/l3str/l3str-format.dtx
@@ -214,14 +214,14 @@
\prg_new_conditional:Npnn \@@_if_in:nN #1#2 { TF }
{
\@@_if_in_aux:NN #2 #1
- { #2 \prg_return_false: \exp_after:wN \__prg_break: \else: }
- \__prg_break_point:
+ { #2 \prg_return_false: \exp_after:wN \prg_break: \else: }
+ \prg_break_point:
}
\cs_new:Npn \@@_if_in_aux:NN #1#2
{
\if_charcode:w #1 #2
\prg_return_true:
- \exp_after:wN \__prg_break:
+ \exp_after:wN \prg_break:
\fi:
\@@_if_in_aux:NN #1
}
diff --git a/l3trial/l3fp-extras/l3fp-symbolic.dtx b/l3trial/l3fp-extras/l3fp-symbolic.dtx
index 7337250..5cb70e0 100644
--- a/l3trial/l3fp-extras/l3fp-symbolic.dtx
+++ b/l3trial/l3fp-extras/l3fp-symbolic.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3fp-symbolic.dtx (C) Copyright 2012-2015,2017 The LaTeX3 Project
+%% File l3fp-symbolic.dtx (C) Copyright 2012-2015,2017,2018 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -490,8 +490,8 @@
{ \prg_return_true: }
{
\exp_after:wN \@@_id_if_invalid_aux:N \tl_to_str:n {#1}
- { ? \__prg_break:n \prg_return_false: }
- \__prg_break_point:
+ { ? \prg_break:n \prg_return_false: }
+ \prg_break_point:
}
}
}
@@ -501,7 +501,7 @@
\int_compare:nF { `a <= `#1 <= `z }
{
\int_compare:nF { `A <= `#1 <= `Z }
- { \__prg_break:n \prg_return_true: }
+ { \prg_break:n \prg_return_true: }
}
\@@_id_if_invalid_aux:N
}
diff --git a/l3trial/l3str-format-new/l3str-format-new.dtx b/l3trial/l3str-format-new/l3str-format-new.dtx
index d00f0f8..bd54171 100644
--- a/l3trial/l3str-format-new/l3str-format-new.dtx
+++ b/l3trial/l3str-format-new/l3str-format-new.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3str-format-new.dtx (C) Copyright 2014-2017 The LaTeX3 Project
+%% File: l3str-format-new.dtx (C) Copyright 2014-2018 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -1041,14 +1041,14 @@
\prg_new_conditional:Npnn \@@_if_in:nN #1#2 { TF }
{
\@@_if_in_aux:NN #2 #1
- { #2 \prg_return_false: \exp_after:wN \__prg_break: \else: }
- \__prg_break_point:
+ { #2 \prg_return_false: \exp_after:wN \prg_break: \else: }
+ \prg_break_point:
}
\cs_new:Npn \@@_if_in_aux:NN #1#2
{
\if_charcode:w #1 #2
\prg_return_true:
- \exp_after:wN \__prg_break:
+ \exp_after:wN \prg_break:
\fi:
\@@_if_in_aux:NN #1
}
diff --git a/l3trial/l3tree/l3tree.dtx b/l3trial/l3tree/l3tree.dtx
index 6588abe..ba63938 100644
--- a/l3trial/l3tree/l3tree.dtx
+++ b/l3trial/l3tree/l3tree.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3tree.dtx (C) Copyright 2012-2014,2016-2017 The LaTeX3 Project
+%% File l3tree.dtx (C) Copyright 2012-2014,2016-2018 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -293,7 +293,7 @@
\s__seq
\exp_after:wN \tree_extract_loop:w
\int_use:N \l_tree_index_int ;
- \__prg_break_point:
+ \prg_break_point:
\s_obj_end
}
\tree_end:
@@ -331,7 +331,7 @@
\cs_new:Npn \tree_extract_loop:w #1 ;
{
\if_int_compare:w #1 = 0 \exp_stop_f:
- \exp_after:wN \__prg_break:
+ \exp_after:wN \prg_break:
\fi:
\exp_not:N \__seq_item:n { \__int_value:w \tex_dimen:D #1 }
\exp_after:wN \tree_extract_loop:w
More information about the latex3-commits
mailing list