* input/mutopia/F.Schubert/GNUmakefile: add morgenlied.ly

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

diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm
index 6b047797ffb851abe08bb6ad4e61f4632b0aaa90..670ff646eb21a24c96947d41ae648a57e9f7510a 100644 (file)
--- a/scm/chord-entry.scm
+++ b/scm/chord-entry.scm
@@ -14,16 +14,14 @@ Entry point for the parser.
 
 "
   (let*
-      (
-       (flat-mods (flatten-list modifications))
+      ((flat-mods (flatten-list modifications))
        (base-chord (stack-thirds (ly:make-pitch 0 4 0) the-canonical-chord))
        (complete-chord '())
        (bass #f)
        (inversion #f)
        (lead-mod #f)
        (explicit-11 #f)
-       (start-additions #t)
-       )
+       (start-additions #t))
 
     (define (interpret-inversion chord mods)
       "Read /FOO   part. Side effect: INVERSION is set."
@@ -262,12 +260,12 @@ DURATION, and INVERSION."
 ; chord modifiers change the pitch list.
 
 (define (aug-modifier  pitches)
-  (set! pitches  (replace-step (ly:make-pitch 0 4 1) pitches))
+  (set! pitches  (replace-step (ly:make-pitch 0 4 SHARP) pitches))
   (replace-step (ly:make-pitch 0 2 0) pitches) 
   )
 
 (define (minor-modifier  pitches)
-  (replace-step (ly:make-pitch 0 2 -1) pitches)
+  (replace-step (ly:make-pitch 0 2 FLAT) pitches)
   )
 
 (define (maj7-modifier  pitches)
@@ -276,9 +274,9 @@ DURATION, and INVERSION."
   )
 
 (define (dim-modifier  pitches)
-  (set! pitches (replace-step (ly:make-pitch 0 2 -1) pitches))
-  (set! pitches (replace-step (ly:make-pitch 0 4 -1) pitches))
-  (set! pitches (replace-step (ly:make-pitch 0 6 -2) pitches))
+  (set! pitches (replace-step (ly:make-pitch 0 2 FLAT) pitches))
+  (set! pitches (replace-step (ly:make-pitch 0 4 FLAT) pitches))
+  (set! pitches (replace-step (ly:make-pitch 0 6 DOUBLE-FLAT) pitches))
   pitches
   )
 
@@ -301,7 +299,7 @@ DURATION, and INVERSION."
   (map
    (lambda (n)
      (define (nca x)
-       (if (= x 7) -1 0))
+       (if (= x 7) FLAT 0))
      (if (>= n 8)
         (ly:make-pitch 1 (- n 8) (nca n))
         (ly:make-pitch 0 (- n 1) (nca n))))