Mercurial > emacs
annotate lisp/calc/calc-lang.el @ 78678:90908a118cf2
*** empty log message ***
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
---|---|
date | Mon, 27 Aug 2007 08:32:36 +0000 |
parents | 095d08e7d6bb |
children | 9754bb0422ed b98604865ea0 |
rev | line source |
---|---|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1 ;;; calc-lang.el --- calc language functions |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
2 |
64325
1db49616ce05
Update copyright information.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62165
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, |
75346 | 4 ;; 2005, 2006, 2007 Free Software Foundation, Inc. |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
5 |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
6 ;; Author: David Gillespie <daveg@synaptics.com> |
77465
1154f082efd9
Update maintainer's address.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
76595
diff
changeset
|
7 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com> |
40785 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
78215
095d08e7d6bb
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77465
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
14 ;; any later version. |
40785 | 15 |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
19 ;; GNU General Public License for more details. |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
20 |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
24 ;; Boston, MA 02110-1301, USA. |
40785 | 25 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
26 ;;; Commentary: |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
27 |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
28 ;;; Code: |
40785 | 29 |
30 ;; This file is autoloaded from calc-ext.el. | |
31 | |
58661
10224395a3c2
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58571
diff
changeset
|
32 (require 'calc-ext) |
40785 | 33 (require 'calc-macs) |
34 | |
35 ;;; Alternate entry/display languages. | |
36 | |
37 (defun calc-set-language (lang &optional option no-refresh) | |
38 (setq math-expr-opers (or (get lang 'math-oper-table) math-standard-opers) | |
39 math-expr-function-mapping (get lang 'math-function-table) | |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
40 math-expr-special-function-mapping (get lang 'math-special-function-table) |
40785 | 41 math-expr-variable-mapping (get lang 'math-variable-table) |
42 calc-language-input-filter (get lang 'math-input-filter) | |
43 calc-language-output-filter (get lang 'math-output-filter) | |
44 calc-vector-brackets (or (get lang 'math-vector-brackets) "[]") | |
45 calc-complex-format (get lang 'math-complex-format) | |
46 calc-radix-formatter (get lang 'math-radix-formatter) | |
47 calc-function-open (or (get lang 'math-function-open) "(") | |
48 calc-function-close (or (get lang 'math-function-close) ")")) | |
49 (if no-refresh | |
50 (setq calc-language lang | |
51 calc-language-option option) | |
52 (calc-change-mode '(calc-language calc-language-option) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
53 (list lang option) t))) |
40785 | 54 |
55 (defun calc-normal-language () | |
56 (interactive) | |
57 (calc-wrapper | |
58 (calc-set-language nil) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
59 (message "Normal language mode"))) |
40785 | 60 |
61 (defun calc-flat-language () | |
62 (interactive) | |
63 (calc-wrapper | |
64 (calc-set-language 'flat) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
65 (message "Flat language mode (all stack entries shown on one line)"))) |
40785 | 66 |
67 (defun calc-big-language () | |
68 (interactive) | |
69 (calc-wrapper | |
70 (calc-set-language 'big) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
71 (message "\"Big\" language mode"))) |
40785 | 72 |
73 (defun calc-unformatted-language () | |
74 (interactive) | |
75 (calc-wrapper | |
76 (calc-set-language 'unform) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
77 (message "Unformatted language mode"))) |
40785 | 78 |
79 | |
80 (defun calc-c-language () | |
81 (interactive) | |
82 (calc-wrapper | |
83 (calc-set-language 'c) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
84 (message "`C' language mode"))) |
40785 | 85 |
86 (put 'c 'math-oper-table | |
87 '( ( "u+" ident -1 1000 ) | |
88 ( "u-" neg -1 1000 ) | |
89 ( "u!" calcFunc-lnot -1 1000 ) | |
90 ( "~" calcFunc-not -1 1000 ) | |
91 ( "*" * 190 191 ) | |
92 ( "/" / 190 191 ) | |
93 ( "%" % 190 191 ) | |
94 ( "+" + 180 181 ) | |
95 ( "-" - 180 181 ) | |
96 ( "<<" calcFunc-lsh 170 171 ) | |
97 ( ">>" calcFunc-rsh 170 171 ) | |
98 ( "<" calcFunc-lt 160 161 ) | |
99 ( ">" calcFunc-gt 160 161 ) | |
100 ( "<=" calcFunc-leq 160 161 ) | |
101 ( ">=" calcFunc-geq 160 161 ) | |
102 ( "==" calcFunc-eq 150 151 ) | |
103 ( "!=" calcFunc-neq 150 151 ) | |
104 ( "&" calcFunc-and 140 141 ) | |
105 ( "^" calcFunc-xor 131 130 ) | |
106 ( "|" calcFunc-or 120 121 ) | |
107 ( "&&" calcFunc-land 110 111 ) | |
108 ( "||" calcFunc-lor 100 101 ) | |
109 ( "?" (math-read-if) 91 90 ) | |
110 ( "!!!" calcFunc-pnot -1 88 ) | |
111 ( "&&&" calcFunc-pand 85 86 ) | |
112 ( "|||" calcFunc-por 75 76 ) | |
113 ( "=" calcFunc-assign 51 50 ) | |
114 ( ":=" calcFunc-assign 51 50 ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
115 ( "::" calcFunc-condition 45 46 ))) ; should support full assignments |
40785 | 116 |
117 (put 'c 'math-function-table | |
118 '( ( acos . calcFunc-arccos ) | |
119 ( acosh . calcFunc-arccosh ) | |
120 ( asin . calcFunc-arcsin ) | |
121 ( asinh . calcFunc-arcsinh ) | |
122 ( atan . calcFunc-arctan ) | |
123 ( atan2 . calcFunc-arctan2 ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
124 ( atanh . calcFunc-arctanh ))) |
40785 | 125 |
126 (put 'c 'math-variable-table | |
127 '( ( M_PI . var-pi ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
128 ( M_E . var-e ))) |
40785 | 129 |
130 (put 'c 'math-vector-brackets "{}") | |
131 | |
132 (put 'c 'math-radix-formatter | |
133 (function (lambda (r s) | |
134 (if (= r 16) (format "0x%s" s) | |
135 (if (= r 8) (format "0%s" s) | |
136 (format "%d#%s" r s)))))) | |
137 | |
138 | |
139 (defun calc-pascal-language (n) | |
140 (interactive "P") | |
141 (calc-wrapper | |
142 (and n (setq n (prefix-numeric-value n))) | |
143 (calc-set-language 'pascal n) | |
144 (message (if (and n (/= n 0)) | |
145 (if (> n 0) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
146 "Pascal language mode (all uppercase)" |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
147 "Pascal language mode (all lowercase)") |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
148 "Pascal language mode")))) |
40785 | 149 |
150 (put 'pascal 'math-oper-table | |
151 '( ( "not" calcFunc-lnot -1 1000 ) | |
152 ( "*" * 190 191 ) | |
153 ( "/" / 190 191 ) | |
154 ( "and" calcFunc-and 190 191 ) | |
155 ( "div" calcFunc-idiv 190 191 ) | |
156 ( "mod" % 190 191 ) | |
157 ( "u+" ident -1 185 ) | |
158 ( "u-" neg -1 185 ) | |
159 ( "+" + 180 181 ) | |
160 ( "-" - 180 181 ) | |
161 ( "or" calcFunc-or 180 181 ) | |
162 ( "xor" calcFunc-xor 180 181 ) | |
163 ( "shl" calcFunc-lsh 180 181 ) | |
164 ( "shr" calcFunc-rsh 180 181 ) | |
165 ( "in" calcFunc-in 160 161 ) | |
166 ( "<" calcFunc-lt 160 161 ) | |
167 ( ">" calcFunc-gt 160 161 ) | |
168 ( "<=" calcFunc-leq 160 161 ) | |
169 ( ">=" calcFunc-geq 160 161 ) | |
170 ( "=" calcFunc-eq 160 161 ) | |
171 ( "<>" calcFunc-neq 160 161 ) | |
172 ( "!!!" calcFunc-pnot -1 85 ) | |
173 ( "&&&" calcFunc-pand 80 81 ) | |
174 ( "|||" calcFunc-por 75 76 ) | |
175 ( ":=" calcFunc-assign 51 50 ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
176 ( "::" calcFunc-condition 45 46 ))) |
40785 | 177 |
178 (put 'pascal 'math-input-filter 'calc-input-case-filter) | |
179 (put 'pascal 'math-output-filter 'calc-output-case-filter) | |
180 | |
181 (put 'pascal 'math-radix-formatter | |
182 (function (lambda (r s) | |
183 (if (= r 16) (format "$%s" s) | |
184 (format "%d#%s" r s))))) | |
185 | |
186 (defun calc-input-case-filter (str) | |
187 (cond ((or (null calc-language-option) (= calc-language-option 0)) | |
188 str) | |
189 (t | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
190 (downcase str)))) |
40785 | 191 |
192 (defun calc-output-case-filter (str) | |
193 (cond ((or (null calc-language-option) (= calc-language-option 0)) | |
194 str) | |
195 ((> calc-language-option 0) | |
196 (upcase str)) | |
197 (t | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
198 (downcase str)))) |
40785 | 199 |
200 | |
201 (defun calc-fortran-language (n) | |
202 (interactive "P") | |
203 (calc-wrapper | |
204 (and n (setq n (prefix-numeric-value n))) | |
205 (calc-set-language 'fortran n) | |
206 (message (if (and n (/= n 0)) | |
207 (if (> n 0) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
208 "FORTRAN language mode (all uppercase)" |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
209 "FORTRAN language mode (all lowercase)") |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
210 "FORTRAN language mode")))) |
40785 | 211 |
212 (put 'fortran 'math-oper-table | |
213 '( ( "u/" (math-parse-fortran-vector) -1 1 ) | |
214 ( "/" (math-parse-fortran-vector-end) 1 -1 ) | |
215 ( "**" ^ 201 200 ) | |
216 ( "u+" ident -1 191 ) | |
217 ( "u-" neg -1 191 ) | |
218 ( "*" * 190 191 ) | |
219 ( "/" / 190 191 ) | |
220 ( "+" + 180 181 ) | |
221 ( "-" - 180 181 ) | |
222 ( ".LT." calcFunc-lt 160 161 ) | |
223 ( ".GT." calcFunc-gt 160 161 ) | |
224 ( ".LE." calcFunc-leq 160 161 ) | |
225 ( ".GE." calcFunc-geq 160 161 ) | |
226 ( ".EQ." calcFunc-eq 160 161 ) | |
227 ( ".NE." calcFunc-neq 160 161 ) | |
228 ( ".NOT." calcFunc-lnot -1 121 ) | |
229 ( ".AND." calcFunc-land 110 111 ) | |
230 ( ".OR." calcFunc-lor 100 101 ) | |
231 ( "!!!" calcFunc-pnot -1 85 ) | |
232 ( "&&&" calcFunc-pand 80 81 ) | |
233 ( "|||" calcFunc-por 75 76 ) | |
234 ( "=" calcFunc-assign 51 50 ) | |
235 ( ":=" calcFunc-assign 51 50 ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
236 ( "::" calcFunc-condition 45 46 ))) |
40785 | 237 |
238 (put 'fortran 'math-vector-brackets "//") | |
239 | |
240 (put 'fortran 'math-function-table | |
241 '( ( acos . calcFunc-arccos ) | |
242 ( acosh . calcFunc-arccosh ) | |
243 ( aimag . calcFunc-im ) | |
244 ( aint . calcFunc-ftrunc ) | |
245 ( asin . calcFunc-arcsin ) | |
246 ( asinh . calcFunc-arcsinh ) | |
247 ( atan . calcFunc-arctan ) | |
248 ( atan2 . calcFunc-arctan2 ) | |
249 ( atanh . calcFunc-arctanh ) | |
250 ( conjg . calcFunc-conj ) | |
251 ( log . calcFunc-ln ) | |
252 ( nint . calcFunc-round ) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49263
diff
changeset
|
253 ( real . calcFunc-re ))) |
40785 | 254 |
255 (put 'fortran 'math-input-filter 'calc-input-case-filter) | |
256 (put 'fortran 'math-output-filter 'calc-output-case-filter) | |
257 | |
58571
4ca47d70b075
(math-expr-data, math-expr-token, math-exp-old-pos): Declare them.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58411
diff
changeset
|
258 ;; The next few variables are local to math-read-exprs in calc-aent.el |
4ca47d70b075
(math-expr-data, math-expr-token, math-exp-old-pos): Declare them.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58411
diff
changeset
|
259 ;; and math-read-expr in calc-ext.el, but are set in functions they call. |
4ca47d70b075
(math-expr-data, math-expr-token, math-exp-old-pos): Declare them.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58411
diff
changeset
|
260 |
4ca47d70b075
(math-expr-data, math-expr-token, math-exp-old-pos): Declare them.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58411
diff
changeset
|
261 (defvar math-exp-token) |
4ca47d70b075
(math-expr-data, math-expr-token, math-exp-old-pos): Declare them.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58411
diff
changeset
|
262 (defvar math-expr-data) |
4ca47d70b075
(math-expr-data, math-expr-token, math-exp-old-pos): Declare them.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58411
diff
changeset
|
263 (defvar math-exp-old-pos) |
4ca47d70b075
(math-expr-data, math-expr-token, math-exp-old-pos): Declare them.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58411
diff
changeset
|
264 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
265 (defvar math-parsing-fortran-vector nil) |
40785 | 266 (defun math-parse-fortran-vector (op) |
267 (let ((math-parsing-fortran-vector '(end . "\000"))) | |
268 (prog1 | |
269 (math-read-brackets t "]") | |
58134
3089957051ea
(math-parse-tex-sum): Use declared variable math-exp-old-pos.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58107
diff
changeset
|
270 (setq math-exp-token (car math-parsing-fortran-vector) |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
271 math-expr-data (cdr math-parsing-fortran-vector))))) |
40785 | 272 |
273 (defun math-parse-fortran-vector-end (x op) | |
274 (if math-parsing-fortran-vector | |
275 (progn | |
58134
3089957051ea
(math-parse-tex-sum): Use declared variable math-exp-old-pos.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58107
diff
changeset
|
276 (setq math-parsing-fortran-vector (cons math-exp-token math-expr-data) |
3089957051ea
(math-parse-tex-sum): Use declared variable math-exp-old-pos.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58107
diff
changeset
|
277 math-exp-token 'end |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
278 math-expr-data "\000") |
40785 | 279 x) |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
280 (throw 'syntax "Unmatched closing `/'"))) |
40785 | 281 |
282 (defun math-parse-fortran-subscr (sym args) | |
283 (setq sym (math-build-var-name sym)) | |
284 (while args | |
285 (setq sym (list 'calcFunc-subscr sym (car args)) | |
286 args (cdr args))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
287 sym) |
40785 | 288 |
289 | |
290 (defun calc-tex-language (n) | |
291 (interactive "P") | |
292 (calc-wrapper | |
293 (and n (setq n (prefix-numeric-value n))) | |
294 (calc-set-language 'tex n) | |
59966
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
295 (cond ((not n) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
296 (message "TeX language mode")) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
297 ((= n 0) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
298 (message "TeX language mode with multiline matrices")) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
299 ((= n 1) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
300 (message "TeX language mode with \\hbox{func}(\\hbox{var})")) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
301 ((> n 1) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
302 (message |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
303 "TeX language mode with \\hbox{func}(\\hbox{var}) and multiline matrices")) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
304 ((= n -1) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
305 (message "TeX language mode with \\func(\\hbox{var})")) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
306 ((< n -1) |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
307 (message |
9eb004b49fc9
(calc-tex-language): Display more information in messages.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59915
diff
changeset
|
308 "TeX language mode with \\func(\\hbox{var}) and multiline matrices"))))) |
40785 | 309 |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
310 (defun calc-latex-language (n) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
311 (interactive "P") |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
312 (calc-wrapper |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
313 (and n (setq n (prefix-numeric-value n))) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
314 (calc-set-language 'latex n) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
315 (cond ((not n) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
316 (message "LaTeX language mode")) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
317 ((= n 0) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
318 (message "LaTeX language mode with multiline matrices")) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
319 ((= n 1) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
320 (message "LaTeX language mode with \\text{func}(\\text{var})")) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
321 ((> n 1) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
322 (message |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
323 "LaTeX language mode with \\text{func}(\\text{var}) and multiline matrices")) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
324 ((= n -1) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
325 (message "LaTeX language mode with \\func(\\text{var})")) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
326 ((< n -1) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
327 (message |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
328 "LaTeX language mode with \\func(\\text{var}) and multiline matrices"))))) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
329 |
40785 | 330 (put 'tex 'math-oper-table |
331 '( ( "u+" ident -1 1000 ) | |
332 ( "u-" neg -1 1000 ) | |
333 ( "\\hat" calcFunc-hat -1 950 ) | |
334 ( "\\check" calcFunc-check -1 950 ) | |
335 ( "\\tilde" calcFunc-tilde -1 950 ) | |
336 ( "\\acute" calcFunc-acute -1 950 ) | |
337 ( "\\grave" calcFunc-grave -1 950 ) | |
338 ( "\\dot" calcFunc-dot -1 950 ) | |
339 ( "\\ddot" calcFunc-dotdot -1 950 ) | |
340 ( "\\breve" calcFunc-breve -1 950 ) | |
341 ( "\\bar" calcFunc-bar -1 950 ) | |
342 ( "\\vec" calcFunc-Vec -1 950 ) | |
343 ( "\\underline" calcFunc-under -1 950 ) | |
344 ( "u|" calcFunc-abs -1 0 ) | |
345 ( "|" closing 0 -1 ) | |
346 ( "\\lfloor" calcFunc-floor -1 0 ) | |
347 ( "\\rfloor" closing 0 -1 ) | |
348 ( "\\lceil" calcFunc-ceil -1 0 ) | |
349 ( "\\rceil" closing 0 -1 ) | |
350 ( "\\pm" sdev 300 300 ) | |
351 ( "!" calcFunc-fact 210 -1 ) | |
352 ( "^" ^ 201 200 ) | |
353 ( "_" calcFunc-subscr 201 200 ) | |
354 ( "\\times" * 191 190 ) | |
355 ( "*" * 191 190 ) | |
356 ( "2x" * 191 190 ) | |
65711
dd684f00015e
(math-oper-table): Raise the precedence of "/" in TeX mode.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
64325
diff
changeset
|
357 ( "/" / 185 186 ) |
40785 | 358 ( "+" + 180 181 ) |
359 ( "-" - 180 181 ) | |
360 ( "\\over" / 170 171 ) | |
361 ( "\\choose" calcFunc-choose 170 171 ) | |
362 ( "\\mod" % 170 171 ) | |
363 ( "<" calcFunc-lt 160 161 ) | |
364 ( ">" calcFunc-gt 160 161 ) | |
365 ( "\\leq" calcFunc-leq 160 161 ) | |
366 ( "\\geq" calcFunc-geq 160 161 ) | |
367 ( "=" calcFunc-eq 160 161 ) | |
368 ( "\\neq" calcFunc-neq 160 161 ) | |
369 ( "\\ne" calcFunc-neq 160 161 ) | |
370 ( "\\lnot" calcFunc-lnot -1 121 ) | |
371 ( "\\land" calcFunc-land 110 111 ) | |
372 ( "\\lor" calcFunc-lor 100 101 ) | |
373 ( "?" (math-read-if) 91 90 ) | |
374 ( "!!!" calcFunc-pnot -1 85 ) | |
375 ( "&&&" calcFunc-pand 80 81 ) | |
376 ( "|||" calcFunc-por 75 76 ) | |
377 ( "\\gets" calcFunc-assign 51 50 ) | |
378 ( ":=" calcFunc-assign 51 50 ) | |
379 ( "::" calcFunc-condition 45 46 ) | |
380 ( "\\to" calcFunc-evalto 40 41 ) | |
381 ( "\\to" calcFunc-evalto 40 -1 ) | |
382 ( "=>" calcFunc-evalto 40 41 ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
383 ( "=>" calcFunc-evalto 40 -1 ))) |
40785 | 384 |
385 (put 'tex 'math-function-table | |
386 '( ( \\arccos . calcFunc-arccos ) | |
387 ( \\arcsin . calcFunc-arcsin ) | |
388 ( \\arctan . calcFunc-arctan ) | |
389 ( \\arg . calcFunc-arg ) | |
390 ( \\cos . calcFunc-cos ) | |
391 ( \\cosh . calcFunc-cosh ) | |
61069
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
392 ( \\cot . calcFunc-cot ) |
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
393 ( \\coth . calcFunc-coth ) |
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
394 ( \\csc . calcFunc-csc ) |
40785 | 395 ( \\det . calcFunc-det ) |
396 ( \\exp . calcFunc-exp ) | |
397 ( \\gcd . calcFunc-gcd ) | |
398 ( \\ln . calcFunc-ln ) | |
399 ( \\log . calcFunc-log10 ) | |
400 ( \\max . calcFunc-max ) | |
401 ( \\min . calcFunc-min ) | |
61069
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
402 ( \\sec . calcFunc-sec ) |
40785 | 403 ( \\sin . calcFunc-sin ) |
404 ( \\sinh . calcFunc-sinh ) | |
405 ( \\sqrt . calcFunc-sqrt ) | |
61069
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
406 ( \\tan . calcFunc-tan ) |
40785 | 407 ( \\tanh . calcFunc-tanh ) |
408 ( \\phi . calcFunc-totient ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
409 ( \\mu . calcFunc-moebius ))) |
40785 | 410 |
411 (put 'tex 'math-variable-table | |
73057
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
412 '( |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
413 ;; The Greek letters |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
414 ( \\alpha . var-alpha ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
415 ( \\beta . var-beta ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
416 ( \\gamma . var-gamma ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
417 ( \\Gamma . var-Gamma ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
418 ( \\delta . var-delta ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
419 ( \\Delta . var-Delta ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
420 ( \\epsilon . var-epsilon ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
421 ( \\varepsilon . var-varepsilon) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
422 ( \\zeta . var-zeta ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
423 ( \\eta . var-eta ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
424 ( \\theta . var-theta ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
425 ( \\vartheta . var-vartheta ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
426 ( \\Theta . var-Theta ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
427 ( \\iota . var-iota ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
428 ( \\kappa . var-kappa ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
429 ( \\lambda . var-lambda ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
430 ( \\Lambda . var-Lambda ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
431 ( \\mu . var-mu ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
432 ( \\nu . var-nu ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
433 ( \\xi . var-xi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
434 ( \\Xi . var-Xi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
435 ( \\pi . var-pi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
436 ( \\varpi . var-varpi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
437 ( \\Pi . var-Pi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
438 ( \\rho . var-rho ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
439 ( \\varrho . var-varrho ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
440 ( \\sigma . var-sigma ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
441 ( \\sigma . var-varsigma ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
442 ( \\Sigma . var-Sigma ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
443 ( \\tau . var-tau ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
444 ( \\upsilon . var-upsilon ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
445 ( \\Upsilon . var-Upsilon ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
446 ( \\phi . var-phi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
447 ( \\varphi . var-varphi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
448 ( \\Phi . var-Phi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
449 ( \\chi . var-chi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
450 ( \\psi . var-psi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
451 ( \\Psi . var-Psi ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
452 ( \\omega . var-omega ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
453 ( \\Omega . var-Omega ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
454 ;; Others |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
455 ( \\ell . var-ell ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
456 ( \\infty . var-inf ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
457 ( \\infty . var-uinf ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
458 ( \\sum . (math-parse-tex-sum calcFunc-sum) ) |
76991373b070
Add Greek letters to math-variable-table properties of tex.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
68636
diff
changeset
|
459 ( \\prod . (math-parse-tex-sum calcFunc-prod) ))) |
40785 | 460 |
461 (put 'tex 'math-complex-format 'i) | |
462 | |
463 (defun math-parse-tex-sum (f val) | |
464 (let (low high save) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
465 (or (equal math-expr-data "_") (throw 'syntax "Expected `_'")) |
40785 | 466 (math-read-token) |
58134
3089957051ea
(math-parse-tex-sum): Use declared variable math-exp-old-pos.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58107
diff
changeset
|
467 (setq save math-exp-old-pos) |
40785 | 468 (setq low (math-read-factor)) |
469 (or (eq (car-safe low) 'calcFunc-eq) | |
470 (progn | |
58134
3089957051ea
(math-parse-tex-sum): Use declared variable math-exp-old-pos.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58107
diff
changeset
|
471 (setq math-exp-old-pos (1+ save)) |
40785 | 472 (throw 'syntax "Expected equation"))) |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
473 (or (equal math-expr-data "^") (throw 'syntax "Expected `^'")) |
40785 | 474 (math-read-token) |
475 (setq high (math-read-factor)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
476 (list (nth 2 f) (math-read-factor) (nth 1 low) (nth 2 low) high))) |
40785 | 477 |
478 (defun math-tex-input-filter (str) ; allow parsing of 123\,456\,789. | |
479 (while (string-match "[0-9]\\\\,[0-9]" str) | |
480 (setq str (concat (substring str 0 (1+ (match-beginning 0))) | |
481 (substring str (1- (match-end 0)))))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
482 str) |
40785 | 483 (put 'tex 'math-input-filter 'math-tex-input-filter) |
484 | |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
485 (put 'latex 'math-oper-table |
59829
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
486 (append (get 'tex 'math-oper-table) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
487 '(( "\\Hat" calcFunc-Hat -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
488 ( "\\Check" calcFunc-Check -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
489 ( "\\Tilde" calcFunc-Tilde -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
490 ( "\\Acute" calcFunc-Acute -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
491 ( "\\Grave" calcFunc-Grave -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
492 ( "\\Dot" calcFunc-Dot -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
493 ( "\\Ddot" calcFunc-Dotdot -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
494 ( "\\Breve" calcFunc-Breve -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
495 ( "\\Bar" calcFunc-Bar -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
496 ( "\\Vec" calcFunc-VEC -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
497 ( "\\dddot" calcFunc-dddot -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
498 ( "\\ddddot" calcFunc-ddddot -1 950 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
499 ( "\div" / 170 171 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
500 ( "\\le" calcFunc-leq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
501 ( "\\leqq" calcFunc-leq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
502 ( "\\leqsland" calcFunc-leq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
503 ( "\\ge" calcFunc-geq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
504 ( "\\geqq" calcFunc-geq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
505 ( "\\geqslant" calcFunc-geq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
506 ( "=" calcFunc-eq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
507 ( "\\neq" calcFunc-neq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
508 ( "\\ne" calcFunc-neq 160 161 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
509 ( "\\lnot" calcFunc-lnot -1 121 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
510 ( "\\land" calcFunc-land 110 111 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
511 ( "\\lor" calcFunc-lor 100 101 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
512 ( "?" (math-read-if) 91 90 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
513 ( "!!!" calcFunc-pnot -1 85 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
514 ( "&&&" calcFunc-pand 80 81 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
515 ( "|||" calcFunc-por 75 76 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
516 ( "\\gets" calcFunc-assign 51 50 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
517 ( ":=" calcFunc-assign 51 50 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
518 ( "::" calcFunc-condition 45 46 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
519 ( "\\to" calcFunc-evalto 40 41 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
520 ( "\\to" calcFunc-evalto 40 -1 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
521 ( "=>" calcFunc-evalto 40 41 ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
522 ( "=>" calcFunc-evalto 40 -1 )))) |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
523 |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
524 (put 'latex 'math-function-table |
59829
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
525 (append |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
526 (get 'tex 'math-function-table) |
59915
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
527 '(( \\frac . (math-latex-parse-frac)) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
528 ( \\tfrac . (math-latex-parse-frac)) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
529 ( \\dfrac . (math-latex-parse-frac)) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
530 ( \\binom . (math-latex-parse-two-args calcFunc-choose)) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
531 ( \\tbinom . (math-latex-parse-two-args calcFunc-choose)) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
532 ( \\dbinom . (math-latex-parse-two-args calcFunc-choose)) |
59829
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
533 ( \\phi . calcFunc-totient ) |
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
534 ( \\mu . calcFunc-moebius )))) |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
535 |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
536 (put 'latex 'math-special-function-table |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
537 '((/ . (math-latex-print-frac "\\frac")) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
538 (calcFunc-choose . (math-latex-print-frac "\\binom")))) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
539 |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
540 (put 'latex 'math-variable-table |
59829
502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59819
diff
changeset
|
541 (get 'tex 'math-variable-table)) |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
542 |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
543 (put 'latex 'math-complex-format 'i) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
544 |
59915
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
545 |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
546 (defun math-latex-parse-frac (f val) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
547 (let (numer denom) |
59915
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
548 (setq numer (car (math-read-expr-list))) |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
549 (math-read-token) |
59915
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
550 (setq denom (math-read-factor)) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
551 (if (and (Math-num-integerp numer) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
552 (Math-num-integerp denom)) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
553 (list 'frac numer denom) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
554 (list '/ numer denom)))) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
555 |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
556 (defun math-latex-parse-two-args (f val) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
557 (let (first second) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
558 (setq first (car (math-read-expr-list))) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
559 (math-read-token) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
560 (setq second (math-read-factor)) |
937e422a1694
(math-latex-parse-frac): Don't use arguments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59829
diff
changeset
|
561 (list (nth 2 f) first second))) |
59811
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
562 |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
563 (defun math-latex-print-frac (a fn) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
564 (list 'horiz (nth 1 fn) "{" (math-compose-expr (nth 1 a) -1) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
565 "}{" |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
566 (math-compose-expr (nth 2 a) -1) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
567 "}")) |
9e28f5bc25bb
(calc-latex-language, math-latex-parse-frac)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58661
diff
changeset
|
568 |
59819
dea78c6f5e48
(math-latex-input-filter): Remove function.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59811
diff
changeset
|
569 (put 'latex 'math-input-filter 'math-tex-input-filter) |
40785 | 570 |
571 (defun calc-eqn-language (n) | |
572 (interactive "P") | |
573 (calc-wrapper | |
574 (calc-set-language 'eqn) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
575 (message "Eqn language mode"))) |
40785 | 576 |
577 (put 'eqn 'math-oper-table | |
578 '( ( "u+" ident -1 1000 ) | |
579 ( "u-" neg -1 1000 ) | |
580 ( "prime" (math-parse-eqn-prime) 950 -1 ) | |
581 ( "prime" calcFunc-Prime 950 -1 ) | |
582 ( "dot" calcFunc-dot 950 -1 ) | |
583 ( "dotdot" calcFunc-dotdot 950 -1 ) | |
584 ( "hat" calcFunc-hat 950 -1 ) | |
585 ( "tilde" calcFunc-tilde 950 -1 ) | |
586 ( "vec" calcFunc-Vec 950 -1 ) | |
587 ( "dyad" calcFunc-dyad 950 -1 ) | |
588 ( "bar" calcFunc-bar 950 -1 ) | |
589 ( "under" calcFunc-under 950 -1 ) | |
590 ( "sub" calcFunc-subscr 931 930 ) | |
591 ( "sup" ^ 921 920 ) | |
592 ( "sqrt" calcFunc-sqrt -1 910 ) | |
593 ( "over" / 900 901 ) | |
594 ( "u|" calcFunc-abs -1 0 ) | |
595 ( "|" closing 0 -1 ) | |
596 ( "left floor" calcFunc-floor -1 0 ) | |
597 ( "right floor" closing 0 -1 ) | |
598 ( "left ceil" calcFunc-ceil -1 0 ) | |
599 ( "right ceil" closing 0 -1 ) | |
600 ( "+-" sdev 300 300 ) | |
601 ( "!" calcFunc-fact 210 -1 ) | |
602 ( "times" * 191 190 ) | |
603 ( "*" * 191 190 ) | |
604 ( "2x" * 191 190 ) | |
605 ( "/" / 180 181 ) | |
606 ( "%" % 180 181 ) | |
607 ( "+" + 170 171 ) | |
608 ( "-" - 170 171 ) | |
609 ( "<" calcFunc-lt 160 161 ) | |
610 ( ">" calcFunc-gt 160 161 ) | |
611 ( "<=" calcFunc-leq 160 161 ) | |
612 ( ">=" calcFunc-geq 160 161 ) | |
613 ( "=" calcFunc-eq 160 161 ) | |
614 ( "==" calcFunc-eq 160 161 ) | |
615 ( "!=" calcFunc-neq 160 161 ) | |
616 ( "u!" calcFunc-lnot -1 121 ) | |
617 ( "&&" calcFunc-land 110 111 ) | |
618 ( "||" calcFunc-lor 100 101 ) | |
619 ( "?" (math-read-if) 91 90 ) | |
620 ( "!!!" calcFunc-pnot -1 85 ) | |
621 ( "&&&" calcFunc-pand 80 81 ) | |
622 ( "|||" calcFunc-por 75 76 ) | |
623 ( "<-" calcFunc-assign 51 50 ) | |
624 ( ":=" calcFunc-assign 51 50 ) | |
625 ( "::" calcFunc-condition 45 46 ) | |
626 ( "->" calcFunc-evalto 40 41 ) | |
627 ( "->" calcFunc-evalto 40 -1 ) | |
628 ( "=>" calcFunc-evalto 40 41 ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
629 ( "=>" calcFunc-evalto 40 -1 ))) |
40785 | 630 |
631 (put 'eqn 'math-function-table | |
632 '( ( arc\ cos . calcFunc-arccos ) | |
633 ( arc\ cosh . calcFunc-arccosh ) | |
634 ( arc\ sin . calcFunc-arcsin ) | |
635 ( arc\ sinh . calcFunc-arcsinh ) | |
636 ( arc\ tan . calcFunc-arctan ) | |
637 ( arc\ tanh . calcFunc-arctanh ) | |
638 ( GAMMA . calcFunc-gamma ) | |
639 ( phi . calcFunc-totient ) | |
640 ( mu . calcFunc-moebius ) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
641 ( matrix . (math-parse-eqn-matrix) ))) |
40785 | 642 |
643 (put 'eqn 'math-variable-table | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
644 '( ( inf . var-uinf ))) |
40785 | 645 |
646 (put 'eqn 'math-complex-format 'i) | |
647 | |
648 (defun math-parse-eqn-matrix (f sym) | |
649 (let ((vec nil)) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
650 (while (assoc math-expr-data '(("ccol") ("lcol") ("rcol"))) |
40785 | 651 (math-read-token) |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
652 (or (equal math-expr-data calc-function-open) |
40785 | 653 (throw 'syntax "Expected `{'")) |
654 (math-read-token) | |
655 (setq vec (cons (cons 'vec (math-read-expr-list)) vec)) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
656 (or (equal math-expr-data calc-function-close) |
40785 | 657 (throw 'syntax "Expected `}'")) |
658 (math-read-token)) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
659 (or (equal math-expr-data calc-function-close) |
40785 | 660 (throw 'syntax "Expected `}'")) |
661 (math-read-token) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
662 (math-transpose (cons 'vec (nreverse vec))))) |
40785 | 663 |
664 (defun math-parse-eqn-prime (x sym) | |
665 (if (eq (car-safe x) 'var) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
666 (if (equal math-expr-data calc-function-open) |
40785 | 667 (progn |
668 (math-read-token) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
669 (let ((args (if (or (equal math-expr-data calc-function-close) |
58134
3089957051ea
(math-parse-tex-sum): Use declared variable math-exp-old-pos.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58107
diff
changeset
|
670 (eq math-exp-token 'end)) |
40785 | 671 nil |
672 (math-read-expr-list)))) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
673 (if (not (or (equal math-expr-data calc-function-close) |
58134
3089957051ea
(math-parse-tex-sum): Use declared variable math-exp-old-pos.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58107
diff
changeset
|
674 (eq math-exp-token 'end))) |
40785 | 675 (throw 'syntax "Expected `)'")) |
676 (math-read-token) | |
677 (cons (intern (format "calcFunc-%s'" (nth 1 x))) args))) | |
678 (list 'var | |
679 (intern (concat (symbol-name (nth 1 x)) "'")) | |
680 (intern (concat (symbol-name (nth 2 x)) "'")))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
681 (list 'calcFunc-Prime x))) |
40785 | 682 |
683 | |
684 (defun calc-mathematica-language () | |
685 (interactive) | |
686 (calc-wrapper | |
687 (calc-set-language 'math) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
688 (message "Mathematica language mode"))) |
40785 | 689 |
690 (put 'math 'math-oper-table | |
691 '( ( "[[" (math-read-math-subscr) 250 -1 ) | |
692 ( "!" calcFunc-fact 210 -1 ) | |
693 ( "!!" calcFunc-dfact 210 -1 ) | |
694 ( "^" ^ 201 200 ) | |
695 ( "u+" ident -1 197 ) | |
696 ( "u-" neg -1 197 ) | |
697 ( "/" / 195 196 ) | |
698 ( "*" * 190 191 ) | |
699 ( "2x" * 190 191 ) | |
700 ( "+" + 180 181 ) | |
701 ( "-" - 180 181 ) | |
702 ( "<" calcFunc-lt 160 161 ) | |
703 ( ">" calcFunc-gt 160 161 ) | |
704 ( "<=" calcFunc-leq 160 161 ) | |
705 ( ">=" calcFunc-geq 160 161 ) | |
706 ( "==" calcFunc-eq 150 151 ) | |
707 ( "!=" calcFunc-neq 150 151 ) | |
708 ( "u!" calcFunc-lnot -1 121 ) | |
709 ( "&&" calcFunc-land 110 111 ) | |
710 ( "||" calcFunc-lor 100 101 ) | |
711 ( "!!!" calcFunc-pnot -1 85 ) | |
712 ( "&&&" calcFunc-pand 80 81 ) | |
713 ( "|||" calcFunc-por 75 76 ) | |
714 ( ":=" calcFunc-assign 51 50 ) | |
715 ( "=" calcFunc-assign 51 50 ) | |
716 ( "->" calcFunc-assign 51 50 ) | |
717 ( ":>" calcFunc-assign 51 50 ) | |
718 ( "::" calcFunc-condition 45 46 ) | |
719 )) | |
720 | |
721 (put 'math 'math-function-table | |
722 '( ( Abs . calcFunc-abs ) | |
723 ( ArcCos . calcFunc-arccos ) | |
724 ( ArcCosh . calcFunc-arccosh ) | |
725 ( ArcSin . calcFunc-arcsin ) | |
726 ( ArcSinh . calcFunc-arcsinh ) | |
727 ( ArcTan . calcFunc-arctan ) | |
728 ( ArcTanh . calcFunc-arctanh ) | |
729 ( Arg . calcFunc-arg ) | |
730 ( Binomial . calcFunc-choose ) | |
731 ( Ceiling . calcFunc-ceil ) | |
732 ( Conjugate . calcFunc-conj ) | |
733 ( Cos . calcFunc-cos ) | |
734 ( Cosh . calcFunc-cosh ) | |
61069
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
735 ( Cot . calcFunc-cot ) |
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
736 ( Coth . calcFunc-coth ) |
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
737 ( Csc . calcFunc-csc ) |
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
738 ( Csch . calcFunc-csch ) |
40785 | 739 ( D . calcFunc-deriv ) |
740 ( Dt . calcFunc-tderiv ) | |
741 ( Det . calcFunc-det ) | |
742 ( Exp . calcFunc-exp ) | |
743 ( EulerPhi . calcFunc-totient ) | |
744 ( Floor . calcFunc-floor ) | |
745 ( Gamma . calcFunc-gamma ) | |
746 ( GCD . calcFunc-gcd ) | |
747 ( If . calcFunc-if ) | |
748 ( Im . calcFunc-im ) | |
749 ( Inverse . calcFunc-inv ) | |
750 ( Integrate . calcFunc-integ ) | |
751 ( Join . calcFunc-vconcat ) | |
752 ( LCM . calcFunc-lcm ) | |
753 ( Log . calcFunc-ln ) | |
754 ( Max . calcFunc-max ) | |
755 ( Min . calcFunc-min ) | |
756 ( Mod . calcFunc-mod ) | |
757 ( MoebiusMu . calcFunc-moebius ) | |
758 ( Random . calcFunc-random ) | |
759 ( Round . calcFunc-round ) | |
760 ( Re . calcFunc-re ) | |
61069
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
761 ( Sec . calcFunc-sec ) |
803f4b2d0113
Add functions to math-function-table properties of tex and math.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59966
diff
changeset
|
762 ( Sech . calcFunc-sech ) |
40785 | 763 ( Sign . calcFunc-sign ) |
764 ( Sin . calcFunc-sin ) | |
765 ( Sinh . calcFunc-sinh ) | |
766 ( Sqrt . calcFunc-sqrt ) | |
767 ( Tan . calcFunc-tan ) | |
768 ( Tanh . calcFunc-tanh ) | |
769 ( Transpose . calcFunc-trn ) | |
770 ( Length . calcFunc-vlen ) | |
771 )) | |
772 | |
773 (put 'math 'math-variable-table | |
774 '( ( I . var-i ) | |
775 ( Pi . var-pi ) | |
776 ( E . var-e ) | |
777 ( GoldenRatio . var-phi ) | |
778 ( EulerGamma . var-gamma ) | |
779 ( Infinity . var-inf ) | |
780 ( ComplexInfinity . var-uinf ) | |
781 ( Indeterminate . var-nan ) | |
782 )) | |
783 | |
784 (put 'math 'math-vector-brackets "{}") | |
785 (put 'math 'math-complex-format 'I) | |
786 (put 'math 'math-function-open "[") | |
787 (put 'math 'math-function-close "]") | |
788 | |
789 (put 'math 'math-radix-formatter | |
790 (function (lambda (r s) (format "%d^^%s" r s)))) | |
791 | |
792 (defun math-read-math-subscr (x op) | |
793 (let ((idx (math-read-expr-level 0))) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
794 (or (and (equal math-expr-data "]") |
40785 | 795 (progn |
796 (math-read-token) | |
58107
cfad3432f125
(math-parse-fortran-vector, math-parse-fortran-vector-end,
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
797 (equal math-expr-data "]"))) |
40785 | 798 (throw 'syntax "Expected ']]'")) |
799 (math-read-token) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
800 (list 'calcFunc-subscr x idx))) |
40785 | 801 |
802 | |
803 (defun calc-maple-language () | |
804 (interactive) | |
805 (calc-wrapper | |
806 (calc-set-language 'maple) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
807 (message "Maple language mode"))) |
40785 | 808 |
809 (put 'maple 'math-oper-table | |
810 '( ( "matrix" ident -1 300 ) | |
811 ( "MATRIX" ident -1 300 ) | |
812 ( "!" calcFunc-fact 210 -1 ) | |
813 ( "^" ^ 201 200 ) | |
814 ( "**" ^ 201 200 ) | |
815 ( "u+" ident -1 197 ) | |
816 ( "u-" neg -1 197 ) | |
817 ( "/" / 191 192 ) | |
818 ( "*" * 191 192 ) | |
819 ( "intersect" calcFunc-vint 191 192 ) | |
820 ( "+" + 180 181 ) | |
821 ( "-" - 180 181 ) | |
822 ( "union" calcFunc-vunion 180 181 ) | |
823 ( "minus" calcFunc-vdiff 180 181 ) | |
824 ( "mod" % 170 170 ) | |
825 ( ".." (math-read-maple-dots) 165 165 ) | |
826 ( "\\dots" (math-read-maple-dots) 165 165 ) | |
827 ( "<" calcFunc-lt 160 160 ) | |
828 ( ">" calcFunc-gt 160 160 ) | |
829 ( "<=" calcFunc-leq 160 160 ) | |
830 ( ">=" calcFunc-geq 160 160 ) | |
831 ( "=" calcFunc-eq 160 160 ) | |
832 ( "<>" calcFunc-neq 160 160 ) | |
833 ( "not" calcFunc-lnot -1 121 ) | |
834 ( "and" calcFunc-land 110 111 ) | |
835 ( "or" calcFunc-lor 100 101 ) | |
836 ( "!!!" calcFunc-pnot -1 85 ) | |
837 ( "&&&" calcFunc-pand 80 81 ) | |
838 ( "|||" calcFunc-por 75 76 ) | |
839 ( ":=" calcFunc-assign 51 50 ) | |
840 ( "::" calcFunc-condition 45 46 ) | |
841 )) | |
842 | |
843 (put 'maple 'math-function-table | |
844 '( ( bernoulli . calcFunc-bern ) | |
845 ( binomial . calcFunc-choose ) | |
846 ( diff . calcFunc-deriv ) | |
847 ( GAMMA . calcFunc-gamma ) | |
848 ( ifactor . calcFunc-prfac ) | |
849 ( igcd . calcFunc-gcd ) | |
850 ( ilcm . calcFunc-lcm ) | |
851 ( int . calcFunc-integ ) | |
852 ( modp . % ) | |
853 ( irem . % ) | |
854 ( iquo . calcFunc-idiv ) | |
855 ( isprime . calcFunc-prime ) | |
856 ( length . calcFunc-vlen ) | |
857 ( member . calcFunc-in ) | |
858 ( crossprod . calcFunc-cross ) | |
859 ( inverse . calcFunc-inv ) | |
860 ( trace . calcFunc-tr ) | |
861 ( transpose . calcFunc-trn ) | |
862 ( vectdim . calcFunc-vlen ) | |
863 )) | |
864 | |
865 (put 'maple 'math-variable-table | |
866 '( ( I . var-i ) | |
867 ( Pi . var-pi ) | |
868 ( E . var-e ) | |
869 ( infinity . var-inf ) | |
870 ( infinity . var-uinf ) | |
871 ( infinity . var-nan ) | |
872 )) | |
873 | |
874 (put 'maple 'math-complex-format 'I) | |
875 | |
876 (defun math-read-maple-dots (x op) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
877 (list 'intv 3 x (math-read-expr-level (nth 3 op)))) |
40785 | 878 |
879 | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
880 ;; The variable math-read-big-lines is local to math-read-big-expr in |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
881 ;; calc-ext.el, but is used by math-read-big-rec, math-read-big-char, |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
882 ;; math-read-big-emptyp, math-read-big-error and math-read-big-balance, |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
883 ;; which are called (directly and indirectly) by math-read-big-expr. |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
884 ;; It is also local to math-read-big-bigp in calc-ext.el, which calls |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
885 ;; math-read-big-balance. |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
886 (defvar math-read-big-lines) |
40785 | 887 |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
888 ;; The variables math-read-big-baseline and math-read-big-h2 are |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
889 ;; local to math-read-big-expr in calc-ext.el, but used by |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
890 ;; math-read-big-rec. |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
891 (defvar math-read-big-baseline) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
892 (defvar math-read-big-h2) |
40785 | 893 |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
894 ;; The variables math-rb-h1, math-rb-h2, math-rb-v1 and math-rb-v2 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
895 ;; are local to math-read-big-rec, but are used by math-read-big-char, |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
896 ;; math-read-big-emptyp and math-read-big-balance which are called by |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
897 ;; math-read-big-rec. |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
898 ;; math-rb-h2 is also local to math-read-big-bigp in calc-ext.el, |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
899 ;; which calls math-read-big-balance. |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
900 (defvar math-rb-h1) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
901 (defvar math-rb-h2) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
902 (defvar math-rb-v1) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
903 (defvar math-rb-v2) |
40785 | 904 |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
905 (defun math-read-big-rec (math-rb-h1 math-rb-v1 math-rb-h2 math-rb-v2 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
906 &optional baseline prec short) |
40785 | 907 (or prec (setq prec 0)) |
908 | |
909 ;; Clip whitespace above or below. | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
910 (while (and (< math-rb-v1 math-rb-v2) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
911 (math-read-big-emptyp math-rb-h1 math-rb-v1 math-rb-h2 (1+ math-rb-v1))) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
912 (setq math-rb-v1 (1+ math-rb-v1))) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
913 (while (and (< math-rb-v1 math-rb-v2) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
914 (math-read-big-emptyp math-rb-h1 (1- math-rb-v2) math-rb-h2 math-rb-v2)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
915 (setq math-rb-v2 (1- math-rb-v2))) |
40785 | 916 |
917 ;; If formula is a single line high, normal parser can handle it. | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
918 (if (<= math-rb-v2 (1+ math-rb-v1)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
919 (if (or (<= math-rb-v2 math-rb-v1) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
920 (> math-rb-h1 (length (setq math-rb-v2 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
921 (nth math-rb-v1 math-read-big-lines))))) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
922 (math-read-big-error math-rb-h1 math-rb-v1) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
923 (setq math-read-big-baseline math-rb-v1 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
924 math-read-big-h2 math-rb-h2 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
925 math-rb-v2 (nth math-rb-v1 math-read-big-lines) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
926 math-rb-h2 (math-read-expr |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
927 (substring math-rb-v2 math-rb-h1 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
928 (min math-rb-h2 (length math-rb-v2))))) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
929 (if (eq (car-safe math-rb-h2) 'error) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
930 (math-read-big-error (+ math-rb-h1 (nth 1 math-rb-h2)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
931 math-rb-v1 (nth 2 math-rb-h2)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
932 math-rb-h2)) |
40785 | 933 |
934 ;; Clip whitespace at left or right. | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
935 (while (and (< math-rb-h1 math-rb-h2) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
936 (math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) math-rb-v2)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
937 (setq math-rb-h1 (1+ math-rb-h1))) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
938 (while (and (< math-rb-h1 math-rb-h2) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
939 (math-read-big-emptyp (1- math-rb-h2) math-rb-v1 math-rb-h2 math-rb-v2)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
940 (setq math-rb-h2 (1- math-rb-h2))) |
40785 | 941 |
942 ;; Scan to find widest left-justified "----" in the region. | |
943 (let* ((widest nil) | |
944 (widest-h2 0) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
945 (lines-v1 (nthcdr math-rb-v1 math-read-big-lines)) |
40785 | 946 (p lines-v1) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
947 (v math-rb-v1) |
40785 | 948 (other-v nil) |
949 other-char line len h) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
950 (while (< v math-rb-v2) |
40785 | 951 (setq line (car p) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
952 len (min math-rb-h2 (length line))) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
953 (and (< math-rb-h1 len) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
954 (/= (aref line math-rb-h1) ?\ ) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
955 (if (and (= (aref line math-rb-h1) ?\-) |
40785 | 956 ;; Make sure it's not a minus sign. |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
957 (or (and (< (1+ math-rb-h1) len) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
958 (= (aref line (1+ math-rb-h1)) ?\-)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
959 (/= (math-read-big-char math-rb-h1 (1- v)) ?\ ) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
960 (/= (math-read-big-char math-rb-h1 (1+ v)) ?\ ))) |
40785 | 961 (progn |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
962 (setq h math-rb-h1) |
40785 | 963 (while (and (< (setq h (1+ h)) len) |
964 (= (aref line h) ?\-))) | |
965 (if (> h widest-h2) | |
966 (setq widest v | |
967 widest-h2 h))) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
968 (or other-v (setq other-v v other-char (aref line math-rb-h1))))) |
40785 | 969 (setq v (1+ v) |
970 p (cdr p))) | |
971 | |
972 (cond ((not (setq v other-v)) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
973 (math-read-big-error math-rb-h1 math-rb-v1)) ; Should never happen! |
40785 | 974 |
975 ;; Quotient. | |
976 (widest | |
977 (setq h widest-h2 | |
978 v widest) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
979 (let ((num (math-read-big-rec math-rb-h1 math-rb-v1 h v)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
980 (den (math-read-big-rec math-rb-h1 (1+ v) h math-rb-v2))) |
40785 | 981 (setq p (if (and (math-integerp num) (math-integerp den)) |
982 (math-make-frac num den) | |
983 (list '/ num den))))) | |
984 | |
985 ;; Big radical sign. | |
986 ((= other-char ?\\) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
987 (or (= (math-read-big-char (1+ math-rb-h1) v) ?\|) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
988 (math-read-big-error (1+ math-rb-h1) v "Malformed root sign")) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
989 (math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
990 (while (= (math-read-big-char (1+ math-rb-h1) (setq v (1- v))) ?\|)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
991 (or (= (math-read-big-char (setq h (+ math-rb-h1 2)) v) ?\_) |
40785 | 992 (math-read-big-error h v "Malformed root sign")) |
993 (while (= (math-read-big-char (setq h (1+ h)) v) ?\_)) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
994 (math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
995 (math-read-big-emptyp math-rb-h1 (1+ other-v) h math-rb-v2 nil t) |
40785 | 996 (setq p (list 'calcFunc-sqrt (math-read-big-rec |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
997 (+ math-rb-h1 2) (1+ v) |
40785 | 998 h (1+ other-v) baseline)) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
999 v math-read-big-baseline)) |
40785 | 1000 |
1001 ;; Small radical sign. | |
1002 ((and (= other-char ?V) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1003 (= (math-read-big-char (1+ math-rb-h1) (1- v)) ?\_)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1004 (setq h (1+ math-rb-h1)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1005 (math-read-big-emptyp math-rb-h1 math-rb-v1 h (1- v) nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1006 (math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1007 (math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t) |
40785 | 1008 (while (= (math-read-big-char (setq h (1+ h)) (1- v)) ?\_)) |
1009 (setq p (list 'calcFunc-sqrt (math-read-big-rec | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1010 (1+ math-rb-h1) v h (1+ v) t)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1011 v math-read-big-baseline)) |
40785 | 1012 |
1013 ;; Binomial coefficient. | |
1014 ((and (= other-char ?\() | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1015 (= (math-read-big-char (1+ math-rb-h1) v) ?\ ) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1016 (= (string-match "( *)" (nth v math-read-big-lines) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1017 math-rb-h1) math-rb-h1)) |
40785 | 1018 (setq h (match-end 0)) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1019 (math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1020 (math-read-big-emptyp math-rb-h1 (1+ v) (1+ math-rb-h1) math-rb-v2 nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1021 (math-read-big-emptyp (1- h) math-rb-v1 h v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1022 (math-read-big-emptyp (1- h) (1+ v) h math-rb-v2 nil t) |
40785 | 1023 (setq p (list 'calcFunc-choose |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1024 (math-read-big-rec (1+ math-rb-h1) math-rb-v1 (1- h) v) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1025 (math-read-big-rec (1+ math-rb-h1) (1+ v) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1026 (1- h) math-rb-v2)))) |
40785 | 1027 |
1028 ;; Minus sign. | |
1029 ((= other-char ?\-) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1030 (setq p (list 'neg (math-read-big-rec (1+ math-rb-h1) math-rb-v1 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1031 math-rb-h2 math-rb-v2 v 250 t)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1032 v math-read-big-baseline |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1033 h math-read-big-h2)) |
40785 | 1034 |
1035 ;; Parentheses. | |
1036 ((= other-char ?\() | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1037 (math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1038 (math-read-big-emptyp math-rb-h1 (1+ v) (1+ math-rb-h1) math-rb-v2 nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1039 (setq h (math-read-big-balance (1+ math-rb-h1) v "(" t)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1040 (math-read-big-emptyp (1- h) math-rb-v1 h v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1041 (math-read-big-emptyp (1- h) (1+ v) h math-rb-v2 nil t) |
40785 | 1042 (let ((sep (math-read-big-char (1- h) v)) |
1043 hmid) | |
1044 (if (= sep ?\.) | |
1045 (setq h (1+ h))) | |
1046 (if (= sep ?\]) | |
1047 (math-read-big-error (1- h) v "Expected `)'")) | |
1048 (if (= sep ?\)) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1049 (setq p (math-read-big-rec |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1050 (1+ math-rb-h1) math-rb-v1 (1- h) math-rb-v2 v)) |
40785 | 1051 (setq hmid (math-read-big-balance h v "(") |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1052 p (list p |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1053 (math-read-big-rec h math-rb-v1 (1- hmid) math-rb-v2 v)) |
40785 | 1054 h hmid) |
1055 (cond ((= sep ?\.) | |
1056 (setq p (cons 'intv (cons (if (= (math-read-big-char | |
1057 (1- h) v) | |
1058 ?\)) | |
1059 0 1) | |
1060 p)))) | |
1061 ((= (math-read-big-char (1- h) v) ?\]) | |
1062 (math-read-big-error (1- h) v "Expected `)'")) | |
1063 ((= sep ?\,) | |
1064 (or (and (math-realp (car p)) (math-realp (nth 1 p))) | |
1065 (math-read-big-error | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1066 math-rb-h1 v "Complex components must be real")) |
40785 | 1067 (setq p (cons 'cplx p))) |
1068 ((= sep ?\;) | |
1069 (or (and (math-realp (car p)) (math-anglep (nth 1 p))) | |
1070 (math-read-big-error | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1071 math-rb-h1 v "Complex components must be real")) |
40785 | 1072 (setq p (cons 'polar p))))))) |
1073 | |
1074 ;; Matrix. | |
1075 ((and (= other-char ?\[) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1076 (or (= (math-read-big-char (setq h math-rb-h1) (1+ v)) ?\[) |
40785 | 1077 (= (math-read-big-char (setq h (1+ h)) v) ?\[) |
1078 (and (= (math-read-big-char h v) ?\ ) | |
1079 (= (math-read-big-char (setq h (1+ h)) v) ?\[))) | |
1080 (= (math-read-big-char h (1+ v)) ?\[)) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1081 (math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t) |
40785 | 1082 (let ((vtop v) |
1083 (hleft h) | |
1084 (hright nil)) | |
1085 (setq p nil) | |
1086 (while (progn | |
1087 (setq h (math-read-big-balance (1+ hleft) v "[")) | |
1088 (if hright | |
1089 (or (= h hright) | |
1090 (math-read-big-error hright v "Expected `]'")) | |
1091 (setq hright h)) | |
1092 (setq p (cons (math-read-big-rec | |
1093 hleft v h (1+ v)) p)) | |
1094 (and (memq (math-read-big-char h v) '(?\ ?\,)) | |
1095 (= (math-read-big-char hleft (1+ v)) ?\[))) | |
1096 (setq v (1+ v))) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1097 (or (= hleft math-rb-h1) |
40785 | 1098 (progn |
1099 (if (= (math-read-big-char h v) ?\ ) | |
1100 (setq h (1+ h))) | |
1101 (and (= (math-read-big-char h v) ?\]) | |
1102 (setq h (1+ h)))) | |
1103 (math-read-big-error (1- h) v "Expected `]'")) | |
1104 (if (= (math-read-big-char h vtop) ?\,) | |
1105 (setq h (1+ h))) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1106 (math-read-big-emptyp math-rb-h1 (1+ v) (1- h) math-rb-v2 nil t) |
40785 | 1107 (setq v (+ vtop (/ (- v vtop) 2)) |
1108 p (cons 'vec (nreverse p))))) | |
1109 | |
1110 ;; Square brackets. | |
1111 ((= other-char ?\[) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1112 (math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1113 (math-read-big-emptyp math-rb-h1 (1+ v) (1+ math-rb-h1) math-rb-v2 nil t) |
40785 | 1114 (setq p nil |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1115 h (1+ math-rb-h1)) |
40785 | 1116 (while (progn |
1117 (setq widest (math-read-big-balance h v "[" t)) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1118 (math-read-big-emptyp (1- h) math-rb-v1 h v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1119 (math-read-big-emptyp (1- h) (1+ v) h math-rb-v2 nil t) |
40785 | 1120 (setq p (cons (math-read-big-rec |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1121 h math-rb-v1 (1- widest) math-rb-v2 v) p) |
40785 | 1122 h widest) |
1123 (= (math-read-big-char (1- h) v) ?\,))) | |
1124 (setq widest (math-read-big-char (1- h) v)) | |
1125 (if (or (memq widest '(?\; ?\))) | |
1126 (and (eq widest ?\.) (cdr p))) | |
1127 (math-read-big-error (1- h) v "Expected `]'")) | |
1128 (if (= widest ?\.) | |
1129 (setq h (1+ h) | |
1130 widest (math-read-big-balance h v "[") | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1131 p (nconc p (list (math-read-big-rec |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1132 h math-rb-v1 (1- widest) math-rb-v2 v))) |
40785 | 1133 h widest |
1134 p (cons 'intv (cons (if (= (math-read-big-char (1- h) v) | |
1135 ?\]) | |
1136 3 2) | |
1137 p))) | |
1138 (setq p (cons 'vec (nreverse p))))) | |
1139 | |
1140 ;; Date form. | |
1141 ((= other-char ?\<) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1142 (setq line (nth v math-read-big-lines)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1143 (string-match ">" line math-rb-h1) |
40785 | 1144 (setq h (match-end 0)) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1145 (math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1146 (math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1147 (setq p (math-read-big-rec math-rb-h1 v h (1+ v) v))) |
40785 | 1148 |
1149 ;; Variable name or function call. | |
1150 ((or (and (>= other-char ?a) (<= other-char ?z)) | |
1151 (and (>= other-char ?A) (<= other-char ?Z))) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1152 (setq line (nth v math-read-big-lines)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1153 (string-match "\\([a-zA-Z'_]+\\) *" line math-rb-h1) |
40785 | 1154 (setq h (match-end 1) |
1155 widest (match-end 0) | |
1156 p (math-match-substring line 1)) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1157 (math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1158 (math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t) |
40785 | 1159 (if (= (math-read-big-char widest v) ?\() |
1160 (progn | |
1161 (setq line (if (string-match "-" p) | |
1162 (intern p) | |
1163 (intern (concat "calcFunc-" p))) | |
1164 h (1+ widest) | |
1165 p nil) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1166 (math-read-big-emptyp widest math-rb-v1 h v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1167 (math-read-big-emptyp widest (1+ v) h math-rb-v2 nil t) |
40785 | 1168 (while (progn |
1169 (setq widest (math-read-big-balance h v "(" t)) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1170 (math-read-big-emptyp (1- h) math-rb-v1 h v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1171 (math-read-big-emptyp (1- h) (1+ v) h math-rb-v2 nil t) |
40785 | 1172 (setq p (cons (math-read-big-rec |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1173 h math-rb-v1 (1- widest) math-rb-v2 v) p) |
40785 | 1174 h widest) |
1175 (= (math-read-big-char (1- h) v) ?\,))) | |
1176 (or (= (math-read-big-char (1- h) v) ?\)) | |
1177 (math-read-big-error (1- h) v "Expected `)'")) | |
1178 (setq p (cons line (nreverse p)))) | |
1179 (setq p (list 'var | |
1180 (intern (math-remove-dashes p)) | |
1181 (if (string-match "-" p) | |
1182 (intern p) | |
1183 (intern (concat "var-" p))))))) | |
1184 | |
1185 ;; Number. | |
1186 (t | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1187 (setq line (nth v math-read-big-lines)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1188 (or (= (string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' *\\)?\\([0-9]+\\(#\\|\\^\\^\\)[0-9a-zA-Z:]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?" line math-rb-h1) math-rb-h1) |
40785 | 1189 (math-read-big-error h v "Expected a number")) |
1190 (setq h (match-end 0) | |
1191 p (math-read-number (math-match-substring line 0))) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1192 (math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1193 (math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t))) |
40785 | 1194 |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1195 ;; Now left term is bounded by math-rb-h1, math-rb-v1, h, math-rb-v2; |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1196 ;; baseline = v. |
40785 | 1197 (if baseline |
1198 (or (= v baseline) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1199 (math-read-big-error math-rb-h1 v "Inconsistent baseline in formula")) |
40785 | 1200 (setq baseline v)) |
1201 | |
1202 ;; Look for superscripts or subscripts. | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1203 (setq line (nth baseline math-read-big-lines) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1204 len (min math-rb-h2 (length line)) |
40785 | 1205 widest h) |
1206 (while (and (< widest len) | |
1207 (= (aref line widest) ?\ )) | |
1208 (setq widest (1+ widest))) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1209 (and (>= widest len) (setq widest math-rb-h2)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1210 (if (math-read-big-emptyp h v widest math-rb-v2) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1211 (if (math-read-big-emptyp h math-rb-v1 widest v) |
40785 | 1212 (setq h widest) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1213 (setq p (list '^ p (math-read-big-rec h math-rb-v1 widest v)) |
40785 | 1214 h widest)) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1215 (if (math-read-big-emptyp h math-rb-v1 widest v) |
40785 | 1216 (setq p (list 'calcFunc-subscr p |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1217 (math-read-big-rec h v widest math-rb-v2)) |
40785 | 1218 h widest))) |
1219 | |
1220 ;; Look for an operator name and grab additional terms. | |
1221 (while (and (< h len) | |
1222 (if (setq widest (and (math-read-big-emptyp | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1223 h math-rb-v1 (1+ h) v) |
40785 | 1224 (math-read-big-emptyp |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1225 h (1+ v) (1+ h) math-rb-v2) |
40785 | 1226 (string-match "<=\\|>=\\|\\+/-\\|!=\\|&&\\|||\\|:=\\|=>\\|." line h) |
1227 (assoc (math-match-substring line 0) | |
1228 math-standard-opers))) | |
1229 (and (>= (nth 2 widest) prec) | |
1230 (setq h (match-end 0))) | |
1231 (and (not (eq (string-match ",\\|;\\|\\.\\.\\|)\\|\\]\\|:" line h) | |
1232 h)) | |
1233 (setq widest '("2x" * 196 195))))) | |
1234 (cond ((eq (nth 3 widest) -1) | |
1235 (setq p (list (nth 1 widest) p))) | |
1236 ((equal (car widest) "?") | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1237 (let ((y (math-read-big-rec h math-rb-v1 math-rb-h2 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1238 math-rb-v2 baseline nil t))) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1239 (or (= (math-read-big-char math-read-big-h2 baseline) ?\:) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1240 (math-read-big-error math-read-big-h2 baseline "Expected `:'")) |
40785 | 1241 (setq p (list (nth 1 widest) p y |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1242 (math-read-big-rec |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1243 (1+ math-read-big-h2) math-rb-v1 math-rb-h2 math-rb-v2 |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1244 baseline (nth 3 widest) t)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1245 h math-read-big-h2))) |
40785 | 1246 (t |
1247 (setq p (list (nth 1 widest) p | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1248 (math-read-big-rec h math-rb-v1 math-rb-h2 math-rb-v2 |
40785 | 1249 baseline (nth 3 widest) t)) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1250 h math-read-big-h2)))) |
40785 | 1251 |
1252 ;; Return all relevant information to caller. | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1253 (setq math-read-big-baseline baseline |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1254 math-read-big-h2 h) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1255 (or short (= math-read-big-h2 math-rb-h2) |
40785 | 1256 (math-read-big-error h baseline)) |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1257 p))) |
40785 | 1258 |
1259 (defun math-read-big-char (h v) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1260 (or (and (>= h math-rb-h1) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1261 (< h math-rb-h2) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1262 (>= v math-rb-v1) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1263 (< v math-rb-v2) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1264 (let ((line (nth v math-read-big-lines))) |
40785 | 1265 (and line |
1266 (< h (length line)) | |
1267 (aref line h)))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1268 ?\ )) |
40785 | 1269 |
1270 (defun math-read-big-emptyp (eh1 ev1 eh2 ev2 &optional what error) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1271 (and (< ev1 math-rb-v1) (setq ev1 math-rb-v1)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1272 (and (< eh1 math-rb-h1) (setq eh1 math-rb-h1)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1273 (and (> ev2 math-rb-v2) (setq ev2 math-rb-v2)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1274 (and (> eh2 math-rb-h2) (setq eh2 math-rb-h2)) |
40785 | 1275 (or what (setq what ?\ )) |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1276 (let ((p (nthcdr ev1 math-read-big-lines)) |
40785 | 1277 h) |
1278 (while (and (< ev1 ev2) | |
1279 (progn | |
1280 (setq h (min eh2 (length (car p)))) | |
1281 (while (and (>= (setq h (1- h)) eh1) | |
1282 (= (aref (car p) h) what))) | |
1283 (and error (>= h eh1) | |
1284 (math-read-big-error h ev1 (if (stringp error) | |
1285 error | |
1286 "Whitespace expected"))) | |
1287 (< h eh1))) | |
1288 (setq ev1 (1+ ev1) | |
1289 p (cdr p))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1290 (>= ev1 ev2))) |
40785 | 1291 |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1292 ;; math-read-big-err-msg is local to math-read-big-expr in calc-ext.el, |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1293 ;; but is used by math-read-big-error which is called (indirectly) by |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1294 ;; math-read-big-expr. |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1295 (defvar math-read-big-err-msg) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1296 |
40785 | 1297 (defun math-read-big-error (h v &optional msg) |
1298 (let ((pos 0) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1299 (p math-read-big-lines)) |
40785 | 1300 (while (> v 0) |
1301 (setq pos (+ pos 1 (length (car p))) | |
1302 p (cdr p) | |
1303 v (1- v))) | |
1304 (setq h (+ pos (min h (length (car p)))) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1305 math-read-big-err-msg (list 'error h (or msg "Syntax error"))) |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1306 (throw 'syntax nil))) |
40785 | 1307 |
1308 (defun math-read-big-balance (h v what &optional commas) | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1309 (let* ((line (nth v math-read-big-lines)) |
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1310 (len (min math-rb-h2 (length line))) |
40785 | 1311 (count 1)) |
1312 (while (> count 0) | |
1313 (if (>= h len) | |
1314 (if what | |
58411
9ceda393e263
(math-read-big-lines): New variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58134
diff
changeset
|
1315 (math-read-big-error nil v (format "Unmatched `%s'" what)) |
40785 | 1316 (setq count 0)) |
1317 (if (memq (aref line h) '(?\( ?\[)) | |
1318 (setq count (1+ count)) | |
1319 (if (if (and commas (= count 1)) | |
1320 (or (memq (aref line h) '(?\) ?\] ?\, ?\;)) | |
1321 (and (eq (aref line h) ?\.) | |
1322 (< (1+ h) len) | |
1323 (eq (aref line (1+ h)) ?\.))) | |
1324 (memq (aref line h) '(?\) ?\]))) | |
1325 (setq count (1- count)))) | |
1326 (setq h (1+ h)))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1327 h)) |
40785 | 1328 |
58661
10224395a3c2
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58571
diff
changeset
|
1329 (provide 'calc-lang) |
10224395a3c2
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58571
diff
changeset
|
1330 |
52401 | 1331 ;;; arch-tag: 483bfe15-f290-4fef-bb7d-ce65be687f2e |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1332 ;;; calc-lang.el ends here |