mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Add some utf-8 coding cookies.
* lisp/calc/calc-aent.el, lisp/calc/calc-ext.el, lisp/calc/calc-lang.el: * lisp/calc/calc-store.el, lisp/calc/calc-units.el, lisp/calc/calc.el: * lisp/calc/calccomp.el: Add explicit utf-8 coding cookies to files with utf-8 characters. Also delete trailing whitespace.
This commit is contained in:
Glenn Morris
parent
32a679fd52
commit
be19ef0b9b
8 changed files with 158 additions and 126 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2010-06-22 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* calc/calc-aent.el, calc/calc-ext.el, calc/calc-lang.el:
|
||||
* calc/calc-store.el, calc/calc-units.el, calc/calc.el:
|
||||
* calc/calccomp.el: Add explicit utf-8 coding cookies to files with
|
||||
utf-8 characters.
|
||||
|
||||
2010-06-21 Karl Fogel <kfogel@red-bean.com>
|
||||
|
||||
* simple.el (compose-mail): Fix doc string to refer to
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; calc-aent.el --- algebraic entry functions for Calc
|
||||
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
|
||||
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
|
||||
;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Dave Gillespie <daveg@synaptics.com>
|
||||
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
|
||||
|
|
@ -609,9 +609,9 @@ in Calc algebraic input.")
|
|||
(setq math-exp-str (math-remove-percentsigns math-exp-str)))
|
||||
(if calc-language-input-filter
|
||||
(setq math-exp-str (funcall calc-language-input-filter math-exp-str)))
|
||||
(while (setq math-exp-token
|
||||
(while (setq math-exp-token
|
||||
(string-match "\\.\\.\\([^.]\\|.[^.]\\)" math-exp-str))
|
||||
(setq 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)))))
|
||||
(math-build-parse-table)
|
||||
|
|
@ -712,7 +712,7 @@ in Calc algebraic input.")
|
|||
(math-read-token)))
|
||||
((and (memq ch calc-user-token-chars)
|
||||
(let ((case-fold-search nil))
|
||||
(eq (string-match
|
||||
(eq (string-match
|
||||
calc-user-tokens math-exp-str math-exp-pos)
|
||||
math-exp-pos)))
|
||||
(setq math-exp-token 'punc
|
||||
|
|
@ -722,7 +722,7 @@ in Calc algebraic input.")
|
|||
(and (>= ch ?A) (<= ch ?Z))
|
||||
(and (>= ch ?α) (<= ch ?ω))
|
||||
(and (>= ch ?Α) (<= ch ?Ω)))
|
||||
(string-match
|
||||
(string-match
|
||||
(cond
|
||||
((and (memq calc-language calc-lang-allow-underscores)
|
||||
(memq calc-language calc-lang-allow-percentsigns))
|
||||
|
|
@ -745,7 +745,7 @@ in Calc algebraic input.")
|
|||
(eq (string-match "_\\.?[0-9]" math-exp-str math-exp-pos)
|
||||
math-exp-pos)
|
||||
(or (eq math-exp-pos 0)
|
||||
(and (not (memq calc-language
|
||||
(and (not (memq calc-language
|
||||
calc-lang-allow-underscores))
|
||||
(eq (string-match "[^])}\"a-zA-Zα-ωΑ-Ω0-9'$]_"
|
||||
math-exp-str (1- math-exp-pos))
|
||||
|
|
@ -757,7 +757,7 @@ in Calc algebraic input.")
|
|||
(setq math-exp-token 'number
|
||||
math-expr-data (math-match-substring math-exp-str 0)
|
||||
math-exp-pos (match-end 0)))
|
||||
((and (setq adfn
|
||||
((and (setq adfn
|
||||
(assq ch (get calc-language 'math-lang-read-symbol)))
|
||||
(eval (nth 1 adfn)))
|
||||
(eval (nth 2 adfn)))
|
||||
|
|
@ -810,8 +810,8 @@ in Calc algebraic input.")
|
|||
|
||||
(defun math-read-expr-level (exp-prec &optional exp-term)
|
||||
(let* ((math-expr-opers (math-expr-ops))
|
||||
(x (math-read-factor))
|
||||
(first t)
|
||||
(x (math-read-factor))
|
||||
(first t)
|
||||
op op2)
|
||||
(while (and (or (and calc-user-parse-table
|
||||
(setq op (calc-check-user-syntax x exp-prec))
|
||||
|
|
@ -832,8 +832,8 @@ in Calc algebraic input.")
|
|||
(memq math-exp-token '(symbol number dollar hash))
|
||||
(equal math-expr-data "(")
|
||||
(and (equal math-expr-data "[")
|
||||
(not (equal
|
||||
(get calc-language
|
||||
(not (equal
|
||||
(get calc-language
|
||||
'math-function-open) "["))
|
||||
(not (and math-exp-keep-spaces
|
||||
(eq (car-safe x) 'vec)))))
|
||||
|
|
@ -1141,8 +1141,8 @@ If the current Calc language does not use placeholders, return nil."
|
|||
(eq math-exp-token 'end)))
|
||||
(throw 'syntax "Expected `)'"))
|
||||
(math-read-token)
|
||||
(if (and (memq calc-language
|
||||
calc-lang-parens-are-subscripts)
|
||||
(if (and (memq calc-language
|
||||
calc-lang-parens-are-subscripts)
|
||||
args
|
||||
(require 'calc-ext)
|
||||
(let ((calc-matrix-mode 'scalar))
|
||||
|
|
@ -1184,7 +1184,7 @@ If the current Calc language does not use placeholders, return nil."
|
|||
(substring (symbol-name (cdr v))
|
||||
4))
|
||||
(cdr v))))))
|
||||
(while (and (memq calc-language
|
||||
(while (and (memq calc-language
|
||||
calc-lang-brackets-are-subscripts)
|
||||
(equal math-expr-data "["))
|
||||
(math-read-token)
|
||||
|
|
@ -1284,6 +1284,7 @@ If the current Calc language does not use placeholders, return nil."
|
|||
(provide 'calc-aent)
|
||||
|
||||
;; Local variables:
|
||||
;; coding: utf-8
|
||||
;; generated-autoload-file: "calc-loaddefs.el"
|
||||
;; End:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; calc-ext.el --- various extension functions for Calc
|
||||
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
|
||||
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
|
||||
;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: David Gillespie <daveg@synaptics.com>
|
||||
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
|
||||
|
|
@ -960,7 +960,7 @@ 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-copy-to-register calc-insert-register
|
||||
calc-copy-to-register calc-insert-register
|
||||
calc-append-to-register calc-prepend-to-register
|
||||
calc-force-refresh calc-locate-cursor-element calc-show-edit-buffer)
|
||||
|
||||
|
|
@ -989,7 +989,7 @@ calc-floor calc-idiv calc-increment calc-mant-part calc-max calc-min
|
|||
calc-round calc-scale-float calc-sign calc-trunc calc-xpon-part)
|
||||
|
||||
("calc-bin" calc-and calc-binary-radix calc-clip calc-twos-complement-mode
|
||||
calc-decimal-radix calc-diff calc-hex-radix calc-leading-zeros
|
||||
calc-decimal-radix calc-diff calc-hex-radix calc-leading-zeros
|
||||
calc-lshift-arith calc-lshift-binary calc-not calc-octal-radix calc-or calc-radix
|
||||
calc-rotate-binary calc-rshift-arith calc-rshift-binary calc-word-size
|
||||
calc-xor)
|
||||
|
|
@ -1415,7 +1415,7 @@ calc-kill calc-kill-region calc-yank))))
|
|||
(with-current-buffer calc-main-buffer
|
||||
calc-option-flag)
|
||||
calc-option-flag))
|
||||
(msg
|
||||
(msg
|
||||
(cond
|
||||
((and opt-flag hyp-flag) "Option Inverse Hyperbolic...")
|
||||
(hyp-flag "Inverse Hyperbolic...")
|
||||
|
|
@ -1505,8 +1505,8 @@ calc-kill calc-kill-region calc-yank))))
|
|||
(with-current-buffer calc-main-buffer
|
||||
calc-option-flag)
|
||||
calc-option-flag))
|
||||
(msg
|
||||
(cond
|
||||
(msg
|
||||
(cond
|
||||
((and opt-flag inv-flag) "Option Inverse Hyperbolic...")
|
||||
(opt-flag "Option Hyperbolic...")
|
||||
(inv-flag "Inverse Hyperbolic...")
|
||||
|
|
@ -1537,8 +1537,8 @@ calc-kill calc-kill-region calc-yank))))
|
|||
(with-current-buffer calc-main-buffer
|
||||
calc-hyperbolic-flag)
|
||||
calc-hyperbolic-flag))
|
||||
(msg
|
||||
(cond
|
||||
(msg
|
||||
(cond
|
||||
((and hyp-flag inv-flag) "Option Inverse Hyperbolic...")
|
||||
(hyp-flag "Option Hyperbolic...")
|
||||
(inv-flag "Option Inverse...")
|
||||
|
|
@ -1702,8 +1702,8 @@ calc-kill calc-kill-region calc-yank))))
|
|||
(defun calc-execute-extended-command (n)
|
||||
(interactive "P")
|
||||
(let* ((prompt (concat (calc-num-prefix-name n) "M-x "))
|
||||
(cmd (intern
|
||||
(completing-read prompt obarray 'commandp t "calc-"
|
||||
(cmd (intern
|
||||
(completing-read prompt obarray 'commandp t "calc-"
|
||||
'calc-extended-command-history))))
|
||||
(setq prefix-arg n)
|
||||
(command-execute cmd)))
|
||||
|
|
@ -3500,5 +3500,9 @@ A key may contain additional specs for Inverse, Hyperbolic, and Inv+Hyp.")
|
|||
|
||||
(provide 'calc-ext)
|
||||
|
||||
;; Local variables:
|
||||
;; coding: utf-8
|
||||
;; End:
|
||||
|
||||
;; arch-tag: 1814ba7f-a390-49dc-9e25-a5adc205e97e
|
||||
;;; calc-ext.el ends here
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; calc-lang.el --- calc language functions
|
||||
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
|
||||
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
|
||||
;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: David Gillespie <daveg@synaptics.com>
|
||||
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
|
||||
|
|
@ -335,7 +335,7 @@
|
|||
(add-to-list 'calc-lang-allow-underscores 'fortran)
|
||||
(add-to-list 'calc-lang-parens-are-subscripts 'fortran)
|
||||
|
||||
;; The next few variables are local to math-read-exprs in calc-aent.el
|
||||
;; The next few variables are local to math-read-exprs in calc-aent.el
|
||||
;; and math-read-expr in calc-ext.el, but are set in functions they call.
|
||||
|
||||
(defvar math-exp-token)
|
||||
|
|
@ -379,12 +379,12 @@
|
|||
((= n 1)
|
||||
(message "TeX language mode with \\hbox{func}(\\hbox{var})"))
|
||||
((> n 1)
|
||||
(message
|
||||
(message
|
||||
"TeX language mode with \\hbox{func}(\\hbox{var}) and multiline matrices"))
|
||||
((= n -1)
|
||||
(message "TeX language mode with \\func(\\hbox{var})"))
|
||||
((< n -1)
|
||||
(message
|
||||
(message
|
||||
"TeX language mode with \\func(\\hbox{var}) and multiline matrices")))))
|
||||
|
||||
(defun calc-latex-language (n)
|
||||
|
|
@ -399,12 +399,12 @@
|
|||
((= n 1)
|
||||
(message "LaTeX language mode with \\text{func}(\\text{var})"))
|
||||
((> n 1)
|
||||
(message
|
||||
(message
|
||||
"LaTeX language mode with \\text{func}(\\text{var}) and multiline matrices"))
|
||||
((= n -1)
|
||||
(message "LaTeX language mode with \\func(\\text{var})"))
|
||||
((< n -1)
|
||||
(message
|
||||
(message
|
||||
"LaTeX language mode with \\func(\\text{var}) and multiline matrices")))))
|
||||
|
||||
(put 'tex 'math-lang-name "TeX")
|
||||
|
|
@ -498,7 +498,7 @@
|
|||
(intv . math-compose-tex-intv)))
|
||||
|
||||
(put 'tex 'math-variable-table
|
||||
'(
|
||||
'(
|
||||
;; The Greek letters
|
||||
( \\alpha . var-alpha )
|
||||
( \\beta . var-beta )
|
||||
|
|
@ -630,7 +630,7 @@
|
|||
|
||||
(defun math-compose-tex-matrix (a &optional ltx)
|
||||
(if (cdr a)
|
||||
(cons (append (math-compose-vector (cdr (car a)) " & " 0)
|
||||
(cons (append (math-compose-vector (cdr (car a)) " & " 0)
|
||||
(if ltx '(" \\\\ ") '(" \\cr ")))
|
||||
(math-compose-tex-matrix (cdr a) ltx))
|
||||
(list (math-compose-vector (cdr (car a)) " & " 0))))
|
||||
|
|
@ -722,7 +722,7 @@
|
|||
(setq left "{" right "}"))
|
||||
(t (setq left calc-function-open
|
||||
right calc-function-close)))
|
||||
(list 'horiz func
|
||||
(list 'horiz func
|
||||
left
|
||||
(math-compose-vector (cdr a) ", " 0)
|
||||
right)))
|
||||
|
|
@ -866,7 +866,7 @@
|
|||
(and right
|
||||
(setq math-exp-str (copy-sequence math-exp-str))
|
||||
(aset math-exp-str right ?\]))))))))))
|
||||
|
||||
|
||||
(defun math-latex-parse-frac (f val)
|
||||
(let (numer denom)
|
||||
(setq numer (car (math-read-expr-list)))
|
||||
|
|
@ -988,7 +988,7 @@
|
|||
(cdr (math-transpose a)))
|
||||
'("}")))))
|
||||
|
||||
(put 'eqn 'math-var-formatter
|
||||
(put 'eqn 'math-var-formatter
|
||||
(function
|
||||
(lambda (a prec)
|
||||
(let (v)
|
||||
|
|
@ -1011,7 +1011,7 @@
|
|||
(intern (substring (symbol-name (nth 2 a)) 0 -1))))
|
||||
prec)
|
||||
(symbol-name (nth 1 a))))))))
|
||||
|
||||
|
||||
(defconst math-eqn-special-funcs
|
||||
'( calcFunc-log
|
||||
calcFunc-ln calcFunc-exp
|
||||
|
|
@ -1022,7 +1022,7 @@
|
|||
calcFunc-arcsin calcFunc-arccos calcFunc-arctan
|
||||
calcFunc-arcsinh calcFunc-arccosh calcFunc-arctanh))
|
||||
|
||||
(put 'eqn 'math-func-formatter
|
||||
(put 'eqn 'math-func-formatter
|
||||
(function
|
||||
(lambda (func a)
|
||||
(let (left right)
|
||||
|
|
@ -1035,8 +1035,8 @@
|
|||
(not (math-tex-expr-is-flat (nth 1 a))))
|
||||
(setq left "{left ( "
|
||||
right " right )}"))
|
||||
|
||||
((and
|
||||
|
||||
((and
|
||||
(memq (car a) math-eqn-special-funcs)
|
||||
(= (length a) 2)
|
||||
(or (Math-realp (nth 1 a))
|
||||
|
|
@ -1069,7 +1069,7 @@
|
|||
("above" punc ",")))
|
||||
|
||||
(put 'eqn 'math-lang-adjust-words
|
||||
(function
|
||||
(function
|
||||
(lambda ()
|
||||
(let ((code (assoc math-expr-data math-eqn-ignore-words)))
|
||||
(cond ((null code))
|
||||
|
|
@ -1189,21 +1189,21 @@
|
|||
( Gamma . var-gamma)))
|
||||
|
||||
(put 'yacas 'math-parse-table
|
||||
'((("Deriv(" 0 ")" 0)
|
||||
'((("Deriv(" 0 ")" 0)
|
||||
calcFunc-deriv (var ArgB var-ArgB) (var ArgA var-ArgA))
|
||||
(("D(" 0 ")" 0)
|
||||
(("D(" 0 ")" 0)
|
||||
calcFunc-deriv (var ArgB var-ArgB) (var ArgA var-ArgA))
|
||||
(("Integrate(" 0 ")" 0)
|
||||
(("Integrate(" 0 ")" 0)
|
||||
calcFunc-integ (var ArgB var-ArgB)(var ArgA var-ArgA))
|
||||
(("Integrate(" 0 "," 0 "," 0 ")" 0)
|
||||
calcFunc-integ (var ArgD var-ArgD) (var ArgA var-ArgA)
|
||||
(("Integrate(" 0 "," 0 "," 0 ")" 0)
|
||||
calcFunc-integ (var ArgD var-ArgD) (var ArgA var-ArgA)
|
||||
(var ArgB var-ArgB) (var ArgC var-ArgC))
|
||||
(("Subst(" 0 "," 0 ")" 0)
|
||||
calcFunc-subst (var ArgC var-ArgC) (var ArgA var-ArgA)
|
||||
(("Subst(" 0 "," 0 ")" 0)
|
||||
calcFunc-subst (var ArgC var-ArgC) (var ArgA var-ArgA)
|
||||
(var ArgB var-ArgB))
|
||||
(("Taylor(" 0 "," 0 "," 0 ")" 0)
|
||||
calcFunc-taylor (var ArgD var-ArgD)
|
||||
(calcFunc-eq (var ArgA var-ArgA) (var ArgB var-ArgB))
|
||||
(("Taylor(" 0 "," 0 "," 0 ")" 0)
|
||||
calcFunc-taylor (var ArgD var-ArgD)
|
||||
(calcFunc-eq (var ArgA var-ArgA) (var ArgB var-ArgB))
|
||||
(var ArgC var-ArgC))))
|
||||
|
||||
(put 'yacas 'math-oper-table
|
||||
|
|
@ -1356,7 +1356,7 @@
|
|||
(math-compose-expr (nth 2 a) -1)
|
||||
(if (not (nth 3 a))
|
||||
")"
|
||||
(concat
|
||||
(concat
|
||||
","
|
||||
(math-compose-expr (nth 3 a) -1)
|
||||
","
|
||||
|
|
@ -1393,7 +1393,7 @@
|
|||
'(("+" + 100 100)
|
||||
("-" - 100 134)
|
||||
("*" * 120 120)
|
||||
("." * 130 129)
|
||||
("." * 130 129)
|
||||
("/" / 120 120)
|
||||
("u-" neg -1 180)
|
||||
("u+" ident -1 180)
|
||||
|
|
@ -1494,9 +1494,9 @@
|
|||
(nth 3 args))))
|
||||
|
||||
(put 'maxima 'math-parse-table
|
||||
'((("if" 0 "then" 0 "else" 0)
|
||||
calcFunc-if
|
||||
(var ArgA var-ArgA)
|
||||
'((("if" 0 "then" 0 "else" 0)
|
||||
calcFunc-if
|
||||
(var ArgA var-ArgA)
|
||||
(var ArgB var-ArgB)
|
||||
(var ArgC var-ArgC))))
|
||||
|
||||
|
|
@ -1572,7 +1572,7 @@
|
|||
(lambda (a)
|
||||
(list 'horiz
|
||||
"matrix("
|
||||
(math-compose-vector (cdr a)
|
||||
(math-compose-vector (cdr a)
|
||||
(concat math-comp-comma " ")
|
||||
math-comp-vector-prec)
|
||||
")"))))
|
||||
|
|
@ -1734,7 +1734,7 @@ order to Calc's."
|
|||
(nth 0 args))))
|
||||
|
||||
(put 'giac 'math-parse-table
|
||||
'((("set" 0)
|
||||
'((("set" 0)
|
||||
calcFunc-rdup
|
||||
(var ArgA var-ArgA))))
|
||||
|
||||
|
|
@ -1748,7 +1748,7 @@ order to Calc's."
|
|||
"Compose the arguments to a Calc function in reverse order.
|
||||
This is used for various language modes which have functions in reverse
|
||||
order to Calc's."
|
||||
(list 'horiz (nth 1 fn)
|
||||
(list 'horiz (nth 1 fn)
|
||||
"("
|
||||
(math-compose-expr (nth 2 a) 0)
|
||||
","
|
||||
|
|
@ -1770,7 +1770,7 @@ order to Calc's."
|
|||
(list 'horiz
|
||||
(math-compose-expr (nth 1 a) 1000)
|
||||
"["
|
||||
(math-compose-expr
|
||||
(math-compose-expr
|
||||
(calc-normalize (list '- (nth 2 a) 1)) 0)
|
||||
"]")))))
|
||||
|
||||
|
|
@ -2001,7 +2001,7 @@ order to Calc's."
|
|||
(list 'horiz
|
||||
"matrix("
|
||||
math-comp-left-bracket
|
||||
(math-compose-vector (cdr a)
|
||||
(math-compose-vector (cdr a)
|
||||
(concat math-comp-comma " ")
|
||||
math-comp-vector-prec)
|
||||
math-comp-right-bracket
|
||||
|
|
@ -2044,9 +2044,9 @@ order to Calc's."
|
|||
(defvar math-read-big-baseline)
|
||||
(defvar math-read-big-h2)
|
||||
|
||||
;; The variables math-rb-h1, math-rb-h2, math-rb-v1 and math-rb-v2
|
||||
;; are local to math-read-big-rec, but are used by math-read-big-char,
|
||||
;; math-read-big-emptyp and math-read-big-balance which are called by
|
||||
;; The variables math-rb-h1, math-rb-h2, math-rb-v1 and math-rb-v2
|
||||
;; are local to math-read-big-rec, but are used by math-read-big-char,
|
||||
;; math-read-big-emptyp and math-read-big-balance which are called by
|
||||
;; math-read-big-rec.
|
||||
;; math-rb-h2 is also local to math-read-big-bigp in calc-ext.el,
|
||||
;; which calls math-read-big-balance.
|
||||
|
|
@ -2055,40 +2055,40 @@ order to Calc's."
|
|||
(defvar math-rb-v1)
|
||||
(defvar math-rb-v2)
|
||||
|
||||
(defun math-read-big-rec (math-rb-h1 math-rb-v1 math-rb-h2 math-rb-v2
|
||||
(defun math-read-big-rec (math-rb-h1 math-rb-v1 math-rb-h2 math-rb-v2
|
||||
&optional baseline prec short)
|
||||
(or prec (setq prec 0))
|
||||
|
||||
;; Clip whitespace above or below.
|
||||
(while (and (< math-rb-v1 math-rb-v2)
|
||||
(while (and (< math-rb-v1 math-rb-v2)
|
||||
(math-read-big-emptyp math-rb-h1 math-rb-v1 math-rb-h2 (1+ math-rb-v1)))
|
||||
(setq math-rb-v1 (1+ math-rb-v1)))
|
||||
(while (and (< math-rb-v1 math-rb-v2)
|
||||
(while (and (< math-rb-v1 math-rb-v2)
|
||||
(math-read-big-emptyp math-rb-h1 (1- math-rb-v2) math-rb-h2 math-rb-v2))
|
||||
(setq math-rb-v2 (1- math-rb-v2)))
|
||||
|
||||
;; If formula is a single line high, normal parser can handle it.
|
||||
(if (<= math-rb-v2 (1+ math-rb-v1))
|
||||
(if (or (<= math-rb-v2 math-rb-v1)
|
||||
(> math-rb-h1 (length (setq math-rb-v2
|
||||
(> math-rb-h1 (length (setq math-rb-v2
|
||||
(nth math-rb-v1 math-read-big-lines)))))
|
||||
(math-read-big-error math-rb-h1 math-rb-v1)
|
||||
(setq math-read-big-baseline math-rb-v1
|
||||
math-read-big-h2 math-rb-h2
|
||||
math-rb-v2 (nth math-rb-v1 math-read-big-lines)
|
||||
math-rb-h2 (math-read-expr
|
||||
(substring math-rb-v2 math-rb-h1
|
||||
math-rb-h2 (math-read-expr
|
||||
(substring math-rb-v2 math-rb-h1
|
||||
(min math-rb-h2 (length math-rb-v2)))))
|
||||
(if (eq (car-safe math-rb-h2) 'error)
|
||||
(math-read-big-error (+ math-rb-h1 (nth 1 math-rb-h2))
|
||||
(math-read-big-error (+ math-rb-h1 (nth 1 math-rb-h2))
|
||||
math-rb-v1 (nth 2 math-rb-h2))
|
||||
math-rb-h2))
|
||||
|
||||
;; Clip whitespace at left or right.
|
||||
(while (and (< math-rb-h1 math-rb-h2)
|
||||
(while (and (< math-rb-h1 math-rb-h2)
|
||||
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) math-rb-v2))
|
||||
(setq math-rb-h1 (1+ math-rb-h1)))
|
||||
(while (and (< math-rb-h1 math-rb-h2)
|
||||
(while (and (< math-rb-h1 math-rb-h2)
|
||||
(math-read-big-emptyp (1- math-rb-h2) math-rb-v1 math-rb-h2 math-rb-v2))
|
||||
(setq math-rb-h2 (1- math-rb-h2)))
|
||||
|
||||
|
|
@ -2107,7 +2107,7 @@ order to Calc's."
|
|||
(/= (aref line math-rb-h1) ?\ )
|
||||
(if (and (= (aref line math-rb-h1) ?\-)
|
||||
;; Make sure it's not a minus sign.
|
||||
(or (and (< (1+ math-rb-h1) len)
|
||||
(or (and (< (1+ math-rb-h1) len)
|
||||
(= (aref line (1+ math-rb-h1)) ?\-))
|
||||
(/= (math-read-big-char math-rb-h1 (1- v)) ?\ )
|
||||
(/= (math-read-big-char math-rb-h1 (1+ v)) ?\ )))
|
||||
|
|
@ -2166,7 +2166,7 @@ order to Calc's."
|
|||
;; Binomial coefficient.
|
||||
((and (= other-char ?\()
|
||||
(= (math-read-big-char (1+ math-rb-h1) v) ?\ )
|
||||
(= (string-match "( *)" (nth v math-read-big-lines)
|
||||
(= (string-match "( *)" (nth v math-read-big-lines)
|
||||
math-rb-h1) math-rb-h1))
|
||||
(setq h (match-end 0))
|
||||
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t)
|
||||
|
|
@ -2180,7 +2180,7 @@ order to Calc's."
|
|||
|
||||
;; Minus sign.
|
||||
((= other-char ?\-)
|
||||
(setq p (list 'neg (math-read-big-rec (1+ math-rb-h1) math-rb-v1
|
||||
(setq p (list 'neg (math-read-big-rec (1+ math-rb-h1) math-rb-v1
|
||||
math-rb-h2 math-rb-v2 v 250 t))
|
||||
v math-read-big-baseline
|
||||
h math-read-big-h2))
|
||||
|
|
@ -2199,10 +2199,10 @@ order to Calc's."
|
|||
(if (= sep ?\])
|
||||
(math-read-big-error (1- h) v "Expected `)'"))
|
||||
(if (= sep ?\))
|
||||
(setq p (math-read-big-rec
|
||||
(setq p (math-read-big-rec
|
||||
(1+ math-rb-h1) math-rb-v1 (1- h) math-rb-v2 v))
|
||||
(setq hmid (math-read-big-balance h v "(")
|
||||
p (list p
|
||||
p (list p
|
||||
(math-read-big-rec h math-rb-v1 (1- hmid) math-rb-v2 v))
|
||||
h hmid)
|
||||
(cond ((= sep ?\.)
|
||||
|
|
@ -2347,7 +2347,7 @@ order to Calc's."
|
|||
(math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t)
|
||||
(math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t)))
|
||||
|
||||
;; Now left term is bounded by math-rb-h1, math-rb-v1, h, math-rb-v2;
|
||||
;; Now left term is bounded by math-rb-h1, math-rb-v1, h, math-rb-v2;
|
||||
;; baseline = v.
|
||||
(if baseline
|
||||
(or (= v baseline)
|
||||
|
|
@ -2389,12 +2389,12 @@ order to Calc's."
|
|||
(cond ((eq (nth 3 widest) -1)
|
||||
(setq p (list (nth 1 widest) p)))
|
||||
((equal (car widest) "?")
|
||||
(let ((y (math-read-big-rec h math-rb-v1 math-rb-h2
|
||||
(let ((y (math-read-big-rec h math-rb-v1 math-rb-h2
|
||||
math-rb-v2 baseline nil t)))
|
||||
(or (= (math-read-big-char math-read-big-h2 baseline) ?\:)
|
||||
(math-read-big-error math-read-big-h2 baseline "Expected `:'"))
|
||||
(setq p (list (nth 1 widest) p y
|
||||
(math-read-big-rec
|
||||
(math-read-big-rec
|
||||
(1+ math-read-big-h2) math-rb-v1 math-rb-h2 math-rb-v2
|
||||
baseline (nth 3 widest) t))
|
||||
h math-read-big-h2)))
|
||||
|
|
@ -2483,5 +2483,9 @@ order to Calc's."
|
|||
|
||||
(provide 'calc-lang)
|
||||
|
||||
;; Local variables:
|
||||
;; coding: utf-8
|
||||
;; End:
|
||||
|
||||
;; arch-tag: 483bfe15-f290-4fef-bb7d-ce65be687f2e
|
||||
;;; calc-lang.el ends here
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; calc-store.el --- value storage functions for Calc
|
||||
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
|
||||
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
|
||||
;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: David Gillespie <daveg@synaptics.com>
|
||||
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
|
||||
|
|
@ -197,8 +197,8 @@
|
|||
(minibuffer-completion-predicate
|
||||
(lambda (x) (boundp (intern (concat "var-" x)))))
|
||||
(minibuffer-completion-confirm t))
|
||||
(read-from-minibuffer
|
||||
prompt nil calc-var-name-map nil
|
||||
(read-from-minibuffer
|
||||
prompt nil calc-var-name-map nil
|
||||
'calc-read-var-name-history)))))
|
||||
(setq calc-aborted-prefix "")
|
||||
(and (not (equal var "var-"))
|
||||
|
|
@ -677,5 +677,9 @@
|
|||
|
||||
(provide 'calc-store)
|
||||
|
||||
;; Local variables:
|
||||
;; coding: utf-8
|
||||
;; End:
|
||||
|
||||
;; arch-tag: 2fbfec82-a521-42ca-bcd8-4f254ae6313e
|
||||
;;; calc-store.el ends here
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; calc-units.el --- unit conversion functions for Calc
|
||||
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
|
||||
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
|
||||
;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: David Gillespie <daveg@synaptics.com>
|
||||
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
|
||||
|
|
@ -323,7 +323,7 @@ that the combined units table will be rebuilt.")
|
|||
( ?c (^ 10 -2) "Centi" )
|
||||
( ?m (^ 10 -3) "Milli" )
|
||||
( ?u (^ 10 -6) "Micro" )
|
||||
( ?μ (^ 10 -6) "Micro" )
|
||||
( ?μ (^ 10 -6) "Micro" )
|
||||
( ?n (^ 10 -9) "Nano" )
|
||||
( ?p (^ 10 -12) "Pico" )
|
||||
( ?f (^ 10 -15) "Femto" )
|
||||
|
|
@ -1548,5 +1548,9 @@ If EXPR is nil, return nil."
|
|||
|
||||
(provide 'calc-units)
|
||||
|
||||
;; Local variables:
|
||||
;; coding: utf-8
|
||||
;; End:
|
||||
|
||||
;; arch-tag: e993314f-3adc-4191-be61-4ef8874881c4
|
||||
;;; calc-units.el ends here
|
||||
|
|
|
|||
|
|
@ -419,7 +419,7 @@ in normal mode."
|
|||
:group 'calc
|
||||
:type 'boolean)
|
||||
|
||||
(defcustom calc-undo-length
|
||||
(defcustom calc-undo-length
|
||||
100
|
||||
"The number of undo steps that will be preserved when Calc is quit."
|
||||
:group 'calc
|
||||
|
|
@ -1233,7 +1233,7 @@ the trail buffer."
|
|||
;; Eventually, prompt user with a list of buffers using embedded mode.
|
||||
(when (and
|
||||
info-list
|
||||
(yes-or-no-p
|
||||
(yes-or-no-p
|
||||
(concat "This Calc stack is being used for embedded mode. Kill anyway?")))
|
||||
(while info-list
|
||||
(with-current-buffer (car (car info-list))
|
||||
|
|
@ -3409,7 +3409,7 @@ largest Emacs integer.")
|
|||
(Math-lessp a math-half-2-word-size))
|
||||
(and (Math-integer-negp a)
|
||||
(require 'calc-ext)
|
||||
(let ((comparison
|
||||
(let ((comparison
|
||||
(math-compare (Math-integer-neg a) math-half-2-word-size)))
|
||||
(or (= comparison 0)
|
||||
(= comparison -1))))))
|
||||
|
|
@ -3553,7 +3553,7 @@ largest Emacs integer.")
|
|||
(math-normalize
|
||||
(save-match-data
|
||||
(cond
|
||||
|
||||
|
||||
;; Integers (most common case)
|
||||
((string-match "\\` *\\([0-9]+\\) *\\'" s)
|
||||
(let ((digs (math-match-substring s 1)))
|
||||
|
|
@ -3565,22 +3565,22 @@ largest Emacs integer.")
|
|||
(if (<= (length digs) (* 2 math-bignum-digit-length))
|
||||
(string-to-number digs)
|
||||
(cons 'bigpos (math-read-bignum digs))))))
|
||||
|
||||
|
||||
;; Clean up the string if necessary
|
||||
((string-match "\\`\\(.*\\)[ \t\n]+\\([^\001]*\\)\\'" s)
|
||||
(math-read-number (concat (math-match-substring s 1)
|
||||
(math-match-substring s 2))))
|
||||
|
||||
|
||||
;; Plus and minus signs
|
||||
((string-match "^[-_+]\\(.*\\)$" s)
|
||||
(let ((val (math-read-number (math-match-substring s 1))))
|
||||
(and val (if (eq (aref s 0) ?+) val (math-neg val)))))
|
||||
|
||||
|
||||
;; Forms that require extensions module
|
||||
((string-match "[^-+0-9eE.]" s)
|
||||
(require 'calc-ext)
|
||||
(math-read-number-fancy s))
|
||||
|
||||
|
||||
;; Decimal point
|
||||
((string-match "^\\([0-9]*\\)\\.\\([0-9]*\\)$" s)
|
||||
(let ((int (math-match-substring s 1))
|
||||
|
|
@ -3593,7 +3593,7 @@ largest Emacs integer.")
|
|||
(list 'float
|
||||
(math-add (math-scale-int int flen) frac)
|
||||
(- flen)))))))
|
||||
|
||||
|
||||
;; "e" notation
|
||||
((string-match "^\\(.*\\)[eE]\\([-+]?[0-9]+\\)$" s)
|
||||
(let ((mant (math-match-substring s 1))
|
||||
|
|
@ -3604,7 +3604,7 @@ largest Emacs integer.")
|
|||
(and mant exp (Math-realp mant) (> exp -4000000) (< exp 4000000)
|
||||
(let ((mant (math-float mant)))
|
||||
(list 'float (nth 1 mant) (+ (nth 2 mant) exp)))))))
|
||||
|
||||
|
||||
;; Syntax error!
|
||||
(t nil)))))
|
||||
|
||||
|
|
@ -3797,7 +3797,7 @@ See Info node `(calc)Defining Functions'."
|
|||
(setq unread-command-event nil)
|
||||
(setq unread-command-events nil)))
|
||||
|
||||
(defcalcmodevar math-2-word-size
|
||||
(defcalcmodevar math-2-word-size
|
||||
(math-read-number-simple "4294967296")
|
||||
"Two to the power of `calc-word-size'.")
|
||||
|
||||
|
|
@ -3814,5 +3814,9 @@ See Info node `(calc)Defining Functions'."
|
|||
|
||||
(provide 'calc)
|
||||
|
||||
;; Local variables:
|
||||
;; coding: utf-8
|
||||
;; End:
|
||||
|
||||
;; arch-tag: 0c3b170c-4ce6-4eaf-8d9b-5834d1fe938f
|
||||
;;; calc.el ends here
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; calccomp.el --- composition functions for Calc
|
||||
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
|
||||
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
|
||||
;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: David Gillespie <daveg@synaptics.com>
|
||||
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
|
||||
|
|
@ -50,19 +50,19 @@
|
|||
;;;
|
||||
;;; (tag X C) Composition C corresponds to sub-expression X
|
||||
|
||||
;; math-comp-just and math-comp-comma-spc are local to
|
||||
;; math-compose-expr, but are used by math-compose-matrix, which is
|
||||
;; math-comp-just and math-comp-comma-spc are local to
|
||||
;; math-compose-expr, but are used by math-compose-matrix, which is
|
||||
;; called by math-compose-expr
|
||||
(defvar math-comp-just)
|
||||
(defvar math-comp-comma-spc)
|
||||
|
||||
;; math-comp-vector-prec is local to math-compose-expr, but is used by
|
||||
;; math-compose-matrix and math-compose-rows, which are called by
|
||||
;; math-comp-vector-prec is local to math-compose-expr, but is used by
|
||||
;; math-compose-matrix and math-compose-rows, which are called by
|
||||
;; math-compose-expr.
|
||||
(defvar math-comp-vector-prec)
|
||||
|
||||
;; math-comp-left-bracket, math-comp-right-bracket and math-comp-comma are
|
||||
;; local to math-compose-expr, but are used by math-compose-rows, which is
|
||||
;; math-comp-left-bracket, math-comp-right-bracket and math-comp-comma are
|
||||
;; local to math-compose-expr, but are used by math-compose-rows, which is
|
||||
;; called by math-compose-expr.
|
||||
(defvar math-comp-left-bracket)
|
||||
(defvar math-comp-right-bracket)
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
(list 'tag a (math-compose-expr a prec))))
|
||||
((and (not (consp a)) (not (integerp a)))
|
||||
(concat "'" (prin1-to-string a)))
|
||||
((setq spfn (assq (car-safe a)
|
||||
((setq spfn (assq (car-safe a)
|
||||
(get calc-language 'math-special-function-table)))
|
||||
(setq spfn (cdr spfn))
|
||||
(if (consp spfn)
|
||||
|
|
@ -111,12 +111,12 @@
|
|||
(and (nth 1 calc-frac-format) (Math-integerp a)))
|
||||
(if (and
|
||||
calc-language
|
||||
(not (memq calc-language
|
||||
(not (memq calc-language
|
||||
'(flat big unform))))
|
||||
(let ((aa (math-adjust-fraction a))
|
||||
(calc-frac-format nil))
|
||||
(math-compose-expr (list '/
|
||||
(if (memq calc-language
|
||||
(if (memq calc-language
|
||||
calc-lang-slash-idiv)
|
||||
(math-float (nth 1 aa))
|
||||
(nth 1 aa))
|
||||
|
|
@ -281,22 +281,22 @@
|
|||
(cdr a)
|
||||
(if full rows 3) t)))))
|
||||
(if (or calc-full-vectors (< (length a) 7))
|
||||
(if (and
|
||||
(if (and
|
||||
(setq spfn (get calc-language 'math-matrix-formatter))
|
||||
(math-matrixp a))
|
||||
(funcall spfn a)
|
||||
(list 'horiz
|
||||
math-comp-left-bracket
|
||||
(math-compose-vector (cdr a)
|
||||
(math-compose-vector (cdr a)
|
||||
(concat math-comp-comma " ")
|
||||
math-comp-vector-prec)
|
||||
math-comp-right-bracket))
|
||||
(list 'horiz
|
||||
math-comp-left-bracket
|
||||
(math-compose-vector (list (nth 1 a) (nth 2 a) (nth 3 a))
|
||||
(concat math-comp-comma " ")
|
||||
(concat math-comp-comma " ")
|
||||
math-comp-vector-prec)
|
||||
math-comp-comma
|
||||
math-comp-comma
|
||||
(if (setq spfn (get calc-language 'math-dots))
|
||||
(concat " " spfn)
|
||||
" ...")
|
||||
|
|
@ -869,7 +869,7 @@
|
|||
math-comp-vector-prec)
|
||||
(if (= col cols)
|
||||
""
|
||||
(concat
|
||||
(concat
|
||||
math-comp-comma-spc " ")))))
|
||||
a)))
|
||||
res)))
|
||||
|
|
@ -880,7 +880,7 @@
|
|||
(if (<= count 0)
|
||||
(if (< count 0)
|
||||
(math-compose-rows (cdr a) -1 nil)
|
||||
(cons (concat
|
||||
(cons (concat
|
||||
(let ((mdots (get calc-language 'math-dots)))
|
||||
(if mdots
|
||||
(concat " " mdots)
|
||||
|
|
@ -1119,7 +1119,7 @@
|
|||
(if (memq prec '(196 201)) ")" "")))))
|
||||
|
||||
;; The variables math-svo-c, math-svo-wid and math-svo-off are local
|
||||
;; to math-stack-value-offset in calc.el, but are used by
|
||||
;; to math-stack-value-offset in calc.el, but are used by
|
||||
;; math-stack-value-offset-fancy, which is called by math-stack-value-offset..
|
||||
(defvar math-svo-c)
|
||||
(defvar math-svo-wid)
|
||||
|
|
@ -1195,11 +1195,11 @@
|
|||
;;; of the formula.
|
||||
|
||||
;; The variables math-comp-full-width, math-comp-highlight, math-comp-word,
|
||||
;; math-comp-level, math-comp-margin and math-comp-buf are local to
|
||||
;; math-comp-to-string-flat, but are used by math-comp-to-string-flat-term,
|
||||
;; math-comp-level, math-comp-margin and math-comp-buf are local to
|
||||
;; math-comp-to-string-flat, but are used by math-comp-to-string-flat-term,
|
||||
;; which is called by math-comp-to-string-flat.
|
||||
;; math-comp-highlight and math-comp-buf are also local to
|
||||
;; math-comp-simplify-term and math-comp-simplify respectively, but are used
|
||||
;; math-comp-highlight and math-comp-buf are also local to
|
||||
;; math-comp-simplify-term and math-comp-simplify respectively, but are used
|
||||
;; by math-comp-add-string.
|
||||
(defvar math-comp-full-width)
|
||||
(defvar math-comp-highlight)
|
||||
|
|
@ -1244,7 +1244,7 @@
|
|||
(cond ((not (consp c))
|
||||
(if math-comp-highlight
|
||||
(setq c (math-comp-highlight-string c)))
|
||||
(setq math-comp-word (if (= (length math-comp-word) 0) c
|
||||
(setq math-comp-word (if (= (length math-comp-word) 0) c
|
||||
(concat math-comp-word c))
|
||||
math-comp-pos (+ math-comp-pos (length c))))
|
||||
|
||||
|
|
@ -1347,8 +1347,8 @@
|
|||
|
||||
|
||||
;; The variable math-comp-sel-tag is local to calc-find-selected-part
|
||||
;; in calc-sel.el, but is used by math-comp-sel-flat-term and
|
||||
;; math-comp-add-string-sel, which are called (indirectly) by
|
||||
;; in calc-sel.el, but is used by math-comp-sel-flat-term and
|
||||
;; math-comp-add-string-sel, which are called (indirectly) by
|
||||
;; calc-find-selected-part.
|
||||
(defvar math-comp-sel-tag)
|
||||
|
||||
|
|
@ -1668,5 +1668,9 @@
|
|||
|
||||
(provide 'calccomp)
|
||||
|
||||
;; Local variables:
|
||||
;; coding: utf-8
|
||||
;; End:
|
||||
|
||||
;; arch-tag: 7c45d10a-a286-4dab-af49-7ae8989fbf78
|
||||
;;; calccomp.el ends here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue