Merge with master

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

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 33f82c95018c7324839f72d2efb2aedaea673e27..939ae7b91eebf91940af60650e9b11a96621a03a 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -15,14 +15,14 @@
 ;; TODO: make into markup.
 ;; 
 (define-public (alteration->text-accidental-markup alteration)
+  
   (make-smaller-markup
    (make-raise-markup
     (if (= alteration FLAT)
        0.3
        0.6)
     (make-musicglyph-markup
-     (format "accidentals.~a"
-            (inexact->exact (* 4 alteration)))))))
+     (assoc-get alteration standard-alteration-glyph-name-alist "")))))
   
 (define (accidental->markup alteration)
   "Return accidental markup for ALTERATION."