dot/emacs-calc: Attach key bindings to definitions.

Also, slightly reformat.

diff --git a/dot/emacs-calc b/dot/emacs-calc
index ea44b59920da852611417612af346a4ecd0f92f5..75c803693c1c52055c3e681bef753b200aa7f97e 100644 (file)
--- a/dot/emacs-calc
+++ b/dot/emacs-calc
@@ -48,6 +48,8 @@ obtained using `z n' (`calc-integrate-numerically')."
                  (list 'calcFunc-sqrt (list '* d d))
                  x)
            (and a b (list a b)))))
                  (list 'calcFunc-sqrt (list '* d d))
                  x)
            (and a b (list a b)))))

+(put 'calc-define 'calc-path-length
+     '(progn (define-key calc-mode-map "zp" 'calc-path-length)))

 
 (defvar var-IntegNumerRules 'calc-IntegNumerRules)
 (defun calc-IntegNumerRules ()
 
 (defvar var-IntegNumerRules 'calc-IntegNumerRules)
 (defun calc-IntegNumerRules ()


@@ -62,6 +64,9 @@ constant bounds."
   (calc-slow-wrapper
    (calc-enter-result 1 "intn"
                      (math-rewrite (calc-top-n 1) var-IntegNumerRules 5))))
   (calc-slow-wrapper
    (calc-enter-result 1 "intn"
                      (math-rewrite (calc-top-n 1) var-IntegNumerRules 5))))

+(put 'calc-define 'calc-integrate-numerically
+     '(progn (define-key calc-mode-map "zn" 'calc-integrate-numerically)))
+

 
 ;;; Mode settings stored by Calc on Mon Mar 15 16:25:50 2004
 (setq calc-group-char " ")
 
 ;;; Mode settings stored by Calc on Mon Mar 15 16:25:50 2004
 (setq calc-group-char " ")


@@ -105,13 +110,3 @@ constant bounds."
 
 ;;; Variable "var-TrigDefRules" stored by Calc on Tue Jan  4 13:47:34 2000
 (setq var-TrigDefRules '(vec (calcFunc-phase 1) (calcFunc-assign (calcFunc-sin (var t var-t)) (/ (- (^ (var e var-e) (* (var i var-i) (var t var-t))) (^ (var e var-e) (neg (* (var i var-i) (var t var-t))))) (* 2 (var i var-i)))) (calcFunc-assign (calcFunc-cos (var t var-t)) (/ (+ (^ (var e var-e) (* (var i var-i) (var t var-t))) (^ (var e var-e) (neg (* (var i var-i) (var t var-t))))) 2)) (calcFunc-assign (calcFunc-arcsin (var x var-x)) (* (neg (var i var-i)) (calcFunc-ln (- (* (var i var-i) (var x var-x)) (calcFunc-sqrt (- 1 (^ (var x var-x) 2))))))) (calcFunc-assign (calcFunc-arccos (var x var-x)) (* (neg (var i var-i)) (calcFunc-ln (- (var x var-x) (calcFunc-sqrt (- (^ (var x var-x) 2) 1)))))) (calcFunc-assign (calcFunc-arctan (var x var-x)) (* (frac -1 2) (* (var i var-i) (calcFunc-ln (/ (+ 1 (* (var i var-i) (var x var-x))) (- 1 (* (var i var-i) (var x var-x)))))))) (calcFunc-assign (calcFunc-arctanh (var x var-x)) (* (frac 1 2) (calcFunc-ln (/ (+ 1 (var x var-x)) (- 1 (var x var-x)))))) (calcFunc-phase 2) (calcFunc-assign (calcFunc-tan (var t var-t)) (/ (calcFunc-sin (var t var-t)) (calcFunc-cos (var t var-t)))) (calcFunc-assign (calcFunc-sinh (var t var-t)) (* (neg (var i var-i)) (calcFunc-sin (* (var i var-i) (var t var-t))))) (calcFunc-assign (calcFunc-cosh (var t var-t)) (calcFunc-cos (* (var i var-i) (var t var-t)))) (calcFunc-assign (calcFunc-tanh (var t var-t)) (/ (calcFunc-sinh (var t var-t)) (calcFunc-cosh (var t var-t)))) (calcFunc-assign (calcFunc-arcsinh (var x var-x)) (* (neg (var i var-i)) (calcFunc-arcsin (* (var i var-i) (var x var-x))))) (calcFunc-assign (calcFunc-arccosh (var x var-x)) (* (neg (var i var-i)) (calcFunc-arccos (var x var-x))))))
 
 ;;; Variable "var-TrigDefRules" stored by Calc on Tue Jan  4 13:47:34 2000
 (setq var-TrigDefRules '(vec (calcFunc-phase 1) (calcFunc-assign (calcFunc-sin (var t var-t)) (/ (- (^ (var e var-e) (* (var i var-i) (var t var-t))) (^ (var e var-e) (neg (* (var i var-i) (var t var-t))))) (* 2 (var i var-i)))) (calcFunc-assign (calcFunc-cos (var t var-t)) (/ (+ (^ (var e var-e) (* (var i var-i) (var t var-t))) (^ (var e var-e) (neg (* (var i var-i) (var t var-t))))) 2)) (calcFunc-assign (calcFunc-arcsin (var x var-x)) (* (neg (var i var-i)) (calcFunc-ln (- (* (var i var-i) (var x var-x)) (calcFunc-sqrt (- 1 (^ (var x var-x) 2))))))) (calcFunc-assign (calcFunc-arccos (var x var-x)) (* (neg (var i var-i)) (calcFunc-ln (- (var x var-x) (calcFunc-sqrt (- (^ (var x var-x) 2) 1)))))) (calcFunc-assign (calcFunc-arctan (var x var-x)) (* (frac -1 2) (* (var i var-i) (calcFunc-ln (/ (+ 1 (* (var i var-i) (var x var-x))) (- 1 (* (var i var-i) (var x var-x)))))))) (calcFunc-assign (calcFunc-arctanh (var x var-x)) (* (frac 1 2) (calcFunc-ln (/ (+ 1 (var x var-x)) (- 1 (var x var-x)))))) (calcFunc-phase 2) (calcFunc-assign (calcFunc-tan (var t var-t)) (/ (calcFunc-sin (var t var-t)) (calcFunc-cos (var t var-t)))) (calcFunc-assign (calcFunc-sinh (var t var-t)) (* (neg (var i var-i)) (calcFunc-sin (* (var i var-i) (var t var-t))))) (calcFunc-assign (calcFunc-cosh (var t var-t)) (calcFunc-cos (* (var i var-i) (var t var-t)))) (calcFunc-assign (calcFunc-tanh (var t var-t)) (/ (calcFunc-sinh (var t var-t)) (calcFunc-cosh (var t var-t)))) (calcFunc-assign (calcFunc-arcsinh (var x var-x)) (* (neg (var i var-i)) (calcFunc-arcsin (* (var i var-i) (var x var-x))))) (calcFunc-assign (calcFunc-arccosh (var x var-x)) (* (neg (var i var-i)) (calcFunc-arccos (var x var-x))))))

-
-;;; Definition stored by Calc on Tue Jan  4 22:44:33 2000
-(put 'calc-define 'calc-integrate-numerically '(progn
- (define-key calc-mode-map "zn" 'calc-integrate-numerically)
-))
-
-;;; Definition stored by Calc on Tue Jan  4 22:44:37 2000
-(put 'calc-define 'calc-path-length '(progn
- (define-key calc-mode-map "zp" 'calc-path-length)
-))