X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=1090d332b49aec21b01fcf852f1f19fc158f7889;hb=5ab8335d106d736335698245af3c1b2b2455aed6;hp=0b828c1516c161f78e1a98d67b37954d629b64a5;hpb=30339cb3706f6399c84607426988b25f79b4998c;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 0b828c1516..1090d332b4 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -39,7 +39,7 @@ Syntax: @var{note}@code{\\x}, where @code{\\x} is a dynamic mark like
 
     (AnnotateOutputEvent
      . ((description . "Print an annotation of an output element.")
-	(types . (general-music event annotate-output-event))
+	(types . (general-music event annotate-output-event post-event))
 	))
 
     (ApplyContext
@@ -72,10 +72,10 @@ Syntax: @w{@var{note}@code{-\\arpeggio}}")
     (ArticulationEvent
      . ((description . "Add an articulation marking to a note.
 
-Syntax: @var{note}@code{x}@code{y}, where @code{x} is a direction
-(@code{^} for up or @code{_} for down), or LilyPond's choice
-(no direction specified), and where @code{y} is an articulation
-(such as @w{@code{-.}}, @w{@code{->}}, @code{\\tenuto}, @code{\\downbow}).
+Syntax: @var{note}@code{x}@code{y}, where @code{x} is a direction\
+\n(@code{^} for up or @code{_} for down), or LilyPond's choice\
+\n(no direction specified), and where @code{y} is an articulation\
+\n(such as @w{@code{-.}}, @w{@code{->}}, @code{\\tenuto}, @code{\\downbow}).
 See the Notation Reference for details.")
 	(types . (general-music post-event event articulation-event script-event))
 	))
@@ -309,6 +309,11 @@ Example: @code{\\mark \"A\"}")
 	(types . (general-music mark-event event))
 	))
 
+    (MeasureCounterEvent
+     . ((description . "Used to signal the start and end of a measure count.")
+        (types . (general-music measure-counter-event span-event event))
+        ))
+
     (MultiMeasureRestEvent
      . ((description . "Used internally by @code{MultiMeasureRestMusic}
 to signal rests.")
@@ -371,6 +376,7 @@ Syntax: @code{\\override} [ @var{context} @code{.} ]
 	(types . (general-music layout-instruction-event
 		  override-property-event))
 	(iterator-ctor . ,ly:push-property-iterator::constructor)
+	(untransposable . #t)
 	))
 
     (PageBreakEvent
@@ -431,12 +437,19 @@ Syntax: @var{note}@code{\\(} and @var{note}@code{\\)}")
 	(types . (general-music post-event span-event event phrasing-slur-event))
 	))
 
+    (PostEvents
+     . ((description . "Container for several postevents.
+
+This can be used to package several events into a single one.  Should not be seen outside of the parser.")
+        (types . (post-event post-event-wrapper))))
+
     (PropertySet
      . ((description . "Set a context property.
 
 Syntax: @code{\\set @var{context}.@var{prop} = @var{scheme-val}}")
 	(types . (layout-instruction-event general-music))
 	(iterator-ctor . ,ly:property-iterator::constructor)
+	(untransposable . #t)
 	))
 
     (PropertyUnset