X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=757e9e3a1eee9ce876d1e9efccd6c3d984c3290d;hb=10ac84f21313e8cc86540d1c8137cb96020b98b3;hp=878086a91c4a24ed5ef16a36676d0a2df3951e03;hpb=62e36043035ba8e0a9c1137077ff45d794a7003e;p=lilypond.git diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 878086a91c..757e9e3a1e 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -1,42 +1,63 @@ +;;;; define-music-types.scm -- +;;;; +;;;; source file of the GNU LilyPond music typesetter +;;;; +;;;; (c) 1998--2006 Han-Wen Nienhuys +;;;; Jan Nieuwenhuizen + +;; TODO: should link back into user manual. + +(define (mm-rest-child-list music) + "Check if we have R1*4-\\markup { .. }, and if applicable convert to +a property set for MultiMeasureRestNumber." + (let ((location (ly:music-property music 'origin)) + (duration (ly:music-property music 'duration))) + (list (make-music 'BarCheck + 'origin location) + (make-event-chord (cons (make-music 'MultiMeasureRestEvent + 'origin location + 'duration duration) + (ly:music-property music 'articulations))) + (make-music 'BarCheck + 'origin location)))) (define-public music-descriptions `( (AbsoluteDynamicEvent . ( - (description . "Creates a dynamic mark. Syntax: @var{note}@code{\\x}, + (description . "Creates a dynamic mark. + +Syntax: @var{note}@code{\\x}, 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) + (iterator-ctor . ,ly:apply-context-iterator::constructor) )) (ApplyOutputEvent . ( (description . " Call the argument with all current grobs during interpreting phase. -SYNTAX +Syntax -\applyoutput FUNC +\\applyOutput #'Context FUNC arguments to func are 1. the grob, 2. the originating context, 3. context where FUNC is called. ") - (internal-class-name . "Event") - (iterator-ctor . ,Output_property_music_iterator::constructor) - (types . (general-music layout-instruction)) + (types . (general-music event layout-instruction)) )) (ArpeggioEvent . ( - (description . "Make an arpeggio on this note. Syntax: + (description . "Make an arpeggio on this note. + +Syntax: @var{note}-@code{\\arpeggio}") - (internal-class-name . "Event") (types . (general-music arpeggio-event event)) )) @@ -44,630 +65,671 @@ arguments to func are 1. the grob, 2. the originating context, ;; separate non articulation scripts (ArticulationEvent . ( - (description . "Adds an articulation marking to a note. Syntax: + (description . "Adds an articulation marking to a note. + +Syntax: @var{note}@code{X}@code{Y}, where X is a direction (up @code{^}, down @code{_}, or LilyPond's choice (no direction specified)), and where Y is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto}, @code{\\downbow}). See the user manual for details.") - (internal-class-name . "Event") (types . (general-music event articulation-event script-event)) )) (AutoChangeMusic . ( - (description . "Used for making voices that switch between piano staves automatically.") - - (internal-class-name . "Music_wrapper") - (iterator-ctor . ,Auto_change_iterator::constructor) + (description . "Used for making voices that switch between piano staves automatically.") + (iterator-ctor . ,ly:auto-change-iterator::constructor) + (start-callback . ,ly:music-wrapper::start-callback) + (length-callback . ,ly:music-wrapper::length-callback) (types . (general-music music-wrapper-music auto-change-instruction)) )) (BarCheck . ( (description . "Check whether this music coincides with the start of the measure.") - (internal-class-name . "Music") (types . (general-music bar-check)) - (iterator-ctor . ,Bar_check_iterator::constructor) + (iterator-ctor . ,ly:bar-check-iterator::constructor) )) (BassFigureEvent . ( - (description . "Print a bass-figure text") + (description . "Print a bass-figure text") - (internal-class-name . "Event") (types . (general-music event rhythmic-event bass-figure-event)) )) (BeamEvent . ( - (description . "Starts or stops a beam. Syntax for manual control: + (description . "Starts or stops a beam. + +Syntax for manual control: c8-[ c c-] c8") - (internal-class-name . "Event") (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 . "Creates a line break. Syntax: \\break.") - - (internal-class-name . "Event") + (description . "Create a line break, Syntax: \\break or page break, Syntax: \\pagebreak.") + (types . (general-music break-event event)) )) (BreathingSignEvent . ( - (description . "Creates a `breath mark' or `comma'. Syntax: + (description . "Creates a `breath mark' or `comma'. + +Syntax: @var{note}\\breathe.") - (internal-class-name . "Event") (types . (general-music event breathing-event)) )) (BusyPlayingEvent . ( - (description . "Used internally to signal beginning and ending of notes.") + (description . "Used internally to signal beginning and ending of notes.") - (internal-class-name . "Event") (types . (general-music event busy-playing-event)) )) - (StartPlayingEvent + (ContextChange . ( - (description . "Used internally to signal beginning of notes.") + (description . "Change staffs in Piano staff. - (internal-class-name . "Event") - (types . (general-music event start-playing-event)) +Syntax @code{\\translator Staff = @var{new-id}}.") + (iterator-ctor . , ly:change-iterator::constructor) + (types . (general-music translator-change-instruction)) )) - + (ClusterNoteEvent - . ( - (description . "A note that is part of a cluster.") - (internal-class-name . "Event") + . ((description . "A note that is part of a cluster.") - ; not a note-event, to ensure that Note_engraver doesn't eat it. + ;; not a note-event, to ensure that Note_engraver doesn't eat it. (types . (general-music cluster-note-event melodic-event rhythmic-event event)) )) (ContextSpeccedMusic . ( - (description . "Interpret the argument music within a specific context.") - (iterator-ctor . ,Context_specced_music_iterator::constructor) - (internal-class-name . "Music_wrapper") + (description . "Interpret the argument music within a specific context.") + (iterator-ctor . ,ly:context-specced-music-iterator::constructor) + (length-callback . ,ly:music-wrapper::length-callback) + (start-callback . ,ly:music-wrapper::start-callback) (types . (context-specification general-music music-wrapper-music)) )) (CrescendoEvent . ( - (description . "Begins or ends a crescendo. Syntax: @var{note}\\cr + (description . "Begins or ends a crescendo. + +Syntax: @var{note}\\cr ... @var{note}\\rc (you can also use \\<, \\!, \\cresc, and \\endcresc. See the user manual for details.).") - (internal-class-name . "Event") (types . (general-music dynamic-event crescendo-event event)) )) (DecrescendoEvent . ( - (description . "See @ref{CrescendoEvent}.") + (description . "See @ref{CrescendoEvent}.") - (internal-class-name . "Event") (types . (general-music dynamic-event decrescendo-event event)) )) - + (ExtenderEvent . ( - (description . "Extend lyrics.") + (description . "Extend lyrics.") - (internal-class-name . "Event") (types . (general-music extender-event event)) )) + + (Event + . ( + (description . "Atomic music event.") + (types . (general-music event)) + )) + + (EventChord + . ( + (description . "Internally used to group a set of events.") + (iterator-ctor . ,ly:event-chord-iterator::constructor) + (length-callback . ,ly:music-sequence::maximum-length-callback) + (to-relative-callback . ,ly:music-sequence::event-chord-relative-callback) + (types . (general-music event-chord simultaneous-music)) + )) + + (FingerEvent . ( (description . "Specify what finger to use for this note.") - (internal-class-name . "Event") (types . (general-music fingering-event event)) )) + (BeamForbidEvent + . ( + (description . "Specify that a note may not auto-beamed ") + (types . (general-music event beam-forbid-event)) + )) (GlissandoEvent . ( - (description . "Start a glissando on this note.") - (internal-class-name . "Event") + (description . "Start a glissando on this note.") (types . (general-music glissando-event event)) )) (GraceMusic . ( - (description . "Interpret the argument as grace notes. ") - - (internal-class-name . "Grace_music") - (iterator-ctor . ,Grace_iterator::constructor) + (description . "Interpret the argument as grace notes. ") + (start-callback . ,ly:grace-music::start-callback) + (length . ,ZERO-MOMENT) + (iterator-ctor . ,ly:grace-iterator::constructor) (types . (grace-music music-wrapper-music general-music)) )) (NoteGroupingEvent . ( (description . "Start or stop grouping brackets.") - (internal-class-name . "Event") (types . (general-music event note-grouping-event)) )) (HarmonicEvent . ( (description . "Mark a note as harmonic") - (internal-class-name . "Event") (types . (general-music event harmonic-event)) )) (HyphenEvent . ( - (description . "A hyphen between lyric syllables.") + (description . "A hyphen between lyric syllables.") - (internal-class-name . "Event") (types . (general-music hyphen-event event)) )) (KeyChangeEvent . ( - (description . "Change the key signature. Syntax: @code{\\key } @var{name} @var{scale}.") + (description . "Change the key signature. - (internal-class-name . "Key_change_ev") +Syntax: @code{\\key } @var{name} @var{scale}.") + (to-relative-callback . ,(lambda (x p) p)) (types . (general-music key-change-event event)) )) - + (LaissezVibrerEvent + . ((description . "Don't damp this chord. + +Syntax: @var{note}\\laissezVibrer.") + + (types . (general-music event laissez-vibrer-event)) + )) (LigatureEvent . ( - (description . "(docme).") - - (internal-class-name . "Event") + (description . "Start or end a ligature.") (span-type . ligature) (types . (general-music span-event ligature-event event)) )) - - (LyricCombineMusic + (LineBreakEvent . ( - (description . "Align lyrics to the start of notes. -Syntax @var{\\addlyrics }@var{music} @var{lyrics}.") - - (internal-class-name . "Lyric_combine_music") - (types . (general-music lyric-combine-music)) - (iterator-ctor . ,Lyric_combine_music_iterator::constructor) + (description . "Allow, forbid or force a line break.") + (types . (general-music break-event event)) )) - (NewLyricCombineMusic + (LyricCombineMusic . ( - (description . "Align lyrics to the start of notes. -Syntax @var{\\addlyrics }@var{music} @var{lyrics}.") - (internal-class-name . "Music") - (length . ,(ly:make-moment 0 1)) + (description . "Align lyrics to the start of notes. + +Syntax @var{\\lyricsto }@var{voicename} @var{lyrics}.") + (length . ,ZERO-MOMENT) (types . (general-music lyric-combine-music)) - (iterator-ctor . ,New_lyric_combine_music_iterator::constructor) + (iterator-ctor . ,ly:lyric-combine-music-iterator::constructor) )) (LyricEvent . ( - (description . "A lyric syllable. Must be entered in lyrics mode, i.e. + (description . "A lyric syllable. Must be entered in lyrics mode, i.e. @code{\\lyrics @{ twinkle4 twinkle4 @} } .") - (internal-class-name . "Event") (types . (general-music rhythmic-event lyric-event event)) )) (MarkEvent . ( - (description . "Insert a rehearsal mark. Syntax: @code{\\mark} @var{marker}, + (description . "Insert a rehearsal mark. + +Syntax: @code{\\mark} @var{marker}, e.g. @code{\\mark \"A\"}.") - (internal-class-name . "Event") (types . (general-music mark-event event)) )) (MelismaPlayingEvent . ( - (description . "Used internally to signal melismas") - (internal-class-name . "Event") + (description . "Used internally to signal melismas.") (types . (general-music melisma-playing-event event)) )) - + (ManualMelismaEvent + . ( + (description . "Start or stop a melisma. + +Syntax: @code{c4\\melisma d\\melismaEnd}.") + (types . (general-music melisma-span-event event)) + )) + + (MultiMeasureRestMusic + . ( + (description . "Rests that may be compressed into Multi rests. + +Syntax +@code{R2.*4} for 4 measures in 3/4 time.") + (iterator-ctor . ,ly:sequential-iterator::constructor) + (elements-callback . ,mm-rest-child-list) + (types . (general-music multi-measure-rest)) + )) + (MultiMeasureRestEvent . ( - (description . "Rests that may be compressed into Multi rests. Syntax -@code{R2.*4} for 4 measures in 3/4 time. Note the capital R.") - (internal-class-name . "Event") + (description . "Used internally by MultiMeasureRestMusic to signal rests") (types . (general-music event rhythmic-event multi-measure-rest-event)) )) (MultiMeasureTextEvent . ( - (description . "Texts on mm rests. Syntax + (description . "Texts on mm rests. + +Syntax @code{R-\\markup @{ \\roman \"bla\" @}}. Note the explicit font switch.") - (internal-class-name . "Event") (types . (general-music event multi-measure-text-event)) )) (Music . ( - (description . "Generic type for music expressions.") + (description . "Generic type for music expressions.") - (internal-class-name . "Music") (types . (general-music)) )) (NoteEvent . ( - (description . "A note.") - - (internal-class-name . "Event") + (description . "A note.") (types . (general-music event note-event rhythmic-event melodic-event)) )) (OverrideProperty . ( - (description . "Extend the definition of a graphical object. + (description . "Extend the definition of a graphical object. SYNTAX -@code{\\propery Foo.Bar \\override} @var{SYMBOL} = @var{VALUE} - +@code{\\override [ @var{Ctxt} . ] @var{Obj} @var{prop} = @var{val}} ") - - (internal-class-name . "Music") (types . (general-music layout-instruction)) - (iterator-ctor . , Push_property_iterator::constructor) + (iterator-ctor . ,ly:push-property-iterator::constructor) + )) + (PageBreakEvent + . ( + (description . "Allow, forbid or force a page break.") + (types . (general-music break-event event)) + )) + (PageTurnEvent + . ( + (description . "Allow, forbid or force a page turn.") + (types . (general-music break-event event)) )) (PartCombineMusic . ( - (description . "Combine two parts on a staff, either merged or + (description . "Combine two parts on a staff, either merged or as separate voices.") - - (internal-class-name . "Simultaneous_music") + (length-callback . ,ly:music-sequence::maximum-length-callback) + (start-callback . ,ly:music-sequence::minimum-start-callback) (types . (general-music part-combine-music)) - (iterator-ctor . ,New_pc_iterator::constructor) + (iterator-ctor . ,ly:part-combine-iterator::constructor) )) - (PhrasingSlurEvent . ( - (description . "Start or end phrasing slur. Syntax NOTE \\( and \\) NOTE") - (internal-class-name . "Event") - (types . (general-music span-event phrasing-slur-event)) + (description . "Start or end phrasing slur. + +Syntax NOTE \\( and \\) NOTE") + (types . (general-music span-event event phrasing-slur-event)) )) (PropertySet . ( - (description . "Set a context property. + (description . "Set a context property. Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.") - (internal-class-name . "Music") (types . (layout-instruction general-music)) - (iterator-ctor . ,Property_iterator::constructor) - ) - ) - + (iterator-ctor . ,ly:property-iterator::constructor) + )) + (PropertyUnset . ( - (description . "Remove the definition of a context @code{\\property}.") + (description . "Remove the definition of a context @code{\\property}.") - (internal-class-name . "Music") (types . (layout-instruction general-music)) - (iterator-ctor . ,Property_unset_iterator::constructor) - ) - ) - + (iterator-ctor . ,ly:property-unset-iterator::constructor) + )) + + (PercentEvent + . ( + (description . "Used internally to signal percent repeats.") + (types . (general-music event percent-event)) + )) + (PesOrFlexaEvent . ( - (description . "Within a ligature, mark the previous and the + (description . "Within a ligature, mark the previous and the following note to form a pes (if melody goes up) or a flexa (if melody goes down).") - (internal-class-name . "Event") (types . (general-music pes-or-flexa-event event)) )) + (QuoteMusic + . ( + (description . "Quote preprocessed snippets of music. ") + (iterator-ctor . ,ly:music-wrapper-iterator::constructor) + (length-callback . ,ly:music-wrapper::length-callback) + (start-callback . ,ly:music-wrapper::start-callback) + (types . (general-music music-wrapper-music)) + )) + (RelativeOctaveCheck . ((description . "Check if a pitch is in the correct octave.") - (internal-class-name . "Relative_octave_check") + (to-relative-callback . ,ly:relative-octave-check::relative-callback) (types . (general-music relative-octave-check)) )) (RepeatedMusic . ( - (description . "Repeat music in different ways") - - (type . repeated-music) + (description . "Repeat music in different ways") (types . (general-music repeated-music)) )) - - (Event + (RepeatTieEvent . ( - (description . "Atomic music event.") - - (internal-class-name . "Event") - (types . (general-music event)) + (description . "Ties for starting a second volta bracket.") + (types . (general-music event repeat-tie-event)) )) - (RestEvent . ( - (description . "A Rest. Syntax @code{r4} for a quarter rest. ") + (description . "A Rest. + +Syntax @code{r4} for a quarter rest. ") - (internal-class-name . "Event") (types . (general-music event rhythmic-event rest-event)) )) - (SequentialMusic + (RevertProperty . ( - (description . "Music expressions concatenated. Syntax \\sequential @{..@} or simply @{..@} .") + (description . "The opposite of @ref{OverrideProperty}: remove a +previously added property from a graphical object definition + ") - (internal-class-name . "Sequential_music") - (iterator-ctor . ,Sequential_music_iterator::constructor) - (types . (general-music sequential-music)) + (types . (general-music layout-instruction)) + (iterator-ctor . , ly:pop-property-iterator::constructor) )) - - (MultiMeasureRestMusicGroup + + (SequentialMusic . ( - (description . "Like sequential-music, but specifically intended -to group start-mmrest, skip, stop-mmrest sequence. Syntax @code{R2.*5} for 5 measures in 3/4 time.") - (internal-class-name . "Sequential_music") - (iterator-ctor . ,Sequential_music_iterator::constructor) + (description . "Music expressions concatenated. + +Syntax \\sequential @{..@} or simply @{..@} .") + + (length-callback . ,ly:music-sequence::cumulative-length-callback) + (start-callback . ,ly:music-sequence::first-start-callback) + (elements-callback . ,(lambda (m) (ly:music-property m 'elements))) + (iterator-ctor . ,ly:sequential-iterator::constructor) (types . (general-music sequential-music)) )) (SoloOneEvent . ( (description . "Print Solo.1") - (internal-class-name . "Event") (part-combine-status . solo1) (types . (general-music event part-combine-event)) )) (SoloTwoEvent . ( (description . "Print Solo.2") - (internal-class-name . "Event") (part-combine-status . solo2) (types . (general-music event part-combine-event)) )) (UnisonoEvent . ((description . "Print a2") - (internal-class-name . "Event") (part-combine-status . unisono) (types . (general-music event part-combine-event)))) (SimultaneousMusic . ( - (description . "Music playing together. + (description . "Music playing together. SYNTAX -@code{ \\simultaneous @{ .. @}} or < .. >.") +@code{ \\simultaneous @{ .. @}} or << .. >>.") - (internal-class-name . "Simultaneous_music") - (iterator-ctor . ,Simultaneous_music_iterator::constructor) + (iterator-ctor . ,ly:simultaneous-music-iterator::constructor) + (start-callback . ,ly:music-sequence::minimum-start-callback) + (length-callback . ,ly:music-sequence::maximum-length-callback) + (to-relative-callback . ,ly:music-sequence::simultaneous-relative-callback) (types . (general-music simultaneous-music)) )) (SlurEvent . ( - (description . "Start or end slur. Syntax NOTE( and )NOTE") - (internal-class-name . "Event") - (types . (general-music span-event slur-event)) - )) + (description . "Start or end slur. - (RevertProperty - . ( - (description . "The opposite of @ref{OverrideProperty}: remove a -previously added property from a graphical object definition - ") +Syntax NOTE( and NOTE) ") - (internal-class-name . "Music") - (types . (general-music layout-instruction)) - (iterator-ctor . , Pop_property_iterator::constructor) + (types . (general-music span-event event slur-event)) )) - - (OutputPropertySetMusic + + (StaffSpanEvent + . ((description . "Start or stop a staff symbol.") + (types . (general-music event span-event staff-span-event)) + )) + + (StartPlayingEvent . ( - (description . "Set grob properties in objects -individually. Syntax @code{\\outputproperty @var{predicate} @var{prop} -= @var{val}}.") + (description . "Used internally to signal beginning of notes.") - (internal-class-name . "Music") - (iterator-ctor . ,Output_property_music_iterator::constructor) - (types . (general-music layout-instruction)) + (types . (general-music event start-playing-event)) )) (TextSpanEvent . ( (description . "Start a text spanner like 8va.....|") - (internal-class-name . "Event") - (types . (general-music span-event text-span-event)) + (types . (general-music span-event event text-span-event)) )) - (TranslatorChange + (TrillSpanEvent . ( - (description . "Change staffs in Piano staff. Syntax @code{\\translator Staff = @var{new-id}}.") - (internal-class-name . "Music") - (iterator-ctor . , Change_iterator::constructor) - (types . (general-music translator-change-instruction)) - )) - - (TimeScaledMusic - . ( - (description . "Multiply durations, as in tuplets. Syntax @code{\\times @var{fraction} @var{music}}, e.g. -@code{\\times 2/3 @{ ... @}} for triplets. - ") - (internal-class-name . "Time_scaled_music") - (iterator-ctor . ,Time_scaled_music_iterator::constructor) - (types . (time-scaled-music music-wrapper-music general-music)) + (description . "Start a trill spanner tr~~~") + (types . (general-music span-event event trill-span-event)) )) (TransposedMusic . ( - (description . "Music that has been transposed.") - (internal-class-name . "Transposed_music") + (description . "Music that has been transposed.") + (iterator-ctor . ,ly:music-wrapper-iterator::constructor) + (start-callback . ,ly:music-wrapper::start-callback) + (length-callback . ,ly:music-wrapper::length-callback) + (to-relative-callback . ,ly:relative-octave-music::no-relative-callback) (types . (music-wrapper-music general-music transposed-music)) )) - (UntransposableMusic + (TimeScaledMusic . ( - (description . "Music that can not be transposed.") + (description . "Multiply durations, as in tuplets. - (internal-class-name . "Untransposable_music") - (types . (music-wrapper-music general-music untransposable-music)) +Syntax @code{\\times @var{fraction} @var{music}}, e.g. +@code{\\times 2/3 @{ ... @}} for triplets. + ") + (length-callback . ,ly:music-wrapper::length-callback) + (start-callback . ,ly:music-wrapper::start-callback) + (iterator-ctor . ,ly:time-scaled-music-iterator::constructor) + (types . (time-scaled-music music-wrapper-music general-music)) )) + (TupletEvent + . ( + (description . "Used internally to signal where tuplet brackets start and stop.") + (types . (tuplet-spanner-event span-event event general-music)) + )) + (UnrelativableMusic . ( - (description . "Music that can not be converted from relative to absolute notation. + (description . "Music that can not be converted from relative to absolute notation. For example, transposed music.") - (internal-class-name . "Un_relativable_music") + (to-relative-callback . ,ly:relative-octave-music::no-relative-callback) + (iterator-ctor . ,ly:music-wrapper-iterator::constructor) + (length-callback . ,ly:music-wrapper::length-callback) (types . (music-wrapper-music general-music unrelativable-music)) )) (RelativeOctaveMusic . ( - (description . "Music that was entered in relative octave notation.") - - (internal-class-name . "Relative_octave_music") + (description . "Music that was entered in relative octave notation.") + (to-relative-callback . ,ly:relative-octave-music::relative-callback) + (iterator-ctor . ,ly:music-wrapper-iterator::constructor) + (length-callback . ,ly:music-wrapper::length-callback) + (start-callback . ,ly:music-wrapper::start-callback) (types . (music-wrapper-music general-music relative-octave-music)) )) - - (EventChord - . ( - (description . "Internally used to group a set of events.") - (internal-class-name . "Event_chord") - (iterator-ctor . ,Event_chord_iterator::constructor) - (types . (general-music event-chord simultaneous-music)) - ) - ) - (ScriptEvent . ( - (description . "Add an articulation mark to a note. ") + (description . "Add an articulation mark to a note. ") - (internal-class-name . "Event") (types . (general-music event)) )) - (NonEventSkip + (SkipMusic . ( - (description . "Filler that takes up duration, but does not print anything. This also does not create any event-accepting contexts. ") - (internal-class-name . "Music") - (length . ,ly:music-duration-length) - (iterator-ctor . ,Simple_music_iterator::constructor) + (description . "Filler that takes up duration, does not print anything, and also +does not create staffs 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)) )) - + (SkipEvent . ( - (description . "Filler that takes up duration, but does not print anything.") + (description . "Filler that takes up duration, but does not print anything. + + + +Syntax: @code{s}@var{duration}") - (internal-class-name . "Event") (types . (general-music event rhythmic-event skip-event)) )) - + + (SpacingSectionEvent + . ((description . "Start a new spacing section") + (types . (general-music event spacing-section-event)))) + (SpanEvent . ( - (description . "Event for anything that is started at a different time than stopped.") + (description . "Event for anything that is started at a different time than stopped.") - (internal-class-name . "Event") (types . (general-music event)) )) (SustainEvent . ( (description . "Depress or release sustain pedal. ") - (internal-class-name . "Event") - (types . (general-music pedal-event sustain-pedal-event)) + (types . (general-music event pedal-event sustain-pedal-event)) )) (SostenutoEvent . ( (description . "Depress or release sostenuto pedal. ") - (internal-class-name . "Event") - (types . (general-music pedal-event sostenuto-pedal-event)) + (types . (general-music event pedal-event sostenuto-pedal-event)) )) (UnaCordaEvent . ( (description . "Depress or release una-corda pedal.") - (internal-class-name . "Event") - (types . (general-music pedal-event una-corda-pedal-event)) + (types . (general-music event pedal-event una-corda-pedal-event)) )) (StringNumberEvent . ( - (description . "Specify on which string to play this note. Syntax: @code{\\@var{number}}.") + (description . "Specify on which string to play this note. + +Syntax: @code{\\@var{number}}.") - (internal-class-name . "Event") (types . (general-music string-number-event event)) )) (MetronomeChangeEvent . ( - (description . "Change tempo setting (in beats per minute).") - (internal-class-name . "Event") + (description . "Change tempo setting (in beats per minute).") (types . (general-music metronome-change-event tempo-event event)) )) (TextScriptEvent . ( - (description . "") - (internal-class-name . "Event") + (description . "") (types . (general-music script-event text-script-event event)) )) (TieEvent . ( - (description . "A tie. Entered as @var{note}-~.") - (internal-class-name . "Event") + (description . "A tie. Entered as @var{note}-~.") (types . (general-music tie-event event)) )) (TremoloEvent . ( (description . "Un measured tremolo.") - (internal-class-name . "Event") (types . (general-music event tremolo-event)) )) + (TremoloSpanEvent + . ( + (description . "Tremolo over two stems") + (types . (general-music event span-event tremolo-span-event)) + )) + (VoiceSeparator . ( - (description . "Separate polyphonic voices in simultaneous music. Syntax: @code{\\\\}") + (description . "Separate polyphonic voices in simultaneous music. + +Syntax: @code{\\\\}") - (internal-class-name . "Music") (types . (separator general-music)) )) (VoltaRepeatedMusic . ( - (iterator-ctor . ,Volta_repeat_iterator::constructor) - (internal-class-name . "Repeated_music") + (iterator-ctor . ,ly:volta-repeat-iterator::constructor) (description . "") - (start-moment-function . ,Repeated_music::first_start) - (length . ,Repeated_music::volta_music_length) + (start-callback . ,ly:repeated-music::first-start) + (length-callback . ,ly:repeated-music::volta-music-length) (types . (general-music repeated-music volta-repeated-music)) )) (UnfoldedRepeatedMusic . ( - (iterator-ctor . ,Unfolded_repeat_iterator::constructor) - (description . "") - (start-moment-function . ,Repeated_music::first_start) - (internal-class-name . "Repeated_music") + (iterator-ctor . ,ly:unfolded-repeat-iterator::constructor) + (description . "") + (start-callback . ,ly:repeated-music::first-start) (types . (general-music repeated-music unfolded-repeated-music)) - (length . ,Repeated_music::unfolded_music_length) + (length-callback . ,ly:repeated-music::unfolded-music-length) )) (PercentRepeatedMusic . ( - (internal-class-name . "Repeated_music") - (description . "Repeats encoded by percents.") - (iterator-ctor . ,Percent_repeat_iterator::constructor) - (start-moment-function . ,Repeated_music::first_start) - (length . ,Repeated_music::unfolded_music_length) + (description . "Repeats encoded by percents.") + (iterator-ctor . ,ly:percent-repeat-iterator::constructor) + (start-callback . ,ly:repeated-music::first-start) + (length-callback . ,ly:repeated-music::unfolded-music-length) (types . (general-music repeated-music percent-repeated-music)) )) (TremoloRepeatedMusic . ( - (iterator-ctor . ,Chord_tremolo_iterator::constructor) - (description . "Repeated notes denoted by tremolo beams.") - (internal-class-name . "Repeated_music") - (start-moment-function . ,Repeated_music::first_start) + (iterator-ctor . ,ly:chord-tremolo-iterator::constructor) + (description . "Repeated notes denoted by tremolo beams.") + (start-callback . ,ly:repeated-music::first-start) ;; the length of the repeat is handled by shifting the note logs - (length . ,Repeated_music::folded_music_length) + (length-callback . ,ly:repeated-music::folded-music-length) (types . (general-music repeated-music tremolo-repeated-music)) )) (FoldedRepeatedMusic . ( - (internal-class-name . "Repeated_music") - (description . "Repeats with alternatives placed in parallel. ") - (iterator-ctor . ,Folded_repeat_iterator::constructor) - (start-moment-function . ,Repeated_music::minimum_start) - (length . ,Repeated_music::folded_music_length) + (description . "Repeats with alternatives placed in parallel. ") + (iterator-ctor . ,ly:folded-repeat-iterator::constructor) + (start-callback . ,ly:repeated-music::minimum-start) + (length-callback . ,ly:repeated-music::folded-music-length) (types . (general-music repeated-music folded-repeated-music)) )) )) @@ -675,8 +737,7 @@ For example, transposed music.") (set! music-descriptions (sort music-descriptions alist