[Emacs-diffs] Changes to emacs/lisp/calc/calc-units.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-units.el
diff -c emacs/lisp/calc/calc-units.el:1.13 emacs/lisp/calc/calc-units.el:1.14
*** emacs/lisp/calc/calc-units.el:1.13  Thu Jan  6 18:14:08 2005
--- emacs/lisp/calc/calc-units.el       Tue Feb 15 19:27:17 2005
***************
*** 1241,1246 ****
--- 1241,1285 ----
              (eq (nth 1 (nth 2 rad)) 'rad)
              (list 'calcFunc-tan (nth 1 rad))))))
  
+ (math-defsimplify calcFunc-sec
+   (and math-simplifying-units
+        (math-units-in-expr-p (nth 1 math-simplify-expr) nil)
+        (let ((rad (math-simplify-units
+                  (math-evaluate-expr
+                   (math-to-standard-units (nth 1 math-simplify-expr) nil))))
+            (calc-angle-mode 'rad))
+        (and (eq (car-safe rad) '*)
+             (math-realp (nth 1 rad))
+             (eq (car-safe (nth 2 rad)) 'var)
+             (eq (nth 1 (nth 2 rad)) 'rad)
+             (list 'calcFunc-sec (nth 1 rad))))))
+ 
+ (math-defsimplify calcFunc-csc
+   (and math-simplifying-units
+        (math-units-in-expr-p (nth 1 math-simplify-expr) nil)
+        (let ((rad (math-simplify-units
+                  (math-evaluate-expr
+                   (math-to-standard-units (nth 1 math-simplify-expr) nil))))
+            (calc-angle-mode 'rad))
+        (and (eq (car-safe rad) '*)
+             (math-realp (nth 1 rad))
+             (eq (car-safe (nth 2 rad)) 'var)
+             (eq (nth 1 (nth 2 rad)) 'rad)
+             (list 'calcFunc-csc (nth 1 rad))))))
+ 
+ (math-defsimplify calcFunc-cot
+   (and math-simplifying-units
+        (math-units-in-expr-p (nth 1 math-simplify-expr) nil)
+        (let ((rad (math-simplify-units
+                  (math-evaluate-expr
+                   (math-to-standard-units (nth 1 math-simplify-expr) nil))))
+            (calc-angle-mode 'rad))
+        (and (eq (car-safe rad) '*)
+             (math-realp (nth 1 rad))
+             (eq (car-safe (nth 2 rad)) 'var)
+             (eq (nth 1 (nth 2 rad)) 'rad)
+             (list 'calcFunc-cot (nth 1 rad))))))
+ 
  
  (defun math-remove-units (expr)
    (if (math-check-unit-name expr)