2001-11-19 07:44:56 +00:00
|
|
|
|
;;; calc-lang.el --- calc language functions
|
|
|
|
|
|
2015-01-01 14:26:41 -08:00
|
|
|
|
;; Copyright (C) 1990-1993, 2001-2015 Free Software Foundation, Inc.
|
2001-11-19 07:44:56 +00:00
|
|
|
|
|
|
|
|
|
;; Author: David Gillespie <daveg@synaptics.com>
|
2007-04-23 21:30:42 +00:00
|
|
|
|
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 03:16:00 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2007-03-19 20:59:53 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:16:00 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2007-03-19 20:59:53 +00:00
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2007-03-19 20:59:53 +00:00
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:16:00 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2001-11-19 07:44:56 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; This file is autoloaded from calc-ext.el.
|
|
|
|
|
|
2004-11-30 17:14:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(require 'calc-macs)
|
|
|
|
|
|
2007-11-27 04:05:19 +00:00
|
|
|
|
|
|
|
|
|
;; Declare functions which are defined elsewhere.
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(declare-function math-compose-vector "calccomp" (a sep prec))
|
2007-12-02 20:00:58 +00:00
|
|
|
|
(declare-function math-compose-var "calccomp" (a))
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(declare-function math-tex-expr-is-flat "calccomp" (a))
|
2007-11-27 04:05:19 +00:00
|
|
|
|
(declare-function math-read-factor "calc-aent" ())
|
|
|
|
|
(declare-function math-read-expr-level "calc-aent" (exp-prec &optional exp-term))
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
;; Declare variables which are defined elsewhere.
|
|
|
|
|
(defvar calc-lang-slash-idiv)
|
|
|
|
|
(defvar calc-lang-allow-underscores)
|
2007-12-26 16:04:51 +00:00
|
|
|
|
(defvar calc-lang-allow-percentsigns)
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(defvar math-comp-left-bracket)
|
|
|
|
|
(defvar math-comp-right-bracket)
|
|
|
|
|
(defvar math-comp-comma)
|
|
|
|
|
(defvar math-comp-vector-prec)
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
;;; Alternate entry/display languages.
|
|
|
|
|
|
|
|
|
|
(defun calc-set-language (lang &optional option no-refresh)
|
2007-06-20 04:15:12 +00:00
|
|
|
|
(setq math-expr-opers (or (get lang 'math-oper-table) (math-standard-ops))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
math-expr-function-mapping (get lang 'math-function-table)
|
|
|
|
|
math-expr-variable-mapping (get lang 'math-variable-table)
|
|
|
|
|
calc-language-input-filter (get lang 'math-input-filter)
|
|
|
|
|
calc-language-output-filter (get lang 'math-output-filter)
|
|
|
|
|
calc-vector-brackets (or (get lang 'math-vector-brackets) "[]")
|
|
|
|
|
calc-complex-format (get lang 'math-complex-format)
|
|
|
|
|
calc-radix-formatter (get lang 'math-radix-formatter)
|
|
|
|
|
calc-function-open (or (get lang 'math-function-open) "(")
|
|
|
|
|
calc-function-close (or (get lang 'math-function-close) ")"))
|
|
|
|
|
(if no-refresh
|
|
|
|
|
(setq calc-language lang
|
|
|
|
|
calc-language-option option)
|
|
|
|
|
(calc-change-mode '(calc-language calc-language-option)
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(list lang option) t)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-normal-language ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language nil)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(message "Normal language mode")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-flat-language ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'flat)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(message "Flat language mode (all stack entries shown on one line)")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-big-language ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'big)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(message "\"Big\" language mode")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-unformatted-language ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'unform)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(message "Unformatted language mode")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun calc-c-language ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'c)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(message "‘C’ language mode")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'c 'math-oper-table
|
2007-10-27 20:25:45 +00:00
|
|
|
|
'( ( "u!" calcFunc-lnot -1 1000 )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( "~" calcFunc-not -1 1000 )
|
2007-10-27 20:25:45 +00:00
|
|
|
|
( "u+" ident -1 197 )
|
|
|
|
|
( "u-" neg -1 197 )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( "*" * 190 191 )
|
|
|
|
|
( "/" / 190 191 )
|
|
|
|
|
( "%" % 190 191 )
|
|
|
|
|
( "+" + 180 181 )
|
|
|
|
|
( "-" - 180 181 )
|
|
|
|
|
( "<<" calcFunc-lsh 170 171 )
|
|
|
|
|
( ">>" calcFunc-rsh 170 171 )
|
|
|
|
|
( "<" calcFunc-lt 160 161 )
|
|
|
|
|
( ">" calcFunc-gt 160 161 )
|
|
|
|
|
( "<=" calcFunc-leq 160 161 )
|
|
|
|
|
( ">=" calcFunc-geq 160 161 )
|
|
|
|
|
( "==" calcFunc-eq 150 151 )
|
|
|
|
|
( "!=" calcFunc-neq 150 151 )
|
|
|
|
|
( "&" calcFunc-and 140 141 )
|
|
|
|
|
( "^" calcFunc-xor 131 130 )
|
|
|
|
|
( "|" calcFunc-or 120 121 )
|
|
|
|
|
( "&&" calcFunc-land 110 111 )
|
|
|
|
|
( "||" calcFunc-lor 100 101 )
|
|
|
|
|
( "?" (math-read-if) 91 90 )
|
|
|
|
|
( "!!!" calcFunc-pnot -1 88 )
|
|
|
|
|
( "&&&" calcFunc-pand 85 86 )
|
|
|
|
|
( "|||" calcFunc-por 75 76 )
|
|
|
|
|
( "=" calcFunc-assign 51 50 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )
|
2001-11-14 09:09:09 +00:00
|
|
|
|
( "::" calcFunc-condition 45 46 ))) ; should support full assignments
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'c 'math-function-table
|
|
|
|
|
'( ( acos . calcFunc-arccos )
|
|
|
|
|
( acosh . calcFunc-arccosh )
|
|
|
|
|
( asin . calcFunc-arcsin )
|
|
|
|
|
( asinh . calcFunc-arcsinh )
|
|
|
|
|
( atan . calcFunc-arctan )
|
2012-05-18 10:16:23 -05:00
|
|
|
|
( atan2 . calcFunc-arctan2 )
|
|
|
|
|
( atanh . calcFunc-arctanh )
|
|
|
|
|
( fma . (math-C-parse-fma))
|
|
|
|
|
( fmax . calcFunc-max )
|
|
|
|
|
( j0 . (math-C-parse-bess))
|
|
|
|
|
( jn . calcFunc-besJ )
|
|
|
|
|
( j1 . (math-C-parse-bess))
|
|
|
|
|
( yn . calcFunc-besY )
|
|
|
|
|
( y0 . (math-C-parse-bess))
|
|
|
|
|
( y1 . (math-C-parse-bess))
|
|
|
|
|
( tgamma . calcFunc-gamma )))
|
|
|
|
|
|
|
|
|
|
(defun math-C-parse-bess (f val)
|
|
|
|
|
"Parse C's j0, j1, y0, y1 functions."
|
|
|
|
|
(let ((args (math-read-expr-list)))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(append
|
|
|
|
|
(cond ((eq val 'j0) '(calcFunc-besJ 0))
|
|
|
|
|
((eq val 'j1) '(calcFunc-besJ 1))
|
|
|
|
|
((eq val 'y0) '(calcFunc-besY 0))
|
|
|
|
|
((eq val 'y1) '(calcFunc-besY 1)))
|
|
|
|
|
args)))
|
|
|
|
|
|
|
|
|
|
(defun math-C-parse-fma (f val)
|
|
|
|
|
"Parse C's fma function fma(x,y,z) => (x * y + z)."
|
|
|
|
|
(let ((args (math-read-expr-list)))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(list 'calcFunc-add
|
|
|
|
|
(list 'calcFunc-mul
|
|
|
|
|
(nth 0 args)
|
|
|
|
|
(nth 1 args))
|
|
|
|
|
(nth 2 args))))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'c 'math-variable-table
|
|
|
|
|
'( ( M_PI . var-pi )
|
2001-11-14 09:09:09 +00:00
|
|
|
|
( M_E . var-e )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'c 'math-vector-brackets "{}")
|
|
|
|
|
|
|
|
|
|
(put 'c 'math-radix-formatter
|
|
|
|
|
(function (lambda (r s)
|
|
|
|
|
(if (= r 16) (format "0x%s" s)
|
|
|
|
|
(if (= r 8) (format "0%s" s)
|
|
|
|
|
(format "%d#%s" r s))))))
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'c 'math-compose-subscr
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(let ((args (cdr (cdr a))))
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 1 a) 1000)
|
|
|
|
|
"["
|
|
|
|
|
(math-compose-vector args ", " 0)
|
|
|
|
|
"]")))))
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-slash-idiv 'c)
|
|
|
|
|
(add-to-list 'calc-lang-allow-underscores 'c)
|
|
|
|
|
(add-to-list 'calc-lang-c-type-hex 'c)
|
|
|
|
|
(add-to-list 'calc-lang-brackets-are-subscripts 'c)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-pascal-language (n)
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(and n (setq n (prefix-numeric-value n)))
|
|
|
|
|
(calc-set-language 'pascal n)
|
|
|
|
|
(message (if (and n (/= n 0))
|
|
|
|
|
(if (> n 0)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
"Pascal language mode (all uppercase)"
|
|
|
|
|
"Pascal language mode (all lowercase)")
|
|
|
|
|
"Pascal language mode"))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'pascal 'math-oper-table
|
|
|
|
|
'( ( "not" calcFunc-lnot -1 1000 )
|
|
|
|
|
( "*" * 190 191 )
|
|
|
|
|
( "/" / 190 191 )
|
|
|
|
|
( "and" calcFunc-and 190 191 )
|
|
|
|
|
( "div" calcFunc-idiv 190 191 )
|
|
|
|
|
( "mod" % 190 191 )
|
|
|
|
|
( "u+" ident -1 185 )
|
|
|
|
|
( "u-" neg -1 185 )
|
|
|
|
|
( "+" + 180 181 )
|
|
|
|
|
( "-" - 180 181 )
|
|
|
|
|
( "or" calcFunc-or 180 181 )
|
|
|
|
|
( "xor" calcFunc-xor 180 181 )
|
|
|
|
|
( "shl" calcFunc-lsh 180 181 )
|
|
|
|
|
( "shr" calcFunc-rsh 180 181 )
|
|
|
|
|
( "in" calcFunc-in 160 161 )
|
|
|
|
|
( "<" calcFunc-lt 160 161 )
|
|
|
|
|
( ">" calcFunc-gt 160 161 )
|
|
|
|
|
( "<=" calcFunc-leq 160 161 )
|
|
|
|
|
( ">=" calcFunc-geq 160 161 )
|
|
|
|
|
( "=" calcFunc-eq 160 161 )
|
|
|
|
|
( "<>" calcFunc-neq 160 161 )
|
|
|
|
|
( "!!!" calcFunc-pnot -1 85 )
|
|
|
|
|
( "&&&" calcFunc-pand 80 81 )
|
|
|
|
|
( "|||" calcFunc-por 75 76 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )
|
2001-11-14 09:09:09 +00:00
|
|
|
|
( "::" calcFunc-condition 45 46 )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'pascal 'math-input-filter 'calc-input-case-filter)
|
|
|
|
|
(put 'pascal 'math-output-filter 'calc-output-case-filter)
|
|
|
|
|
|
|
|
|
|
(put 'pascal 'math-radix-formatter
|
|
|
|
|
(function (lambda (r s)
|
|
|
|
|
(if (= r 16) (format "$%s" s)
|
|
|
|
|
(format "%d#%s" r s)))))
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'pascal 'math-lang-read-symbol
|
|
|
|
|
'((?\$
|
|
|
|
|
(eq (string-match
|
2010-05-14 23:50:25 -05:00
|
|
|
|
"\\(\\$[0-9a-fA-F]+\\)\\($\\|[^0-9a-zA-Zα-ωΑ-Ω]\\)"
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
math-exp-str math-exp-pos)
|
|
|
|
|
math-exp-pos)
|
|
|
|
|
(setq math-exp-token 'number
|
|
|
|
|
math-expr-data (math-match-substring math-exp-str 1)
|
|
|
|
|
math-exp-pos (match-end 1)))))
|
|
|
|
|
|
|
|
|
|
(put 'pascal 'math-compose-subscr
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(let ((args (cdr (cdr a))))
|
|
|
|
|
(while (eq (car-safe (nth 1 a)) 'calcFunc-subscr)
|
|
|
|
|
(setq args (append (cdr (cdr (nth 1 a))) args)
|
|
|
|
|
a (nth 1 a)))
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 1 a) 1000)
|
|
|
|
|
"["
|
|
|
|
|
(math-compose-vector args ", " 0)
|
|
|
|
|
"]")))))
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-allow-underscores 'pascal)
|
|
|
|
|
(add-to-list 'calc-lang-brackets-are-subscripts 'pascal)
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calc-input-case-filter (str)
|
|
|
|
|
(cond ((or (null calc-language-option) (= calc-language-option 0))
|
|
|
|
|
str)
|
|
|
|
|
(t
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(downcase str))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-output-case-filter (str)
|
|
|
|
|
(cond ((or (null calc-language-option) (= calc-language-option 0))
|
|
|
|
|
str)
|
|
|
|
|
((> calc-language-option 0)
|
|
|
|
|
(upcase str))
|
|
|
|
|
(t
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(downcase str))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun calc-fortran-language (n)
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(and n (setq n (prefix-numeric-value n)))
|
|
|
|
|
(calc-set-language 'fortran n)
|
|
|
|
|
(message (if (and n (/= n 0))
|
|
|
|
|
(if (> n 0)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
"FORTRAN language mode (all uppercase)"
|
|
|
|
|
"FORTRAN language mode (all lowercase)")
|
|
|
|
|
"FORTRAN language mode"))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'fortran 'math-oper-table
|
|
|
|
|
'( ( "u/" (math-parse-fortran-vector) -1 1 )
|
|
|
|
|
( "/" (math-parse-fortran-vector-end) 1 -1 )
|
|
|
|
|
( "**" ^ 201 200 )
|
|
|
|
|
( "u+" ident -1 191 )
|
|
|
|
|
( "u-" neg -1 191 )
|
|
|
|
|
( "*" * 190 191 )
|
|
|
|
|
( "/" / 190 191 )
|
|
|
|
|
( "+" + 180 181 )
|
|
|
|
|
( "-" - 180 181 )
|
|
|
|
|
( ".LT." calcFunc-lt 160 161 )
|
|
|
|
|
( ".GT." calcFunc-gt 160 161 )
|
|
|
|
|
( ".LE." calcFunc-leq 160 161 )
|
|
|
|
|
( ".GE." calcFunc-geq 160 161 )
|
|
|
|
|
( ".EQ." calcFunc-eq 160 161 )
|
|
|
|
|
( ".NE." calcFunc-neq 160 161 )
|
|
|
|
|
( ".NOT." calcFunc-lnot -1 121 )
|
|
|
|
|
( ".AND." calcFunc-land 110 111 )
|
|
|
|
|
( ".OR." calcFunc-lor 100 101 )
|
|
|
|
|
( "!!!" calcFunc-pnot -1 85 )
|
|
|
|
|
( "&&&" calcFunc-pand 80 81 )
|
|
|
|
|
( "|||" calcFunc-por 75 76 )
|
|
|
|
|
( "=" calcFunc-assign 51 50 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )
|
2001-11-14 09:09:09 +00:00
|
|
|
|
( "::" calcFunc-condition 45 46 )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'fortran 'math-vector-brackets "//")
|
|
|
|
|
|
|
|
|
|
(put 'fortran 'math-function-table
|
|
|
|
|
'( ( acos . calcFunc-arccos )
|
|
|
|
|
( acosh . calcFunc-arccosh )
|
|
|
|
|
( aimag . calcFunc-im )
|
|
|
|
|
( aint . calcFunc-ftrunc )
|
|
|
|
|
( asin . calcFunc-arcsin )
|
|
|
|
|
( asinh . calcFunc-arcsinh )
|
|
|
|
|
( atan . calcFunc-arctan )
|
|
|
|
|
( atan2 . calcFunc-arctan2 )
|
|
|
|
|
( atanh . calcFunc-arctanh )
|
|
|
|
|
( conjg . calcFunc-conj )
|
|
|
|
|
( log . calcFunc-ln )
|
|
|
|
|
( nint . calcFunc-round )
|
2003-02-04 13:24:35 +00:00
|
|
|
|
( real . calcFunc-re )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'fortran 'math-input-filter 'calc-input-case-filter)
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(put 'fortran 'math-output-filter 'calc-output-case-filter)
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'fortran 'math-lang-read-symbol
|
|
|
|
|
'((?\.
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(eq (string-match "\\.[a-zA-Zα-ωΑ-Ω][a-zA-Zα-ωΑ-Ω][a-zA-Zα-ωΑ-Ω]?\\."
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
math-exp-str math-exp-pos) math-exp-pos)
|
|
|
|
|
(setq math-exp-token 'punc
|
|
|
|
|
math-expr-data (upcase (math-match-substring math-exp-str 0))
|
|
|
|
|
math-exp-pos (match-end 0)))))
|
|
|
|
|
|
|
|
|
|
(put 'fortran 'math-compose-subscr
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(let ((args (cdr (cdr a))))
|
|
|
|
|
(while (eq (car-safe (nth 1 a)) 'calcFunc-subscr)
|
|
|
|
|
(setq args (append (cdr (cdr (nth 1 a))) args)
|
|
|
|
|
a (nth 1 a)))
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 1 a) 1000)
|
|
|
|
|
"("
|
|
|
|
|
(math-compose-vector args ", " 0)
|
|
|
|
|
")")))))
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-slash-idiv 'fortran)
|
|
|
|
|
(add-to-list 'calc-lang-allow-underscores 'fortran)
|
|
|
|
|
(add-to-list 'calc-lang-parens-are-subscripts 'fortran)
|
|
|
|
|
|
2010-06-22 00:41:10 -07:00
|
|
|
|
;; The next few variables are local to math-read-exprs in calc-aent.el
|
2004-11-27 04:10:15 +00:00
|
|
|
|
;; and math-read-expr in calc-ext.el, but are set in functions they call.
|
|
|
|
|
|
|
|
|
|
(defvar math-exp-token)
|
|
|
|
|
(defvar math-expr-data)
|
|
|
|
|
(defvar math-exp-old-pos)
|
|
|
|
|
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(defvar math-parsing-fortran-vector nil)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun math-parse-fortran-vector (op)
|
|
|
|
|
(let ((math-parsing-fortran-vector '(end . "\000")))
|
|
|
|
|
(prog1
|
|
|
|
|
(math-read-brackets t "]")
|
2004-11-11 05:52:17 +00:00
|
|
|
|
(setq math-exp-token (car math-parsing-fortran-vector)
|
2004-11-09 20:32:13 +00:00
|
|
|
|
math-expr-data (cdr math-parsing-fortran-vector)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-parse-fortran-vector-end (x op)
|
|
|
|
|
(if math-parsing-fortran-vector
|
|
|
|
|
(progn
|
2004-11-11 05:52:17 +00:00
|
|
|
|
(setq math-parsing-fortran-vector (cons math-exp-token math-expr-data)
|
|
|
|
|
math-exp-token 'end
|
2004-11-09 20:32:13 +00:00
|
|
|
|
math-expr-data "\000")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
x)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(throw 'syntax "Unmatched closing ‘/’")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-parse-fortran-subscr (sym args)
|
|
|
|
|
(setq sym (math-build-var-name sym))
|
|
|
|
|
(while args
|
|
|
|
|
(setq sym (list 'calcFunc-subscr sym (car args))
|
|
|
|
|
args (cdr args)))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
sym)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun calc-tex-language (n)
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(and n (setq n (prefix-numeric-value n)))
|
|
|
|
|
(calc-set-language 'tex n)
|
2005-02-06 16:21:39 +00:00
|
|
|
|
(cond ((not n)
|
|
|
|
|
(message "TeX language mode"))
|
|
|
|
|
((= n 0)
|
|
|
|
|
(message "TeX language mode with multiline matrices"))
|
|
|
|
|
((= n 1)
|
|
|
|
|
(message "TeX language mode with \\hbox{func}(\\hbox{var})"))
|
|
|
|
|
((> n 1)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(message
|
2005-02-06 16:21:39 +00:00
|
|
|
|
"TeX language mode with \\hbox{func}(\\hbox{var}) and multiline matrices"))
|
|
|
|
|
((= n -1)
|
|
|
|
|
(message "TeX language mode with \\func(\\hbox{var})"))
|
|
|
|
|
((< n -1)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(message
|
2005-02-06 16:21:39 +00:00
|
|
|
|
"TeX language mode with \\func(\\hbox{var}) and multiline matrices")))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2005-01-31 06:25:17 +00:00
|
|
|
|
(defun calc-latex-language (n)
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(and n (setq n (prefix-numeric-value n)))
|
|
|
|
|
(calc-set-language 'latex n)
|
|
|
|
|
(cond ((not n)
|
|
|
|
|
(message "LaTeX language mode"))
|
|
|
|
|
((= n 0)
|
|
|
|
|
(message "LaTeX language mode with multiline matrices"))
|
|
|
|
|
((= n 1)
|
|
|
|
|
(message "LaTeX language mode with \\text{func}(\\text{var})"))
|
|
|
|
|
((> n 1)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(message
|
2005-01-31 06:25:17 +00:00
|
|
|
|
"LaTeX language mode with \\text{func}(\\text{var}) and multiline matrices"))
|
|
|
|
|
((= n -1)
|
|
|
|
|
(message "LaTeX language mode with \\func(\\text{var})"))
|
|
|
|
|
((< n -1)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(message
|
2005-01-31 06:25:17 +00:00
|
|
|
|
"LaTeX language mode with \\func(\\text{var}) and multiline matrices")))))
|
|
|
|
|
|
2007-12-11 04:04:26 +00:00
|
|
|
|
(put 'tex 'math-lang-name "TeX")
|
|
|
|
|
(put 'latex 'math-lang-name "LaTeX")
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(put 'tex 'math-oper-table
|
2007-10-27 20:25:45 +00:00
|
|
|
|
'( ( "\\hat" calcFunc-hat -1 950 )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( "\\check" calcFunc-check -1 950 )
|
|
|
|
|
( "\\tilde" calcFunc-tilde -1 950 )
|
|
|
|
|
( "\\acute" calcFunc-acute -1 950 )
|
|
|
|
|
( "\\grave" calcFunc-grave -1 950 )
|
|
|
|
|
( "\\dot" calcFunc-dot -1 950 )
|
|
|
|
|
( "\\ddot" calcFunc-dotdot -1 950 )
|
|
|
|
|
( "\\breve" calcFunc-breve -1 950 )
|
|
|
|
|
( "\\bar" calcFunc-bar -1 950 )
|
|
|
|
|
( "\\vec" calcFunc-Vec -1 950 )
|
|
|
|
|
( "\\underline" calcFunc-under -1 950 )
|
|
|
|
|
( "u|" calcFunc-abs -1 0 )
|
|
|
|
|
( "|" closing 0 -1 )
|
|
|
|
|
( "\\lfloor" calcFunc-floor -1 0 )
|
|
|
|
|
( "\\rfloor" closing 0 -1 )
|
|
|
|
|
( "\\lceil" calcFunc-ceil -1 0 )
|
|
|
|
|
( "\\rceil" closing 0 -1 )
|
|
|
|
|
( "\\pm" sdev 300 300 )
|
|
|
|
|
( "!" calcFunc-fact 210 -1 )
|
|
|
|
|
( "^" ^ 201 200 )
|
|
|
|
|
( "_" calcFunc-subscr 201 200 )
|
2007-10-27 20:25:45 +00:00
|
|
|
|
( "u+" ident -1 197 )
|
|
|
|
|
( "u-" neg -1 197 )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( "\\times" * 191 190 )
|
|
|
|
|
( "*" * 191 190 )
|
|
|
|
|
( "2x" * 191 190 )
|
|
|
|
|
( "+" + 180 181 )
|
|
|
|
|
( "-" - 180 181 )
|
|
|
|
|
( "\\over" / 170 171 )
|
2007-11-16 04:15:23 +00:00
|
|
|
|
( "/" / 170 171 )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( "\\choose" calcFunc-choose 170 171 )
|
|
|
|
|
( "\\mod" % 170 171 )
|
|
|
|
|
( "<" calcFunc-lt 160 161 )
|
|
|
|
|
( ">" calcFunc-gt 160 161 )
|
|
|
|
|
( "\\leq" calcFunc-leq 160 161 )
|
|
|
|
|
( "\\geq" calcFunc-geq 160 161 )
|
|
|
|
|
( "=" calcFunc-eq 160 161 )
|
|
|
|
|
( "\\neq" calcFunc-neq 160 161 )
|
|
|
|
|
( "\\ne" calcFunc-neq 160 161 )
|
|
|
|
|
( "\\lnot" calcFunc-lnot -1 121 )
|
|
|
|
|
( "\\land" calcFunc-land 110 111 )
|
|
|
|
|
( "\\lor" calcFunc-lor 100 101 )
|
|
|
|
|
( "?" (math-read-if) 91 90 )
|
|
|
|
|
( "!!!" calcFunc-pnot -1 85 )
|
|
|
|
|
( "&&&" calcFunc-pand 80 81 )
|
|
|
|
|
( "|||" calcFunc-por 75 76 )
|
|
|
|
|
( "\\gets" calcFunc-assign 51 50 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )
|
|
|
|
|
( "::" calcFunc-condition 45 46 )
|
|
|
|
|
( "\\to" calcFunc-evalto 40 41 )
|
|
|
|
|
( "\\to" calcFunc-evalto 40 -1 )
|
|
|
|
|
( "=>" calcFunc-evalto 40 41 )
|
2001-11-14 09:09:09 +00:00
|
|
|
|
( "=>" calcFunc-evalto 40 -1 )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'tex 'math-function-table
|
|
|
|
|
'( ( \\arccos . calcFunc-arccos )
|
|
|
|
|
( \\arcsin . calcFunc-arcsin )
|
|
|
|
|
( \\arctan . calcFunc-arctan )
|
|
|
|
|
( \\arg . calcFunc-arg )
|
|
|
|
|
( \\cos . calcFunc-cos )
|
|
|
|
|
( \\cosh . calcFunc-cosh )
|
2005-03-29 04:54:48 +00:00
|
|
|
|
( \\cot . calcFunc-cot )
|
|
|
|
|
( \\coth . calcFunc-coth )
|
|
|
|
|
( \\csc . calcFunc-csc )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( \\det . calcFunc-det )
|
|
|
|
|
( \\exp . calcFunc-exp )
|
|
|
|
|
( \\gcd . calcFunc-gcd )
|
|
|
|
|
( \\ln . calcFunc-ln )
|
|
|
|
|
( \\log . calcFunc-log10 )
|
|
|
|
|
( \\max . calcFunc-max )
|
|
|
|
|
( \\min . calcFunc-min )
|
2005-03-29 04:54:48 +00:00
|
|
|
|
( \\sec . calcFunc-sec )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( \\sin . calcFunc-sin )
|
|
|
|
|
( \\sinh . calcFunc-sinh )
|
|
|
|
|
( \\sqrt . calcFunc-sqrt )
|
2005-03-29 04:54:48 +00:00
|
|
|
|
( \\tan . calcFunc-tan )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( \\tanh . calcFunc-tanh )
|
|
|
|
|
( \\phi . calcFunc-totient )
|
2001-11-14 09:09:09 +00:00
|
|
|
|
( \\mu . calcFunc-moebius )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'tex 'math-special-function-table
|
|
|
|
|
'((calcFunc-sum . (math-compose-tex-sum "\\sum"))
|
|
|
|
|
(calcFunc-prod . (math-compose-tex-sum "\\prod"))
|
2009-01-11 19:14:59 +00:00
|
|
|
|
(calcFunc-sqrt . math-compose-tex-sqrt)
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(intv . math-compose-tex-intv)))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(put 'tex 'math-variable-table
|
2010-06-22 00:41:10 -07:00
|
|
|
|
'(
|
2006-09-22 17:46:21 +00:00
|
|
|
|
;; The Greek letters
|
|
|
|
|
( \\alpha . var-alpha )
|
|
|
|
|
( \\beta . var-beta )
|
|
|
|
|
( \\gamma . var-gamma )
|
|
|
|
|
( \\Gamma . var-Gamma )
|
|
|
|
|
( \\delta . var-delta )
|
|
|
|
|
( \\Delta . var-Delta )
|
|
|
|
|
( \\epsilon . var-epsilon )
|
|
|
|
|
( \\varepsilon . var-varepsilon)
|
|
|
|
|
( \\zeta . var-zeta )
|
|
|
|
|
( \\eta . var-eta )
|
|
|
|
|
( \\theta . var-theta )
|
|
|
|
|
( \\vartheta . var-vartheta )
|
|
|
|
|
( \\Theta . var-Theta )
|
|
|
|
|
( \\iota . var-iota )
|
|
|
|
|
( \\kappa . var-kappa )
|
|
|
|
|
( \\lambda . var-lambda )
|
|
|
|
|
( \\Lambda . var-Lambda )
|
|
|
|
|
( \\mu . var-mu )
|
|
|
|
|
( \\nu . var-nu )
|
|
|
|
|
( \\xi . var-xi )
|
|
|
|
|
( \\Xi . var-Xi )
|
|
|
|
|
( \\pi . var-pi )
|
|
|
|
|
( \\varpi . var-varpi )
|
|
|
|
|
( \\Pi . var-Pi )
|
|
|
|
|
( \\rho . var-rho )
|
|
|
|
|
( \\varrho . var-varrho )
|
|
|
|
|
( \\sigma . var-sigma )
|
|
|
|
|
( \\sigma . var-varsigma )
|
|
|
|
|
( \\Sigma . var-Sigma )
|
|
|
|
|
( \\tau . var-tau )
|
|
|
|
|
( \\upsilon . var-upsilon )
|
|
|
|
|
( \\Upsilon . var-Upsilon )
|
|
|
|
|
( \\phi . var-phi )
|
|
|
|
|
( \\varphi . var-varphi )
|
|
|
|
|
( \\Phi . var-Phi )
|
|
|
|
|
( \\chi . var-chi )
|
|
|
|
|
( \\psi . var-psi )
|
|
|
|
|
( \\Psi . var-Psi )
|
|
|
|
|
( \\omega . var-omega )
|
|
|
|
|
( \\Omega . var-Omega )
|
2010-11-18 19:14:36 -06:00
|
|
|
|
;; Units
|
|
|
|
|
( pt . var-texpt )
|
|
|
|
|
( pc . var-texpc )
|
|
|
|
|
( bp . var-texbp )
|
|
|
|
|
( dd . var-texdd )
|
|
|
|
|
( cc . var-texcc )
|
|
|
|
|
( sp . var-texsp )
|
|
|
|
|
( pint . var-pt )
|
|
|
|
|
( parsec . var-pc)
|
|
|
|
|
|
2006-09-22 17:46:21 +00:00
|
|
|
|
;; Others
|
|
|
|
|
( \\ell . var-ell )
|
|
|
|
|
( \\infty . var-inf )
|
|
|
|
|
( \\infty . var-uinf )
|
|
|
|
|
( \\sum . (math-parse-tex-sum calcFunc-sum) )
|
|
|
|
|
( \\prod . (math-parse-tex-sum calcFunc-prod) )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'tex 'math-punc-table
|
|
|
|
|
'((?\{ . ?\()
|
|
|
|
|
(?\} . ?\))
|
|
|
|
|
(?\& . ?\,)))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(put 'tex 'math-complex-format 'i)
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'tex 'math-input-filter 'math-tex-input-filter)
|
|
|
|
|
|
|
|
|
|
(put 'tex 'math-matrix-formatter
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(if (and (integerp calc-language-option)
|
|
|
|
|
(or (= calc-language-option 0)
|
|
|
|
|
(> calc-language-option 1)
|
|
|
|
|
(< calc-language-option -1)))
|
|
|
|
|
(append '(vleft 0 "\\matrix{")
|
|
|
|
|
(math-compose-tex-matrix (cdr a))
|
|
|
|
|
'("}"))
|
|
|
|
|
(append '(horiz "\\matrix{ ")
|
|
|
|
|
(math-compose-tex-matrix (cdr a))
|
|
|
|
|
'(" }"))))))
|
|
|
|
|
|
|
|
|
|
(put 'tex 'math-var-formatter 'math-compose-tex-var)
|
|
|
|
|
|
|
|
|
|
(put 'tex 'math-func-formatter 'math-compose-tex-func)
|
|
|
|
|
|
|
|
|
|
(put 'tex 'math-dots "\\ldots")
|
|
|
|
|
|
|
|
|
|
(put 'tex 'math-big-parens '("\\left( " . " \\right)"))
|
|
|
|
|
|
|
|
|
|
(put 'tex 'math-evalto '("\\evalto " . " \\to "))
|
|
|
|
|
|
|
|
|
|
(defconst math-tex-ignore-words
|
|
|
|
|
'( ("\\hbox") ("\\mbox") ("\\text") ("\\left") ("\\right")
|
|
|
|
|
("\\,") ("\\>") ("\\:") ("\\;") ("\\!") ("\\ ")
|
|
|
|
|
("\\quad") ("\\qquad") ("\\hfil") ("\\hfill")
|
|
|
|
|
("\\displaystyle") ("\\textstyle") ("\\dsize") ("\\tsize")
|
|
|
|
|
("\\scriptstyle") ("\\scriptscriptstyle") ("\\ssize") ("\\sssize")
|
|
|
|
|
("\\rm") ("\\bf") ("\\it") ("\\sl")
|
|
|
|
|
("\\roman") ("\\bold") ("\\italic") ("\\slanted")
|
|
|
|
|
("\\cal") ("\\mit") ("\\Cal") ("\\Bbb") ("\\frak") ("\\goth")
|
|
|
|
|
("\\evalto")
|
|
|
|
|
("\\matrix" mat) ("\\bmatrix" mat) ("\\pmatrix" mat)
|
|
|
|
|
("\\begin" begenv)
|
|
|
|
|
("\\cr" punc ";") ("\\\\" punc ";") ("\\*" punc "*")
|
|
|
|
|
("\\{" punc "[") ("\\}" punc "]")))
|
|
|
|
|
|
|
|
|
|
(defconst math-latex-ignore-words
|
|
|
|
|
(append math-tex-ignore-words
|
|
|
|
|
'(("\\begin" begenv))))
|
|
|
|
|
|
|
|
|
|
(put 'tex 'math-lang-read-symbol
|
|
|
|
|
'((?\\
|
|
|
|
|
(< math-exp-pos (1- (length math-exp-str)))
|
|
|
|
|
(progn
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(or (string-match "\\\\hbox *{\\([a-zA-Zα-ωΑ-Ω0-9]+\\)}"
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
math-exp-str math-exp-pos)
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(string-match "\\(\\\\\\([a-zA-Zα-ωΑ-Ω]+\\|[^a-zA-Zα-ωΑ-Ω]\\)\\)"
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
math-exp-str math-exp-pos))
|
|
|
|
|
(setq math-exp-token 'symbol
|
|
|
|
|
math-exp-pos (match-end 0)
|
|
|
|
|
math-expr-data (math-restore-dashes
|
|
|
|
|
(math-match-substring math-exp-str 1)))
|
|
|
|
|
(let ((code (assoc math-expr-data math-latex-ignore-words)))
|
|
|
|
|
(cond ((null code))
|
|
|
|
|
((null (cdr code))
|
|
|
|
|
(math-read-token))
|
|
|
|
|
((eq (nth 1 code) 'punc)
|
|
|
|
|
(setq math-exp-token 'punc
|
|
|
|
|
math-expr-data (nth 2 code)))
|
|
|
|
|
((and (eq (nth 1 code) 'mat)
|
|
|
|
|
(string-match " *{" math-exp-str math-exp-pos))
|
|
|
|
|
(setq math-exp-pos (match-end 0)
|
|
|
|
|
math-exp-token 'punc
|
|
|
|
|
math-expr-data "[")
|
|
|
|
|
(let ((right (string-match "}" math-exp-str math-exp-pos)))
|
|
|
|
|
(and right
|
|
|
|
|
(setq math-exp-str (copy-sequence math-exp-str))
|
|
|
|
|
(aset math-exp-str right ?\]))))))))))
|
|
|
|
|
|
|
|
|
|
(defun math-compose-tex-matrix (a &optional ltx)
|
|
|
|
|
(if (cdr a)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(cons (append (math-compose-vector (cdr (car a)) " & " 0)
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(if ltx '(" \\\\ ") '(" \\cr ")))
|
|
|
|
|
(math-compose-tex-matrix (cdr a) ltx))
|
|
|
|
|
(list (math-compose-vector (cdr (car a)) " & " 0))))
|
|
|
|
|
|
|
|
|
|
(defun math-compose-tex-sum (a fn)
|
|
|
|
|
(cond
|
|
|
|
|
((nth 4 a)
|
|
|
|
|
(list 'horiz (nth 1 fn)
|
|
|
|
|
"_{" (math-compose-expr (nth 2 a) 0)
|
|
|
|
|
"=" (math-compose-expr (nth 3 a) 0)
|
|
|
|
|
"}^{" (math-compose-expr (nth 4 a) 0)
|
|
|
|
|
"}{" (math-compose-expr (nth 1 a) 0) "}"))
|
|
|
|
|
((nth 3 a)
|
|
|
|
|
(list 'horiz (nth 1 fn)
|
|
|
|
|
"_{" (math-compose-expr (nth 2 a) 0)
|
|
|
|
|
"=" (math-compose-expr (nth 3 a) 0)
|
|
|
|
|
"}{" (math-compose-expr (nth 1 a) 0) "}"))
|
|
|
|
|
(t
|
|
|
|
|
(list 'horiz (nth 1 fn)
|
|
|
|
|
"_{" (math-compose-expr (nth 2 a) 0)
|
|
|
|
|
"}{" (math-compose-expr (nth 1 a) 0) "}"))))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun math-parse-tex-sum (f val)
|
|
|
|
|
(let (low high save)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(or (equal math-expr-data "_") (throw 'syntax "Expected ‘_’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
2004-11-11 05:52:17 +00:00
|
|
|
|
(setq save math-exp-old-pos)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq low (math-read-factor))
|
|
|
|
|
(or (eq (car-safe low) 'calcFunc-eq)
|
|
|
|
|
(progn
|
2004-11-11 05:52:17 +00:00
|
|
|
|
(setq math-exp-old-pos (1+ save))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(throw 'syntax "Expected equation")))
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(or (equal math-expr-data "^") (throw 'syntax "Expected ‘^’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
|
|
|
|
(setq high (math-read-factor))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(list (nth 2 f) (math-read-factor) (nth 1 low) (nth 2 low) high)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-tex-input-filter (str) ; allow parsing of 123\,456\,789.
|
|
|
|
|
(while (string-match "[0-9]\\\\,[0-9]" str)
|
|
|
|
|
(setq str (concat (substring str 0 (1+ (match-beginning 0)))
|
|
|
|
|
(substring str (1- (match-end 0))))))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
str)
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
|
2009-01-11 19:14:59 +00:00
|
|
|
|
(defun math-compose-tex-sqrt (a)
|
|
|
|
|
(list 'horiz
|
|
|
|
|
"\\sqrt{"
|
|
|
|
|
(math-compose-expr (nth 1 a) 0)
|
|
|
|
|
"}"))
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
|
|
|
|
|
(defun math-compose-tex-intv (a)
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(if (memq (nth 1 a) '(0 1)) "(" "[")
|
|
|
|
|
(math-compose-expr (nth 2 a) 0)
|
|
|
|
|
" \\ldots "
|
|
|
|
|
(math-compose-expr (nth 3 a) 0)
|
|
|
|
|
(if (memq (nth 1 a) '(0 2)) ")" "]")))
|
|
|
|
|
|
2007-12-02 20:00:58 +00:00
|
|
|
|
(defun math-compose-tex-var (a prec)
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(if (and calc-language-option
|
|
|
|
|
(not (= calc-language-option 0))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(string-match "\\`[a-zA-Zα-ωΑ-Ω][a-zA-Zα-ωΑ-Ω0-9]+\\'"
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(symbol-name (nth 1 a))))
|
|
|
|
|
(if (eq calc-language 'latex)
|
|
|
|
|
(format "\\text{%s}" (symbol-name (nth 1 a)))
|
|
|
|
|
(format "\\hbox{%s}" (symbol-name (nth 1 a))))
|
2007-12-02 20:00:58 +00:00
|
|
|
|
(math-compose-var a)))
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
|
|
|
|
|
(defun math-compose-tex-func (func a)
|
|
|
|
|
(let (left right)
|
|
|
|
|
(if (and calc-language-option
|
|
|
|
|
(not (= calc-language-option 0))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(string-match "\\`[a-zA-Zα-ωΑ-Ω][a-zA-Zα-ωΑ-Ω0-9]+\\'" func))
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(if (< (prefix-numeric-value calc-language-option) 0)
|
|
|
|
|
(setq func (format "\\%s" func))
|
|
|
|
|
(setq func (if (eq calc-language 'latex)
|
|
|
|
|
(format "\\text{%s}" func)
|
|
|
|
|
(format "\\hbox{%s}" func)))))
|
|
|
|
|
(cond ((or (> (length a) 2)
|
|
|
|
|
(not (math-tex-expr-is-flat (nth 1 a))))
|
|
|
|
|
(setq left "\\left( "
|
|
|
|
|
right " \\right)"))
|
|
|
|
|
((and (eq (aref func 0) ?\\)
|
|
|
|
|
(not (or
|
|
|
|
|
(string-match "\\hbox{" func)
|
|
|
|
|
(string-match "\\text{" func)))
|
|
|
|
|
(= (length a) 2)
|
|
|
|
|
(or (Math-realp (nth 1 a))
|
|
|
|
|
(memq (car (nth 1 a)) '(var *))))
|
|
|
|
|
(setq left "{" right "}"))
|
|
|
|
|
(t (setq left calc-function-open
|
|
|
|
|
right calc-function-close)))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(list 'horiz func
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
left
|
|
|
|
|
(math-compose-vector (cdr a) ", " 0)
|
|
|
|
|
right)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2005-01-31 06:25:17 +00:00
|
|
|
|
(put 'latex 'math-oper-table
|
2005-01-31 21:53:21 +00:00
|
|
|
|
(append (get 'tex 'math-oper-table)
|
|
|
|
|
'(( "\\Hat" calcFunc-Hat -1 950 )
|
|
|
|
|
( "\\Check" calcFunc-Check -1 950 )
|
|
|
|
|
( "\\Tilde" calcFunc-Tilde -1 950 )
|
|
|
|
|
( "\\Acute" calcFunc-Acute -1 950 )
|
|
|
|
|
( "\\Grave" calcFunc-Grave -1 950 )
|
|
|
|
|
( "\\Dot" calcFunc-Dot -1 950 )
|
|
|
|
|
( "\\Ddot" calcFunc-Dotdot -1 950 )
|
|
|
|
|
( "\\Breve" calcFunc-Breve -1 950 )
|
|
|
|
|
( "\\Bar" calcFunc-Bar -1 950 )
|
|
|
|
|
( "\\Vec" calcFunc-VEC -1 950 )
|
|
|
|
|
( "\\dddot" calcFunc-dddot -1 950 )
|
|
|
|
|
( "\\ddddot" calcFunc-ddddot -1 950 )
|
2007-11-16 04:15:23 +00:00
|
|
|
|
( "\\div" / 170 171 )
|
2005-01-31 21:53:21 +00:00
|
|
|
|
( "\\le" calcFunc-leq 160 161 )
|
|
|
|
|
( "\\leqq" calcFunc-leq 160 161 )
|
|
|
|
|
( "\\leqsland" calcFunc-leq 160 161 )
|
|
|
|
|
( "\\ge" calcFunc-geq 160 161 )
|
|
|
|
|
( "\\geqq" calcFunc-geq 160 161 )
|
|
|
|
|
( "\\geqslant" calcFunc-geq 160 161 )
|
|
|
|
|
( "=" calcFunc-eq 160 161 )
|
|
|
|
|
( "\\neq" calcFunc-neq 160 161 )
|
|
|
|
|
( "\\ne" calcFunc-neq 160 161 )
|
|
|
|
|
( "\\lnot" calcFunc-lnot -1 121 )
|
|
|
|
|
( "\\land" calcFunc-land 110 111 )
|
|
|
|
|
( "\\lor" calcFunc-lor 100 101 )
|
|
|
|
|
( "?" (math-read-if) 91 90 )
|
|
|
|
|
( "!!!" calcFunc-pnot -1 85 )
|
|
|
|
|
( "&&&" calcFunc-pand 80 81 )
|
|
|
|
|
( "|||" calcFunc-por 75 76 )
|
|
|
|
|
( "\\gets" calcFunc-assign 51 50 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )
|
|
|
|
|
( "::" calcFunc-condition 45 46 )
|
|
|
|
|
( "\\to" calcFunc-evalto 40 41 )
|
|
|
|
|
( "\\to" calcFunc-evalto 40 -1 )
|
|
|
|
|
( "=>" calcFunc-evalto 40 41 )
|
|
|
|
|
( "=>" calcFunc-evalto 40 -1 ))))
|
2005-01-31 06:25:17 +00:00
|
|
|
|
|
|
|
|
|
(put 'latex 'math-function-table
|
2005-01-31 21:53:21 +00:00
|
|
|
|
(append
|
|
|
|
|
(get 'tex 'math-function-table)
|
2005-02-04 06:20:52 +00:00
|
|
|
|
'(( \\frac . (math-latex-parse-frac))
|
|
|
|
|
( \\tfrac . (math-latex-parse-frac))
|
|
|
|
|
( \\dfrac . (math-latex-parse-frac))
|
|
|
|
|
( \\binom . (math-latex-parse-two-args calcFunc-choose))
|
|
|
|
|
( \\tbinom . (math-latex-parse-two-args calcFunc-choose))
|
|
|
|
|
( \\dbinom . (math-latex-parse-two-args calcFunc-choose))
|
2005-01-31 21:53:21 +00:00
|
|
|
|
( \\phi . calcFunc-totient )
|
|
|
|
|
( \\mu . calcFunc-moebius ))))
|
2005-01-31 06:25:17 +00:00
|
|
|
|
|
|
|
|
|
(put 'latex 'math-special-function-table
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
'((/ . (math-compose-latex-frac "\\frac"))
|
|
|
|
|
(calcFunc-choose . (math-compose-latex-frac "\\binom"))
|
|
|
|
|
(calcFunc-sum . (math-compose-tex-sum "\\sum"))
|
|
|
|
|
(calcFunc-prod . (math-compose-tex-sum "\\prod"))
|
2009-01-11 19:14:59 +00:00
|
|
|
|
(calcFunc-sqrt . math-compose-tex-sqrt)
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(intv . math-compose-tex-intv)))
|
2005-01-31 06:25:17 +00:00
|
|
|
|
|
|
|
|
|
(put 'latex 'math-variable-table
|
2005-01-31 21:53:21 +00:00
|
|
|
|
(get 'tex 'math-variable-table))
|
2005-01-31 06:25:17 +00:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'latex 'math-punc-table
|
|
|
|
|
'((?\{ . ?\()
|
|
|
|
|
(?\} . ?\))
|
|
|
|
|
(?\& . ?\,)))
|
2005-01-31 06:25:17 +00:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'latex 'math-complex-format 'i)
|
2005-02-04 06:20:52 +00:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'latex 'math-matrix-formatter
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(if (and (integerp calc-language-option)
|
|
|
|
|
(or (= calc-language-option 0)
|
|
|
|
|
(> calc-language-option 1)
|
|
|
|
|
(< calc-language-option -1)))
|
|
|
|
|
(append '(vleft 0 "\\begin{pmatrix}")
|
|
|
|
|
(math-compose-tex-matrix (cdr a) t)
|
|
|
|
|
'("\\end{pmatrix}"))
|
|
|
|
|
(append '(horiz "\\begin{pmatrix} ")
|
|
|
|
|
(math-compose-tex-matrix (cdr a) t)
|
|
|
|
|
'(" \\end{pmatrix}"))))))
|
|
|
|
|
|
|
|
|
|
(put 'latex 'math-var-formatter 'math-compose-tex-var)
|
|
|
|
|
|
|
|
|
|
(put 'latex 'math-func-formatter 'math-compose-tex-func)
|
|
|
|
|
|
|
|
|
|
(put 'latex 'math-dots "\\ldots")
|
|
|
|
|
|
|
|
|
|
(put 'latex 'math-big-parens '("\\left( " . " \\right)"))
|
|
|
|
|
|
|
|
|
|
(put 'latex 'math-evalto '("\\evalto " . " \\to "))
|
|
|
|
|
|
|
|
|
|
(put 'latex 'math-lang-read-symbol
|
|
|
|
|
'((?\\
|
|
|
|
|
(< math-exp-pos (1- (length math-exp-str)))
|
|
|
|
|
(progn
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(or (string-match "\\\\hbox *{\\([a-zA-Zα-ωΑ-Ω0-9]+\\)}"
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
math-exp-str math-exp-pos)
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(string-match "\\\\text *{\\([a-zA-Zα-ωΑ-Ω0-9]+\\)}"
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
math-exp-str math-exp-pos)
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(string-match "\\(\\\\\\([a-zA-Zα-ωΑ-Ω]+\\|[^a-zA-Zα-ωΑ-Ω]\\)\\)"
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
math-exp-str math-exp-pos))
|
|
|
|
|
(setq math-exp-token 'symbol
|
|
|
|
|
math-exp-pos (match-end 0)
|
|
|
|
|
math-expr-data (math-restore-dashes
|
|
|
|
|
(math-match-substring math-exp-str 1)))
|
|
|
|
|
(let ((code (assoc math-expr-data math-tex-ignore-words))
|
|
|
|
|
envname)
|
|
|
|
|
(cond ((null code))
|
|
|
|
|
((null (cdr code))
|
|
|
|
|
(math-read-token))
|
|
|
|
|
((eq (nth 1 code) 'punc)
|
|
|
|
|
(setq math-exp-token 'punc
|
|
|
|
|
math-expr-data (nth 2 code)))
|
|
|
|
|
((and (eq (nth 1 code) 'begenv)
|
|
|
|
|
(string-match " *{\\([^}]*\\)}" math-exp-str math-exp-pos))
|
|
|
|
|
(setq math-exp-pos (match-end 0)
|
|
|
|
|
envname (match-string 1 math-exp-str)
|
|
|
|
|
math-exp-token 'punc
|
|
|
|
|
math-expr-data "[")
|
|
|
|
|
(cond ((or (string= envname "matrix")
|
|
|
|
|
(string= envname "bmatrix")
|
|
|
|
|
(string= envname "smallmatrix")
|
|
|
|
|
(string= envname "pmatrix"))
|
|
|
|
|
(if (string-match (concat "\\\\end{" envname "}")
|
|
|
|
|
math-exp-str math-exp-pos)
|
|
|
|
|
(setq math-exp-str
|
|
|
|
|
(replace-match "]" t t math-exp-str))
|
|
|
|
|
(error "%s" (concat "No closing \\end{" envname "}"))))))
|
|
|
|
|
((and (eq (nth 1 code) 'mat)
|
|
|
|
|
(string-match " *{" math-exp-str math-exp-pos))
|
|
|
|
|
(setq math-exp-pos (match-end 0)
|
|
|
|
|
math-exp-token 'punc
|
|
|
|
|
math-expr-data "[")
|
|
|
|
|
(let ((right (string-match "}" math-exp-str math-exp-pos)))
|
|
|
|
|
(and right
|
|
|
|
|
(setq math-exp-str (copy-sequence math-exp-str))
|
|
|
|
|
(aset math-exp-str right ?\]))))))))))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
|
2005-01-31 06:25:17 +00:00
|
|
|
|
(defun math-latex-parse-frac (f val)
|
|
|
|
|
(let (numer denom)
|
2005-02-04 06:20:52 +00:00
|
|
|
|
(setq numer (car (math-read-expr-list)))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(setq denom (math-read-factor))
|
|
|
|
|
(if (and (Math-num-integerp numer)
|
|
|
|
|
(Math-num-integerp denom))
|
|
|
|
|
(list 'frac numer denom)
|
|
|
|
|
(list '/ numer denom))))
|
|
|
|
|
|
|
|
|
|
(defun math-latex-parse-two-args (f val)
|
|
|
|
|
(let (first second)
|
|
|
|
|
(setq first (car (math-read-expr-list)))
|
2005-01-31 06:25:17 +00:00
|
|
|
|
(math-read-token)
|
2005-02-04 06:20:52 +00:00
|
|
|
|
(setq second (math-read-factor))
|
|
|
|
|
(list (nth 2 f) first second)))
|
2005-01-31 06:25:17 +00:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(defun math-compose-latex-frac (a fn)
|
2005-01-31 06:25:17 +00:00
|
|
|
|
(list 'horiz (nth 1 fn) "{" (math-compose-expr (nth 1 a) -1)
|
|
|
|
|
"}{"
|
|
|
|
|
(math-compose-expr (nth 2 a) -1)
|
|
|
|
|
"}"))
|
|
|
|
|
|
2005-01-31 09:08:34 +00:00
|
|
|
|
(put 'latex 'math-input-filter 'math-tex-input-filter)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-eqn-language (n)
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'eqn)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(message "Eqn language mode")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-oper-table
|
2007-10-27 20:25:45 +00:00
|
|
|
|
'( ( "prime" (math-parse-eqn-prime) 950 -1 )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( "prime" calcFunc-Prime 950 -1 )
|
|
|
|
|
( "dot" calcFunc-dot 950 -1 )
|
|
|
|
|
( "dotdot" calcFunc-dotdot 950 -1 )
|
|
|
|
|
( "hat" calcFunc-hat 950 -1 )
|
|
|
|
|
( "tilde" calcFunc-tilde 950 -1 )
|
|
|
|
|
( "vec" calcFunc-Vec 950 -1 )
|
|
|
|
|
( "dyad" calcFunc-dyad 950 -1 )
|
|
|
|
|
( "bar" calcFunc-bar 950 -1 )
|
|
|
|
|
( "under" calcFunc-under 950 -1 )
|
|
|
|
|
( "sub" calcFunc-subscr 931 930 )
|
|
|
|
|
( "sup" ^ 921 920 )
|
|
|
|
|
( "sqrt" calcFunc-sqrt -1 910 )
|
|
|
|
|
( "over" / 900 901 )
|
|
|
|
|
( "u|" calcFunc-abs -1 0 )
|
|
|
|
|
( "|" closing 0 -1 )
|
|
|
|
|
( "left floor" calcFunc-floor -1 0 )
|
|
|
|
|
( "right floor" closing 0 -1 )
|
|
|
|
|
( "left ceil" calcFunc-ceil -1 0 )
|
|
|
|
|
( "right ceil" closing 0 -1 )
|
|
|
|
|
( "+-" sdev 300 300 )
|
|
|
|
|
( "!" calcFunc-fact 210 -1 )
|
2007-10-27 20:25:45 +00:00
|
|
|
|
( "u+" ident -1 197 )
|
|
|
|
|
( "u-" neg -1 197 )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( "times" * 191 190 )
|
|
|
|
|
( "*" * 191 190 )
|
|
|
|
|
( "2x" * 191 190 )
|
|
|
|
|
( "/" / 180 181 )
|
|
|
|
|
( "%" % 180 181 )
|
|
|
|
|
( "+" + 170 171 )
|
|
|
|
|
( "-" - 170 171 )
|
|
|
|
|
( "<" calcFunc-lt 160 161 )
|
|
|
|
|
( ">" calcFunc-gt 160 161 )
|
|
|
|
|
( "<=" calcFunc-leq 160 161 )
|
|
|
|
|
( ">=" calcFunc-geq 160 161 )
|
|
|
|
|
( "=" calcFunc-eq 160 161 )
|
|
|
|
|
( "==" calcFunc-eq 160 161 )
|
|
|
|
|
( "!=" calcFunc-neq 160 161 )
|
|
|
|
|
( "u!" calcFunc-lnot -1 121 )
|
|
|
|
|
( "&&" calcFunc-land 110 111 )
|
|
|
|
|
( "||" calcFunc-lor 100 101 )
|
|
|
|
|
( "?" (math-read-if) 91 90 )
|
|
|
|
|
( "!!!" calcFunc-pnot -1 85 )
|
|
|
|
|
( "&&&" calcFunc-pand 80 81 )
|
|
|
|
|
( "|||" calcFunc-por 75 76 )
|
|
|
|
|
( "<-" calcFunc-assign 51 50 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )
|
|
|
|
|
( "::" calcFunc-condition 45 46 )
|
|
|
|
|
( "->" calcFunc-evalto 40 41 )
|
|
|
|
|
( "->" calcFunc-evalto 40 -1 )
|
|
|
|
|
( "=>" calcFunc-evalto 40 41 )
|
2001-11-14 09:09:09 +00:00
|
|
|
|
( "=>" calcFunc-evalto 40 -1 )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-function-table
|
|
|
|
|
'( ( arc\ cos . calcFunc-arccos )
|
|
|
|
|
( arc\ cosh . calcFunc-arccosh )
|
|
|
|
|
( arc\ sin . calcFunc-arcsin )
|
|
|
|
|
( arc\ sinh . calcFunc-arcsinh )
|
|
|
|
|
( arc\ tan . calcFunc-arctan )
|
|
|
|
|
( arc\ tanh . calcFunc-arctanh )
|
|
|
|
|
( GAMMA . calcFunc-gamma )
|
|
|
|
|
( phi . calcFunc-totient )
|
|
|
|
|
( mu . calcFunc-moebius )
|
2001-11-14 09:09:09 +00:00
|
|
|
|
( matrix . (math-parse-eqn-matrix) )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'eqn 'math-special-function-table
|
|
|
|
|
'((intv . math-compose-eqn-intv)))
|
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-punc-table
|
|
|
|
|
'((?\{ . ?\()
|
|
|
|
|
(?\} . ?\))))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(put 'eqn 'math-variable-table
|
2001-11-14 09:09:09 +00:00
|
|
|
|
'( ( inf . var-uinf )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-complex-format 'i)
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'eqn 'math-big-parens '("{left ( " . " right )}"))
|
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-evalto '("evalto " . " -> "))
|
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-matrix-formatter
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(append '(horiz "matrix { ")
|
|
|
|
|
(math-compose-eqn-matrix
|
|
|
|
|
(cdr (math-transpose a)))
|
|
|
|
|
'("}")))))
|
|
|
|
|
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(put 'eqn 'math-var-formatter
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(function
|
2007-12-02 20:00:58 +00:00
|
|
|
|
(lambda (a prec)
|
|
|
|
|
(let (v)
|
|
|
|
|
(if (and math-compose-hash-args
|
|
|
|
|
(let ((p calc-arg-values))
|
|
|
|
|
(setq v 1)
|
|
|
|
|
(while (and p (not (equal (car p) a)))
|
|
|
|
|
(setq p (and (eq math-compose-hash-args t) (cdr p))
|
|
|
|
|
v (1+ v)))
|
|
|
|
|
p))
|
|
|
|
|
(if (eq math-compose-hash-args 1)
|
|
|
|
|
"#"
|
|
|
|
|
(format "#%d" v))
|
|
|
|
|
(if (string-match ".'\\'" (symbol-name (nth 2 a)))
|
|
|
|
|
(math-compose-expr
|
|
|
|
|
(list 'calcFunc-Prime
|
|
|
|
|
(list
|
|
|
|
|
'var
|
|
|
|
|
(intern (substring (symbol-name (nth 1 a)) 0 -1))
|
|
|
|
|
(intern (substring (symbol-name (nth 2 a)) 0 -1))))
|
|
|
|
|
prec)
|
|
|
|
|
(symbol-name (nth 1 a))))))))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(defconst math-eqn-special-funcs
|
|
|
|
|
'( calcFunc-log
|
|
|
|
|
calcFunc-ln calcFunc-exp
|
|
|
|
|
calcFunc-sin calcFunc-cos calcFunc-tan
|
|
|
|
|
calcFunc-sec calcFunc-csc calcFunc-cot
|
|
|
|
|
calcFunc-sinh calcFunc-cosh calcFunc-tanh
|
|
|
|
|
calcFunc-sech calcFunc-csch calcFunc-coth
|
|
|
|
|
calcFunc-arcsin calcFunc-arccos calcFunc-arctan
|
|
|
|
|
calcFunc-arcsinh calcFunc-arccosh calcFunc-arctanh))
|
|
|
|
|
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(put 'eqn 'math-func-formatter
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(function
|
|
|
|
|
(lambda (func a)
|
|
|
|
|
(let (left right)
|
|
|
|
|
(if (string-match "[^']'+\\'" func)
|
|
|
|
|
(let ((n (- (length func) (match-beginning 0) 1)))
|
|
|
|
|
(setq func (substring func 0 (- n)))
|
|
|
|
|
(while (>= (setq n (1- n)) 0)
|
|
|
|
|
(setq func (concat func " prime")))))
|
|
|
|
|
(cond ((or (> (length a) 2)
|
|
|
|
|
(not (math-tex-expr-is-flat (nth 1 a))))
|
|
|
|
|
(setq left "{left ( "
|
|
|
|
|
right " right )}"))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
|
|
|
|
|
((and
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(memq (car a) math-eqn-special-funcs)
|
|
|
|
|
(= (length a) 2)
|
|
|
|
|
(or (Math-realp (nth 1 a))
|
|
|
|
|
(memq (car (nth 1 a)) '(var *))))
|
|
|
|
|
(setq left "~{" right "}"))
|
|
|
|
|
(t
|
|
|
|
|
(setq left " ( "
|
|
|
|
|
right " )")))
|
|
|
|
|
(list 'horiz func left
|
|
|
|
|
(math-compose-vector (cdr a) " , " 0)
|
|
|
|
|
right)))))
|
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-lang-read-symbol
|
|
|
|
|
'((?\"
|
|
|
|
|
(string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)"
|
|
|
|
|
math-exp-str math-exp-pos)
|
|
|
|
|
(progn
|
|
|
|
|
(setq math-exp-str (copy-sequence math-exp-str))
|
|
|
|
|
(aset math-exp-str (match-beginning 1) ?\{)
|
|
|
|
|
(if (< (match-end 1) (length math-exp-str))
|
|
|
|
|
(aset math-exp-str (match-end 1) ?\}))
|
|
|
|
|
(math-read-token)))))
|
|
|
|
|
|
|
|
|
|
(defconst math-eqn-ignore-words
|
|
|
|
|
'( ("roman") ("bold") ("italic") ("mark") ("lineup") ("evalto")
|
|
|
|
|
("left" ("floor") ("ceil"))
|
|
|
|
|
("right" ("floor") ("ceil"))
|
|
|
|
|
("arc" ("sin") ("cos") ("tan") ("sinh") ("cosh") ("tanh"))
|
|
|
|
|
("size" n) ("font" n) ("fwd" n) ("back" n) ("up" n) ("down" n)
|
|
|
|
|
("above" punc ",")))
|
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-lang-adjust-words
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(function
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(lambda ()
|
|
|
|
|
(let ((code (assoc math-expr-data math-eqn-ignore-words)))
|
|
|
|
|
(cond ((null code))
|
|
|
|
|
((null (cdr code))
|
|
|
|
|
(math-read-token))
|
|
|
|
|
((consp (nth 1 code))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(if (assoc math-expr-data (cdr code))
|
|
|
|
|
(setq math-expr-data (format "%s %s"
|
|
|
|
|
(car code) math-expr-data))))
|
|
|
|
|
((eq (nth 1 code) 'punc)
|
|
|
|
|
(setq math-exp-token 'punc
|
|
|
|
|
math-expr-data (nth 2 code)))
|
|
|
|
|
(t
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(math-read-token)))))))
|
|
|
|
|
|
|
|
|
|
(put 'eqn 'math-lang-read
|
|
|
|
|
'((eq (string-match "->\\|<-\\|+-\\|\\\\dots\\|~\\|\\^"
|
|
|
|
|
math-exp-str math-exp-pos)
|
|
|
|
|
math-exp-pos)
|
|
|
|
|
(progn
|
|
|
|
|
(setq math-exp-token 'punc
|
|
|
|
|
math-expr-data (math-match-substring math-exp-str 0)
|
|
|
|
|
math-exp-pos (match-end 0))
|
|
|
|
|
(and (eq (string-match "\\\\dots\\." math-exp-str math-exp-pos)
|
|
|
|
|
math-exp-pos)
|
|
|
|
|
(setq math-exp-pos (match-end 0)))
|
|
|
|
|
(if (memq (aref math-expr-data 0) '(?~ ?^))
|
|
|
|
|
(math-read-token)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun math-compose-eqn-matrix (a)
|
|
|
|
|
(if a
|
|
|
|
|
(cons
|
|
|
|
|
(cond ((eq calc-matrix-just 'right) "rcol ")
|
|
|
|
|
((eq calc-matrix-just 'center) "ccol ")
|
|
|
|
|
(t "lcol "))
|
|
|
|
|
(cons
|
|
|
|
|
(list 'break math-compose-level)
|
|
|
|
|
(cons
|
|
|
|
|
"{ "
|
|
|
|
|
(cons
|
|
|
|
|
(let ((math-compose-level (1+ math-compose-level)))
|
|
|
|
|
(math-compose-vector (cdr (car a)) " above " 1000))
|
|
|
|
|
(cons
|
|
|
|
|
" } "
|
|
|
|
|
(math-compose-eqn-matrix (cdr a)))))))
|
|
|
|
|
nil))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun math-parse-eqn-matrix (f sym)
|
|
|
|
|
(let ((vec nil))
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(while (assoc math-expr-data '(("ccol") ("lcol") ("rcol")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(or (equal math-expr-data calc-function-open)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(throw 'syntax "Expected ‘{’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
|
|
|
|
(setq vec (cons (cons 'vec (math-read-expr-list)) vec))
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(or (equal math-expr-data calc-function-close)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(throw 'syntax "Expected ‘}’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token))
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(or (equal math-expr-data calc-function-close)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(throw 'syntax "Expected ‘}’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(math-transpose (cons 'vec (nreverse vec)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-parse-eqn-prime (x sym)
|
|
|
|
|
(if (eq (car-safe x) 'var)
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(if (equal math-expr-data calc-function-open)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(math-read-token)
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(let ((args (if (or (equal math-expr-data calc-function-close)
|
2004-11-11 05:52:17 +00:00
|
|
|
|
(eq math-exp-token 'end))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
nil
|
|
|
|
|
(math-read-expr-list))))
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(if (not (or (equal math-expr-data calc-function-close)
|
2004-11-11 05:52:17 +00:00
|
|
|
|
(eq math-exp-token 'end)))
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(throw 'syntax "Expected ‘)’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
|
|
|
|
(cons (intern (format "calcFunc-%s'" (nth 1 x))) args)))
|
|
|
|
|
(list 'var
|
|
|
|
|
(intern (concat (symbol-name (nth 1 x)) "'"))
|
|
|
|
|
(intern (concat (symbol-name (nth 2 x)) "'"))))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(list 'calcFunc-Prime x)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(defun math-compose-eqn-intv (a)
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(if (memq (nth 1 a) '(0 1)) "(" "[")
|
|
|
|
|
(math-compose-expr (nth 2 a) 0)
|
|
|
|
|
" ... "
|
|
|
|
|
(math-compose-expr (nth 3 a) 0)
|
|
|
|
|
(if (memq (nth 1 a) '(0 2)) ")" "]")))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
;;; Yacas
|
|
|
|
|
|
|
|
|
|
(defun calc-yacas-language ()
|
|
|
|
|
"Change the Calc language to be Yacas-like."
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'yacas)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(message "‘Yacas’ language mode")))
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
|
|
|
|
|
(put 'yacas 'math-vector-brackets "{}")
|
|
|
|
|
|
|
|
|
|
(put 'yacas 'math-complex-format 'I)
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-brackets-are-subscripts 'yacas)
|
|
|
|
|
|
|
|
|
|
(put 'yacas 'math-variable-table
|
|
|
|
|
'(( Infinity . var-inf)
|
|
|
|
|
( Infinity . var-uinf)
|
|
|
|
|
( Undefined . var-nan)
|
|
|
|
|
( Pi . var-pi)
|
|
|
|
|
( E . var-e) ;; Not really in Yacas
|
|
|
|
|
( GoldenRatio . var-phi)
|
|
|
|
|
( Gamma . var-gamma)))
|
|
|
|
|
|
|
|
|
|
(put 'yacas 'math-parse-table
|
2010-06-22 00:41:10 -07:00
|
|
|
|
'((("Deriv(" 0 ")" 0)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
calcFunc-deriv (var ArgB var-ArgB) (var ArgA var-ArgA))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(("D(" 0 ")" 0)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
calcFunc-deriv (var ArgB var-ArgB) (var ArgA var-ArgA))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(("Integrate(" 0 ")" 0)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
calcFunc-integ (var ArgB var-ArgB)(var ArgA var-ArgA))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(("Integrate(" 0 "," 0 "," 0 ")" 0)
|
|
|
|
|
calcFunc-integ (var ArgD var-ArgD) (var ArgA var-ArgA)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
(var ArgB var-ArgB) (var ArgC var-ArgC))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(("Subst(" 0 "," 0 ")" 0)
|
|
|
|
|
calcFunc-subst (var ArgC var-ArgC) (var ArgA var-ArgA)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
(var ArgB var-ArgB))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(("Taylor(" 0 "," 0 "," 0 ")" 0)
|
|
|
|
|
calcFunc-taylor (var ArgD var-ArgD)
|
|
|
|
|
(calcFunc-eq (var ArgA var-ArgA) (var ArgB var-ArgB))
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
(var ArgC var-ArgC))))
|
|
|
|
|
|
|
|
|
|
(put 'yacas 'math-oper-table
|
|
|
|
|
'(("+" + 30 30)
|
|
|
|
|
("-" - 30 60)
|
|
|
|
|
("*" * 60 60)
|
|
|
|
|
("/" / 70 70)
|
|
|
|
|
("u-" neg -1 60)
|
|
|
|
|
("^" ^ 80 80)
|
|
|
|
|
("u+" ident -1 30)
|
|
|
|
|
("<<" calcFunc-lsh 80 80)
|
|
|
|
|
(">>" calcFunc-rsh 80 80)
|
|
|
|
|
("!" calcFunc-fact 80 -1)
|
|
|
|
|
("!!" calcFunc-dfact 80 -1)
|
|
|
|
|
("X" calcFunc-cross 70 70)
|
|
|
|
|
("=" calcFunc-eq 10 10)
|
|
|
|
|
("!=" calcFunc-neq 10 10)
|
|
|
|
|
("<" calcFunc-lt 10 10)
|
|
|
|
|
(">" calcFunc-gt 10 10)
|
|
|
|
|
("<=" calcFunc-leq 10 10)
|
|
|
|
|
(">=" calcFunc-geq 10 10)
|
|
|
|
|
("And" calcFunc-land 5 5)
|
|
|
|
|
("Or" calcFunc-or 4 4)
|
|
|
|
|
("Not" calcFunc-lnot -1 3)
|
|
|
|
|
(":=" calcFunc-assign 1 1)))
|
|
|
|
|
|
|
|
|
|
(put 'yacas 'math-function-table
|
|
|
|
|
'(( Div . calcFunc-idiv)
|
|
|
|
|
( Mod . calcFunc-mod)
|
|
|
|
|
( Abs . calcFunc-abs)
|
|
|
|
|
( Sign . calcFunc-sign)
|
|
|
|
|
( Sqrt . calcFunc-sqrt)
|
|
|
|
|
( Max . calcFunc-max)
|
|
|
|
|
( Min . calcFunc-min)
|
|
|
|
|
( Floor . calcFunc-floor)
|
|
|
|
|
( Ceil . calcFunc-ceil)
|
|
|
|
|
( Round . calcFunc-round)
|
|
|
|
|
( Conjugate . calcFunc-conj)
|
|
|
|
|
( Arg . calcFunc-arg)
|
|
|
|
|
( Re . calcFunc-re)
|
|
|
|
|
( Im . calcFunc-im)
|
|
|
|
|
( Rationalize . calcFunc-pfrac)
|
|
|
|
|
( Sin . calcFunc-sin)
|
|
|
|
|
( Cos . calcFunc-cos)
|
|
|
|
|
( Tan . calcFunc-tan)
|
|
|
|
|
( Sec . calcFunc-sec)
|
|
|
|
|
( Csc . calcFunc-csc)
|
|
|
|
|
( Cot . calcFunc-cot)
|
|
|
|
|
( ArcSin . calcFunc-arcsin)
|
|
|
|
|
( ArcCos . calcFunc-arccos)
|
|
|
|
|
( ArcTan . calcFunc-arctan)
|
|
|
|
|
( Sinh . calcFunc-sinh)
|
|
|
|
|
( Cosh . calcFunc-cosh)
|
|
|
|
|
( Tanh . calcFunc-tanh)
|
|
|
|
|
( Sech . calcFunc-sech)
|
|
|
|
|
( Csch . calcFunc-csch)
|
|
|
|
|
( Coth . calcFunc-coth)
|
|
|
|
|
( ArcSinh . calcFunc-arcsinh)
|
|
|
|
|
( ArcCosh . calcFunc-arccosh)
|
|
|
|
|
( ArcTanh . calcFunc-arctanh)
|
|
|
|
|
( Ln . calcFunc-ln)
|
|
|
|
|
( Exp . calcFunc-exp)
|
|
|
|
|
( Gamma . calcFunc-gamma)
|
|
|
|
|
( Gcd . calcFunc-gcd)
|
|
|
|
|
( Lcm . calcFunc-lcm)
|
|
|
|
|
( Bin . calcFunc-choose)
|
|
|
|
|
( Bernoulli . calcFunc-bern)
|
|
|
|
|
( Euler . calcFunc-euler)
|
|
|
|
|
( StirlingNumber1 . calcFunc-stir1)
|
|
|
|
|
( StirlingNumber2 . calcFunc-stir2)
|
|
|
|
|
( IsPrime . calcFunc-prime)
|
|
|
|
|
( Factors . calcFunc-prfac)
|
|
|
|
|
( NextPrime . calcFunc-nextprime)
|
|
|
|
|
( Moebius . calcFunc-moebius)
|
|
|
|
|
( Random . calcFunc-random)
|
|
|
|
|
( Concat . calcFunc-vconcat)
|
|
|
|
|
( Head . calcFunc-head)
|
|
|
|
|
( Tail . calcFunc-tail)
|
|
|
|
|
( Length . calcFunc-vlen)
|
|
|
|
|
( Reverse . calcFunc-rev)
|
|
|
|
|
( CrossProduct . calcFunc-cross)
|
|
|
|
|
( Dot . calcFunc-mul)
|
|
|
|
|
( DiagonalMatrix . calcFunc-diag)
|
|
|
|
|
( Transpose . calcFunc-trn)
|
|
|
|
|
( Inverse . calcFunc-inv)
|
|
|
|
|
( Determinant . calcFunc-det)
|
|
|
|
|
( Trace . calcFunc-tr)
|
|
|
|
|
( RemoveDuplicates . calcFunc-rdup)
|
|
|
|
|
( Union . calcFunc-vunion)
|
|
|
|
|
( Intersection . calcFunc-vint)
|
|
|
|
|
( Difference . calcFunc-vdiff)
|
|
|
|
|
( Apply . calcFunc-apply)
|
|
|
|
|
( Map . calcFunc-map)
|
|
|
|
|
( Simplify . calcFunc-simplify)
|
|
|
|
|
( ExpandBrackets . calcFunc-expand)
|
|
|
|
|
( Solve . calcFunc-solve)
|
|
|
|
|
( Degree . calcFunc-pdeg)
|
|
|
|
|
( If . calcFunc-if)
|
|
|
|
|
( Contains . (math-lang-switch-args calcFunc-in))
|
|
|
|
|
( Sum . (math-yacas-parse-Sum calcFunc-sum))
|
|
|
|
|
( Factorize . (math-yacas-parse-Sum calcFunc-prod))))
|
|
|
|
|
|
|
|
|
|
(put 'yacas 'math-special-function-table
|
|
|
|
|
'(( calcFunc-sum . (math-yacas-compose-sum "Sum"))
|
|
|
|
|
( calcFunc-prod . (math-yacas-compose-sum "Factorize"))
|
|
|
|
|
( calcFunc-deriv . (math-yacas-compose-deriv "Deriv"))
|
|
|
|
|
( calcFunc-integ . (math-yacas-compose-deriv "Integrate"))
|
|
|
|
|
( calcFunc-taylor . math-yacas-compose-taylor)
|
|
|
|
|
( calcFunc-in . (math-lang-compose-switch-args "Contains"))))
|
|
|
|
|
|
|
|
|
|
(put 'yacas 'math-compose-subscr
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(let ((args (cdr (cdr a))))
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 1 a) 1000)
|
|
|
|
|
"["
|
|
|
|
|
(math-compose-vector args ", " 0)
|
|
|
|
|
"]")))))
|
|
|
|
|
|
|
|
|
|
(defun math-yacas-parse-Sum (f val)
|
|
|
|
|
"Read in the arguments to \"Sum\" in Calc's Yacas mode."
|
|
|
|
|
(let ((args (math-read-expr-list)))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(list (nth 2 f)
|
|
|
|
|
(nth 3 args)
|
|
|
|
|
(nth 0 args)
|
|
|
|
|
(nth 1 args)
|
|
|
|
|
(nth 2 args))))
|
|
|
|
|
|
|
|
|
|
(defun math-yacas-compose-sum (a fn)
|
|
|
|
|
"Compose the \"Sum\" function in Calc's Yacas mode."
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(nth 1 fn)
|
|
|
|
|
"("
|
|
|
|
|
(math-compose-expr (nth 2 a) -1)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 3 a) -1)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 4 a) -1)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 1 a) -1)
|
|
|
|
|
")"))
|
|
|
|
|
|
|
|
|
|
(defun math-yacas-compose-deriv (a fn)
|
|
|
|
|
"Compose the \"Deriv\" function in Calc's Yacas mode."
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(nth 1 fn)
|
|
|
|
|
"("
|
|
|
|
|
(math-compose-expr (nth 2 a) -1)
|
|
|
|
|
(if (not (nth 3 a))
|
|
|
|
|
")"
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(concat
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 3 a) -1)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 4 a) -1)
|
|
|
|
|
")"))
|
|
|
|
|
" "
|
|
|
|
|
(math-compose-expr (nth 1 a) -1)))
|
|
|
|
|
|
|
|
|
|
(defun math-yacas-compose-taylor (a)
|
|
|
|
|
"Compose the \"Taylor\" function in Calc's Yacas mode."
|
|
|
|
|
(list 'horiz
|
|
|
|
|
"Taylor("
|
|
|
|
|
(if (eq (car-safe (nth 2 a)) 'calcFunc-eq)
|
|
|
|
|
(concat (math-compose-expr (nth 1 (nth 2 a)) -1)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 2 (nth 2 a)) -1))
|
|
|
|
|
(concat (math-compose-expr (nth 2 a) -1) ",0"))
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 3 a) -1)
|
|
|
|
|
") "
|
|
|
|
|
(math-compose-expr (nth 1 a) -1)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Maxima
|
|
|
|
|
|
|
|
|
|
(defun calc-maxima-language ()
|
|
|
|
|
"Change the Calc language to be Maxima-like."
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'maxima)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(message "‘Maxima’ language mode")))
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
|
|
|
|
|
(put 'maxima 'math-oper-table
|
|
|
|
|
'(("+" + 100 100)
|
|
|
|
|
("-" - 100 134)
|
|
|
|
|
("*" * 120 120)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
("." * 130 129)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
("/" / 120 120)
|
|
|
|
|
("u-" neg -1 180)
|
|
|
|
|
("u+" ident -1 180)
|
|
|
|
|
("^" ^ 140 139)
|
|
|
|
|
("**" ^ 140 139)
|
|
|
|
|
("!" calcFunc-fact 160 -1)
|
|
|
|
|
("!!" calcFunc-dfact 160 -1)
|
|
|
|
|
("=" calcFunc-eq 80 80)
|
|
|
|
|
("#" calcFunc-neq 80 80)
|
|
|
|
|
("<" calcFunc-lt 80 80)
|
|
|
|
|
(">" calcFunc-gt 80 80)
|
|
|
|
|
("<=" calcFunc-leq 80 80)
|
|
|
|
|
(">=" calcFunc-geq 80 80)
|
|
|
|
|
("and" calcFunc-land 65 65)
|
|
|
|
|
("or" calcFunc-or 60 60)
|
|
|
|
|
("not" calcFunc-lnot -1 70)
|
|
|
|
|
(":" calcFunc-assign 180 20)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(put 'maxima 'math-function-table
|
|
|
|
|
'(( matrix . vec)
|
|
|
|
|
( abs . calcFunc-abs)
|
|
|
|
|
( cabs . calcFunc-abs)
|
|
|
|
|
( signum . calcFunc-sign)
|
|
|
|
|
( floor . calcFunc-floor)
|
|
|
|
|
( entier . calcFunc-floor)
|
|
|
|
|
( fix . calcFunc-floor)
|
|
|
|
|
( conjugate . calcFunc-conj )
|
|
|
|
|
( carg . calcFunc-arg)
|
|
|
|
|
( realpart . calcFunc-re)
|
|
|
|
|
( imagpart . calcFunc-im)
|
|
|
|
|
( rationalize . calcFunc-pfrac)
|
|
|
|
|
( asin . calcFunc-arcsin)
|
|
|
|
|
( acos . calcFunc-arccos)
|
|
|
|
|
( atan . calcFunc-arctan)
|
|
|
|
|
( atan2 . calcFunc-arctan2)
|
|
|
|
|
( asinh . calcFunc-arcsinh)
|
|
|
|
|
( acosh . calcFunc-arccosh)
|
|
|
|
|
( atanh . calcFunc-arctanh)
|
|
|
|
|
( log . calcFunc-ln)
|
|
|
|
|
( plog . calcFunc-ln)
|
|
|
|
|
( bessel_j . calcFunc-besJ)
|
|
|
|
|
( bessel_y . calcFunc-besY)
|
|
|
|
|
( factorial . calcFunc-fact)
|
|
|
|
|
( binomial . calcFunc-choose)
|
|
|
|
|
( primep . calcFunc-prime)
|
|
|
|
|
( next_prime . calcFunc-nextprime)
|
|
|
|
|
( prev_prime . calcFunc-prevprime)
|
|
|
|
|
( append . calcFunc-vconcat)
|
|
|
|
|
( rest . calcFunc-tail)
|
|
|
|
|
( reverse . calcFunc-rev)
|
|
|
|
|
( innerproduct . calcFunc-mul)
|
|
|
|
|
( inprod . calcFunc-mul)
|
|
|
|
|
( row . calcFunc-mrow)
|
|
|
|
|
( columnvector . calcFunc-mcol)
|
|
|
|
|
( covect . calcFunc-mcol)
|
|
|
|
|
( transpose . calcFunc-trn)
|
|
|
|
|
( invert . calcFunc-inv)
|
|
|
|
|
( determinant . calcFunc-det)
|
|
|
|
|
( mattrace . calcFunc-tr)
|
|
|
|
|
( member . calcFunc-in)
|
|
|
|
|
( lmax . calcFunc-vmax)
|
|
|
|
|
( lmin . calcFunc-vmin)
|
|
|
|
|
( distrib . calcFunc-expand)
|
|
|
|
|
( partfrac . calcFunc-apart)
|
|
|
|
|
( rat . calcFunc-nrat)
|
|
|
|
|
( product . calcFunc-prod)
|
|
|
|
|
( diff . calcFunc-deriv)
|
|
|
|
|
( integrate . calcFunc-integ)
|
|
|
|
|
( quotient . calcFunc-pdiv)
|
|
|
|
|
( remainder . calcFunc-prem)
|
|
|
|
|
( divide . calcFunc-pdivrem)
|
|
|
|
|
( equal . calcFunc-eq)
|
|
|
|
|
( notequal . calcFunc-neq)
|
|
|
|
|
( rhs . calcFunc-rmeq)
|
|
|
|
|
( subst . (math-maxima-parse-subst))
|
|
|
|
|
( substitute . (math-maxima-parse-subst))
|
|
|
|
|
( taylor . (math-maxima-parse-taylor))))
|
|
|
|
|
|
|
|
|
|
(defun math-maxima-parse-subst (f val)
|
|
|
|
|
"Read in the arguments to \"subst\" in Calc's Maxima mode."
|
|
|
|
|
(let ((args (math-read-expr-list)))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(list 'calcFunc-subst
|
|
|
|
|
(nth 1 args)
|
|
|
|
|
(nth 2 args)
|
|
|
|
|
(nth 0 args))))
|
|
|
|
|
|
|
|
|
|
(defun math-maxima-parse-taylor (f val)
|
|
|
|
|
"Read in the arguments to \"taylor\" in Calc's Maxima mode."
|
|
|
|
|
(let ((args (math-read-expr-list)))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(list 'calcFunc-taylor
|
|
|
|
|
(nth 0 args)
|
|
|
|
|
(list 'calcFunc-eq
|
|
|
|
|
(nth 1 args)
|
|
|
|
|
(nth 2 args))
|
|
|
|
|
(nth 3 args))))
|
|
|
|
|
|
|
|
|
|
(put 'maxima 'math-parse-table
|
2010-06-22 00:41:10 -07:00
|
|
|
|
'((("if" 0 "then" 0 "else" 0)
|
|
|
|
|
calcFunc-if
|
|
|
|
|
(var ArgA var-ArgA)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
(var ArgB var-ArgB)
|
|
|
|
|
(var ArgC var-ArgC))))
|
|
|
|
|
|
|
|
|
|
(put 'maxima 'math-special-function-table
|
|
|
|
|
'(( calcFunc-taylor . math-maxima-compose-taylor)
|
|
|
|
|
( calcFunc-subst . math-maxima-compose-subst)
|
|
|
|
|
( calcFunc-if . math-maxima-compose-if)))
|
|
|
|
|
|
|
|
|
|
(defun math-maxima-compose-taylor (a)
|
|
|
|
|
"Compose the \"taylor\" function in Calc's Maxima mode."
|
|
|
|
|
(list 'horiz
|
|
|
|
|
"taylor("
|
|
|
|
|
(math-compose-expr (nth 1 a) -1)
|
|
|
|
|
","
|
|
|
|
|
(if (eq (car-safe (nth 2 a)) 'calcFunc-eq)
|
|
|
|
|
(concat (math-compose-expr (nth 1 (nth 2 a)) -1)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 2 (nth 2 a)) -1))
|
|
|
|
|
(concat (math-compose-expr (nth 2 a) -1) ",0"))
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 3 a) -1)
|
|
|
|
|
")"))
|
|
|
|
|
|
|
|
|
|
(defun math-maxima-compose-subst (a)
|
|
|
|
|
"Compose the \"subst\" function in Calc's Maxima mode."
|
|
|
|
|
(list 'horiz
|
|
|
|
|
"substitute("
|
|
|
|
|
(math-compose-expr (nth 2 a) -1)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 3 a) -1)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 1 a) -1)
|
|
|
|
|
")"))
|
|
|
|
|
|
|
|
|
|
(defun math-maxima-compose-if (a)
|
|
|
|
|
"Compose the \"if\" function in Calc's Maxima mode."
|
|
|
|
|
(list 'horiz
|
|
|
|
|
"if "
|
|
|
|
|
(math-compose-expr (nth 1 a) -1)
|
|
|
|
|
" then "
|
|
|
|
|
(math-compose-expr (nth 2 a) -1)
|
|
|
|
|
" else "
|
|
|
|
|
(math-compose-expr (nth 3 a) -1)))
|
|
|
|
|
|
|
|
|
|
(put 'maxima 'math-variable-table
|
|
|
|
|
'(( infinity . var-uinf)
|
|
|
|
|
( %pi . var-pi)
|
|
|
|
|
( %e . var-e)
|
|
|
|
|
( %i . var-i)
|
|
|
|
|
( %phi . var-phi)
|
|
|
|
|
( %gamma . var-gamma)))
|
|
|
|
|
|
|
|
|
|
(put 'maxima 'math-complex-format '%i)
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-allow-underscores 'maxima)
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-allow-percentsigns 'maxima)
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-brackets-are-subscripts 'maxima)
|
|
|
|
|
|
|
|
|
|
(put 'maxima 'math-compose-subscr
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(let ((args (cdr (cdr a))))
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 1 a) 1000)
|
|
|
|
|
"["
|
|
|
|
|
(math-compose-vector args ", " 0)
|
|
|
|
|
"]")))))
|
|
|
|
|
|
|
|
|
|
(put 'maxima 'math-matrix-formatter
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(list 'horiz
|
|
|
|
|
"matrix("
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(math-compose-vector (cdr a)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
(concat math-comp-comma " ")
|
|
|
|
|
math-comp-vector-prec)
|
|
|
|
|
")"))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Giac
|
|
|
|
|
|
|
|
|
|
(defun calc-giac-language ()
|
|
|
|
|
"Change the Calc language to be Giac-like."
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'giac)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(message "‘Giac’ language mode")))
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
|
|
|
|
|
(put 'giac 'math-oper-table
|
|
|
|
|
'( ( "[" (math-read-giac-subscr) 250 -1 )
|
|
|
|
|
( "+" + 180 181 )
|
|
|
|
|
( "-" - 180 181 )
|
|
|
|
|
( "/" / 191 192 )
|
|
|
|
|
( "*" * 191 192 )
|
|
|
|
|
( "^" ^ 201 200 )
|
|
|
|
|
( "u+" ident -1 197 )
|
|
|
|
|
( "u-" neg -1 197 )
|
|
|
|
|
( "!" calcFunc-fact 210 -1 )
|
|
|
|
|
( ".." (math-read-maple-dots) 165 165 )
|
|
|
|
|
( "\\dots" (math-read-maple-dots) 165 165 )
|
|
|
|
|
( "intersect" calcFunc-vint 191 192 )
|
|
|
|
|
( "union" calcFunc-vunion 180 181 )
|
|
|
|
|
( "minus" calcFunc-vdiff 180 181 )
|
|
|
|
|
( "<" calcFunc-lt 160 160 )
|
|
|
|
|
( ">" calcFunc-gt 160 160 )
|
|
|
|
|
( "<=" calcFunc-leq 160 160 )
|
|
|
|
|
( ">=" calcFunc-geq 160 160 )
|
|
|
|
|
( "=" calcFunc-eq 160 160 )
|
|
|
|
|
( "==" calcFunc-eq 160 160 )
|
|
|
|
|
( "!=" calcFunc-neq 160 160 )
|
|
|
|
|
( "and" calcFunc-land 110 111 )
|
|
|
|
|
( "or" calcFunc-lor 100 101 )
|
|
|
|
|
( "&&" calcFunc-land 110 111 )
|
|
|
|
|
( "||" calcFunc-lor 100 101 )
|
|
|
|
|
( "not" calcFunc-lnot -1 121 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(put 'giac 'math-function-table
|
|
|
|
|
'(( rdiv . calcFunc-div)
|
|
|
|
|
( iquo . calcFunc-idiv)
|
|
|
|
|
( irem . calcFunc-mod)
|
|
|
|
|
( remain . calcFunc-mod)
|
|
|
|
|
( floor . calcFunc-floor)
|
|
|
|
|
( iPart . calcFunc-floor)
|
|
|
|
|
( ceil . calcFunc-ceil)
|
|
|
|
|
( ceiling . calcFunc-ceil)
|
|
|
|
|
( re . calcFunc-re)
|
|
|
|
|
( real . calcFunc-re)
|
|
|
|
|
( im . calcFunc-im)
|
|
|
|
|
( imag . calcFunc-im)
|
|
|
|
|
( float2rational . calcFunc-pfrac)
|
|
|
|
|
( exact . calcFunc-pfrac)
|
|
|
|
|
( evalf . calcFunc-pfloat)
|
|
|
|
|
( bitand . calcFunc-and)
|
|
|
|
|
( bitor . calcFunc-or)
|
|
|
|
|
( bitxor . calcFunc-xor)
|
|
|
|
|
( asin . calcFunc-arcsin)
|
|
|
|
|
( acos . calcFunc-arccos)
|
|
|
|
|
( atan . calcFunc-arctan)
|
|
|
|
|
( asinh . calcFunc-arcsinh)
|
|
|
|
|
( acosh . calcFunc-arccosh)
|
|
|
|
|
( atanh . calcFunc-arctanh)
|
|
|
|
|
( log . calcFunc-ln)
|
|
|
|
|
( logb . calcFunc-log)
|
|
|
|
|
( factorial . calcFunc-fact)
|
|
|
|
|
( comb . calcFunc-choose)
|
|
|
|
|
( binomial . calcFunc-choose)
|
|
|
|
|
( nCr . calcFunc-choose)
|
|
|
|
|
( perm . calcFunc-perm)
|
|
|
|
|
( nPr . calcFunc-perm)
|
|
|
|
|
( bernoulli . calcFunc-bern)
|
|
|
|
|
( is_prime . calcFunc-prime)
|
|
|
|
|
( isprime . calcFunc-prime)
|
|
|
|
|
( isPrime . calcFunc-prime)
|
|
|
|
|
( ifactors . calcFunc-prfac)
|
|
|
|
|
( euler . calcFunc-totient)
|
|
|
|
|
( phi . calcFunc-totient)
|
|
|
|
|
( rand . calcFunc-random)
|
|
|
|
|
( concat . calcFunc-vconcat)
|
|
|
|
|
( augment . calcFunc-vconcat)
|
|
|
|
|
( mid . calcFunc-subvec)
|
|
|
|
|
( length . calcFunc-length)
|
|
|
|
|
( size . calcFunc-length)
|
|
|
|
|
( nops . calcFunc-length)
|
|
|
|
|
( SortA . calcFunc-sort)
|
|
|
|
|
( SortB . calcFunc-rsort)
|
|
|
|
|
( revlist . calcFunc-rev)
|
|
|
|
|
( cross . calcFunc-cross)
|
|
|
|
|
( crossP . calcFunc-cross)
|
|
|
|
|
( crossproduct . calcFunc-cross)
|
|
|
|
|
( mul . calcFunc-mul)
|
|
|
|
|
( dot . calcFunc-mul)
|
|
|
|
|
( dotprod . calcFunc-mul)
|
|
|
|
|
( dotP . calcFunc-mul)
|
|
|
|
|
( scalar_product . calcFunc-mul)
|
|
|
|
|
( scalar_Product . calcFunc-mul)
|
|
|
|
|
( row . calcFunc-mrow)
|
|
|
|
|
( col . calcFunc-mcol)
|
|
|
|
|
( dim . calcFunc-mdims)
|
|
|
|
|
( tran . calcFunc-trn)
|
|
|
|
|
( transpose . calcFunc-trn)
|
|
|
|
|
( lu . calcFunc-lud)
|
|
|
|
|
( trace . calcFunc-tr)
|
|
|
|
|
( member . calcFunc-in)
|
|
|
|
|
( sum . calcFunc-vsum)
|
|
|
|
|
( add . calcFunc-vsum)
|
|
|
|
|
( product . calcFunc-vprod)
|
|
|
|
|
( mean . calcFunc-vmean)
|
|
|
|
|
( median . calcFunc-vmedian)
|
|
|
|
|
( stddev . calcFunc-vsdev)
|
|
|
|
|
( stddevp . calcFunc-vpsdev)
|
|
|
|
|
( variance . calcFunc-vpvar)
|
|
|
|
|
( map . calcFunc-map)
|
|
|
|
|
( apply . calcFunc-map)
|
|
|
|
|
( of . calcFunc-map)
|
|
|
|
|
( zip . calcFunc-map)
|
|
|
|
|
( expand . calcFunc-expand)
|
|
|
|
|
( fdistrib . calcFunc-expand)
|
|
|
|
|
( partfrac . calcFunc-apart)
|
|
|
|
|
( ratnormal . calcFunc-nrat)
|
|
|
|
|
( diff . calcFunc-deriv)
|
|
|
|
|
( derive . calcFunc-deriv)
|
|
|
|
|
( integrate . calcFunc-integ)
|
|
|
|
|
( int . calcFunc-integ)
|
|
|
|
|
( Int . calcFunc-integ)
|
|
|
|
|
( romberg . calcFunc-ninteg)
|
|
|
|
|
( nInt . calcFunc-ninteg)
|
|
|
|
|
( lcoeff . calcFunc-plead)
|
|
|
|
|
( content . calcFunc-pcont)
|
|
|
|
|
( primpart . calcFunc-pprim)
|
|
|
|
|
( quo . calcFunc-pdiv)
|
|
|
|
|
( rem . calcFunc-prem)
|
|
|
|
|
( quorem . calcFunc-pdivrem)
|
|
|
|
|
( divide . calcFunc-pdivrem)
|
|
|
|
|
( equal . calcFunc-eq)
|
|
|
|
|
( ifte . calcFunc-if)
|
|
|
|
|
( not . calcFunc-lnot)
|
|
|
|
|
( rhs . calcFunc-rmeq)
|
|
|
|
|
( right . calcFunc-rmeq)
|
|
|
|
|
( prepend . (math-lang-switch-args calcFunc-cons))
|
|
|
|
|
( contains . (math-lang-switch-args calcFunc-in))
|
|
|
|
|
( has . (math-lang-switch-args calcFunc-refers))))
|
|
|
|
|
|
|
|
|
|
(defun math-lang-switch-args (f val)
|
|
|
|
|
"Read the arguments to a Calc function in reverse order.
|
|
|
|
|
This is used for various language modes which have functions in reverse
|
|
|
|
|
order to Calc's."
|
|
|
|
|
(let ((args (math-read-expr-list)))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(list (nth 2 f)
|
|
|
|
|
(nth 1 args)
|
|
|
|
|
(nth 0 args))))
|
|
|
|
|
|
|
|
|
|
(put 'giac 'math-parse-table
|
2010-06-22 00:41:10 -07:00
|
|
|
|
'((("set" 0)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
calcFunc-rdup
|
|
|
|
|
(var ArgA var-ArgA))))
|
|
|
|
|
|
|
|
|
|
(put 'giac 'math-special-function-table
|
|
|
|
|
'((calcFunc-cons . (math-lang-compose-switch-args "prepend"))
|
|
|
|
|
(calcFunc-in . (math-lang-compose-switch-args "contains"))
|
|
|
|
|
(calcFunc-refers . (math-lang-compose-switch-args "has"))
|
|
|
|
|
(intv . math-compose-maple-intv)))
|
|
|
|
|
|
|
|
|
|
(defun math-lang-compose-switch-args (a fn)
|
|
|
|
|
"Compose the arguments to a Calc function in reverse order.
|
|
|
|
|
This is used for various language modes which have functions in reverse
|
|
|
|
|
order to Calc's."
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(list 'horiz (nth 1 fn)
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
"("
|
|
|
|
|
(math-compose-expr (nth 2 a) 0)
|
|
|
|
|
","
|
|
|
|
|
(math-compose-expr (nth 1 a) 0)
|
|
|
|
|
")"))
|
|
|
|
|
|
|
|
|
|
(put 'giac 'math-variable-table
|
|
|
|
|
'(( infinity . var-inf)
|
|
|
|
|
( infinity . var-uinf)))
|
|
|
|
|
|
2007-12-29 04:27:46 +00:00
|
|
|
|
(put 'giac 'math-complex-format 'i)
|
|
|
|
|
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
(add-to-list 'calc-lang-allow-underscores 'giac)
|
|
|
|
|
|
|
|
|
|
(put 'giac 'math-compose-subscr
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(let ((args (cdr (cdr a))))
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 1 a) 1000)
|
|
|
|
|
"["
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(math-compose-expr
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
(calc-normalize (list '- (nth 2 a) 1)) 0)
|
|
|
|
|
"]")))))
|
|
|
|
|
|
|
|
|
|
(defun math-read-giac-subscr (x op)
|
|
|
|
|
(let ((idx (math-read-expr-level 0)))
|
|
|
|
|
(or (equal math-expr-data "]")
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-24 23:39:33 -07:00
|
|
|
|
(throw 'syntax "Expected ‘]’"))
|
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-yacas-parse-Sum, math-yacas-compose-sum)
(math-yacas-compose-deriv, math-yacas-compose-taylor)
(math-maxima-parse-subst, math-maxima-parse-taylor)
(math-maxima-compose-taylor, math-maxima-compose-subst)
(math-maxima-compose-if, math-lang-switch-args)
(math-lang-compose-switch-args, math-read-giac-subscr):
New functions.
(calc-lang-allow-underscores, calc-lang-allow-percentsigns)
(calc-lang-brackets-are-subscripts, calc-lang-c-type-hex):
Add languages.
(math-vector-brackets, math-complex-format, math-variable-table)
(math-parse-table, math-oper-table, math-function-table)
(math-special-function-table, math-compose-subscr):
Add values for new languages.
2007-12-29 00:56:17 +00:00
|
|
|
|
(math-read-token)
|
|
|
|
|
(list 'calcFunc-subscr x (calc-normalize (list '+ idx 1)))))
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-c-type-hex 'giac)
|
|
|
|
|
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calc-mathematica-language ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'math)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(message "Mathematica language mode")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'math 'math-oper-table
|
|
|
|
|
'( ( "[[" (math-read-math-subscr) 250 -1 )
|
|
|
|
|
( "!" calcFunc-fact 210 -1 )
|
|
|
|
|
( "!!" calcFunc-dfact 210 -1 )
|
|
|
|
|
( "^" ^ 201 200 )
|
|
|
|
|
( "u+" ident -1 197 )
|
|
|
|
|
( "u-" neg -1 197 )
|
|
|
|
|
( "/" / 195 196 )
|
|
|
|
|
( "*" * 190 191 )
|
|
|
|
|
( "2x" * 190 191 )
|
|
|
|
|
( "+" + 180 181 )
|
|
|
|
|
( "-" - 180 181 )
|
|
|
|
|
( "<" calcFunc-lt 160 161 )
|
|
|
|
|
( ">" calcFunc-gt 160 161 )
|
|
|
|
|
( "<=" calcFunc-leq 160 161 )
|
|
|
|
|
( ">=" calcFunc-geq 160 161 )
|
|
|
|
|
( "==" calcFunc-eq 150 151 )
|
|
|
|
|
( "!=" calcFunc-neq 150 151 )
|
|
|
|
|
( "u!" calcFunc-lnot -1 121 )
|
|
|
|
|
( "&&" calcFunc-land 110 111 )
|
|
|
|
|
( "||" calcFunc-lor 100 101 )
|
|
|
|
|
( "!!!" calcFunc-pnot -1 85 )
|
|
|
|
|
( "&&&" calcFunc-pand 80 81 )
|
|
|
|
|
( "|||" calcFunc-por 75 76 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )
|
|
|
|
|
( "=" calcFunc-assign 51 50 )
|
|
|
|
|
( "->" calcFunc-assign 51 50 )
|
|
|
|
|
( ":>" calcFunc-assign 51 50 )
|
|
|
|
|
( "::" calcFunc-condition 45 46 )
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(put 'math 'math-function-table
|
|
|
|
|
'( ( Abs . calcFunc-abs )
|
|
|
|
|
( ArcCos . calcFunc-arccos )
|
|
|
|
|
( ArcCosh . calcFunc-arccosh )
|
|
|
|
|
( ArcSin . calcFunc-arcsin )
|
|
|
|
|
( ArcSinh . calcFunc-arcsinh )
|
|
|
|
|
( ArcTan . calcFunc-arctan )
|
|
|
|
|
( ArcTanh . calcFunc-arctanh )
|
|
|
|
|
( Arg . calcFunc-arg )
|
|
|
|
|
( Binomial . calcFunc-choose )
|
|
|
|
|
( Ceiling . calcFunc-ceil )
|
|
|
|
|
( Conjugate . calcFunc-conj )
|
|
|
|
|
( Cos . calcFunc-cos )
|
|
|
|
|
( Cosh . calcFunc-cosh )
|
2005-03-29 04:54:48 +00:00
|
|
|
|
( Cot . calcFunc-cot )
|
|
|
|
|
( Coth . calcFunc-coth )
|
|
|
|
|
( Csc . calcFunc-csc )
|
|
|
|
|
( Csch . calcFunc-csch )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( D . calcFunc-deriv )
|
|
|
|
|
( Dt . calcFunc-tderiv )
|
|
|
|
|
( Det . calcFunc-det )
|
|
|
|
|
( Exp . calcFunc-exp )
|
|
|
|
|
( EulerPhi . calcFunc-totient )
|
|
|
|
|
( Floor . calcFunc-floor )
|
|
|
|
|
( Gamma . calcFunc-gamma )
|
|
|
|
|
( GCD . calcFunc-gcd )
|
|
|
|
|
( If . calcFunc-if )
|
|
|
|
|
( Im . calcFunc-im )
|
|
|
|
|
( Inverse . calcFunc-inv )
|
|
|
|
|
( Integrate . calcFunc-integ )
|
|
|
|
|
( Join . calcFunc-vconcat )
|
|
|
|
|
( LCM . calcFunc-lcm )
|
|
|
|
|
( Log . calcFunc-ln )
|
|
|
|
|
( Max . calcFunc-max )
|
|
|
|
|
( Min . calcFunc-min )
|
|
|
|
|
( Mod . calcFunc-mod )
|
|
|
|
|
( MoebiusMu . calcFunc-moebius )
|
|
|
|
|
( Random . calcFunc-random )
|
|
|
|
|
( Round . calcFunc-round )
|
|
|
|
|
( Re . calcFunc-re )
|
2005-03-29 04:54:48 +00:00
|
|
|
|
( Sec . calcFunc-sec )
|
|
|
|
|
( Sech . calcFunc-sech )
|
2001-11-06 18:59:06 +00:00
|
|
|
|
( Sign . calcFunc-sign )
|
|
|
|
|
( Sin . calcFunc-sin )
|
|
|
|
|
( Sinh . calcFunc-sinh )
|
|
|
|
|
( Sqrt . calcFunc-sqrt )
|
|
|
|
|
( Tan . calcFunc-tan )
|
|
|
|
|
( Tanh . calcFunc-tanh )
|
|
|
|
|
( Transpose . calcFunc-trn )
|
|
|
|
|
( Length . calcFunc-vlen )
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(put 'math 'math-variable-table
|
|
|
|
|
'( ( I . var-i )
|
|
|
|
|
( Pi . var-pi )
|
|
|
|
|
( E . var-e )
|
|
|
|
|
( GoldenRatio . var-phi )
|
|
|
|
|
( EulerGamma . var-gamma )
|
|
|
|
|
( Infinity . var-inf )
|
|
|
|
|
( ComplexInfinity . var-uinf )
|
|
|
|
|
( Indeterminate . var-nan )
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(put 'math 'math-vector-brackets "{}")
|
|
|
|
|
(put 'math 'math-complex-format 'I)
|
|
|
|
|
(put 'math 'math-function-open "[")
|
|
|
|
|
(put 'math 'math-function-close "]")
|
|
|
|
|
|
|
|
|
|
(put 'math 'math-radix-formatter
|
|
|
|
|
(function (lambda (r s) (format "%d^^%s" r s))))
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'math 'math-lang-read
|
|
|
|
|
'((eq (string-match "\\[\\[\\|->\\|:>" math-exp-str math-exp-pos)
|
|
|
|
|
math-exp-pos)
|
|
|
|
|
(setq math-exp-token 'punc
|
|
|
|
|
math-expr-data (math-match-substring math-exp-str 0)
|
|
|
|
|
math-exp-pos (match-end 0))))
|
|
|
|
|
|
|
|
|
|
(put 'math 'math-compose-subscr
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 1 a) 1000)
|
|
|
|
|
"[["
|
|
|
|
|
(math-compose-expr (nth 2 a) 0)
|
|
|
|
|
"]]"))))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun math-read-math-subscr (x op)
|
|
|
|
|
(let ((idx (math-read-expr-level 0)))
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(or (and (equal math-expr-data "]")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(math-read-token)
|
2004-11-09 20:32:13 +00:00
|
|
|
|
(equal math-expr-data "]")))
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-24 23:39:33 -07:00
|
|
|
|
(throw 'syntax "Expected ‘]]’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(list 'calcFunc-subscr x idx)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun calc-maple-language ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(calc-set-language 'maple)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(message "Maple language mode")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'maple 'math-oper-table
|
|
|
|
|
'( ( "matrix" ident -1 300 )
|
|
|
|
|
( "MATRIX" ident -1 300 )
|
|
|
|
|
( "!" calcFunc-fact 210 -1 )
|
|
|
|
|
( "^" ^ 201 200 )
|
|
|
|
|
( "**" ^ 201 200 )
|
|
|
|
|
( "u+" ident -1 197 )
|
|
|
|
|
( "u-" neg -1 197 )
|
|
|
|
|
( "/" / 191 192 )
|
|
|
|
|
( "*" * 191 192 )
|
|
|
|
|
( "intersect" calcFunc-vint 191 192 )
|
|
|
|
|
( "+" + 180 181 )
|
|
|
|
|
( "-" - 180 181 )
|
|
|
|
|
( "union" calcFunc-vunion 180 181 )
|
|
|
|
|
( "minus" calcFunc-vdiff 180 181 )
|
|
|
|
|
( "mod" % 170 170 )
|
|
|
|
|
( ".." (math-read-maple-dots) 165 165 )
|
|
|
|
|
( "\\dots" (math-read-maple-dots) 165 165 )
|
|
|
|
|
( "<" calcFunc-lt 160 160 )
|
|
|
|
|
( ">" calcFunc-gt 160 160 )
|
|
|
|
|
( "<=" calcFunc-leq 160 160 )
|
|
|
|
|
( ">=" calcFunc-geq 160 160 )
|
|
|
|
|
( "=" calcFunc-eq 160 160 )
|
|
|
|
|
( "<>" calcFunc-neq 160 160 )
|
|
|
|
|
( "not" calcFunc-lnot -1 121 )
|
|
|
|
|
( "and" calcFunc-land 110 111 )
|
|
|
|
|
( "or" calcFunc-lor 100 101 )
|
|
|
|
|
( "!!!" calcFunc-pnot -1 85 )
|
|
|
|
|
( "&&&" calcFunc-pand 80 81 )
|
|
|
|
|
( "|||" calcFunc-por 75 76 )
|
|
|
|
|
( ":=" calcFunc-assign 51 50 )
|
|
|
|
|
( "::" calcFunc-condition 45 46 )
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(put 'maple 'math-function-table
|
|
|
|
|
'( ( bernoulli . calcFunc-bern )
|
|
|
|
|
( binomial . calcFunc-choose )
|
|
|
|
|
( diff . calcFunc-deriv )
|
|
|
|
|
( GAMMA . calcFunc-gamma )
|
|
|
|
|
( ifactor . calcFunc-prfac )
|
|
|
|
|
( igcd . calcFunc-gcd )
|
|
|
|
|
( ilcm . calcFunc-lcm )
|
|
|
|
|
( int . calcFunc-integ )
|
|
|
|
|
( modp . % )
|
|
|
|
|
( irem . % )
|
|
|
|
|
( iquo . calcFunc-idiv )
|
|
|
|
|
( isprime . calcFunc-prime )
|
|
|
|
|
( length . calcFunc-vlen )
|
|
|
|
|
( member . calcFunc-in )
|
|
|
|
|
( crossprod . calcFunc-cross )
|
|
|
|
|
( inverse . calcFunc-inv )
|
|
|
|
|
( trace . calcFunc-tr )
|
|
|
|
|
( transpose . calcFunc-trn )
|
|
|
|
|
( vectdim . calcFunc-vlen )
|
|
|
|
|
))
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'maple 'math-special-function-table
|
|
|
|
|
'((intv . math-compose-maple-intv)))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(put 'maple 'math-variable-table
|
|
|
|
|
'( ( I . var-i )
|
|
|
|
|
( Pi . var-pi )
|
|
|
|
|
( E . var-e )
|
|
|
|
|
( infinity . var-inf )
|
|
|
|
|
( infinity . var-uinf )
|
|
|
|
|
( infinity . var-nan )
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(put 'maple 'math-complex-format 'I)
|
|
|
|
|
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(put 'maple 'math-matrix-formatter
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(list 'horiz
|
|
|
|
|
"matrix("
|
|
|
|
|
math-comp-left-bracket
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(math-compose-vector (cdr a)
|
(math-compose-vector, math-compose-var, math-tex-expr-is-flat):
Declare as functions.
(calc-lang-slash-idiv, calc-lang-allow-underscores)
math-comp-left-bracket, math-comp-right-bracket, math-comp-comma)
(math-comp-vector-prec): Declare as variables.
(math-var-formatter, math-matrix-formatter,math-lang-adjust-words)
(math-lang-read-symbol, math-land-read, math-punc-table)
(math-compose-subscr,math-dots,math-func-formatter): New property
names to store language specific information.
(math-compose-tex-var, math-compose-tex-intv)
(math-compose-maple-intv, math-compose-eqn-intv, math-compose-tex-sum)
(math-compose-tex-func, math-compose-tex-intv): New functions.
(math-eqn-ignore-words,math-tex-ignore-words,math-latex-ignore-words):
Move from calc.el.
(math-special-function-table): Add entries for tex.
(calc-lang-slash-idiv, calc-lang-allows-underscores): New variables.
(math-compose-latex-frac): Rename from `math-latex-print-frac'.
(math-compose-tex-matrix, math-compose-eqn-matrix)
(math-eqn-special-functions): Move from calccomp.el
2007-12-02 03:17:22 +00:00
|
|
|
|
(concat math-comp-comma " ")
|
|
|
|
|
math-comp-vector-prec)
|
|
|
|
|
math-comp-right-bracket
|
|
|
|
|
")"))))
|
|
|
|
|
|
|
|
|
|
(put 'maple 'math-compose-subscr
|
|
|
|
|
(function
|
|
|
|
|
(lambda (a)
|
|
|
|
|
(let ((args (cdr (cdr a))))
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 1 a) 1000)
|
|
|
|
|
"["
|
|
|
|
|
(math-compose-vector args ", " 0)
|
|
|
|
|
"]")))))
|
|
|
|
|
|
|
|
|
|
(add-to-list 'calc-lang-allow-underscores 'maple)
|
|
|
|
|
(add-to-list 'calc-lang-brackets-are-subscripts 'maple)
|
|
|
|
|
|
|
|
|
|
(defun math-compose-maple-intv (a)
|
|
|
|
|
(list 'horiz
|
|
|
|
|
(math-compose-expr (nth 2 a) 0)
|
|
|
|
|
" .. "
|
|
|
|
|
(math-compose-expr (nth 3 a) 0)))
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun math-read-maple-dots (x op)
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(list 'intv 3 x (math-read-expr-level (nth 3 op))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
;; The variable math-read-big-lines is local to math-read-big-expr in
|
|
|
|
|
;; calc-ext.el, but is used by math-read-big-rec, math-read-big-char,
|
|
|
|
|
;; math-read-big-emptyp, math-read-big-error and math-read-big-balance,
|
|
|
|
|
;; which are called (directly and indirectly) by math-read-big-expr.
|
|
|
|
|
;; It is also local to math-read-big-bigp in calc-ext.el, which calls
|
|
|
|
|
;; math-read-big-balance.
|
|
|
|
|
(defvar math-read-big-lines)
|
|
|
|
|
|
|
|
|
|
;; The variables math-read-big-baseline and math-read-big-h2 are
|
|
|
|
|
;; local to math-read-big-expr in calc-ext.el, but used by
|
|
|
|
|
;; math-read-big-rec.
|
|
|
|
|
(defvar math-read-big-baseline)
|
|
|
|
|
(defvar math-read-big-h2)
|
|
|
|
|
|
2010-06-22 00:41:10 -07:00
|
|
|
|
;; The variables math-rb-h1, math-rb-h2, math-rb-v1 and math-rb-v2
|
|
|
|
|
;; are local to math-read-big-rec, but are used by math-read-big-char,
|
|
|
|
|
;; math-read-big-emptyp and math-read-big-balance which are called by
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
;; math-read-big-rec.
|
|
|
|
|
;; math-rb-h2 is also local to math-read-big-bigp in calc-ext.el,
|
|
|
|
|
;; which calls math-read-big-balance.
|
|
|
|
|
(defvar math-rb-h1)
|
|
|
|
|
(defvar math-rb-h2)
|
|
|
|
|
(defvar math-rb-v1)
|
|
|
|
|
(defvar math-rb-v2)
|
|
|
|
|
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(defun math-read-big-rec (math-rb-h1 math-rb-v1 math-rb-h2 math-rb-v2
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
&optional baseline prec short)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(or prec (setq prec 0))
|
|
|
|
|
|
|
|
|
|
;; Clip whitespace above or below.
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(while (and (< math-rb-v1 math-rb-v2)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 math-rb-h2 (1+ math-rb-v1)))
|
|
|
|
|
(setq math-rb-v1 (1+ math-rb-v1)))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(while (and (< math-rb-v1 math-rb-v2)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1- math-rb-v2) math-rb-h2 math-rb-v2))
|
|
|
|
|
(setq math-rb-v2 (1- math-rb-v2)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; If formula is a single line high, normal parser can handle it.
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(if (<= math-rb-v2 (1+ math-rb-v1))
|
|
|
|
|
(if (or (<= math-rb-v2 math-rb-v1)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(> math-rb-h1 (length (setq math-rb-v2
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(nth math-rb-v1 math-read-big-lines)))))
|
|
|
|
|
(math-read-big-error math-rb-h1 math-rb-v1)
|
|
|
|
|
(setq math-read-big-baseline math-rb-v1
|
|
|
|
|
math-read-big-h2 math-rb-h2
|
|
|
|
|
math-rb-v2 (nth math-rb-v1 math-read-big-lines)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
math-rb-h2 (math-read-expr
|
|
|
|
|
(substring math-rb-v2 math-rb-h1
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(min math-rb-h2 (length math-rb-v2)))))
|
|
|
|
|
(if (eq (car-safe math-rb-h2) 'error)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(math-read-big-error (+ math-rb-h1 (nth 1 math-rb-h2))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
math-rb-v1 (nth 2 math-rb-h2))
|
|
|
|
|
math-rb-h2))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Clip whitespace at left or right.
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(while (and (< math-rb-h1 math-rb-h2)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) math-rb-v2))
|
|
|
|
|
(setq math-rb-h1 (1+ math-rb-h1)))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(while (and (< math-rb-h1 math-rb-h2)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp (1- math-rb-h2) math-rb-v1 math-rb-h2 math-rb-v2))
|
|
|
|
|
(setq math-rb-h2 (1- math-rb-h2)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Scan to find widest left-justified "----" in the region.
|
|
|
|
|
(let* ((widest nil)
|
|
|
|
|
(widest-h2 0)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(lines-v1 (nthcdr math-rb-v1 math-read-big-lines))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(p lines-v1)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(v math-rb-v1)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(other-v nil)
|
|
|
|
|
other-char line len h)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(while (< v math-rb-v2)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq line (car p)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
len (min math-rb-h2 (length line)))
|
|
|
|
|
(and (< math-rb-h1 len)
|
|
|
|
|
(/= (aref line math-rb-h1) ?\ )
|
|
|
|
|
(if (and (= (aref line math-rb-h1) ?\-)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
;; Make sure it's not a minus sign.
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(or (and (< (1+ math-rb-h1) len)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(= (aref line (1+ math-rb-h1)) ?\-))
|
|
|
|
|
(/= (math-read-big-char math-rb-h1 (1- v)) ?\ )
|
|
|
|
|
(/= (math-read-big-char math-rb-h1 (1+ v)) ?\ )))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(setq h math-rb-h1)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(while (and (< (setq h (1+ h)) len)
|
|
|
|
|
(= (aref line h) ?\-)))
|
|
|
|
|
(if (> h widest-h2)
|
|
|
|
|
(setq widest v
|
|
|
|
|
widest-h2 h)))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(or other-v (setq other-v v other-char (aref line math-rb-h1)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq v (1+ v)
|
|
|
|
|
p (cdr p)))
|
|
|
|
|
|
|
|
|
|
(cond ((not (setq v other-v))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-error math-rb-h1 math-rb-v1)) ; Should never happen!
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Quotient.
|
|
|
|
|
(widest
|
|
|
|
|
(setq h widest-h2
|
|
|
|
|
v widest)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(let ((num (math-read-big-rec math-rb-h1 math-rb-v1 h v))
|
|
|
|
|
(den (math-read-big-rec math-rb-h1 (1+ v) h math-rb-v2)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (if (and (math-integerp num) (math-integerp den))
|
|
|
|
|
(math-make-frac num den)
|
|
|
|
|
(list '/ num den)))))
|
|
|
|
|
|
|
|
|
|
;; Big radical sign.
|
|
|
|
|
((= other-char ?\\)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(or (= (math-read-big-char (1+ math-rb-h1) v) ?\|)
|
|
|
|
|
(math-read-big-error (1+ math-rb-h1) v "Malformed root sign"))
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t)
|
|
|
|
|
(while (= (math-read-big-char (1+ math-rb-h1) (setq v (1- v))) ?\|))
|
|
|
|
|
(or (= (math-read-big-char (setq h (+ math-rb-h1 2)) v) ?\_)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-big-error h v "Malformed root sign"))
|
|
|
|
|
(while (= (math-read-big-char (setq h (1+ h)) v) ?\_))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ other-v) h math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (list 'calcFunc-sqrt (math-read-big-rec
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(+ math-rb-h1 2) (1+ v)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
h (1+ other-v) baseline))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
v math-read-big-baseline))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Small radical sign.
|
|
|
|
|
((and (= other-char ?V)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(= (math-read-big-char (1+ math-rb-h1) (1- v)) ?\_))
|
|
|
|
|
(setq h (1+ math-rb-h1))
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 h (1- v) nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(while (= (math-read-big-char (setq h (1+ h)) (1- v)) ?\_))
|
|
|
|
|
(setq p (list 'calcFunc-sqrt (math-read-big-rec
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(1+ math-rb-h1) v h (1+ v) t))
|
|
|
|
|
v math-read-big-baseline))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Binomial coefficient.
|
|
|
|
|
((and (= other-char ?\()
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(= (math-read-big-char (1+ math-rb-h1) v) ?\ )
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(= (string-match "( *)" (nth v math-read-big-lines)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
math-rb-h1) math-rb-h1))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq h (match-end 0))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ v) (1+ math-rb-h1) math-rb-v2 nil t)
|
|
|
|
|
(math-read-big-emptyp (1- h) math-rb-v1 h v nil t)
|
|
|
|
|
(math-read-big-emptyp (1- h) (1+ v) h math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (list 'calcFunc-choose
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-rec (1+ math-rb-h1) math-rb-v1 (1- h) v)
|
|
|
|
|
(math-read-big-rec (1+ math-rb-h1) (1+ v)
|
|
|
|
|
(1- h) math-rb-v2))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Minus sign.
|
|
|
|
|
((= other-char ?\-)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(setq p (list 'neg (math-read-big-rec (1+ math-rb-h1) math-rb-v1
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
math-rb-h2 math-rb-v2 v 250 t))
|
|
|
|
|
v math-read-big-baseline
|
|
|
|
|
h math-read-big-h2))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Parentheses.
|
|
|
|
|
((= other-char ?\()
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ v) (1+ math-rb-h1) math-rb-v2 nil t)
|
|
|
|
|
(setq h (math-read-big-balance (1+ math-rb-h1) v "(" t))
|
|
|
|
|
(math-read-big-emptyp (1- h) math-rb-v1 h v nil t)
|
|
|
|
|
(math-read-big-emptyp (1- h) (1+ v) h math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let ((sep (math-read-big-char (1- h) v))
|
|
|
|
|
hmid)
|
|
|
|
|
(if (= sep ?\.)
|
|
|
|
|
(setq h (1+ h)))
|
|
|
|
|
(if (= sep ?\])
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(math-read-big-error (1- h) v "Expected ‘)’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (= sep ?\))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(setq p (math-read-big-rec
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(1+ math-rb-h1) math-rb-v1 (1- h) math-rb-v2 v))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq hmid (math-read-big-balance h v "(")
|
2010-06-22 00:41:10 -07:00
|
|
|
|
p (list p
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-rec h math-rb-v1 (1- hmid) math-rb-v2 v))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
h hmid)
|
|
|
|
|
(cond ((= sep ?\.)
|
|
|
|
|
(setq p (cons 'intv (cons (if (= (math-read-big-char
|
|
|
|
|
(1- h) v)
|
|
|
|
|
?\))
|
|
|
|
|
0 1)
|
|
|
|
|
p))))
|
|
|
|
|
((= (math-read-big-char (1- h) v) ?\])
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(math-read-big-error (1- h) v "Expected ‘)’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((= sep ?\,)
|
|
|
|
|
(or (and (math-realp (car p)) (math-realp (nth 1 p)))
|
|
|
|
|
(math-read-big-error
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
math-rb-h1 v "Complex components must be real"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (cons 'cplx p)))
|
|
|
|
|
((= sep ?\;)
|
|
|
|
|
(or (and (math-realp (car p)) (math-anglep (nth 1 p)))
|
|
|
|
|
(math-read-big-error
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
math-rb-h1 v "Complex components must be real"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (cons 'polar p)))))))
|
|
|
|
|
|
|
|
|
|
;; Matrix.
|
|
|
|
|
((and (= other-char ?\[)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(or (= (math-read-big-char (setq h math-rb-h1) (1+ v)) ?\[)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(= (math-read-big-char (setq h (1+ h)) v) ?\[)
|
|
|
|
|
(and (= (math-read-big-char h v) ?\ )
|
|
|
|
|
(= (math-read-big-char (setq h (1+ h)) v) ?\[)))
|
|
|
|
|
(= (math-read-big-char h (1+ v)) ?\[))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let ((vtop v)
|
|
|
|
|
(hleft h)
|
|
|
|
|
(hright nil))
|
|
|
|
|
(setq p nil)
|
|
|
|
|
(while (progn
|
|
|
|
|
(setq h (math-read-big-balance (1+ hleft) v "["))
|
|
|
|
|
(if hright
|
|
|
|
|
(or (= h hright)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(math-read-big-error hright v "Expected ‘]’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq hright h))
|
|
|
|
|
(setq p (cons (math-read-big-rec
|
|
|
|
|
hleft v h (1+ v)) p))
|
|
|
|
|
(and (memq (math-read-big-char h v) '(?\ ?\,))
|
|
|
|
|
(= (math-read-big-char hleft (1+ v)) ?\[)))
|
|
|
|
|
(setq v (1+ v)))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(or (= hleft math-rb-h1)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(if (= (math-read-big-char h v) ?\ )
|
|
|
|
|
(setq h (1+ h)))
|
|
|
|
|
(and (= (math-read-big-char h v) ?\])
|
|
|
|
|
(setq h (1+ h))))
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(math-read-big-error (1- h) v "Expected ‘]’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (= (math-read-big-char h vtop) ?\,)
|
|
|
|
|
(setq h (1+ h)))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ v) (1- h) math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq v (+ vtop (/ (- v vtop) 2))
|
|
|
|
|
p (cons 'vec (nreverse p)))))
|
|
|
|
|
|
|
|
|
|
;; Square brackets.
|
|
|
|
|
((= other-char ?\[)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 (1+ math-rb-h1) v nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ v) (1+ math-rb-h1) math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p nil
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
h (1+ math-rb-h1))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(while (progn
|
|
|
|
|
(setq widest (math-read-big-balance h v "[" t))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp (1- h) math-rb-v1 h v nil t)
|
|
|
|
|
(math-read-big-emptyp (1- h) (1+ v) h math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (cons (math-read-big-rec
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
h math-rb-v1 (1- widest) math-rb-v2 v) p)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
h widest)
|
|
|
|
|
(= (math-read-big-char (1- h) v) ?\,)))
|
|
|
|
|
(setq widest (math-read-big-char (1- h) v))
|
|
|
|
|
(if (or (memq widest '(?\; ?\)))
|
|
|
|
|
(and (eq widest ?\.) (cdr p)))
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(math-read-big-error (1- h) v "Expected ‘]’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (= widest ?\.)
|
|
|
|
|
(setq h (1+ h)
|
|
|
|
|
widest (math-read-big-balance h v "[")
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
p (nconc p (list (math-read-big-rec
|
|
|
|
|
h math-rb-v1 (1- widest) math-rb-v2 v)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
h widest
|
|
|
|
|
p (cons 'intv (cons (if (= (math-read-big-char (1- h) v)
|
|
|
|
|
?\])
|
|
|
|
|
3 2)
|
|
|
|
|
p)))
|
|
|
|
|
(setq p (cons 'vec (nreverse p)))))
|
|
|
|
|
|
|
|
|
|
;; Date form.
|
|
|
|
|
((= other-char ?\<)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(setq line (nth v math-read-big-lines))
|
|
|
|
|
(string-match ">" line math-rb-h1)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq h (match-end 0))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t)
|
|
|
|
|
(setq p (math-read-big-rec math-rb-h1 v h (1+ v) v)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Variable name or function call.
|
|
|
|
|
((or (and (>= other-char ?a) (<= other-char ?z))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(and (>= other-char ?A) (<= other-char ?Z))
|
|
|
|
|
(and (>= other-char ?α) (<= other-char ?ω))
|
|
|
|
|
(and (>= other-char ?Α) (<= other-char ?Ω)))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(setq line (nth v math-read-big-lines))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(string-match "\\([a-zA-Zα-ωΑ-Ω'_]+\\) *" line math-rb-h1)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq h (match-end 1)
|
|
|
|
|
widest (match-end 0)
|
|
|
|
|
p (math-match-substring line 1))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (= (math-read-big-char widest v) ?\()
|
|
|
|
|
(progn
|
|
|
|
|
(setq line (if (string-match "-" p)
|
|
|
|
|
(intern p)
|
|
|
|
|
(intern (concat "calcFunc-" p)))
|
|
|
|
|
h (1+ widest)
|
|
|
|
|
p nil)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp widest math-rb-v1 h v nil t)
|
|
|
|
|
(math-read-big-emptyp widest (1+ v) h math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(while (progn
|
|
|
|
|
(setq widest (math-read-big-balance h v "(" t))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp (1- h) math-rb-v1 h v nil t)
|
|
|
|
|
(math-read-big-emptyp (1- h) (1+ v) h math-rb-v2 nil t)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (cons (math-read-big-rec
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
h math-rb-v1 (1- widest) math-rb-v2 v) p)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
h widest)
|
|
|
|
|
(= (math-read-big-char (1- h) v) ?\,)))
|
|
|
|
|
(or (= (math-read-big-char (1- h) v) ?\))
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(math-read-big-error (1- h) v "Expected ‘)’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (cons line (nreverse p))))
|
|
|
|
|
(setq p (list 'var
|
|
|
|
|
(intern (math-remove-dashes p))
|
|
|
|
|
(if (string-match "-" p)
|
|
|
|
|
(intern p)
|
|
|
|
|
(intern (concat "var-" p)))))))
|
|
|
|
|
|
|
|
|
|
;; Number.
|
|
|
|
|
(t
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(setq line (nth v math-read-big-lines))
|
|
|
|
|
(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)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-big-error h v "Expected a number"))
|
|
|
|
|
(setq h (match-end 0)
|
|
|
|
|
p (math-read-number (math-match-substring line 0)))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-emptyp math-rb-h1 math-rb-v1 h v nil t)
|
|
|
|
|
(math-read-big-emptyp math-rb-h1 (1+ v) h math-rb-v2 nil t)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2010-06-22 00:41:10 -07:00
|
|
|
|
;; Now left term is bounded by math-rb-h1, math-rb-v1, h, math-rb-v2;
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
;; baseline = v.
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if baseline
|
|
|
|
|
(or (= v baseline)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-error math-rb-h1 v "Inconsistent baseline in formula"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq baseline v))
|
|
|
|
|
|
|
|
|
|
;; Look for superscripts or subscripts.
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(setq line (nth baseline math-read-big-lines)
|
|
|
|
|
len (min math-rb-h2 (length line))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
widest h)
|
|
|
|
|
(while (and (< widest len)
|
|
|
|
|
(= (aref line widest) ?\ ))
|
|
|
|
|
(setq widest (1+ widest)))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(and (>= widest len) (setq widest math-rb-h2))
|
|
|
|
|
(if (math-read-big-emptyp h v widest math-rb-v2)
|
|
|
|
|
(if (math-read-big-emptyp h math-rb-v1 widest v)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq h widest)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(setq p (list '^ p (math-read-big-rec h math-rb-v1 widest v))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
h widest))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(if (math-read-big-emptyp h math-rb-v1 widest v)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (list 'calcFunc-subscr p
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-rec h v widest math-rb-v2))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
h widest)))
|
|
|
|
|
|
|
|
|
|
;; Look for an operator name and grab additional terms.
|
|
|
|
|
(while (and (< h len)
|
|
|
|
|
(if (setq widest (and (math-read-big-emptyp
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
h math-rb-v1 (1+ h) v)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-big-emptyp
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
h (1+ v) (1+ h) math-rb-v2)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(string-match "<=\\|>=\\|\\+/-\\|!=\\|&&\\|||\\|:=\\|=>\\|." line h)
|
|
|
|
|
(assoc (math-match-substring line 0)
|
2007-06-20 04:15:12 +00:00
|
|
|
|
(math-standard-ops))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(and (>= (nth 2 widest) prec)
|
|
|
|
|
(setq h (match-end 0)))
|
|
|
|
|
(and (not (eq (string-match ",\\|;\\|\\.\\.\\|)\\|\\]\\|:" line h)
|
|
|
|
|
h))
|
|
|
|
|
(setq widest '("2x" * 196 195)))))
|
|
|
|
|
(cond ((eq (nth 3 widest) -1)
|
|
|
|
|
(setq p (list (nth 1 widest) p)))
|
|
|
|
|
((equal (car widest) "?")
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(let ((y (math-read-big-rec h math-rb-v1 math-rb-h2
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
math-rb-v2 baseline nil t)))
|
|
|
|
|
(or (= (math-read-big-char math-read-big-h2 baseline) ?\:)
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(math-read-big-error math-read-big-h2 baseline
|
|
|
|
|
"Expected ‘:’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (list (nth 1 widest) p y
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(math-read-big-rec
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(1+ math-read-big-h2) math-rb-v1 math-rb-h2 math-rb-v2
|
|
|
|
|
baseline (nth 3 widest) t))
|
|
|
|
|
h math-read-big-h2)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(t
|
|
|
|
|
(setq p (list (nth 1 widest) p
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(math-read-big-rec h math-rb-v1 math-rb-h2 math-rb-v2
|
2001-11-06 18:59:06 +00:00
|
|
|
|
baseline (nth 3 widest) t))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
h math-read-big-h2))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; Return all relevant information to caller.
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(setq math-read-big-baseline baseline
|
|
|
|
|
math-read-big-h2 h)
|
|
|
|
|
(or short (= math-read-big-h2 math-rb-h2)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-big-error h baseline))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
p)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-read-big-char (h v)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(or (and (>= h math-rb-h1)
|
|
|
|
|
(< h math-rb-h2)
|
|
|
|
|
(>= v math-rb-v1)
|
|
|
|
|
(< v math-rb-v2)
|
|
|
|
|
(let ((line (nth v math-read-big-lines)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(and line
|
|
|
|
|
(< h (length line))
|
|
|
|
|
(aref line h))))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
?\ ))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-read-big-emptyp (eh1 ev1 eh2 ev2 &optional what error)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(and (< ev1 math-rb-v1) (setq ev1 math-rb-v1))
|
|
|
|
|
(and (< eh1 math-rb-h1) (setq eh1 math-rb-h1))
|
|
|
|
|
(and (> ev2 math-rb-v2) (setq ev2 math-rb-v2))
|
|
|
|
|
(and (> eh2 math-rb-h2) (setq eh2 math-rb-h2))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(or what (setq what ?\ ))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(let ((p (nthcdr ev1 math-read-big-lines))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
h)
|
|
|
|
|
(while (and (< ev1 ev2)
|
|
|
|
|
(progn
|
|
|
|
|
(setq h (min eh2 (length (car p))))
|
|
|
|
|
(while (and (>= (setq h (1- h)) eh1)
|
|
|
|
|
(= (aref (car p) h) what)))
|
|
|
|
|
(and error (>= h eh1)
|
|
|
|
|
(math-read-big-error h ev1 (if (stringp error)
|
|
|
|
|
error
|
|
|
|
|
"Whitespace expected")))
|
|
|
|
|
(< h eh1)))
|
|
|
|
|
(setq ev1 (1+ ev1)
|
|
|
|
|
p (cdr p)))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(>= ev1 ev2)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
;; math-read-big-err-msg is local to math-read-big-expr in calc-ext.el,
|
|
|
|
|
;; but is used by math-read-big-error which is called (indirectly) by
|
|
|
|
|
;; math-read-big-expr.
|
|
|
|
|
(defvar math-read-big-err-msg)
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun math-read-big-error (h v &optional msg)
|
|
|
|
|
(let ((pos 0)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(p math-read-big-lines))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(while (> v 0)
|
|
|
|
|
(setq pos (+ pos 1 (length (car p)))
|
|
|
|
|
p (cdr p)
|
|
|
|
|
v (1- v)))
|
|
|
|
|
(setq h (+ pos (min h (length (car p))))
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
math-read-big-err-msg (list 'error h (or msg "Syntax error")))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
(throw 'syntax nil)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-read-big-balance (h v what &optional commas)
|
(math-read-big-lines): New variable.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-error, math-read-big-balance): Replace variable
lines by declared variable.
(math-read-big-baseline, math-read-big-h2): New variables.
(math-read-big-rec): Replace variables the-baseline and the-h2
by declared variables.
(math-read-big-rec): Fix typo.
(math-read-big-balance): Replace unbound variable by value.
(math-rb-h1, math-rb-h2, math-rb-v1, math-rb-v2): New variables.
(math-read-big-rec, math-read-big-char, math-read-big-emptyp)
(math-read-big-balance): Replace variables h1, h2, v1 and v2 by
declared variables.
(math-read-big-err-msg): New variable.
(math-read-big-error): Replace variable err-msg by declared variable.
2004-11-22 04:53:51 +00:00
|
|
|
|
(let* ((line (nth v math-read-big-lines))
|
|
|
|
|
(len (min math-rb-h2 (length line)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(count 1))
|
|
|
|
|
(while (> count 0)
|
|
|
|
|
(if (>= h len)
|
|
|
|
|
(if what
|
More-conservative ‘format’ quote restyling
Instead of restyling curved quotes for every call to ‘format’,
create a new function ‘format-message’ that does the restyling,
and using the new function instead of ‘format’ only in contexts
where this seems appropriate.
Problem reported by Dmitry Gutov and Andreas Schwab in:
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00826.html
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00827.html
* doc/lispref/commands.texi (Using Interactive):
* doc/lispref/control.texi (Signaling Errors, Signaling Errors):
* doc/lispref/display.texi (Displaying Messages, Progress):
* doc/lispref/elisp.texi:
* doc/lispref/help.texi (Keys in Documentation):
* doc/lispref/minibuf.texi (Minibuffer Misc):
* doc/lispref/strings.texi (Formatting Strings):
* etc/NEWS:
Document the changes.
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/apropos.el (apropos-library):
* lisp/calc/calc-ext.el (calc-record-message)
(calc-user-function-list):
* lisp/calc/calc-help.el (calc-describe-key, calc-full-help):
* lisp/calc/calc-lang.el (math-read-big-balance):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--add-diary-entry):
* lisp/cedet/mode-local.el (mode-local-print-binding)
(mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-completion-message):
* lisp/cedet/semantic/edit.el (semantic-parse-changes-failed):
* lisp/cedet/semantic/wisent/comp.el (wisent-log):
* lisp/cedet/srecode/insert.el (srecode-insert-show-error-report):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dframe.el (dframe-message):
* lisp/dired-aux.el (dired-query):
* lisp/emacs-lisp/byte-opt.el (byte-compile-log-lap-1):
* lisp/emacs-lisp/bytecomp.el (byte-compile-log)
(byte-compile-log-file, byte-compile-warn, byte-compile-form):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use)
(cconv-analyze-form):
* lisp/emacs-lisp/check-declare.el (check-declare-warn):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet):
* lisp/emacs-lisp/edebug.el (edebug-format):
* lisp/emacs-lisp/eieio-core.el (eieio-oref):
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message)
(eldoc-message):
* lisp/emacs-lisp/elint.el (elint-file, elint-log):
* lisp/emacs-lisp/find-func.el (find-function-library):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring):
* lisp/emacs-lisp/package.el (package-compute-transaction)
(package-install-button-action, package-delete-button-action)
(package-menu--list-to-prompt):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emacs-lisp/warnings.el (lwarn, warn):
* lisp/emulation/viper-cmd.el:
(viper-toggle-parse-sexp-ignore-comments)
(viper-kill-buffer, viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/facemenu.el (facemenu-add-new-face):
* lisp/faces.el (face-documentation, read-face-name)
(face-read-string, read-face-font, describe-face):
* lisp/files.el (find-alternate-file, hack-local-variables)
(hack-one-local-variable--obsolete, write-file)
(basic-save-buffer, delete-directory):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--obsolete)
(help-fns--interactive-only, describe-function-1)
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/info-xref.el (info-xref-output):
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
* lisp/international/kkc.el (kkc-error):
* lisp/international/mule-cmds.el:
(select-safe-coding-system-interactively)
(select-safe-coding-system, describe-input-method):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/international/quail.el (quail-error):
* lisp/minibuffer.el (minibuffer-message):
* lisp/mpc.el (mpc--debug):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-message):
* lisp/net/gnutls.el (gnutls-message-maybe):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/nsm.el (nsm-query-user):
* lisp/net/rlogin.el (rlogin):
* lisp/net/soap-client.el (soap-warning):
* lisp/net/tramp.el (tramp-debug-message):
* lisp/nxml/nxml-outln.el (nxml-report-outline-error):
* lisp/nxml/nxml-parse.el (nxml-parse-error):
* lisp/nxml/rng-cmpct.el (rng-c-error):
* lisp/nxml/rng-match.el (rng-compile-error):
* lisp/nxml/rng-uri.el (rng-uri-error):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/org/org-ctags.el:
(org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/proced.el (proced-log):
* lisp/progmodes/ebnf2ps.el (ebnf-log):
* lisp/progmodes/flymake.el (flymake-log):
* lisp/progmodes/vhdl-mode.el (vhdl-warning-when-idle):
* lisp/replace.el (occur-1):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, define-alternatives):
* lisp/startup.el (command-line):
* lisp/subr.el (error, user-error, add-to-list):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* src/callint.c (Fcall_interactively):
* src/editfns.c (Fmessage, Fmessage_box):
Restyle the quotes of format strings intended for use as a
diagnostic, when restyling seems appropriate.
* lisp/subr.el (format-message): New function.
* src/doc.c (Finternal__text_restyle): New function.
(syms_of_doc): Define it.
2015-08-23 22:38:02 -07:00
|
|
|
|
(math-read-big-error nil v (format-message
|
|
|
|
|
"Unmatched ‘%s’" what))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq count 0))
|
|
|
|
|
(if (memq (aref line h) '(?\( ?\[))
|
|
|
|
|
(setq count (1+ count))
|
|
|
|
|
(if (if (and commas (= count 1))
|
|
|
|
|
(or (memq (aref line h) '(?\) ?\] ?\, ?\;))
|
|
|
|
|
(and (eq (aref line h) ?\.)
|
|
|
|
|
(< (1+ h) len)
|
|
|
|
|
(eq (aref line (1+ h)) ?\.)))
|
|
|
|
|
(memq (aref line h) '(?\) ?\])))
|
|
|
|
|
(setq count (1- count))))
|
|
|
|
|
(setq h (1+ h))))
|
2001-11-14 09:09:09 +00:00
|
|
|
|
h))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2004-11-30 17:14:06 +00:00
|
|
|
|
(provide 'calc-lang)
|
|
|
|
|
|
2010-06-22 00:41:10 -07:00
|
|
|
|
;; Local variables:
|
|
|
|
|
;; coding: utf-8
|
|
|
|
|
;; End:
|
|
|
|
|
|
2001-11-14 09:09:09 +00:00
|
|
|
|
;;; calc-lang.el ends here
|