* python/convertrules.py (conv): warning on \tempo{}

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index b3855c34dbf0eb679a655547c0d4b6cab45f396c..cf9ea3505d023962a9de64441b6ea6863fe1914e 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -8,7 +8,8 @@
 ;; TODO: should link back into user manual.
 
 (define (mm-rest-child-list music)
-  "Generate events for multimeasure rests, to be used by the sequential-iterator"
+  "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
@@ -103,10 +104,17 @@ 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.")
+       
+       (types . (general-music break-event event))
+       ))
     (BreathingEvent
      . (
        (description .  "Creates a `breath mark' or `comma'.  
@@ -335,12 +343,12 @@ SYNTAX
     (PageBreakEvent
      . (
        (description .  "Allow, forbid or force a page break.")
-       (types . (general-music break-event page-break-event event))
+       (types . (general-music break-event event))
        ))
     (PageTurnEvent
      . (
        (description .  "Allow, forbid or force a page turn.")
-       (types . (general-music break-event page-turn-event event))
+       (types . (general-music break-event event))
        ))
     (PartCombineMusic
      . (
@@ -451,13 +459,13 @@ Syntax \\sequential @{..@} or simply @{..@} .")
      . (
        (description . "Print Solo.1")
        (part-combine-status . solo1)
-       (types . (general-music event part-combine-event solo-one-event))
+       (types . (general-music event part-combine-event solo1-event))
        ))
     (SoloTwoEvent
      . (
        (description . "Print Solo.2")
        (part-combine-status . solo2)
-       (types . (general-music event part-combine-event solo-two-event))
+       (types . (general-music event part-combine-event solo2-event))
        ))
     (UnisonoEvent
      . ((description . "Print a2")