annotate lisp/calc/calc-units.el @ 91962:37c6e66c7e57

*** empty log message ***
author Michael Albinus <michael.albinus@gmx.de>
date Tue, 19 Feb 2008 19:23:19 +0000
parents 107ccd98fa12
children 606f2d163a64 1e3a407766b9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
64325
1db49616ce05 Update copyright information.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 64163
diff changeset
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
79702
9754bb0422ed Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 78215
diff changeset
4 ;; 2005, 2006, 2007, 2008 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
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
8
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
10
76595
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
78215
095d08e7d6bb Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 77465
diff changeset
13 ;; the Free Software Foundation; either version 3, or (at your option)
76595
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
14 ;; any later version.
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
15
76595
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
19 ;; GNU General Public License for more details.
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
20
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
21 ;; You should have received a copy of the GNU General Public License
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
497d17a80bb8 Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 75346
diff changeset
24 ;; Boston, MA 02110-1301, USA.
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
25
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
26 ;;; Commentary:
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
27
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
28 ;;; Code:
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
29
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
30 ;; 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
31
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
32 (require 'calc-ext)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
33 (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
34 (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
35 (require 'calc-alg))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
36
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
37 ;;; Units operations.
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
38
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
39 ;;; Units table last updated 9-Jan-91 by Ulrich Mueller (ulm@vsnhd1.cern.ch)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
40 ;;; with some additions by Przemek Klosowski (przemek@rrdstrad.nist.gov)
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
41 ;;; Updated April 2002 by Jochen Küpper
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
42
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
43 ;;; 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
44 ;;; 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
45 ;;; 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
46 ;;; ESUWM (Encyclopaedia of Scientific Units, Weights and
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
47 ;;; Measures, by François Cardarelli)
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
48 ;;; All conversions are exact unless otherwise noted.
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
49
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
50 (defvar math-standard-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
51 '( ;; Length
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
52 ( m nil "*Meter" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
53 ( in "254*10^(-2) cm" "Inch" )
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
54 ( ft "12 in" "Foot" )
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
55 ( 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
56 ( mi "5280 ft" "Mile" )
84891
1059e5620f1c (math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 82436
diff changeset
57 ( au "149597870691. m" "Astronomical Unit" )
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" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
60 ( pc "3.0856775854e16 m" "Parsec" ) ;; (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
61 ( 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
62 ( fath "6 ft" "Fathom" )
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
63 ( mu "1 um" "Micron" )
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
64 ( mil "in/1000" "Mil" )
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
65 ( point "in/72" "Point (1/72 inch)" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
66 ( 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
67 ( 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
68 ;; TeX lengths
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
69 ( texpt "(100/7227) in" "Point (TeX conventions)" )
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
70 ( texpc "12 texpt" "Pica" )
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
71 ( texbp "point" "Big point (TeX conventions)" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
72 ( texdd "(1238/1157) texpt" "Didot point" )
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
73 ( texcc "12 texdd" "Cicero" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
74 ( texsp "(1/65536) texpt" "Scaled TeX point" )
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49263
diff changeset
75
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
76 ;; Area
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
77 ( 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
78 ( a "100 m^2" "Are")
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
79 ( acre "mi^2 / 640" "Acre" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
80 ( b "10^(-28) m^2" "Barn" )
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49263
diff changeset
81
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
82 ;; Volume
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
83 ( 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
84 ( 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
85 ( 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
86 ( qt "2 pt" "Quart" )
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
87 ( pt "2 cup" "Pint" )
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
88 ( 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
89 ( 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
90 ( 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
91 ( 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
92 ;; 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
93 ;; That gives the following exact value for tsp.
84891
1059e5620f1c (math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 82436
diff changeset
94 ( tsp "492892159375*10^(-11) ml" "Teaspoon" )
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
95 ( vol "tsp+tbsp+ozfl+cup+pt+qt+gal" "Gallons + ... + teaspoons" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
96 ( galC "galUK" "Canadian Gallon" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
97 ( galUK "454609*10^(-5) L" "UK Gallon" ) ;; NIST
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49263
diff changeset
98
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
99 ;; Time
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
100 ( 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
101 ( 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
102 ( 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
103 ( 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
104 ( 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
105 ( 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
106 ( hms "wk+day+hr+min+s" "Hours, minutes, seconds" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
107 ( yr "365.25 day" "Year" ) ;; (approx, but keep)
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
108 ( Hz "1/s" "Hertz" )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
109
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
110 ;; Speed
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
111 ( 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
112 ( 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
113 ( 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
114 ( c "299792458 m/s" "Speed of light" ) ;;; CODATA
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49263
diff changeset
115
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
116 ;; Acceleration
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
117 ( ga "980665*10^(-5) m/s^2" "*\"g\" acceleration" ) ;; CODATA
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
118
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
119 ;; Mass
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
120 ( 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
121 ( lb "16 oz" "Pound (mass)" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
122 ( oz "28349523125*10^(-9) g" "Ounce (mass)" ) ;; ESUWM
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
123 ( 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
124 ( 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
125 ( t "1000 kg" "Metric ton" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
126 ( tonUK "10160469088*10^(-7) kg" "UK ton" ) ;; ESUWM
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
127 ( lbt "12 ozt" "Troy pound" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
128 ( ozt "31.10347680 g" "Troy ounce" ) ;; (approx) ESUWM
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
129 ( ct "(2/10) g" "Carat" ) ;; ESUWM
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
130 ( u "1.660538782e-27 kg" "Unified atomic mass" );;(approx) CODATA
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
131
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
132 ;; Force
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
133 ( 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
134 ( 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
135 ( 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
136 ( 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
137 ( kip "1000 lbf" "Kilopound (force)" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
138 ( pdl "138254954376*10^(-12) N" "Poundal" ) ;; ESUWM
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
139
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
140 ;; Energy
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
141 ( 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
142 ( erg "10^(-7) J" "Erg" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
143 ( cal "4.18674 J" "International Table Calorie" );;(approx) ESUWM
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
144 ( Btu "105505585262*10^(-8) J" "International Table Btu" ) ;; ESUWM
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
145 ( 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
146 ( 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
147 ( 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
148 ( 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
149 ( 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
150 ( 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
151 ( 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
152 ( 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
153 ( 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
154 ( Ws "W s" "Watt second")
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
155
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
156 ;; Power
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
157 ( W "J/s" "*Watt" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
158 ( hp "745.699871581 W" "Horsepower" ) ;;(approx) ESUWM
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
159
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
160 ;; Temperature
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
161 ( 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
162 ( 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
163 ( 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
164 ( 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
165 ( 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
166 ( 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
167 ( degF "(5/9) K" "Degree Fahrenheit" F )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
168
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
169 ;; Pressure
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
170 ( 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
171 ( 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
172 ( atm "101325 Pa" "Standard atmosphere" ) ;; CODATA
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
173 ( Torr "1.333224e2 Pa" "Torr" ) ;;(approx) NIST
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
174 ( mHg "1000 Torr" "Meter of mercury" )
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
175 ( inHg "254*10^(-1) mmHg" "Inch of mercury" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
176 ( inH2O "2.490889e2 Pa" "Inch of water" ) ;;(approx) NIST
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
177 ( psi "lbf/in^2" "Pounds per square inch" )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
178
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
179 ;; Viscosity
82390
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
180 ( 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
181 ( St "10^(-4) m^2/s" "Stokes" )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
182
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
183 ;; Electromagnetism
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
184 ( 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
185 ( 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
186 ( 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
187 ( e "ech" "Elementary charge" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
188 ( ech "1.602176487e-19 C" "Elementary charge" ) ;;(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
189 ( 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
190 ( ohm "V/A" "Ohm" )
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
191 ( 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
192 ( 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
193 ( 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
194 ( 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
195 ( 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
196 ( 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
197 ( Wb "V s" "Weber" )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
198
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
199 ;; 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
200 ( 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
201 ( 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
202 ( 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
203 ( 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
204 ( ph "10000 lx" "Phot" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
205 ( fc "10.76391 lx" "Footcandle" ) ;;(approx) NIST
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
206 ( lam "10000 lm/m^2" "Lambert" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
207 ( flam "3.426259 cd/m^2" "Footlambert" ) ;;(approx) NIST
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
208
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
209 ;; Radioactivity
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
210 ( 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
211 ( 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
212 ( 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
213 ( 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
214 ( 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
215 ( 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
216 ( rem "rd" "Rem" )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
217
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
218 ;; 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
219 ( mol nil "*Mole" )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
220
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
221 ;; 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
222 ( 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
223 ( 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
224 ( 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
225 ( 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
226 ( 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
227 ( 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
228 ( 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
229 ( rpm "rev/min" "Revolutions per minute" )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
230
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
231 ;; 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
232 ( sr nil "*Steradian" )
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
233
66206
fffcb2d302a5 (math-standard-units): Add units, adjust symbols and update values.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 65592
diff changeset
234 ;; 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
235 ;; The values are from CODATA, and are approximate.
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
236 ( h "6.62606896e-34 J s" "*Planck's constant" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
237 ( hbar "h / (2 pi)" "Planck's constant" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
238 ( mu0 "4 pi 10^(-7) H/m" "Permeability of vacuum" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
239 ( G "6.67428e-11 m^3/(kg s^2)" "Gravitational constant" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
240 ( Nav "6.02214179e23 / mol" "Avagadro's constant" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
241 ( me "9.10938215e-31 kg" "Electron rest mass" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
242 ( mp "1.672621637e-27 kg" "Proton rest mass" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
243 ( mn "1.674927211e-27 kg" "Neutron rest mass" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
244 ( mmu "1.88353130e-28 kg" "Muon rest mass" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
245 ( Ryd "10973731.568527 /m" "Rydberg's constant" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
246 ( k "1.3806504e-23 J/K" "Boltzmann's constant" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
247 ( alpha "7.2973525376e-3" "Fine structure constant" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
248 ( muB "927.400915e-26 J/T" "Bohr magneton" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
249 ( muN "5.05078324e-27 J/T" "Nuclear magneton" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
250 ( mue "-928.476377e-26 J/T" "Electron magnetic moment" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
251 ( mup "1.410606662e-26 J/T" "Proton magnetic moment" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
252 ( R0 "8.314472 J/(mol K)" "Molar gas constant" )
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
253 ( V0 "22.710981e-3 m^3/mol" "Standard volume of ideal gas" )))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
254
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
255
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
256 (defvar math-additional-units nil
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
257 "*Additional units table for user-defined units.
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
258 Must be formatted like math-standard-units.
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
259 If this is changed, be sure to set math-units-table to nil to ensure
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
260 that the combined units table will be rebuilt.")
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
261
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
262 (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
263 '( ( ?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
264 ( ?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
265 ( ?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
266 ( ?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
267 ( ?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
268 ( ?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
269 ( ?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
270 ( ?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
271 ( ?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
272 ( ?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
273 ( ?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
274 ( ?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
275 ( 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
276 ( ?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
277 ( ?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
278 ( ?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
279 ( ?u (^ 10 -6) "Micro" )
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
280 ( ?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
281 ( ?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
282 ( ?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
283 ( ?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
284 ( ?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
285 ( ?y (^ 10 -24) "yocto" )))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
286
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
287 (defvar math-standard-units-systems
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
288 '( ( 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
289 ( 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
290 ( 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
291 ( cgs ( ( m '(* (var cm var-cm) 100 ) ) ) )))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
292
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
293 (defvar math-units-table nil
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
294 "Internal units table derived from math-defined-units.
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
295 Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).")
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
296
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
297 (defvar math-units-table-buffer-valid nil)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
298
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
299 ;;; Units commands.
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
300
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
301 (defun calc-base-units ()
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
302 (interactive)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
303 (calc-slow-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
304 (let ((calc-autorange-units nil))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
305 (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
306 (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
307 nil))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
308
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
309 (defun calc-quick-units ()
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
310 (interactive)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
311 (calc-slow-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
312 (let* ((num (- last-command-char ?0))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
313 (pos (if (= num 0) 10 num))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
314 (units (calc-var-value 'var-Units))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
315 (expr (calc-top-n 1)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
316 (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
317 (error "Bad unit number"))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
318 (unless (math-vectorp units)
57130
d8cdadecaba8 (calc-quick-units): Fix overzealous s/or/unless.
John Paul Wallington <jpw@pobox.com>
parents: 52401
diff changeset
319 (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
320 (unless (< pos (length units))
57130
d8cdadecaba8 (calc-quick-units): Fix overzealous s/or/unless.
John Paul Wallington <jpw@pobox.com>
parents: 52401
diff changeset
321 (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
322 (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
323 (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
324 (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
325 (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
326 (math-simplify-units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
327 (math-mul expr (nth pos units))))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
328
82368
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
329 (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
330 "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
331 (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
332 (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
333 (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
334
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
335 (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
336 "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
337 (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
338 (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
339
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
340 (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
341 "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
342 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
343 (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
344 (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
345 (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
346 " / " "/"
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
347 (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
348 cexpr
c315336c2be8 (math-standard-units): Update values. Put in exact values when
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82368
diff changeset
349 (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
350
84891
1059e5620f1c (math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 82436
diff changeset
351 (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
352 (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
353 "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
354
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
355 (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
356 "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
357 (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
358 (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
359 (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
360 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
361 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
362 (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
363 (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
364 (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
365
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
366 (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
367 "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
368 (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
369 (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
370 (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
371 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
372 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
373 (cond
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
374 ((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
375 (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
376 ((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
377 (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
378 (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
379 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
380
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
381
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
382 (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
383 (interactive)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
384 (calc-slow-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
385 (let ((expr (calc-top-n 1))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
386 (uoldname nil)
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
387 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
388 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 defunits)
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
390 (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
391 (let ((uold (or old-units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
392 (progn
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
393 (setq uoldname (read-string "Old units: "))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
394 (if (equal uoldname "")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
395 (progn
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
396 (setq uoldname "1")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
397 1)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
398 (if (string-match "\\` */" uoldname)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
399 (setq uoldname (concat "1" uoldname)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
400 (math-read-expr uoldname))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
401 (when (eq (car-safe uold) 'error)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
402 (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
403 (setq expr (math-mul expr uold))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
404 (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
405 (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
406 (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
407 (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
408 (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
409 (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
410 uoldname
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
411 ", 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
412 "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
413 (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
414 (concat
84936
9f0f3499c174 (calc-convert-units, calc-convert-temperature): Remove unnecessary
Jay Belanger <jay.p.belanger@gmail.com>
parents: 84891
diff changeset
415 " (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
416 defunits
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
417 "): ")
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
418 ": "))))
84891
1059e5620f1c (math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 82436
diff changeset
419
82368
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
420 (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
421 (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
422 defunits)
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
423 (setq new-units defunits)))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
424 (when (string-match "\\` */" new-units)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
425 (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
426 (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
427 (when (eq (car-safe units) 'error)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
428 (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
429 (math-put-default-units units)
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
430 (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
431 (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
432 (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
433 (if std
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
434 (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
435 (math-to-standard-units expr
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
436 (nth 1 std))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
437 (unless unew
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
438 (error "No units specified"))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
439 (calc-enter-result 1 "cvun"
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
440 (math-convert-units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
441 expr units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
442 (and uoldname (not (equal uoldname "1"))))))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
443
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
444 (defun calc-autorange-units (arg)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
445 (interactive "P")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
446 (calc-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
447 (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
448 (message (if calc-autorange-units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
449 "Adjusting target unit prefix automatically"
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
450 "Using target units exactly"))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
451
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
452 (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
453 (interactive)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
454 (calc-slow-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
455 (let ((expr (calc-top-n 1))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
456 (uold nil)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
457 (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
458 unew
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
459 defunits)
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
460 (setq uold (or old-units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
461 (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
462 (if units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
463 (if (consp units)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
464 (list 'var (car units)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
465 (intern (concat "var-"
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
466 (symbol-name
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
467 (car units)))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
468 (error "Not a pure temperature expression"))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
469 (math-read-expr
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
470 (setq uoldname (read-string
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
471 "Old temperature units: ")))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
472 (when (eq (car-safe uold) 'error)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
473 (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
474 (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
475 (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
476 (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
477 (setq unew (or new-units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
478 (math-read-expr
84891
1059e5620f1c (math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 82436
diff changeset
479 (read-string
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 (concat
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
481 (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
482 (concat "Old temperature units: "
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
483 uoldname
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
484 ", 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
485 "New temperature units")
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
486 (if defunits
84936
9f0f3499c174 (calc-convert-units, calc-convert-temperature): Remove unnecessary
Jay Belanger <jay.p.belanger@gmail.com>
parents: 84891
diff changeset
487 (concat " (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
488 defunits
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
489 "): ")
030fcc9e29ab (math-get-standard-units,math-get-units,math-make-unit-string)
Jay Belanger <jay.p.belanger@gmail.com>
parents: 82325
diff changeset
490 ": "))))))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
491 (when (eq (car-safe unew) 'error)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
492 (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
493 (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
494 (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
495 (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
496 (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
497 uoldname)))))
a0abd1e93db8 (calc-convert-temperature): Ensure that units are on the result
Jay Belanger <jay.p.belanger@gmail.com>
parents: 85603
diff changeset
498 (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
499 (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
500 (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
501 (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
502
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
503 (defun calc-remove-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 (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
507 (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
508
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
509 (defun calc-extract-units ()
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
510 (interactive)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
511 (calc-slow-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
512 (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
513 (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
514
84891
1059e5620f1c (math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 82436
diff changeset
515 ;; 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
516 ;; 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
517 ;; 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
518 (defvar calc-num-units)
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
519 (defvar calc-den-units)
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
520
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
521 (defun calc-explain-units ()
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
522 (interactive)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
523 (calc-wrapper
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
524 (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
525 (calc-den-units nil))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
526 (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
527 (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
528 (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
529 (if calc-num-units
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
530 (if calc-den-units
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
531 (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
532 (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
533 (if calc-den-units
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
534 (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
535 (message "No units in expression"))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
536
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
537 (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
538 (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
539 pos)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
540 (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
541 (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
542 (if (eq (aref name 0) ?\*)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
543 (setq name (substring name 1)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
544 (if (string-match "[^a-zA-Z0-9']" name)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
545 (if (string-match "^[a-zA-Z0-9' ()]*$" name)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
546 (while (setq pos (string-match "[ ()]" name))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
547 (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
548 (if (eq (aref name pos) 32) "-" "")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
549 (substring name (1+ pos)))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
550 (setq name (concat "(" name ")"))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
551 (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
552 (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
553 (nth 1 expr)) 0)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
554 math-unit-prefixes))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
555 (if (and (string-match "[^a-zA-Z0-9']" name)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
556 (not (memq (car u) '(mHg gf))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
557 (concat "-" name)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
558 (downcase name)))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
559 (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
560 (math-equal-int pow -1)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
561 ((or (math-equal-int pow 2)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
562 (math-equal-int pow -2))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
563 (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
564 (setq name (concat "Square-" name))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
565 (setq name (concat name "-squared"))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
566 ((or (math-equal-int pow 3)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
567 (math-equal-int pow -3))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
568 (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
569 (setq name (concat "Cubic-" name))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
570 (setq name (concat name "-cubed"))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
571 (t
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
572 (setq name (concat name "^"
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
573 (math-format-number (math-abs pow))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
574 (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
575 (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
576 (concat calc-num-units " " name)
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
577 name))
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
578 (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
579 (concat calc-den-units " " name)
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
580 name))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
581 (cond ((eq (car-safe expr) '*)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
582 (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
583 (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
584 ((eq (car-safe expr) '/)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
585 (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
586 (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
587 ((memq (car-safe expr) '(neg + -))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
588 (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
589 ((and (eq (car-safe expr) '^)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
590 (math-realp (nth 2 expr)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
591 (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
592 (math-mul pow (nth 2 expr))))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
593
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
594 (defun calc-simplify-units ()
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
595 (interactive)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
596 (calc-slow-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
597 (calc-with-default-simplification
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
598 (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
599
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
600 (defun calc-view-units-table (n)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
601 (interactive "P")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
602 (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
603 (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
604 (if (and win
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
605 math-units-table
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
606 math-units-table-buffer-valid)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
607 (progn
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
608 (bury-buffer (window-buffer win))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
609 (let ((curwin (selected-window)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
610 (select-window win)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
611 (switch-to-buffer nil)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
612 (select-window curwin)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
613 (math-build-units-table-buffer nil))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
614
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
615 (defun calc-enter-units-table (n)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
616 (interactive "P")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
617 (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
618 (math-build-units-table-buffer t)
65592
1038e6fc7f28 message format spec fixes, commit # 11
Deepak Goel <deego@gnufans.org>
parents: 64325
diff changeset
619 (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
620
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
621 (defun calc-define-unit (uname desc)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
622 (interactive "SDefine unit name: \nsDescription: ")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
623 (calc-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
624 (let ((form (calc-top-n 1))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
625 (unit (assq uname math-additional-units)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
626 (or unit
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
627 (setq math-additional-units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
628 (cons (setq unit (list uname nil nil))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
629 math-additional-units)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
630 math-units-table nil))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
631 (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
632 (eq (nth 1 form) uname)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
633 (not (math-equal-int form 1))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
634 (math-format-flat-expr form 0)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
635 (setcar (cdr (cdr unit)) (and (not (equal desc ""))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
636 desc))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
637 (calc-invalidate-units-table))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
638
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
639 (defun calc-undefine-unit (uname)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
640 (interactive "SUndefine unit name: ")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
641 (calc-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
642 (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
643 (or unit
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
644 (if (assq uname math-standard-units)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
645 (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
646 (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
647 (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
648 math-units-table nil)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
649 (calc-invalidate-units-table))
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-invalidate-units-table ()
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
652 (setq math-units-table nil)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
653 (let ((buf (get-buffer "*Units Table*")))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
654 (and buf
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
655 (save-excursion
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
656 (set-buffer buf)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
657 (save-excursion
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
658 (goto-char (point-min))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
659 (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
660 (let ((inhibit-read-only t))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
661 (insert "(Obsolete) "))))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
662
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
663 (defun calc-get-unit-definition (uname)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
664 (interactive "SGet definition for unit: ")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
665 (calc-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
666 (math-build-units-table)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
667 (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
668 (or unit
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
669 (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
670 (let ((msg (nth 2 unit)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
671 (if (stringp msg)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
672 (if (string-match "^\\*" msg)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
673 (setq msg (substring msg 1)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
674 (setq msg (symbol-name uname)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
675 (if (nth 1 unit)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
676 (progn
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
677 (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
678 (message "Derived unit: %s" msg))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
679 (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
680 (intern
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
681 (concat "var-"
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
682 (symbol-name uname)))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
683 (message "Base unit: %s" msg))))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
684
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
685 (defun calc-permanent-units ()
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
686 (interactive)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
687 (calc-wrapper
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
688 (let (pos)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
689 (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
690 calc-settings-file)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
691 (goto-char (point-min))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
692 (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
693 (progn
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
694 (beginning-of-line)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
695 (setq pos (point))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
696 (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
697 (progn
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
698 (beginning-of-line)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
699 (forward-line 1)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
700 (delete-region pos (point)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
701 (goto-char (point-max))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
702 (insert "\n\n")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
703 (forward-char -1))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
704 (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
705 (if math-additional-units
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
706 (progn
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
707 (insert "(setq math-additional-units '(\n")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
708 (let ((list math-additional-units))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
709 (while list
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
710 (insert " (" (symbol-name (car (car list))) " "
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
711 (if (nth 1 (car list))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
712 (if (stringp (nth 1 (car list)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
713 (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
714 (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
715 (nth 1 (car list)) 0)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
716 "nil")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
717 " "
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
718 (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
719 ")\n")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
720 (setq list (cdr list))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
721 (insert "))\n"))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
722 (insert ";;; (no custom units defined)\n"))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
723 (insert ";;; End of custom units\n")
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
724 (save-buffer))))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
725
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
726
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
727 ;; 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
728 ;; 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
729 ;; 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
730 ;; 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
731 ;; 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
732 (defvar math-cu-unit-list)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
733
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
734 (defun math-build-units-table ()
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
735 (or math-units-table
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
736 (let* ((combined-units (append math-additional-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
737 math-standard-units))
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
738 (math-cu-unit-list (mapcar 'car combined-units))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
739 tab)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
740 (message "Building units table...")
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
741 (setq math-units-table-buffer-valid nil)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
742 (setq tab (mapcar (function
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
743 (lambda (x)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
744 (list (car x)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
745 (and (nth 1 x)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
746 (if (stringp (nth 1 x))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
747 (let ((exp (math-read-plain-expr
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
748 (nth 1 x))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
749 (if (eq (car-safe exp) 'error)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
750 (error "Format error in definition of %s in units table: %s"
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
751 (car x) (nth 2 exp))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
752 exp))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
753 (nth 1 x)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
754 (nth 2 x)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
755 (nth 3 x)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
756 (and (not (nth 1 x))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
757 (list (cons (car x) 1))))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
758 combined-units))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
759 (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
760 (mapc 'math-find-base-units tab))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
761 (message "Building units table...done")
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
762 (setq math-units-table tab))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
763
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
764 ;; 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
765 ;; 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
766 ;; 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
767 (defvar math-fbu-base)
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
768 (defvar math-fbu-entry)
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
769
58511
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
770 (defun math-find-base-units (math-fbu-entry)
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
771 (if (eq (nth 4 math-fbu-entry) 'boom)
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
772 (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
773 (or (nth 4 math-fbu-entry)
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
774 (let (math-fbu-base)
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
775 (setcar (nthcdr 4 math-fbu-entry) 'boom)
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
776 (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
777 '(or math-fbu-base
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
778 (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
779 (while (eq (cdr (car math-fbu-base)) 0)
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
780 (setq math-fbu-base (cdr math-fbu-base)))
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
781 (let ((b math-fbu-base))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
782 (while (cdr b)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
783 (if (eq (cdr (car (cdr b))) 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
784 (setcdr b (cdr (cdr b)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
785 (setq b (cdr b)))))
58511
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
786 (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
787 (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
788 math-fbu-base)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
789
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
790 (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
791 (memq (car b) (cdr (memq (car a) math-cu-unit-list))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
792
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
793 (defun math-find-base-units-rec (expr pow)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
794 (let ((u (math-check-unit-name expr)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
795 (cond (u
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
796 (let ((ulist (math-find-base-units u)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
797 (while ulist
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
798 (let ((p (* (cdr (car ulist)) pow))
58511
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
799 (old (assq (car (car ulist)) math-fbu-base)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
800 (if old
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
801 (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
802 (setq math-fbu-base
58511
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
803 (cons (cons (car (car ulist)) p) math-fbu-base))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
804 (setq ulist (cdr ulist)))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
805 ((math-scalarp expr))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
806 ((and (eq (car expr) '^)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
807 (integerp (nth 2 expr)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
808 (math-find-base-units-rec (nth 1 expr) (* pow (nth 2 expr))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
809 ((eq (car expr) '*)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
810 (math-find-base-units-rec (nth 1 expr) pow)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
811 (math-find-base-units-rec (nth 2 expr) pow))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
812 ((eq (car expr) '/)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
813 (math-find-base-units-rec (nth 1 expr) pow)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
814 (math-find-base-units-rec (nth 2 expr) (- pow)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
815 ((eq (car expr) 'neg)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
816 (math-find-base-units-rec (nth 1 expr) pow))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
817 ((eq (car expr) '+)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
818 (math-find-base-units-rec (nth 1 expr) pow))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
819 ((eq (car expr) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
820 (or (eq (nth 1 expr) 'pi)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
821 (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
822 (nth 1 expr) (car math-fbu-entry))))
0a3797785946 Finish making previous changes.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58508
diff changeset
823 (t (error "Malformed defining expression for unit %s" (car math-fbu-entry))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
824
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
825
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
826 (defun math-units-in-expr-p (expr sub-exprs)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
827 (and (consp expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
828 (if (eq (car expr) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
829 (math-check-unit-name expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
830 (and (or sub-exprs
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
831 (memq (car expr) '(* / ^)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
832 (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
833 (math-units-in-expr-p (nth 2 expr) sub-exprs))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
834
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
835 (defun math-only-units-in-expr-p (expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
836 (and (consp expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
837 (if (eq (car expr) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
838 (math-check-unit-name expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
839 (if (memq (car expr) '(* /))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
840 (and (math-only-units-in-expr-p (nth 1 expr))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
841 (math-only-units-in-expr-p (nth 2 expr)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
842 (and (eq (car expr) '^)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
843 (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
844 (math-realp (nth 2 expr))))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
845
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
846 (defun math-single-units-in-expr-p (expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
847 (cond ((math-scalarp expr) nil)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
848 ((eq (car expr) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
849 (math-check-unit-name expr))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
850 ((eq (car expr) '*)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
851 (let ((u1 (math-single-units-in-expr-p (nth 1 expr)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
852 (u2 (math-single-units-in-expr-p (nth 2 expr))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
853 (or (and u1 u2 'wrong)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
854 u1
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
855 u2)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
856 ((eq (car expr) '/)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
857 (if (math-units-in-expr-p (nth 2 expr) nil)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
858 'wrong
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
859 (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
860 (t 'wrong)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
861
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
862 (defun math-check-unit-name (v)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
863 (and (eq (car-safe v) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
864 (or (assq (nth 1 v) (or math-units-table (math-build-units-table)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
865 (let ((name (symbol-name (nth 1 v))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
866 (and (> (length name) 1)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
867 (assq (aref name 0) math-unit-prefixes)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
868 (or (assq (intern (substring name 1)) math-units-table)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
869 (and (eq (aref name 0) ?M)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
870 (> (length name) 3)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
871 (eq (aref name 1) ?e)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
872 (eq (aref name 2) ?g)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
873 (assq (intern (substring name 3))
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
874 math-units-table))))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
875
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
876 ;; 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
877 ;; 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
878 ;; math-to-standard-units.
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
879 (defvar math-which-standard)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
880
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
881 (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
882 (math-to-standard-rec expr))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
883
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
884 (defun math-to-standard-rec (expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
885 (if (eq (car-safe expr) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
886 (let ((u (math-check-unit-name expr))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
887 (base (nth 1 expr)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
888 (if u
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
889 (progn
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
890 (if (nth 1 u)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
891 (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
892 (let ((st (assq (car u) math-which-standard)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
893 (if st
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
894 (setq expr (nth 1 st))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
895 (setq expr (list 'var (car u)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
896 (intern (concat "var-"
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
897 (symbol-name
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
898 (car u)))))))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
899 (or (null u)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
900 (eq base (car u))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
901 (setq expr (list '*
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
902 (nth 1 (assq (aref (symbol-name base) 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
903 math-unit-prefixes))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
904 expr)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
905 expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
906 (if (eq base 'pi)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
907 (math-pi)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
908 expr)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
909 (if (Math-primp expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
910 expr
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
911 (cons (car expr)
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
912 (mapcar 'math-to-standard-rec (cdr expr))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
913
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
914 (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
915 (setq expr (math-simplify-units expr))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
916 (if ulist
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
917 (let ((new 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
918 value)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
919 (or (math-numberp expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
920 (error "Incompatible units"))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
921 (while (cdr ulist)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
922 (setq value (math-div expr (nth 1 (car ulist)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
923 value (math-floor (let ((calc-internal-prec
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
924 (1- calc-internal-prec)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
925 (math-normalize value)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
926 new (math-add new (math-mul value (car (car ulist))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
927 expr (math-sub expr (math-mul value (nth 1 (car ulist))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
928 ulist (cdr ulist)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
929 (math-add new (math-mul (math-div expr (nth 1 (car ulist)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
930 (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
931 (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
932 expr
f3c30d255a4d (math-apply-units): Change the places in which units are simplified.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 62565
diff changeset
933 (math-simplify-units (list '* expr units)))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
934
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
935 (defvar math-decompose-units-cache nil)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
936 (defun math-decompose-units (units)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
937 (let ((u (math-check-unit-name units)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
938 (and u (eq (car-safe (nth 1 u)) '+)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
939 (setq units (nth 1 u))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
940 (setq units (calcFunc-expand units))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
941 (and (eq (car-safe units) '+)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
942 (let ((entry (list units calc-internal-prec calc-prefer-frac)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
943 (or (equal entry (car math-decompose-units-cache))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
944 (let ((ulist nil)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
945 (utemp units)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
946 qty unit)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
947 (while (eq (car-safe utemp) '+)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
948 (setq ulist (cons (math-decompose-unit-part (nth 2 utemp))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
949 ulist)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
950 utemp (nth 1 utemp)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
951 (setq ulist (cons (math-decompose-unit-part utemp) ulist)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
952 utemp ulist)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
953 (while (setq utemp (cdr utemp))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
954 (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
955 (error "Inconsistent units in sum")))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
956 (setq math-decompose-units-cache
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
957 (cons entry
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
958 (sort ulist
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
959 (function
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
960 (lambda (x y)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
961 (not (Math-lessp (nth 1 x)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
962 (nth 1 y))))))))))
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
963 (cdr math-decompose-units-cache))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
964
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
965 (defun math-decompose-unit-part (unit)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
966 (cons unit
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
967 (math-is-multiple (math-simplify-units (math-to-standard-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
968 unit nil))
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
969 t)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
970
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
971 ;; 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
972 ;; 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
973 ;; math-find-compatible-unit.
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
974 (defvar math-fcu-u)
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
975
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
976 (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
977 (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
978 (if math-fcu-u
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
979 (math-find-compatible-unit-rec expr 1))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
980
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
981 (defun math-find-compatible-unit-rec (expr pow)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
982 (cond ((eq (car-safe expr) '*)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
983 (or (math-find-compatible-unit-rec (nth 1 expr) pow)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
984 (math-find-compatible-unit-rec (nth 2 expr) pow)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
985 ((eq (car-safe expr) '/)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
986 (or (math-find-compatible-unit-rec (nth 1 expr) pow)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
987 (math-find-compatible-unit-rec (nth 2 expr) (- pow))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
988 ((and (eq (car-safe expr) '^)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
989 (integerp (nth 2 expr)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
990 (math-find-compatible-unit-rec (nth 1 expr) (* pow (nth 2 expr))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
991 (t
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
992 (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
993 (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
994 (cons expr pow))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
995
84891
1059e5620f1c (math-build-units-table): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 82436
diff changeset
996 ;; 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
997 ;; 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
998 ;; 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
999 (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
1000 (defvar math-cu-pure)
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
1001
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
1002 (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
1003 (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
1004 (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
1005 (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
1006 (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
1007 (setq math-cu-new-units (nth 1 unew)))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1008 (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
1009 (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
1010 (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
1011 (math-cu-unit-list nil)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1012 (math-combining-units nil))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1013 (if compat
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1014 (math-simplify-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1015 (math-mul (math-mul (math-simplify-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1016 (math-div expr (math-pow (car compat)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1017 (cdr compat))))
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
1018 (math-pow math-cu-new-units (cdr compat)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1019 (math-simplify-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1020 (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
1021 (math-pow (math-div (car compat) math-cu-new-units)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1022 (cdr compat))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1023 nil))))
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
1024 (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
1025 (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
1026 (when (eq (car-safe expr) '+)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1027 (setq expr (math-simplify-units expr)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1028 (if (math-units-in-expr-p expr t)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1029 (math-convert-units-rec expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1030 (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
1031 (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
1032 math-cu-new-units math-cu-unit-list math-cu-pure))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1033
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1034 (defun math-convert-units-rec (expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1035 (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
1036 (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
1037 (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
1038 math-cu-new-units math-cu-unit-list math-cu-pure)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1039 (if (Math-primp expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1040 expr
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1041 (cons (car expr)
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1042 (mapcar 'math-convert-units-rec (cdr expr))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1043
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1044 (defun math-convert-temperature (expr old new &optional pure)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1045 (let* ((units (math-single-units-in-expr-p expr))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1046 (uold (if old
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1047 (if (or (null units)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1048 (equal (nth 1 old) (car units)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1049 (math-check-unit-name old)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1050 (error "Inconsistent temperature units"))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1051 units))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1052 (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
1053 (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
1054 (error "Not a valid temperature unit"))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1055 (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
1056 (error "Not a pure temperature expression"))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1057 (let ((v (car uold)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1058 (setq expr (list '/ expr (list 'var v
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1059 (intern (concat "var-"
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1060 (symbol-name v)))))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1061 (or (eq (nth 3 uold) (nth 3 unew))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1062 (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
1063 (setq expr (list '- expr '(/ 27315 100)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1064 (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
1065 (setq expr (list '+ (list '* expr '(/ 9 5)) 32))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1066 ((eq (nth 3 uold) 'C)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1067 (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
1068 (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
1069 (setq expr (list '+ expr '(/ 27315 100)))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1070 (t
82325
c9f47b4c81d5 (calc-convert-temperature): Use `/' to create fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 78215
diff changeset
1071 (setq expr (list '* (list '- expr 32) '(/ 5 9)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1072 (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
1073 (setq expr (list '+ expr '(/ 27315 100)))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1074 (if pure
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1075 expr
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1076 (list '* expr new))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1077
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1078
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1079
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1080 (defun math-simplify-units (a)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1081 (let ((math-simplifying-units t)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1082 (calc-matrix-mode 'scalar))
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1083 (math-simplify a)))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1084 (defalias 'calcFunc-usimplify 'math-simplify-units)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1085
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1086 ;; 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
1087 ;; 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
1088 (defvar math-simplify-expr)
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1089
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1090 (math-defsimplify (+ -)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1091 (and math-simplifying-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1092 (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
1093 (let* ((units (math-extract-units (nth 1 math-simplify-expr)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1094 (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
1095 (list '/ (nth 2 math-simplify-expr) units) nil))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1096 (if (math-units-in-expr-p ratio nil)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1097 (progn
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1098 (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
1099 math-simplify-expr)
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1100 (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
1101 (if (eq (car math-simplify-expr) '-)
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1102 (math-neg ratio) ratio))
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1103 units)))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1104
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1105 (math-defsimplify *
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1106 (math-simplify-units-prod))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1107
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1108 (defun math-simplify-units-prod ()
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1109 (and math-simplifying-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1110 calc-autorange-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1111 (Math-realp (nth 1 math-simplify-expr))
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1112 (let* ((num (math-float (nth 1 math-simplify-expr)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1113 (xpon (calcFunc-xpon num))
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1114 (unitp (cdr (cdr math-simplify-expr)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1115 (unit (car unitp))
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1116 (pow (if (eq (car math-simplify-expr) '*) 1 -1))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1117 u)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1118 (and (eq (car-safe unit) '*)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1119 (setq unitp (cdr unit)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1120 unit (car unitp)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1121 (and (eq (car-safe unit) '^)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1122 (integerp (nth 2 unit))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1123 (setq pow (* pow (nth 2 unit))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1124 unitp (cdr unit)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1125 unit (car unitp)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1126 (and (setq u (math-check-unit-name unit))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1127 (integerp xpon)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1128 (or (< xpon 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1129 (>= xpon (if (eq (car u) 'm) 1 3)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1130 (let* ((uxpon 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1131 (pref (if (< pow 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1132 (reverse math-unit-prefixes)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1133 math-unit-prefixes))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1134 (p pref)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1135 pxpon pname)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1136 (or (eq (car u) (nth 1 unit))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1137 (setq uxpon (* pow
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1138 (nth 2 (nth 1 (assq
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1139 (aref (symbol-name
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1140 (nth 1 unit)) 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1141 math-unit-prefixes))))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1142 (setq xpon (+ xpon uxpon))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1143 (while (and p
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1144 (or (memq (car (car p)) '(?d ?D ?h ?H))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1145 (and (eq (car (car p)) ?c)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1146 (not (eq (car u) 'm)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1147 (< xpon (setq pxpon (* (nth 2 (nth 1 (car p)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1148 pow)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1149 (progn
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1150 (setq pname (math-build-var-name
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1151 (if (eq (car (car p)) 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1152 (car u)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1153 (concat (char-to-string
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1154 (car (car p)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1155 (symbol-name
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1156 (car u))))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1157 (and (/= (car (car p)) 0)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1158 (assq (nth 1 pname)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1159 math-units-table)))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1160 (setq p (cdr p)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1161 (and p
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1162 (/= pxpon uxpon)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1163 (or (not (eq p pref))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1164 (< xpon (+ pxpon (* (math-abs pow) 3))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1165 (progn
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1166 (setcar (cdr math-simplify-expr)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1167 (let ((calc-prefer-frac nil))
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1168 (calcFunc-scf (nth 1 math-simplify-expr)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1169 (- uxpon pxpon))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1170 (setcar unitp pname)
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1171 math-simplify-expr)))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1172
58508
589dc235628a (calc-convert-units): Make units a local variable.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58303
diff changeset
1173 (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
1174
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1175 (math-defsimplify /
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1176 (and math-simplifying-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1177 (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
1178 (math-try-cancel-units 0)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1179 n nn)
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1180 (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
1181 (cdr (nth 2 math-simplify-expr))
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1182 (nthcdr 2 math-simplify-expr)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1183 (if (math-realp (car n))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1184 (progn
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1185 (setcar (cdr math-simplify-expr) (math-mul (nth 1 math-simplify-expr)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1186 (let ((calc-prefer-frac nil))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1187 (math-div 1 (car n)))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1188 (setcar n 1)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1189 (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
1190 (math-simplify-units-divisor (cdr n) (cdr (cdr math-simplify-expr)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1191 (setq np (cdr (cdr n))))
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1192 (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
1193 (if (eq math-try-cancel-units 0)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1194 (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
1195 (base (math-simplify
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1196 (math-to-standard-units math-simplify-expr nil))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1197 (if (Math-numberp base)
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1198 (setq math-simplify-expr base))))
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1199 (if (eq (car-safe math-simplify-expr) '/)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1200 (math-simplify-units-prod))
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1201 math-simplify-expr)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1202
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1203 (defun math-simplify-units-divisor (np dp)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1204 (let ((n (car np))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1205 d dd temp)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1206 (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
1207 (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
1208 (setcar np (setq n temp))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1209 (setcar (cdr d) 1))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1210 (setq dp (cdr (cdr d))))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1211 (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
1212 (setcar np (setq n temp))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1213 (setcar dp 1))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1214
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1215 ;; Simplify, e.g., "in / cm" to "2.54" in a units expression.
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1216 (defun math-simplify-units-quotient (n d)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1217 (let ((pow1 1)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1218 (pow2 1))
41269
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1219 (when (and (eq (car-safe n) '^)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1220 (integerp (nth 2 n)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1221 (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
1222 (when (and (eq (car-safe d) '^)
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1223 (integerp (nth 2 d)))
8b4a880d7759 (calcFunc-usimplify): Add missing quote to defalias argument.
Colin Walters <walters@gnu.org>
parents: 41046
diff changeset
1224 (setq pow2 (nth 2 d) d (nth 1 d)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1225 (let ((un (math-check-unit-name n))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1226 (ud (math-check-unit-name d)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1227 (and un ud
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1228 (if (and (equal (nth 4 un) (nth 4 ud))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1229 (eq pow1 pow2))
85603
819d86e241bc (math-simplify-units-quotient): Replace missing exponent.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 84936
diff changeset
1230 (if (eq pow1 1)
819d86e241bc (math-simplify-units-quotient): Replace missing exponent.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 84936
diff changeset
1231 (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
1232 (list '^ (math-to-standard-units (list '/ n d) nil) pow1))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1233 (let (ud1)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1234 (setq un (nth 4 un)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1235 ud (nth 4 ud))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1236 (while un
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1237 (setq ud1 ud)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1238 (while ud1
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1239 (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
1240 (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
1241 (+ math-try-cancel-units
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1242 (- (* (cdr (car un)) pow1)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1243 (* (cdr (car ud)) pow2)))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1244 (setq ud1 (cdr ud1)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1245 (setq un (cdr un)))
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1246 nil))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1247
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1248 (math-defsimplify ^
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1249 (and math-simplifying-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1250 (math-realp (nth 2 math-simplify-expr))
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1251 (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
1252 (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
1253 (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
1254 (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
1255 (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
1256 (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
1257 (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
1258 (nth 2 math-simplify-expr)))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1259
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1260 (math-defsimplify calcFunc-sqrt
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1261 (and math-simplifying-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1262 (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
1263 (list (car (nth 1 math-simplify-expr))
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1264 (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
1265 (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
1266 (math-simplify-units-pow (nth 1 math-simplify-expr) '(frac 1 2)))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1267
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1268 (math-defsimplify (calcFunc-floor
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1269 calcFunc-ceil
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1270 calcFunc-round
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1271 calcFunc-rounde
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1272 calcFunc-roundu
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1273 calcFunc-trunc
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1274 calcFunc-float
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1275 calcFunc-frac
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1276 calcFunc-abs
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1277 calcFunc-clean)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1278 (and math-simplifying-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1279 (= (length math-simplify-expr) 2)
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1280 (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
1281 (nth 1 math-simplify-expr)
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1282 (if (and (memq (car-safe (nth 1 math-simplify-expr)) '(* /))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1283 (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
1284 (nth 1 (nth 1 math-simplify-expr)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1285 (math-only-units-in-expr-p
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1286 (nth 2 (nth 1 math-simplify-expr)))))
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1287 (list (car (nth 1 math-simplify-expr))
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1288 (cons (car math-simplify-expr)
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1289 (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
1290 (cdr (cdr math-simplify-expr))))
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1291 (cons (car math-simplify-expr)
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1292 (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
1293 (cdr (cdr math-simplify-expr)))))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1294
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1295 (defun math-simplify-units-pow (a pow)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1296 (if (and (eq (car-safe a) '^)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1297 (math-check-unit-name (nth 1 a))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1298 (math-realp (nth 2 a)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1299 (list '^ (nth 1 a) (math-mul pow (nth 2 a)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1300 (let* ((u (math-check-unit-name a))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1301 (pf (math-to-simple-fraction pow))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1302 (d (and (eq (car-safe pf) 'frac) (nth 2 pf))))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1303 (and u d
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1304 (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
1305 (list '^ (math-to-standard-units a nil) pow)))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1306
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1307
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1308 (defun math-units-are-multiple (u n)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1309 (setq u (nth 4 u))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1310 (while (and u (= (% (cdr (car u)) n) 0))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1311 (setq u (cdr u)))
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1312 (null u))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1313
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1314 (math-defsimplify calcFunc-sin
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1315 (and math-simplifying-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1316 (math-units-in-expr-p (nth 1 math-simplify-expr) nil)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1317 (let ((rad (math-simplify-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1318 (math-evaluate-expr
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1319 (math-to-standard-units (nth 1 math-simplify-expr) nil))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1320 (calc-angle-mode 'rad))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1321 (and (eq (car-safe rad) '*)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1322 (math-realp (nth 1 rad))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1323 (eq (car-safe (nth 2 rad)) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1324 (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
1325 (list 'calcFunc-sin (nth 1 rad))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1326
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1327 (math-defsimplify calcFunc-cos
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1328 (and math-simplifying-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1329 (math-units-in-expr-p (nth 1 math-simplify-expr) nil)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1330 (let ((rad (math-simplify-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1331 (math-evaluate-expr
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1332 (math-to-standard-units (nth 1 math-simplify-expr) nil))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1333 (calc-angle-mode 'rad))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1334 (and (eq (car-safe rad) '*)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1335 (math-realp (nth 1 rad))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1336 (eq (car-safe (nth 2 rad)) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1337 (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
1338 (list 'calcFunc-cos (nth 1 rad))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1339
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1340 (math-defsimplify calcFunc-tan
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1341 (and math-simplifying-units
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1342 (math-units-in-expr-p (nth 1 math-simplify-expr) nil)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1343 (let ((rad (math-simplify-units
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1344 (math-evaluate-expr
58303
6ae80af2f94b (math-simplify-expr): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 57130
diff changeset
1345 (math-to-standard-units (nth 1 math-simplify-expr) nil))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1346 (calc-angle-mode 'rad))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1347 (and (eq (car-safe rad) '*)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1348 (math-realp (nth 1 rad))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1349 (eq (car-safe (nth 2 rad)) 'var)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1350 (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
1351 (list 'calcFunc-tan (nth 1 rad))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1352
60082
1697c06499c8 Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 59394
diff changeset
1353 (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
1354 (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
1355 (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
1356 (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
1357 (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
1358 (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
1359 (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
1360 (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
1361 (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
1362 (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
1363 (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
1364 (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
1365
1697c06499c8 Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 59394
diff changeset
1366 (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
1367 (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
1368 (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
1369 (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
1370 (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
1371 (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
1372 (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
1373 (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
1374 (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
1375 (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
1376 (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
1377 (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
1378
1697c06499c8 Add simplification rules for calcFunc-sec, calcFunc-csc, calcFunc-cot.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 59394
diff changeset
1379 (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
1380 (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
1381 (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
1382 (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
1383 (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
1384 (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
1385 (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
1386 (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
1387 (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
1388 (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
1389 (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
1390 (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
1391
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1392
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1393 (defun math-remove-units (expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1394 (if (math-check-unit-name expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1395 1
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1396 (if (Math-primp expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1397 expr
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1398 (cons (car expr)
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1399 (mapcar 'math-remove-units (cdr expr))))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1400
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1401 (defun math-extract-units (expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1402 (if (memq (car-safe expr) '(* /))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1403 (cons (car expr)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1404 (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
1405 (if (math-check-unit-name expr) expr 1)))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1406
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1407 (defun math-build-units-table-buffer (enter-buffer)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1408 (if (not (and math-units-table math-units-table-buffer-valid
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1409 (get-buffer "*Units Table*")))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1410 (let ((buf (get-buffer-create "*Units Table*"))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1411 (uptr (math-build-units-table))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1412 (calc-language (if (eq calc-language 'big) nil calc-language))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1413 (calc-float-format '(float 0))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1414 (calc-group-digits nil)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1415 (calc-number-radix 10)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1416 (calc-point-char ".")
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1417 (std nil)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1418 u name shadowed)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1419 (save-excursion
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1420 (message "Formatting units table...")
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1421 (set-buffer buf)
62565
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1422 (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
1423 (erase-buffer)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1424 (insert "Calculator Units Table:\n\n")
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1425 (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
1426 (while uptr
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1427 (setq u (car uptr)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1428 name (nth 2 u))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1429 (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
1430 (setq std t))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1431 (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
1432 (when (and name
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1433 (> (length name) 1)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1434 (eq (aref name 0) ?\*))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1435 (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
1436 (insert "\n"))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1437 (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
1438 (insert " ")
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1439 (and shadowed (insert "("))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1440 (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
1441 (and shadowed (insert ")"))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1442 (if (nth 3 u)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1443 (progn
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1444 (indent-to 10)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1445 (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
1446 (or std
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1447 (progn
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1448 (indent-to 10)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1449 (insert "U"))))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1450 (indent-to 14)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1451 (and shadowed (insert "("))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1452 (if (nth 1 u)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1453 (insert (math-format-value (nth 1 u) 80))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1454 (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
1455 (and shadowed (insert ")"))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1456 (indent-to 41)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1457 (insert " ")
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1458 (when name
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1459 (insert name))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1460 (if shadowed
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1461 (insert " (redefined above)")
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1462 (unless (nth 1 u)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1463 (insert " (base unit)")))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1464 (insert "\n")
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1465 (setq uptr (cdr uptr)))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1466 (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
1467 (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
1468 (while uptr
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1469 (setq u (car uptr))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1470 (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
1471 (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
1472 (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
1473 " ")
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1474 (insert " "))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1475 (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
1476 (indent-to 15)
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1477 (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
1478 (while (eq (car (car (setq uptr (cdr uptr)))) 0)))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1479 (insert "\n"))
2b285bf6f228 (calc-invalidate-units-table): Use inhibit-read-only.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 61412
diff changeset
1480 (view-mode)
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1481 (message "Formatting units table...done"))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1482 (setq math-units-table-buffer-valid t)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1483 (let ((oldbuf (current-buffer)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1484 (set-buffer buf)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1485 (goto-char (point-min))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1486 (set-buffer oldbuf))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1487 (if enter-buffer
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1488 (pop-to-buffer buf)
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1489 (display-buffer buf)))
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1490 (if enter-buffer
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1491 (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
1492 (display-buffer (get-buffer "*Units Table*")))))
40785
2fb9d407ae73 Initial import of Calc 2.02f.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1493
58677
5ef7cf7f3b8f Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58511
diff changeset
1494 (provide 'calc-units)
5ef7cf7f3b8f Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents: 58511
diff changeset
1495
45291
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
1496 ;; Local Variables:
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
1497 ;; coding: iso-latin-1
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
1498 ;; End:
01f46f9c1fa0 (math-standard-units): Update from CODATA.
Colin Walters <walters@gnu.org>
parents: 41269
diff changeset
1499
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49598
diff changeset
1500 ;;; arch-tag: e993314f-3adc-4191-be61-4ef8874881c4
41046
14b73d89514a (calcFunc-unsimplify): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents: 40785
diff changeset
1501 ;;; calc-units.el ends here