Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scm / define-music-types.scm

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 489e27b2a25f18f42ff9355256ea42280a01831b..69c654b019467e3c24515a3f663f75ddb01c3802 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -7,20 +7,6 @@
 
 ;; TODO: should link back into user manual.
 
-(define (mm-rest-child-list music)
-  "Check if we have R1*4-\\markup { .. }, and if applicable convert to
-a property set for MultiMeasureRestNumber."
-  (let ((location (ly:music-property music 'origin))
-       (duration (ly:music-property music 'duration)))
-    (list (make-music 'BarCheck
-                     'origin location)
-         (make-event-chord (cons (make-music 'MultiMeasureRestEvent
-                                             'origin location
-                                             'duration duration)
-                                 (ly:music-property music 'articulations)))
-         (make-music 'BarCheck
-                     'origin location))))
-
 (define-public music-descriptions
   `(
     (AbsoluteDynamicEvent
@@ -104,11 +90,6 @@ Syntax for manual control:
 c8-[ c c-] c8")
        (types . (general-music event beam-event span-event))
        ))
-
-    (BendAfterEvent
-     . ((description . "A drop/fall/doit jazz articulation")
-       (types . (general-music bend-after-event event))))
-
     (BreakEvent
      . (
        (description .  "Create a line break, Syntax: \\break or page break, Syntax: \\pagebreak.")
@@ -124,6 +105,12 @@ Syntax:
 
        (types . (general-music event breathing-event))
        )) 
+    (BusyPlayingEvent
+     . (
+       (description .  "Used internally to signal beginning and ending of notes.")
+
+       (types . (general-music event busy-playing-event))
+       ))
     (ContextChange
      . (
        (description .  "Change staffs in Piano staff. 
@@ -173,12 +160,7 @@ Syntax: @var{note}\\cr
        (types . (general-music extender-event event))
        ))
 
-    (Event
-     . (
-       (description .  "Atomic music event.")
-       (types . (general-music event))
-       ))
-        
+    
     (EventChord
      . (
        (description .  "Internally used to group a set of events.")
@@ -188,7 +170,6 @@ Syntax: @var{note}\\cr
        (types . (general-music event-chord simultaneous-music))
        ))
 
-    
     (FingerEvent
      . (
        (description . "Specify what finger to use for this note.")
@@ -295,22 +276,26 @@ e.g. @code{\\mark \"A\"}.")
 Syntax: @code{c4\\melisma d\\melismaEnd}.")
        (types . (general-music melisma-span-event event))
        ))
-
-    (MultiMeasureRestMusic
+    
+    (MultiMeasureRestEvent
      . (
        (description . "Rests that may be compressed into Multi rests. 
 
 Syntax
-@code{R2.*4} for 4 measures in 3/4 time.")
-       (iterator-ctor . ,ly:sequential-iterator::constructor)
-       (elements-callback . ,mm-rest-child-list)
-       (types . (general-music multi-measure-rest))
+@code{R2.*4} for 4 measures in 3/4 time. Note the capital R.")
+       (types . (general-music event rhythmic-event multi-measure-rest-event))
        ))
-
-    (MultiMeasureRestEvent
+    
+    (MultiMeasureRestMusicGroup
      . (
-       (description . "Used internally by MultiMeasureRestMusic to signal rests")
-       (types . (general-music event rhythmic-event multi-measure-rest-event))
+       (description .  "Like sequential-music, but specifically intended
+to group start-mmrest, skip, stop-mmrest sequence. 
+
+Syntax @code{R2.*5} for 5 measures in 3/4 time.")
+       (length-callback . ,ly:music-sequence::cumulative-length-callback)
+       (start-callback . ,ly:music-sequence::first-start-callback)
+       (iterator-ctor . ,ly:sequential-music-iterator::constructor)
+       (types . (general-music sequential-music))
        ))
     
     (MultiMeasureTextEvent
@@ -429,6 +414,12 @@ goes down).")
        (description . "Ties for starting a second volta bracket.")
        (types . (general-music event repeat-tie-event))
        ))
+    (Event
+     . (
+       (description .  "Atomic music event.")
+       (types . (general-music event))
+       ))
+    
     (RestEvent
      . (
        (description .  "A Rest. 
@@ -455,8 +446,7 @@ Syntax \\sequential @{..@} or simply @{..@} .")
 
        (length-callback . ,ly:music-sequence::cumulative-length-callback)
        (start-callback . ,ly:music-sequence::first-start-callback)
-       (elements-callback . ,(lambda (m) (ly:music-property m 'elements)))
-       (iterator-ctor . ,ly:sequential-iterator::constructor)
+       (iterator-ctor . ,ly:sequential-music-iterator::constructor)
        (types . (general-music sequential-music))
        ))
 
@@ -604,11 +594,6 @@ Syntax: @code{s}@var{duration}")
 
        (types . (general-music event rhythmic-event skip-event))
        ))
-
-    (SpacingSectionEvent
-     . ((description . "Start a new spacing section")
-       (types . (general-music event spacing-section-event))))
-     
     (SpanEvent
      . (
        (description .  "Event for anything that is started at a different time than stopped.")