Mercurial > emacs
annotate lisp/calc/calc-units.el @ 112453:06719a229a46 default tip
* calc/calc.el (calc-default-power-reference-level)
(calc-default-field-reference-level): New variables.
* calc/calc-units.el (math-standard-units): Add dB and Np.
(math-logunits): New variable.
(math-extract-logunits, math-logcombine, calcFunc-luplus)
(calcFunc-luminus, calc-luplus, calc-luminus, math-logunit-level)
(calcFunc-fieldlevel, calcFunc-powerlevel, calc-level): New
functions.
(math-find-base-units-rec): Add entry for ln(10).
* calc/calc-help.el (calc-u-prefix-help): Add logarithmic help.
(calc-ul-prefix-help): New function.
* calc/calc-ext.el (calc-init-extensions): Autoload new units
functions. Add keybindings for new units functions.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Sun, 23 Jan 2011 23:08:04 -0600 |
parents | 61f7601898b1 |
children |
rev | line source |
---|---|
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1 ;;; calc-units.el --- unit conversion functions for Calc |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
2 |
112284
61f7601898b1
Refill some copyright headers.
Glenn Morris <rgm@gnu.org>
parents:
112278
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005, |
61f7601898b1
Refill some copyright headers.
Glenn Morris <rgm@gnu.org>
parents:
112278
diff
changeset
|
4 ;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
5 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
6 ;; Author: David Gillespie <daveg@synaptics.com> |
77465
1154f082efd9
Update maintainer's address.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
76595
diff
changeset
|
7 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com> |
40785 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; (at your option) any later version. |
40785 | 15 |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
19 ;; GNU General Public License for more details. |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
20 |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
40785 | 23 |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
24 ;;; Commentary: |
40785 | 25 |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
26 ;;; Code: |
40785 | 27 |
28 ;; This file is autoloaded from calc-ext.el. | |
58677
5ef7cf7f3b8f
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58511
diff
changeset
|
29 |
40785 | 30 (require 'calc-ext) |
31 (require 'calc-macs) | |
59394
18e7205127f0
Make sure the proper macro definitions are available when compiling.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58677
diff
changeset
|
32 (eval-when-compile |
18e7205127f0
Make sure the proper macro definitions are available when compiling.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58677
diff
changeset
|
33 (require 'calc-alg)) |
40785 | 34 |
35 ;;; Units operations. | |
36 | |
37 ;;; Units table last updated 9-Jan-91 by Ulrich Mueller (ulm@vsnhd1.cern.ch) | |
38 ;;; with some additions by Przemek Klosowski (przemek@rrdstrad.nist.gov) | |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
39 ;;; Updated April 2002 by Jochen Küpper |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
40 |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
41 ;;; Updated August 2007, using |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
42 ;;; CODATA (http://physics.nist.gov/cuu/Constants/index.html) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
43 ;;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
44 ;;; ESUWM (Encyclopaedia of Scientific Units, Weights and |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
45 ;;; Measures, by François Cardarelli) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
46 ;;; All conversions are exact unless otherwise noted. |
40785 | 47 |
48 (defvar math-standard-units | |
49 '( ;; Length | |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
50 ( m nil "*Meter" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
51 ( in "254*10^(-2) cm" "Inch" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
52 "2.54 cm") |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
53 ( ft "12 in" "Foot") |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
54 ( yd "3 ft" "Yard" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
55 ( mi "5280 ft" "Mile" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
56 ( au "149597870691. m" "Astronomical Unit" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
57 "149597870691 m (*)") |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
58 ;; (approx) NASA JPL (http://neo.jpl.nasa.gov/glossary/au.html) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
59 ( lyr "c yr" "Light Year" ) |
111633
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
60 ( pc "3.0856775854*10^16 m" "Parsec (**)" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
61 "3.0856775854 10^16 m (*)") ;; (approx) ESUWM |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
62 ( nmi "1852 m" "Nautical Mile" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
63 ( fath "6 ft" "Fathom" ) |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
64 ( fur "660 ft" "Furlong") |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
65 ( mu "1 um" "Micron" ) |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
66 ( mil "(1/1000) in" "Mil" ) |
111633
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
67 ( point "(1/72) in" "Point (PostScript convention)" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
68 ( Ang "10^(-10) m" "Angstrom" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
69 ( mfi "mi+ft+in" "Miles + feet + inches" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
70 ;; TeX lengths |
111633
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
71 ( texpt "(100/7227) in" "Point (TeX convention) (**)" ) |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
72 ( texpc "12 texpt" "Pica (TeX convention) (**)" ) |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
73 ( texbp "point" "Big point (TeX convention) (**)" ) |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
74 ( texdd "(1238/1157) texpt" "Didot point (TeX convention) (**)" ) |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
75 ( texcc "12 texdd" "Cicero (TeX convention) (**)" ) |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
76 ( texsp "(1/65536) texpt" "Scaled TeX point (TeX convention) (**)" ) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49263
diff
changeset
|
77 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
78 ;; Area |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
79 ( hect "10000 m^2" "*Hectare" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
80 ( a "100 m^2" "Are") |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
81 ( acre "(1/640) mi^2" "Acre" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
82 ( b "10^(-28) m^2" "Barn" ) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49263
diff
changeset
|
83 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
84 ;; Volume |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
85 ( L "10^(-3) m^3" "*Liter" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
86 ( l "L" "Liter" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
87 ( gal "4 qt" "US Gallon" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
88 ( qt "2 pt" "Quart" ) |
111633
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
89 ( pt "2 cup" "Pint (**)" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
90 ( cup "8 ozfl" "Cup" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
91 ( ozfl "2 tbsp" "Fluid Ounce" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
92 ( floz "2 tbsp" "Fluid Ounce" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
93 ( tbsp "3 tsp" "Tablespoon" ) |
82436
396a03499dc0
(math-standard-units): Give exact conversion for tsp.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82390
diff
changeset
|
94 ;; ESUWM defines a US gallon as 231 in^3. |
396a03499dc0
(math-standard-units): Give exact conversion for tsp.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82390
diff
changeset
|
95 ;; That gives the following exact value for tsp. |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
96 ( tsp "492892159375*10^(-11) ml" "Teaspoon" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
97 "4.92892159375 ml") |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
98 ( vol "tsp+tbsp+ozfl+cup+pt+qt+gal" "Gallons + ... + teaspoons" nil |
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
99 "tsp+tbsp+ozfl+cup+pt+qt+gal") |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
100 ( galC "galUK" "Canadian Gallon" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
101 ( galUK "454609*10^(-5) L" "UK Gallon" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
102 "4.54609 L") ;; NIST |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49263
diff
changeset
|
103 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
104 ;; Time |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
105 ( s nil "*Second" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
106 ( sec "s" "Second" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
107 ( min "60 s" "Minute" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
108 ( hr "60 min" "Hour" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
109 ( day "24 hr" "Day" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
110 ( wk "7 day" "Week" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
111 ( hms "wk+day+hr+min+s" "Hours, minutes, seconds" ) |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
112 ( yr "36525*10^(-2) day" "Year (Julian)" nil |
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
113 "365.25 day") |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
114 ( Hz "1/s" "Hertz" ) |
40785 | 115 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
116 ;; Speed |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
117 ( mph "mi/hr" "*Miles per hour" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
118 ( kph "km/hr" "Kilometers per hour" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
119 ( knot "nmi/hr" "Knot" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
120 ( c "299792458 m/s" "Speed of light" ) ;;; CODATA |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49263
diff
changeset
|
121 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
122 ;; Acceleration |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
123 ( ga "980665*10^(-5) m/s^2" "*\"g\" acceleration" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
124 "9.80665 m / s^2") ;; CODATA |
40785 | 125 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
126 ;; Mass |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
127 ( g nil "*Gram" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
128 ( lb "16 oz" "Pound (mass)" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
129 ( oz "28349523125*10^(-9) g" "Ounce (mass)" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
130 "28.349523125 g") ;; ESUWM |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
131 ( ton "2000 lb" "Ton" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
132 ( tpo "ton+lb+oz" "Tons + pounds + ounces (mass)" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
133 ( t "1000 kg" "Metric ton" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
134 ( tonUK "10160469088*10^(-7) kg" "UK ton" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
135 "1016.0469088 kg") ;; ESUWM |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
136 ( lbt "12 ozt" "Troy pound" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
137 ( ozt "311034768*10^(-7) g" "Troy ounce" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
138 "31.10347680 g") ;; ESUWM, 1/12 exact value for lbt |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
139 ( ct "(2/10) g" "Carat" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
140 "0.2 g") ;; ESUWM |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
141 ( u "1.660538782*10^(-27) kg" "Unified atomic mass" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
142 "1.660538782 10^-27 kg (*)");;(approx) CODATA |
40785 | 143 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
144 ;; Force |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
145 ( N "m kg/s^2" "*Newton" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
146 ( dyn "10^(-5) N" "Dyne" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
147 ( gf "ga g" "Gram (force)" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
148 ( lbf "ga lb" "Pound (force)" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
149 ( kip "1000 lbf" "Kilopound (force)" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
150 ( pdl "138254954376*10^(-12) N" "Poundal" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
151 "0.138254954376 N") ;; ESUWM |
40785 | 152 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
153 ;; Energy |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
154 ( J "N m" "*Joule" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
155 ( erg "10^(-7) J" "Erg" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
156 ( cal "41868*10^(-4) J" "International Table Calorie" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
157 "4.1868 J") ;; NIST |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
158 ( calth "4184*10^(-3) J" "Thermochemical Calorie" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
159 "4.184 J") ;; NIST |
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
160 ( Cal "1000 cal" "Large Calorie") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
161 ( Btu "105505585262*10^(-8) J" "International Table Btu" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
162 "1055.05585262 J") ;; ESUWM |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
163 ( eV "ech V" "Electron volt" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
164 ( ev "eV" "Electron volt" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
165 ( therm "105506000 J" "EEC therm" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
166 ( invcm "h c/cm" "Energy in inverse centimeters" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
167 ( Kayser "invcm" "Kayser (inverse centimeter energy)" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
168 ( men "100/invcm" "Inverse energy in meters" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
169 ( Hzen "h Hz" "Energy in Hertz") |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
170 ( Ken "k K" "Energy in Kelvins") |
61412
4291a3412879
(math-standard-units): Redefine Watt hour as W*hr.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
60082
diff
changeset
|
171 ( Wh "W hr" "Watt hour") |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
172 ( Ws "W s" "Watt second") |
40785 | 173 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
174 ;; Power |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
175 ( W "J/s" "*Watt" ) |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
176 ( hp "550 ft lbf/s" "Horsepower") ;;ESUWM |
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
177 ( hpm "75 m kgf/s" "Metric Horsepower") ;;ESUWM |
40785 | 178 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
179 ;; Temperature |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
180 ( K nil "*Degree Kelvin" K ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
181 ( dK "K" "Degree Kelvin" K ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
182 ( degK "K" "Degree Kelvin" K ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
183 ( dC "K" "Degree Celsius" C ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
184 ( degC "K" "Degree Celsius" C ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
185 ( dF "(5/9) K" "Degree Fahrenheit" F ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
186 ( degF "(5/9) K" "Degree Fahrenheit" F ) |
40785 | 187 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
188 ;; Pressure |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
189 ( Pa "N/m^2" "*Pascal" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
190 ( bar "10^5 Pa" "Bar" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
191 ( atm "101325 Pa" "Standard atmosphere" ) ;; CODATA |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
192 ( Torr "(1/760) atm" "Torr") |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
193 ( mHg "1000 Torr" "Meter of mercury" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
194 ( inHg "254*10^(-1) mmHg" "Inch of mercury" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
195 "25.4 mmHg") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
196 ( inH2O "2.490889*10^2 Pa" "Inch of water" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
197 "2.490889 10^2 Pa (*)") ;;(approx) NIST |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
198 ( psi "lbf/in^2" "Pounds per square inch" ) |
40785 | 199 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
200 ;; Viscosity |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
201 ( P "(1/10) Pa s" "*Poise" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
202 ( St "10^(-4) m^2/s" "Stokes" ) |
40785 | 203 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
204 ;; Electromagnetism |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
205 ( A nil "*Ampere" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
206 ( C "A s" "Coulomb" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
207 ( Fdy "ech Nav" "Faraday" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
208 ( e "ech" "Elementary charge" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
209 ( ech "1.602176487*10^(-19) C" "Elementary charge" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
210 "1.602176487 10^-19 C (*)") ;;(approx) CODATA |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
211 ( V "W/A" "Volt" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
212 ( ohm "V/A" "Ohm" ) |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
213 ( Ω "ohm" "Ohm" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
214 ( mho "A/V" "Mho" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
215 ( S "A/V" "Siemens" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
216 ( F "C/V" "Farad" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
217 ( H "Wb/A" "Henry" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
218 ( T "Wb/m^2" "Tesla" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
219 ( Gs "10^(-4) T" "Gauss" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
220 ( Wb "V s" "Weber" ) |
40785 | 221 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
222 ;; Luminous intensity |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
223 ( cd nil "*Candela" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
224 ( sb "10000 cd/m^2" "Stilb" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
225 ( lm "cd sr" "Lumen" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
226 ( lx "lm/m^2" "Lux" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
227 ( ph "10000 lx" "Phot" ) |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
228 ( fc "lm/ft^2" "Footcandle") ;; ESUWM |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
229 ( lam "10000 lm/m^2" "Lambert" ) |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
230 ( flam "(1/pi) cd/ft^2" "Footlambert") ;; ESUWM |
40785 | 231 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
232 ;; Radioactivity |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
233 ( Bq "1/s" "*Becquerel" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
234 ( Ci "37*10^9 Bq" "Curie" ) ;; ESUWM |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
235 ( Gy "J/kg" "Gray" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
236 ( Sv "Gy" "Sievert" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
237 ( R "258*10^(-6) C/kg" "Roentgen" ) ;; NIST |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
238 ( rd "(1/100) Gy" "Rad" ) |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
239 ( rem "rd" "Rem" ) |
40785 | 240 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
241 ;; Amount of substance |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
242 ( mol nil "*Mole" ) |
40785 | 243 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
244 ;; Plane angle |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
245 ( rad nil "*Radian" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
246 ( circ "2 pi rad" "Full circle" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
247 ( rev "circ" "Full revolution" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
248 ( deg "circ/360" "Degree" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
249 ( arcmin "deg/60" "Arc minute" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
250 ( arcsec "arcmin/60" "Arc second" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
251 ( grad "circ/400" "Grade" ) |
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
252 ( rpm "rev/min" "Revolutions per minute" ) |
40785 | 253 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
254 ;; Solid angle |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
255 ( sr nil "*Steradian" ) |
40785 | 256 |
66206
fffcb2d302a5
(math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
65592
diff
changeset
|
257 ;; Other physical quantities |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
258 ;; The values are from CODATA, and are approximate. |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
259 ( h "6.62606896*10^(-34) J s" "*Planck's constant" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
260 "6.62606896 10^-34 J s (*)") |
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
261 ( hbar "h / (2 pi)" "Planck's constant" ) ;; Exact |
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
262 ( mu0 "4 pi 10^(-7) H/m" "Permeability of vacuum") ;; Exact |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
263 ( μ0 "mu0" "Permeability of vacuum") ;; Exact |
99729
fa7cdd1157d9
(math-standard-units): Add eps0, permittivity of vacuum.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98540
diff
changeset
|
264 ( eps0 "1 / (mu0 c^2)" "Permittivity of vacuum" ) |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
265 ( ε0 "eps0" "Permittivity of vacuum" ) |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
266 ( G "6.67428*10^(-11) m^3/(kg s^2)" "Gravitational constant" nil |
98540
9496026984da
(math-standard-units): More adjustments.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98538
diff
changeset
|
267 "6.67428 10^-11 m^3/(kg s^2) (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
268 ( Nav "6.02214179*10^(23) / mol" "Avogadro's constant" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
269 "6.02214179 10^23 / mol (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
270 ( me "9.10938215*10^(-31) kg" "Electron rest mass" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
271 "9.10938215 10^-31 kg (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
272 ( mp "1.672621637*10^(-27) kg" "Proton rest mass" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
273 "1.672621637 10^-27 kg (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
274 ( mn "1.674927211*10^(-27) kg" "Neutron rest mass" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
275 "1.674927211 10^-27 kg (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
276 ( mmu "1.88353130*10^(-28) kg" "Muon rest mass" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
277 "1.88353130 10^-28 kg (*)") |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
278 ( mμ "mmu" "Muon rest mass" nil |
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
279 "1.88353130 10^-28 kg (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
280 ( Ryd "10973731.568527 /m" "Rydberg's constant" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
281 "10973731.568527 /m (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
282 ( k "1.3806504*10^(-23) J/K" "Boltzmann's constant" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
283 "1.3806504 10^-23 J/K (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
284 ( alpha "7.2973525376*10^(-3)" "Fine structure constant" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
285 "7.2973525376 10^-3 (*)") |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
286 ( α "alpha" "Fine structure constant" nil |
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
287 "7.2973525376 10^-3 (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
288 ( muB "927.400915*10^(-26) J/T" "Bohr magneton" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
289 "927.400915 10^-26 J/T (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
290 ( muN "5.05078324*10^(-27) J/T" "Nuclear magneton" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
291 "5.05078324 10^-27 J/T (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
292 ( mue "-928.476377*10^(-26) J/T" "Electron magnetic moment" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
293 "-928.476377 10^-26 J/T (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
294 ( mup "1.410606662*10^(-26) J/T" "Proton magnetic moment" nil |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
295 "1.410606662 10^-26 J/T (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
296 ( R0 "8.314472 J/(mol K)" "Molar gas constant" nil |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
297 "8.314472 J/(mol K) (*)") |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
298 ( V0 "22.710981*10^(-3) m^3/mol" "Standard volume of ideal gas" nil |
112453
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
299 "22.710981 10^-3 m^3/mol (*)") |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
300 ;; Logarithmic units |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
301 ( Np nil "*Neper") |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
302 ( dB "(ln(10)/20) Np" "decibel"))) |
40785 | 303 |
304 | |
305 (defvar math-additional-units nil | |
306 "*Additional units table for user-defined units. | |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
307 Must be formatted like `math-standard-units'. |
99738
f84e322e603e
(math-additional-units): Doc fix (active voice).
Glenn Morris <rgm@gnu.org>
parents:
99732
diff
changeset
|
308 If you change this, be sure to set `math-units-table' to nil to ensure |
40785 | 309 that the combined units table will be rebuilt.") |
310 | |
311 (defvar math-unit-prefixes | |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
312 '( ( ?Y (^ 10 24) "Yotta" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
313 ( ?Z (^ 10 21) "Zetta" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
314 ( ?E (^ 10 18) "Exa" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
315 ( ?P (^ 10 15) "Peta" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
316 ( ?T (^ 10 12) "Tera" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
317 ( ?G (^ 10 9) "Giga" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
318 ( ?M (^ 10 6) "Mega" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
319 ( ?k (^ 10 3) "Kilo" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
320 ( ?K (^ 10 3) "Kilo" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
321 ( ?h (^ 10 2) "Hecto" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
322 ( ?H (^ 10 2) "Hecto" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
323 ( ?D (^ 10 1) "Deka" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
324 ( 0 (^ 10 0) nil ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
325 ( ?d (^ 10 -1) "Deci" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
326 ( ?c (^ 10 -2) "Centi" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
327 ( ?m (^ 10 -3) "Milli" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
328 ( ?u (^ 10 -6) "Micro" ) |
109033
d150a25a0eb9
Add some utf-8 coding cookies.
Glenn Morris <rgm@gnu.org>
parents:
108590
diff
changeset
|
329 ( ?μ (^ 10 -6) "Micro" ) |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
330 ( ?n (^ 10 -9) "Nano" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
331 ( ?p (^ 10 -12) "Pico" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
332 ( ?f (^ 10 -15) "Femto" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
333 ( ?a (^ 10 -18) "Atto" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
334 ( ?z (^ 10 -21) "zepto" ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
335 ( ?y (^ 10 -24) "yocto" ))) |
40785 | 336 |
337 (defvar math-standard-units-systems | |
338 '( ( base nil ) | |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
339 ( si ( ( g '(/ (var kg var-kg) 1000) ) ) ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
340 ( mks ( ( g '(/ (var kg var-kg) 1000) ) ) ) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
341 ( cgs ( ( m '(* (var cm var-cm) 100 ) ) ) ))) |
40785 | 342 |
343 (defvar math-units-table nil | |
99732
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
344 "Internal units table. |
651a986bea61
* calc/calc-units.el (math-units-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99729
diff
changeset
|
345 Derived from `math-standard-units' and `math-additional-units'. |
40785 | 346 Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).") |
347 | |
348 (defvar math-units-table-buffer-valid nil) | |
349 | |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
350 ;;; Units commands. |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
351 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
352 (defun calc-base-units () |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
353 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
354 (calc-slow-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
355 (let ((calc-autorange-units nil)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
356 (calc-enter-result 1 "bsun" (math-simplify-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
357 (math-to-standard-units (calc-top-n 1) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
358 nil)))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
359 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
360 (defun calc-quick-units () |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
361 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
362 (calc-slow-wrapper |
101001
14b421290b2f
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
363 (let* ((num (- last-command-event ?0)) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
364 (pos (if (= num 0) 10 num)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
365 (units (calc-var-value 'var-Units)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
366 (expr (calc-top-n 1))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
367 (unless (and (>= num 0) (<= num 9)) |
57130
d8cdadecaba8
(calc-quick-units): Fix overzealous s/or/unless.
John Paul Wallington <jpw@pobox.com>
parents:
52401
diff
changeset
|
368 (error "Bad unit number")) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
369 (unless (math-vectorp units) |
57130
d8cdadecaba8
(calc-quick-units): Fix overzealous s/or/unless.
John Paul Wallington <jpw@pobox.com>
parents:
52401
diff
changeset
|
370 (error "No \"quick units\" are defined")) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
371 (unless (< pos (length units)) |
57130
d8cdadecaba8
(calc-quick-units): Fix overzealous s/or/unless.
John Paul Wallington <jpw@pobox.com>
parents:
52401
diff
changeset
|
372 (error "Unit number %d not defined" pos)) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
373 (if (math-units-in-expr-p expr nil) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
374 (calc-enter-result 1 (format "cun%d" num) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
375 (math-convert-units expr (nth pos units))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
376 (calc-enter-result 1 (format "*un%d" num) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
377 (math-simplify-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
378 (math-mul expr (nth pos units)))))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
379 |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
380 (defun math-get-standard-units (expr) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
381 "Return the standard units in EXPR." |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
382 (math-simplify-units |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
383 (math-extract-units |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
384 (math-to-standard-units expr nil)))) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
385 |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
386 (defun math-get-units (expr) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
387 "Return the units in EXPR." |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
388 (math-simplify-units |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
389 (math-extract-units expr))) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
390 |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
391 (defun math-make-unit-string (expr) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
392 "Return EXPR in string form. |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
393 If EXPR is nil, return nil." |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
394 (if expr |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
395 (let ((cexpr (math-compose-expr expr 0))) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
396 (replace-regexp-in-string |
82390
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
397 " / " "/" |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
398 (if (stringp cexpr) |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
399 cexpr |
c315336c2be8
(math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82368
diff
changeset
|
400 (math-composition-to-string cexpr)))))) |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
401 |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
402 (defvar math-default-units-table |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
403 (make-hash-table :test 'equal) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
404 "A table storing previously converted units.") |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
405 |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
406 (defun math-get-default-units (expr) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
407 "Get default units to use when converting the units in EXPR." |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
408 (let* ((units (math-get-units expr)) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
409 (standard-units (math-get-standard-units expr)) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
410 (default-units (gethash |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
411 standard-units |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
412 math-default-units-table))) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
413 (if (equal units (car default-units)) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
414 (math-make-unit-string (cadr default-units)) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
415 (math-make-unit-string (car default-units))))) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
416 |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
417 (defun math-put-default-units (expr) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
418 "Put the units in EXPR in the default units table." |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
419 (let* ((units (math-get-units expr)) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
420 (standard-units (math-get-standard-units expr)) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
421 (default-units (gethash |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
422 standard-units |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
423 math-default-units-table))) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
424 (cond |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
425 ((not default-units) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
426 (puthash standard-units (list units) math-default-units-table)) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
427 ((not (equal units (car default-units))) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
428 (puthash standard-units |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
429 (list units (car default-units)) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
430 math-default-units-table))))) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
431 |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
432 |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
433 (defun calc-convert-units (&optional old-units new-units) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
434 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
435 (calc-slow-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
436 (let ((expr (calc-top-n 1)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
437 (uoldname nil) |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
438 unew |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
439 units |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
440 defunits) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
441 (unless (math-units-in-expr-p expr t) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
442 (let ((uold (or old-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
443 (progn |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
444 (setq uoldname (read-string "Old units: ")) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
445 (if (equal uoldname "") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
446 (progn |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
447 (setq uoldname "1") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
448 1) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
449 (if (string-match "\\` */" uoldname) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
450 (setq uoldname (concat "1" uoldname))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
451 (math-read-expr uoldname)))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
452 (when (eq (car-safe uold) 'error) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
453 (error "Bad format in units expression: %s" (nth 1 uold))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
454 (setq expr (math-mul expr uold)))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
455 (unless new-units |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
456 (setq defunits (math-get-default-units expr)) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
457 (setq new-units |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
458 (read-string (concat |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
459 (if uoldname |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
460 (concat "Old units: " |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
461 uoldname |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
462 ", new units") |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
463 "New units") |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
464 (if defunits |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
465 (concat |
84936
9f0f3499c174
(calc-convert-units, calc-convert-temperature): Remove unnecessary
Jay Belanger <jay.p.belanger@gmail.com>
parents:
84891
diff
changeset
|
466 " (default " |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
467 defunits |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
468 "): ") |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
469 ": ")))) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
470 |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
471 (if (and |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
472 (string= new-units "") |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
473 defunits) |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
474 (setq new-units defunits))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
475 (when (string-match "\\` */" new-units) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
476 (setq new-units (concat "1" new-units))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
477 (setq units (math-read-expr new-units)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
478 (when (eq (car-safe units) 'error) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
479 (error "Bad format in units expression: %s" (nth 2 units))) |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
480 (math-put-default-units units) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
481 (let ((unew (math-units-in-expr-p units t)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
482 (std (and (eq (car-safe units) 'var) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
483 (assq (nth 1 units) math-standard-units-systems)))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
484 (if std |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
485 (calc-enter-result 1 "cvun" (math-simplify-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
486 (math-to-standard-units expr |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
487 (nth 1 std)))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
488 (unless unew |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
489 (error "No units specified")) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
490 (calc-enter-result 1 "cvun" |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
491 (math-convert-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
492 expr units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
493 (and uoldname (not (equal uoldname "1")))))))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
494 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
495 (defun calc-autorange-units (arg) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
496 (interactive "P") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
497 (calc-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
498 (calc-change-mode 'calc-autorange-units arg nil t) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
499 (message (if calc-autorange-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
500 "Adjusting target unit prefix automatically" |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
501 "Using target units exactly")))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
502 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
503 (defun calc-convert-temperature (&optional old-units new-units) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
504 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
505 (calc-slow-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
506 (let ((expr (calc-top-n 1)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
507 (uold nil) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
508 (uoldname nil) |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
509 unew |
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
510 defunits) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
511 (setq uold (or old-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
512 (let ((units (math-single-units-in-expr-p expr))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
513 (if units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
514 (if (consp units) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
515 (list 'var (car units) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
516 (intern (concat "var-" |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
517 (symbol-name |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
518 (car units))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
519 (error "Not a pure temperature expression")) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
520 (math-read-expr |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
521 (setq uoldname (read-string |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
522 "Old temperature units: "))))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
523 (when (eq (car-safe uold) 'error) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
524 (error "Bad format in units expression: %s" (nth 2 uold))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
525 (or (math-units-in-expr-p expr nil) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
526 (setq expr (math-mul expr uold))) |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
527 (setq defunits (math-get-default-units expr)) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
528 (setq unew (or new-units |
98201
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
529 (read-string |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
530 (concat |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
531 (if uoldname |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
532 (concat "Old temperature units: " |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
533 uoldname |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
534 ", new units") |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
535 "New temperature units") |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
536 (if defunits |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
537 (concat " (default " |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
538 defunits |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
539 "): ") |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
540 ": "))))) |
1d82f8f9b231
(calc-convert-temperature): Use default units when appropriate.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
94654
diff
changeset
|
541 (setq unew (math-read-expr (if (string= unew "") defunits unew))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
542 (when (eq (car-safe unew) 'error) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
543 (error "Bad format in units expression: %s" (nth 2 unew))) |
82368
030fcc9e29ab
(math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
82325
diff
changeset
|
544 (math-put-default-units unew) |
87499
a0abd1e93db8
(calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents:
85603
diff
changeset
|
545 (let ((ntemp (calc-normalize |
a0abd1e93db8
(calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents:
85603
diff
changeset
|
546 (math-simplify-units |
a0abd1e93db8
(calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents:
85603
diff
changeset
|
547 (math-convert-temperature expr uold unew |
a0abd1e93db8
(calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents:
85603
diff
changeset
|
548 uoldname))))) |
a0abd1e93db8
(calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents:
85603
diff
changeset
|
549 (if (Math-zerop ntemp) |
a0abd1e93db8
(calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents:
85603
diff
changeset
|
550 (setq ntemp (list '* ntemp unew))) |
a0abd1e93db8
(calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents:
85603
diff
changeset
|
551 (let ((calc-simplify-mode 'none)) |
a0abd1e93db8
(calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents:
85603
diff
changeset
|
552 (calc-enter-result 1 "cvtm" ntemp)))))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
553 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
554 (defun calc-remove-units () |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
555 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
556 (calc-slow-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
557 (calc-enter-result 1 "rmun" (math-simplify-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
558 (math-remove-units (calc-top-n 1)))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
559 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
560 (defun calc-extract-units () |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
561 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
562 (calc-slow-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
563 (calc-enter-result 1 "rmun" (math-simplify-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
564 (math-extract-units (calc-top-n 1)))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
565 |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
566 ;; The variables calc-num-units and calc-den-units are local to |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
567 ;; calc-explain-units, but are used by calc-explain-units-rec, |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
568 ;; which is called by calc-explain-units. |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
569 (defvar calc-num-units) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
570 (defvar calc-den-units) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
571 |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
572 (defun calc-explain-units () |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
573 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
574 (calc-wrapper |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
575 (let ((calc-num-units nil) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
576 (calc-den-units nil)) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
577 (calc-explain-units-rec (calc-top-n 1) 1) |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
578 (and calc-den-units (string-match "^[^(].* .*[^)]$" calc-den-units) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
579 (setq calc-den-units (concat "(" calc-den-units ")"))) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
580 (if calc-num-units |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
581 (if calc-den-units |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
582 (message "%s per %s" calc-num-units calc-den-units) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
583 (message "%s" calc-num-units)) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
584 (if calc-den-units |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
585 (message "1 per %s" calc-den-units) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
586 (message "No units in expression")))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
587 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
588 (defun calc-explain-units-rec (expr pow) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
589 (let ((u (math-check-unit-name expr)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
590 pos) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
591 (if (and u (not (math-zerop pow))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
592 (let ((name (or (nth 2 u) (symbol-name (car u))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
593 (if (eq (aref name 0) ?\*) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
594 (setq name (substring name 1))) |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
595 (if (string-match "[^a-zA-Zα-ωΑ-Ω0-9']" name) |
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
596 (if (string-match "^[a-zA-Zα-ωΑ-Ω0-9' ()]*$" name) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
597 (while (setq pos (string-match "[ ()]" name)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
598 (setq name (concat (substring name 0 pos) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
599 (if (eq (aref name pos) 32) "-" "") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
600 (substring name (1+ pos))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
601 (setq name (concat "(" name ")")))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
602 (or (eq (nth 1 expr) (car u)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
603 (setq name (concat (nth 2 (assq (aref (symbol-name |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
604 (nth 1 expr)) 0) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
605 math-unit-prefixes)) |
108590
c84578d13e42
calc-aent.el (math-read-token, math-find-user-tokens):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
606 (if (and (string-match "[^a-zA-Zα-ωΑ-Ω0-9']" name) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
607 (not (memq (car u) '(mHg gf)))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
608 (concat "-" name) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
609 (downcase name))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
610 (cond ((or (math-equal-int pow 1) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
611 (math-equal-int pow -1))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
612 ((or (math-equal-int pow 2) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
613 (math-equal-int pow -2)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
614 (if (equal (nth 4 u) '((m . 1))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
615 (setq name (concat "Square-" name)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
616 (setq name (concat name "-squared")))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
617 ((or (math-equal-int pow 3) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
618 (math-equal-int pow -3)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
619 (if (equal (nth 4 u) '((m . 1))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
620 (setq name (concat "Cubic-" name)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
621 (setq name (concat name "-cubed")))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
622 (t |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
623 (setq name (concat name "^" |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
624 (math-format-number (math-abs pow)))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
625 (if (math-posp pow) |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
626 (setq calc-num-units (if calc-num-units |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
627 (concat calc-num-units " " name) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
628 name)) |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
629 (setq calc-den-units (if calc-den-units |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
630 (concat calc-den-units " " name) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
631 name)))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
632 (cond ((eq (car-safe expr) '*) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
633 (calc-explain-units-rec (nth 1 expr) pow) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
634 (calc-explain-units-rec (nth 2 expr) pow)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
635 ((eq (car-safe expr) '/) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
636 (calc-explain-units-rec (nth 1 expr) pow) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
637 (calc-explain-units-rec (nth 2 expr) (- pow))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
638 ((memq (car-safe expr) '(neg + -)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
639 (calc-explain-units-rec (nth 1 expr) pow)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
640 ((and (eq (car-safe expr) '^) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
641 (math-realp (nth 2 expr))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
642 (calc-explain-units-rec (nth 1 expr) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
643 (math-mul pow (nth 2 expr)))))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
644 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
645 (defun calc-simplify-units () |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
646 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
647 (calc-slow-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
648 (calc-with-default-simplification |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
649 (calc-enter-result 1 "smun" (math-simplify-units (calc-top-n 1)))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
650 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
651 (defun calc-view-units-table (n) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
652 (interactive "P") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
653 (and n (setq math-units-table-buffer-valid nil)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
654 (let ((win (get-buffer-window "*Units Table*"))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
655 (if (and win |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
656 math-units-table |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
657 math-units-table-buffer-valid) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
658 (progn |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
659 (bury-buffer (window-buffer win)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
660 (let ((curwin (selected-window))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
661 (select-window win) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
662 (switch-to-buffer nil) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
663 (select-window curwin))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
664 (math-build-units-table-buffer nil)))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
665 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
666 (defun calc-enter-units-table (n) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
667 (interactive "P") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
668 (and n (setq math-units-table-buffer-valid nil)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
669 (math-build-units-table-buffer t) |
65592
1038e6fc7f28
message format spec fixes, commit # 11
Deepak Goel <deego@gnufans.org>
parents:
64325
diff
changeset
|
670 (message "%s" (substitute-command-keys "Type \\[calc] to return to the Calculator"))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
671 |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
672 (defun calc-define-unit (uname desc &optional disp) |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
673 (interactive "SDefine unit name: \nsDescription: \nP") |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
674 (if disp (setq disp (read-string "Display definition: "))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
675 (calc-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
676 (let ((form (calc-top-n 1)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
677 (unit (assq uname math-additional-units))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
678 (or unit |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
679 (setq math-additional-units |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
680 (cons (setq unit (list uname nil nil nil nil)) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
681 math-additional-units) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
682 math-units-table nil)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
683 (setcar (cdr unit) (and (not (and (eq (car-safe form) 'var) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
684 (eq (nth 1 form) uname))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
685 (not (math-equal-int form 1)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
686 (math-format-flat-expr form 0))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
687 (setcar (cdr (cdr unit)) (and (not (equal desc "")) |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
688 desc)) |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
689 (if disp |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
690 (setcar (cdr (cdr (cdr (cdr unit)))) disp)))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
691 (calc-invalidate-units-table)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
692 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
693 (defun calc-undefine-unit (uname) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
694 (interactive "SUndefine unit name: ") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
695 (calc-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
696 (let ((unit (assq uname math-additional-units))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
697 (or unit |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
698 (if (assq uname math-standard-units) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
699 (error "\"%s\" is a predefined unit name" uname) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
700 (error "Unit name \"%s\" not found" uname))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
701 (setq math-additional-units (delq unit math-additional-units) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
702 math-units-table nil))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
703 (calc-invalidate-units-table)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
704 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
705 (defun calc-invalidate-units-table () |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
706 (setq math-units-table nil) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
707 (let ((buf (get-buffer "*Units Table*"))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
708 (and buf |
105792
2c12fbae77c2
* calc/calc.el (calc, calc-refresh, calc-trail-buffer, calc-record)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101001
diff
changeset
|
709 (with-current-buffer buf |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
710 (save-excursion |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
711 (goto-char (point-min)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
712 (if (looking-at "Calculator Units Table") |
62565
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
713 (let ((inhibit-read-only t)) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
714 (insert "(Obsolete) ")))))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
715 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
716 (defun calc-get-unit-definition (uname) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
717 (interactive "SGet definition for unit: ") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
718 (calc-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
719 (math-build-units-table) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
720 (let ((unit (assq uname math-units-table))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
721 (or unit |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
722 (error "Unit name \"%s\" not found" uname)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
723 (let ((msg (nth 2 unit))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
724 (if (stringp msg) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
725 (if (string-match "^\\*" msg) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
726 (setq msg (substring msg 1))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
727 (setq msg (symbol-name uname))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
728 (if (nth 1 unit) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
729 (progn |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
730 (calc-enter-result 0 "ugdf" (nth 1 unit)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
731 (message "Derived unit: %s" msg)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
732 (calc-enter-result 0 "ugdf" (list 'var uname |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
733 (intern |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
734 (concat "var-" |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
735 (symbol-name uname))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
736 (message "Base unit: %s" msg)))))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
737 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
738 (defun calc-permanent-units () |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
739 (interactive) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
740 (calc-wrapper |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
741 (let (pos) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
742 (set-buffer (find-file-noselect (substitute-in-file-name |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
743 calc-settings-file))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
744 (goto-char (point-min)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
745 (if (and (search-forward ";;; Custom units stored by Calc" nil t) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
746 (progn |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
747 (beginning-of-line) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
748 (setq pos (point)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
749 (search-forward "\n;;; End of custom units" nil t))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
750 (progn |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
751 (beginning-of-line) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
752 (forward-line 1) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
753 (delete-region pos (point))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
754 (goto-char (point-max)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
755 (insert "\n\n") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
756 (forward-char -1)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
757 (insert ";;; Custom units stored by Calc on " (current-time-string) "\n") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
758 (if math-additional-units |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
759 (progn |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
760 (insert "(setq math-additional-units '(\n") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
761 (let ((list math-additional-units)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
762 (while list |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
763 (insert " (" (symbol-name (car (car list))) " " |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
764 (if (nth 1 (car list)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
765 (if (stringp (nth 1 (car list))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
766 (prin1-to-string (nth 1 (car list))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
767 (prin1-to-string (math-format-flat-expr |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
768 (nth 1 (car list)) 0))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
769 "nil") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
770 " " |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
771 (prin1-to-string (nth 2 (car list))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
772 ")\n") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
773 (setq list (cdr list)))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
774 (insert "))\n")) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
775 (insert ";;; (no custom units defined)\n")) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
776 (insert ";;; End of custom units\n") |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
777 (save-buffer)))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
778 |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
779 |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
780 ;; The variable math-cu-unit-list is local to math-build-units-table, |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
781 ;; but is used by math-compare-unit-names, which is called (indirectly) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
782 ;; by math-build-units-table. |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
783 ;; math-cu-unit-list is also local to math-convert-units, but is used |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
784 ;; by math-convert-units-rec, which is called by math-convert-units. |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
785 (defvar math-cu-unit-list) |
40785 | 786 |
787 (defun math-build-units-table () | |
788 (or math-units-table | |
789 (let* ((combined-units (append math-additional-units | |
790 math-standard-units)) | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
791 (math-cu-unit-list (mapcar 'car combined-units)) |
40785 | 792 tab) |
793 (message "Building units table...") | |
794 (setq math-units-table-buffer-valid nil) | |
795 (setq tab (mapcar (function | |
796 (lambda (x) | |
797 (list (car x) | |
798 (and (nth 1 x) | |
799 (if (stringp (nth 1 x)) | |
800 (let ((exp (math-read-plain-expr | |
801 (nth 1 x)))) | |
802 (if (eq (car-safe exp) 'error) | |
803 (error "Format error in definition of %s in units table: %s" | |
804 (car x) (nth 2 exp)) | |
805 exp)) | |
806 (nth 1 x))) | |
807 (nth 2 x) | |
808 (nth 3 x) | |
809 (and (not (nth 1 x)) | |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
810 (list (cons (car x) 1))) |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
811 (nth 4 x)))) |
40785 | 812 combined-units)) |
813 (let ((math-units-table tab)) | |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
814 (mapc 'math-find-base-units tab)) |
40785 | 815 (message "Building units table...done") |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
816 (setq math-units-table tab)))) |
40785 | 817 |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
818 ;; The variables math-fbu-base and math-fbu-entry are local to |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
819 ;; math-find-base-units, but are used by math-find-base-units-rec, |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
820 ;; which is called by math-find-base-units. |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
821 (defvar math-fbu-base) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
822 (defvar math-fbu-entry) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
823 |
58511
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
824 (defun math-find-base-units (math-fbu-entry) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
825 (if (eq (nth 4 math-fbu-entry) 'boom) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
826 (error "Circular definition involving unit %s" (car math-fbu-entry))) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
827 (or (nth 4 math-fbu-entry) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
828 (let (math-fbu-base) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
829 (setcar (nthcdr 4 math-fbu-entry) 'boom) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
830 (math-find-base-units-rec (nth 1 math-fbu-entry) 1) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
831 '(or math-fbu-base |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
832 (error "Dimensionless definition for unit %s" (car math-fbu-entry))) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
833 (while (eq (cdr (car math-fbu-base)) 0) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
834 (setq math-fbu-base (cdr math-fbu-base))) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
835 (let ((b math-fbu-base)) |
40785 | 836 (while (cdr b) |
837 (if (eq (cdr (car (cdr b))) 0) | |
838 (setcdr b (cdr (cdr b))) | |
839 (setq b (cdr b))))) | |
58511
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
840 (setq math-fbu-base (sort math-fbu-base 'math-compare-unit-names)) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
841 (setcar (nthcdr 4 math-fbu-entry) math-fbu-base) |
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
842 math-fbu-base))) |
40785 | 843 |
844 (defun math-compare-unit-names (a b) | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
845 (memq (car b) (cdr (memq (car a) math-cu-unit-list)))) |
40785 | 846 |
847 (defun math-find-base-units-rec (expr pow) | |
848 (let ((u (math-check-unit-name expr))) | |
849 (cond (u | |
850 (let ((ulist (math-find-base-units u))) | |
851 (while ulist | |
852 (let ((p (* (cdr (car ulist)) pow)) | |
58511
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
853 (old (assq (car (car ulist)) math-fbu-base))) |
40785 | 854 (if old |
855 (setcdr old (+ (cdr old) p)) | |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
856 (setq math-fbu-base |
58511
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
857 (cons (cons (car (car ulist)) p) math-fbu-base)))) |
40785 | 858 (setq ulist (cdr ulist))))) |
859 ((math-scalarp expr)) | |
860 ((and (eq (car expr) '^) | |
861 (integerp (nth 2 expr))) | |
862 (math-find-base-units-rec (nth 1 expr) (* pow (nth 2 expr)))) | |
863 ((eq (car expr) '*) | |
864 (math-find-base-units-rec (nth 1 expr) pow) | |
865 (math-find-base-units-rec (nth 2 expr) pow)) | |
866 ((eq (car expr) '/) | |
867 (math-find-base-units-rec (nth 1 expr) pow) | |
868 (math-find-base-units-rec (nth 2 expr) (- pow))) | |
869 ((eq (car expr) 'neg) | |
870 (math-find-base-units-rec (nth 1 expr) pow)) | |
871 ((eq (car expr) '+) | |
872 (math-find-base-units-rec (nth 1 expr) pow)) | |
873 ((eq (car expr) 'var) | |
874 (or (eq (nth 1 expr) 'pi) | |
875 (error "Unknown name %s in defining expression for unit %s" | |
58511
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
876 (nth 1 expr) (car math-fbu-entry)))) |
112453
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
877 ((equal expr '(calcFunc-ln 10))) |
58511
0a3797785946
Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58508
diff
changeset
|
878 (t (error "Malformed defining expression for unit %s" (car math-fbu-entry)))))) |
40785 | 879 |
880 | |
881 (defun math-units-in-expr-p (expr sub-exprs) | |
882 (and (consp expr) | |
883 (if (eq (car expr) 'var) | |
884 (math-check-unit-name expr) | |
885 (and (or sub-exprs | |
886 (memq (car expr) '(* / ^))) | |
887 (or (math-units-in-expr-p (nth 1 expr) sub-exprs) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
888 (math-units-in-expr-p (nth 2 expr) sub-exprs)))))) |
40785 | 889 |
890 (defun math-only-units-in-expr-p (expr) | |
891 (and (consp expr) | |
892 (if (eq (car expr) 'var) | |
893 (math-check-unit-name expr) | |
894 (if (memq (car expr) '(* /)) | |
895 (and (math-only-units-in-expr-p (nth 1 expr)) | |
896 (math-only-units-in-expr-p (nth 2 expr))) | |
897 (and (eq (car expr) '^) | |
898 (and (math-only-units-in-expr-p (nth 1 expr)) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
899 (math-realp (nth 2 expr)))))))) |
40785 | 900 |
901 (defun math-single-units-in-expr-p (expr) | |
902 (cond ((math-scalarp expr) nil) | |
903 ((eq (car expr) 'var) | |
904 (math-check-unit-name expr)) | |
905 ((eq (car expr) '*) | |
906 (let ((u1 (math-single-units-in-expr-p (nth 1 expr))) | |
907 (u2 (math-single-units-in-expr-p (nth 2 expr)))) | |
908 (or (and u1 u2 'wrong) | |
909 u1 | |
910 u2))) | |
911 ((eq (car expr) '/) | |
912 (if (math-units-in-expr-p (nth 2 expr) nil) | |
913 'wrong | |
914 (math-single-units-in-expr-p (nth 1 expr)))) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
915 (t 'wrong))) |
40785 | 916 |
917 (defun math-check-unit-name (v) | |
918 (and (eq (car-safe v) 'var) | |
919 (or (assq (nth 1 v) (or math-units-table (math-build-units-table))) | |
920 (let ((name (symbol-name (nth 1 v)))) | |
921 (and (> (length name) 1) | |
922 (assq (aref name 0) math-unit-prefixes) | |
923 (or (assq (intern (substring name 1)) math-units-table) | |
924 (and (eq (aref name 0) ?M) | |
925 (> (length name) 3) | |
926 (eq (aref name 1) ?e) | |
927 (eq (aref name 2) ?g) | |
928 (assq (intern (substring name 3)) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
929 math-units-table)))))))) |
40785 | 930 |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
931 ;; The variable math-which-standard is local to math-to-standard-units, |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
932 ;; but is used by math-to-standard-rec, which is called by |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
933 ;; math-to-standard-units. |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
934 (defvar math-which-standard) |
40785 | 935 |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
936 (defun math-to-standard-units (expr math-which-standard) |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
937 (math-to-standard-rec expr)) |
40785 | 938 |
939 (defun math-to-standard-rec (expr) | |
940 (if (eq (car-safe expr) 'var) | |
941 (let ((u (math-check-unit-name expr)) | |
942 (base (nth 1 expr))) | |
943 (if u | |
944 (progn | |
945 (if (nth 1 u) | |
946 (setq expr (math-to-standard-rec (nth 1 u))) | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
947 (let ((st (assq (car u) math-which-standard))) |
40785 | 948 (if st |
949 (setq expr (nth 1 st)) | |
950 (setq expr (list 'var (car u) | |
951 (intern (concat "var-" | |
952 (symbol-name | |
953 (car u))))))))) | |
954 (or (null u) | |
955 (eq base (car u)) | |
956 (setq expr (list '* | |
957 (nth 1 (assq (aref (symbol-name base) 0) | |
958 math-unit-prefixes)) | |
959 expr))) | |
960 expr) | |
961 (if (eq base 'pi) | |
962 (math-pi) | |
963 expr))) | |
964 (if (Math-primp expr) | |
965 expr | |
966 (cons (car expr) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
967 (mapcar 'math-to-standard-rec (cdr expr)))))) |
40785 | 968 |
969 (defun math-apply-units (expr units ulist &optional pure) | |
64163
f3c30d255a4d
(math-apply-units): Change the places in which units are simplified.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62565
diff
changeset
|
970 (setq expr (math-simplify-units expr)) |
40785 | 971 (if ulist |
972 (let ((new 0) | |
973 value) | |
974 (or (math-numberp expr) | |
975 (error "Incompatible units")) | |
976 (while (cdr ulist) | |
977 (setq value (math-div expr (nth 1 (car ulist))) | |
978 value (math-floor (let ((calc-internal-prec | |
979 (1- calc-internal-prec))) | |
980 (math-normalize value))) | |
981 new (math-add new (math-mul value (car (car ulist)))) | |
982 expr (math-sub expr (math-mul value (nth 1 (car ulist)))) | |
983 ulist (cdr ulist))) | |
984 (math-add new (math-mul (math-div expr (nth 1 (car ulist))) | |
985 (car (car ulist))))) | |
64163
f3c30d255a4d
(math-apply-units): Change the places in which units are simplified.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62565
diff
changeset
|
986 (if pure |
f3c30d255a4d
(math-apply-units): Change the places in which units are simplified.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62565
diff
changeset
|
987 expr |
f3c30d255a4d
(math-apply-units): Change the places in which units are simplified.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62565
diff
changeset
|
988 (math-simplify-units (list '* expr units))))) |
40785 | 989 |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
990 (defvar math-decompose-units-cache nil) |
40785 | 991 (defun math-decompose-units (units) |
992 (let ((u (math-check-unit-name units))) | |
993 (and u (eq (car-safe (nth 1 u)) '+) | |
994 (setq units (nth 1 u)))) | |
995 (setq units (calcFunc-expand units)) | |
996 (and (eq (car-safe units) '+) | |
997 (let ((entry (list units calc-internal-prec calc-prefer-frac))) | |
998 (or (equal entry (car math-decompose-units-cache)) | |
999 (let ((ulist nil) | |
1000 (utemp units) | |
1001 qty unit) | |
1002 (while (eq (car-safe utemp) '+) | |
1003 (setq ulist (cons (math-decompose-unit-part (nth 2 utemp)) | |
1004 ulist) | |
1005 utemp (nth 1 utemp))) | |
1006 (setq ulist (cons (math-decompose-unit-part utemp) ulist) | |
1007 utemp ulist) | |
1008 (while (setq utemp (cdr utemp)) | |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1009 (unless (equal (nth 2 (car utemp)) (nth 2 (car ulist))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1010 (error "Inconsistent units in sum"))) |
40785 | 1011 (setq math-decompose-units-cache |
1012 (cons entry | |
1013 (sort ulist | |
1014 (function | |
1015 (lambda (x y) | |
1016 (not (Math-lessp (nth 1 x) | |
1017 (nth 1 y)))))))))) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1018 (cdr math-decompose-units-cache)))) |
40785 | 1019 |
1020 (defun math-decompose-unit-part (unit) | |
1021 (cons unit | |
1022 (math-is-multiple (math-simplify-units (math-to-standard-units | |
1023 unit nil)) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1024 t))) |
40785 | 1025 |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1026 ;; The variable math-fcu-u is local to math-find-compatible-unit, |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1027 ;; but is used by math-find-compatible-rec which is called by |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1028 ;; math-find-compatible-unit. |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1029 (defvar math-fcu-u) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1030 |
40785 | 1031 (defun math-find-compatible-unit (expr unit) |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1032 (let ((math-fcu-u (math-check-unit-name unit))) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1033 (if math-fcu-u |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1034 (math-find-compatible-unit-rec expr 1)))) |
40785 | 1035 |
1036 (defun math-find-compatible-unit-rec (expr pow) | |
1037 (cond ((eq (car-safe expr) '*) | |
1038 (or (math-find-compatible-unit-rec (nth 1 expr) pow) | |
1039 (math-find-compatible-unit-rec (nth 2 expr) pow))) | |
1040 ((eq (car-safe expr) '/) | |
1041 (or (math-find-compatible-unit-rec (nth 1 expr) pow) | |
1042 (math-find-compatible-unit-rec (nth 2 expr) (- pow)))) | |
1043 ((and (eq (car-safe expr) '^) | |
1044 (integerp (nth 2 expr))) | |
1045 (math-find-compatible-unit-rec (nth 1 expr) (* pow (nth 2 expr)))) | |
1046 (t | |
1047 (let ((u2 (math-check-unit-name expr))) | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1048 (if (equal (nth 4 math-fcu-u) (nth 4 u2)) |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1049 (cons expr pow)))))) |
40785 | 1050 |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1051 ;; The variables math-cu-new-units and math-cu-pure are local to |
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1052 ;; math-convert-units, but are used by math-convert-units-rec, |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1053 ;; which is called by math-convert-units. |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1054 (defvar math-cu-new-units) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1055 (defvar math-cu-pure) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1056 |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1057 (defun math-convert-units (expr math-cu-new-units &optional math-cu-pure) |
66753
2f681ffeffdf
(math-convert-units): Replace any composite unit by its definition.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
66206
diff
changeset
|
1058 (if (eq (car-safe math-cu-new-units) 'var) |
2f681ffeffdf
(math-convert-units): Replace any composite unit by its definition.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
66206
diff
changeset
|
1059 (let ((unew (assq (nth 1 math-cu-new-units) |
2f681ffeffdf
(math-convert-units): Replace any composite unit by its definition.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
66206
diff
changeset
|
1060 (math-build-units-table)))) |
2f681ffeffdf
(math-convert-units): Replace any composite unit by its definition.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
66206
diff
changeset
|
1061 (if (eq (car-safe (nth 1 unew)) '+) |
2f681ffeffdf
(math-convert-units): Replace any composite unit by its definition.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
66206
diff
changeset
|
1062 (setq math-cu-new-units (nth 1 unew))))) |
40785 | 1063 (math-with-extra-prec 2 |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1064 (let ((compat (and (not math-cu-pure) |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1065 (math-find-compatible-unit expr math-cu-new-units))) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1066 (math-cu-unit-list nil) |
40785 | 1067 (math-combining-units nil)) |
1068 (if compat | |
1069 (math-simplify-units | |
1070 (math-mul (math-mul (math-simplify-units | |
1071 (math-div expr (math-pow (car compat) | |
1072 (cdr compat)))) | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1073 (math-pow math-cu-new-units (cdr compat))) |
40785 | 1074 (math-simplify-units |
1075 (math-to-standard-units | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1076 (math-pow (math-div (car compat) math-cu-new-units) |
40785 | 1077 (cdr compat)) |
1078 nil)))) | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1079 (when (setq math-cu-unit-list (math-decompose-units math-cu-new-units)) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1080 (setq math-cu-new-units (nth 2 (car math-cu-unit-list)))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1081 (when (eq (car-safe expr) '+) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1082 (setq expr (math-simplify-units expr))) |
40785 | 1083 (if (math-units-in-expr-p expr t) |
1084 (math-convert-units-rec expr) | |
1085 (math-apply-units (math-to-standard-units | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1086 (list '/ expr math-cu-new-units) nil) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1087 math-cu-new-units math-cu-unit-list math-cu-pure)))))) |
40785 | 1088 |
1089 (defun math-convert-units-rec (expr) | |
1090 (if (math-units-in-expr-p expr nil) | |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1091 (math-apply-units (math-to-standard-units |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1092 (list '/ expr math-cu-new-units) nil) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1093 math-cu-new-units math-cu-unit-list math-cu-pure) |
40785 | 1094 (if (Math-primp expr) |
1095 expr | |
1096 (cons (car expr) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1097 (mapcar 'math-convert-units-rec (cdr expr)))))) |
40785 | 1098 |
1099 (defun math-convert-temperature (expr old new &optional pure) | |
1100 (let* ((units (math-single-units-in-expr-p expr)) | |
1101 (uold (if old | |
1102 (if (or (null units) | |
1103 (equal (nth 1 old) (car units))) | |
1104 (math-check-unit-name old) | |
1105 (error "Inconsistent temperature units")) | |
1106 units)) | |
1107 (unew (math-check-unit-name new))) | |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1108 (unless (and (consp unew) (nth 3 unew)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1109 (error "Not a valid temperature unit")) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1110 (unless (and (consp uold) (nth 3 uold)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1111 (error "Not a pure temperature expression")) |
40785 | 1112 (let ((v (car uold))) |
1113 (setq expr (list '/ expr (list 'var v | |
1114 (intern (concat "var-" | |
1115 (symbol-name v))))))) | |
1116 (or (eq (nth 3 uold) (nth 3 unew)) | |
1117 (cond ((eq (nth 3 uold) 'K) | |
82325
c9f47b4c81d5
(calc-convert-temperature): Use `/' to create fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1118 (setq expr (list '- expr '(/ 27315 100))) |
40785 | 1119 (if (eq (nth 3 unew) 'F) |
82325
c9f47b4c81d5
(calc-convert-temperature): Use `/' to create fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1120 (setq expr (list '+ (list '* expr '(/ 9 5)) 32)))) |
40785 | 1121 ((eq (nth 3 uold) 'C) |
1122 (if (eq (nth 3 unew) 'F) | |
82325
c9f47b4c81d5
(calc-convert-temperature): Use `/' to create fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1123 (setq expr (list '+ (list '* expr '(/ 9 5)) 32)) |
c9f47b4c81d5
(calc-convert-temperature): Use `/' to create fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1124 (setq expr (list '+ expr '(/ 27315 100))))) |
40785 | 1125 (t |
82325
c9f47b4c81d5
(calc-convert-temperature): Use `/' to create fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1126 (setq expr (list '* (list '- expr 32) '(/ 5 9))) |
40785 | 1127 (if (eq (nth 3 unew) 'K) |
82325
c9f47b4c81d5
(calc-convert-temperature): Use `/' to create fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1128 (setq expr (list '+ expr '(/ 27315 100))))))) |
40785 | 1129 (if pure |
1130 expr | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1131 (list '* expr new)))) |
40785 | 1132 |
1133 | |
1134 | |
1135 (defun math-simplify-units (a) | |
1136 (let ((math-simplifying-units t) | |
1137 (calc-matrix-mode 'scalar)) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1138 (math-simplify a))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1139 (defalias 'calcFunc-usimplify 'math-simplify-units) |
40785 | 1140 |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1141 ;; The function created by math-defsimplify uses the variable |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1142 ;; math-simplify-expr, and so is used by functions in math-defsimplify |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1143 (defvar math-simplify-expr) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1144 |
40785 | 1145 (math-defsimplify (+ -) |
1146 (and math-simplifying-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1147 (math-units-in-expr-p (nth 1 math-simplify-expr) nil) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1148 (let* ((units (math-extract-units (nth 1 math-simplify-expr))) |
40785 | 1149 (ratio (math-simplify (math-to-standard-units |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1150 (list '/ (nth 2 math-simplify-expr) units) nil)))) |
40785 | 1151 (if (math-units-in-expr-p ratio nil) |
1152 (progn | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1153 (calc-record-why "*Inconsistent units" math-simplify-expr) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1154 math-simplify-expr) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1155 (list '* (math-add (math-remove-units (nth 1 math-simplify-expr)) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1156 (if (eq (car math-simplify-expr) '-) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1157 (math-neg ratio) ratio)) |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1158 units))))) |
40785 | 1159 |
1160 (math-defsimplify * | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1161 (math-simplify-units-prod)) |
40785 | 1162 |
1163 (defun math-simplify-units-prod () | |
1164 (and math-simplifying-units | |
1165 calc-autorange-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1166 (Math-realp (nth 1 math-simplify-expr)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1167 (let* ((num (math-float (nth 1 math-simplify-expr))) |
40785 | 1168 (xpon (calcFunc-xpon num)) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1169 (unitp (cdr (cdr math-simplify-expr))) |
40785 | 1170 (unit (car unitp)) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1171 (pow (if (eq (car math-simplify-expr) '*) 1 -1)) |
40785 | 1172 u) |
1173 (and (eq (car-safe unit) '*) | |
1174 (setq unitp (cdr unit) | |
1175 unit (car unitp))) | |
1176 (and (eq (car-safe unit) '^) | |
1177 (integerp (nth 2 unit)) | |
1178 (setq pow (* pow (nth 2 unit)) | |
1179 unitp (cdr unit) | |
1180 unit (car unitp))) | |
1181 (and (setq u (math-check-unit-name unit)) | |
1182 (integerp xpon) | |
1183 (or (< xpon 0) | |
1184 (>= xpon (if (eq (car u) 'm) 1 3))) | |
1185 (let* ((uxpon 0) | |
1186 (pref (if (< pow 0) | |
1187 (reverse math-unit-prefixes) | |
1188 math-unit-prefixes)) | |
1189 (p pref) | |
1190 pxpon pname) | |
1191 (or (eq (car u) (nth 1 unit)) | |
1192 (setq uxpon (* pow | |
1193 (nth 2 (nth 1 (assq | |
1194 (aref (symbol-name | |
1195 (nth 1 unit)) 0) | |
1196 math-unit-prefixes)))))) | |
1197 (setq xpon (+ xpon uxpon)) | |
1198 (while (and p | |
1199 (or (memq (car (car p)) '(?d ?D ?h ?H)) | |
1200 (and (eq (car (car p)) ?c) | |
1201 (not (eq (car u) 'm))) | |
1202 (< xpon (setq pxpon (* (nth 2 (nth 1 (car p))) | |
1203 pow))) | |
1204 (progn | |
1205 (setq pname (math-build-var-name | |
1206 (if (eq (car (car p)) 0) | |
1207 (car u) | |
1208 (concat (char-to-string | |
1209 (car (car p))) | |
1210 (symbol-name | |
1211 (car u)))))) | |
1212 (and (/= (car (car p)) 0) | |
1213 (assq (nth 1 pname) | |
1214 math-units-table))))) | |
1215 (setq p (cdr p))) | |
1216 (and p | |
1217 (/= pxpon uxpon) | |
1218 (or (not (eq p pref)) | |
1219 (< xpon (+ pxpon (* (math-abs pow) 3)))) | |
1220 (progn | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1221 (setcar (cdr math-simplify-expr) |
40785 | 1222 (let ((calc-prefer-frac nil)) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1223 (calcFunc-scf (nth 1 math-simplify-expr) |
40785 | 1224 (- uxpon pxpon)))) |
1225 (setcar unitp pname) | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1226 math-simplify-expr))))))) |
40785 | 1227 |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1228 (defvar math-try-cancel-units) |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1229 |
40785 | 1230 (math-defsimplify / |
1231 (and math-simplifying-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1232 (let ((np (cdr math-simplify-expr)) |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1233 (math-try-cancel-units 0) |
40785 | 1234 n nn) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1235 (setq n (if (eq (car-safe (nth 2 math-simplify-expr)) '*) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1236 (cdr (nth 2 math-simplify-expr)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1237 (nthcdr 2 math-simplify-expr))) |
40785 | 1238 (if (math-realp (car n)) |
1239 (progn | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1240 (setcar (cdr math-simplify-expr) (math-mul (nth 1 math-simplify-expr) |
40785 | 1241 (let ((calc-prefer-frac nil)) |
1242 (math-div 1 (car n))))) | |
1243 (setcar n 1))) | |
1244 (while (eq (car-safe (setq n (car np))) '*) | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1245 (math-simplify-units-divisor (cdr n) (cdr (cdr math-simplify-expr))) |
40785 | 1246 (setq np (cdr (cdr n)))) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1247 (math-simplify-units-divisor np (cdr (cdr math-simplify-expr))) |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1248 (if (eq math-try-cancel-units 0) |
40785 | 1249 (let* ((math-simplifying-units nil) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1250 (base (math-simplify |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1251 (math-to-standard-units math-simplify-expr nil)))) |
40785 | 1252 (if (Math-numberp base) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1253 (setq math-simplify-expr base)))) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1254 (if (eq (car-safe math-simplify-expr) '/) |
40785 | 1255 (math-simplify-units-prod)) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1256 math-simplify-expr))) |
40785 | 1257 |
1258 (defun math-simplify-units-divisor (np dp) | |
1259 (let ((n (car np)) | |
1260 d dd temp) | |
1261 (while (eq (car-safe (setq d (car dp))) '*) | |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1262 (when (setq temp (math-simplify-units-quotient n (nth 1 d))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1263 (setcar np (setq n temp)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1264 (setcar (cdr d) 1)) |
40785 | 1265 (setq dp (cdr (cdr d)))) |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1266 (when (setq temp (math-simplify-units-quotient n d)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1267 (setcar np (setq n temp)) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1268 (setcar dp 1)))) |
40785 | 1269 |
1270 ;; Simplify, e.g., "in / cm" to "2.54" in a units expression. | |
1271 (defun math-simplify-units-quotient (n d) | |
1272 (let ((pow1 1) | |
1273 (pow2 1)) | |
41269
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1274 (when (and (eq (car-safe n) '^) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1275 (integerp (nth 2 n))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1276 (setq pow1 (nth 2 n) n (nth 1 n))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1277 (when (and (eq (car-safe d) '^) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1278 (integerp (nth 2 d))) |
8b4a880d7759
(calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents:
41046
diff
changeset
|
1279 (setq pow2 (nth 2 d) d (nth 1 d))) |
40785 | 1280 (let ((un (math-check-unit-name n)) |
1281 (ud (math-check-unit-name d))) | |
1282 (and un ud | |
1283 (if (and (equal (nth 4 un) (nth 4 ud)) | |
1284 (eq pow1 pow2)) | |
85603
819d86e241bc
(math-simplify-units-quotient): Replace missing exponent.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
84936
diff
changeset
|
1285 (if (eq pow1 1) |
819d86e241bc
(math-simplify-units-quotient): Replace missing exponent.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
84936
diff
changeset
|
1286 (math-to-standard-units (list '/ n d) nil) |
819d86e241bc
(math-simplify-units-quotient): Replace missing exponent.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
84936
diff
changeset
|
1287 (list '^ (math-to-standard-units (list '/ n d) nil) pow1)) |
40785 | 1288 (let (ud1) |
1289 (setq un (nth 4 un) | |
1290 ud (nth 4 ud)) | |
1291 (while un | |
1292 (setq ud1 ud) | |
1293 (while ud1 | |
1294 (and (eq (car (car un)) (car (car ud1))) | |
58508
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1295 (setq math-try-cancel-units |
589dc235628a
(calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58303
diff
changeset
|
1296 (+ math-try-cancel-units |
40785 | 1297 (- (* (cdr (car un)) pow1) |
1298 (* (cdr (car ud)) pow2))))) | |
1299 (setq ud1 (cdr ud1))) | |
1300 (setq un (cdr un))) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1301 nil)))))) |
40785 | 1302 |
1303 (math-defsimplify ^ | |
1304 (and math-simplifying-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1305 (math-realp (nth 2 math-simplify-expr)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1306 (if (memq (car-safe (nth 1 math-simplify-expr)) '(* /)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1307 (list (car (nth 1 math-simplify-expr)) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1308 (list '^ (nth 1 (nth 1 math-simplify-expr)) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1309 (nth 2 math-simplify-expr)) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1310 (list '^ (nth 2 (nth 1 math-simplify-expr)) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1311 (nth 2 math-simplify-expr))) |
84891
1059e5620f1c
(math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82436
diff
changeset
|
1312 (math-simplify-units-pow (nth 1 math-simplify-expr) |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1313 (nth 2 math-simplify-expr))))) |
40785 | 1314 |
1315 (math-defsimplify calcFunc-sqrt | |
1316 (and math-simplifying-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1317 (if (memq (car-safe (nth 1 math-simplify-expr)) '(* /)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1318 (list (car (nth 1 math-simplify-expr)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1319 (list 'calcFunc-sqrt (nth 1 (nth 1 math-simplify-expr))) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1320 (list 'calcFunc-sqrt (nth 2 (nth 1 math-simplify-expr)))) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1321 (math-simplify-units-pow (nth 1 math-simplify-expr) '(frac 1 2))))) |
40785 | 1322 |
1323 (math-defsimplify (calcFunc-floor | |
1324 calcFunc-ceil | |
1325 calcFunc-round | |
1326 calcFunc-rounde | |
1327 calcFunc-roundu | |
1328 calcFunc-trunc | |
1329 calcFunc-float | |
1330 calcFunc-frac | |
1331 calcFunc-abs | |
1332 calcFunc-clean) | |
1333 (and math-simplifying-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1334 (= (length math-simplify-expr) 2) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1335 (if (math-only-units-in-expr-p (nth 1 math-simplify-expr)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1336 (nth 1 math-simplify-expr) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1337 (if (and (memq (car-safe (nth 1 math-simplify-expr)) '(* /)) |
40785 | 1338 (or (math-only-units-in-expr-p |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1339 (nth 1 (nth 1 math-simplify-expr))) |
40785 | 1340 (math-only-units-in-expr-p |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1341 (nth 2 (nth 1 math-simplify-expr))))) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1342 (list (car (nth 1 math-simplify-expr)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1343 (cons (car math-simplify-expr) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1344 (cons (nth 1 (nth 1 math-simplify-expr)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1345 (cdr (cdr math-simplify-expr)))) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1346 (cons (car math-simplify-expr) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1347 (cons (nth 2 (nth 1 math-simplify-expr)) |
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1348 (cdr (cdr math-simplify-expr))))))))) |
40785 | 1349 |
1350 (defun math-simplify-units-pow (a pow) | |
1351 (if (and (eq (car-safe a) '^) | |
1352 (math-check-unit-name (nth 1 a)) | |
1353 (math-realp (nth 2 a))) | |
1354 (list '^ (nth 1 a) (math-mul pow (nth 2 a))) | |
1355 (let* ((u (math-check-unit-name a)) | |
1356 (pf (math-to-simple-fraction pow)) | |
1357 (d (and (eq (car-safe pf) 'frac) (nth 2 pf)))) | |
1358 (and u d | |
1359 (math-units-are-multiple u d) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1360 (list '^ (math-to-standard-units a nil) pow))))) |
40785 | 1361 |
1362 | |
1363 (defun math-units-are-multiple (u n) | |
1364 (setq u (nth 4 u)) | |
1365 (while (and u (= (% (cdr (car u)) n) 0)) | |
1366 (setq u (cdr u))) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1367 (null u)) |
40785 | 1368 |
1369 (math-defsimplify calcFunc-sin | |
1370 (and math-simplifying-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1371 (math-units-in-expr-p (nth 1 math-simplify-expr) nil) |
40785 | 1372 (let ((rad (math-simplify-units |
1373 (math-evaluate-expr | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1374 (math-to-standard-units (nth 1 math-simplify-expr) nil)))) |
40785 | 1375 (calc-angle-mode 'rad)) |
1376 (and (eq (car-safe rad) '*) | |
1377 (math-realp (nth 1 rad)) | |
1378 (eq (car-safe (nth 2 rad)) 'var) | |
1379 (eq (nth 1 (nth 2 rad)) 'rad) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1380 (list 'calcFunc-sin (nth 1 rad)))))) |
40785 | 1381 |
1382 (math-defsimplify calcFunc-cos | |
1383 (and math-simplifying-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1384 (math-units-in-expr-p (nth 1 math-simplify-expr) nil) |
40785 | 1385 (let ((rad (math-simplify-units |
1386 (math-evaluate-expr | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1387 (math-to-standard-units (nth 1 math-simplify-expr) nil)))) |
40785 | 1388 (calc-angle-mode 'rad)) |
1389 (and (eq (car-safe rad) '*) | |
1390 (math-realp (nth 1 rad)) | |
1391 (eq (car-safe (nth 2 rad)) 'var) | |
1392 (eq (nth 1 (nth 2 rad)) 'rad) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1393 (list 'calcFunc-cos (nth 1 rad)))))) |
40785 | 1394 |
1395 (math-defsimplify calcFunc-tan | |
1396 (and math-simplifying-units | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1397 (math-units-in-expr-p (nth 1 math-simplify-expr) nil) |
40785 | 1398 (let ((rad (math-simplify-units |
1399 (math-evaluate-expr | |
58303
6ae80af2f94b
(math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57130
diff
changeset
|
1400 (math-to-standard-units (nth 1 math-simplify-expr) nil)))) |
40785 | 1401 (calc-angle-mode 'rad)) |
1402 (and (eq (car-safe rad) '*) | |
1403 (math-realp (nth 1 rad)) | |
1404 (eq (car-safe (nth 2 rad)) 'var) | |
1405 (eq (nth 1 (nth 2 rad)) 'rad) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1406 (list 'calcFunc-tan (nth 1 rad)))))) |
40785 | 1407 |
60082
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1408 (math-defsimplify calcFunc-sec |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1409 (and math-simplifying-units |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1410 (math-units-in-expr-p (nth 1 math-simplify-expr) nil) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1411 (let ((rad (math-simplify-units |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1412 (math-evaluate-expr |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1413 (math-to-standard-units (nth 1 math-simplify-expr) nil)))) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1414 (calc-angle-mode 'rad)) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1415 (and (eq (car-safe rad) '*) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1416 (math-realp (nth 1 rad)) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1417 (eq (car-safe (nth 2 rad)) 'var) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1418 (eq (nth 1 (nth 2 rad)) 'rad) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1419 (list 'calcFunc-sec (nth 1 rad)))))) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1420 |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1421 (math-defsimplify calcFunc-csc |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1422 (and math-simplifying-units |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1423 (math-units-in-expr-p (nth 1 math-simplify-expr) nil) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1424 (let ((rad (math-simplify-units |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1425 (math-evaluate-expr |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1426 (math-to-standard-units (nth 1 math-simplify-expr) nil)))) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1427 (calc-angle-mode 'rad)) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1428 (and (eq (car-safe rad) '*) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1429 (math-realp (nth 1 rad)) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1430 (eq (car-safe (nth 2 rad)) 'var) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1431 (eq (nth 1 (nth 2 rad)) 'rad) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1432 (list 'calcFunc-csc (nth 1 rad)))))) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1433 |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1434 (math-defsimplify calcFunc-cot |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1435 (and math-simplifying-units |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1436 (math-units-in-expr-p (nth 1 math-simplify-expr) nil) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1437 (let ((rad (math-simplify-units |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1438 (math-evaluate-expr |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1439 (math-to-standard-units (nth 1 math-simplify-expr) nil)))) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1440 (calc-angle-mode 'rad)) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1441 (and (eq (car-safe rad) '*) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1442 (math-realp (nth 1 rad)) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1443 (eq (car-safe (nth 2 rad)) 'var) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1444 (eq (nth 1 (nth 2 rad)) 'rad) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1445 (list 'calcFunc-cot (nth 1 rad)))))) |
1697c06499c8
Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
59394
diff
changeset
|
1446 |
40785 | 1447 |
1448 (defun math-remove-units (expr) | |
1449 (if (math-check-unit-name expr) | |
1450 1 | |
1451 (if (Math-primp expr) | |
1452 expr | |
1453 (cons (car expr) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1454 (mapcar 'math-remove-units (cdr expr)))))) |
40785 | 1455 |
1456 (defun math-extract-units (expr) | |
1457 (if (memq (car-safe expr) '(* /)) | |
1458 (cons (car expr) | |
1459 (mapcar 'math-extract-units (cdr expr))) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1460 (if (math-check-unit-name expr) expr 1))) |
40785 | 1461 |
1462 (defun math-build-units-table-buffer (enter-buffer) | |
1463 (if (not (and math-units-table math-units-table-buffer-valid | |
1464 (get-buffer "*Units Table*"))) | |
1465 (let ((buf (get-buffer-create "*Units Table*")) | |
1466 (uptr (math-build-units-table)) | |
1467 (calc-language (if (eq calc-language 'big) nil calc-language)) | |
1468 (calc-float-format '(float 0)) | |
1469 (calc-group-digits nil) | |
1470 (calc-number-radix 10) | |
106145
ba9f3a2508e3
(math-build-units-table-buffer): Let `calc-twos-complement-mode' be nil.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
105792
diff
changeset
|
1471 (calc-twos-complement-mode nil) |
40785 | 1472 (calc-point-char ".") |
1473 (std nil) | |
1474 u name shadowed) | |
1475 (save-excursion | |
1476 (message "Formatting units table...") | |
1477 (set-buffer buf) | |
62565
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1478 (let ((inhibit-read-only t)) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1479 (erase-buffer) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1480 (insert "Calculator Units Table:\n\n") |
98538
e216a9ffc756
(math-standard-units): Update the values of the units.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98400
diff
changeset
|
1481 (insert "(All definitions are exact unless marked with an asterisk (*).)\n\n") |
62565
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1482 (insert "Unit Type Definition Description\n\n") |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1483 (while uptr |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1484 (setq u (car uptr) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1485 name (nth 2 u)) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1486 (when (eq (car u) 'm) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1487 (setq std t)) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1488 (setq shadowed (and std (assq (car u) math-additional-units))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1489 (when (and name |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1490 (> (length name) 1) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1491 (eq (aref name 0) ?\*)) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1492 (unless (eq uptr math-units-table) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1493 (insert "\n")) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1494 (setq name (substring name 1))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1495 (insert " ") |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1496 (and shadowed (insert "(")) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1497 (insert (symbol-name (car u))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1498 (and shadowed (insert ")")) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1499 (if (nth 3 u) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1500 (progn |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1501 (indent-to 10) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1502 (insert (symbol-name (nth 3 u)))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1503 (or std |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1504 (progn |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1505 (indent-to 10) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1506 (insert "U")))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1507 (indent-to 14) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1508 (and shadowed (insert "(")) |
98400
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
1509 (if (nth 5 u) |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
1510 (insert (nth 5 u)) |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
1511 (if (nth 1 u) |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
1512 (insert (math-format-value (nth 1 u) 80)) |
f9165517710c
(math-standard-units): Add entries used to display the the values in the
Jay Belanger <jay.p.belanger@gmail.com>
parents:
98201
diff
changeset
|
1513 (insert (symbol-name (car u))))) |
62565
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1514 (and shadowed (insert ")")) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1515 (indent-to 41) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1516 (insert " ") |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1517 (when name |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1518 (insert name)) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1519 (if shadowed |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1520 (insert " (redefined above)") |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1521 (unless (nth 1 u) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1522 (insert " (base unit)"))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1523 (insert "\n") |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1524 (setq uptr (cdr uptr))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1525 (insert "\n\nUnit Prefix Table:\n\n") |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1526 (setq uptr math-unit-prefixes) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1527 (while uptr |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1528 (setq u (car uptr)) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1529 (insert " " (char-to-string (car u))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1530 (if (equal (nth 1 u) (nth 1 (nth 1 uptr))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1531 (insert " " (char-to-string (car (car (setq uptr (cdr uptr))))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1532 " ") |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1533 (insert " ")) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1534 (insert "10^" (int-to-string (nth 2 (nth 1 u)))) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1535 (indent-to 15) |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1536 (insert " " (nth 2 u) "\n") |
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1537 (while (eq (car (car (setq uptr (cdr uptr)))) 0))) |
111633
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
1538 (insert "\n\n") |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
1539 (insert "(**) When in TeX or LaTeX display mode, the TeX specific unit\n" |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
1540 "names will not use the `tex' prefix; the unit name for a\n" |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
1541 "TeX point will be `pt' instead of `texpt', for example.\n" |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
1542 "To avoid conflicts, the unit names for pint and parsec will\n" |
4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
Jay Belanger <jay.p.belanger@gmail.com>
parents:
109033
diff
changeset
|
1543 "be `pint' and `parsec' instead of `pt' and `pc'.")) |
62565
2b285bf6f228
(calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61412
diff
changeset
|
1544 (view-mode) |
40785 | 1545 (message "Formatting units table...done")) |
1546 (setq math-units-table-buffer-valid t) | |
1547 (let ((oldbuf (current-buffer))) | |
1548 (set-buffer buf) | |
1549 (goto-char (point-min)) | |
1550 (set-buffer oldbuf)) | |
1551 (if enter-buffer | |
1552 (pop-to-buffer buf) | |
1553 (display-buffer buf))) | |
1554 (if enter-buffer | |
1555 (pop-to-buffer (get-buffer "*Units Table*")) | |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1556 (display-buffer (get-buffer "*Units Table*"))))) |
40785 | 1557 |
112453
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1558 ;;; Logarithmic units functions |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1559 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1560 (defvar math-logunits '((var dB var-dB) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1561 (var Np var-Np))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1562 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1563 (defun math-extract-logunits (expr) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1564 (if (memq (car-safe expr) '(* /)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1565 (cons (car expr) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1566 (mapcar 'math-extract-logunits (cdr expr))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1567 (if (memq (car-safe expr) '(^)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1568 (list '^ (math-extract-logunits (nth 1 expr)) (nth 2 expr)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1569 (if (member expr math-logunits) expr 1)))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1570 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1571 (defun math-logcombine (a b neg) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1572 (let ((aunit (math-simplify (math-extract-logunits a)))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1573 (if (not (eq (car-safe aunit) 'var)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1574 (calc-record-why "*Improper logarithmic unit" aunit) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1575 (let* ((units (math-extract-units a)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1576 (acoeff (math-simplify (math-remove-units a))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1577 (bcoeff (math-simplify (math-to-standard-units |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1578 (list '/ b units) nil)))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1579 (if (math-units-in-expr-p bcoeff nil) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1580 (calc-record-why "*Inconsistent units" nil) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1581 (if (and neg |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1582 (or (math-lessp acoeff bcoeff) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1583 (math-equal acoeff bcoeff))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1584 (calc-record-why "*Improper coefficients" nil) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1585 (math-mul |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1586 (if (equal aunit '(var dB var-dB)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1587 (math-mul 10 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1588 (calcFunc-log10 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1589 (if neg |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1590 (math-sub |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1591 (math-pow 10 (math-div acoeff 10)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1592 (math-pow 10 (math-div bcoeff 10))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1593 (math-add |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1594 (math-pow 10 (math-div acoeff 10)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1595 (math-pow 10 (math-div bcoeff 10)))))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1596 (calcFunc-ln |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1597 (if neg |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1598 (math-sub |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1599 (calcFunc-exp acoeff) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1600 (calcFunc-exp bcoeff)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1601 (math-add |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1602 (calcFunc-exp acoeff) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1603 (calcFunc-exp bcoeff))))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1604 units))))))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1605 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1606 (defun calcFunc-luplus (a b) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1607 (math-logcombine a b nil)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1608 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1609 (defun calcFunc-luminus (a b) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1610 (math-logcombine a b t)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1611 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1612 (defun calc-luplus (arg) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1613 (interactive "P") |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1614 (calc-slow-wrapper |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1615 (if (calc-is-inverse) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1616 (calc-binary-op "lu-" 'calcFunc-luminus arg) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1617 (calc-binary-op "lu+" 'calcFunc-luplus arg)))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1618 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1619 (defun calc-luminus (arg) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1620 (interactive "P") |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1621 (calc-slow-wrapper |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1622 (if (calc-is-inverse) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1623 (calc-binary-op "lu+" 'calcFunc-luplus arg) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1624 (calc-binary-op "lu-" 'calcFunc-luminus arg)))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1625 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1626 ;(defun calcFunc-lmul (a b) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1627 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1628 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1629 (defun math-logunit-level (val ref power) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1630 (let ((lunit (math-simplify (math-extract-logunits val)))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1631 (if (not (eq (car-safe lunit) 'var)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1632 (calc-record-why "*Improper logarithmic unit" lunit) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1633 (if (not (eq 1 (math-simplify (math-extract-units (math-div val lunit))))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1634 (calc-record-why "*Inappropriate units" nil) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1635 (let ((coeff (math-simplify (math-div val lunit)))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1636 (if (equal lunit '(var dB var-dB)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1637 (math-mul |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1638 ref |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1639 (math-pow |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1640 10 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1641 (math-div |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1642 coeff |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1643 (if power 10 20)))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1644 (math-mul |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1645 ref |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1646 (calcFunc-exp |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1647 (if power |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1648 (math-mul 2 coeff) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1649 coeff))))))))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1650 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1651 (defvar calc-default-field-reference-level) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1652 (defvar calc-default-power-reference-level) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1653 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1654 (defun calcFunc-fieldlevel (val &optional ref) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1655 (unless ref |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1656 (setq ref (math-read-expr calc-default-field-reference-level))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1657 (math-logunit-level val ref nil)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1658 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1659 (defun calcFunc-powerlevel (val &optional ref) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1660 (unless ref |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1661 (setq ref (math-read-expr calc-default-power-reference-level))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1662 (math-logunit-level val ref t)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1663 |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1664 (defun calc-level (arg) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1665 (interactive "P") |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1666 (calc-slow-wrapper |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1667 (if (calc-is-hyperbolic) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1668 (if (calc-is-option) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1669 (calc-binary-op "plvl" 'calcFunc-powerlevel arg) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1670 (calc-unary-op "plvl" 'calcFunc-powerlevel arg)) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1671 (if (calc-is-option) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1672 (calc-binary-op "flvl" 'calcFunc-fieldlevel arg) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1673 (calc-unary-op "flvl" 'calcFunc-fieldlevel arg))))) |
06719a229a46
* calc/calc.el (calc-default-power-reference-level)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
112284
diff
changeset
|
1674 |
58677
5ef7cf7f3b8f
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58511
diff
changeset
|
1675 (provide 'calc-units) |
5ef7cf7f3b8f
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58511
diff
changeset
|
1676 |
109033
d150a25a0eb9
Add some utf-8 coding cookies.
Glenn Morris <rgm@gnu.org>
parents:
108590
diff
changeset
|
1677 ;; Local variables: |
d150a25a0eb9
Add some utf-8 coding cookies.
Glenn Morris <rgm@gnu.org>
parents:
108590
diff
changeset
|
1678 ;; coding: utf-8 |
45291
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
1679 ;; End: |
01f46f9c1fa0
(math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents:
41269
diff
changeset
|
1680 |
41046
14b73d89514a
(calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1681 ;;; calc-units.el ends here |