From acbc4b3c1d3629ae290305ff7c6056eb83d1151c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 26 Mar 2016 22:56:01 +0000 Subject: l3 (26mar16) git-svn-id: svn://tug.org/texlive/trunk@40146 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/l3kernel/l3fp-expo.dtx | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx') diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx index c994fe3ce2c..05da6150eb4 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3fp-expo.dtx Copyright (C) 2011-2014 The LaTeX3 Project +%% File: l3fp-expo.dtx Copyright (C) 2011-2014,2016 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 @@ -36,7 +36,7 @@ % %<*driver> \documentclass[full]{l3doc} -\GetIdInfo$Id: l3fp-expo.dtx 5893 2015-08-26 16:16:52Z mittelba $ +\GetIdInfo$Id: l3fp-expo.dtx 6441 2016-03-24 10:11:59Z joseph $ {L3 Floating-point exponential-related functions} \begin{document} \DocInput{\jobname.dtx} @@ -187,7 +187,7 @@ 0 \fi: \exp_after:wN \exp_stop_f: - \int_use:N \__int_eval:w % for the exponent + \__int_value:w \__int_eval:w % for the exponent \@@_ln_significand:NNNNnnnN #2#3 \@@_ln_exponent:wn {#1} } @@ -239,11 +239,11 @@ \cs:w c_@@_ln_ \__int_to_roman:w #1 _fixed_tl \exp_after:wN \cs_end: \__int_value:w \exp_after:wN \@@_ln_x_iv:wnnnnnnnn - \int_use:N \__int_eval:w + \__int_value:w \__int_eval:w \exp_after:wN \@@_ln_x_iii_var:NNNNNw - \int_use:N \__int_eval:w 9999 9990 + #1*#2#3 + + \__int_value:w \__int_eval:w 9999 9990 + #1*#2#3 + \exp_after:wN \@@_ln_x_iii:NNNNNNw - \int_use:N \__int_eval:w 10 0000 0000 + #1*#4#5 ; + \__int_value:w \__int_eval:w 10 0000 0000 + #1*#4#5 ; {20000} {0000} {0000} {0000} } %^^A todo: reoptimize (a generalization attempt failed). \cs_new:Npn \@@_ln_x_iii:NNNNNNw #1#2 #3#4#5#6 #7; @@ -328,7 +328,7 @@ \cs_new:Npn \@@_ln_x_iv:wnnnnnnnn #1; #2#3#4#5 #6#7#8#9 { \exp_after:wN \@@_div_significand_pack:NNN - \int_use:N \__int_eval:w + \__int_value:w \__int_eval:w \@@_ln_div_i:w #1 ; #6 #7 ; {#8} {#9} {#2} {#3} {#4} {#5} @@ -341,20 +341,20 @@ \cs_new:Npn \@@_ln_div_i:w #1; { \exp_after:wN \@@_div_significand_calc:wwnnnnnnn - \int_use:N \__int_eval:w 999999 + 2 0000 0000 / #1 ; % Q1 + \__int_value:w \__int_eval:w 999999 + 2 0000 0000 / #1 ; % Q1 } \cs_new:Npn \@@_ln_div_ii:wwn #1; #2;#3 % y; B1;B2 <- for k=1 { \exp_after:wN \@@_div_significand_pack:NNN - \int_use:N \__int_eval:w + \__int_value:w \__int_eval:w \exp_after:wN \@@_div_significand_calc:wwnnnnnnn - \int_use:N \__int_eval:w 999999 + #2 #3 / #1 ; % Q2 + \__int_value:w \__int_eval:w 999999 + #2 #3 / #1 ; % Q2 #2 #3 ; } \cs_new:Npn \@@_ln_div_vi:wwn #1; #2;#3#4#5 #6#7#8#9 %y;F1;F2F3F4x1x2x3x4 { \exp_after:wN \@@_div_significand_pack:NNN - \int_use:N \__int_eval:w 1000000 + #2 #3 / #1 ; % Q6 + \__int_value:w \__int_eval:w 1000000 + #2 #3 / #1 ; % Q6 } % \end{macrocode} % We now have essentially\footnote{Bruno: add a mention that @@ -402,12 +402,12 @@ \exp_after:wN \@@_ln_t_large:NNw \exp_after:wN + % \exp_after:wN #1 - \int_use:N \__int_eval:w 9999 - #2 \exp_after:wN ; - \int_use:N \__int_eval:w 9999 - #3 \exp_after:wN ; - \int_use:N \__int_eval:w 9999 - #4 \exp_after:wN ; - \int_use:N \__int_eval:w 9999 - #5 \exp_after:wN ; - \int_use:N \__int_eval:w 9999 - #6 \exp_after:wN ; - \int_use:N \__int_eval:w 1 0000 - #7 ; + \__int_value:w \__int_eval:w 9999 - #2 \exp_after:wN ; + \__int_value:w \__int_eval:w 9999 - #3 \exp_after:wN ; + \__int_value:w \__int_eval:w 9999 - #4 \exp_after:wN ; + \__int_value:w \__int_eval:w 9999 - #5 \exp_after:wN ; + \__int_value:w \__int_eval:w 9999 - #6 \exp_after:wN ; + \__int_value:w \__int_eval:w 1 0000 - #7 ; } % \end{macrocode} % @@ -422,29 +422,29 @@ \cs_new:Npn \@@_ln_t_large:NNw #1 #2 #3; #4; #5; #6; #7; #8; { \exp_after:wN \@@_ln_square_t_after:w - \int_use:N \__int_eval:w 9999 0000 + #3*#3 + \__int_value:w \__int_eval:w 9999 0000 + #3*#3 \exp_after:wN \@@_ln_square_t_pack:NNNNNw - \int_use:N \__int_eval:w 9999 0000 + 2*#3*#4 + \__int_value:w \__int_eval:w 9999 0000 + 2*#3*#4 \exp_after:wN \@@_ln_square_t_pack:NNNNNw - \int_use:N \__int_eval:w 9999 0000 + 2*#3*#5 + #4*#4 + \__int_value:w \__int_eval:w 9999 0000 + 2*#3*#5 + #4*#4 \exp_after:wN \@@_ln_square_t_pack:NNNNNw - \int_use:N \__int_eval:w 9999 0000 + 2*#3*#6 + 2*#4*#5 + \__int_value:w \__int_eval:w 9999 0000 + 2*#3*#6 + 2*#4*#5 \exp_after:wN \@@_ln_square_t_pack:NNNNNw - \int_use:N \__int_eval:w 1 0000 0000 + 2*#3*#7 + 2*#4*#6 + #5*#5 + \__int_value:w \__int_eval:w 1 0000 0000 + 2*#3*#7 + 2*#4*#6 + #5*#5 + (2*#3*#8 + 2*#4*#7 + 2*#5*#6) / 1 0000 % ; ; ; \exp_after:wN \@@_ln_twice_t_after:w - \int_use:N \__int_eval:w -1 + 2*#3 + \__int_value:w \__int_eval:w -1 + 2*#3 \exp_after:wN \@@_ln_twice_t_pack:Nw - \int_use:N \__int_eval:w 9999 + 2*#4 + \__int_value:w \__int_eval:w 9999 + 2*#4 \exp_after:wN \@@_ln_twice_t_pack:Nw - \int_use:N \__int_eval:w 9999 + 2*#5 + \__int_value:w \__int_eval:w 9999 + 2*#5 \exp_after:wN \@@_ln_twice_t_pack:Nw - \int_use:N \__int_eval:w 9999 + 2*#6 + \__int_value:w \__int_eval:w 9999 + 2*#6 \exp_after:wN \@@_ln_twice_t_pack:Nw - \int_use:N \__int_eval:w 9999 + 2*#7 + \__int_value:w \__int_eval:w 9999 + 2*#7 \exp_after:wN \@@_ln_twice_t_pack:Nw - \int_use:N \__int_eval:w 10000 + 2*#8 ; ; + \__int_value:w \__int_eval:w 10000 + 2*#8 ; ; { \@@_ln_c:NwNw #1 } #2 } @@ -498,7 +498,7 @@ \@@_fixed_mul:wwn #3; { \exp_after:wN \@@_ln_Taylor_loop:www - \int_use:N \__int_eval:w #1 - \c_two ; + \__int_value:w \__int_eval:w #1 - \c_two ; } #3; } @@ -506,7 +506,7 @@ { \fi: \exp_after:wN \@@_fixed_mul:wwn - \exp_after:wN { \int_use:N \__int_eval:w 10000 + #2 } #3; + \exp_after:wN { \__int_value:w \__int_eval:w 10000 + #2 } #3; } % \end{macrocode} % \end{macro} @@ -652,7 +652,7 @@ \if_int_compare:w #4 < - \c_eight \c_one \exp_after:wN \@@_add_big_i_o:wNww - \int_use:N \__int_eval:w \c_one - #4 ; + \__int_value:w \__int_eval:w \c_one - #4 ; 0 {1000}{0000}{0000}{0000} ; #5; \exp:w \else: @@ -717,7 +717,7 @@ \@@_fixed_mul:wwn #2 ; { \exp_after:wN \@@_exp_Taylor_loop:www - \int_use:N \__int_eval:w #1 - 1 ; + \__int_value:w \__int_eval:w #1 - 1 ; #2 ; } } @@ -1086,21 +1086,21 @@ \cs_new:Npn \@@_pow_exponent:Nwnnnnnw #1#2; #3#4#5#6#7#8; { %^^A todo: use that in ln. \exp_after:wN \@@_fixed_mul_after:wwn - \int_use:N \__int_eval:w \c_@@_leading_shift_int + \__int_value:w \__int_eval:w \c_@@_leading_shift_int \exp_after:wN \@@_pack:NNNNNw - \int_use:N \__int_eval:w \c_@@_middle_shift_int + \__int_value:w \__int_eval:w \c_@@_middle_shift_int #1#2*23025 - #1 #3 \exp_after:wN \@@_pack:NNNNNw - \int_use:N \__int_eval:w \c_@@_middle_shift_int + \__int_value:w \__int_eval:w \c_@@_middle_shift_int #1 #2*8509 - #1 #4 \exp_after:wN \@@_pack:NNNNNw - \int_use:N \__int_eval:w \c_@@_middle_shift_int + \__int_value:w \__int_eval:w \c_@@_middle_shift_int #1 #2*2994 - #1 #5 \exp_after:wN \@@_pack:NNNNNw - \int_use:N \__int_eval:w \c_@@_middle_shift_int + \__int_value:w \__int_eval:w \c_@@_middle_shift_int #1 #2*0456 - #1 #6 \exp_after:wN \@@_pack:NNNNNw - \int_use:N \__int_eval:w \c_@@_trailing_shift_int + \__int_value:w \__int_eval:w \c_@@_trailing_shift_int #1 #2*8401 - #1 #7 #1 ( #2*7991 - #8 ) / 1 0000 ; ; } @@ -1116,7 +1116,7 @@ \fi: \fi: #7 \exp_after:wN ; - \int_use:N \__int_eval:w 10 0000 + #1 \__int_eval_end: + \__int_value:w \__int_eval:w 10 0000 + #1 \__int_eval_end: #2#3#4#5#6 0000 0000 0000 0000 0000 0000 ; %^^A todo: how many 0? } \cs_new:Npn \@@_pow_C_overflow:w #1; #2; #3 @@ -1183,7 +1183,7 @@ \exp_after:wN \s_@@ \exp_after:wN \@@_chk:w \exp_after:wN #2 - \int_use:N \__int_eval:w \c_two - #3 \__int_eval_end: + \__int_value:w \__int_eval:w \c_two - #3 \__int_eval_end: } % \end{macrocode} % ^^A todo: is this \@@_exp_after_o:w necessary? Appropriate? -- cgit v1.2.3