diff options
author | Karl Berry <karl@freefriends.org> | 2010-11-26 23:34:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-11-26 23:34:47 +0000 |
commit | a881f79f85c5ae2491b5448cd8bc0d5a28b55bf5 (patch) | |
tree | 0620e635477f75be996071619fd104866445d00e /Master/texmf-dist/tex/latex/expl3/l3fp.sty | |
parent | fe6482d3468ca040e53f8e5347548495db754e98 (diff) |
expl3 2093 (25nov10)
git-svn-id: svn://tug.org/texlive/trunk@20578 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3fp.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3fp.sty | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3fp.sty b/Master/texmf-dist/tex/latex/expl3/l3fp.sty index 55b088bfbde..65366e3af16 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3fp.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3fp.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3fp.dtx 2080 2010-10-27 11:02:09Z joseph $ +\GetIdInfo$Id: l3fp.dtx 2092 2010-11-25 20:44:04Z joseph $ {L3 Experimental floating-point operations} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -79,8 +79,8 @@ \int_set:Nn \c_fp_two_pi_decimal_int { 283 185 307 } \int_new:N \c_fp_two_pi_extended_int \int_set:Nn \c_fp_two_pi_extended_int { 179 586 477 } -\tl_new:N \c_infinity_fp -\tl_set:Nn \c_infinity_fp { + 2147483647 . 2147483647 e 2147483647 } +\tl_new:N \c_one_fp +\tl_set:Nn \c_one_fp { + 1.000000000 e 0 } \tl_new:N \c_pi_fp \tl_set:Nn \c_pi_fp { + 3.141592654 e 0 } \tl_new:N \c_undefined_fp @@ -145,6 +145,8 @@ } \cs_new_protected_nopar:Npn \fp_split:Nn #1#2 { \tl_set:Nx \l_fp_tmp_tl {#2} + \tl_set_rescan:Nno \l_fp_tmp_tl { \char_make_ignore:n { 32 } } + { \l_fp_tmp_tl } \l_fp_split_sign_int \c_one \fp_split_sign: \use:c { l_fp_input_ #1 _sign_int } \l_fp_split_sign_int @@ -511,6 +513,8 @@ \prg_replicate:nn { #2 - 9 } { 0 } . } +\cs_new_nopar:Npn \fp_to_dim:N #1 { \fp_use:N #1 pt } +\cs_generate_variant:Nn \fp_to_dim:N { c } \cs_new_nopar:Npn \fp_to_int:N #1 { \exp_after:wN \fp_to_int_aux:w #1 \q_stop } @@ -1666,7 +1670,7 @@ \l_fp_output_decimal_int \l_fp_output_exponent_int \tl_new:c { c_fp_sin ( \l_fp_trig_arg_tl ) _tl } - \tl_set:cx { c_fp_sin ( \l_fp_trig_arg_tl ) _tl } + \tl_gset:cx { c_fp_sin ( \l_fp_trig_arg_tl ) _tl } { \tex_ifnum:D \l_fp_input_a_sign_int > \c_zero + @@ -1754,7 +1758,7 @@ \l_fp_output_decimal_int \l_fp_output_exponent_int \tl_new:c { c_fp_cos ( \l_fp_trig_arg_tl ) _tl } - \tl_set:cx { c_fp_cos ( \l_fp_trig_arg_tl ) _tl } + \tl_gset:cx { c_fp_cos ( \l_fp_trig_arg_tl ) _tl } { \tex_ifnum:D \l_fp_input_a_sign_int > \c_zero + @@ -2024,7 +2028,7 @@ \l_fp_output_decimal_int \l_fp_output_exponent_int \tl_new:c { c_fp_tan ( \l_fp_trig_arg_tl ) _tl } - \tl_set:cx { c_fp_tan ( \l_fp_trig_arg_tl ) _tl } + \tl_gset:cx { c_fp_tan ( \l_fp_trig_arg_tl ) _tl } { \tex_ifnum:D \l_fp_output_sign_int > \c_zero + @@ -2041,13 +2045,6 @@ \int_use:N \l_fp_output_exponent_int } } -\prg_new_conditional:Npnn \fp_if_infinity:N #1 { p , T , F , TF } { - \tex_ifx:D #1 \c_infinity_fp - \prg_return_true: - \tex_else:D - \prg_return_false: - \tex_fi:D -} \prg_new_conditional:Npnn \fp_if_undefined:N #1 { p , T , F , TF } { \tex_ifx:D #1 \c_undefined_fp \prg_return_true: |