diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3regex.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3regex.dtx | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx index cd7bd9f33b0..c07583f539e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-10-23} +% \date{Released 2023-11-01} % % \maketitle % @@ -1090,7 +1090,7 @@ % When actually building the result, % \begin{itemize} % \item \tn{toks}\meta{position} holds \meta{tokens} which \texttt{o}- -% and \texttt{x}-expand to the \meta{position}-th token in the query. +% and \texttt{e}-expand to the \meta{position}-th token in the query. % \item \cs{g_@@_balance_intarray} holds the balance of begin-group and % end-group character tokens which appear before that point in the % token list. @@ -1160,12 +1160,12 @@ % % \begin{macro}{\@@_toks_put_left:Ne} % \begin{macro}{\@@_toks_put_right:Ne, \@@_toks_put_right:Nn} -% During the building phase we wish to add \texttt{x}-expanded +% During the building phase we wish to add \texttt{e}-expanded % material to \tn{toks}, either to the left or to the right. The % expansion is done \enquote{by hand} for optimization (these % operations are used quite a lot). The \texttt{Nn} version of % \cs{@@_toks_put_right:Ne} is provided because it is more -% efficient than \texttt{x}-expanding with \cs{exp_not:n}. +% efficient than \texttt{e}-expanding with \cs{exp_not:n}. % \begin{macrocode} \cs_new_protected:Npn \@@_toks_put_left:Ne #1#2 { @@ -1188,7 +1188,7 @@ % \begin{macro}[rEXP]{\@@_curr_cs_to_str:} % Expands to the string representation of the token (known to be a % control sequence) at the current position \cs{l_@@_curr_pos_int}. -% It should only be used in \texttt{x}-expansion to avoid losing a +% It should only be used in \texttt{e}/\texttt{x}-expansion to avoid losing a % leading space. % \begin{macrocode} \cs_new:Npn \@@_curr_cs_to_str: @@ -1705,14 +1705,14 @@ % a string, then read from left to right, interpreting backslashes as % escaping the next character. Unescaped characters are fed to the % function \meta{inline~1}, and escaped characters are fed to the function -% \meta{inline~2} within an \texttt{x}-expansion context (typically those +% \meta{inline~2} within an \texttt{e}-expansion context (typically those % functions perform some tests on their argument to decide how to output % them). The escape sequences |\a|, |\e|, |\f|, |\n|, |\r|, |\t| and % |\x| are recognized, and those are replaced by the corresponding % character, then fed to \meta{inline~3}. The result is then left in the % input stream. Spaces are ignored unless escaped. % -% The conversion is done within an \texttt{x}-expanding assignment. +% The conversion is done within an \texttt{e}-expanding assignment. % % \begin{macro}{\@@_escape_use:nnnn} % The result is built in \cs{l_@@_internal_a_tl}, which is then left @@ -2393,7 +2393,7 @@ % \begin{macro}{\@@_compile:w, \@@_compile_end:} % Used when compiling a user regex or a regex for the |\c{...}| escape % sequence within another regex. Start building a token list within a -% group (with \texttt{x}-expansion at the outset), and set a few +% group (with \texttt{e}-expansion at the outset), and set a few % variables (group level, catcodes), then start the first branch. At % the end, make sure there are no dangling classes nor groups, close % the last branch: we are done building \cs{l_@@_internal_regex}. @@ -3638,7 +3638,7 @@ % % \begin{macro}[EXP]{\@@_compile_u_loop:NN} % We collect the characters for the argument of |\u| within an -% \texttt{x}-expanding assignment. In principle we could just wait to +% \texttt{e}-expanding assignment. In principle we could just wait to % encounter a right brace, but this is unsafe: if the right brace was % missing, then we would reach the end-markers of the regex, and % continue, leading to obscure fatal errors. Instead, we only allow @@ -4220,7 +4220,7 @@ \cs_new_protected:Npn \@@_show_item_exact_cs:n #1 { \seq_set_split:Nnn \l_@@_internal_seq { \scan_stop: } {#1} - \seq_set_map_x:NNn \l_@@_internal_seq + \seq_set_map_e:NNn \l_@@_internal_seq \l_@@_internal_seq { \iow_char:N\\##1 } \@@_show_one:n { control~sequence~ \seq_use:Nn \l_@@_internal_seq { ~or~ } } @@ -5363,7 +5363,7 @@ } \cs_new_protected:Npn \@@_match_once_init_aux: { - \tl_build_clear:N \l_@@_matched_analysis_tl + \tl_build_begin:N \l_@@_matched_analysis_tl \tl_clear:N \l_@@_curr_analysis_tl } % \end{macrocode} @@ -5663,7 +5663,7 @@ \l_@@_fresh_thread_bool \int_set_eq:NN \l_@@_success_pos_int \l_@@_curr_pos_int \int_set_eq:NN \l_@@_last_char_success_int \l_@@_last_char_int - \tl_build_clear:N \l_@@_matched_analysis_tl + \tl_build_begin:N \l_@@_matched_analysis_tl \tl_set_eq:NN \l_@@_success_submatches_tl \l_@@_curr_submatches_tl \prg_break: @@ -5748,7 +5748,7 @@ % \cs{exp_not:n} requires a braced argument. As far as I can tell, it % is only needed if the user tries to include in the replacement text % a control sequence set equal to a macro parameter character, such as -% \cs{c_parameter_token}. Indeed, within an \texttt{x}-expanding +% \cs{c_parameter_token}. Indeed, within an \texttt{e}/\texttt{x}-expanding % assignment, \cs{exp_not:N}~|#| behaves as a single |#|, whereas % \cs{exp_not:n}~|{#}| behaves as a doubled |##|. % \begin{macrocode} @@ -5774,7 +5774,7 @@ % exclusive. The function \cs{@@_query_range:nn} \Arg{min} % \Arg{max} unpacks registers from the position \meta{min} to the % position $\meta{max}-1$ included. Once this is expanded, a second -% \texttt{x}-expansion results in the actual tokens from the +% \texttt{e}-expansion results in the actual tokens from the % query. That second expansion is only done by user functions at the % very end of their operation, after checking (and correcting) the % brace balance first. @@ -6056,9 +6056,7 @@ % Unless the submatch appears inside a |\c{...}| or |\u{...}| % construction, it must be taken into account in the brace balance. % Later on, |##1| will be replaced by a pointer to the $0$-th submatch for a -% given match. There is an \cs{exp_not:N} here as at the point-of-use -% of \cs{g_@@_balance_tl} there is an \texttt{x}-type expansion which is needed -% to get |##1| in correctly. +% given match. % \begin{macrocode} \cs_new_protected:Npn \@@_replacement_put_submatch:n #1 { @@ -6292,7 +6290,7 @@ % % \begin{macro}{\@@_replacement_c_A:w} % For an active character, expansion must be avoided, twice because we -% later do two \texttt{x}-expansions, to unpack \tn{toks} for the +% later do two \texttt{e}-expansions, to unpack \tn{toks} for the % query, and to expand their contents to tokens of the query. % \begin{macrocode} \char_set_catcode_active:N \^^@ @@ -6305,7 +6303,7 @@ % An explicit begin-group token increases the balance, unless within a % |\c{...}| or |\u{...}| construction. Add the desired begin-group % character, using the standard \cs{if_false:} trick. We eventually -% \texttt{x}-expand twice. The first time must yield a balanced token +% \texttt{e}-expand twice. The first time must yield a balanced token % list, and the second one gives the bare begin-group token. The % \cs{exp_after:wN} is not strictly needed, but is more consistent % with \pkg{l3tl-analysis}. @@ -6326,7 +6324,7 @@ % This is not quite catcode-related: when the user requests a % character with category \enquote{control sequence}, the % one-character control symbol is returned. As for the active -% character, we prepare for two \texttt{x}-expansions. +% character, we prepare for two \texttt{e}-expansions. % \begin{macrocode} \cs_new_protected:Npn \@@_replacement_c_C:w #1#2 { @@ -6347,7 +6345,7 @@ % \end{macro} % % \begin{macro}{\@@_replacement_c_E:w} -% Similar to the begin-group case, the second \texttt{x}-expansion +% Similar to the begin-group case, the second \texttt{e}-expansion % produces the bare end-group token. % \begin{macrocode} \char_set_catcode_group_end:N \^^@ @@ -6391,7 +6389,7 @@ % % \begin{macro}{\@@_replacement_c_P:w} % For macro parameters, expansion is a tricky issue. We need to -% prepare for two \texttt{x}-expansions and passing through various +% prepare for two \texttt{e}-expansions and passing through various % macro definitions. Note that we cannot replace one \cs{exp_not:n} by % doubling the macro parameter characters because this would misbehave % if a mischievous user asks for |\c{\cP\#}|, since that macro @@ -7213,7 +7211,7 @@ % this match; we need to add the tokens from the end of the match to % the end of the query. Finally, store the result in the user's % variable after closing the group: this step involves an additional -% \texttt{x}-expansion, and checks that braces are balanced in the +% \texttt{e}-expansion, and checks that braces are balanced in the % final result. % \begin{macrocode} \cs_new_protected:Npn \@@_replace_once:nnN #1#2 @@ -7303,7 +7301,7 @@ % \@@_group_end_replace:N, \@@_group_end_replace_try:, % \@@_group_end_replace_check:w, \@@_group_end_replace_check:n % } -% At this stage \cs{l_@@_internal_a_tl} (|x|-expands to the desired +% At this stage \cs{l_@@_internal_a_tl} (|e|-expands to the desired % result). Guess from \cs{l_@@_balance_int} the number of braces to % add before or after the result then try expanding. The simplest % case is when \cs{l_@@_internal_a_tl} together with the braces we @@ -7476,7 +7474,7 @@ \@@_single_match: #1 \@@_match_init: - \tl_build_clear:N \l_@@_input_tl + \tl_build_begin:N \l_@@_input_tl \@@_match_once_init: \peek_analysis_map_inline:n { @@ -7499,7 +7497,7 @@ % match. For \cs{peek_regex_remove_once:nTF} we reinsert the tokens % seen only if the match failed; otherwise we just reinsert the % tokens~|#1|, with one expansion. To be more precise, |#1| consists -% of tokens that \texttt{o}-expand and \texttt{x}-expand to the last +% of tokens that \texttt{o}-expand and \texttt{e}-expand to the last % token seen, for example it is \cs{exp_not:N} \meta{cs} for a control % sequence. This means that just doing \cs{exp_after:wN} % \cs{l_@@_peek_true_tl} |#1| would be unsafe because the expansion of @@ -7661,12 +7659,12 @@ % \begin{macro}{\@@_peek_replacement_put:n} % While building the replacement function % \cs{@@_replacement_do_one_match:n}, we often want to put simple -% material, given as |#1|, whose \texttt{x}-expansion +% material, given as |#1|, whose \texttt{e}-expansion % \texttt{o}-expands to a single token. Normally we can just add the % token to \cs{l_@@_build_tl}, but for % \cs{peek_regex_replace_once:nnTF} we eventually want to do some % strange expansion that is basically using \cs{exp_after:wN} to jump -% through numerous tokens (we cannot use \texttt{x}-expansion like for +% through numerous tokens (we cannot use \texttt{e}-expansion like for % \cs{regex_replace_once:nnNTF} because it is ok for the result to be % unbalanced since we insert it in the input stream rather than % storing it. When within a csname we don't do any such shenanigan |