* ly/music-functions-init.ly: change name to BreathingEvent

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 375a1568c043a8b10abcc3e46c137824d4709c63..cbd0a1e1ea92da97649bb37a4d1d2cf58a3e26a2 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
@@ -49,7 +50,7 @@ arguments to func are 1. the grob, 2. the originating context,
 3. context where FUNC is called.
 
 ")
-       (types . (general-music event apply-output-event))
+       (types . (general-music event layout-instruction-event))
        ))
     (ArpeggioEvent 
      . (
@@ -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'.  
@@ -149,13 +157,13 @@ Syntax: @var{note}\\cr
 ... @var{note}\\rc (you can also use \\<, \\!, \\cresc, and
 \\endcresc.  See the user manual for details.).")
 
-       (types . (general-music span-event span-dynamic-event crescendo-event event))
+       (types . (general-music dynamic-event crescendo-event event))
        )) 
     (DecrescendoEvent
      . (
        (description .  "See @ref{CrescendoEvent}.")
 
-       (types . (general-music span-event span-dynamic-event decrescendo-event event))
+       (types . (general-music dynamic-event decrescendo-event event))
        ))
     
     (ExtenderEvent
@@ -329,18 +337,18 @@ SYNTAX
 
 @code{\\override [ @var{Ctxt} . ] @var{Obj} @var{prop} = @var{val}}
 ")
-       (types . (general-music layout-instruction-event override-property-event))
+       (types . (general-music layout-instruction-event))
        (iterator-ctor . ,ly:push-property-iterator::constructor)
        ))
     (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")
@@ -599,19 +607,19 @@ Syntax: @code{s}@var{duration}")
     (SustainEvent
      . (
        (description . "Depress or release sustain pedal. ")
-       (types . (general-music event pedal-event sustain-event))
+       (types . (general-music event pedal-event sustain-pedal-event))
        ))
     
     (SostenutoEvent
      . (
        (description . "Depress or release sostenuto pedal. ")
-       (types . (general-music event pedal-event sostenuto-event))
+       (types . (general-music event pedal-event sostenuto-pedal-event))
        ))
     
     (UnaCordaEvent
      . (
        (description . "Depress or release una-corda pedal.")
-       (types . (general-music event pedal-event una-corda-event))
+       (types . (general-music event pedal-event una-corda-pedal-event))
        ))
     
     (StringNumberEvent
@@ -623,6 +631,12 @@ Syntax: @code{\\@var{number}}.")
        (types . (general-music string-number-event event))
        )) 
 
+    (MetronomeChangeEvent
+     . (
+       (description .  "Change tempo setting (in beats per minute).")
+       (types . (general-music metronome-change-event tempo-event event))
+       ))
+    
     (TextScriptEvent
      . (
        (description .  "")