diff options
author | Karl Berry <karl@freefriends.org> | 2020-05-11 20:47:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-05-11 20:47:47 +0000 |
commit | bffbeb435746ef4bfc3abbbce80006f657360f3a (patch) | |
tree | 25bd4caaead6a06571d1376a8d442fe79e071d62 /Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx | |
parent | a3fca75048862f5c0f86ec89c88da49a55beafb7 (diff) |
l3kernel (11may20)
git-svn-id: svn://tug.org/texlive/trunk@55101 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx index 8c5a03bd24f..978d4dfe7f3 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-05-05} +% \date{Released 2020-05-11} % % \maketitle % @@ -468,7 +468,7 @@ % \item If the next token is a control sequence with the meaning of % \cs{scan_stop:}, it can be: \cs{s_@@}, in which case our job is % done, as what follows is an internal floating point number, or -% \cs{s_@@_mark}, in which case the expression has come to an early +% \cs{s_@@_expr_mark}, in which case the expression has come to an early % end, as we are still looking for a number here, or something else, % in which case we consider the control sequence to be a bad % variable resulting from \texttt{c}-expansion. @@ -499,7 +499,7 @@ % operator. This goes as follows. % \begin{itemize} % \item If the next token is a control sequence, it could be the -% special marker \cs{s_@@_mark}, and +% special marker \cs{s_@@_expr_mark}, and % otherwise it is a case of juxtaposing numbers, such as % |2\c_zero_int|, with an implied multiplication. % \item If the next token is a letter, it is also a case of @@ -741,7 +741,7 @@ % \begin{macro}[EXP] % { % \@@_parse_one_fp:NN, -% \@@_exp_after_mark_f:nw, +% \@@_exp_after_expr_mark_f:nw, % \@@_exp_after_?_f:nw % } % This function receives a \meta{precedence} and a control sequence @@ -750,8 +750,8 @@ % \item \cs{s_@@} starts a floating point number, and we call % \cs{@@_exp_after_f:nw}, which |f|-expands after the floating % point. -% \item \cs{s_@@_mark} is a premature end, we call -% \cs{@@_exp_after_mark_f:nw}, which triggers an |fp-early-end| +% \item \cs{s_@@_expr_mark} is a premature end, we call +% \cs{@@_exp_after_expr_mark_f:nw}, which triggers an |fp-early-end| % error. % \item For a control sequence not containing \cs[no-index]{s_@@}, we call % \cs{@@_exp_after_?_f:nw}, causing a |bad-variable| error. @@ -776,7 +776,7 @@ \exp_after:wN #1 \exp:w \@@_parse_expand:w } } -\cs_new:Npn \@@_exp_after_mark_f:nw #1 +\cs_new:Npn \@@_exp_after_expr_mark_f:nw #1 { \int_case:nnF { \exp_after:wN \use_i:nnn \use_none:nnn #1 } { @@ -877,11 +877,11 @@ ; \exp_not:N \@@_parse_one_register_dim:ww \tl_to_str:n { pt } ; \exp_not:N \@@_parse_one_register_mu:www . \tl_to_str:n { pt } ; \exp_not:N \@@_parse_one_register_int:www - \exp_not:N \q_stop + \s_@@_stop } \exp_args:Nno \use:nn { \cs_new:Npn \@@_parse_one_register_auxii:wwwNw #1 . #2 } - { \tl_to_str:n { pt } #3 ; #4#5 \q_stop } + { \tl_to_str:n { pt } #3 ; #4#5 \s_@@_stop } { #4 #1.#2; } \exp_args:Nno \use:nn { \cs_new:Npn \@@_parse_one_register_mu:www #1 } @@ -1837,12 +1837,12 @@ % \begin{macrocode} \cs_new:Npn \@@_parse_apply_unary:NNNwN #1#2#3#4@#5 { - \@@_parse_apply_unary_chk:NwNw #4 @ ; . \q_stop + \@@_parse_apply_unary_chk:NwNw #4 @ ; . \s_@@_stop \@@_parse_apply_unary_type:NNN #3 #2 #4 @ \exp:w \exp_end_continue_f:w #5 #1 } -\cs_new:Npn \@@_parse_apply_unary_chk:NwNw #1#2 ; #3#4 \q_stop +\cs_new:Npn \@@_parse_apply_unary_chk:NwNw #1#2 ; #3#4 \s_@@_stop { \if_meaning:w @ #3 \else: \token_if_eq_meaning:NNTF . #3 @@ -1947,7 +1947,7 @@ \exp_not:N \token_if_eq_meaning:NNTF #3 \exp_not:c { @@_parse_infix_):N } { - \exp_not:N \@@_exp_after_array_f:w #2 \s_@@_stop + \exp_not:N \@@_exp_after_array_f:w #2 \s_@@_expr_stop \exp_not:N \exp_after:wN \exp_not:N \@@_parse_infix_after_paren:NN \exp_not:N \exp_after:wN #1 @@ -2116,7 +2116,7 @@ % in two steps. The \cs{@@_parse_operand:Nw} function performs % computations until reaching an operation with precedence % \cs{c_@@_prec_end_int} or less, namely, the end of the expression. The -% marker \cs{s_@@_mark} indicates that the next token is an already +% marker \cs{s_@@_expr_mark} indicates that the next token is an already % parsed version of an infix operator, and \cs{@@_parse_infix_end:N} % has infinitely negative precedence. Finally, clean up a % (well-defined) set of extra tokens and stop the initial expansion @@ -2129,12 +2129,12 @@ \exp:w \@@_parse_operand:Nw \c_@@_prec_end_int \@@_parse_expand:w #1 - \s_@@_mark \@@_parse_infix_end:N - \s_@@_stop + \s_@@_expr_mark \@@_parse_infix_end:N + \s_@@_expr_stop \exp_end: } \cs_new:Npn \@@_parse_after:ww - #1@ \@@_parse_infix_end:N \s_@@_stop #2 { #2 #1 } + #1@ \@@_parse_infix_end:N \s_@@_expr_stop #2 { #2 #1 } \cs_new:Npn \@@_parse_o:n #1 { \exp:w @@ -2142,8 +2142,8 @@ \exp:w \@@_parse_operand:Nw \c_@@_prec_end_int \@@_parse_expand:w #1 - \s_@@_mark \@@_parse_infix_end:N - \s_@@_stop + \s_@@_expr_mark \@@_parse_infix_end:N + \s_@@_expr_stop { \exp_end_continue_f:w \@@_exp_after_any_f:nw { \exp_after:wN \exp_stop_f: } @@ -2265,7 +2265,7 @@ { \if_catcode:w \scan_stop: \exp_not:N #2 \if_int_compare:w - \@@_str_if_eq:nn { \s_@@_mark } { \exp_not:N #2 } + \@@_str_if_eq:nn { \s_@@_expr_mark } { \exp_not:N #2 } = 0 \exp_stop_f: \exp_after:wN \exp_after:wN \exp_after:wN \@@_parse_infix_mark:NNN @@ -2317,7 +2317,7 @@ { \if_catcode:w \scan_stop: \exp_not:N #2 \if_int_compare:w - \@@_str_if_eq:nn { \s_@@_mark } { \exp_not:N #2 } + \@@_str_if_eq:nn { \s_@@_expr_mark } { \exp_not:N #2 } = 0 \exp_stop_f: \exp_after:wN \exp_after:wN \exp_after:wN \@@_parse_infix_mark:NNN @@ -2349,7 +2349,7 @@ % \subsubsection{Closing parentheses and commas} % % \begin{macro}[EXP]{\@@_parse_infix_mark:NNN} -% As an infix operator, \cs{s_@@_mark} means that the next +% As an infix operator, \cs{s_@@_expr_mark} means that the next % token~(|#3|) has already gone through \cs{@@_parse_infix:NN} and % should be provided the precedence~|#1|. The scan mark~|#2| is % discarded. @@ -2764,7 +2764,7 @@ \cs_new:Npn \@@_parse_function_one_two:nnw #1#2#3 { \@@_if_type_fp:NTwFw - #3 { } \s_@@ \@@_parse_function_one_two_error_o:w \q_stop + #3 { } \s_@@ \@@_parse_function_one_two_error_o:w \s_@@_stop \@@_parse_function_one_two_aux:nnw {#1} {#2} #3 } \cs_new:Npn \@@_parse_function_one_two_error_o:w #1#2#3#4 @ @@ -2786,7 +2786,7 @@ \fi: \@@_parse_function_one_two_error_o:w } - \q_stop + \s_@@_stop \@@_parse_function_one_two_auxii:nnw {#1} {#2} #3; #4 } \cs_new:Npn \@@_parse_function_one_two_auxii:nnw #1#2#3; #4; #5 |