X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fchord-entry.scm;h=80a473acb177118d0cccc6b02fef78ed4c9e91f0;hb=5842c0a15dc9683fc74996c6703ea33d4dd43ad0;hp=ccfa0877d0c604b03e95b96f8476b7214fc7dcb4;hpb=42c8f04fe971525561dde0ee757ffebe3e6c0703;p=lilypond.git

diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm
index ccfa0877d0..80a473acb1 100644
--- a/scm/chord-entry.scm
+++ b/scm/chord-entry.scm
@@ -2,16 +2,15 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2007 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.
@@ -206,7 +205,7 @@ DURATION, and INVERSION."
 (define (sus-modifier pitches)
   (remove-step (pitch-step (ly:make-pitch 0 2 0)) pitches))
 
-(define-public default-chord-modifier-list
+(define-safe-public default-chord-modifier-list
   `((m . ,minor-modifier)
     (min . ,minor-modifier)
     (aug . , aug-modifier)
@@ -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))))