X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fchord-entry.scm;h=17735e6aca75057bb0b6b89eb8733c2ea7fa3977;hb=17f11c2f5ab963bfb07b7652b4860dc4dda5540a;hp=b703e5e630a0680e676e5b0de04d85b1334d3125;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm
index b703e5e630..17735e6aca 100644
--- a/scm/chord-entry.scm
+++ b/scm/chord-entry.scm
@@ -1,17 +1,27 @@
-;;;; chord-entry.scm -- Generate chord names for the parser.
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-(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))
@@ -37,7 +47,7 @@ Entry point for the parser.
 	    (set! bass (cadr mods))
 	    (set! mods (cddr mods))))
       (if (pair? mods)
-	  (scm-error 'chord-format "construct-chord" "Spurious garbage following chord: ~A" mods #f))
+	  (ly:warning (_ "Spurious garbage following chord: ~A") mods))
       chord)
 
     (define (interpret-removals	 chord mods)
@@ -155,12 +165,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 +191,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 +229,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))))