X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=1090d332b49aec21b01fcf852f1f19fc158f7889;hb=85d4958c021936c64b6ef9d514a6a2b0d269cc58;hp=7b60887bd698a8de035b0d73751fb1218c093d41;hpb=24b50a014e90df93d3670a782cf7be23233ead43;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 7b60887bd6..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))
 	))
@@ -200,9 +200,17 @@ An alternative syntax is @var{note}@code{\\decr} @dots{}
 	))
 
     (EventChord
-     . ((description . "Internally used to group a set of events.")
+     . ((description . "Explicitly entered chords.
+
+When iterated, @code{elements} are converted to events at the current
+timestep, followed by any @code{articulations}.  Per-chord postevents
+attached by the parser just follow any rhythmic events in
+@code{elements} instead of utilizing @code{articulations}.
+
+An unexpanded chord repetition @samp{q} is recognizable by having its
+duration stored in @code{duration}.")
 	(iterator-ctor . ,ly:event-chord-iterator::constructor)
-	(length-callback . ,ly:music-sequence::maximum-length-callback)
+	(length-callback . ,ly:music-sequence::event-chord-length-callback)
 	(to-relative-callback .
 	 ,ly:music-sequence::event-chord-relative-callback)
 	(types . (general-music event-chord simultaneous-music))
@@ -301,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.")
@@ -332,7 +345,12 @@ Note the explicit font switch.")
 	))
 
     (NoteEvent
-     . ((description . "A note.")
+     . ((description . "A note.
+
+Outside of chords, any events in @code{articulations} with a listener
+are broadcast like chord articulations, the others are retained.
+
+For iteration inside of chords, @xref{EventChord}.")
 	(iterator-ctor . ,ly:rhythmic-music-iterator::constructor)
 	(types . (general-music event note-event rhythmic-event
 		  melodic-event))
@@ -358,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
@@ -418,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
@@ -458,15 +484,6 @@ Syntax: @code{\\unset @var{context}.@var{prop}}")
 	(types . (music-wrapper-music general-music relative-octave-music))
 	))
 
-    (RepeatedChord
-     . ((description . "A chord repetition")
-	(to-relative-callback . ,ly:music-sequence::repeated-chord-relative-callback)
-	(iterator-ctor . ,ly:music-wrapper-iterator::constructor)
-	(start-callback . ,ly:music-wrapper::start-callback)
-	(length-callback . ,ly:music-wrapper::length-callback)
-	(types . (general-music music-wrapper-music))
-	))
-
     (RepeatedMusic
      . ((description . "Repeat music in different ways.")
 	(types . (general-music repeated-music))
@@ -541,7 +558,7 @@ print anything, and also does not create staves or voices implicitly.
 Syntax: @code{\\skip} @var{duration}")
 	(length-callback . ,ly:music-duration-length)
 	(iterator-ctor . ,ly:simple-music-iterator::constructor)
-	(types . (general-music event rhythmic-event skip-event))
+	(types . (general-music event skip-event))
 	))
 
     (SlurEvent