summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-10-10 21:52:54 +0000
committerKarl Berry <karl@freefriends.org>2011-10-10 21:52:54 +0000
commit26a0070af35fa5652128c74fa1f126ec51def209 (patch)
treec3cb194fd4cc2dc13141e39c561dc5bc5d0b7a83 /Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
parent4d055293335b5b39f55edeff0c28700ebc2486eb (diff)
l3kernel 2900 (10oct11)
git-svn-id: svn://tug.org/texlive/trunk@24256 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3fp.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3fp.sty20
1 files changed, 15 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
index 9d3f1943a09..6304b6d449c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3fp.dtx 2812 2011-09-12 09:19:26Z bruno $
+\GetIdInfo$Id: l3fp.dtx 2857 2011-09-26 19:46:31Z joseph $
{L3 Experimental floating-point operations}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -1707,7 +1707,7 @@
\cs_new_protected_nopar:Npn \fp_trig_octant:
{
\l_fp_trig_octant_int \c_one
- \fp_trig_octant_aux:
+ \fp_trig_octant_aux_i:
\if_int_compare:w \l_fp_input_a_decimal_int < \c_ten
\l_fp_input_a_decimal_int \c_zero
\l_fp_input_a_extended_int \c_zero
@@ -1722,7 +1722,17 @@
\l_fp_input_a_extended_int
\fi:
}
-\cs_new_protected_nopar:Npn \fp_trig_octant_aux:
+\cs_new_protected_nopar:Npn \fp_trig_octant_aux_i:
+ {
+ \if_int_compare:w \l_fp_trig_octant_int > \c_four
+ \l_fp_trig_octant_int \c_four
+ \l_fp_input_a_decimal_int \c_fp_pi_by_four_decimal_int
+ \l_fp_input_a_extended_int \c_fp_pi_by_four_extended_int
+ \else:
+ \exp_after:wN \fp_trig_octant_aux_ii:
+ \fi:
+ }
+\cs_new_protected_nopar:Npn \fp_trig_octant_aux_ii:
{
\if_int_compare:w \l_fp_input_a_integer_int > \c_zero
\fp_sub:NNNNNNNNN
@@ -1732,7 +1742,7 @@
\l_fp_input_a_integer_int \l_fp_input_a_decimal_int
\l_fp_input_a_extended_int
\tex_advance:D \l_fp_trig_octant_int \c_one
- \exp_after:wN \fp_trig_octant_aux:
+ \exp_after:wN \fp_trig_octant_aux_i:
\else:
\if_int_compare:w
\l_fp_input_a_decimal_int > \c_fp_pi_by_four_decimal_int
@@ -1745,7 +1755,7 @@
\l_fp_input_a_extended_int
\tex_advance:D \l_fp_trig_octant_int \c_one
\exp_after:wN \exp_after:wN \exp_after:wN
- \fp_trig_octant_aux:
+ \fp_trig_octant_aux_i:
\fi:
\fi:
}