new file.

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 375a1568c043a8b10abcc3e46c137824d4709c63..757e9e3a1eee9ce876d1e9efccd6c3d984c3290d 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))
        ))
     (ArpeggioEvent 
      . (
@@ -103,11 +104,18 @@ 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))))
 
-    (BreathingEvent
+    (BreakEvent
+     . (
+       (description .  "Create a line break, Syntax: \\break or page break, Syntax: \\pagebreak.")
+       
+       (types . (general-music break-event event))
+       ))
+    (BreathingSignEvent
      . (
        (description .  "Creates a `breath mark' or `comma'.  
 
@@ -116,6 +124,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. 
@@ -149,13 +163,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
@@ -181,7 +195,7 @@ Syntax: @var{note}\\cr
        ))
 
     
-    (FingeringEvent
+    (FingerEvent
      . (
        (description . "Specify what finger to use for this note.")
        (types . (general-music fingering-event event))
@@ -246,7 +260,7 @@ Syntax: @var{note}\\laissezVibrer.")
     (LineBreakEvent
      . (
        (description .  "Allow, forbid or force a line break.")
-       (types . (general-music line-break-event break-event event))
+       (types . (general-music break-event event))
        ))
     
     (LyricCombineMusic
@@ -275,6 +289,11 @@ e.g. @code{\\mark \"A\"}.")
 
        (types . (general-music mark-event event))
        ))
+    (MelismaPlayingEvent
+     . (
+       (description .  "Used internally to signal melismas.")
+       (types . (general-music melisma-playing-event event))
+       ))
     (ManualMelismaEvent
      . (
        (description .  "Start or stop a melisma.
@@ -329,18 +348,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))
        (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
      . (
@@ -364,7 +383,7 @@ Syntax NOTE \\(  and \\) NOTE")
        (description .  "Set a context property.
 
 Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
-       (types . (layout-instruction-event general-music))
+       (types . (layout-instruction general-music))
        (iterator-ctor . ,ly:property-iterator::constructor)
        ))
 
@@ -372,7 +391,7 @@ Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
      . (
        (description .  "Remove the definition of a context @code{\\property}.")
 
-       (types . (layout-instruction-event general-music))
+       (types . (layout-instruction general-music))
        (iterator-ctor . ,ly:property-unset-iterator::constructor)
        ))
 
@@ -430,7 +449,7 @@ Syntax @code{r4} for a quarter rest. ")
 previously added property from a graphical object definition
  ")
 
-       (types . (general-music layout-instruction-event))
+       (types . (general-music layout-instruction))
        (iterator-ctor . ,      ly:pop-property-iterator::constructor)
        ))
 
@@ -451,18 +470,18 @@ 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))
        ))
     (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))
        ))
     (UnisonoEvent
      . ((description . "Print a2")
        (part-combine-status . unisono)
-       (types . (general-music event part-combine-event unisono-event))))
+       (types . (general-music event part-combine-event))))
     
     (SimultaneousMusic
      . (
@@ -494,6 +513,13 @@ Syntax NOTE(        and NOTE) ")
        (types . (general-music event span-event staff-span-event))
      ))
     
+    (StartPlayingEvent
+     . (
+       (description .  "Used internally to signal beginning of notes.")
+
+       (types . (general-music event start-playing-event))
+       ))
+    
     (TextSpanEvent
      . (
        (description . "Start a text spanner like 8va.....|")
@@ -529,10 +555,10 @@ Syntax @code{\\times @var{fraction} @var{music}}, e.g.
        (types . (time-scaled-music music-wrapper-music general-music))
        ))
 
-    (TupletSpanEvent
+    (TupletEvent
      . (
        (description .  "Used internally to signal where tuplet brackets start and stop.")
-       (types . (tuplet-span-event span-event event general-music))
+       (types . (tuplet-spanner-event span-event event general-music))
        ))
 
     (UnrelativableMusic
@@ -599,19 +625,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 +649,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 .  "")