[Emacs-diffs] /srv/bzr/emacs/trunk r111866: * calc/calc-ext.el (math-to-radians-2, math-from-radians-2):

[Jay Belanger]

------------------------------------------------------------
revno: 111866
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Sat 2013-02-23 19:05:13 -0600
message:
  * calc/calc-ext.el (math-to-radians-2, math-from-radians-2):
    Add option to force `pi' to remain symbolic.
  * calc/calcalg2.el (calcFunc-sin, calcFunc-cos, calcFunc-tan)
    (calcFunc-cot, calcFunc-csc, calcFunc-sec, calcFunc-arcsin)
    (calcFunc-arccos, calcFunc-arctan): Use symbolic `pi' in the
    derivatives, when necessary.
modified:
  lisp/ChangeLog
  lisp/calc/calc-math.el
  lisp/calc/calcalg2.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-23 22:06:45 +0000
+++ b/lisp/ChangeLog    2013-02-24 01:05:13 +0000
@@ -1,3 +1,12 @@
+2013-02-24  Jay Belanger  <address@hidden>
+
+       * calc/calc-ext.el (math-to-radians-2, math-from-radians-2):
+       Add option to force `pi' to remain symbolic.
+       * calc/calcalg2.el (calcFunc-sin, calcFunc-cos, calcFunc-tan)
+       (calcFunc-cot, calcFunc-csc, calcFunc-sec, calcFunc-arcsin)
+       (calcFunc-arccos, calcFunc-arctan): Use symbolic `pi' in the
+       derivatives, when necessary.
+
 2013-02-23  Peter Kleiweg  <address@hidden>
 
        * progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i.

=== modified file 'lisp/calc/calc-math.el'
--- a/lisp/calc/calc-math.el    2013-01-01 09:11:05 +0000
+++ b/lisp/calc/calc-math.el    2013-02-24 01:05:13 +0000
@@ -777,18 +777,18 @@
         (math-to-hms a 'rad))
        (t a)))
 
-(defun math-to-radians-2 (a)   ; [N N]
+(defun math-to-radians-2 (a &optional force-symbolic)   ; [N N]
   (cond ((eq (car-safe a) 'hms)
         (math-from-hms a 'rad))
        ((memq calc-angle-mode '(deg hms))
-        (if calc-symbolic-mode
+        (if (or calc-symbolic-mode force-symbolic)
             (math-div (math-mul a '(var pi var-pi)) 180)
           (math-mul a (math-pi-over-180))))
        (t a)))
 
-(defun math-from-radians-2 (a)   ; [N N]
+(defun math-from-radians-2 (a &optional force-symbolic)   ; [N N]
   (cond ((memq calc-angle-mode '(deg hms))
-        (if calc-symbolic-mode
+        (if (or calc-symbolic-mode force-symbolic)
             (math-div (math-mul 180 a) '(var pi var-pi))
           (math-div a (math-pi-over-180))))
        (t a)))

=== modified file 'lisp/calc/calcalg2.el'
--- a/lisp/calc/calcalg2.el     2013-01-01 09:11:05 +0000
+++ b/lisp/calc/calcalg2.el     2013-02-24 01:05:13 +0000
@@ -401,18 +401,18 @@
 
 (put 'calcFunc-sin\' 'math-derivative-1
      (function (lambda (u) (math-to-radians-2 (math-normalize
-                                              (list 'calcFunc-cos u))))))
+                                              (list 'calcFunc-cos u)) t))))
 
 (put 'calcFunc-cos\' 'math-derivative-1
      (function (lambda (u) (math-neg (math-to-radians-2
                                      (math-normalize
-                                      (list 'calcFunc-sin u)))))))
+                                      (list 'calcFunc-sin u)) t)))))
 
 (put 'calcFunc-tan\' 'math-derivative-1
      (function (lambda (u) (math-to-radians-2
                            (math-sqr
                              (math-normalize
-                              (list 'calcFunc-sec u)))))))
+                              (list 'calcFunc-sec u))) t))))
 
 (put 'calcFunc-sec\' 'math-derivative-1
      (function (lambda (u) (math-to-radians-2
@@ -420,7 +420,7 @@
                              (math-normalize
                               (list 'calcFunc-sec u))
                              (math-normalize
-                              (list 'calcFunc-tan u)))))))
+                              (list 'calcFunc-tan u))) t))))
 
 (put 'calcFunc-csc\' 'math-derivative-1
      (function (lambda (u) (math-neg
@@ -429,32 +429,32 @@
                               (math-normalize
                                (list 'calcFunc-csc u))
                               (math-normalize
-                               (list 'calcFunc-cot u))))))))
+                               (list 'calcFunc-cot u))) t)))))
 
 (put 'calcFunc-cot\' 'math-derivative-1
      (function (lambda (u) (math-neg
                             (math-to-radians-2
                              (math-sqr
                               (math-normalize
-                               (list 'calcFunc-csc u))))))))
+                               (list 'calcFunc-csc u))) t)))))
 
 (put 'calcFunc-arcsin\' 'math-derivative-1
      (function (lambda (u)
                 (math-from-radians-2
                  (math-div 1 (math-normalize
                               (list 'calcFunc-sqrt
-                                    (math-sub 1 (math-sqr u)))))))))
+                                    (math-sub 1 (math-sqr u))))) t))))
 
 (put 'calcFunc-arccos\' 'math-derivative-1
      (function (lambda (u)
                 (math-from-radians-2
                  (math-div -1 (math-normalize
                                (list 'calcFunc-sqrt
-                                     (math-sub 1 (math-sqr u)))))))))
+                                     (math-sub 1 (math-sqr u))))) t))))
 
 (put 'calcFunc-arctan\' 'math-derivative-1
      (function (lambda (u) (math-from-radians-2
-                           (math-div 1 (math-add 1 (math-sqr u)))))))
+                           (math-div 1 (math-add 1 (math-sqr u))) t))))
 
 (put 'calcFunc-sinh\' 'math-derivative-1
      (function (lambda (u) (math-normalize (list 'calcFunc-cosh u)))))