X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=da13e221d2baf756228ceffac5dda1c70013d8e1;hb=e153c0a662134ebec453ea50a4fad2c82e2b8f27;hp=f0d555743bb7ed18c01cf4070fd06dd0c6d0866d;hpb=7c93f8e815a77c7735d0ab0f3cc4b21c19a10199;p=lilypond.git diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index f0d555743b..da13e221d2 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2005 Han-Wen Nienhuys +;;;; (c) 1998--2006 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;; TODO: should link back into user manual. @@ -15,15 +15,13 @@ 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 . ( @@ -38,8 +36,7 @@ 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) + (iterator-ctor . ,ly:output-property-music-iterator::constructor) (types . (general-music layout-instruction)) )) (ArpeggioEvent @@ -48,7 +45,6 @@ arguments to func are 1. the grob, 2. the originating context, Syntax: @var{note}-@code{\\arpeggio}") - (internal-class-name . "Event") (types . (general-music arpeggio-event event)) )) @@ -64,31 +60,27 @@ Syntax: 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") - (iterator-ctor . ,Auto_change_iterator::constructor) - (start-callback . ,Music_wrapper::start_callback) - (length-callback . ,Music_wrapper::length_callback) + (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") - (internal-class-name . "Event") (types . (general-music event rhythmic-event bass-figure-event)) )) (BeamEvent @@ -97,14 +89,12 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto}, Syntax for manual control: c8-[ c c-] c8") - (internal-class-name . "Event") (types . (general-music event beam-event span-event)) )) (BreakEvent . ( (description . "Create a line break, Syntax: \\break or page break, Syntax: \\pagebreak.") - (internal-class-name . "Event") (types . (general-music break-event event)) )) (BreathingSignEvent @@ -114,14 +104,12 @@ c8-[ c c-] c8") 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.") - (internal-class-name . "Event") (types . (general-music event busy-playing-event)) )) (ContextChange @@ -129,27 +117,23 @@ Syntax: (description . "Change staffs in Piano staff. Syntax @code{\\translator Staff = @var{new-id}}.") - (internal-class-name . "Music") - (iterator-ctor . , Change_iterator::constructor) + (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) - (length-callback . ,Music_wrapper::length_callback) - (start-callback . ,Music_wrapper::start_callback) - (internal-class-name . "Music") + (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)) )) @@ -161,14 +145,12 @@ 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}.") - (internal-class-name . "Event") (types . (general-music dynamic-event decrescendo-event event)) )) @@ -176,7 +158,6 @@ Syntax: @var{note}\\cr . ( (description . "Extend lyrics.") - (internal-class-name . "Event") (types . (general-music extender-event event)) )) @@ -184,58 +165,50 @@ Syntax: @var{note}\\cr (EventChord . ( (description . "Internally used to group a set of events.") - (internal-class-name . "Music") - (iterator-ctor . ,Event_chord_iterator::constructor) - (length-callback . ,Music_sequence::maximum_length_callback) - (to-relative-callback . ,Music_sequence::event_chord_relative_callback) + (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 ") - (internal-class-name . "Event") (types . (general-music event beam-forbid-event)) )) (GlissandoEvent . ( (description . "Start a glissando on this note.") - (internal-class-name . "Event") (types . (general-music glissando-event event)) )) (GraceMusic . ( (description . "Interpret the argument as grace notes. ") - (internal-class-name . "Music") - (start-callback . ,Grace_music::start_callback) - (length . ,(ly:make-moment 0 1)) - (iterator-ctor . ,Grace_iterator::constructor) + (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.") - (internal-class-name . "Event") (types . (general-music hyphen-event event)) )) @@ -244,16 +217,19 @@ Syntax: @var{note}\\cr (description . "Change the key signature. Syntax: @code{\\key } @var{name} @var{scale}.") - - (internal-class-name . "Event") + (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") (span-type . ligature) (types . (general-music span-event ligature-event event)) )) @@ -264,11 +240,10 @@ Syntax: @code{\\key } @var{name} @var{scale}.") Syntax @var{\\oldaddlyrics }@var{music} @var{lyrics}.") - (internal-class-name . "Music") (types . (general-music lyric-combine-music)) - (length-callback . ,Lyric_combine_music::length_callback) - (start-callback . ,Music_sequence::first_start_callback) - (iterator-ctor . ,Lyric_combine_music_iterator::constructor) + (length-callback . ,ly:lyric-combine-music::length-callback) + (start-callback . ,ly:music-sequence::first-start-callback) + (iterator-ctor . ,ly:old-lyric-combine-music-iterator::constructor) )) (LyricCombineMusic @@ -276,10 +251,9 @@ Syntax @var{\\oldaddlyrics }@var{music} @var{lyrics}.") (description . "Align lyrics to the start of notes. Syntax @var{\\lyricsto }@var{voicename} @var{lyrics}.") - (internal-class-name . "Music") - (length . ,(ly:make-moment 0 1)) + (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 @@ -287,7 +261,6 @@ Syntax @var{\\lyricsto }@var{voicename} @var{lyrics}.") (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 @@ -297,13 +270,11 @@ Syntax @var{\\lyricsto }@var{voicename} @var{lyrics}.") 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") (types . (general-music melisma-playing-event event)) )) (ManualMelismaEvent @@ -311,7 +282,6 @@ e.g. @code{\\mark \"A\"}.") (description . "Start or stop a melisma. Syntax: @code{c4\\melisma d\\melismaEnd}.") - (internal-class-name . "Event") (types . (general-music melisma-span-event event)) )) @@ -321,7 +291,6 @@ Syntax: @code{c4\\melisma d\\melismaEnd}.") Syntax @code{R2.*4} for 4 measures in 3/4 time. Note the capital R.") - (internal-class-name . "Event") (types . (general-music event rhythmic-event multi-measure-rest-event)) )) @@ -331,10 +300,9 @@ Syntax to group start-mmrest, skip, stop-mmrest sequence. Syntax @code{R2.*5} for 5 measures in 3/4 time.") - (internal-class-name . "Music") - (length-callback . ,Music_sequence::cumulative_length_callback) - (start-callback . ,Music_sequence::first_start_callback) - (iterator-ctor . ,Sequential_music_iterator::constructor) + (length-callback . ,ly:music-sequence::cumulative-length-callback) + (start-callback . ,ly:music-sequence::first-start-callback) + (iterator-ctor . ,ly:sequential-music-iterator::constructor) (types . (general-music sequential-music)) )) @@ -344,7 +312,6 @@ Syntax @code{R2.*5} for 5 measures in 3/4 time.") Syntax @code{R-\\markup @{ \\roman \"bla\" @}}. Note the explicit font switch.") - (internal-class-name . "Event") (types . (general-music event multi-measure-text-event)) )) @@ -352,14 +319,12 @@ Syntax . ( (description . "Generic type for music expressions.") - (internal-class-name . "Music") (types . (general-music)) )) (NoteEvent . ( (description . "A note.") - (internal-class-name . "Event") (types . (general-music event note-event rhythmic-event melodic-event)) )) @@ -371,8 +336,7 @@ individually. Syntax @code{\\outputproperty @var{predicate} @var{prop} = @var{val}}.") - (internal-class-name . "Music") - (iterator-ctor . ,Output_property_music_iterator::constructor) + (iterator-ctor . ,ly:output-property-music-iterator::constructor) (types . (general-music layout-instruction)) )) @@ -382,30 +346,26 @@ Syntax @code{\\outputproperty @var{predicate} @var{prop} 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) )) (PartCombineMusic . ( (description . "Combine two parts on a staff, either merged or as separate voices.") - (internal-class-name . "Music") - (length-callback . ,Music_sequence::maximum_length_callback) - (start-callback . ,Music_sequence::minimum_start_callback) + (length-callback . ,ly:music-sequence::maximum-length-callback) + (start-callback . ,ly:music-sequence::minimum-start-callback) (types . (general-music part-combine-music)) - (iterator-ctor . ,Part_combine_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)) + (types . (general-music span-event event phrasing-slur-event)) )) (PropertySet @@ -413,18 +373,16 @@ Syntax NOTE \\( and \\) NOTE") (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}.") - (internal-class-name . "Music") (types . (layout-instruction general-music)) - (iterator-ctor . ,Property_unset_iterator::constructor) + (iterator-ctor . ,ly:property-unset-iterator::constructor) )) (PesOrFlexaEvent @@ -433,37 +391,37 @@ Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.") 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. ") - (internal-class-name . "Music") - (iterator-ctor . ,Quote_iterator::constructor) - (types . (general-music)) + (iterator-ctor . ,ly:quote-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 . "Music") - (to-relative-callback . ,Relative_octave_check::relative_callback) + (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) (types . (general-music repeated-music)) )) - + (RepeatTieEvent + . ( + (description . "Ties for starting a second volta bracket.") + (types . (general-music event repeat-tie-event)) + )) (Event . ( (description . "Atomic music event.") - - (internal-class-name . "Event") (types . (general-music event)) )) @@ -473,7 +431,6 @@ goes down).") Syntax @code{r4} for a quarter rest. ") - (internal-class-name . "Event") (types . (general-music event rhythmic-event rest-event)) )) (RevertProperty @@ -482,9 +439,8 @@ Syntax @code{r4} for a quarter rest. ") previously added property from a graphical object definition ") - (internal-class-name . "Music") (types . (general-music layout-instruction)) - (iterator-ctor . , Pop_property_iterator::constructor) + (iterator-ctor . , ly:pop-property-iterator::constructor) )) (SequentialMusic @@ -493,30 +449,26 @@ previously added property from a graphical object definition Syntax \\sequential @{..@} or simply @{..@} .") - (internal-class-name . "Music") - (length-callback . ,Music_sequence::cumulative_length_callback) - (start-callback . ,Music_sequence::first_start_callback) - (iterator-ctor . ,Sequential_music_iterator::constructor) + (length-callback . ,ly:music-sequence::cumulative-length-callback) + (start-callback . ,ly:music-sequence::first-start-callback) + (iterator-ctor . ,ly:sequential-music-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)))) @@ -526,13 +478,12 @@ Syntax \\sequential @{..@} or simply @{..@} .") SYNTAX -@code{ \\simultaneous @{ .. @}} or < .. >.") +@code{ \\simultaneous @{ .. @}} or << .. >>.") - (internal-class-name . "Music") - (iterator-ctor . ,Simultaneous_music_iterator::constructor) - (start-callback . ,Music_sequence::minimum_start_callback) - (length-callback . ,Music_sequence::maximum_length_callback) - (to-relative-callback . ,Music_sequence::simultaneous_relative_callback) + (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)) )) @@ -541,14 +492,13 @@ SYNTAX . ( (description . "Start or end slur. -Syntax NOTE( and )NOTE") - (internal-class-name . "Event") - (types . (general-music span-event slur-event)) +Syntax NOTE( and NOTE) ") + + (types . (general-music span-event event slur-event)) )) (StaffSpanEvent . ((description . "Start or stop a staff symbol.") - (internal-class-name . "Event") (types . (general-music event span-event staff-span-event)) )) @@ -556,22 +506,19 @@ Syntax NOTE( and )NOTE") . ( (description . "Used internally to signal beginning of notes.") - (internal-class-name . "Event") (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)) )) (TrillSpanEvent . ( (description . "Start a trill spanner tr~~~") - (internal-class-name . "Event") - (types . (general-music span-event trill-span-event)) + (types . (general-music span-event event trill-span-event)) )) (TimeScaledMusic @@ -581,21 +528,19 @@ Syntax NOTE( and )NOTE") Syntax @code{\\times @var{fraction} @var{music}}, e.g. @code{\\times 2/3 @{ ... @}} for triplets. ") - (internal-class-name . "Music") - (length-callback . ,Music_wrapper::length_callback) - (start-callback . ,Music_wrapper::start_callback) - (iterator-ctor . ,Time_scaled_music_iterator::constructor) + (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)) )) (TransposedMusic . ( (description . "Music that has been transposed.") - (internal-class-name . "Music") - (iterator-ctor . ,Music_wrapper_iterator::constructor) - (start-callback . ,Music_wrapper::start_callback) - (length-callback . ,Music_wrapper::length_callback) - (to-relative-callback . ,Relative_octave_music::no_relative_callback) + (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)) )) @@ -603,28 +548,25 @@ Syntax @code{\\times @var{fraction} @var{music}}, e.g. . ( (description . "Music that can not be converted from relative to absolute notation. For example, transposed music.") - (to-relative-callback . ,Relative_octave_music::no_relative_callback) - (iterator-ctor . ,Music_wrapper_iterator::constructor) - (length-callback . ,Music_wrapper::length_callback) - (internal-class-name . "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.") - (to-relative-callback . ,Relative_octave_music::relative_callback) - (iterator-ctor . ,Music_wrapper_iterator::constructor) - (length-callback . ,Music_wrapper::length_callback) - (start-callback . ,Music_wrapper::start_callback) - (internal-class-name . "Music") + (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)) )) (ScriptEvent . ( (description . "Add an articulation mark to a note. ") - (internal-class-name . "Event") (types . (general-music event)) )) @@ -636,9 +578,8 @@ does not create staffs or voices implicitly. Syntax: @code{\\skip }@var{duration}.") - (internal-class-name . "Music") (length-callback . ,ly:music-duration-length) - (iterator-ctor . ,Simple_music_iterator::constructor) + (iterator-ctor . ,ly:simple-music-iterator::constructor) (types . (general-music event rhythmic-event skip-event)) )) @@ -650,36 +591,31 @@ Syntax: @code{\\skip }@var{duration}.") Syntax: @code{s}@var{duration}") - (internal-class-name . "Event") (types . (general-music event rhythmic-event skip-event)) )) (SpanEvent . ( (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 @@ -688,33 +624,28 @@ Syntax: @code{s}@var{duration}") 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") (types . (general-music metronome-change-event tempo-event event)) )) (TextScriptEvent . ( (description . "") - (internal-class-name . "Event") (types . (general-music script-event text-script-event event)) )) (TieEvent . ( (description . "A tie. Entered as @var{note}-~.") - (internal-class-name . "Event") (types . (general-music tie-event event)) )) (TremoloEvent . ( (description . "Un measured tremolo.") - (internal-class-name . "Event") (types . (general-music event tremolo-event)) )) @@ -724,59 +655,53 @@ Syntax: @code{\\@var{number}}.") Syntax: @code{\\\\}") - (internal-class-name . "Music") (types . (separator general-music)) )) (VoltaRepeatedMusic . ( - (iterator-ctor . ,Volta_repeat_iterator::constructor) - (internal-class-name . "Music") + (iterator-ctor . ,ly:volta-repeat-iterator::constructor) (description . "") - (start-callback . ,Repeated_music::first_start) - (length-callback . ,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) + (iterator-ctor . ,ly:unfolded-repeat-iterator::constructor) (description . "") - (start-callback . ,Repeated_music::first_start) - (internal-class-name . "Music") + (start-callback . ,ly:repeated-music::first-start) (types . (general-music repeated-music unfolded-repeated-music)) - (length-callback . ,Repeated_music::unfolded_music_length) + (length-callback . ,ly:repeated-music::unfolded-music-length) )) (PercentRepeatedMusic . ( - (internal-class-name . "Music") (description . "Repeats encoded by percents.") - (iterator-ctor . ,Percent_repeat_iterator::constructor) - (start-callback . ,Repeated_music::first_start) - (length-callback . ,Repeated_music::unfolded_music_length) + (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) + (iterator-ctor . ,ly:chord-tremolo-iterator::constructor) (description . "Repeated notes denoted by tremolo beams.") - (internal-class-name . "Music") - (start-callback . ,Repeated_music::first_start) + (start-callback . ,ly:repeated-music::first-start) ;; the length of the repeat is handled by shifting the note logs - (length-callback . ,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 . "Music") (description . "Repeats with alternatives placed in parallel. ") - (iterator-ctor . ,Folded_repeat_iterator::constructor) - (start-callback . ,Repeated_music::minimum_start) - (length-callback . ,Repeated_music::folded_music_length) + (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)) )) )) @@ -784,7 +709,7 @@ Syntax: @code{\\\\}") (set! music-descriptions (sort music-descriptions alist