Run `make grand-replace'.

[lilypond.git] / scm / chord-entry.scm

diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm
index b703e5e630a0680e676e5b0de04d85b1334d3125..243052106a5b0232c794fcd3860aa34b3333f6c0 100644 (file)
--- a/scm/chord-entry.scm
+++ b/scm/chord-entry.scm
@@ -2,16 +2,15 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-(define-public (construct-chord root duration modifications)
-  " Build a chord on root using modifiers in MODIFICATIONS. NoteEvent
-have duration DURATION..
+(define-public (construct-chord-elements root duration modifications)
+  " Build a chord on root using modifiers in MODIFICATIONS. NoteEvents
+have duration DURATION.
 
 Notes: natural 11 is left from chord if not explicitly specified.
 
 Entry point for the parser.
-
 "
   (let* ((flat-mods (flatten-list modifications))
         (base-chord (stack-thirds (ly:make-pitch 0 4 0) the-canonical-chord))
@@ -155,12 +154,12 @@ the bass specified.
          (write-me "inversion: " inversion)
          (write-me "bass: " bass)))
     (if inversion
-       (make-chord (cdr complete-chord) bass duration (car complete-chord)
+       (make-chord-elements (cdr complete-chord) bass duration (car complete-chord)
                    inversion)
-       (make-chord complete-chord bass duration #f #f))))
+       (make-chord-elements complete-chord bass duration #f #f))))
 
 
-(define (make-chord pitches bass duration inversion original-inv-pitch)
+(define (make-chord-elements pitches bass duration inversion original-inv-pitch)
   "Make EventChord with notes corresponding to PITCHES, BASS and
 DURATION, and INVERSION."
   (define (make-note-ev pitch)
@@ -181,7 +180,7 @@ DURATION, and INVERSION."
                (- (ly:pitch-octave inversion)
                   (ly:pitch-octave original-inv-pitch)))
          (set! nots (cons inv-note nots))))
-    (make-event-chord nots)))
+    nots))
 
 ;;;;;;;;;;;;;;;;
 ; chord modifiers change the pitch list.
@@ -219,6 +218,7 @@ DURATION, and INVERSION."
   (map (lambda (n)
         (define (nca x)
           (if (= x 7) FLAT 0))
+        
         (if (>= n 8)
             (ly:make-pitch 1 (- n 8) (nca n))
             (ly:make-pitch 0 (- n 1) (nca n))))