* lisp/calc/README: Mention musical notes.

* lisp/calc-units.el (calc-lu-quant): Rename from 
  `calc-logunits-quantity'. 
  (calcFunc-lupquant): Rename from `calcFunc-powerquant'.
  (calcFunc-lufquant): Rename from `calcFunc-fieldquant'.
  (calc-db): Rename from `calc-dblevel'.
  (calcFunc-dbpower): Rename from `calcFunc-dbpowerlevel'.
  (calcFunc-dbfield): Rename from `calcFunc-dbfieldlevel'.
  (calc-np): Rename from `calc-nplevel'.
  (calcFunc-nppower): Rename from `calcFunc-nppowerlevel'.
  (calcFunc-npfield): Rename from `calcFunc-npfieldlevel'.
  (calc-lu-plus): Rename from `calc-logunits-add'.
  (calcFunc-lupadd): Rename from `calcFunc-lupoweradd'.
  (calcFunc-lufadd): Rename from `calcFunc-lufieldadd'.
  (calc-lu-minus): Rename from `calc-logunits-sub'.
  (calcFunc-lupsub): Rename from `calcFunc-lupowersub'.
  (calcFunc-lufsub): Rename from `calcFunc-lufieldsub'.
  (calc-lu-times): Rename from `calc-logunits-mul'.
  (calcFunc-lupmul): Rename from `calcFunc-lupowermul'.
  (calcFunc-lufmul): Rename from `calcFunc-lufieldmul'.
  (calc-lu-divide): Rename from `calc-logunits-div'.
  (calcFunc-lupdiv): Rename from `calcFunc-lupowerdiv'.
  (calcFunc-lufdiv): Rename from `calcFunc-lufielddiv'.

* lisp/calc/calc-ext.el (calc-init-extensions): Update the names of the
  functions being autoloaded.

* lisp/calc/calc.el   (calc-lu-power-reference): Rename from
  `calc-logunits-power-reference'. 
  (calc-lu-field-reference): Rename from
  `calc-logunits-field-reference'. 

* lisp/calc/calc-help (calc-l-prefix-help): Mention musical note functions.

* doc/misc/calc.texi (Logarithmic Units): Update the function names.

1 files changed, 15 insertions, 16 deletions

diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 11a26d6d12..57e7eabd1f 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -422,13 +422,13 @@
   (define-key calc-mode-map "kT" 'calc-utpt)
 
   (define-key calc-mode-map "l" nil)
-  (define-key calc-mode-map "lq" 'calc-logunits-quantity)
-  (define-key calc-mode-map "ld" 'calc-dblevel)
-  (define-key calc-mode-map "ln" 'calc-nplevel)
-  (define-key calc-mode-map "l+" 'calc-logunits-add)
-  (define-key calc-mode-map "l-" 'calc-logunits-sub)
-  (define-key calc-mode-map "l*" 'calc-logunits-mul)
-  (define-key calc-mode-map "l/" 'calc-logunits-divide)
+  (define-key calc-mode-map "lq" 'calc-lu-quant)
+  (define-key calc-mode-map "ld" 'calc-db)
+  (define-key calc-mode-map "ln" 'calc-np)
+  (define-key calc-mode-map "l+" 'calc-lu-plus)
+  (define-key calc-mode-map "l-" 'calc-lu-minus)
+  (define-key calc-mode-map "l*" 'calc-lu-times)
+  (define-key calc-mode-map "l/" 'calc-lu-divide)
   (define-key calc-mode-map "ls" 'calc-spn)
   (define-key calc-mode-map "lm" 'calc-midi)
   (define-key calc-mode-map "lf" 'calc-freq)
@@ -943,12 +943,11 @@ calc-store-value calc-var-name)
  ("calc-stuff" calc-explain-why calcFunc-clean
 calcFunc-pclean calcFunc-pfloat calcFunc-pfrac)
 
- ("calc-units" calcFunc-usimplify calcFunc-lufieldadd
-calcFunc-lupoweradd calcFunc-lufieldsub calcFunc-lupowersub
-calcFunc-lufieldmul calcFunc-lupowermul calcFunc-lufielddiv
-calcFunc-lupowerdiv calcFunc-fieldquant calcFunc-powerquant
-calcFunc-dbfieldlevel calcFunc-dbpowerlevel calcFunc-npfieldlevel
-calcFunc-nppowerlevel calcFunc-spn calcFunc-midi calcFunc-freq
+ ("calc-units" calcFunc-usimplify calcFunc-lufadd calcFunc-lupadd
+calcFunc-lufsub calcFunc-lupsub calcFunc-lufmul calcFunc-lupmul
+calcFunc-lufdiv calcFunc-lupdiv calcFunc-fquant calcFunc-pquant
+calcFunc-dbfield calcFunc-dbpower calcFunc-npfield
+calcFunc-nppower calcFunc-spn calcFunc-midi calcFunc-freq
 math-build-units-table math-build-units-table-buffer
 math-check-unit-name math-convert-temperature math-convert-units
 math-extract-units math-remove-units math-simplify-units
@@ -1180,9 +1179,9 @@ calc-convert-temperature calc-convert-units calc-define-unit
 calc-enter-units-table calc-explain-units calc-extract-units
 calc-get-unit-definition calc-permanent-units calc-quick-units
 calc-remove-units calc-simplify-units calc-undefine-unit
-calc-view-units-table calc-logunits-quantity calc-dblevel
-calc-nplevel calc-logunits-add calc-logunits-sub
-calc-logunits-mul calc-logunits-divide calc-spn calc-midi
+calc-view-units-table calc-lu-quant calc-db
+calc-np calc-lu-plus calc-lu-minus
+calc-lu-times calc-lu-divide calc-spn calc-midi
 calc-freq)
 
  ("calc-vec" calc-arrange-vector calc-build-vector calc-cnorm