X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=cf9ea3505d023962a9de64441b6ea6863fe1914e;hb=7dcae7597fae14ce5c4e2e7d50c2709d162b7332;hp=251de0488ed648a6f6291a2ba523a9f81819ac17;hpb=05acd5edad83e30653d81698ced14bc59822843b;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 251de0488e..cf9ea3505d 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -50,7 +50,7 @@ arguments to func are 1. the grob, 2. the originating context,
 3. context where FUNC is called.
 
 ")
-	(types . (general-music event layout-instruction))
+	(types . (general-music event apply-output-event))
 	))
     (ArpeggioEvent 
      . (
@@ -104,13 +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))))
+
     (BreakEvent
      . (
 	(description .  "Create a line break, Syntax: \\break or page break, Syntax: \\pagebreak.")
 	
 	(types . (general-music break-event event))
 	))
-    (BreathingSignEvent
+    (BreathingEvent
      . (
 	(description .	"Creates a `breath mark' or `comma'.  
 
@@ -119,12 +124,6 @@ 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. 
@@ -189,7 +188,8 @@ Syntax: @var{note}\\cr
 	(types . (general-music event-chord simultaneous-music))
 	))
 
-    (FingerEvent
+    
+    (FingeringEvent
      . (
 	(description . "Specify what finger to use for this note.")
 	(types . (general-music fingering-event event))
@@ -254,7 +254,7 @@ Syntax: @var{note}\\laissezVibrer.")
     (LineBreakEvent
      . (
 	(description .  "Allow, forbid or force a line break.")
-	(types . (general-music break-event event))
+	(types . (general-music line-break-event break-event event))
 	))
     
     (LyricCombineMusic
@@ -283,11 +283,6 @@ 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.
@@ -342,7 +337,7 @@ SYNTAX
 
 @code{\\override [ @var{Ctxt} . ] @var{Obj} @var{prop} = @var{val}}
 ")
-	(types . (general-music layout-instruction))
+	(types . (general-music layout-instruction-event override-property-event))
 	(iterator-ctor . ,ly:push-property-iterator::constructor)
 	))
     (PageBreakEvent
@@ -377,7 +372,7 @@ Syntax NOTE \\(  and \\) NOTE")
 	(description .	"Set a context property.
 
 Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
-	(types . (layout-instruction general-music))
+	(types . (layout-instruction-event general-music))
 	(iterator-ctor . ,ly:property-iterator::constructor)
 	))
 
@@ -385,7 +380,7 @@ Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
      . (
 	(description .	"Remove the definition of a context @code{\\property}.")
 
-	(types . (layout-instruction general-music))
+	(types . (layout-instruction-event general-music))
 	(iterator-ctor . ,ly:property-unset-iterator::constructor)
 	))
 
@@ -443,7 +438,7 @@ Syntax @code{r4} for a quarter rest. ")
 previously added property from a graphical object definition
  ")
 
-	(types . (general-music layout-instruction))
+	(types . (general-music layout-instruction-event))
 	(iterator-ctor . ,	ly:pop-property-iterator::constructor)
 	))
 
@@ -464,18 +459,18 @@ Syntax \\sequential @{..@} or simply @{..@} .")
      . (
 	(description . "Print Solo.1")
 	(part-combine-status . solo1)
-	(types . (general-music event part-combine-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))
+	(types . (general-music event part-combine-event solo2-event))
 	))
     (UnisonoEvent
      . ((description . "Print a2")
 	(part-combine-status . unisono)
-	(types . (general-music event part-combine-event))))
+	(types . (general-music event part-combine-event unisono-event))))
     
     (SimultaneousMusic
      . (
@@ -507,13 +502,6 @@ 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.....|")
@@ -549,10 +537,10 @@ Syntax @code{\\times @var{fraction} @var{music}}, e.g.
 	(types . (time-scaled-music music-wrapper-music general-music))
 	))
 
-    (TupletEvent
+    (TupletSpanEvent
      . (
 	(description .  "Used internally to signal where tuplet brackets start and stop.")
-	(types . (tuplet-spanner-event span-event event general-music))
+	(types . (tuplet-span-event span-event event general-music))
        ))
 
     (UnrelativableMusic
@@ -619,7 +607,7 @@ Syntax: @code{s}@var{duration}")
     (SustainEvent
      . (
 	(description . "Depress or release sustain pedal. ")
-	(types . (general-music event pedal-event sustain-pedal-event))
+	(types . (general-music event pedal-event sustain-event))
 	))
     
     (SostenutoEvent
@@ -643,12 +631,6 @@ 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 .	"")