diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3regex.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3regex.dtx | 228 |
1 files changed, 114 insertions, 114 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx index 3808ec66d17..e811b8c4db4 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3regex.dtx Copyright (C) 2011-2017 The LaTeX3 Project +%% File: l3regex.dtx Copyright (C) 2011-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 @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2017/12/16} +% \date{Released 2018/02/21} % % \maketitle % @@ -120,8 +120,8 @@ % sign. % \item \verb*"[+\-\ ]*\d+\ *" matches an explicit integer with any % number of $+$ and $-$ signs, with spaces allowed except within the -% mantissa, and sourrounded by spaces. -% \item \verb*"[+\-\ ]*(\d+|\d*\.\d+)\ *" matches an explict integer or +% mantissa, and surrounded by spaces. +% \item \verb*"[+\-\ ]*(\d+|\d*\.\d+)\ *" matches an explicit integer or % decimal number; using \verb*"[.,]" instead of \verb*"\." would allow % the comma as a decimal marker. % \item @@ -537,7 +537,7 @@ % equal to the number of times % \meta{regular expression} appears in \meta{token list}. % The search starts by finding the left-most longest match, -% respecting greedy and ungreedy operators. Then the search +% respecting greedy and lazy (non-greedy) operators. Then the search % starts again from the character following the last character % of the previous match, until reaching the end of the token list. % Infinite loops are prevented in the case where the regular expression @@ -1457,11 +1457,11 @@ % \cs{__tl_build_one:o} by a single call to \cs{__tl_build_one:x}, because % the \texttt{x}-expanding assignment may be interrupted by |\x|. % \begin{macrocode} -\__debug_patch:nnNNpn +\__kernel_patch:nnNNpn { - \__debug_trace_push:nnN { regex } { 1 } \@@_escape_use:nnnn + \@@_trace_push:nnN { regex } { 1 } \@@_escape_use:nnnn \__tl_build:Nw \l_@@_internal_a_tl - \__tl_build_one:n { \__debug_trace_pop:nnN { regex } { 1 } \@@_escape_use:nnnn } + \__tl_build_one:n { \@@_trace_pop:nnN { regex } { 1 } \@@_escape_use:nnnn } \use_none:nn } { } @@ -1536,7 +1536,7 @@ \cs_new:cpn { @@_escape_/break:w } { \if_false: { \fi: } - \__msg_kernel_error:nn { kernel } { trailing-backslash } + \__kernel_msg_error:nn { kernel } { trailing-backslash } \exp_after:wN \use_none:n \exp_after:wN { \if_false: } \fi: } \cs_new:cpn { @@_escape_~:w } { } @@ -1575,7 +1575,7 @@ { \if_false: { \fi: } \__tl_build_one:o \l_@@_internal_b_tl - \__msg_kernel_error:nnx { kernel } { x-overflow } {#1} + \__kernel_msg_error:nnx { kernel } { x-overflow } {#1} \tl_set:Nx \l_@@_internal_b_tl { \if_false: } \fi: } @@ -1664,7 +1664,7 @@ { \if_false: { \fi: } \__tl_build_one:o \l_@@_internal_b_tl - \__msg_kernel_error:nnx { kernel } { x-missing-rbrace } {#1} + \__kernel_msg_error:nnx { kernel } { x-missing-rbrace } {#1} \tl_set:Nx \l_@@_internal_b_tl { \if_false: } \fi: \@@_escape_loop:N #1 } @@ -2080,7 +2080,7 @@ \if_int_compare:w \l_@@_mode_int = \c_@@_class_mode_int \exp_after:wN \exp_after:wN \exp_after:wN \use:n \else: - \__msg_kernel_error:nn { kernel } { c-bad-mode } + \__kernel_msg_error:nn { kernel } { c-bad-mode } \exp_after:wN \exp_after:wN \exp_after:wN \use_none:n \fi: \fi: @@ -2129,13 +2129,13 @@ { \@@_if_in_class:TF { - \__msg_kernel_error:nn { kernel } { missing-rbrack } + \__kernel_msg_error:nn { kernel } { missing-rbrack } \use:c { @@_compile_]: } \prg_do_nothing: \prg_do_nothing: } { } \if_int_compare:w \l_@@_group_level_int > 0 \exp_stop_f: - \__msg_kernel_error:nnx { kernel } { missing-rparen } + \__kernel_msg_error:nnx { kernel } { missing-rparen } { \int_use:N \l_@@_group_level_int } \prg_replicate:nn { \l_@@_group_level_int } @@ -2186,10 +2186,10 @@ \prg_do_nothing: \prg_do_nothing: \prg_do_nothing: \prg_do_nothing: \int_compare:nNnT \l_@@_mode_int = \c_@@_catcode_mode_int - { \__msg_kernel_error:nn { kernel } { c-trailing } } + { \__kernel_msg_error:nn { kernel } { c-trailing } } \int_compare:nNnT \l_@@_mode_int < \c_@@_outer_mode_int { - \__msg_kernel_error:nn { kernel } { c-missing-rbrace } + \__kernel_msg_error:nn { kernel } { c-missing-rbrace } \@@_compile_end_cs: \prg_do_nothing: \prg_do_nothing: \prg_do_nothing: \prg_do_nothing: @@ -2296,7 +2296,7 @@ \cs_new_protected:Npn \@@_compile_quantifier_abort:xNN #1#2#3 { \@@_compile_quantifier_none: - \__msg_kernel_warning:nnxx { kernel } { invalid-quantifier } {#1} {#3} + \__kernel_msg_warning:nnxx { kernel } { invalid-quantifier } {#1} {#3} \@@_compile_abort_tokens:x {#1} #2 #3 } @@ -2409,7 +2409,7 @@ { #1 #2 } { \@@_compile_special:N \c_right_brace_str } { \if_int_compare:w \l_@@_internal_a_int > \l_@@_internal_b_int - \__msg_kernel_error:nnxx { kernel } { backwards-quantifier } + \__kernel_msg_error:nnxx { kernel } { backwards-quantifier } { \int_use:N \l_@@_internal_a_int } { \int_use:N \l_@@_internal_b_int } \int_zero:N \l_@@_internal_b_int @@ -2443,7 +2443,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_compile_raw_error:N #1 { - \__msg_kernel_error:nnx { kernel } { bad-escape } {#1} + \__kernel_msg_error:nnx { kernel } { bad-escape } {#1} \@@_compile_raw:N #1 } % \end{macrocode} @@ -2502,7 +2502,7 @@ \@@_if_end_range:NNTF #2 #3 { \if_int_compare:w `#1 > `#3 \exp_stop_f: - \__msg_kernel_error:nnxx { kernel } { range-backwards } {#1} {#3} + \__kernel_msg_error:nnxx { kernel } { range-backwards } {#1} {#3} \else: \__tl_build_one:x { @@ -2516,7 +2516,7 @@ \fi: } { - \__msg_kernel_warning:nnxx { kernel } { range-missing-end } + \__kernel_msg_warning:nnxx { kernel } { range-missing-end } {#1} { \c_backslash_str #3 } \__tl_build_one:x { @@ -2794,8 +2794,8 @@ \str_case:nn { #2 } { : { \@@_compile_class_posix:NNNNw } - = { \__msg_kernel_warning:nnx { kernel } { posix-unsupported } { = } } - . { \__msg_kernel_warning:nnx { kernel } { posix-unsupported } { . } } + = { \__kernel_msg_warning:nnx { kernel } { posix-unsupported } { = } } + . { \__kernel_msg_warning:nnx { kernel } { posix-unsupported } { . } } } } \@@_compile_raw:N [ #1 #2 @@ -2834,7 +2834,7 @@ } } { - \__msg_kernel_warning:nnx { kernel } { posix-unknown } + \__kernel_msg_warning:nnx { kernel } { posix-unknown } { \l_@@_internal_a_tl } \@@_compile_abort_tokens:x { @@ -2844,7 +2844,7 @@ } } { - \__msg_kernel_error:nnxx { kernel } { posix-missing-close } + \__kernel_msg_error:nnxx { kernel } { posix-missing-close } { [: \l_@@_internal_a_tl } { #2 #4 } \@@_compile_abort_tokens:x { [: \l_@@_internal_a_tl } #1 #2 #3 #4 @@ -2886,7 +2886,7 @@ \__tl_build_one:o \l_@@_internal_regex \exp_after:wN \@@_compile_quantifier:w \else: - \__msg_kernel_warning:nn { kernel } { extra-rparen } + \__kernel_msg_warning:nn { kernel } { extra-rparen } \exp_after:wN \@@_compile_raw:N \exp_after:wN ) \fi: } @@ -2910,7 +2910,7 @@ \cs_if_exist_use:cF { @@_compile_special_group_\token_to_str:N #4 :w } { - \__msg_kernel_warning:nnx { kernel } { special-group-unknown } + \__kernel_msg_warning:nnx { kernel } { special-group-unknown } { (? #4 } \@@_compile_group_begin:N \@@_group:nnnN \@@_compile_raw:N ? #3 #4 @@ -2977,7 +2977,7 @@ \cs_set:Npn \@@_item_range:nn { \@@_item_caseless_range:nn } } { - \__msg_kernel_warning:nnx { kernel } { unknown-option } { (?i #2 } + \__kernel_msg_warning:nnx { kernel } { unknown-option } { (?i #2 } \@@_compile_raw:N ( \@@_compile_raw:N ? \@@_compile_raw:N i @@ -2993,7 +2993,7 @@ \cs_set:Npn \@@_item_range:nn { \@@_item_caseful_range:nn } } { - \__msg_kernel_warning:nnx { kernel } { unknown-option } { (?-#2#4 } + \__kernel_msg_warning:nnx { kernel } { unknown-option } { (?-#2#4 } \@@_compile_raw:N ( \@@_compile_raw:N ? \@@_compile_raw:N - @@ -3031,7 +3031,7 @@ } { \cs_if_exist_use:cF { @@_compile_c_#2:w } } { - \__msg_kernel_error:nnx { kernel } { c-missing-category } {#2} + \__kernel_msg_error:nnx { kernel } { c-missing-category } {#2} #1 #2 } } @@ -3052,7 +3052,7 @@ { \token_if_eq_charcode:NNF #2 ( } % ) } { \use:n } - { \__msg_kernel_error:nnn { kernel } { c-C-invalid } {#2} } + { \__kernel_msg_error:nnn { kernel } { c-C-invalid } {#2} } #1 #2 } % \end{macrocode} @@ -3105,7 +3105,7 @@ { \@@_compile_c_lbrack_end: } } { - \__msg_kernel_error:nnx { kernel } { c-missing-rbrack } {#2} + \__kernel_msg_error:nnx { kernel } { c-missing-rbrack } {#2} \@@_compile_c_lbrack_end: #1 #2 } @@ -3251,7 +3251,7 @@ \@@_compile_u_loop:NN } { - \__msg_kernel_error:nn { kernel } { u-missing-lbrace } + \__kernel_msg_error:nn { kernel } { u-missing-lbrace } \@@_compile_raw:N u #1 #2 } } @@ -3269,7 +3269,7 @@ } { \if_false: { \fi: } - \__msg_kernel_error:nnx { kernel } { u-missing-rbrace } {#2} + \__kernel_msg_error:nnx { kernel } { u-missing-rbrace } {#2} \@@_compile_u_end: #1 #2 } @@ -3685,11 +3685,11 @@ \@@_compile:n {#1} \@@_build:N \l_@@_internal_regex } -\__debug_patch:nnNNpn - { \__debug_trace_push:nnN { regex } { 1 } \@@_build:N } +\__kernel_patch:nnNNpn + { \@@_trace_push:nnN { regex } { 1 } \@@_build:N } { \@@_trace_states:n { 2 } - \__debug_trace_pop:nnN { regex } { 1 } \@@_build:N + \@@_trace_pop:nnN { regex } { 1 } \@@_build:N } \cs_new_protected:Npn \@@_build:N #1 { @@ -3714,11 +3714,11 @@ % work properly at the outer level, we need to put the appropriate % \texttt{left} and \texttt{right} states in their sequence. % \begin{macrocode} -\__debug_patch:nnNNpn - { \__debug_trace_push:nnN { regex } { 1 } \@@_build_for_cs:n } +\__kernel_patch:nnNNpn + { \@@_trace_push:nnN { regex } { 1 } \@@_build_for_cs:n } { \@@_trace_states:n { 2 } - \__debug_trace_pop:nnN { regex } { 1 } \@@_build_for_cs:n + \@@_trace_pop:nnN { regex } { 1 } \@@_build_for_cs:n } \cs_new_protected:Npn \@@_build_for_cs:n #1 { @@ -3786,9 +3786,9 @@ % \texttt{right} state is the new empty state, and the \texttt{left} % state points to the previously \enquote{current} state. % \begin{macrocode} -\__debug_patch:nnNNpn +\__kernel_patch:nnNNpn { - \__debug_trace:nnx { regex } { 2 } + \@@_trace:nnx { regex } { 2 } { regex~new~state~ L=\int_use:N \l_@@_left_state_int ~ -> ~ @@ -3952,9 +3952,9 @@ % auxiliaries expects \texttt{left_state} and \texttt{right_state} to % be set properly. % \begin{macrocode} -\__debug_patch:nnNNpn - { \__debug_trace_push:nnN { regex } { 1 } \@@_group_aux:nnnnN } - { \__debug_trace_pop:nnN { regex } { 1 } \@@_group_aux:nnnnN } +\__kernel_patch:nnNNpn + { \@@_trace_push:nnN { regex } { 1 } \@@_group_aux:nnnnN } + { \@@_trace_pop:nnN { regex } { 1 } \@@_group_aux:nnnnN } \cs_new_protected:Npn \@@_group_aux:nnnnN #1#2#3#4#5 { \if_int_compare:w #3 = 0 \exp_stop_f: @@ -4035,9 +4035,9 @@ % the group. The left and right states of the group are extracted from % the relevant sequences. % \begin{macrocode} -\__debug_patch:nnNNpn - { \__debug_trace_push:nnN { regex } { 1 } \@@_branch:n } - { \__debug_trace_pop:nnN { regex } { 1 } \@@_branch:n } +\__kernel_patch:nnNNpn + { \@@_trace_push:nnN { regex } { 1 } \@@_branch:n } + { \@@_trace_pop:nnN { regex } { 1 } \@@_branch:n } \cs_new_protected:Npn \@@_branch:n #1 { \@@_build_new_state: @@ -4533,12 +4533,12 @@ % smothering an empty match at the start). Once all this is set up, we % are ready for the ride. Find the first match. % \begin{macrocode} -\__debug_patch:nnNNpn +\__kernel_patch:nnNNpn { - \__debug_trace_push:nnN { regex } { 1 } \@@_match:n - \__debug_trace:nnx { regex } { 1 } { analyzing~query~token~list } + \@@_trace_push:nnN { regex } { 1 } \@@_match:n + \@@_trace:nnx { regex } { 1 } { analyzing~query~token~list } } - { \__debug_trace_pop:nnN { regex } { 1 } \@@_match:n } + { \@@_trace_pop:nnN { regex } { 1 } \@@_match:n } \cs_new_protected:Npn \@@_match:n #1 { \int_zero:N \l_@@_balance_int @@ -4552,8 +4552,8 @@ \@@_match_init: \@@_match_once: } -\__debug_patch:nnNNpn - { \__debug_trace:nnx { regex } { 1 } { initializing } } +\__kernel_patch:nnNNpn + { \@@_trace:nnx { regex } { 1 } { initializing } } { } \cs_new_protected:Npn \@@_match_init: { @@ -4733,8 +4733,8 @@ % state is marked as $\texttt{step}+1$: any thread hitting it at that % point will be terminated. % \begin{macrocode} -\__debug_patch:nnNNpn - { \__debug_trace:nnx { regex } { 2 } { state~\int_use:N \l_@@_curr_state_int } } +\__kernel_patch:nnNNpn + { \@@_trace:nnx { regex } { 2 } { state~\int_use:N \l_@@_curr_state_int } } { } \cs_new_protected:Npn \@@_use_state: { @@ -5098,9 +5098,9 @@ % parsed, make sure that there is no open csname. Finally, define the % \texttt{balance_one_match} and \texttt{do_one_match} functions. % \begin{macrocode} -\__debug_patch:nnNNpn - { \__debug_trace_push:nnN { regex } { 1 } \@@_replacement:n } - { \__debug_trace_pop:nnN { regex } { 1 } \@@_replacement:n } +\__kernel_patch:nnNNpn + { \@@_trace_push:nnN { regex } { 1 } \@@_replacement:n } + { \@@_trace_pop:nnN { regex } { 1 } \@@_replacement:n } \cs_new_protected:Npn \@@_replacement:n #1 { \__tl_build:Nw \l_@@_internal_a_tl @@ -5120,14 +5120,14 @@ {#1} \prg_do_nothing: \prg_do_nothing: \if_int_compare:w \l_@@_replacement_csnames_int > 0 \exp_stop_f: - \__msg_kernel_error:nnx { kernel } { replacement-missing-rbrace } + \__kernel_msg_error:nnx { kernel } { replacement-missing-rbrace } { \int_use:N \l_@@_replacement_csnames_int } \__tl_build_one:x { \prg_replicate:nn \l_@@_replacement_csnames_int \cs_end: } \fi: \seq_if_empty:NF \l_@@_replacement_category_seq { - \__msg_kernel_error:nnx { kernel } { replacement-missing-rparen } + \__kernel_msg_error:nnx { kernel } { replacement-missing-rparen } { \seq_count:N \l_@@_replacement_category_seq } \seq_clear:N \l_@@_replacement_category_seq } @@ -5361,11 +5361,11 @@ \cs_new_protected:Npn \@@_replacement_cat:NNN #1#2#3 { \token_if_eq_meaning:NNTF \prg_do_nothing: #3 - { \__msg_kernel_error:nn { kernel } { replacement-catcode-end } } + { \__kernel_msg_error:nn { kernel } { replacement-catcode-end } } { \int_compare:nNnTF { \l_@@_replacement_csnames_int } > 0 { - \__msg_kernel_error:nnnn + \__kernel_msg_error:nnnn { kernel } { replacement-catcode-in-cs } {#1} {#3} #2 #3 } @@ -5381,7 +5381,7 @@ { \@@_char_if_alphanumeric:NTF #3 { - \__msg_kernel_error:nnnn + \__kernel_msg_error:nnnn { kernel } { replacement-catcode-escaped } {#1} {#3} } @@ -5543,7 +5543,7 @@ \cs_new_protected:Npn \@@_replacement_c_S:w #1#2 { \if_int_compare:w `#2 = 0 \exp_stop_f: - \__msg_kernel_error:nn { kernel } { replacement-null-space } + \__kernel_msg_error:nn { kernel } { replacement-null-space } \fi: \tex_lccode:D `\ = `#2 \scan_stop: \tex_lowercase:D { \__tl_build_one:n {~} } @@ -5586,7 +5586,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_replacement_error:NNN #1#2#3 { - \__msg_kernel_error:nnx { kernel } { replacement-#1 } {#3} + \__kernel_msg_error:nnx { kernel } { replacement-#1 } {#3} #2 #3 } % \end{macrocode} @@ -5948,7 +5948,7 @@ { \flag_height:n { @@_begin } + \flag_height:n { @@_end } } = 0 { - \__msg_kernel_error:nnxxx { kernel } { result-unbalanced } + \__kernel_msg_error:nnxxx { kernel } { result-unbalanced } { splitting~or~extracting~submatches } { \flag_height:n { @@_end } } { \flag_height:n { @@_begin } } @@ -6139,7 +6139,7 @@ { \if_int_compare:w \l_@@_balance_int = 0 \exp_stop_f: \else: - \__msg_kernel_error:nnxxx { kernel } { result-unbalanced } + \__kernel_msg_error:nnxxx { kernel } { result-unbalanced } { replacing } { \int_max:nn { - \l_@@_balance_int } { 0 } } { \int_max:nn { \l_@@_balance_int } { 0 } } @@ -6170,20 +6170,20 @@ % % Messages for the preparsing phase. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { trailing-backslash } +\__kernel_msg_new:nnnn { kernel } { trailing-backslash } { Trailing~escape~character~'\iow_char:N\\'. } { A~regular~expression~or~its~replacement~text~ends~with~ the~escape~character~'\iow_char:N\\'.~It~will~be~ignored. } -\__msg_kernel_new:nnnn { kernel } { x-missing-rbrace } +\__kernel_msg_new:nnnn { kernel } { x-missing-rbrace } { Missing~closing~brace~in~'\iow_char:N\\x'~hexadecimal~sequence. } { You~wrote~something~like~ '\iow_char:N\\x\{...#1'.~ The~closing~brace~is~missing. } -\__msg_kernel_new:nnnn { kernel } { x-overflow } +\__kernel_msg_new:nnnn { kernel } { x-overflow } { Character~code~'#1'~too~large~in~'\iow_char:N\\x'~hexadecimal~sequence. } { You~wrote~something~like~ @@ -6195,7 +6195,7 @@ % % Invalid quantifier. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { invalid-quantifier } +\__kernel_msg_new:nnnn { kernel } { invalid-quantifier } { Braced~quantifier~'#1'~may~not~be~followed~by~'#2'. } { The~character~'#2'~is~invalid~in~the~braced~quantifier~'#1'.~ @@ -6207,13 +6207,13 @@ % Messages for missing or extra closing brackets and parentheses, with % some fancy singular/plural handling for the case of parentheses. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { missing-rbrack } +\__kernel_msg_new:nnnn { kernel } { missing-rbrack } { Missing~right~bracket~inserted~in~regular~expression. } { LaTeX~was~given~a~regular~expression~where~a~character~class~ was~started~with~'[',~but~the~matching~']'~is~missing. } -\__msg_kernel_new:nnnn { kernel } { missing-rparen } +\__kernel_msg_new:nnnn { kernel } { missing-rparen } { Missing~right~ \int_compare:nTF { #1 = 1 } { parenthesis } { parentheses } ~ @@ -6223,7 +6223,7 @@ LaTeX~was~given~a~regular~expression~with~\int_eval:n {#1} ~ more~left~parentheses~than~right~parentheses. } -\__msg_kernel_new:nnnn { kernel } { extra-rparen } +\__kernel_msg_new:nnnn { kernel } { extra-rparen } { Extra~right~parenthesis~ignored~in~regular~expression. } { LaTeX~came~across~a~closing~parenthesis~when~no~submatch~group~ @@ -6233,7 +6233,7 @@ % % Some escaped alphanumerics are not allowed everywhere. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { bad-escape } +\__kernel_msg_new:nnnn { kernel } { bad-escape } { Invalid~escape~'\iow_char:N\\#1'~ \@@_if_in_cs:TF { within~a~control~sequence. } @@ -6261,14 +6261,14 @@ % % Range errors. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { range-missing-end } +\__kernel_msg_new:nnnn { kernel } { range-missing-end } { Invalid~end-point~for~range~'#1-#2'~in~character~class. } { The~end-point~'#2'~of~the~range~'#1-#2'~may~not~serve~as~an~ end-point~for~a~range:~alphanumeric~characters~should~not~be~ escaped,~and~non-alphanumeric~characters~should~be~escaped. } -\__msg_kernel_new:nnnn { kernel } { range-backwards } +\__kernel_msg_new:nnnn { kernel } { range-backwards } { Range~'[#1-#2]'~out~of~order~in~character~class. } { In~ranges~of~characters~'[x-y]'~appearing~in~character~classes,~ @@ -6280,34 +6280,34 @@ % % Errors related to |\c| and |\u|. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { c-bad-mode } +\__kernel_msg_new:nnnn { kernel } { c-bad-mode } { Invalid~nested~'\iow_char:N\\c'~escape~in~regular~expression. } { The~'\iow_char:N\\c'~escape~cannot~be~used~within~ a~control~sequence~test~'\iow_char:N\\c{...}'.~ To~combine~several~category~tests,~use~'\iow_char:N\\c[...]'. } -\__msg_kernel_new:nnnn { kernel } { c-C-invalid } +\__kernel_msg_new:nnnn { kernel } { c-C-invalid } { '\iow_char:N\\cC'~should~be~followed~by~'.'~or~'(',~not~'#1'. } { The~'\iow_char:N\\cC'~construction~restricts~the~next~item~to~be~a~ control~sequence~or~the~next~group~to~be~made~of~control~sequences.~ It~only~makes~sense~to~follow~it~by~'.'~or~by~a~group. } -\__msg_kernel_new:nnnn { kernel } { c-missing-rbrace } +\__kernel_msg_new:nnnn { kernel } { c-missing-rbrace } { Missing~right~brace~inserted~for~'\iow_char:N\\c'~escape. } { LaTeX~was~given~a~regular~expression~where~a~ '\iow_char:N\\c\iow_char:N\{...'~construction~was~not~ended~ with~a~closing~brace~'\iow_char:N\}'. } -\__msg_kernel_new:nnnn { kernel } { c-missing-rbrack } +\__kernel_msg_new:nnnn { kernel } { c-missing-rbrack } { Missing~right~bracket~inserted~for~'\iow_char:N\\c'~escape. } { A~construction~'\iow_char:N\\c[...'~appears~in~a~ regular~expression,~but~the~closing~']'~is~not~present. } -\__msg_kernel_new:nnnn { kernel } { c-missing-category } +\__kernel_msg_new:nnnn { kernel } { c-missing-category } { Invalid~character~'#1'~following~'\iow_char:N\\c'~escape. } { In~regular~expressions,~the~'\iow_char:N\\c'~escape~sequence~ @@ -6315,19 +6315,19 @@ capital~letter~representing~a~character~category,~namely~ one~of~'ABCDELMOPSTU'. } -\__msg_kernel_new:nnnn { kernel } { c-trailing } +\__kernel_msg_new:nnnn { kernel } { c-trailing } { Trailing~category~code~escape~'\iow_char:N\\c'... } { A~regular~expression~ends~with~'\iow_char:N\\c'~followed~ by~a~letter.~It~will~be~ignored. } -\__msg_kernel_new:nnnn { kernel } { u-missing-lbrace } +\__kernel_msg_new:nnnn { kernel } { u-missing-lbrace } { Missing~left~brace~following~'\iow_char:N\\u'~escape. } { The~'\iow_char:N\\u'~escape~sequence~must~be~followed~by~ a~brace~group~with~the~name~of~the~variable~to~use. } -\__msg_kernel_new:nnnn { kernel } { u-missing-rbrace } +\__kernel_msg_new:nnnn { kernel } { u-missing-rbrace } { Missing~right~brace~inserted~for~'\iow_char:N\\u'~escape. } { LaTeX~ @@ -6340,14 +6340,14 @@ % % Errors when encountering the \textsc{posix} syntax |[:...:]|. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { posix-unsupported } +\__kernel_msg_new:nnnn { kernel } { posix-unsupported } { POSIX~collating~element~'[#1 ~ #1]'~not~supported. } { The~'[.foo.]'~and~'[=bar=]'~syntaxes~have~a~special~meaning~ in~POSIX~regular~expressions.~This~is~not~supported~by~LaTeX.~ Maybe~you~forgot~to~escape~a~left~bracket~in~a~character~class? } -\__msg_kernel_new:nnnn { kernel } { posix-unknown } +\__kernel_msg_new:nnnn { kernel } { posix-unknown } { POSIX~class~'[:#1:]'~unknown. } { '[:#1:]'~is~not~among~the~known~POSIX~classes~ @@ -6356,7 +6356,7 @@ '[:print:]',~'[:punct:]',~'[:space:]',~'[:upper:]',~ '[:word:]',~and~'[:xdigit:]'. } -\__msg_kernel_new:nnnn { kernel } { posix-missing-close } +\__kernel_msg_new:nnnn { kernel } { posix-missing-close } { Missing~closing~':]'~for~POSIX~class. } { The~POSIX~syntax~'#1'~must~be~followed~by~':]',~not~'#2'. } % \end{macrocode} @@ -6365,7 +6365,7 @@ % with an unbalanced token list, which we must re-balance by adding % begin-group or end-group character tokens. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { result-unbalanced } +\__kernel_msg_new:nnnn { kernel } { result-unbalanced } { Missing~brace~inserted~when~#1. } { LaTeX~was~asked~to~do~some~regular~expression~operation,~ @@ -6377,13 +6377,13 @@ % % Error message for unknown options. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { unknown-option } +\__kernel_msg_new:nnnn { kernel } { unknown-option } { Unknown~option~'#1'~for~regular~expressions. } { The~only~available~option~is~'case-insensitive',~toggled~by~ '(?i)'~and~'(?-i)'. } -\__msg_kernel_new:nnnn { kernel } { special-group-unknown } +\__kernel_msg_new:nnnn { kernel } { special-group-unknown } { Unknown~special~group~'#1~...'~in~a~regular~expression. } { The~only~valid~constructions~starting~with~'(?'~are~ @@ -6393,21 +6393,21 @@ % % Errors in the replacement text. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { replacement-c } +\__kernel_msg_new:nnnn { kernel } { replacement-c } { Misused~'\iow_char:N\\c'~command~in~a~replacement~text. } { In~a~replacement~text,~the~'\iow_char:N\\c'~escape~sequence~ can~be~followed~by~one~of~the~letters~'ABCDELMOPSTU'~ or~a~brace~group,~not~by~'#1'. } -\__msg_kernel_new:nnnn { kernel } { replacement-u } +\__kernel_msg_new:nnnn { kernel } { replacement-u } { Misused~'\iow_char:N\\u'~command~in~a~replacement~text. } { In~a~replacement~text,~the~'\iow_char:N\\u'~escape~sequence~ must~be~~followed~by~a~brace~group~holding~the~name~of~the~ variable~to~use. } -\__msg_kernel_new:nnnn { kernel } { replacement-g } +\__kernel_msg_new:nnnn { kernel } { replacement-g } { Missing~brace~for~the~'\iow_char:N\\g'~construction~ in~a~replacement~text. @@ -6417,7 +6417,7 @@ submatches~are~represented~either~as~'\iow_char:N \\g{dd..d}',~ or~'\\d',~where~'d'~are~single~digits.~Here,~a~brace~is~missing. } -\__msg_kernel_new:nnnn { kernel } { replacement-catcode-end } +\__kernel_msg_new:nnnn { kernel } { replacement-catcode-end } { Missing~character~for~the~'\iow_char:N\\c<category><character>'~ construction~in~a~replacement~text. @@ -6428,7 +6428,7 @@ the~character~category.~Then,~a~character~must~follow.~LaTeX~ reached~the~end~of~the~replacement~when~looking~for~that. } -\__msg_kernel_new:nnnn { kernel } { replacement-catcode-escaped } +\__kernel_msg_new:nnnn { kernel } { replacement-catcode-escaped } { Escaped~letter~or~digit~after~category~code~in~replacement~text. } @@ -6438,7 +6438,7 @@ the~character~category.~Then,~a~character~must~follow,~not~ '\iow_char:N\\#2'. } -\__msg_kernel_new:nnnn { kernel } { replacement-catcode-in-cs } +\__kernel_msg_new:nnnn { kernel } { replacement-catcode-in-cs } { Category~code~'\iow_char:N\\c#1#3'~ignored~inside~ '\iow_char:N\\c\{...\}'~in~a~replacement~text. @@ -6448,7 +6448,7 @@ '\iow_char:N\\c\{...\}'~are~ignored~when~building~the~control~ sequence~name. } -\__msg_kernel_new:nnnn { kernel } { replacement-null-space } +\__kernel_msg_new:nnnn { kernel } { replacement-null-space } { TeX~cannot~build~a~space~token~with~character~code~0. } { You~asked~for~a~character~token~with~category~space,~ @@ -6457,13 +6457,13 @@ This~specific~case~is~impossible~and~will~be~replaced~ by~a~normal~space. } -\__msg_kernel_new:nnnn { kernel } { replacement-missing-rbrace } +\__kernel_msg_new:nnnn { kernel } { replacement-missing-rbrace } { Missing~right~brace~inserted~in~replacement~text. } { There~ \int_compare:nTF { #1 = 1 } { was } { were } ~ #1~ missing~right~\int_compare:nTF { #1 = 1 } { brace } { braces } . } -\__msg_kernel_new:nnnn { kernel } { replacement-missing-rparen } +\__kernel_msg_new:nnnn { kernel } { replacement-missing-rparen } { Missing~right~parenthesis~inserted~in~replacement~text. } { There~ \int_compare:nTF { #1 = 1 } { was } { were } ~ #1~ @@ -6473,7 +6473,7 @@ % % Used when showing a regex. % \begin{macrocode} -\__msg_kernel_new:nnn { kernel } { show-regex } +\__kernel_msg_new:nnn { kernel } { show-regex } { >~Compiled~regex~ \tl_if_empty:nTF {#1} { variable~ #2 } { {#1} } : @@ -6513,21 +6513,21 @@ % be merged. % % \begin{macro} -% {\__debug_trace_push:nnN, \__debug_trace_pop:nnN, \__debug_trace:nnx} +% {\@@_trace_push:nnN, \@@_trace_pop:nnN, \@@_trace:nnx} % Here |#1| is the module name (\texttt{regex}) and |#2| is % typically~1. If the module's current tracing level is less than % |#2| show nothing, otherwise write |#3| to the terminal. % \begin{macrocode} -\__debug:TF +\__kernel_debug:TF { - \cs_new_protected:Npn \__debug_trace_push:nnN #1#2#3 - { \__debug_trace:nnx {#1} {#2} { entering~ \token_to_str:N #3 } } - \cs_new_protected:Npn \__debug_trace_pop:nnN #1#2#3 - { \__debug_trace:nnx {#1} {#2} { leaving~ \token_to_str:N #3 } } - \cs_new_protected:Npn \__debug_trace:nnx #1#2#3 + \cs_new_protected:Npn \@@_trace_push:nnN #1#2#3 + { \@@_trace:nnx {#1} {#2} { entering~ \token_to_str:N #3 } } + \cs_new_protected:Npn \@@_trace_pop:nnN #1#2#3 + { \@@_trace:nnx {#1} {#2} { leaving~ \token_to_str:N #3 } } + \cs_new_protected:Npn \@@_trace:nnx #1#2#3 { \int_compare:nNnF - { \int_use:c { g__debug_trace_#1_int } } < {#2} + { \int_use:c { g_@@_trace_#1_int } } < {#2} { \iow_term:x { Trace:~#3 } } } } @@ -6535,10 +6535,10 @@ % \end{macrocode} % \end{macro} % -% \begin{variable}{\g__debug_trace_regex_int} +% \begin{variable}{\g_@@_trace_regex_int} % No tracing when that is zero. % \begin{macrocode} -\int_new:N \g__debug_trace_regex_int +\int_new:N \g_@@_trace_regex_int % \end{macrocode} % \end{variable} % @@ -6547,7 +6547,7 @@ % stored in \tn{toks} from $0$ to \cs{l_@@_max_state_int} % (excluded). % \begin{macrocode} -\__debug:TF +\__kernel_debug:TF { \cs_new_protected:Npn \@@_trace_states:n #1 { @@ -6556,7 +6556,7 @@ { 1 } { \l_@@_max_state_int - 1 } { - \__debug_trace:nnx { regex } {#1} + \@@_trace:nnx { regex } {#1} { \iow_char:N \\toks ##1 = { \@@_toks_use:w ##1 } } } } |