From: David Nalesnik Date: Wed, 1 Apr 2015 01:11:33 +0000 (-0500) Subject: Remove unused music type general-music X-Git-Tag: release/2.19.19-1~13 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=b2ca0fefe3018477aaca23b6f672c7199ba5238e Remove unused music type general-music --- diff --git a/input/regression/scheme-text-spanner.ly b/input/regression/scheme-text-spanner.ly index 6dc7445409..2fc7949e29 100644 --- a/input/regression/scheme-text-spanner.ly +++ b/input/regression/scheme-text-spanner.ly @@ -68,7 +68,7 @@ in scheme." (SchemeTextSpanEvent . ((description . "Used to signal where scheme text spanner brackets start and stop.") - (types . (general-music scheme-text-span-event span-event event)) + (types . (scheme-text-span-event span-event event)) )) )) diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 8327e7c60e..30903edb7b 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -29,23 +29,23 @@ Syntax: @var{note}@code{\\x}, where @code{\\x} is a dynamic mark like @code{\\ppp} or @code{\\sfz}. A complete list is in file @file{ly/@/dynamic-scripts-init.ly}.") - (types . (general-music post-event event dynamic-event absolute-dynamic-event)) + (types . (post-event event dynamic-event absolute-dynamic-event)) )) (AlternativeEvent . ((description . "Create an alternative event.") - (types . (general-music event alternative-event)) + (types . (event alternative-event)) )) (AnnotateOutputEvent . ((description . "Print an annotation of an output element.") - (types . (general-music event annotate-output-event post-event)) + (types . (event annotate-output-event post-event)) )) (ApplyContext . ((description . "Call the argument with the current context during interpreting phase.") - (types . (general-music apply-context)) + (types . (apply-context)) (iterator-ctor . ,ly:apply-context-iterator::constructor) )) @@ -57,14 +57,14 @@ Syntax: @code{\\applyOutput #'@var{context} @var{func}} Arguments to @var{func} are 1.@tie{}the grob, 2.@tie{}the originating context, and 3.@tie{}the context where @var{func} is called.") - (types . (general-music event apply-output-event)) + (types . (event apply-output-event)) )) (ArpeggioEvent . ((description . "Make an arpeggio on this note. Syntax: @w{@var{note}@code{-\\arpeggio}}") - (types . (general-music post-event arpeggio-event event)) + (types . (post-event arpeggio-event event)) )) ;; todo: use articulation-event for slur as well. @@ -77,7 +77,7 @@ Syntax: @var{note}@code{x}@code{y}, where @code{x} is a direction\ \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)) + (types . (post-event event articulation-event script-event)) )) (AutoChangeMusic @@ -86,63 +86,62 @@ 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)) + (types . (music-wrapper-music auto-change-instruction)) )) (BarCheck . ((description . "Check whether this music coincides with the start of the measure.") - (types . (general-music bar-check)) + (types . (bar-check)) (iterator-ctor . ,ly:bar-check-iterator::constructor) )) (BassFigureEvent . ((description . "Print a bass-figure text.") - (types . (general-music event rhythmic-event bass-figure-event)) + (types . (event rhythmic-event bass-figure-event)) )) (BeamEvent . ((description . "Start or stop a beam. Syntax for manual control: @code{c8-[ c c-] c8}") - (types . (general-music post-event event beam-event span-event)) + (types . (post-event event beam-event span-event)) )) (BeamForbidEvent . ((description . "Specify that a note may not auto-beamed.") - (types . (general-music post-event event beam-forbid-event)) + (types . (post-event event beam-forbid-event)) )) (BreakDynamicSpanEvent . ((description . "End an alignment spanner for dynamics here.") - (types . (general-music post-event break-span-event break-dynamic-span-event event)) + (types . (post-event break-span-event break-dynamic-span-event event)) )) (BendAfterEvent . ((description . "A drop/@/fall/@/doit jazz articulation.") - (types . (general-music post-event bend-after-event event)))) + (types . (post-event bend-after-event event)))) (BreathingEvent . ((description . "Create a @q{breath mark} or @q{comma}. Syntax: @var{note}@code{\\breathe}") - (types . (general-music event breathing-event)) + (types . (event breathing-event)) (midi-length . ,breathe::midi-length))) (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)) + (types . (cluster-note-event melodic-event rhythmic-event event)) )) (CompletizeExtenderEvent . ((description . "Used internally to signal the end of a lyrics block to ensure extenders are completed correctly when a @code{Lyrics} context ends before its associated @code{Voice} context.") - (types . (general-music completize-extender-event event)) + (types . (completize-extender-event event)) )) (ContextChange @@ -150,7 +149,7 @@ before its associated @code{Voice} context.") Syntax: @code{\\change Staff = @var{new-id}}") (iterator-ctor . ,ly:change-iterator::constructor) - (types . (general-music translator-change-instruction)) + (types . (translator-change-instruction)) )) (ContextSpeccedMusic @@ -159,7 +158,7 @@ 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)) + (types . (context-specification music-wrapper-music)) )) (CrescendoEvent @@ -169,8 +168,8 @@ Syntax: @var{note}@code{\\<} @dots{} @var{note}@code{\\!} An alternative syntax is @var{note}@code{\\cr} @dots{} @var{note}@code{\\endcr}.") - (types . (general-music post-event span-event span-dynamic-event crescendo-event - event)) + (types . (post-event span-event span-dynamic-event crescendo-event + event)) )) (DecrescendoEvent @@ -180,23 +179,23 @@ Syntax: @var{note}@code{\\>} @dots{} @var{note}@code{\\!} An alternative syntax is @var{note}@code{\\decr} @dots{} @var{note}@code{\\enddecr}.") - (types . (general-music post-event span-event span-dynamic-event decrescendo-event - event)) + (types . (post-event span-event span-dynamic-event decrescendo-event + event)) )) (DoublePercentEvent . ((description . "Used internally to signal double percent repeats.") - (types . (general-music event double-percent-event rhythmic-event)) + (types . (event double-percent-event rhythmic-event)) )) (EpisemaEvent . ((description . "Begin or end an episema.") - (types . (general-music post-event span-event event episema-event)) + (types . (post-event span-event event episema-event)) )) (Event . ((description . "Atomic music event.") - (types . (general-music event)) + (types . (event)) )) (EventChord @@ -213,27 +212,27 @@ duration stored in @code{duration}.") (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)) + (types . (event-chord simultaneous-music)) )) (ExtenderEvent . ((description . "Extend lyrics.") - (types . (general-music post-event extender-event event)) + (types . (post-event extender-event event)) )) (FingeringEvent . ((description . "Specify what finger to use for this note.") - (types . (general-music post-event fingering-event event)) + (types . (post-event fingering-event event)) )) (FootnoteEvent . ((description . "Footnote a grob.") - (types . (general-music event footnote-event)) + (types . (event footnote-event)) )) (GlissandoEvent . ((description . "Start a glissando on this note.") - (types . (general-music post-event glissando-event event)) + (types . (post-event glissando-event event)) )) (GraceMusic @@ -241,17 +240,17 @@ duration stored in @code{duration}.") (start-callback . ,ly:grace-music::start-callback) (length . ,ZERO-MOMENT) (iterator-ctor . ,ly:grace-iterator::constructor) - (types . (grace-music music-wrapper-music general-music)) + (types . (grace-music music-wrapper-music)) )) (HarmonicEvent . ((description . "Mark a note as harmonic.") - (types . (general-music post-event event harmonic-event)) + (types . (post-event event harmonic-event)) )) (HyphenEvent . ((description . "A hyphen between lyric syllables.") - (types . (general-music post-event hyphen-event event)) + (types . (post-event hyphen-event event)) )) (KeyChangeEvent @@ -259,29 +258,29 @@ duration stored in @code{duration}.") Syntax: @code{\\key} @var{name} @var{scale}") (to-relative-callback . ,(lambda (x p) p)) - (types . (general-music key-change-event event)) + (types . (key-change-event event)) )) (LabelEvent . ((description . "Place a bookmarking label.") - (types . (general-music label-event event)) + (types . (label-event event)) )) (LaissezVibrerEvent . ((description . "Don't damp this chord. Syntax: @var{note}@code{\\laissezVibrer}") - (types . (general-music post-event event laissez-vibrer-event)) + (types . (post-event event laissez-vibrer-event)) )) (LigatureEvent . ((description . "Start or end a ligature.") - (types . (general-music span-event ligature-event event)) + (types . (span-event ligature-event event)) )) (LineBreakEvent . ((description . "Allow, forbid or force a line break.") - (types . (general-music line-break-event break-event event)) + (types . (line-break-event break-event event)) )) (LyricCombineMusic @@ -289,7 +288,7 @@ Syntax: @var{note}@code{\\laissezVibrer}") Syntax: @code{\\lyricsto} @var{voicename} @var{lyrics}") (length . ,ZERO-MOMENT) - (types . (general-music lyric-combine-music)) + (types . (lyric-combine-music)) (iterator-ctor . ,ly:lyric-combine-music-iterator::constructor) )) @@ -297,7 +296,7 @@ Syntax: @code{\\lyricsto} @var{voicename} @var{lyrics}") . ((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)) + (types . (rhythmic-event lyric-event event)) )) (MarkEvent @@ -306,20 +305,19 @@ i.e., @code{\\lyrics @{ twinkle4 twinkle4 @} }.") Syntax: @code{\\mark} @var{marker} Example: @code{\\mark \"A\"}") - (types . (general-music mark-event event)) + (types . (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)) + (types . (measure-counter-event span-event event)) )) (MultiMeasureRestEvent . ((description . "Used internally by @code{MultiMeasureRestMusic} to signal rests.") (iterator-ctor . ,ly:rhythmic-music-iterator::constructor) - (types . (general-music event rhythmic-event - multi-measure-rest-event)) + (types . (event rhythmic-event multi-measure-rest-event)) )) (MultiMeasureRestMusic @@ -328,7 +326,7 @@ to signal 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)) + (types . (multi-measure-rest)) )) (MultiMeasureTextEvent @@ -337,12 +335,12 @@ Syntax: @code{R2.*4} for 4 measures in 3/4 time.") Syntax: @code{R-\\markup @{ \\roman \"bla\" @}} Note the explicit font switch.") - (types . (general-music post-event event multi-measure-text-event)) + (types . (post-event event multi-measure-text-event)) )) (Music . ((description . "Generic type for music expressions.") - (types . (general-music)) + (types . ()) )) (NoteEvent @@ -353,20 +351,19 @@ 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)) + (types . (event note-event rhythmic-event melodic-event)) )) (NoteGroupingEvent . ((description . "Start or stop grouping brackets.") - (types . (general-music post-event event note-grouping-event)) + (types . (post-event event note-grouping-event)) )) (OttavaMusic . ((description . "Start or stop an ottava bracket.") (iterator-ctor . ,ly:sequential-iterator::constructor) (elements-callback . ,make-ottava-set) - (types . (general-music ottava-music)) + (types . (ottava-music)) )) (OverrideProperty @@ -374,25 +371,24 @@ For iteration inside of chords, @xref{EventChord}.") Syntax: @code{\\override} [ @var{context} @code{.} ] @var{object} @var{property} @code{=} @var{value}") - (types . (general-music layout-instruction-event - override-property-event)) + (types . (layout-instruction-event override-property-event)) (iterator-ctor . ,ly:push-property-iterator::constructor) (untransposable . #t) )) (PageBreakEvent . ((description . "Allow, forbid or force a page break.") - (types . (general-music break-event page-break-event event)) + (types . (break-event page-break-event event)) )) (PageTurnEvent . ((description . "Allow, forbid or force a page turn.") - (types . (general-music break-event page-turn-event event)) + (types . (break-event page-turn-event event)) )) (PartCombineForceEvent . ((description . "Override the part-combiner's strategy.") - (types . (general-music part-combine-force-event event)) + (types . (part-combine-force-event event)) )) (PartialSet @@ -403,7 +399,7 @@ Syntax: @code{\\override} [ @var{context} @code{.} ] ;; for the overall timing in spite of having a non-zero ;; duration field. (length-callback . ,ly:music-sequence::cumulative-length-callback) - (types . (general-music partial-set)) + (types . (partial-set)) )) (PartCombineMusic @@ -411,13 +407,13 @@ Syntax: @code{\\override} [ @var{context} @code{.} ] as separate voices.") (length-callback . ,ly:music-sequence::maximum-length-callback) (start-callback . ,ly:music-sequence::minimum-start-callback) - (types . (general-music part-combine-music)) + (types . (part-combine-music)) (iterator-ctor . ,ly:part-combine-iterator::constructor) )) (PercentEvent . ((description . "Used internally to signal percent repeats.") - (types . (general-music event percent-event rhythmic-event)) + (types . (event percent-event rhythmic-event)) )) (PercentRepeatedMusic @@ -425,14 +421,14 @@ as separate voices.") (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)) + (types . (repeated-music percent-repeated-music)) )) (PesOrFlexaEvent . ((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).") - (types . (general-music pes-or-flexa-event event)) + (types . (pes-or-flexa-event event)) )) (PhrasingSlurEvent @@ -440,7 +436,7 @@ goes down).") Syntax: @var{note}@code{\\(} and @var{note}@code{\\)}") (spanner-id . "") - (types . (general-music post-event span-event event phrasing-slur-event)) + (types . (post-event span-event event phrasing-slur-event)) )) (PostEvents @@ -453,7 +449,7 @@ This can be used to package several events into a single one. Should not be see . ((description . "Set a context property. Syntax: @code{\\set @var{context}.@var{prop} = @var{scheme-val}}") - (types . (layout-instruction-event general-music)) + (types . (layout-instruction-event)) (iterator-ctor . ,ly:property-iterator::constructor) (untransposable . #t) )) @@ -463,7 +459,7 @@ Syntax: @code{\\set @var{context}.@var{prop} = @var{scheme-val}}") property. See @ref{PropertySet}. Syntax: @code{\\unset @var{context}.@var{prop}}") - (types . (layout-instruction-event general-music)) + (types . (layout-instruction-event)) (iterator-ctor . ,ly:property-unset-iterator::constructor) )) @@ -472,13 +468,13 @@ Syntax: @code{\\unset @var{context}.@var{prop}}") (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)) + (types . (music-wrapper-music)) )) (RelativeOctaveCheck . ((description . "Check if a pitch is in the correct octave.") (to-relative-callback . ,ly:relative-octave-check::relative-callback) - (types . (general-music relative-octave-check)) + (types . (relative-octave-check)) )) (RelativeOctaveMusic @@ -487,22 +483,22 @@ Syntax: @code{\\unset @var{context}.@var{prop}}") (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)) + (types . (music-wrapper-music relative-octave-music)) )) (RepeatedMusic . ((description . "Repeat music in different ways.") - (types . (general-music repeated-music)) + (types . (repeated-music)) )) (RepeatSlashEvent . ((description . "Used internally to signal beat repeats.") - (types . (general-music event repeat-slash-event rhythmic-event)) + (types . (event repeat-slash-event rhythmic-event)) )) (RepeatTieEvent . ((description . "Ties for starting a second volta bracket.") - (types . (general-music post-event event repeat-tie-event)) + (types . (post-event event repeat-tie-event)) )) (RestEvent @@ -510,19 +506,19 @@ Syntax: @code{\\unset @var{context}.@var{prop}}") Syntax: @code{r4} for a quarter rest.") (iterator-ctor . ,ly:rhythmic-music-iterator::constructor) - (types . (general-music event rhythmic-event rest-event)) + (types . (event rhythmic-event rest-event)) )) (RevertProperty . ((description . "The opposite of @ref{OverrideProperty}: remove a previously added property from a graphical object definition.") - (types . (general-music layout-instruction-event)) + (types . (layout-instruction-event)) (iterator-ctor . ,ly:pop-property-iterator::constructor) )) (ScriptEvent . ((description . "Add an articulation mark to a note.") - (types . (general-music event)) + (types . (event)) )) (SequentialMusic @@ -533,7 +529,7 @@ Syntax: @code{\\sequential @{ @dots{} @}} or simply @code{@{ @dots{} @}}") (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)) + (types . (sequential-music)) )) (SimultaneousMusic @@ -545,7 +541,7 @@ Syntax: @code{\\simultaneous @{ @dots{} @}} or @code{<< @dots{} >>}") (length-callback . ,ly:music-sequence::maximum-length-callback) (to-relative-callback . ,ly:music-sequence::simultaneous-relative-callback) - (types . (general-music simultaneous-music)) + (types . (simultaneous-music)) )) (SkipEvent @@ -554,7 +550,7 @@ 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)) + (types . (event rhythmic-event skip-event)) )) (SkipMusic @@ -564,7 +560,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 skip-event)) + (types . (event skip-event)) )) (SlurEvent @@ -572,81 +568,81 @@ Syntax: @code{\\skip} @var{duration}") Syntax: @var{note}@code{(} and @var{note}@code{)}") (spanner-id . "") - (types . (general-music post-event span-event event slur-event)) + (types . (post-event span-event event slur-event)) )) (SoloOneEvent . ((description . "Print @q{Solo@tie{}1}.") (part-combine-status . solo1) - (types . (general-music event part-combine-event solo-one-event)) + (types . (event part-combine-event solo-one-event)) )) (SoloTwoEvent . ((description . "Print @q{Solo@tie{}2}.") (part-combine-status . solo2) - (types . (general-music event part-combine-event solo-two-event)) + (types . (event part-combine-event solo-two-event)) )) (SostenutoEvent . ((description . "Depress or release sostenuto pedal.") - (types . (general-music post-event event pedal-event sostenuto-event)) + (types . (post-event event pedal-event sostenuto-event)) )) (SpacingSectionEvent . ((description . "Start a new spacing section.") - (types . (general-music event spacing-section-event)))) + (types . (event spacing-section-event)))) (SpanEvent . ((description . "Event for anything that is started at a different time than stopped.") - (types . (general-music event)) + (types . (event)) )) (StaffSpanEvent . ((description . "Start or stop a staff symbol.") - (types . (general-music event span-event staff-span-event)) + (types . (event span-event staff-span-event)) )) (StringNumberEvent . ((description . "Specify on which string to play this note. Syntax: @code{\\@var{number}}") - (types . (general-music post-event string-number-event event)) + (types . (post-event string-number-event event)) )) (StrokeFingerEvent . ((description . "Specify with which finger to pluck a string. Syntax: @code{\\rightHandFinger @var{text}}") - (types . (general-music post-event stroke-finger-event event)) + (types . (post-event stroke-finger-event event)) )) (SustainEvent . ((description . "Depress or release sustain pedal.") - (types . (general-music post-event event pedal-event sustain-event)) + (types . (post-event event pedal-event sustain-event)) )) (TempoChangeEvent . ((description . "A metronome mark or tempo indication.") - (types . (general-music event tempo-change-event)) + (types . (event tempo-change-event)) )) (TextScriptEvent . ((description . "Print text.") - (types . (general-music post-event script-event text-script-event event)) + (types . (post-event script-event text-script-event event)) )) (TextSpanEvent . ((description . "Start a text spanner, for example, an octavation.") - (types . (general-music post-event span-event event text-span-event)) + (types . (post-event span-event event text-span-event)) )) (TieEvent . ((description . "A tie. Syntax: @w{@var{note}@code{-~}}") - (types . (general-music post-event tie-event event)) + (types . (post-event tie-event event)) )) (TimeScaledMusic @@ -657,19 +653,19 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g., (length-callback . ,ly:music-wrapper::length-callback) (start-callback . ,ly:music-wrapper::start-callback) (iterator-ctor . ,ly:tuplet-iterator::constructor) - (types . (time-scaled-music music-wrapper-music general-music)) + (types . (time-scaled-music music-wrapper-music)) )) (TimeSignatureMusic . ((description . "Set a new time signature") (iterator-ctor . ,ly:sequential-iterator::constructor) (elements-callback . ,make-time-signature-set) - (types . (general-music time-signature-music)) + (types . (time-signature-music)) )) (TimeSignatureEvent . ((description . "An event created when setting a new time signature") - (types . (general-music event time-signature-event)) + (types . (event time-signature-event)) )) (TransposedMusic @@ -679,12 +675,12 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g., (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)) + (types . (music-wrapper-music transposed-music)) )) (TremoloEvent . ((description . "Unmeasured tremolo.") - (types . (general-music post-event event tremolo-event)) + (types . (post-event event tremolo-event)) )) (TremoloRepeatedMusic @@ -692,28 +688,28 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g., (iterator-ctor . ,ly:chord-tremolo-iterator::constructor) (start-callback . ,ly:repeated-music::first-start) (length-callback . ,ly:repeated-music::unfolded-music-length) - (types . (general-music repeated-music tremolo-repeated-music)) + (types . (repeated-music tremolo-repeated-music)) )) (TremoloSpanEvent . ((description . "Tremolo over two stems.") - (types . (general-music event span-event tremolo-span-event)) + (types . (event span-event tremolo-span-event)) )) (TrillSpanEvent . ((description . "Start a trill spanner.") - (types . (general-music post-event span-event event trill-span-event)) + (types . (post-event span-event event trill-span-event)) )) (TupletSpanEvent . ((description . "Used internally to signal where tuplet brackets start and stop.") - (types . (tuplet-span-event span-event event general-music post-event)) + (types . (tuplet-span-event span-event event post-event)) )) (UnaCordaEvent . ((description . "Depress or release una-corda pedal.") - (types . (general-music post-event event pedal-event una-corda-event)) + (types . (post-event event pedal-event una-corda-event)) )) (UnfoldedRepeatedMusic @@ -722,14 +718,14 @@ played) out.") (iterator-ctor . ,ly:sequential-iterator::constructor) (elements-callback . ,make-unfolded-set) (start-callback . ,ly:repeated-music::first-start) - (types . (general-music repeated-music unfolded-repeated-music)) + (types . (repeated-music unfolded-repeated-music)) (length-callback . ,ly:repeated-music::unfolded-music-length) )) (UnisonoEvent . ((description . "Print @q{a@tie{}2}.") (part-combine-status . unisono) - (types . (general-music event part-combine-event unisono-event)))) + (types . (event part-combine-event unisono-event)))) (UnrelativableMusic . ((description . "Music that cannot be converted from relative @@ -737,14 +733,14 @@ to absolute notation. For example, transposed 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)) + (types . (music-wrapper-music unrelativable-music)) )) (VoiceSeparator . ((description . "Separate polyphonic voices in simultaneous music. Syntax: @code{\\\\}") - (types . (separator general-music)) + (types . (separator)) )) (VoltaRepeatedMusic @@ -753,7 +749,7 @@ Syntax: @code{\\\\}") (elements-callback . ,make-volta-set) (start-callback . ,ly:repeated-music::first-start) (length-callback . ,ly:repeated-music::volta-music-length) - (types . (general-music repeated-music volta-repeated-music)) + (types . (repeated-music volta-repeated-music)) )) ))