[latex3-commits] [l3svn] r6781 - Use fp-specific constants for precedences (see #316)
noreply at latex-project.org
noreply at latex-project.org
Mon Dec 5 17:03:17 CET 2016
Author: bruno
Date: 2016-12-05 17:03:17 +0100 (Mon, 05 Dec 2016)
New Revision: 6781
Modified:
trunk/l3kernel/l3fp-logic.dtx
trunk/l3kernel/l3fp-parse.dtx
trunk/l3kernel/testfiles/m3expl001.luatex.tlg
trunk/l3kernel/testfiles/m3expl001.ptex.tlg
trunk/l3kernel/testfiles/m3expl001.tlg
trunk/l3kernel/testfiles/m3expl001.uptex.tlg
trunk/l3kernel/testfiles/m3expl001.xetex.tlg
trunk/l3kernel/testfiles/m3expl003.luatex.tlg
trunk/l3kernel/testfiles/m3expl003.ptex.tlg
trunk/l3kernel/testfiles/m3expl003.tlg
trunk/l3kernel/testfiles/m3expl003.uptex.tlg
trunk/l3kernel/testfiles/m3expl003.xetex.tlg
Log:
Use fp-specific constants for precedences (see #316)
Switch to using \c_@@_prec_comma_int and similar instead
of \c_one etc. I've also shifted some precedences by 1
to avoid needing negative ones.
Modified: trunk/l3kernel/l3fp-logic.dtx
===================================================================
--- trunk/l3kernel/l3fp-logic.dtx 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/l3fp-logic.dtx 2016-12-05 16:03:17 UTC (rev 6781)
@@ -545,7 +545,7 @@
\@@_exp_after_array_f:w #3 \s_@@_stop
\exp_after:wN @
\exp:w
- \@@_parse_operand:Nw \c_two
+ \@@_parse_operand:Nw \c_@@_prec_colon_int
\@@_parse_expand:w
\else:
\__msg_kernel_expandable_error:nnnn
Modified: trunk/l3kernel/l3fp-parse.dtx
===================================================================
--- trunk/l3kernel/l3fp-parse.dtx 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/l3fp-parse.dtx 2016-12-05 16:03:17 UTC (rev 6781)
@@ -111,23 +111,54 @@
% \begin{itemize}
% \item[16] Function calls with multiple arguments.
% \item[15] Function calls expecting exactly one argument.
-% \item[14] Binary |**| and~|^| (right to left).
+% \item[13/14] Binary |**| and~|^| (right to left).
% \item[12] Unary |+|, |-|, |!| (right to left).
% \item[10] Binary |*|, |/|, and juxtaposition (implicit~|*|).
% \item[9] Binary |+| and~|-|.
% \item[7] Comparisons.
-% \item[5] Logical \texttt{and}, denoted by~|&&|.
-% \item[4] Logical \texttt{or}, denoted by~\verb*+||+.
-% \item[3] Ternary operator |?:|, piece~|?|.
-% \item[2] Ternary operator |?:|, piece~|:|.
-% \item[1] Commas, and parentheses accepting commas.
-% \item[0] Parentheses expecting exactly one argument.
-% \item[-1] Start and end of the expression.
+% \item[6] Logical \texttt{and}, denoted by~|&&|.
+% \item[5] Logical \texttt{or}, denoted by~\verb*+||+.
+% \item[4] Ternary operator |?:|, piece~|?|.
+% \item[3] Ternary operator |?:|, piece~|:|.
+% \item[2] Commas, and parentheses accepting commas.
+% \item[1] Parentheses expecting exactly one argument.
+% \item[0] Start and end of the expression.
% \end{itemize}
%
-% \begin{variable}{\c_@@_prec_end_int}
+% \begin{variable}
+% {
+% \c_@@_prec_funcii_int,
+% \c_@@_prec_func_int,
+% \c_@@_prec_hatii_int,
+% \c_@@_prec_hat_int,
+% \c_@@_prec_not_int,
+% \c_@@_prec_times_int,
+% \c_@@_prec_plus_int,
+% \c_@@_prec_comp_int,
+% \c_@@_prec_and_int,
+% \c_@@_prec_or_int,
+% \c_@@_prec_quest_int,
+% \c_@@_prec_colon_int,
+% \c_@@_prec_comma_int,
+% \c_@@_prec_paren_int,
+% \c_@@_prec_end_int,
+% }
% \begin{macrocode}
-\cs_new_eq:NN \c_@@_prec_end_int \c_minus_one
+\int_const:Nn \c_@@_prec_funcii_int { 16 }
+\int_const:Nn \c_@@_prec_func_int { 15 }
+\int_const:Nn \c_@@_prec_hatii_int { 14 }
+\int_const:Nn \c_@@_prec_hat_int { 13 }
+\int_const:Nn \c_@@_prec_not_int { 12 }
+\int_const:Nn \c_@@_prec_times_int { 10 }
+\int_const:Nn \c_@@_prec_plus_int { 9 }
+\int_const:Nn \c_@@_prec_comp_int { 7 }
+\int_const:Nn \c_@@_prec_and_int { 6 }
+\int_const:Nn \c_@@_prec_or_int { 5 }
+\int_const:Nn \c_@@_prec_quest_int { 4 }
+\int_const:Nn \c_@@_prec_colon_int { 3 }
+\int_const:Nn \c_@@_prec_comma_int { 2 }
+\int_const:Nn \c_@@_prec_paren_int { 1 }
+\int_const:Nn \c_@@_prec_end_int { 0 }
% \end{macrocode}
% \end{variable}
%
@@ -221,8 +252,8 @@
% 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
-% argument of |\operand:Nw| should be an integer constant (\cs{c_three},
-% \cs{c_nine}, \ldots{}) equal to the precedence of the given operator,
+% 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.
% \begin{itemize}
% \item Clean up~|41| and find~|-|. We call |\operand:Nw|~|-| to find
@@ -1742,7 +1773,7 @@
% \begin{macro}[EXP, aux]{\@@_parse_prefix_-:Nw, \@@_parse_prefix_!:Nw}
% The unary~|-| and boolean not are harder: we parse the operand using
% a precedence equal to the maximum of the previous precedence~|##1|
-% and the precedence \cs{c_twelve} of the unary operator, then call
+% and the precedence \cs{c_@@_prec_not_int} of the unary operator, then call
% the appropriate |\__fp_|\meta{operation}|_o:w| function,
% where the \meta{operation} is |set_sign| or |not|.
% \begin{macrocode}
@@ -1763,8 +1794,8 @@
\@@_parse_expand:w
}
}
-\@@_tmp:w - \c_twelve \@@_set_sign_o:w 2
-\@@_tmp:w ! \c_twelve \@@_not_o:w ?
+\@@_tmp:w - \c_@@_prec_not_int \@@_set_sign_o:w 2
+\@@_tmp:w ! \c_@@_prec_not_int \@@_not_o:w ?
% \end{macrocode}
% \end{macro}
%
@@ -1807,10 +1838,10 @@
\exp_after:wN \@@_parse_lparen_after:NwN
\exp_after:wN #1
\exp:w
- \if_int_compare:w #1 = \c_sixteen
- \@@_parse_operand:Nw \c_one
+ \if_int_compare:w #1 = \c_@@_prec_funcii_int
+ \@@_parse_operand:Nw \c_@@_prec_comma_int
\else:
- \@@_parse_operand:Nw \c_zero
+ \@@_parse_operand:Nw \c_@@_prec_paren_int
\fi:
\@@_parse_expand:w
}
@@ -1841,7 +1872,7 @@
% \begin{macrocode}
\cs_new:cpn { @@_parse_prefix_):Nw } #1
{
- \if_int_compare:w #1 = \c_one
+ \if_int_compare:w #1 = \c_@@_prec_comma_int
\else:
\__msg_kernel_expandable_error:nnn
{ kernel } { fp-missing-number } { ) }
@@ -1947,7 +1978,7 @@
\exp_after:wN #2
\cs:w @@_#1_o:w \exp_after:wN \cs_end:
\exp:w
- \@@_parse_operand:Nw \c_fifteen \@@_parse_expand:w
+ \@@_parse_operand:Nw \c_@@_prec_func_int \@@_parse_expand:w
}
\cs_new:Npn \@@_parse_function:NNN #1#2#3
{
@@ -1956,7 +1987,7 @@
\exp_after:wN #2
\exp_after:wN #1
\exp:w
- \@@_parse_operand:Nw \c_sixteen \@@_parse_expand:w
+ \@@_parse_operand:Nw \c_@@_prec_funcii_int \@@_parse_expand:w
}
% \end{macrocode}
% \end{macro}
@@ -2261,7 +2292,7 @@
\char_set_catcode_letter:N \)
\cs_new:Npn \@@_parse_infix_):N #1
{
- \if_int_compare:w #1 < \c_zero
+ \if_int_compare:w #1 < \c_@@_prec_paren_int
\__msg_kernel_expandable_error:nnn { kernel } { fp-extra } { ) }
\exp_after:wN \@@_parse_infix:NN
\exp_after:wN #1
@@ -2286,16 +2317,16 @@
\char_set_catcode_letter:N \,
\cs_new:Npn \@@_parse_infix_,:N #1
{
- \if_int_compare:w #1 > \c_one
+ \if_int_compare:w #1 > \c_@@_prec_comma_int
\exp_after:wN @
\exp_after:wN \use_none:n
\exp_after:wN \@@_parse_infix_,:N
\else:
- \if_int_compare:w #1 < \c_one
+ \if_int_compare:w #1 < \c_@@_prec_comma_int
\@@_parse_infix_comma_error:w
\fi:
\exp_after:wN \@@_parse_infix_comma:w
- \exp:w \@@_parse_operand:Nw \c_one
+ \exp:w \@@_parse_operand:Nw \c_@@_prec_comma_int
\exp_after:wN \@@_parse_expand:w
\fi:
}
@@ -2372,13 +2403,13 @@
\fi:
}
}
- \@@_tmp:w \@@_parse_infix_^:N ^ \c_fifteen \c_fourteen
- \@@_tmp:w \@@_parse_infix_/:N / \c_ten \c_ten
- \@@_tmp:w \@@_parse_infix_mul:N * \c_ten \c_ten
- \@@_tmp:w \@@_parse_infix_-:N - \c_nine \c_nine
- \@@_tmp:w \@@_parse_infix_+:N + \c_nine \c_nine
- \@@_tmp:w \@@_parse_infix_and:N & \c_five \c_five
- \@@_tmp:w \@@_parse_infix_or:N | \c_four \c_four
+ \@@_tmp:w \@@_parse_infix_^:N ^ \c_@@_prec_hatii_int \c_@@_prec_hat_int
+ \@@_tmp:w \@@_parse_infix_/:N / \c_@@_prec_times_int \c_@@_prec_times_int
+ \@@_tmp:w \@@_parse_infix_mul:N * \c_@@_prec_times_int \c_@@_prec_times_int
+ \@@_tmp:w \@@_parse_infix_-:N - \c_@@_prec_plus_int \c_@@_prec_plus_int
+ \@@_tmp:w \@@_parse_infix_+:N + \c_@@_prec_plus_int \c_@@_prec_plus_int
+ \@@_tmp:w \@@_parse_infix_and:N & \c_@@_prec_and_int \c_@@_prec_and_int
+ \@@_tmp:w \@@_parse_infix_or:N | \c_@@_prec_or_int \c_@@_prec_or_int
\group_end:
% \end{macrocode}
% \end{macro}
@@ -2408,11 +2439,11 @@
% \begin{macrocode}
\cs_new:Npn \@@_parse_infix_juxtapose:N #1
{
- \if_int_compare:w #1 < \c_ten
+ \if_int_compare:w #1 < \c_@@_prec_times_int
\exp_after:wN @
\exp_after:wN \@@_parse_apply_juxtapose:NwwN
\exp:w
- \@@_parse_operand:Nw \c_ten
+ \@@_parse_operand:Nw \c_@@_prec_times_int
\exp_after:wN \@@_parse_expand:w
\else:
\exp_after:wN @
@@ -2498,11 +2529,11 @@
\char_set_catcode_letter:N \?
\cs_new:Npn \@@_parse_infix_?:N #1
{
- \if_int_compare:w #1 < \c_three
+ \if_int_compare:w #1 < \c_@@_prec_quest_int
\exp_after:wN @
\exp_after:wN \@@_ternary:NwwN
\exp:w
- \@@_parse_operand:Nw \c_three
+ \@@_parse_operand:Nw \c_@@_prec_quest_int
\exp_after:wN \@@_parse_expand:w
\else:
\exp_after:wN @
@@ -2512,13 +2543,13 @@
}
\cs_new:Npn \@@_parse_infix_::N #1
{
- \if_int_compare:w #1 < \c_three
+ \if_int_compare:w #1 < \c_@@_prec_quest_int
\__msg_kernel_expandable_error:nnnn
{ kernel } { fp-missing } { ? } { ~for~?: }
\exp_after:wN @
\exp_after:wN \@@_ternary_auxii:NwwN
\exp:w
- \@@_parse_operand:Nw \c_two
+ \@@_parse_operand:Nw \c_@@_prec_colon_int
\exp_after:wN \@@_parse_expand:w
\else:
\exp_after:wN @
@@ -2579,7 +2610,7 @@
}
\cs_new:Npn \@@_parse_compare:NNNNNNN #1
{
- \if_int_compare:w #1 < \c_seven
+ \if_int_compare:w #1 < \c_@@_prec_comp_int
\exp_after:wN \@@_parse_compare_auxi:NNNNNNN
\exp_after:wN \@@_parse_excl_error:
\else:
@@ -2625,7 +2656,7 @@
\exp_after:wN #3
\exp_after:wN #4
\exp:w
- \@@_parse_operand:Nw \c_seven \@@_parse_expand:w #5
+ \@@_parse_operand:Nw \c_@@_prec_comp_int \@@_parse_expand:w #5
}
\cs_new:Npn \@@_parse_apply_compare:NwNNNNNwN
#1 #2@ #3 #4#5#6#7 #8@ #9
@@ -2682,7 +2713,7 @@
\exp_after:wN \@@_function_apply:nw
\exp_after:wN #1
\exp:w
- \@@_parse_operand:Nw \c_sixteen \@@_parse_expand:w
+ \@@_parse_operand:Nw \c_@@_prec_funcii_int \@@_parse_expand:w
}
% \end{macrocode}
% \end{macro}
@@ -2718,7 +2749,7 @@
\__int_value:w #3 \exp_after:wN ; \exp_after:wN
}
\exp:w
- \@@_parse_operand:Nw \c_sixteen \@@_parse_expand:w
+ \@@_parse_operand:Nw \c_@@_prec_funcii_int \@@_parse_expand:w
}
\cs_new:Npn #2 #4 {#5}
}
Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3519,6 +3519,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3510,6 +3510,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl001.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3510,6 +3510,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3510,6 +3510,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3517,6 +3517,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3520,6 +3520,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3511,6 +3511,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl003.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3511,6 +3511,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3511,6 +3511,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2016-12-05 16:03:17 UTC (rev 6781)
@@ -3518,6 +3518,20 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_funcii_int on line ...
+Defining \c__fp_prec_func_int on line ...
+Defining \c__fp_prec_hatii_int on line ...
+Defining \c__fp_prec_hat_int on line ...
+Defining \c__fp_prec_not_int on line ...
+Defining \c__fp_prec_times_int on line ...
+Defining \c__fp_prec_plus_int on line ...
+Defining \c__fp_prec_comp_int on line ...
+Defining \c__fp_prec_and_int on line ...
+Defining \c__fp_prec_or_int on line ...
+Defining \c__fp_prec_quest_int on line ...
+Defining \c__fp_prec_colon_int on line ...
+Defining \c__fp_prec_comma_int on line ...
+Defining \c__fp_prec_paren_int on line ...
Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
More information about the latex3-commits
mailing list