X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-display-methods.scm;h=3212e5f0b8be0f7ade9cdce5c361bded2510773d;hb=9cfb34deec4b1cdfa4d147846f38b72c562be3d9;hp=0f957151f8e312f67954e067bf26786756338179;hpb=1cdd20054babbf7ce6eb6a135854abc2d8f00f8f;p=lilypond.git

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index 0f957151f8..3212e5f0b8 100644
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -155,6 +155,7 @@
 		     'HarmonicEvent
 		     'BeamForbidEvent
 		     'AbsoluteDynamicEvent
+		     'TupletSpanEvent
 		     'TrillSpanEvent
 		     'GlissandoEvent
 		     'ArpeggioEvent
@@ -598,6 +599,7 @@ Otherwise, return #f."
 	(fig (ly:music-property figure 'figure))
 	(bracket-start (ly:music-property figure 'bracket-start))
 	(bracket-stop (ly:music-property figure 'bracket-stop)))
+
     (format #f "~a~a~a~a"
 	    (if (null? bracket-start) "" "[")
 	    (cond ((null? fig) "_")
@@ -605,12 +607,12 @@ Otherwise, return #f."
 		  (else fig))
 	    (if (null? alteration)
 		""
-		(case alteration
-		  ((-4) "--")
-		  ((-2) "-")
-		  ((0) "!")
-		  ((2) "+")
-		  ((4) "++")
+		(cond 
+		  ((= alteration DOUBLE-FLAT) "--")
+		  ((= alteration FLAT) "-")
+		  ((= alteration NATURAL) "!")
+		  ((= alteration SHARP) "+")
+		  ((= alteration DOUBLE-SHARP) "++")
 		  (else "")))
 	    (if (null? bracket-stop) "" "]"))))
 
@@ -899,10 +901,15 @@ Otherwise, return #f."
 	    ?unit-count)))
 
 ;;; \clef 
-(define clef-name-alist (map (lambda (name+vals)
-			       (cons (cdr name+vals)
-				     (car name+vals)))
-			     supported-clefs))
+(define clef-name-alist #f)
+(define-public (memoize-clef-names clefs)
+  "Initialize `clef-name-alist', if not already set."
+  (if (not clef-name-alist)
+      (set! clef-name-alist
+            (map (lambda (name+vals)
+                   (cons (cdr name+vals)
+                         (car name+vals)))
+                 clefs))))
 
 (define-extra-display-method ContextSpeccedMusic (expr parser)
   "If `expr' is a clef change, return \"\\clef ...\"