Switch to recommended form of GPLv3 permissions notice.

[bpt/emacs.git] / lisp / calc / calc-math.el

diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 920022a..c17e801 100644 (file)
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1074,7 +1072,7 @@ If this can't be done, return NIL."
        (t (calc-record-why 'scalarp x)
           (list 'calcFunc-cot x))))
 
-(defun math-sin-raw (x)   ; [N N]
+(defun math-sin-raw (x &optional orgx)   ; [N N]
   (cond ((eq (car x) 'cplx)
         (let* ((expx (math-exp-raw (nth 2 x)))
                (expmx (math-div-float '(float 1 0) expx))
@@ -1089,15 +1087,15 @@ If this can't be done, return NIL."
        ((eq (car x) 'polar)
         (math-polar (math-sin-raw (math-complex x))))
        ((Math-integer-negp (nth 1 x))
-        (math-neg-float (math-sin-raw (math-neg-float x))))
+        (math-neg-float (math-sin-raw (math-neg-float x) (if orgx orgx x))))
        ((math-lessp-float '(float 7 0) x)  ; avoid inf loops due to roundoff
-        (math-sin-raw (math-mod x (math-two-pi))))
-       (t (math-sin-raw-2 x x))))
+        (math-sin-raw (math-mod x (math-two-pi)) (if orgx orgx x)))
+       (t (math-sin-raw-2 x (if orgx orgx x)))))
 
 (defun math-cos-raw (x)   ; [N N]
   (if (eq (car-safe x) 'polar)
       (math-polar (math-cos-raw (math-complex x)))
-    (math-sin-raw (math-sub (math-pi-over-2) x))))
+    (math-sin-raw (math-sub (math-pi-over-2) x) x)))
 
 (defun math-sec-raw (x)   ; [N N]
   (cond ((eq (car x) 'cplx)
@@ -1216,13 +1214,15 @@ If this can't be done, return NIL."
           (math-cos-raw-2 xmpo2 orgx))
          ((math-lessp-float x (math-neg (math-pi-over-4)))
           (math-neg (math-cos-raw-2 (math-add (math-pi-over-2) x) orgx)))
-         ((math-nearly-zerop-float x orgx) '(float 0 0))
+         ((math-with-extra-prec -1 (math-nearly-zerop-float x orgx)) 
+           '(float 0 0))
           ((math-use-emacs-fn 'sin x))
          (calc-symbolic-mode (signal 'inexact-result nil))
          (t (math-sin-series x 6 4 x (math-neg-float (math-sqr-float x)))))))
 
 (defun math-cos-raw-2 (x orgx)   ; [F F]
-  (cond ((math-nearly-zerop-float x orgx) '(float 1 0))
+  (cond ((math-with-extra-prec -1 (math-nearly-zerop-float x orgx))
+         '(float 1 0))
         ((math-use-emacs-fn 'cos x))
        (calc-symbolic-mode (signal 'inexact-result nil))
        (t (let ((xnegsqr (math-neg-float (math-sqr-float x))))
@@ -2158,5 +2158,5 @@ If this can't be done, return NIL."
 
 (provide 'calc-math)
 
-;;; arch-tag: c7367e8e-d0b8-4f70-8577-2fb3f31dbb4c
+;; arch-tag: c7367e8e-d0b8-4f70-8577-2fb3f31dbb4c
 ;;; calc-math.el ends here