aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2007-08-17 19:57:14 +0000
committerJay Belanger2007-08-17 19:57:14 +0000
commit7026903cf303168725fa3091d5eeaa5f0134dc43 (patch)
tree8d6f2a9ccde138f1d3ba656b48eb8b2d2a26354b
parentef77dde4c30ab115bc3d4863cf9760376000004b (diff)
downloademacs-7026903cf303168725fa3091d5eeaa5f0134dc43.tar.gz
emacs-7026903cf303168725fa3091d5eeaa5f0134dc43.zip
(math-standard-units): Give exact conversion for tsp.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc-units.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9452fde9db..df38de29e08 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-08-17 Jay Belanger <belanger@localhost.localdomain>
2
3 * calc/calc-units.el (math-standard-units): Give exact
4 conversion for tsp.
5
12007-08-17 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change) 62007-08-17 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change)
2 7
3 * progmode/cperl-mode.el (cperl-look-at-leading-count) 8 * progmode/cperl-mode.el (cperl-look-at-leading-count)
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index ae94fc43ae1..3724490169a 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -89,7 +89,9 @@
89 ( ozfl "2 tbsp" "Fluid Ounce" ) 89 ( ozfl "2 tbsp" "Fluid Ounce" )
90 ( floz "2 tbsp" "Fluid Ounce" ) 90 ( floz "2 tbsp" "Fluid Ounce" )
91 ( tbsp "3 tsp" "Tablespoon" ) 91 ( tbsp "3 tsp" "Tablespoon" )
92 ( tsp "4.92892159373 ml" "Teaspoon" ) ;; (approx) ESUWM 92 ;; ESUWM defines a US gallon as 231 in^3.
93 ;; That gives the following exact value for tsp.
94 ( tsp "492892159375*10^(-11) ml" "Teaspoon" )
93 ( vol "tsp+tbsp+ozfl+cup+pt+qt+gal" "Gallons + ... + teaspoons" ) 95 ( vol "tsp+tbsp+ozfl+cup+pt+qt+gal" "Gallons + ... + teaspoons" )
94 ( galC "galUK" "Canadian Gallon" ) 96 ( galC "galUK" "Canadian Gallon" )
95 ( galUK "454609*10^(-5) L" "UK Gallon" ) ;; NIST 97 ( galUK "454609*10^(-5) L" "UK Gallon" ) ;; NIST