mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

(math-compose-var): Adjust argument list.

Browse source 
(math-compose-expr): Use adjusted `math-compose-var'.
This commit is contained in:
Jay Belanger 2007-12-02 20:00:36 +00:00
parent dad9356322
commit 2b8a300253
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lisp/calc/calccomp.el
View file

@ -70,20 +70,21 @@
(defvar math-comp-right-bracket)
(defvar math-comp-comma)
(defun math-compose-var (a v)
(if (and math-compose-hash-args
(let ((p calc-arg-values))
(setq v 1)
(while (and p (not (equal (car p) a)))
(setq p (and (eq math-compose-hash-args t) (cdr p))
v (1+ v)))
p))
(if (eq math-compose-hash-args 1)
"#"
(format "#%d" v))
(if (memq calc-language calc-lang-allow-underscores)
(math-to-underscores (symbol-name (nth 1 a)))
(symbol-name (nth 1 a)))))
(defun math-compose-var (a)
(let (v)
(if (and math-compose-hash-args
(let ((p calc-arg-values))
(setq v 1)
(while (and p (not (equal (car p) a)))
(setq p (and (eq math-compose-hash-args t) (cdr p))
v (1+ v)))
p))
(if (eq math-compose-hash-args 1)
"#"
(format "#%d" v))
(if (memq calc-language calc-lang-allow-underscores)
(math-to-underscores (symbol-name (nth 1 a)))
(symbol-name (nth 1 a))))))
(defun math-compose-expr (a prec)
(let ((math-compose-level (1+ math-compose-level))
@ -332,8 +333,8 @@
(if v
(symbol-name (car v))
(if (setq spfn (get calc-language 'math-var-formatter))
(funcall spfn a v prec)
(math-compose-var a v)))))
(funcall spfn a prec)
(math-compose-var a)))))
((eq (car a) 'intv)
(list 'horiz
(if (memq (nth 1 a) '(0 1)) "(" "[")