X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fmusic-types.scm;h=4db44dd7c72958cefa462a4e113da0f0fbfb4829;hb=c5f04d22f8ad2b8735c6cfec69b8138f185752af;hp=7746ca4cf9661332e25a7fe6db760fbd26b83474;hpb=0afbca9d16e35aaa0602d088ec7d57ed25008870;p=lilypond.git

diff --git a/scm/music-types.scm b/scm/music-types.scm
index 7746ca4cf9..4db44dd7c7 100644
--- a/scm/music-types.scm
+++ b/scm/music-types.scm
@@ -15,6 +15,13 @@ where x is one of \@\{\\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.\@\}")
 	(internal-class-name . "Event")
 	(types . (general-music event dynamic-event absolute-dynamic-event))
 	))
+    (ApplyContext
+     . (
+	(description . "Call the argument with the current context during interpreting phase")
+	(internal-class-name . "Music")
+	(types . (general-music apply-context))
+	(iterator-ctor . ,Apply_context_iterator::constructor)
+	))
     (ArpeggioEvent 
      . (
 	(description .  "Make an arpeggio on this note. Syntax:
@@ -61,11 +68,18 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
     (BeamEvent
      . (
    (description .  "Starts or stops a beam.  Syntax for manual control:
-\[c8 c c\] c8")
+c8-[ c c-] c8")
 
 	(internal-class-name . "Event")
 	(types . (general-music event beam-event span-event))
 	))
+    (NewBeamEvent
+     . (
+   (description .  "Starts or stops a beam.  Syntax for manual control:
+c8-[ c c-] c8")
+	(internal-class-name . "Event")
+	(types . (general-music event new-beam-event span-event))
+	))
     (BreakEvent
      . (
    (description .  "Creates a line break.  Syntax: \\break.")
@@ -75,7 +89,7 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 	))
     (BreathingSignEvent
      . (
-   (description .  "Creates a `breath mark' or `comma'.  Syntax:
+	(description .  "Creates a `breath mark' or `comma'.  Syntax:
 @var{note}\\breathe.")
 
 	(internal-class-name . "Event")
@@ -88,6 +102,12 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 	(internal-class-name . "Event")
 	(types . (general-music event busy-playing-event))
 	)) 
+    (ClusterEvent
+     . (
+	(description .  "Begins or ends a cluster.")
+	(internal-class-name . "Event")
+	(types . (general-music cluster-event span-event event))
+	)) 
     (ContextSpeccedMusic
      . (
 	(description .  "")
@@ -160,6 +180,14 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 	(internal-class-name . "Key_change_req")
 	(types . (general-music key-change-event event))
 	)) 
+    (LigatureEvent
+     . (
+	(description .  "")
+
+	(internal-class-name . "Event")
+	(span-type . ligature)
+	(types . (general-music span-event ligature-event event))
+	))
     (LyricCombineMusic
      . (
 	(description .  "")
@@ -177,34 +205,18 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 	(internal-class-name . "Event")
 	(types . (general-music rhythmic-event lyric-event event))
 	))
-    (LigatureEvent
-     . (
-	(description .  "")
-
-	(internal-class-name . "Event")
-	(span-type . ligature)
-	(types . (general-music event span-event ligature-event))
-	))
     (MarkEvent
      . (
 	(description .  "")
 
 	(internal-class-name . "Event")
 	(types . (general-music mark-event event))
-	))  
-    (MelismaEvent
-     . (
-	(description .  "")
-
-	(internal-class-name . "Event")
-	(types . (general-music span-event melisma-playing-event event))
-	)) 
+	))
     (MelismaPlayingEvent
      . (
 	(description .  "")
-
 	(internal-class-name . "Event")
-	(types . (general-music event))
+	(types . (general-music melisma-playing-event event))
 	))
     (MultiMeasureRestEvent
      . (
@@ -421,7 +433,7 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 	(internal-class-name . "Event")
 	(types . (general-music event))
 	)) 
-    (SustainPedalEvent
+    (SustainEvent
      . (
 	(description . "")
 	(internal-class-name . "Event")
@@ -449,7 +461,6 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
     (TempoEvent
      . (
 	(description .  "")
-
 	(internal-class-name . "Event")
 	(types . (general-music tempo-event event))
 	)) 
@@ -465,6 +476,12 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 	(internal-class-name . "Event")
 	(types . (general-music tie-event event))
 	))
+    (NewTieEvent
+     . (
+	(description .  "A tie.  Entered as @var{note}-~.")
+	(internal-class-name . "Event")
+	(types . (general-music new-tie-event event))
+	))
     (TremoloEvent
      . (
 	(description . "Un measured tremolo.")