Run `make grand-replace'.

[lilypond.git] / scm / chord-ignatzek-names.scm

diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index 19e30fac636e80dcdbfcdfcb5eb5e80c3c9c2ea9..25e9c1a07af4b5f11960ef8e717b518808fcb5ab 100644 (file)
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2000--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 
@@ -79,7 +79,7 @@
          nn)))
 
   (define (is-natural-alteration? p)
-    (= (natural-chord-alteration p)  (ly:pitch-alteration p)))
+    (= (natural-chord-alteration p) (ly:pitch-alteration p)))
   
   (define (ignatzek-format-chord-name
           root
@@ -177,7 +177,10 @@ work than classifying the pitches."
       (set! base-stuff
            (append
             (list root-markup
-                  (markup-join prefixes sep)
+                  (conditional-kern-before (markup-join prefixes sep)
+                                           (and (not (null? prefixes))
+                                                (= (ly:pitch-alteration root) NATURAL))
+                                           (ly:context-property context 'chordPrefixSpacer))
                   (make-super-markup to-be-raised-stuff))
             base-stuff))
       (make-line-markup base-stuff)))
@@ -212,12 +215,12 @@ work than classifying the pitches."
         (alterations '()))
     
     (if exception
-       (ignatzek-format-exception  root exception bass-note)
+       (ignatzek-format-exception root exception bass-note)
        
        (begin
          ;; no exception.
          ;; handle sus4 and sus2 suffix: if there is a 3 together with
-         ;; sus2 or sus4, then we explicitly say  add3.
+         ;; sus2 or sus4, then we explicitly say add3.
          (map
           (lambda (j)
             (if (get-step j pitches)
@@ -226,7 +229,7 @@ work than classifying the pitches."
                       (begin
                         (set! add-steps (cons (get-step 3 pitches) add-steps))
                         (set! pitches (remove-step 3 pitches))))
-                  (set! suffixes  (cons (get-step j pitches) suffixes)))))
+                  (set! suffixes (cons (get-step j pitches) suffixes)))))
           '(2 4))
 
          ;; do minor-3rd modifier.