martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Ignore angle mode while simplifying units"

Browse Source 
This reverts commit 713e922243.
This commit causes Bug#25652.
This commit is contained in:
Tino Calancha
2017-05-18 13:15:50 +09:00
parent d4cac417d6
commit eab1a6307b
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/calc/calc-forms.el
View File

@@ -317,9 +317,7 @@
(list 'calcFunc-hms a))
((math-negp a)
(math-neg (math-to-hms (math-neg a) ang)))
((eq (or ang
(and (not math-simplifying-units) calc-angle-mode))
'rad)
((eq (or ang calc-angle-mode) 'rad)
(math-to-hms (math-div a (math-pi-over-180)) 'deg))
((memq (car-safe a) '(cplx polar)) a)
(t
@@ -356,16 +354,12 @@
(if (eq (car-safe a) 'sdev)
(math-make-sdev (math-from-hms (nth 1 a) ang)
(math-from-hms (nth 2 a) ang))
(if (eq (or ang
(and (not math-simplifying-units) calc-angle-mode))
'rad)
(if (eq (or ang calc-angle-mode) 'rad)
(list 'calcFunc-rad a)
(list 'calcFunc-deg a)))))
((math-negp a)
(math-neg (math-from-hms (math-neg a) ang)))
((eq (or ang
(and (not math-simplifying-units) calc-angle-mode))
'rad)
((eq (or ang calc-angle-mode) 'rad)
(math-mul (math-from-hms a 'deg) (math-pi-over-180)))
(t
(math-add (math-div (math-add (math-div (nth 3 a)

12
lisp/calc/calc-math.el
View File

@@ -763,14 +763,12 @@ If this can't be done, return NIL."
(defun math-to-radians (a) ; [N N]
(cond ((eq (car-safe a) 'hms)
(math-from-hms a 'rad))
((and (not math-simplifying-units)
(memq calc-angle-mode '(deg hms)))
((memq calc-angle-mode '(deg hms))
(math-mul a (math-pi-over-180)))
(t a)))
(defun math-from-radians (a) ; [N N]
(cond ((and (not math-simplifying-units)
(eq calc-angle-mode 'deg))
(cond ((eq calc-angle-mode 'deg)
(if (math-constp a)
(math-div a (math-pi-over-180))
(list 'calcFunc-deg a)))
@@ -781,16 +779,14 @@ If this can't be done, return NIL."
(defun math-to-radians-2 (a &optional force-symbolic) ; [N N]
(cond ((eq (car-safe a) 'hms)
(math-from-hms a 'rad))
((and (not math-simplifying-units)
(memq calc-angle-mode '(deg hms)))
((memq calc-angle-mode '(deg hms))
(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 &optional force-symbolic) ; [N N]
(cond ((and (not math-simplifying-units)
(memq calc-angle-mode '(deg hms)))
(cond ((memq calc-angle-mode '(deg hms))
(if (or calc-symbolic-mode force-symbolic)
(math-div (math-mul 180 a) '(var pi var-pi))
(math-div a (math-pi-over-180))))