Mercurial > emacs
comparison lisp/calc/calc.el @ 65903:451fee578520
(calc-set-mode-line): Add square matrix option.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Fri, 07 Oct 2005 21:18:47 +0000 |
parents | 1db49616ce05 |
children | 1851d5f19b4f |
comparison
equal
deleted
inserted
replaced
65902:a15a1dd65d9e | 65903:451fee578520 |
---|---|
652 If nil, computations on numbers always yield numbers where possible.") | 652 If nil, computations on numbers always yield numbers where possible.") |
653 | 653 |
654 (defcalcmodevar calc-matrix-mode nil | 654 (defcalcmodevar calc-matrix-mode nil |
655 "If `matrix', variables are assumed to be matrix-valued. | 655 "If `matrix', variables are assumed to be matrix-valued. |
656 If a number, variables are assumed to be NxN matrices. | 656 If a number, variables are assumed to be NxN matrices. |
657 If `square', variables are assumed to be square matrices of an unspecified size. | |
657 If `scalar', variables are assumed to be scalar-valued. | 658 If `scalar', variables are assumed to be scalar-valued. |
658 If nil, symbolic math routines make no assumptions about variables.") | 659 If nil, symbolic math routines make no assumptions about variables.") |
659 | 660 |
660 (defcalcmodevar calc-shift-prefix nil | 661 (defcalcmodevar calc-shift-prefix nil |
661 "If non-nil, shifted letter keys are prefix keys rather than normal meanings.") | 662 "If non-nil, shifted letter keys are prefix keys rather than normal meanings.") |
1549 ;; Computational modes | 1550 ;; Computational modes |
1550 (if calc-symbolic-mode "Symb " "") | 1551 (if calc-symbolic-mode "Symb " "") |
1551 (cond ((eq calc-matrix-mode 'matrix) "Matrix ") | 1552 (cond ((eq calc-matrix-mode 'matrix) "Matrix ") |
1552 ((integerp calc-matrix-mode) | 1553 ((integerp calc-matrix-mode) |
1553 (format "Matrix%d " calc-matrix-mode)) | 1554 (format "Matrix%d " calc-matrix-mode)) |
1555 ((eq calc-matrix-mode 'square) "SqMatrix ") | |
1554 ((eq calc-matrix-mode 'scalar) "Scalar ") | 1556 ((eq calc-matrix-mode 'scalar) "Scalar ") |
1555 (t "")) | 1557 (t "")) |
1556 (if (eq calc-complex-mode 'polar) "Polar " "") | 1558 (if (eq calc-complex-mode 'polar) "Polar " "") |
1557 (if calc-prefer-frac "Frac " "") | 1559 (if calc-prefer-frac "Frac " "") |
1558 (cond ((null calc-infinite-mode) "") | 1560 (cond ((null calc-infinite-mode) "") |