[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc-ext.el [emacs-unicode-2]
|
From: |
Miles Bader |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc-ext.el [emacs-unicode-2] |
|
Date: |
Wed, 08 Dec 2004 01:55:59 -0500 |
Index: emacs/lisp/calc/calc-ext.el
diff -c emacs/lisp/calc/calc-ext.el:1.13.4.4
emacs/lisp/calc/calc-ext.el:1.13.4.5
*** emacs/lisp/calc/calc-ext.el:1.13.4.4 Fri Nov 19 06:55:08 2004
--- emacs/lisp/calc/calc-ext.el Wed Dec 8 05:02:18 2004
***************
*** 26,51 ****
;;; Code:
- (provide 'calc-ext)
(require 'calc)
-
- (setq calc-extensions-loaded t)
-
- ;;; This function is the autoload "hook" to cause this file to be loaded.
- ;;;###autoload
- (defun calc-extensions ()
- "This function is part of the autoload linkage for parts of Calc."
- t)
-
- ;;; Auto-load calc.el part, in case this part was loaded first.
- (if (fboundp 'calc-dispatch)
- (and (eq (car-safe (symbol-function 'calc-dispatch)) 'autoload)
- (load (nth 1 (symbol-function 'calc-dispatch))))
- (if (fboundp 'calc)
- (and (eq (car-safe (symbol-function 'calc)) 'autoload)
- (load (nth 1 (symbol-function 'calc))))
- (error "Main part of Calc must be present in order to load this file")))
-
(require 'calc-macs)
(defvar math-simplifying nil)
--- 26,32 ----
***************
*** 668,674 ****
(autoload func (car x)))) (cdr x))))
'(
! ("calc-alg" calc-Need-calc-alg calc-has-rules
calc-modify-simplify-mode calcFunc-collect calcFunc-esimplify
calcFunc-islin calcFunc-islinnt calcFunc-lin calcFunc-linnt
calcFunc-simplify calcFunc-subst math-beforep
--- 649,655 ----
(autoload func (car x)))) (cdr x))))
'(
! ("calc-alg" calc-has-rules math-defsimplify
calc-modify-simplify-mode calcFunc-collect calcFunc-esimplify
calcFunc-islin calcFunc-islinnt calcFunc-lin calcFunc-linnt
calcFunc-simplify calcFunc-subst math-beforep
***************
*** 676,688 ****
math-expr-contains-count math-expr-depends math-expr-height
math-expr-subst math-expr-weight math-integer-plus math-is-linear
math-is-multiple math-is-polynomial math-linear-in math-multiple-of
! math-need-std-simps math-poly-depends math-poly-mix math-poly-mul
math-poly-simplify math-poly-zerop math-polynomial-base
math-polynomial-p math-recompile-eval-rules math-simplify
math-simplify-exp math-simplify-extended math-simplify-sqrt
math-to-simple-fraction)
! ("calcalg2" calc-Need-calc-alg-2 calcFunc-asum calcFunc-deriv
calcFunc-ffinv calcFunc-finv calcFunc-fsolve calcFunc-gpoly
calcFunc-integ calcFunc-poly calcFunc-prod calcFunc-roots
calcFunc-solve calcFunc-sum calcFunc-table calcFunc-taylor
--- 657,669 ----
math-expr-contains-count math-expr-depends math-expr-height
math-expr-subst math-expr-weight math-integer-plus math-is-linear
math-is-multiple math-is-polynomial math-linear-in math-multiple-of
! math-poly-depends math-poly-mix math-poly-mul
math-poly-simplify math-poly-zerop math-polynomial-base
math-polynomial-p math-recompile-eval-rules math-simplify
math-simplify-exp math-simplify-extended math-simplify-sqrt
math-to-simple-fraction)
! ("calcalg2" calcFunc-asum calcFunc-deriv
calcFunc-ffinv calcFunc-finv calcFunc-fsolve calcFunc-gpoly
calcFunc-integ calcFunc-poly calcFunc-prod calcFunc-roots
calcFunc-solve calcFunc-sum calcFunc-table calcFunc-taylor
***************
*** 691,697 ****
math-poly-all-roots math-prod-rec math-reject-solution math-solve-eqn
math-solve-for math-sum-rec math-try-integral)
! ("calcalg3" calc-Need-calc-alg-3 calcFunc-efit calcFunc-fit
calcFunc-fitdummy calcFunc-fitparam calcFunc-fitvar
calcFunc-hasfitparams calcFunc-hasfitvars calcFunc-maximize
calcFunc-minimize calcFunc-ninteg calcFunc-polint calcFunc-ratint
--- 672,678 ----
math-poly-all-roots math-prod-rec math-reject-solution math-solve-eqn
math-solve-for math-sum-rec math-try-integral)
! ("calcalg3" calcFunc-efit calcFunc-fit
calcFunc-fitdummy calcFunc-fitparam calcFunc-fitvar
calcFunc-hasfitparams calcFunc-hasfitvars calcFunc-maximize
calcFunc-minimize calcFunc-ninteg calcFunc-polint calcFunc-ratint
***************
*** 699,705 ****
calcFunc-xfit math-find-minimum math-find-root math-ninteg-evaluate
math-ninteg-midpoint math-ninteg-romberg math-poly-interp)
! ("calc-arith" calc-Need-calc-arith calcFunc-abs calcFunc-abssqr
calcFunc-add calcFunc-ceil calcFunc-decr calcFunc-deven calcFunc-dimag
calcFunc-dint calcFunc-div calcFunc-dnatnum calcFunc-dneg
calcFunc-dnonneg calcFunc-dnonzero calcFunc-dnumint calcFunc-dodd
--- 680,686 ----
calcFunc-xfit math-find-minimum math-find-root math-ninteg-evaluate
math-ninteg-midpoint math-ninteg-romberg math-poly-interp)
! ("calc-arith" calcFunc-abs calcFunc-abssqr
calcFunc-add calcFunc-ceil calcFunc-decr calcFunc-deven calcFunc-dimag
calcFunc-dint calcFunc-div calcFunc-dnatnum calcFunc-dneg
calcFunc-dnonneg calcFunc-dnonzero calcFunc-dnumint calcFunc-dodd
***************
*** 725,731 ****
math-quarter-integer math-round math-setup-declarations math-sqr
math-sqr-float math-trunc-fancy math-trunc-special)
! ("calc-bin" calc-Need-calc-bin calcFunc-and calcFunc-ash
calcFunc-clip calcFunc-diff calcFunc-lsh calcFunc-not calcFunc-or
calcFunc-rash calcFunc-rot calcFunc-rsh calcFunc-xor math-clip
math-compute-max-digits math-convert-radix-digits math-float-parts
--- 706,712 ----
math-quarter-integer math-round math-setup-declarations math-sqr
math-sqr-float math-trunc-fancy math-trunc-special)
! ("calc-bin" calcFunc-and calcFunc-ash
calcFunc-clip calcFunc-diff calcFunc-lsh calcFunc-not calcFunc-or
calcFunc-rash calcFunc-rot calcFunc-rsh calcFunc-xor math-clip
math-compute-max-digits math-convert-radix-digits math-float-parts
***************
*** 734,740 ****
math-format-radix math-format-radix-float math-integer-log2
math-power-of-2 math-radix-float-power)
! ("calc-comb" calc-Need-calc-comb calc-report-prime-test
calcFunc-choose calcFunc-dfact calcFunc-egcd calcFunc-fact
calcFunc-gcd calcFunc-lcm calcFunc-moebius calcFunc-nextprime
calcFunc-perm calcFunc-prevprime calcFunc-prfac calcFunc-prime
--- 715,721 ----
math-format-radix math-format-radix-float math-integer-log2
math-power-of-2 math-radix-float-power)
! ("calc-comb" calc-report-prime-test
calcFunc-choose calcFunc-dfact calcFunc-egcd calcFunc-fact
calcFunc-gcd calcFunc-lcm calcFunc-moebius calcFunc-nextprime
calcFunc-perm calcFunc-prevprime calcFunc-prfac calcFunc-prime
***************
*** 742,769 ****
calcFunc-totient math-init-random-base math-member math-prime-test
math-random-base)
! ("calccomp" calc-Need-calc-comp calcFunc-cascent calcFunc-cdescent
calcFunc-cheight calcFunc-cwidth math-comp-ascent math-comp-descent
math-comp-height math-comp-width math-compose-expr
math-composition-to-string math-stack-value-offset-fancy
math-vector-is-string math-vector-to-string)
! ("calc-cplx" calc-Need-calc-cplx calcFunc-arg calcFunc-conj
calcFunc-im calcFunc-polar calcFunc-re calcFunc-rect math-complex
math-fix-circular math-imaginary math-imaginary-i math-normalize-polar
math-polar math-want-polar)
! ("calc-embed" calc-Need-calc-embed calc-do-embedded
calc-do-embedded-activate calc-embedded-evaluate-expr
calc-embedded-modes-change calc-embedded-var-change)
! ("calc-fin" calc-Need-calc-fin calc-to-percentage calcFunc-ddb
calcFunc-fv calcFunc-fvb calcFunc-fvl calcFunc-irr calcFunc-irrb
calcFunc-nper calcFunc-nperb calcFunc-nperl calcFunc-npv calcFunc-npvb
calcFunc-pmt calcFunc-pmtb calcFunc-pv calcFunc-pvb calcFunc-pvl
calcFunc-rate calcFunc-rateb calcFunc-ratel calcFunc-sln calcFunc-syd)
! ("calc-forms" calc-Need-calc-forms calcFunc-badd calcFunc-bsub
calcFunc-date calcFunc-day calcFunc-dsadj calcFunc-hms
calcFunc-holiday calcFunc-hour calcFunc-incmonth calcFunc-incyear
calcFunc-intv calcFunc-julian calcFunc-makemod calcFunc-minute
--- 723,750 ----
calcFunc-totient math-init-random-base math-member math-prime-test
math-random-base)
! ("calccomp" calcFunc-cascent calcFunc-cdescent
calcFunc-cheight calcFunc-cwidth math-comp-ascent math-comp-descent
math-comp-height math-comp-width math-compose-expr
math-composition-to-string math-stack-value-offset-fancy
math-vector-is-string math-vector-to-string)
! ("calc-cplx" calcFunc-arg calcFunc-conj
calcFunc-im calcFunc-polar calcFunc-re calcFunc-rect math-complex
math-fix-circular math-imaginary math-imaginary-i math-normalize-polar
math-polar math-want-polar)
! ("calc-embed" calc-do-embedded
calc-do-embedded-activate calc-embedded-evaluate-expr
calc-embedded-modes-change calc-embedded-var-change)
! ("calc-fin" calc-to-percentage calcFunc-ddb
calcFunc-fv calcFunc-fvb calcFunc-fvl calcFunc-irr calcFunc-irrb
calcFunc-nper calcFunc-nperb calcFunc-nperl calcFunc-npv calcFunc-npvb
calcFunc-pmt calcFunc-pmtb calcFunc-pv calcFunc-pvb calcFunc-pvl
calcFunc-rate calcFunc-rateb calcFunc-ratel calcFunc-sln calcFunc-syd)
! ("calc-forms" calcFunc-badd calcFunc-bsub
calcFunc-date calcFunc-day calcFunc-dsadj calcFunc-hms
calcFunc-holiday calcFunc-hour calcFunc-incmonth calcFunc-incyear
calcFunc-intv calcFunc-julian calcFunc-makemod calcFunc-minute
***************
*** 778,788 ****
math-setup-add-holidays math-setup-holidays math-setup-year-holidays
math-sort-intv math-to-business-day math-to-hms)
! ("calc-frac" calc-Need-calc-frac calc-add-fractions
calc-div-fractions calc-mul-fractions calcFunc-fdiv calcFunc-frac
math-make-frac)
! ("calc-funcs" calc-Need-calc-funcs calc-prob-dist calcFunc-bern
calcFunc-besJ calcFunc-besY calcFunc-beta calcFunc-betaB
calcFunc-betaI calcFunc-erf calcFunc-erfc calcFunc-euler
calcFunc-gamma calcFunc-gammaG calcFunc-gammaP calcFunc-gammaQ
--- 759,769 ----
math-setup-add-holidays math-setup-holidays math-setup-year-holidays
math-sort-intv math-to-business-day math-to-hms)
! ("calc-frac" calc-add-fractions
calc-div-fractions calc-mul-fractions calcFunc-fdiv calcFunc-frac
math-make-frac)
! ("calc-funcs" calc-prob-dist calcFunc-bern
calcFunc-besJ calcFunc-besY calcFunc-beta calcFunc-betaB
calcFunc-betaI calcFunc-erf calcFunc-erfc calcFunc-euler
calcFunc-gamma calcFunc-gammaG calcFunc-gammaP calcFunc-gammaQ
***************
*** 791,810 ****
calcFunc-utpf calcFunc-utpn calcFunc-utpp calcFunc-utpt
math-bernoulli-number math-gammap1-raw)
! ("calc-graph" calc-Need-calc-graph calc-graph-show-tty)
!
! ("calc-help" calc-Need-calc-help)
! ("calc-incom" calc-Need-calc-incom calc-digit-dots)
! ("calc-keypd" calc-Need-calc-keypd calc-do-keypad
calc-keypad-x-left-click calc-keypad-x-middle-click
calc-keypad-x-right-click)
! ("calc-lang" calc-Need-calc-lang calc-set-language
math-read-big-balance math-read-big-rec)
! ("calc-map" calc-Need-calc-map calc-get-operator calcFunc-accum
calcFunc-afixp calcFunc-anest calcFunc-apply calcFunc-call
calcFunc-fixp calcFunc-inner calcFunc-map calcFunc-mapa calcFunc-mapc
calcFunc-mapd calcFunc-mapeq calcFunc-mapeqp calcFunc-mapeqr
--- 772,789 ----
calcFunc-utpf calcFunc-utpn calcFunc-utpp calcFunc-utpt
math-bernoulli-number math-gammap1-raw)
! ("calc-graph" calc-graph-show-tty)
! ("calc-incom" calc-digit-dots)
! ("calc-keypd" calc-do-keypad
calc-keypad-x-left-click calc-keypad-x-middle-click
calc-keypad-x-right-click)
! ("calc-lang" calc-set-language
math-read-big-balance math-read-big-rec)
! ("calc-map" calc-get-operator calcFunc-accum
calcFunc-afixp calcFunc-anest calcFunc-apply calcFunc-call
calcFunc-fixp calcFunc-inner calcFunc-map calcFunc-mapa calcFunc-mapc
calcFunc-mapd calcFunc-mapeq calcFunc-mapeqp calcFunc-mapeqr
***************
*** 815,825 ****
math-calcFunc-to-var math-multi-subst math-multi-subst-rec
math-var-to-calcFunc)
! ("calc-mtx" calc-Need-calc-mat calcFunc-det calcFunc-lud calcFunc-tr
math-col-matrix math-lud-solve math-matrix-inv-raw math-matrix-lud
math-mul-mat-vec math-mul-mats math-row-matrix)
! ("calc-math" calc-Need-calc-math calcFunc-alog calcFunc-arccos
calcFunc-arccosh calcFunc-arcsin calcFunc-arcsincos calcFunc-arcsinh
calcFunc-arctan calcFunc-arctan2 calcFunc-arctanh calcFunc-cos
calcFunc-cosh calcFunc-deg calcFunc-exp calcFunc-exp10 calcFunc-expm1
--- 794,804 ----
math-calcFunc-to-var math-multi-subst math-multi-subst-rec
math-var-to-calcFunc)
! ("calc-mtx" calcFunc-det calcFunc-lud calcFunc-tr
math-col-matrix math-lud-solve math-matrix-inv-raw math-matrix-lud
math-mul-mat-vec math-mul-mats math-row-matrix)
! ("calc-math" calcFunc-alog calcFunc-arccos
calcFunc-arccosh calcFunc-arcsin calcFunc-arcsincos calcFunc-arcsinh
calcFunc-arctan calcFunc-arctan2 calcFunc-arctanh calcFunc-cos
calcFunc-cosh calcFunc-deg calcFunc-exp calcFunc-exp10 calcFunc-expm1
***************
*** 834,842 ****
math-sin-cos-raw math-sin-raw math-sqrt math-sqrt-float math-sqrt-raw
math-tan-raw math-to-radians math-to-radians-2)
! ("calc-mode" calc-Need-calc-mode math-get-modes-vec)
! ("calc-poly" calc-Need-calc-poly calcFunc-apart calcFunc-expand
calcFunc-expandpow calcFunc-factor calcFunc-factors calcFunc-nrat
calcFunc-pcont calcFunc-pdeg calcFunc-pdiv calcFunc-pdivide
calcFunc-pdivrem calcFunc-pgcd calcFunc-plead calcFunc-pprim
--- 813,821 ----
math-sin-cos-raw math-sin-raw math-sqrt math-sqrt-float math-sqrt-raw
math-tan-raw math-to-radians math-to-radians-2)
! ("calc-mode" math-get-modes-vec)
! ("calc-poly" calcFunc-apart calcFunc-expand
calcFunc-expandpow calcFunc-factor calcFunc-factors calcFunc-nrat
calcFunc-pcont calcFunc-pdeg calcFunc-pdiv calcFunc-pdivide
calcFunc-pdivrem calcFunc-pgcd calcFunc-plead calcFunc-pprim
***************
*** 849,855 ****
math-poly-gcd-frac-list math-poly-modulus-rec math-ratpoly-p
math-to-ratpoly math-to-ratpoly-rec)
! ("calc-prog" calc-Need-calc-prog calc-default-formula-arglist
calc-execute-kbd-macro calc-finish-user-syntax-edit
calc-fix-token-name calc-fix-user-formula calc-read-parse-table
calc-read-parse-table-part calc-subsetp calc-write-parse-table
--- 828,834 ----
math-poly-gcd-frac-list math-poly-modulus-rec math-ratpoly-p
math-to-ratpoly math-to-ratpoly-rec)
! ("calc-prog" calc-default-formula-arglist
calc-execute-kbd-macro calc-finish-user-syntax-edit
calc-fix-token-name calc-fix-user-formula calc-read-parse-table
calc-read-parse-table-part calc-subsetp calc-write-parse-table
***************
*** 862,868 ****
math-do-defmath math-handle-for math-handle-foreach
math-normalize-logical-op math-return)
! ("calc-rewr" calc-Need-calc-rewr calcFunc-match calcFunc-matches
calcFunc-matchnot calcFunc-rewrite calcFunc-vmatches
math-apply-rewrites math-compile-patterns math-compile-rewrites
math-flatten-lands math-match-patterns math-rewrite
--- 841,847 ----
math-do-defmath math-handle-for math-handle-foreach
math-normalize-logical-op math-return)
! ("calc-rewr" calcFunc-match calcFunc-matches
calcFunc-matchnot calcFunc-rewrite calcFunc-vmatches
math-apply-rewrites math-compile-patterns math-compile-rewrites
math-flatten-lands math-match-patterns math-rewrite
***************
*** 870,912 ****
("calc-rules" calc-CommuteRules calc-DistribRules calc-FactorRules
calc-FitRules calc-IntegAfterRules calc-InvertRules calc-JumpRules
! calc-MergeRules calc-Need-calc-rules calc-NegateRules
calc-compile-rule-set)
! ("calc-sel" calc-Need-calc-sel calc-auto-selection
calc-delete-selection calc-encase-atoms calc-find-assoc-parent-formula
calc-find-parent-formula calc-find-sub-formula calc-prepare-selection
calc-preserve-point calc-replace-selections calc-replace-sub-formula
calc-roll-down-with-selections calc-roll-up-with-selections
calc-sel-error)
! ("calcsel2" calc-Need-calc-sel-2)
!
! ("calc-stat" calc-Need-calc-stat calc-vector-op calcFunc-agmean
calcFunc-vcorr calcFunc-vcount calcFunc-vcov calcFunc-vflat
calcFunc-vgmean calcFunc-vhmean calcFunc-vmax calcFunc-vmean
calcFunc-vmeane calcFunc-vmedian calcFunc-vmin calcFunc-vpcov
calcFunc-vprod calcFunc-vpsdev calcFunc-vpvar calcFunc-vsdev
calcFunc-vsum calcFunc-vvar math-flatten-many-vecs)
! ("calc-store" calc-Need-calc-store calc-read-var-name
calc-store-value calc-var-name)
! ("calc-stuff" calc-Need-calc-stuff calc-explain-why calcFunc-clean
calcFunc-pclean calcFunc-pfloat calcFunc-pfrac)
! ("calc-trail" calc-Need-calc-trail)
!
! ("calc-undo" calc-Need-calc-undo)
!
! ("calc-units" calc-Need-calc-units calcFunc-usimplify
math-build-units-table math-build-units-table-buffer
math-check-unit-name math-convert-temperature math-convert-units
math-extract-units math-remove-units math-simplify-units
math-single-units-in-expr-p math-to-standard-units
math-units-in-expr-p)
! ("calc-vec" calc-Need-calc-vec calcFunc-append calcFunc-appendrev
calcFunc-arrange calcFunc-cnorm calcFunc-cons calcFunc-cross
calcFunc-ctrn calcFunc-cvec calcFunc-diag calcFunc-find
calcFunc-getdiag calcFunc-grade calcFunc-head calcFunc-histogram
--- 849,885 ----
("calc-rules" calc-CommuteRules calc-DistribRules calc-FactorRules
calc-FitRules calc-IntegAfterRules calc-InvertRules calc-JumpRules
! calc-MergeRules calc-NegateRules
calc-compile-rule-set)
! ("calc-sel" calc-auto-selection
calc-delete-selection calc-encase-atoms calc-find-assoc-parent-formula
calc-find-parent-formula calc-find-sub-formula calc-prepare-selection
calc-preserve-point calc-replace-selections calc-replace-sub-formula
calc-roll-down-with-selections calc-roll-up-with-selections
calc-sel-error)
! ("calc-stat" calc-vector-op calcFunc-agmean
calcFunc-vcorr calcFunc-vcount calcFunc-vcov calcFunc-vflat
calcFunc-vgmean calcFunc-vhmean calcFunc-vmax calcFunc-vmean
calcFunc-vmeane calcFunc-vmedian calcFunc-vmin calcFunc-vpcov
calcFunc-vprod calcFunc-vpsdev calcFunc-vpvar calcFunc-vsdev
calcFunc-vsum calcFunc-vvar math-flatten-many-vecs)
! ("calc-store" calc-read-var-name
calc-store-value calc-var-name)
! ("calc-stuff" calc-explain-why calcFunc-clean
calcFunc-pclean calcFunc-pfloat calcFunc-pfrac)
! ("calc-units" calcFunc-usimplify
math-build-units-table math-build-units-table-buffer
math-check-unit-name math-convert-temperature math-convert-units
math-extract-units math-remove-units math-simplify-units
math-single-units-in-expr-p math-to-standard-units
math-units-in-expr-p)
! ("calc-vec" calcFunc-append calcFunc-appendrev
calcFunc-arrange calcFunc-cnorm calcFunc-cons calcFunc-cross
calcFunc-ctrn calcFunc-cvec calcFunc-diag calcFunc-find
calcFunc-getdiag calcFunc-grade calcFunc-head calcFunc-histogram
***************
*** 925,931 ****
math-map-vec-2 math-mat-col math-mimic-ident math-prepare-set
math-read-brackets math-reduce-cols math-reduce-vec math-transpose)
! ("calc-yank" calc-Need-calc-yank calc-alg-edit calc-clean-newlines
calc-do-grab-rectangle calc-do-grab-region calc-finish-stack-edit
calc-force-refresh calc-locate-cursor-element calc-show-edit-buffer)
--- 898,904 ----
math-map-vec-2 math-mat-col math-mimic-ident math-prepare-set
math-read-brackets math-reduce-cols math-reduce-vec math-transpose)
! ("calc-yank" calc-alg-edit calc-clean-newlines
calc-do-grab-rectangle calc-do-grab-region calc-finish-stack-edit
calc-force-refresh calc-locate-cursor-element calc-show-edit-buffer)
***************
*** 1176,1181 ****
--- 1149,1157 ----
;;;; Miscellaneous.
+ ;; calc-command-flags is declared in calc.el
+ (defvar calc-command-flags)
+
(defun calc-clear-command-flag (f)
(setq calc-command-flags (delq f calc-command-flags)))
***************
*** 1342,1348 ****
(defun calc-inverse (&optional n)
(interactive "P")
! (calc-fancy-prefix 'calc-inverse-flag "Inverse..." n))
(defconst calc-fancy-prefix-map
(let ((map (make-sparse-keymap)))
--- 1318,1333 ----
(defun calc-inverse (&optional n)
(interactive "P")
! (let* ((hyp-flag (if (or
! (eq major-mode 'calc-keypad-mode)
! (eq major-mode 'calc-trail-mode))
! (with-current-buffer calc-main-buffer
! calc-hyperbolic-flag)
! calc-hyperbolic-flag))
! (msg (if hyp-flag
! "Inverse Hyperbolic..."
! "Inverse...")))
! (calc-fancy-prefix 'calc-inverse-flag msg n)))
(defconst calc-fancy-prefix-map
(let ((map (make-sparse-keymap)))
***************
*** 1410,1416 ****
(defun calc-hyperbolic (&optional n)
(interactive "P")
! (calc-fancy-prefix 'calc-hyperbolic-flag "Hyperbolic..." n))
(defun calc-hyperbolic-func ()
(save-excursion
--- 1395,1410 ----
(defun calc-hyperbolic (&optional n)
(interactive "P")
! (let* ((inv-flag (if (or
! (eq major-mode 'calc-keypad-mode)
! (eq major-mode 'calc-trail-mode))
! (with-current-buffer calc-main-buffer
! calc-inverse-flag)
! calc-inverse-flag))
! (msg (if inv-flag
! "Inverse Hyperbolic..."
! "Hyperbolic...")))
! (calc-fancy-prefix 'calc-hyperbolic-flag msg n)))
(defun calc-hyperbolic-func ()
(save-excursion
***************
*** 1654,1660 ****
(defvar calc-gnuplot-process nil)
!
(defun calc-gnuplot-alive ()
(and calc-gnuplot-process
--- 1648,1655 ----
(defvar calc-gnuplot-process nil)
! (defvar calc-gnuplot-input)
! (defvar calc-gnuplot-buffer)
(defun calc-gnuplot-alive ()
(and calc-gnuplot-process
***************
*** 1670,1716 ****
(defun calc-load-everything ()
(interactive)
! (calc-need-macros) ; calc-macs.el
! (calc-record-list nil) ; calc-misc.el
! (math-read-exprs "0") ; calc-aent.el
!
! ;;;; (Loads here)
! (calc-Need-calc-alg-2)
! (calc-Need-calc-alg-3)
! (calc-Need-calc-alg)
! (calc-Need-calc-arith)
! (calc-Need-calc-bin)
! (calc-Need-calc-comb)
! (calc-Need-calc-comp)
! (calc-Need-calc-cplx)
! (calc-Need-calc-embed)
! (calc-Need-calc-fin)
! (calc-Need-calc-forms)
! (calc-Need-calc-frac)
! (calc-Need-calc-funcs)
! (calc-Need-calc-graph)
! (calc-Need-calc-help)
! (calc-Need-calc-incom)
! (calc-Need-calc-keypd)
! (calc-Need-calc-lang)
! (calc-Need-calc-map)
! (calc-Need-calc-mat)
! (calc-Need-calc-math)
! (calc-Need-calc-mode)
! (calc-Need-calc-poly)
! (calc-Need-calc-prog)
! (calc-Need-calc-rewr)
! (calc-Need-calc-rules)
! (calc-Need-calc-sel-2)
! (calc-Need-calc-sel)
! (calc-Need-calc-stat)
! (calc-Need-calc-store)
! (calc-Need-calc-stuff)
! (calc-Need-calc-trail)
! (calc-Need-calc-undo)
! (calc-Need-calc-units)
! (calc-Need-calc-vec)
! (calc-Need-calc-yank)
(message "All parts of Calc are now loaded"))
--- 1665,1709 ----
(defun calc-load-everything ()
(interactive)
! (require 'calc-aent)
! (require 'calc-alg)
! (require 'calc-arith)
! (require 'calc-bin)
! (require 'calc-comb)
! (require 'calc-cplx)
! (require 'calc-embed)
! (require 'calc-fin)
! (require 'calc-forms)
! (require 'calc-frac)
! (require 'calc-funcs)
! (require 'calc-graph)
! (require 'calc-help)
! (require 'calc-incom)
! (require 'calc-keypd)
! (require 'calc-lang)
! (require 'calc-macs)
! (require 'calc-map)
! (require 'calc-math)
! (require 'calc-misc)
! (require 'calc-mode)
! (require 'calc-mtx)
! (require 'calc-poly)
! (require 'calc-prog)
! (require 'calc-rewr)
! (require 'calc-rules)
! (require 'calc-sel)
! (require 'calc-stat)
! (require 'calc-store)
! (require 'calc-stuff)
! (require 'calc-trail)
! (require 'calc-undo)
! (require 'calc-units)
! (require 'calc-vec)
! (require 'calc-yank)
! (require 'calcalg2)
! (require 'calcalg3)
! (require 'calccomp)
! (require 'calcsel2)
(message "All parts of Calc are now loaded"))
***************
*** 2217,2222 ****
--- 2210,2220 ----
(math-normalize (car a))
(error "Can't use multi-valued function in an expression")))))
+ ;; The variable math-normalize-a is local to math-normalize in calc.el,
+ ;; but is used by math-normalize-nonstandard, which is called by
+ ;; math-normalize.
+ (defvar math-normalize-a)
+
(defun math-normalize-nonstandard ()
(if (consp calc-simplify-mode)
(progn
***************
*** 2591,2610 ****
(cons (car x) (mapcar 'math-evaluate-expr-rec (cdr x))))))
x))
- (defmacro math-defsimplify (funcs &rest code)
- (append '(progn (math-need-std-simps))
- (mapcar (function
- (lambda (func)
- (list 'put (list 'quote func) ''math-simplify
- (list 'nconc
- (list 'get (list 'quote func) ''math-simplify)
- (list 'list
- (list 'function
- (append '(lambda
(math-simplify-expr))
- code)))))))
- (if (symbolp funcs) (list funcs) funcs))))
- (put 'math-defsimplify 'lisp-indent-hook 1)
-
(defun math-any-floats (expr)
(if (Math-primp expr)
(math-floatp expr)
--- 2589,2594 ----
***************
*** 2656,2661 ****
--- 2640,2649 ----
(eq (car-safe (symbol-value (nth 2 expr))) 'special-const))
(memq (nth 2 expr) '(var-inf var-uinf var-nan)))))
+ ;; The variable math-integral-cache is originally declared in calcalg2.el,
+ ;; but is set by math-defintegral and math-definitegral2.
+ (defvar math-integral-cache)
+
(defmacro math-defintegral (funcs &rest code)
(setq math-integral-cache nil)
(append '(progn)
***************
*** 2886,2896 ****
--- 2874,2952 ----
(defvar math-expr-data)
+ (defvar math-read-replacement-list
+ '(;; Misc symbols
+ ("±" "+/-") ; plus or minus
+ ("Ã" "*") ; multiplication sign
+ ("÷" ":") ; division sign
+ ("â" "-") ; subtraction sign
+ ("â" "/") ; division sign
+ ("â" "*") ; asterisk multiplication
+ ("â" "inf") ; infinity symbol
+ ("â¤" "<=")
+ ("â¥" ">=")
+ ("â¦" "<=")
+ ("â§" ">=")
+ ;; fractions
+ ("¼" "(1:4)") ; 1/4
+ ("½" "(1:2)") ; 1/2
+ ("¾" "(3:4)") ; 3/4
+ ("â
" "(1:3)") ; 1/3
+ ("â
" "(2:3)") ; 2/3
+ ("â
" "(1:5)") ; 1/5
+ ("â
" "(2:5)") ; 2/5
+ ("â
" "(3:5)") ; 3/5
+ ("â
" "(4:5)") ; 4/5
+ ("â
" "(1:6)") ; 1/6
+ ("â
" "(5:6)") ; 5/6
+ ("â
" "(1:8)") ; 1/8
+ ("â
" "(3:8)") ; 3/8
+ ("â
" "(5:8)") ; 5/8
+ ("â
" "(7:8)") ; 7/8
+ ("â
" "1:") ; 1/...
+ ;; superscripts
+ ("â°" "0") ; 0
+ ("¹" "1") ; 1
+ ("²" "2") ; 2
+ ("³" "3") ; 3
+ ("â´" "4") ; 4
+ ("âµ" "5") ; 5
+ ("â¶" "6") ; 6
+ ("â·" "7") ; 7
+ ("â¸" "8") ; 8
+ ("â¹" "9") ; 9
+ ("âº" "+") ; +
+ ("â»" "-") ; -
+ ("â½" "(") ; (
+ ("â¾" ")") ; )
+ ("â¿" "n") ; n
+ ("â±" "i")) ; i
+ "A list whose elements (old new) indicate replacements to make
+ in Calc algebraic input.")
+
+ (defvar math-read-superscripts
+ "â°Â¹Â²Â³â´âµâ¶â·â¸â¹âºâ»â½â¾â¿â±" ; 0123456789+-()ni
+ "A string consisting of the superscripts allowed by Calc.")
+
+ (defun math-read-preprocess-string (str)
+ "Replace some substrings of STR by Calc equivalents."
+ (setq str
+ (replace-regexp-in-string (concat "[" math-read-superscripts "]+")
+ "^(\\&)" str))
+ (let ((rep-list math-read-replacement-list))
+ (while rep-list
+ (setq str
+ (replace-regexp-in-string (nth 0 (car rep-list))
+ (nth 1 (car rep-list)) str))
+ (setq rep-list (cdr rep-list))))
+ str)
+
(defun math-read-expr (math-exp-str)
(let ((math-exp-pos 0)
(math-exp-old-pos 0)
(math-exp-keep-spaces nil)
math-exp-token math-expr-data)
+ (setq math-exp-str (math-read-preprocess-string math-exp-str))
(while (setq math-exp-token (string-match "\\.\\.\\([^.]\\|.[^.]\\)"
math-exp-str))
(setq math-exp-str (concat (substring math-exp-str 0 math-exp-token)
"\\dots"
(substring math-exp-str (+ math-exp-token 2)))))
***************
*** 2943,2979 ****
(math-expr-function-mapping (get 'tex 'math-function-table))
(math-expr-variable-mapping (get 'tex 'math-variable-table)))
(math-read-expr str)))
! (let ((lines nil)
(pos 0)
(width 0)
! (err-msg nil)
! the-baseline the-h2
new-pos p)
(while (setq new-pos (string-match "\n" str pos))
! (setq lines (cons (substring str pos new-pos) lines)
pos (1+ new-pos)))
! (setq lines (nreverse (cons (substring str pos) lines))
! p lines)
(while p
(setq width (max width (length (car p)))
p (cdr p)))
! (if (math-read-big-bigp lines)
(or (catch 'syntax
! (math-read-big-rec 0 0 width (length lines)))
! err-msg
'(error 0 "Syntax error"))
(math-read-expr str)))))
! (defun math-read-big-bigp (lines)
! (and (cdr lines)
(let ((matrix nil)
(v 0)
! (height (if (> (length (car lines)) 0) 1 0)))
! (while (and (cdr lines)
(let* ((i 0)
j
! (l1 (car lines))
! (l2 (nth 1 lines))
(len (min (length l1) (length l2))))
(if (> (length l2) 0)
(setq height (1+ height)))
--- 2999,3037 ----
(math-expr-function-mapping (get 'tex 'math-function-table))
(math-expr-variable-mapping (get 'tex 'math-variable-table)))
(math-read-expr str)))
! (let ((math-read-big-lines nil)
(pos 0)
(width 0)
! (math-read-big-err-msg nil)
! math-read-big-baseline math-read-big-h2
new-pos p)
(while (setq new-pos (string-match "\n" str pos))
! (setq math-read-big-lines
! (cons (substring str pos new-pos) math-read-big-lines)
pos (1+ new-pos)))
! (setq math-read-big-lines
! (nreverse (cons (substring str pos) math-read-big-lines))
! p math-read-big-lines)
(while p
(setq width (max width (length (car p)))
p (cdr p)))
! (if (math-read-big-bigp math-read-big-lines)
(or (catch 'syntax
! (math-read-big-rec 0 0 width (length math-read-big-lines)))
! math-read-big-err-msg
'(error 0 "Syntax error"))
(math-read-expr str)))))
! (defun math-read-big-bigp (math-read-big-lines)
! (and (cdr math-read-big-lines)
(let ((matrix nil)
(v 0)
! (height (if (> (length (car math-read-big-lines)) 0) 1 0)))
! (while (and (cdr math-read-big-lines)
(let* ((i 0)
j
! (l1 (car math-read-big-lines))
! (l2 (nth 1 math-read-big-lines))
(len (min (length l1) (length l2))))
(if (> (length l2) 0)
(setq height (1+ height)))
***************
*** 2984,2990 ****
(= (aref l2 i) (aref l1 i)))
(and (eq (aref l1 i) ?\[)
(eq (aref l2 i) ?\[)
! (let ((h2 (length l1)))
(setq j (math-read-big-balance
(1+ i) v "[")))
(setq i (1- j)))))
--- 3042,3048 ----
(= (aref l2 i) (aref l1 i)))
(and (eq (aref l1 i) ?\[)
(eq (aref l2 i) ?\[)
! (let ((math-rb-h2 (length l1)))
(setq j (math-read-big-balance
(1+ i) v "[")))
(setq i (1- j)))))
***************
*** 2994,3003 ****
(eq (aref l2 i) ?\[)
(setq matrix t)
nil))))
! (setq lines (cdr lines)
v (1+ v)))
(or (and (> height 1)
! (not (cdr lines)))
matrix))))
;;; Nontrivial "flat" formatting.
--- 3052,3061 ----
(eq (aref l2 i) ?\[)
(setq matrix t)
nil))))
! (setq math-read-big-lines (cdr math-read-big-lines)
v (1+ v)))
(or (and (> height 1)
! (not (cdr math-read-big-lines)))
matrix))))
;;; Nontrivial "flat" formatting.
***************
*** 3288,3292 ****
--- 3346,3352 ----
(run-hooks 'calc-ext-load-hook)
+ (provide 'calc-ext)
+
;;; arch-tag: 1814ba7f-a390-49dc-9e25-a5adc205e97e
;;; calc-ext.el ends here
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-ext.el [emacs-unicode-2],
Miles Bader <=