X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fchord-names.scm;h=25ddef79a950a7aac7bf50726089535cf9f833a7;hb=8da6cef580cce3365b219f6aca429b434cb60fcf;hp=1cac00d032cf46516d779a833bd266e515c20b78;hpb=f579726b1c1fe56fe74a913a4438d11f283462b7;p=lilypond.git

diff --git a/scm/chord-names.scm b/scm/chord-names.scm
index 1cac00d032..25ddef79a9 100644
--- a/scm/chord-names.scm
+++ b/scm/chord-names.scm
@@ -24,9 +24,9 @@
 ;; * text definition is rather ad-hoc
 ;; * do without format module
 ;; * finish and check american names
-;; * make notename (tonic) configurable from mudela
+;; * make notename (tonic) configurable from lilypond
 ;; * fix append/cons stuff in inner-name-banter
-;;
+;; * doc strings.
 
 
 ;;;;;;;;;
@@ -68,6 +68,7 @@
 ;; DONT use non-ascii characters, even if ``it works'' in Windows
 
 (define chord::names-alist-american '())
+
 (set! chord::names-alist-american
       (append 
        '(
@@ -428,7 +429,7 @@
 					(list 'super (step->text-banter p))
 					(if (pair? (cdr from))
 					    '((super "/"))
-					    '()))))))
+					    '())))))) ; nesting?
 		 to))
 	 (if (and (pair? base-and-inversion)
 		  (or (car base-and-inversion)
@@ -461,6 +462,14 @@
 	(subtractions #f))
     (chord::inner-name-banter tonic user-name additions subtractions base-and-inversion)))
 
+(define (new-to-old-pitch p)
+  (if (pitch? p)
+      (list (pitch-octave p) (pitch-notename p) (pitch-alteration p))
+      #f
+  ))
+
+
+
 ;; C++ entry point
 ;; 
 ;; Check for each subset of chord, full chord first, if there's a
@@ -472,6 +481,10 @@
   ;(display "pitches:") (display  pitches) (newline)
   ;(display "style:") (display  style) (newline)
   ;(display "b&i:") (display  base-and-inversion) (newline)
+  (set! pitches (map new-to-old-pitch pitches))
+  (set! base-and-inversion (cons (new-to-old-pitch (car base-and-inversion))
+				 (new-to-old-pitch (cdr base-and-inversion))))
+  
   (let ((diff (pitch::diff '(0 0 0) (car pitches)))
 	(name-func 
 	  (ly-eval (string->symbol (string-append "chord::name-" style))))