diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx index b0abdd5abac..f83cd642d62 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2017/05/29} +% \date{Released 2017/07/15} % % \maketitle % @@ -78,7 +78,7 @@ % \begin{texnote} % Registers (integers, toks, etc.) are automatically unpacked, % without requiring a function such as \cs{int_use:N}. Invalid -% tokens remaining after \texttt{f}-expansion will lead to +% tokens remaining after \texttt{f}-expansion lead to % unrecoverable low-level \TeX{} errors. % \end{texnote} % \end{macro} @@ -155,7 +155,7 @@ % \cs{int_eval:n} does), and with this approach, expanding the next % unread token forces us to jump with \cs{exp_after:wN} over every value % computed earlier in the expression. With this approach, the run-time -% will grow at least quadratically in the length of the expression, if +% grows at least quadratically in the length of the expression, if % not as its cube (inserting the \cs{exp_after:wN} is tricky and slow). % % A second option is to place those values at the end of the expression. @@ -217,7 +217,7 @@ % to do the calculation, and in the process to expand the following % once. This is also true in our real application: all the functions of % the form \cs[no-index]{@@_\ldots_o:ww} expand what follows once. This comes at the -% cost of leaving tokens in the input stack, and we will need to be +% cost of leaving tokens in the input stack, and we need to be % careful not to waste this memory. All of our discussion above is nice % but simplistic, as operations should not simply be performed in the % order they appear. @@ -232,8 +232,8 @@ % reaching an operator which has lower precedence than the one which % called |\operand:w|. This means that |\operand:w| must know what the % previous binary operator is, or rather, its precedence: we thus rename -% it |\operand:Nw|. Let us describe as an example how the calculation -% |41-2^3*4+5| will be done. Here, we abuse notations: the first +% it |\operand:Nw|. Let us describe as an example how we plan to do +% the calculation |41-2^3*4+5|. Here, we abuse notations: the first % argument of |\operand:Nw| should be an integer constant (\cs{c_@@_prec_plus_int}, % \ldots{}) equal to the precedence of the given operator, % not directly the operator itself. @@ -266,7 +266,7 @@ % \end{itemize} % The procedure above stops short of performing all computations, but % adding a surrounding call to |\operand:Nw| with a very low precedence -% ensures that all computations will be performed before |\operand:Nw| +% ensures that all computations are performed before |\operand:Nw| % is done. Adding a trailing marker with the same very low precedence % prevents the surrounding |\operand:Nw| from going beyond the marker. % @@ -386,7 +386,7 @@ % the \meta{precedence}, continuing the loop. % % We have introduced the most important functions here, and the next few -% paragraphs will describe various subtleties. +% paragraphs we describe various subtleties. % % \subsubsection{Prefix operators, parentheses, and functions} % @@ -530,8 +530,8 @@ % At all steps, we try to accept all category codes: when |#1|~is kept % to be used later, it is almost always converted to category code other % through \cs{token_to_str:N}. More precisely, catcodes $\{3, 6, 7, 8, -% 11, 12\}$ should work without trouble, but $\{1, 2, 4, 10, 13\}$ will -% not work, and of course $\{0, 5, 9\}$ cannot become tokens. +% 11, 12\}$ should work without trouble, but not $\{1, 2, 4, 10, 13\}$, +% and of course $\{0, 5, 9\}$ cannot become tokens. % % Floating point expressions should behave as much as possible like % \eTeX{}-based integer expressions and dimension expressions. In @@ -541,22 +541,22 @@ % restricted expandable functions can then be used in floating point % expressions just as they can be in other kinds of expressions. % Problematically, spaces stop \texttt{f}-expansion: for instance, the -% macro~|\X| below will not be expanded if we simply perform +% macro~|\X| below would not be expanded if we simply performed % \texttt{f}-expansion. % \begin{verbatim} % \DeclareDocumentCommand {\test} {m} { \fp_eval:n {#1} } % \ExplSyntaxOff % \test { 1 + \X } % \end{verbatim} -% Of course, spaces will not appear in a code setting, but may very +% Of course, spaces typically do not appear in a code setting, but may very % easily come in document-level input, from which some expressions may % come. To avoid this problem, at every step, we do essentially what % \cs{use:f} would do: take an argument, put it back in the input % stream, then \texttt{f}-expand it. This is not a complete solution, -% since a macro's expansion could contain leading spaces which will stop +% since a macro's expansion could contain leading spaces which would stop % the \texttt{f}-expansion before further macro calls are performed. % However, in practice it should be enough: in particular, floating -% point numbers will correctly be expanded to the underlying \cs{s_@@} +% point numbers are correctly expanded to the underlying \cs{s_@@} % \ldots{} structure. The \texttt{f}-expansion is performed by % \cs{@@_parse_expand:w}. % @@ -722,7 +722,7 @@ % and |#2|~the first token of the operand. We distinguish four cases: % |#2|~is equal to \cs{scan_stop:} in meaning, |#2|~is a different % control sequence, |#2|~is a digit, and |#2|~is something else (this -% last case will be split further). Despite the earlier +% last case is split further later). Despite the earlier % \texttt{f}-expansion, |#2|~may still be expandable if it was % protected by \cs{exp_not:N}, as may happen with the \LaTeXe{} command % \tn{protect}. Using a well placed \cs{reverse_if:N}, this case is @@ -925,7 +925,7 @@ % % \begin{macro}[aux, EXP]{\@@_parse_one_digit:NN} % A digit marks the beginning of an explicit floating point number. -% Once the number is found, we will catch the case of overflow and +% Once the number is found, we catch the case of overflow and % underflow with \cs{@@_sanitize:wN}, then % \cs{@@_parse_infix_after_operand:NwN} expands \cs{@@_parse_infix:NN} % after the number we find, to wrap the following infix operator as @@ -1069,7 +1069,7 @@ % % \subsubsection{Numbers: trimming leading zeros} % -% Numbers will be parsed as follows: first we trim leading zeros, then +% Numbers are parsed as follows: first we trim leading zeros, then % if the next character is a digit, start reading a significand $\geq 1$ % with the set of functions |\__fp_parse_large|\ldots{}; if it is a % period, the significand is~$<1$; and otherwise it is zero. In the @@ -1150,8 +1150,8 @@ % % \begin{macro}[aux, EXP]{\@@_parse_zero:} % After reading a significand of~$0$, find any exponent, then put a -% sign of~|1| for \cs{@@_sanitize:wN}, which will remove everything -% and leave an exact zero. +% sign of~|1| for \cs{@@_sanitize:wN}, which removes everything +% and leaves an exact zero. % \begin{macrocode} \cs_new:Npn \@@_parse_zero: { @@ -1172,8 +1172,8 @@ % expanding) can only go up to $9$ digits. Hence we grab digits in % two steps of $8$ digits. Since |#1| is a digit, read seven more % digits using \cs{@@_parse_digits_vii:N}. The \texttt{small_leading} -% auxiliary will leave those digits in the \cs{__int_value:w}, and -% grab some more, or stop if there are no more digits. Then the +% auxiliary leaves those digits in the \cs{__int_value:w}, and +% grabs some more, or stops if there are no more digits. Then the % \texttt{pack_leading} auxiliary puts the various parts in the % appropriate order for the processing further up. % \begin{macrocode} @@ -1471,7 +1471,7 @@ % {\@@_parse_small_round:NN, \@@_parse_round_after:wN} % Here, |#1|~is the digit that we are currently rounding (we only care % whether it is even or odd). If |#2|~is not a digit, then fetch an -% exponent and expand to |;|\meta{exponent} only. Otherwise, we will +% exponent and expand to |;|\meta{exponent} only. Otherwise, we % expand to |+0| or |+1|, then |;|\meta{exponent}. To % decide which, call \cs{@@_round_s:NNNw} to know whether to round up, % giving it as arguments a sign~$0$ (all explicit numbers are @@ -1842,7 +1842,7 @@ % \begin{macro}[aux, EXP] % {\@@_parse_prefix_(:Nw, \@@_parse_lparen_after:NwN} % The left parenthesis is treated as a unary prefix operator because -% it appears in exactly the same settings. Commas will be allowed if +% it appears in exactly the same settings. Commas are allowed if % the previous precedence is $16$ (function with multiple arguments). % In this case, find an % operand using the precedence~$1$; otherwise the precedence~$0$. @@ -2028,7 +2028,7 @@ % \begin{macro}[int, EXP]{\@@_parse:n} % \begin{macro}[aux, EXP]{\@@_parse_after:ww} % Start an \cs{exp:w} expansion so that \cs{@@_parse:n} expands -% in two steps. The \cs{@@_parse_operand:Nw} function will perform +% 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 @@ -2654,7 +2654,7 @@ % is the role of \cs{@@_function_store:wwNwnn} and % \cs{@@_function_store_end:wnnn}. Then apply \cs{@@_parse:n} to the % code~|#1| followed by a brace group with this token list. This -% results in a floating point result, which will correctly be parsed +% results in a floating point result, which is then correctly parsed % as the next operand of whatever was looking for one. The trailing % \cs{s_@@_mark} is used as a special infix operator to indicate that % the next token has already gone through \cs{@@_parse_infix:NN}. |