X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-display-methods.scm;h=f76b335af2d3a0ae95dcd7275a313c842f0faec8;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=ea72b1147646fcbd6c81e4b720ac99dfe2467893;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index ea72b11476..f76b335af2 100644
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -1,7 +1,7 @@
 ;;; define-music-display-methods.scm -- data for displaying music
 ;;; expressions using LilyPond notation.
 ;;;
-;;; (c) 2005--2006 Nicolas Sceaux  <nicolas.sceaux@free.fr>
+;;; (c) 2005--2009 Nicolas Sceaux  <nicolas.sceaux@free.fr>
 ;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -155,6 +155,7 @@
 		     'HarmonicEvent
 		     'BeamForbidEvent
 		     'AbsoluteDynamicEvent
+		     'TupletSpanEvent
 		     'TrillSpanEvent
 		     'GlissandoEvent
 		     'ArpeggioEvent
@@ -233,8 +234,8 @@
 (define-span-event-display-method CrescendoEvent (event parser) #f "\\<" "\\!")
 (define-span-event-display-method DecrescendoEvent (event parser) #f "\\>" "\\!")
 (define-span-event-display-method PhrasingSlurEvent (event parser) #f "\\(" "\\)")
-(define-span-event-display-method SustainEvent (event parser) #f "\\sustainDown" "\\sustainUp")
-(define-span-event-display-method SostenutoEvent (event parser) #f "\\sostenutoDown" "\\sostenutoUp")
+(define-span-event-display-method SustainEvent (event parser) #f "\\sustainOn" "\\sustainOff")
+(define-span-event-display-method SostenutoEvent (event parser) #f "\\sostenutoOn" "\\sostenutoOff")
 (define-span-event-display-method TextSpanEvent (event parser) #f "\\startTextSpan" "\\stopTextSpan")
 (define-span-event-display-method TrillSpanEvent (event parser) #f "\\startTrillSpan" "\\stopTrillSpan")
 (define-span-event-display-method StaffSpanEvent (event parser) #f "\\startStaff" "\\stopStaff")
@@ -575,7 +576,7 @@ Otherwise, return #f."
 
 (define-display-method RelativeOctaveCheck (octave parser)
   (let ((pitch (ly:music-property octave 'pitch)))
-    (format #f "\\octave ~a~a"
+    (format #f "\\octaveCheck ~a~a"
 	    (note-name->lily-string pitch parser)
 	    (octave->lily-string pitch))))
 
@@ -688,9 +689,6 @@ Otherwise, return #f."
 (define-display-method UnfoldedRepeatedMusic (expr parser)
   (repeat->lily-string expr "unfold" parser))
 
-(define-display-method FoldedRepeatedMusic (expr parser)
-  (repeat->lily-string expr "fold" parser))
-
 (define-display-method PercentRepeatedMusic (expr parser)
   (repeat->lily-string expr "percent" parser))
 
@@ -883,27 +881,59 @@ Otherwise, return #f."
     "\\melismaEnd"))
 
 ;;; \tempo
+;;; Check for all three different syntaxes of tempo:
+;;; \tempo string duration=note, \tempo duration=note and \tempo string
 (define-extra-display-method ContextSpeccedMusic (expr parser)
   "If expr is a tempo, return \"\\tempo x = nnn\", otherwise return #f."
-  (with-music-match (expr (music 'ContextSpeccedMusic
+  (or   (with-music-match (expr (music 'ContextSpeccedMusic
+		element (music 'SequentialMusic
+			      elements ((music 'PropertySet
+					  value ?unit-text
+					  symbol 'tempoText)
+					(music 'PropertySet
+					  symbol 'tempoWholesPerMinute)
+					(music 'PropertySet
+					  value ?unit-duration
+					  symbol 'tempoUnitDuration)
+					(music 'PropertySet
+					  value ?unit-count
+					  symbol 'tempoUnitCount)))))
+		(format #f "\\tempo ~a ~a = ~a"
+			(scheme-expr->lily-string ?unit-text)
+			(duration->lily-string ?unit-duration #:force-duration #t)
+			?unit-count))
+	(with-music-match (expr (music 'ContextSpeccedMusic
+		    element (music 'SequentialMusic
+			      elements ((music 'PropertyUnset
+					  symbol 'tempoText)
+					(music 'PropertySet
+					  symbol 'tempoWholesPerMinute)
+					(music 'PropertySet
+					  value ?unit-duration
+					  symbol 'tempoUnitDuration)
+					(music 'PropertySet
+					  value ?unit-count
+					  symbol 'tempoUnitCount)))))
+			(format #f "\\tempo ~a = ~a"
+				(duration->lily-string ?unit-duration #:force-duration #t)
+				?unit-count))
+	(with-music-match (expr (music 'ContextSpeccedMusic
 			    element (music 'SequentialMusic
 				      elements ((music 'PropertySet
-						  symbol 'tempoWholesPerMinute)
-						(music 'PropertySet
-						  value ?unit-duration
-						  symbol 'tempoUnitDuration)
-						(music 'PropertySet
-						  value ?unit-count
-						  symbol 'tempoUnitCount)))))
-    (format #f "\\tempo ~a = ~a"
-	    (duration->lily-string ?unit-duration #:force-duration #t)
-	    ?unit-count)))
+						  value ?tempo-text
+						 symbol 'tempoText)))))
+			(format #f "\\tempo ~a" (scheme-expr->lily-string ?tempo-text)))))
 
 ;;; \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 ...\"
@@ -915,13 +945,15 @@ Otherwise, return #f."
 								 value ?clef-glyph
 								 symbol 'clefGlyph)
 							  (music 'PropertySet
-								 symbol 'middleCPosition)
+								 symbol 'middleCClefPosition)
 							  (music 'PropertySet
 								 value ?clef-position
 								 symbol 'clefPosition)
 							  (music 'PropertySet
 								 value ?clef-octavation
-								 symbol 'clefOctavation)))))
+								 symbol 'clefOctavation)
+							  (music 'ApplyContext
+								 procedure ly:set-middle-C!)))))
     (let ((clef-prop+name (assoc (list ?clef-glyph ?clef-position 0)
 				 clef-name-alist)))
       (if clef-prop+name