[latex3-commits] [git/LaTeX3-latex3-latex3] master: Make scan marks public (9ca515a)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Apr 1 15:20:42 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/9ca515a6b423775cc0cc1eb637d35cd4dcf720de
>---------------------------------------------------------------
commit 9ca515a6b423775cc0cc1eb637d35cd4dcf720de
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Apr 1 11:04:36 2018 +0100
Make scan marks public
>---------------------------------------------------------------
9ca515a6b423775cc0cc1eb637d35cd4dcf720de
l3experimental/l3str/l3str-convert.dtx | 30 +++++++++---------
l3experimental/l3str/l3str-format.dtx | 42 ++++++++++++-------------
l3experimental/xgalley/l3galley.dtx | 12 +++----
l3kernel/l3fp-aux.dtx | 18 +++++------
l3kernel/l3fp-convert.dtx | 4 +--
l3kernel/l3fp-expo.dtx | 4 +--
l3kernel/l3prop.dtx | 2 +-
l3kernel/l3quark.dtx | 38 ++++++++++------------
l3kernel/l3sort.dtx | 6 ++--
l3kernel/l3tl-analysis.dtx | 2 +-
l3kernel/testfiles/m3expl001.luatex.tlg | 6 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 6 ++--
l3kernel/testfiles/m3expl001.tlg | 6 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 6 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 6 ++--
l3kernel/testfiles/m3expl003.luatex.tlg | 6 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 6 ++--
l3kernel/testfiles/m3expl003.tlg | 6 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 6 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 6 ++--
l3kernel/testfiles/m3quark001.lvt | 8 ++---
l3kernel/testfiles/m3quark001.tlg | 2 +-
l3trial/l3bigint/l3bigint.dtx | 14 ++-------
l3trial/l3fp-extras/l3fp-symbolic.dtx | 2 +-
l3trial/l3fp-extras/l3fp-types.dtx | 2 +-
l3trial/l3htoks/l3htoks.dtx | 2 +-
l3trial/l3str-format-new/l3str-format-new.dtx | 30 +++++++++---------
27 files changed, 132 insertions(+), 146 deletions(-)
diff --git a/l3experimental/l3str/l3str-convert.dtx b/l3experimental/l3str/l3str-convert.dtx
index 64e6d1d..2cdd1b3 100644
--- a/l3experimental/l3str/l3str-convert.dtx
+++ b/l3experimental/l3str/l3str-convert.dtx
@@ -2295,7 +2295,7 @@
% big-endianness. The three endianness cases are based on a common
% auxiliary whose first argument is $1$ for big-endian and $2$ for
% little-endian, and whose second argument, delimited by the scan mark
-% \cs{s__stop}, is expanded once (the string may be long; passing
+% \cs{s_stop}, is expanded once (the string may be long; passing
% \cs{g_@@_result_tl} as an argument before expansion is cheaper).
%
% The \cs{@@_decode_utf_xvi:Nw} function defines \cs{@@_tmp:w} to
@@ -2305,13 +2305,13 @@
% \cs{@@_decode_utf_xvi_pair:NN} described below.
% \begin{macrocode}
\cs_new_protected:cpn { @@_convert_decode_utf16be: }
- { \@@_decode_utf_xvi:Nw 1 \g_@@_result_tl \s__stop }
+ { \@@_decode_utf_xvi:Nw 1 \g_@@_result_tl \s_stop }
\cs_new_protected:cpn { @@_convert_decode_utf16le: }
- { \@@_decode_utf_xvi:Nw 2 \g_@@_result_tl \s__stop }
+ { \@@_decode_utf_xvi:Nw 2 \g_@@_result_tl \s_stop }
\cs_new_protected:cpn { @@_convert_decode_utf16: }
{
\exp_after:wN \@@_decode_utf_xvi_bom:NN
- \g_@@_result_tl \s__stop \s__stop \s__stop
+ \g_@@_result_tl \s_stop \s_stop \s_stop
}
\cs_new_protected:Npn \@@_decode_utf_xvi_bom:NN #1#2
{
@@ -2323,7 +2323,7 @@
{ \@@_decode_utf_xvi:Nw 1 #1#2 }
}
}
- \cs_new_protected:Npn \@@_decode_utf_xvi:Nw #1#2 \s__stop
+ \cs_new_protected:Npn \@@_decode_utf_xvi:Nw #1#2 \s_stop
{
\flag_clear:n { str_error }
\flag_clear:n { str_missing }
@@ -2572,7 +2572,7 @@
%
% The structure is similar to \textsc{utf-16} decoding functions. If
% the endianness is not given, test the first $4$ bytes of the string
-% (possibly \cs{s__stop} if the string is too short) for the presence
+% (possibly \cs{s_stop} if the string is too short) for the presence
% of a byte-order mark. If there is a byte-order mark, use that
% endianness, and remove the $4$ bytes, otherwise default to
% big-endian, and leave the $4$ bytes in place. The
@@ -2584,22 +2584,22 @@
% inside an \texttt{x}-expanding assignment to \cs{g_@@_result_tl}.
%
% The \texttt{_loop} auxiliary first checks for the end-of-string
-% marker \cs{s__stop}, calling the \texttt{_end} auxiliary if
+% marker \cs{s_stop}, calling the \texttt{_end} auxiliary if
% appropriate. Otherwise, leave the \meta{4~bytes} \cs{s__tl} behind,
% then check that the code point is not overflowing: the leading byte
% must be $0$, and the following byte at most $16$.
%
% In the ending code, we check that there remains no byte: there
-% should be nothing left until the first \cs{s__stop}. Break the map.
+% should be nothing left until the first \cs{s_stop}. Break the map.
% \begin{macrocode}
\cs_new_protected:cpn { @@_convert_decode_utf32be: }
- { \@@_decode_utf_xxxii:Nw 1 \g_@@_result_tl \s__stop }
+ { \@@_decode_utf_xxxii:Nw 1 \g_@@_result_tl \s_stop }
\cs_new_protected:cpn { @@_convert_decode_utf32le: }
- { \@@_decode_utf_xxxii:Nw 2 \g_@@_result_tl \s__stop }
+ { \@@_decode_utf_xxxii:Nw 2 \g_@@_result_tl \s_stop }
\cs_new_protected:cpn { @@_convert_decode_utf32: }
{
\exp_after:wN \@@_decode_utf_xxxii_bom:NNNN \g_@@_result_tl
- \s__stop \s__stop \s__stop \s__stop \s__stop
+ \s_stop \s_stop \s_stop \s_stop \s_stop
}
\cs_new_protected:Npn \@@_decode_utf_xxxii_bom:NNNN #1#2#3#4
{
@@ -2611,7 +2611,7 @@
{ \@@_decode_utf_xxxii:Nw 1 #1#2#3#4 }
}
}
- \cs_new_protected:Npn \@@_decode_utf_xxxii:Nw #1#2 \s__stop
+ \cs_new_protected:Npn \@@_decode_utf_xxxii:Nw #1#2 \s_stop
{
\flag_clear:n { str_overflow }
\flag_clear:n { str_end }
@@ -2620,14 +2620,14 @@
\tl_gset:Nx \g_@@_result_tl
{
\exp_after:wN \@@_decode_utf_xxxii_loop:NNNN
- #2 \s__stop \s__stop \s__stop \s__stop
+ #2 \s_stop \s_stop \s_stop \s_stop
\prg_break_point:
}
\@@_if_flag_error:nnx { str_error } { utf32-decode } { }
}
\cs_new:Npn \@@_decode_utf_xxxii_loop:NNNN #1#2#3#4
{
- \if_meaning:w \s__stop #4
+ \if_meaning:w \s_stop #4
\exp_after:wN \@@_decode_utf_xxxii_end:w
\fi:
#1#2#3#4 \s__tl
@@ -2648,7 +2648,7 @@
\s__tl
\@@_decode_utf_xxxii_loop:NNNN
}
- \cs_new:Npn \@@_decode_utf_xxxii_end:w #1 \s__stop
+ \cs_new:Npn \@@_decode_utf_xxxii_end:w #1 \s_stop
{
\tl_if_empty:nF {#1}
{
diff --git a/l3experimental/l3str/l3str-format.dtx b/l3experimental/l3str/l3str-format.dtx
index 2be66e1..df16a5f 100644
--- a/l3experimental/l3str/l3str-format.dtx
+++ b/l3experimental/l3str/l3str-format.dtx
@@ -187,7 +187,7 @@
%
% \begin{macro}[EXP]{\@@_if_digit:NTF}
% Here we expect |#1| to be a character with category other, or
-% \cs{s__stop}.
+% \cs{s_stop}.
% \begin{macrocode}
\prg_new_conditional:Npnn \@@_if_digit:N #1 { TF }
{
@@ -199,9 +199,9 @@
%
% \begin{macro}[EXP]
% {\@@_put:nw, \@@_put:ow, \@@_put:fw}
-% Put |#1| after an \cs{s__stop} delimiter.
+% Put |#1| after an \cs{s_stop} delimiter.
% \begin{macrocode}
-\cs_new:Npn \@@_put:nw #1 #2 \s__stop { #2 \s__stop #1 }
+\cs_new:Npn \@@_put:nw #1 #2 \s_stop { #2 \s_stop #1 }
\cs_generate_variant:Nn \@@_put:nw { o , f }
% \end{macrocode}
% \end{macro}
@@ -252,7 +252,7 @@
\cs_new:Npn \@@_parse:n #1
{
\exp_last_unbraced:Nf \@@_parse_auxi:NN
- \__str_to_other:n {#1} \s__stop \s__stop {#1}
+ \__str_to_other:n {#1} \s_stop \s_stop {#1}
}
\cs_new:Npx \@@_parse_auxi:NN #1#2
{
@@ -297,11 +297,11 @@
}
\cs_new:Npn \@@_parse_auxvii:nN #1#2
{
- \token_if_eq_meaning:NNTF \s__stop #2
+ \token_if_eq_meaning:NNTF \s_stop #2
{ \@@_parse_end:nwn { #1 ? } #2 }
{ \@@_parse_end:nwn { #1 #2 } }
}
-\cs_new:Npn \@@_parse_end:nwn #1 #2 \s__stop \s__stop #3
+\cs_new:Npn \@@_parse_end:nwn #1 #2 \s_stop \s_stop #3
{
\tl_if_empty:nF {#2}
{ \__kernel_msg_expandable_error:nnn { str } { invalid-format } {#3} }
@@ -451,9 +451,9 @@
% \end{quote}
% First check that the \meta{alignment} is not |=|, and set the
% default alignment |?| to |<|. Place the modified information after
-% a trailing \cs{s__stop} for later retrieval. Then check that there
+% a trailing \cs{s_stop} for later retrieval. Then check that there
% was no \meta{sign}. The width will be useful later, store it after
-% \cs{s__stop}. Afterwards, store the precision, and the function
+% \cs{s_stop}. Afterwards, store the precision, and the function
% \cs{__str_range:nnn} that will be used to extract the first
% |#5| characters of the string.
% There is a need to use the internal function, as otherwise
@@ -491,14 +491,14 @@
}
}
\@@_tl_s:NNnnNNn
- \s__stop
+ \s_stop
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}[EXP]{\@@_tl_s:NNnnNNn}
% \begin{quote}
-% \cs{@@_tl_s:NNnnNNn} \cs{s__stop} \meta{function}
+% \cs{@@_tl_s:NNnnNNn} \cs{s_stop} \meta{function}
% \Arg{arguments} \Arg{width} \meta{fill} \meta{alignment}
% \Arg{token list}
% \end{quote}
@@ -613,12 +613,12 @@
% \end{quote}
% First set the
% default alignment |?| to |>|. Place the modified information after
-% a trailing \cs{s__stop} for later retrieval. Then check the
+% a trailing \cs{s_stop} for later retrieval. Then check the
% \meta{sign}: if the integer is negative, always put~|-|. Otherwise,
% if the format's \meta{sign} is |~|, put a space (with category
% \enquote{other}); if it is~|+| put |+|; if it is |-| (default), put
% nothing, represented as a brace group. The width |#4| will be
-% useful later, store it after \cs{s__stop}. Afterwards, check that
+% useful later, store it after \cs{s_stop}. Afterwards, check that
% the \meta{precision} was absent. Finally, dispatch depending on the
% \meta{style}.
% \begin{macrocode}
@@ -656,14 +656,14 @@
{ str } { invalid-style-format } {#6} { int }
\@@_int:NwnnNNn \use:n
}
- \s__stop {#7}
+ \s_stop {#7}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}[EXP]{\@@_int:NwnnNNn}
% \begin{quote}
-% \cs{@@_int:NwnnNNn} \meta{function} \cs{s__stop}
+% \cs{@@_int:NwnnNNn} \meta{function} \cs{s_stop}
% \Arg{width} \Arg{sign} \meta{fill} \meta{alignment} \Arg{integer}
% \end{quote}
% Use the |format_align| function corresponding to the
@@ -676,7 +676,7 @@
% \item the \meta{fill} character.
% \end{itemize}
% \begin{macrocode}
-\cs_new:Npn \@@_int:NwnnNNn #1#2 \s__stop #3#4#5#6#7
+\cs_new:Npn \@@_int:NwnnNNn #1#2 \s_stop #3#4#5#6#7
{
\exp_args:Nc \exp_args:Nf
{ @@_align_#6:nnnN }
@@ -723,13 +723,13 @@
% body} |;|
% \end{quote}
% First set the default alignment |?| to |>|. Place the modified
-% information after a trailing \cs{s__stop} for later retrieval. Then
+% information after a trailing \cs{s_stop} for later retrieval. Then
% check the \meta{format sign} and the \meta{fp sign}: if the floating
% point is negative, always put~|-|. Otherwise (including
% \texttt{nan}), if the format's \meta{sign} is |~|, put a space (with
% category \enquote{other}); if it is~|+| put |+|; if it is |-|
% (default), put nothing, represented as a brace group. The width
-% |#4| will be useful later, store it after \cs{s__stop}. Afterwards,
+% |#4| will be useful later, store it after \cs{s_stop}. Afterwards,
% check the \meta{precision}: if it was not given, replace it by $6$
% (default precision). Finally, dispatch depending on the
% \meta{style}.
@@ -766,7 +766,7 @@
{ str } { invalid-style-format } {#6} { fp }
\@@_fp:wnnnNNw \@@_fp_g:wn
}
- \s__stop
+ \s_stop
\s__fp \__fp_chk:w #7 #8
}
% \end{macrocode}
@@ -774,14 +774,14 @@
%
% \begin{macro}[EXP]{\@@_fp:wnnnNNw}
% \begin{quote}
-% \cs{@@_fp:wnnnNNw} \meta{formatting function} \cs{s__stop}
+% \cs{@@_fp:wnnnNNw} \meta{formatting function} \cs{s_stop}
% \Arg{precision} \Arg{width} \Arg{sign} \meta{fill}
% \meta{alignment} \cs{s__fp} \cs{__fp_chk:w} \meta{fp type}
% \meta{fp sign} \meta{fp body} |;|
% \end{quote}
% \begin{macrocode}
\cs_new:Npn \@@_fp:wnnnNNw
- #1 \s__stop #2 #3 #4 #5#6 #7 ;
+ #1 \s_stop #2 #3 #4 #5#6 #7 ;
{
\exp_args:Nc \exp_args:Nf
{ @@_align_#6:nnnN }
@@ -836,7 +836,7 @@
{ \str_range:nnn { #4#5#6#7 0 } { 2 } { #8 + 1 } }
}
\@@_put:fw { \use_i:nnnn #4 . }
- \use_none:n \s__stop
+ \use_none:n \s_stop
}
% \end{macrocode}
% \end{macro}
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index f3bfb38..a2f2411 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -1144,10 +1144,10 @@
%
% \subsection{The \cs{par} token}
%
-% \begin{variable}{\s__par_omit}
+% \begin{variable}{\s_@@_par_omit}
% Used to indicate that a paragraph should be omitted.
% \begin{macrocode}
-\__scan_new:N \s__par_omit
+\scan_new:N \s_@@_par_omit
% \end{macrocode}
% \end{variable}
%
@@ -1162,18 +1162,18 @@
% \begin{macrocode}
\cs_new_protected:Npn \galley_par:
{
- \s__par_omit
+ \s_@@_par_omit
\exp_after:wN \@@_par_auxi: \exp:w \exp_end_continue_f:w
}
\cs_new_protected:Npn \@@_par_auxi:
{
- \peek_meaning:NTF \s__par_omit
+ \peek_meaning:NTF \s_@@_par_omit
{ \@@_par_aux:N }
{ \@@_par_auxii: }
}
\cs_new_protected:Npn \@@_par_aux:N #1
{
- \str_if_eq_x:nnF {#1} { \s__par_omit }
+ \str_if_eq_x:nnF {#1} { \s_@@_par_omit }
{
\@@_par_auxii:
#1
@@ -1283,7 +1283,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \galley_par:n #1
{
- \s__par_omit
+ \s_@@_par_omit
\bool_if:NF \g_@@_begin_level_bool
{
#1
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index 316eb7f..02e8f3d 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -239,7 +239,7 @@
% However, when typeset, \cs{s_@@} does nothing, and \cs{@@_chk:w} is
% expanded. We define \cs{@@_chk:w} to produce an error.
% \begin{macrocode}
-\__scan_new:N \s_@@
+\scan_new:N \s_@@
\cs_new_protected:Npn \@@_chk:w #1 ;
{ \@@_misused:n { \s_@@ \@@_chk:w #1 ; } }
% \end{macrocode}
@@ -248,8 +248,8 @@
% \begin{macro}{\s_@@_mark, \s_@@_stop}
% Aliases of \cs{tex_relax:D}, used to terminate expressions.
% \begin{macrocode}
-\__scan_new:N \s_@@_mark
-\__scan_new:N \s_@@_stop
+\scan_new:N \s_@@_mark
+\scan_new:N \s_@@_stop
% \end{macrocode}
% \end{macro}
%
@@ -261,11 +261,11 @@
% A couple of scan marks used to indicate where special floating point
% numbers come from.
% \begin{macrocode}
-\__scan_new:N \s_@@_invalid
-\__scan_new:N \s_@@_underflow
-\__scan_new:N \s_@@_overflow
-\__scan_new:N \s_@@_division
-\__scan_new:N \s_@@_exact
+\scan_new:N \s_@@_invalid
+\scan_new:N \s_@@_underflow
+\scan_new:N \s_@@_overflow
+\scan_new:N \s_@@_division
+\scan_new:N \s_@@_exact
% \end{macrocode}
% \end{macro}
%
@@ -493,7 +493,7 @@
% an error, just like usual floating point numbers.
% Tuples may have zero or one element.
% \begin{macrocode}
-\__scan_new:N \s_@@_tuple
+\scan_new:N \s_@@_tuple
\cs_new_protected:Npn \@@_tuple_chk:w #1 ;
{ \@@_misused:n { \s_@@_tuple \@@_tuple_chk:w #1 ; } }
\tl_const:Nn \c_@@_empty_tuple_fp
diff --git a/l3kernel/l3fp-convert.dtx b/l3kernel/l3fp-convert.dtx
index e4f6831..34af6f2 100644
--- a/l3kernel/l3fp-convert.dtx
+++ b/l3kernel/l3fp-convert.dtx
@@ -109,11 +109,11 @@
\cs_new:Npn \@@_trim_zeros:w #1 ;
{
\@@_trim_zeros_loop:w #1
- ; \@@_trim_zeros_loop:w 0; \@@_trim_zeros_dot:w .; \s__stop
+ ; \@@_trim_zeros_loop:w 0; \@@_trim_zeros_dot:w .; \s_stop
}
\cs_new:Npn \@@_trim_zeros_loop:w #1 0; #2 { #2 #1 ; #2 }
\cs_new:Npn \@@_trim_zeros_dot:w #1 .; { \@@_trim_zeros_end:w #1 ; }
-\cs_new:Npn \@@_trim_zeros_end:w #1 ; #2 \s__stop { #1 }
+\cs_new:Npn \@@_trim_zeros_end:w #1 ; #2 \s_stop { #1 }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3kernel/l3fp-expo.dtx b/l3kernel/l3fp-expo.dtx
index 29ee2a8..c4810a0 100644
--- a/l3kernel/l3fp-expo.dtx
+++ b/l3kernel/l3fp-expo.dtx
@@ -698,7 +698,7 @@
; #2#3#4 0000 0000 ;
}
\cs_new:Npn \@@_exp_Taylor_ii:ww #1; #2;
- { \@@_exp_Taylor_loop:www 10 ; #1 ; #1 ; \s__stop }
+ { \@@_exp_Taylor_loop:www 10 ; #1 ; #1 ; \s_stop }
\cs_new:Npn \@@_exp_Taylor_loop:www #1; #2; #3;
{
\if_int_compare:w #1 = 1 \exp_stop_f:
@@ -713,7 +713,7 @@
#2 ;
}
}
-\cs_new:Npn \@@_exp_Taylor_break:Nww #1 #2; #3 \s__stop
+\cs_new:Npn \@@_exp_Taylor_break:Nww #1 #2; #3 \s_stop
{ \@@_fixed_add_one:wN #2 ; }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 496c860..5a2f306 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -526,7 +526,7 @@
% A private scan mark is used as a marker after each key, and at the
% very beginning of the property list.
% \begin{macrocode}
-\__scan_new:N \s_@@
+\scan_new:N \s_@@
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3quark.dtx b/l3kernel/l3quark.dtx
index 69efece..c1e2009 100644
--- a/l3kernel/l3quark.dtx
+++ b/l3kernel/l3quark.dtx
@@ -51,9 +51,7 @@
%
% Two special types of constants in \LaTeX3 are \enquote{quarks} and
% \enquote{scan marks}. By convention all constants of type quark
-% start out with |\q_|, and scan marks start with |\s_|. Scan marks are
-% for internal use by the kernel: they are not intended for more general
-% use.
+% start out with |\q_|, and scan marks start with |\s_|.
%
% \subsection{Quarks}
%
@@ -327,30 +325,26 @@
% This allows to skip to that point if the end of the instructions
% should not be performed (see \pkg{l3regex}).
%
-% The scan marks system is only for internal use by the kernel team in
-% a small number of very specific places. These functions should not be
-% used more generally.
-%
-% \begin{function}{\__scan_new:N}
+% \begin{function}{\scan_new:N}
% \begin{syntax}
-% \cs{__scan_new:N} \meta{scan mark}
+% \cs{scan_new:N} \meta{scan mark}
% \end{syntax}
% Creates a new \meta{scan mark} which is set equal to \cs{scan_stop:}.
% The \meta{scan mark} is defined globally, and an error message
% is raised if the name was already taken by another scan mark.
% \end{function}
%
-% \begin{variable}{\s__stop}
+% \begin{variable}{\s_stop}
% Used at the end of a set of instructions, as a marker
-% that can be jumped to using \cs{__use_none_delimit_by_s__stop:w}.
+% that can be jumped to using \cs{use_none_delimit_by_s_stop:w}.
% \end{variable}
%
-% \begin{function}{\__use_none_delimit_by_s__stop:w}
+% \begin{function}{\use_none_delimit_by_s_stop:w}
% \begin{syntax}
-% \cs{__use_none_delimit_by_s__stop:w} \meta{tokens} \cs{s__stop}
+% \cs{use_none_delimit_by_s_stop:w} \meta{tokens} \cs{s_stop}
% \end{syntax}
-% Removes the \meta{tokens} and \cs{s__stop} from the input stream.
-% This leads to a low-level \TeX{} error if \cs{s__stop} is absent.
+% Removes the \meta{tokens} and \cs{s_stop} from the input stream.
+% This leads to a low-level \TeX{} error if \cs{s_stop} is absent.
% \end{function}
%
% \end{documentation}
@@ -594,12 +588,12 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_new:N}
+% \begin{macro}{\scan_new:N}
% \UnitTested
% Check whether the variable is already a scan mark,
% then declare it to be equal to \cs{scan_stop:} globally.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_new:N #1
+\cs_new_protected:Npn \scan_new:N #1
{
\tl_if_in:NnTF \g_@@_marks_tl { #1 }
{
@@ -614,20 +608,20 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{variable}{\s__stop}
+% \begin{variable}{\s_stop}
% \UnitTested
% We only declare one scan mark here, more can be defined
% by specific modules.
% \begin{macrocode}
-\@@_new:N \s__stop
+\scan_new:N \s_stop
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\__use_none_delimit_by_s__stop:w}
+% \begin{macro}{\use_none_delimit_by_s_stop:w}
% \UnitTested
% Similar to \cs{use_none_delimit_by_q_stop:w}.
% \begin{macrocode}
-\cs_new:Npn \__use_none_delimit_by_s__stop:w #1 \s__stop { }
+\cs_new:Npn \use_none_delimit_by_s_stop:w #1 \s_stop { }
% \end{macrocode}
% \end{macro}
%
@@ -635,7 +629,7 @@
% This private scan mark is needed by \pkg{l3seq}, but that is loaded
% before the quark module, hence its definition is deferred.
% \begin{macrocode}
-\__scan_new:N \s__seq
+\scan_new:N \s__seq
% \end{macrocode}
% \end{variable}
%
diff --git a/l3kernel/l3sort.dtx b/l3kernel/l3sort.dtx
index 331bf3f..868b728 100644
--- a/l3kernel/l3sort.dtx
+++ b/l3kernel/l3sort.dtx
@@ -832,7 +832,7 @@
% \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
-% after \cs{q_mark}, namely removing the trailing \cs{s__stop} and
+% after \cs{q_mark}, namely removing the trailing \cs{s_stop} and
% \cs{q_stop} and leaving \cs{exp_stop_f:} to stop
% \texttt{f}-expansion.
% \begin{macrocode}
@@ -858,9 +858,9 @@
{
\@@_quick_split:NnNn #4 \@@_quick_end:nnTFNn { }
\q_mark { \@@_quick_cleanup:w \exp_stop_f: }
- \s__stop \q_stop
+ \s_stop \q_stop
}
-\cs_new:Npn \@@_quick_cleanup:w #1 \s__stop \q_stop {#1}
+\cs_new:Npn \@@_quick_cleanup:w #1 \s_stop \q_stop {#1}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3kernel/l3tl-analysis.dtx b/l3kernel/l3tl-analysis.dtx
index 7188ad8..9716732 100644
--- a/l3kernel/l3tl-analysis.dtx
+++ b/l3kernel/l3tl-analysis.dtx
@@ -176,7 +176,7 @@
% \cs{exp_stop_f:} \cs{exp_not:N} \cs{q_mark} to extract a character
% code followed by the delimiter in an \texttt{x}-expansion.
% \begin{macrocode}
-\__scan_new:N \s_@@
+\scan_new:N \s_@@
% \end{macrocode}
% \end{variable}
%
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 6d16ae1..be4c29f 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -1923,9 +1923,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 95f0422..0ef3097 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -1604,9 +1604,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 1f597f2..aa8fc8b 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -1604,9 +1604,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index f7a8537..1b04e4b 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -1604,9 +1604,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 9dffc78..e37b037 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -1921,9 +1921,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 6d16ae1..be4c29f 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -1923,9 +1923,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 95f0422..0ef3097 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -1604,9 +1604,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 1f597f2..aa8fc8b 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -1604,9 +1604,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index f7a8537..1b04e4b 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -1604,9 +1604,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 9dffc78..e37b037 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -1921,9 +1921,9 @@ Defining \quark_if_nil:VF on line ...
Defining \quark_if_nil:oF on line ...
Defining \__quark_if_empty_return:o on line ...
Defining \g__scan_marks_tl on line ...
-Defining \__scan_new:N on line ...
-Defining \s__stop on line ...
-Defining \__use_none_delimit_by_s__stop:w on line ...
+Defining \scan_new:N on line ...
+Defining \s_stop on line ...
+Defining \use_none_delimit_by_s_stop:w on line ...
Defining \s__seq on line ...
Defining \if_bool:N on line ...
Defining \if_predicate:w on line ...
diff --git a/l3kernel/testfiles/m3quark001.lvt b/l3kernel/testfiles/m3quark001.lvt
index 00aa14c..d8cc1bc 100644
--- a/l3kernel/testfiles/m3quark001.lvt
+++ b/l3kernel/testfiles/m3quark001.lvt
@@ -83,22 +83,22 @@
}
\TEST{New~scan~mark;~no~worries}{
- \__scan_new:N \s__foo
+ \scan_new:N \s__foo
\iow_term:x { \cs_meaning:N \s__foo }
}
\TEST{New~scan~mark,~same~name:~ERROR!}{
- \__scan_new:N \s__foo
+ \scan_new:N \s__foo
\tl_log:N \g__scan_marks_tl
}
\TESTEXP{Use~none~until~s__stop~(expect~nothing)}{
- \__use_none_delimit_by_s__stop:w \ERROR \s__stop
+ \use_none_delimit_by_s_stop:w \ERROR \s_stop
}
\TEST{Scan~marks~do~nothing~(redundant)}{
\s__foo
- \s__stop
+ \s_stop
}
\END
diff --git a/l3kernel/testfiles/m3quark001.tlg b/l3kernel/testfiles/m3quark001.tlg
index bd6d330..64f8c1b 100644
--- a/l3kernel/testfiles/m3quark001.tlg
+++ b/l3kernel/testfiles/m3quark001.tlg
@@ -101,7 +101,7 @@ l. ...}
| LaTeX has been asked to create a new scan mark '\s__foo' but this name has
| already been used for a scan mark.
|...............................................
-> \g__scan_marks_tl=\s__stop \s__seq \s__prop \s__fp \s__fp_mark \s__fp_stop
+> \g__scan_marks_tl=\s_stop \s__seq \s__prop \s__fp \s__fp_mark \s__fp_stop
\s__fp_invalid \s__fp_underflow \s__fp_overflow \s__fp_division \s__fp_exact
\s__fp_tuple \s__tl \s__foo .
============================================================
diff --git a/l3trial/l3bigint/l3bigint.dtx b/l3trial/l3bigint/l3bigint.dtx
index e6f3730..28db3be 100644
--- a/l3trial/l3bigint/l3bigint.dtx
+++ b/l3trial/l3bigint/l3bigint.dtx
@@ -658,14 +658,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_scan_new:N}
-% A poor man's version of the kernel's \cs{__scan_new:N}.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_scan_new:N #1
- { \cs_new_eq:NN #1 \scan_stop: }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\@@_int_value:w, \@@_int_eval:w, \@@_int_eval_end:}
% Copies of \TeX{}'s and \eTeX{}'s \tn{number} and \tn{numexpr}
% primitives, used for calculations.
@@ -687,7 +679,7 @@
% However, when typeset, \cs{s_@@} does nothing, and \cs{@@_chk:w} is
% defined to produce an error.
% \begin{macrocode}
-\@@_scan_new:N \s_@@
+\scan_new:N \s_@@
\cs_new_protected:Npn \@@_chk:w #1 ;
{
\msg_error:nnx { bigint } { misused-var }
@@ -711,8 +703,8 @@
% \begin{macro}{\s_@@_mark, \s_@@_stop}
% Unexpandable markers for the end of a big integer expression.
% \begin{macrocode}
-\@@_scan_new:N \s_@@_mark
-\@@_scan_new:N \s_@@_stop
+\scan_new:N \s_@@_mark
+\scan_new:N \s_@@_stop
% \end{macrocode}
% \end{macro}
%
diff --git a/l3trial/l3fp-extras/l3fp-symbolic.dtx b/l3trial/l3fp-extras/l3fp-symbolic.dtx
index 5cb70e0..79f0424 100644
--- a/l3trial/l3fp-extras/l3fp-symbolic.dtx
+++ b/l3trial/l3fp-extras/l3fp-symbolic.dtx
@@ -144,7 +144,7 @@
% \begin{variable}[int]{\s_@@_symbolic}
% Scan mark indicating the start of a symbolic expression.
% \begin{macrocode}
-\__scan_new:N \s_@@_symbolic
+\scan_new:N \s_@@_symbolic
% \end{macrocode}
% \end{variable}
%
diff --git a/l3trial/l3fp-extras/l3fp-types.dtx b/l3trial/l3fp-extras/l3fp-types.dtx
index b34e285..9ed5ec3 100644
--- a/l3trial/l3fp-extras/l3fp-types.dtx
+++ b/l3trial/l3fp-extras/l3fp-types.dtx
@@ -263,7 +263,7 @@
% Marks the start of some \texttt{N}-type tokens stored as a
% floating-point object.
% \begin{macrocode}
-\__scan_new:N \s_@@_tokens
+\scan_new:N \s_@@_tokens
% \end{macrocode}
% \end{variable}
%
diff --git a/l3trial/l3htoks/l3htoks.dtx b/l3trial/l3htoks/l3htoks.dtx
index 324ec1e..57dda83 100644
--- a/l3trial/l3htoks/l3htoks.dtx
+++ b/l3trial/l3htoks/l3htoks.dtx
@@ -213,7 +213,7 @@
%
% \begin{variable}{\s_@@}
% \begin{macrocode}
-\__scan_new:N \s_@@
+\scan_new:N \s_@@
% \end{macrocode}
% \end{variable}
%
diff --git a/l3trial/l3str-format-new/l3str-format-new.dtx b/l3trial/l3str-format-new/l3str-format-new.dtx
index bc68092..c6b558d 100644
--- a/l3trial/l3str-format-new/l3str-format-new.dtx
+++ b/l3trial/l3str-format-new/l3str-format-new.dtx
@@ -1018,7 +1018,7 @@
%
% \begin{macro}[EXP]{\@@_if_digit:NTF}
% Here we expect |#1| to be a character with category other, or
-% \cs{s__stop}.
+% \cs{s_stop}.
% \begin{macrocode}
\prg_new_conditional:Npnn \@@_if_digit:N #1 { TF }
{
@@ -1030,9 +1030,9 @@
%
% \begin{macro}[EXP]
% {\@@_put:nw, \@@_put:ow, \@@_put:fw}
-% Put |#1| after an \cs{s__stop} delimiter.
+% Put |#1| after an \cs{s_stop} delimiter.
% \begin{macrocode}
-\cs_new:Npn \@@_put:nw #1 #2 \s__stop { #2 \s__stop #1 }
+\cs_new:Npn \@@_put:nw #1 #2 \s_stop { #2 \s_stop #1 }
\cs_generate_variant:Nn \@@_put:nw { o , f }
% \end{macrocode}
% \end{macro}
@@ -1083,7 +1083,7 @@
\cs_new:Npn \@@_python:n #1
{
\exp_last_unbraced:Nf \@@_python_auxi:NN
- \__str_to_other:n {#1} \s__stop \s__stop {#1}
+ \__str_to_other:n {#1} \s_stop \s_stop {#1}
}
\cs_new:Npx \@@_python_auxi:NN #1#2
{
@@ -1128,11 +1128,11 @@
}
\cs_new:Npn \@@_python_auxvii:nN #1#2
{
- \token_if_eq_meaning:NNTF \s__stop #2
+ \token_if_eq_meaning:NNTF \s_stop #2
{ \@@_python_end:nwn { #1 ? } #2 }
{ \@@_python_end:nwn { #1 #2 } }
}
-\cs_new:Npn \@@_python_end:nwn #1 #2 \s__stop \s__stop #3
+\cs_new:Npn \@@_python_end:nwn #1 #2 \s_stop \s_stop #3
{
\tl_if_empty:nF {#2}
{ \__kernel_msg_expandable_error:nnn { str } { invalid-format } {#3} }
@@ -1169,9 +1169,9 @@
% \end{quote}
% First check that the \meta{alignment} is not |=|, and set the
% default alignment |?| to |<|. Place the modified information after
-% a trailing \cs{s__stop} for later retrieval. Then check that there
+% a trailing \cs{s_stop} for later retrieval. Then check that there
% was no \meta{sign}. The width will be useful later, store it after
-% \cs{s__stop}. Afterwards, store the precision, and the function
+% \cs{s_stop}. Afterwards, store the precision, and the function
% \cs{__str_range_unsafe:nnn} that will be used to extract the first
% |#5| characters of the string.
% There is a need to use the \enquote{unsafe} function, as otherwise
@@ -1209,14 +1209,14 @@
}
}
\@@_tl_s:NNnnNNn
- \s__stop
+ \s_stop
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}[EXP]{\@@_tl_s:NNnnNNn}
% \begin{quote}
-% \cs{@@_tl_s:NNnnNNn} \cs{s__stop} \meta{function}
+% \cs{@@_tl_s:NNnnNNn} \cs{s_stop} \meta{function}
% \Arg{arguments} \Arg{width} \meta{fill} \meta{alignment}
% \Arg{token list}
% \end{quote}
@@ -1331,12 +1331,12 @@
% \end{quote}
% First set the
% default alignment |?| to |>|. Place the modified information after
-% a trailing \cs{s__stop} for later retrieval. Then check the
+% a trailing \cs{s_stop} for later retrieval. Then check the
% \meta{sign}: if the integer is negative, always put~|-|. Otherwise,
% if the format's \meta{sign} is |~|, put a space (with category
% \enquote{other}); if it is~|+| put |+|; if it is |-| (default), put
% nothing, represented as a brace group. The width |#4| will be
-% useful later, store it after \cs{s__stop}. Afterwards, check that
+% useful later, store it after \cs{s_stop}. Afterwards, check that
% the \meta{precision} was absent. Finally, dispatch depending on the
% \meta{style}.
% \begin{macrocode}
@@ -1374,14 +1374,14 @@
{ str } { invalid-style-format } {#6} { int }
\@@_int:NwnnNNn \use:n
}
- \s__stop {#7}
+ \s_stop {#7}
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}[EXP]{\@@_int:NwnnNNn}
% \begin{quote}
-% \cs{@@_int:NwnnNNn} \meta{function} \cs{s__stop}
+% \cs{@@_int:NwnnNNn} \meta{function} \cs{s_stop}
% \Arg{width} \Arg{sign} \meta{fill} \meta{alignment} \Arg{integer}
% \end{quote}
% Use the |format_align| function corresponding to the
@@ -1394,7 +1394,7 @@
% \item the \meta{fill} character.
% \end{itemize}
% \begin{macrocode}
-\cs_new:Npn \@@_int:NwnnNNn #1#2 \s__stop #3#4#5#6#7
+\cs_new:Npn \@@_int:NwnnNNn #1#2 \s_stop #3#4#5#6#7
{
\exp_args:Nc \exp_args:Nf
{ @@_align_#6:nnnN }
More information about the latex3-commits
mailing list