From 7a91562ff0ea0033add100295a52ded5a8be0d9b Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Sat, 23 Feb 2013 19:05:13 -0600 Subject: * 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. --- lisp/calc/calc-math.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lisp/calc/calc-math.el') diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el index 94b3f645785..3b845f563a1 100644 --- a/lisp/calc/calc-math.el +++ b/lisp/calc/calc-math.el @@ -777,18 +777,18 @@ If this can't be done, return NIL." (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))) -- cgit v1.2.1