X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fdefine-music-types.scm;h=5b9e6f6174fde2a451bb8ff1aa447b5a70bbe76c;hb=86dfbf857b9e4afb3c431fd4b945a7baf6bc4cbb;hp=0dc9c7ee71b3ae8a2bcd48d6c669215e18d1687d;hpb=12eab82dd932613faa11d4c438ba48d5c5add40f;p=lilypond.git diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 0dc9c7ee71..5b9e6f6174 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)) )) @@ -118,6 +118,16 @@ Syntax for manual control: @code{c8-[ c c-] c8}") (types . (general-music post-event break-span-event break-dynamic-span-event event)) )) + (BreakPhrasingSlurEvent + . ((description . "End a phrasing slur here.") + (types . (general-music break-span-event break-phrasing-slur-event event)) + )) + + (BreakSlurEvent + . ((description . "End a slur here.") + (types . (general-music break-span-event break-slur-event event)) + )) + (BendAfterEvent . ((description . "A drop/@/fall/@/doit jazz articulation.") (types . (general-music post-event bend-after-event event)))) @@ -133,6 +143,7 @@ Syntax: @var{note}@code{\\breathe}") (ClusterNoteEvent . ((description . "A note that is part of a cluster.") ;; not a note-event, to ensure that Note_heads_engraver doesn't eat it. + (iterator-ctor . ,ly:rhythmic-music-iterator::constructor) (types . (general-music cluster-note-event melodic-event rhythmic-event event)) )) @@ -199,9 +210,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)) @@ -287,6 +306,7 @@ Syntax: @code{\\lyricsto} @var{voicename} @var{lyrics}") (LyricEvent . ((description . "A lyric syllable. Must be entered in lyrics mode, i.e., @code{\\lyrics @{ twinkle4 twinkle4 @} }.") + (iterator-ctor . ,ly:rhythmic-music-iterator::constructor) (types . (general-music rhythmic-event lyric-event event)) )) @@ -299,6 +319,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.") @@ -330,7 +355,13 @@ 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)) )) @@ -355,6 +386,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 @@ -415,12 +447,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 @@ -455,15 +494,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)) @@ -483,6 +513,7 @@ Syntax: @code{\\unset @var{context}.@var{prop}}") . ((description . "A Rest. Syntax: @code{r4} for a quarter rest.") + (iterator-ctor . ,ly:rhythmic-music-iterator::constructor) (types . (general-music event rhythmic-event rest-event)) )) @@ -526,6 +557,7 @@ Syntax: @code{\\simultaneous @{ @dots{} @}} or @code{<< @dots{} >>}") print anything. Syntax: @code{s4} for a skip equivalent to a quarter rest.") + (iterator-ctor . ,ly:rhythmic-music-iterator::constructor) (types . (general-music event rhythmic-event skip-event)) )) @@ -536,7 +568,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