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 | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx index f0cdec7ffbb..88f30d3ce87 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx @@ -36,7 +36,7 @@ % %<*driver> \documentclass[full]{l3doc} -\GetIdInfo$Id: l3fp-parse.dtx 4975 2014-05-31 19:26:32Z bruno $ +\GetIdInfo$Id: l3fp-parse.dtx 5223 2014-07-18 01:54:05Z bruno $ {L3 Floating-point expression parsing} \begin{document} \DocInput{\jobname.dtx} @@ -107,12 +107,11 @@ % irrelevant for the order of evaluation, but serve as signals), from % the tightest binding to the loosest binding. % \begin{itemize} -% \item[32] Juxtaposition for implicit multiplication. % \item[16] Function calls with multiple arguments. % \item[15] Function calls expecting exactly one argument. % \item[14] Binary |**| and~|^| (right to left). % \item[12] Unary |+|, |-|, |!| (right to left). -% \item[10] Binary |*|, |/| and~|%|. +% \item[10] Binary |*|, |/|, and juxtaposition (implicit~|*|). % \item[9] Binary |+| and~|-|. % \item[7] Comparisons. % \item[5] Logical \texttt{and}, denoted by~|&&|. @@ -412,7 +411,7 @@ % % Functions are implemented as prefix operators with very high % precedence, so that their argument is the first number that can -% possibly be built, except for juxtaposition. +% possibly be built. % % Note that contrarily to the \texttt{infix} functions discussed % earlier, the \texttt{prefix} functions do perform tests on the @@ -472,7 +471,6 @@ % Once a number is found, \cs{@@_parse_one:Nw} also finds an infix % operator. This goes as follows. % \begin{itemize} -% \item % \item If the next token is a control sequence, it could be the % special marker \cs{s_@@_mark}, and % otherwise it is a case of juxtaposing numbers, such as @@ -2310,22 +2308,23 @@ % \end{macrocode} % \end{macro} % +% ^^A todo: can |...(1,2,3)pt| really occur? If not, simplify. % \begin{macro}[aux, EXP] % {\@@_parse_infix_juxtapose:N, \@@_parse_apply_juxtapose:NwwN} % Juxtaposition follows the same scheme as other binary operations, % but calls \cs{@@_parse_apply_juxtapose:NwwN} rather than directly % calling \cs{@@_parse_apply_binary:NwNwN}. This lets us catch errors -% such as |max(1,2,3)pt| where one operand of the juxtaposition is not +% such as |...(1,2,3)pt| where one operand of the juxtaposition is not % a single number: both |#3| and~|#5| of the \texttt{apply} auxiliary % must be empty. % \begin{macrocode} \cs_new:Npn \@@_parse_infix_juxtapose:N #1 { - \if_int_compare:w #1 < \c_thirty_two + \if_int_compare:w #1 < \c_ten \exp_after:wN @ \exp_after:wN \@@_parse_apply_juxtapose:NwwN \tex_romannumeral:D - \@@_parse_operand:Nw \c_thirty_two + \@@_parse_operand:Nw \c_ten \exp_after:wN \@@_parse_expand:w \else: \exp_after:wN @ |