X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=ba4459b8a32a671404fd62ce0c446f3cb4606954;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=489e27b2a25f18f42ff9355256ea42280a01831b;hpb=b6a8afbd0a9a0b36b07c114503d81a7c420e09e7;p=lilypond.git diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 489e27b2a2..ba4459b8a3 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -1,15 +1,15 @@ ;;;; define-music-types.scm -- ;;;; ;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 1998--2006 Han-Wen Nienhuys +;;;; +;;;; (c) 1998--2008 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." + "Generate events for multimeasure rests, +to be used by the sequential-iterator" (let ((location (ly:music-property music 'origin)) (duration (ly:music-property music 'duration))) (list (make-music 'BarCheck @@ -24,435 +24,413 @@ a property set for MultiMeasureRestNumber." (define-public music-descriptions `( (AbsoluteDynamicEvent - . ( - (description . "Creates a dynamic mark. + . ((description . "Create a dynamic mark. -Syntax: @var{note}@code{\\x}, -where x is one of \\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.") +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 event dynamic-event absolute-dynamic-event)) )) + + (AnnotateOutputEvent + . ((description . "Print an annotation of an output element.") + (types . (general-music event annotate-output-event)) + )) + (ApplyContext - . ( - (description . "Call the argument with the current context during interpreting phase") + . ((description . "Call the argument with the current context during +interpreting phase.") (types . (general-music apply-context)) (iterator-ctor . ,ly:apply-context-iterator::constructor) )) - (ApplyOutputEvent - . ( - (description . " -Call the argument with all current grobs during interpreting phase. -Syntax - -\\applyOutput #'Context FUNC + (ApplyOutputEvent + . ((description . "Call the argument with all current grobs during +interpreting phase. -arguments to func are 1. the grob, 2. the originating context, -3. context where FUNC is called. +Syntax: @code{\\applyOutput #'@var{context} @var{func}} -") - (types . (general-music event layout-instruction)) +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)) )) - (ArpeggioEvent - . ( - (description . "Make an arpeggio on this note. -Syntax: -@var{note}-@code{\\arpeggio}") + (ArpeggioEvent + . ((description . "Make an arpeggio on this note. + +Syntax: @var{note}@code{-\\arpeggio}") (types . (general-music arpeggio-event event)) )) ;; todo: use articulation-event for slur as well. - ;; separate non articulation scripts + ;; separate non articulation scripts (ArticulationEvent - . ( - (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.") + . ((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 @code{-.}, @code{->}, @code{\\tenuto}, @code{\\downbow}). +See the Notation Reference for details.") (types . (general-music event articulation-event script-event)) - )) + )) + (AutoChangeMusic - . ( - (description . "Used for making voices that switch between piano staves automatically.") + . ((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.") + . ((description . "Check whether this music coincides with +the start of the measure.") (types . (general-music bar-check)) (iterator-ctor . ,ly:bar-check-iterator::constructor) )) - (BassFigureEvent - . ( - (description . "Print a bass-figure text") + (BassFigureEvent + . ((description . "Print a bass-figure text.") (types . (general-music event rhythmic-event bass-figure-event)) )) + (BeamEvent - . ( - (description . "Starts or stops a beam. + . ((description . "Start or stop a beam. -Syntax for manual control: -c8-[ c c-] c8") +Syntax for manual control: @code{c8-[ c c-] c8}") (types . (general-music event beam-event span-event)) )) + (BeamForbidEvent + . ((description . "Specify that a note may not auto-beamed.") + (types . (general-music event beam-forbid-event)) + )) + (BendAfterEvent - . ((description . "A drop/fall/doit jazz articulation") + . ((description . "A drop/fall/doit jazz articulation.") (types . (general-music bend-after-event event)))) - (BreakEvent - . ( - (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'. + (BreathingEvent + . ((description . "Create a @q{breath mark} or @q{comma}. -Syntax: -@var{note}\\breathe.") +Syntax: @var{note}@code{\\breathe}") (types . (general-music event breathing-event)) - )) + )) + (ContextChange - . ( - (description . "Change staffs in Piano staff. + . ((description . "Change staves in Piano staff. -Syntax @code{\\translator Staff = @var{new-id}}.") - (iterator-ctor . , ly:change-iterator::constructor) +Syntax: @code{\\change 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.") - - ;; not a note-event, to ensure that Note_engraver doesn't eat it. - (types . (general-music cluster-note-event melodic-event rhythmic-event event)) + . ((description . "A note that is part of a cluster.") + ;; 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.") + . ((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. + . ((description . "Begin or end a crescendo. -Syntax: @var{note}\\cr -... @var{note}\\rc (you can also use \\<, \\!, \\cresc, and -\\endcresc. See the user manual for details.).") +Syntax: @var{note}@code{\\cr} @dots{} @var{note}@code{\\rc} - (types . (general-music dynamic-event crescendo-event event)) - )) - (DecrescendoEvent - . ( - (description . "See @ref{CrescendoEvent}.") +You can also use @code{\\<}, @code{\\!}, @code{\\cresc}, and +@code{\\endcresc}. See the Notation Reference for details.") + (types . (general-music span-event span-dynamic-event crescendo-event + event)) + )) - (types . (general-music dynamic-event decrescendo-event event)) + (DecrescendoEvent + . ((description . "See @ref{CrescendoEvent}.") + (types . (general-music span-event span-dynamic-event decrescendo-event + event)) )) - - (ExtenderEvent - . ( - (description . "Extend lyrics.") + (ExtenderEvent + . ((description . "Extend lyrics.") (types . (general-music extender-event event)) )) (Event - . ( - (description . "Atomic music event.") + . ((description . "Atomic music event.") (types . (general-music event)) )) - + (EventChord - . ( - (description . "Internally used to group a set of events.") + . ((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) + (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.") + (FingeringEvent + . ((description . "Specify what finger to use for this note.") (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.") + . ((description . "Start a glissando on this note.") (types . (general-music glissando-event event)) )) - + (GraceMusic - . ( - (description . "Interpret the argument as grace notes. ") + . ((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.") - (types . (general-music event note-grouping-event)) - )) + (HarmonicEvent - . ( - (description . "Mark a note as harmonic") + . ((description . "Mark a note as harmonic.") (types . (general-music event harmonic-event)) )) - (HyphenEvent - . ( - (description . "A hyphen between lyric syllables.") + (HyphenEvent + . ((description . "A hyphen between lyric syllables.") (types . (general-music hyphen-event event)) )) - + (KeyChangeEvent - . ( - (description . "Change the key signature. + . ((description . "Change the key signature. -Syntax: @code{\\key } @var{name} @var{scale}.") +Syntax: @code{\\key} @var{name} @var{scale}") (to-relative-callback . ,(lambda (x p) p)) (types . (general-music key-change-event event)) )) + + (LabelEvent + . ((description . "Place a bookmarking label.") + (types . (general-music label-event event)) + )) + (LaissezVibrerEvent . ((description . "Don't damp this chord. -Syntax: @var{note}\\laissezVibrer.") - +Syntax: @var{note}@code{\\laissezVibrer}") (types . (general-music event laissez-vibrer-event)) )) + (LigatureEvent - . ( - (description . "Start or end a ligature.") + . ((description . "Start or end a ligature.") (span-type . ligature) (types . (general-music span-event ligature-event event)) )) + (LineBreakEvent - . ( - (description . "Allow, forbid or force a line break.") - (types . (general-music break-event event)) + . ((description . "Allow, forbid or force a line break.") + (types . (general-music line-break-event break-event event)) )) - + (LyricCombineMusic - . ( - (description . "Align lyrics to the start of notes. + . ((description . "Align lyrics to the start of notes. -Syntax @var{\\lyricsto }@var{voicename} @var{lyrics}.") +Syntax: @code{\\lyricsto} @var{voicename} @var{lyrics}") (length . ,ZERO-MOMENT) (types . (general-music lyric-combine-music)) (iterator-ctor . ,ly:lyric-combine-music-iterator::constructor) )) (LyricEvent - . ( - (description . "A lyric syllable. Must be entered in lyrics mode, i.e. -@code{\\lyrics @{ twinkle4 twinkle4 @} } .") - + . ((description . "A lyric syllable. Must be entered in lyrics mode, +i.e., @code{\\lyrics @{ twinkle4 twinkle4 @} }.") (types . (general-music rhythmic-event lyric-event event)) )) + (MarkEvent - . ( - (description . "Insert a rehearsal mark. + . ((description . "Insert a rehearsal mark. -Syntax: @code{\\mark} @var{marker}, -e.g. @code{\\mark \"A\"}.") +Syntax: @code{\\mark} @var{marker} +Example: @code{\\mark \"A\"}") (types . (general-music mark-event event)) )) - (MelismaPlayingEvent - . ( - (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)) + (MultiMeasureRestEvent + . ((description . "Used internally by @code{MultiMeasureRestMusic} +to signal rests.") + (types . (general-music event rhythmic-event + multi-measure-rest-event)) )) (MultiMeasureRestMusic - . ( - (description . "Rests that may be compressed into Multi rests. + . ((description . "Rests that may be compressed into Multi rests. -Syntax -@code{R2.*4} for 4 measures in 3/4 time.") +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 . "Used internally by MultiMeasureRestMusic to signal rests") - (types . (general-music event rhythmic-event multi-measure-rest-event)) - )) - (MultiMeasureTextEvent - . ( - (description . "Texts on mm rests. + . ((description . "Texts on multi measure rests. + +Syntax: @code{R-\\markup @{ \\roman \"bla\" @}} -Syntax -@code{R-\\markup @{ \\roman \"bla\" @}}. Note the explicit font switch.") +Note the explicit font switch.") (types . (general-music event multi-measure-text-event)) )) (Music - . ( - (description . "Generic type for music expressions.") - - (types . (general-music)) + . ((description . "Generic type for music expressions.") + (types . (general-music)) )) + (NoteEvent - . ( - (description . "A note.") - (types . (general-music event note-event rhythmic-event melodic-event)) + . ((description . "A note.") + (types . (general-music event note-event rhythmic-event + melodic-event)) + )) + + (NoteGroupingEvent + . ((description . "Start or stop grouping brackets.") + (types . (general-music event note-grouping-event)) )) - - (OverrideProperty - . ( - (description . "Extend the definition of a graphical object. -SYNTAX + (OverrideProperty + . ((description . "Extend the definition of a graphical object. -@code{\\override [ @var{Ctxt} . ] @var{Obj} @var{prop} = @var{val}} -") - (types . (general-music layout-instruction)) +Syntax: @code{\\override} [ @var{context} @code{.} ] +@var{object} @var{property} @code{=} @var{value}") + (types . (general-music layout-instruction-event + override-property-event)) (iterator-ctor . ,ly:push-property-iterator::constructor) )) + (PageBreakEvent - . ( - (description . "Allow, forbid or force a page break.") - (types . (general-music break-event event)) + . ((description . "Allow, forbid or force a page break.") + (types . (general-music break-event page-break-event event)) )) + (PageTurnEvent - . ( - (description . "Allow, forbid or force a page turn.") - (types . (general-music break-event event)) + . ((description . "Allow, forbid or force a page turn.") + (types . (general-music break-event page-turn-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.") (length-callback . ,ly:music-sequence::maximum-length-callback) (start-callback . ,ly:music-sequence::minimum-start-callback) (types . (general-music 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)) + )) + + (PercentRepeatedMusic + . ((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)) + )) + + (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)) + )) + (PhrasingSlurEvent - . ( - (description . "Start or end phrasing slur. + . ((description . "Start or end phrasing slur. -Syntax NOTE \\( and \\) NOTE") +Syntax: @var{note}@code{\\(} and @var{note}@code{\\)}") (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}}.") - (types . (layout-instruction general-music)) +Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}") + (types . (layout-instruction-event general-music)) (iterator-ctor . ,ly:property-iterator::constructor) )) (PropertyUnset - . ( - (description . "Remove the definition of a context @code{\\property}.") - - (types . (layout-instruction general-music)) + . ((description . "Remove the definition of a context +@code{\\property}.") + (types . (layout-instruction-event general-music)) (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 -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)) - )) - (QuoteMusic - . ( - (description . "Quote preprocessed snippets of music. ") + . ((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.") (to-relative-callback . ,ly:relative-octave-check::relative-callback) (types . (general-music relative-octave-check)) )) - - (RepeatedMusic - . ( - (description . "Repeat music in different ways") - (types . (general-music repeated-music)) + + (RelativeOctaveMusic + . ((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)) )) + (RepeatTieEvent - . ( - (description . "Ties for starting a second volta bracket.") + . ((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. ") + (RepeatedMusic + . ((description . "Repeat music in different ways.") + (types . (general-music repeated-music)) + )) + + (RestEvent + . ((description . "A Rest. +Syntax: @code{r4} for a quarter rest.") (types . (general-music event rhythmic-event rest-event)) - )) + )) + (RevertProperty - . ( - (description . "The opposite of @ref{OverrideProperty}: remove a -previously added property from a graphical object definition - ") + . ((description . "The opposite of @ref{OverrideProperty}: remove a +previously added property from a graphical object definition.") + (types . (general-music layout-instruction-event)) + (iterator-ctor . ,ly:pop-property-iterator::constructor) + )) - (types . (general-music layout-instruction)) - (iterator-ctor . , ly:pop-property-iterator::constructor) + (ScriptEvent + . ((description . "Add an articulation mark to a note.") + (types . (general-music event)) )) (SequentialMusic - . ( - (description . "Music expressions concatenated. - -Syntax \\sequential @{..@} or simply @{..@} .") + . ((description . "Music expressions concatenated. +Syntax: @code{\\sequential @{ @dots{} @}} or simply @code{@{ @dots{} @}}") (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))) @@ -460,272 +438,204 @@ Syntax \\sequential @{..@} or simply @{..@} .") (types . (general-music sequential-music)) )) - (SoloOneEvent - . ( - (description . "Print Solo.1") - (part-combine-status . solo1) - (types . (general-music event part-combine-event)) - )) - (SoloTwoEvent - . ( - (description . "Print Solo.2") - (part-combine-status . solo2) - (types . (general-music event part-combine-event)) - )) - (UnisonoEvent - . ((description . "Print a2") - (part-combine-status . unisono) - (types . (general-music event part-combine-event)))) - (SimultaneousMusic - . ( - (description . "Music playing together. - -SYNTAX - -@code{ \\simultaneous @{ .. @}} or << .. >>.") + . ((description . "Music playing together. +Syntax: @code{\\simultaneous @{ @dots{} @}} or @code{<< @dots{} >>}") (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) - + (to-relative-callback . + ,ly:music-sequence::simultaneous-relative-callback) (types . (general-music simultaneous-music)) )) - - (SlurEvent - . ( - (description . "Start or end slur. -Syntax NOTE( and NOTE) ") + (SkipEvent + . ((description . "Filler that takes up duration, but does not +print anything. + +Syntax: @code{s4} for a skip equivalent to a quarter rest.") + (types . (general-music event rhythmic-event skip-event)) + )) + + (SkipMusic + . ((description . "Filler that takes up duration, does not +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)) + )) + + (SlurEvent + . ((description . "Start or end slur. + +Syntax: @var{note}@code{(} and @var{note}@code{)}") (types . (general-music 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)) + )) + + (SoloTwoEvent + . ((description . "Print @q{Solo@tie{}2}.") + (part-combine-status . solo2) + (types . (general-music event part-combine-event solo-two-event)) + )) + + (SostenutoEvent + . ((description . "Depress or release sostenuto pedal.") + (types . (general-music event pedal-event sostenuto-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.") + (types . (general-music event)) + )) + (StaffSpanEvent - . ((description . "Start or stop a staff symbol.") + . ((description . "Start or stop a staff symbol.") (types . (general-music event span-event staff-span-event)) )) - - (StartPlayingEvent - . ( - (description . "Used internally to signal beginning of notes.") - (types . (general-music event start-playing-event)) + (StringNumberEvent + . ((description . "Specify on which string to play this note. + +Syntax: @code{\\@var{number}}") + (types . (general-music string-number-event event)) + )) + + (StrokeFingerEvent + . ((description . "Specify with which finger to pluck a string. + +Syntax: @code{\\rightHandFinger @var{text}}") + (types . (general-music stroke-finger-event event)) + )) + + (SustainEvent + . ((description . "Depress or release sustain pedal.") + (types . (general-music event pedal-event sustain-event)) )) - + + (TextScriptEvent + . ((description . "Print text.") + (types . (general-music script-event text-script-event event)) + )) + (TextSpanEvent - . ( - (description . "Start a text spanner like 8va.....|") + . ((description . "Start a text spanner, e.g., 8va.....|") (types . (general-music span-event event text-span-event)) )) - - (TrillSpanEvent - . ( - (description . "Start a trill spanner tr~~~") - (types . (general-music span-event event trill-span-event)) - )) - - (TransposedMusic - . ( - (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)) + + (TieEvent + . ((description . "A tie. + +Syntax: @var{note}@code{-~}") + (types . (general-music tie-event event)) )) (TimeScaledMusic - . ( - (description . "Multiply durations, as in tuplets. + . ((description . "Multiply durations, as in tuplets. -Syntax @code{\\times @var{fraction} @var{music}}, e.g. -@code{\\times 2/3 @{ ... @}} for triplets. - ") +Syntax: @code{\\times @var{fraction} @var{music}}, e.g. +@code{\\times 2/3 @{ @dots{} @}} 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. -For example, transposed music.") - (to-relative-callback . ,ly:relative-octave-music::no-relative-callback) + (TransposedMusic + . ((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) - (types . (music-wrapper-music general-music unrelativable-music)) + (to-relative-callback . + ,ly:relative-octave-music::no-relative-callback) + (types . (music-wrapper-music general-music transposed-music)) )) - (RelativeOctaveMusic - . ( - (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)) + (TremoloEvent + . ((description . "Unmeasured tremolo.") + (types . (general-music event tremolo-event)) )) - (ScriptEvent - . ( - (description . "Add an articulation mark to a note. ") - (types . (general-music event)) + (TremoloRepeatedMusic + . ((description . "Repeated notes denoted by tremolo beams.") + (iterator-ctor . ,ly:chord-tremolo-iterator::constructor) + (start-callback . ,ly:repeated-music::first-start) + ;; the length of the repeat is handled by shifting the note logs + (length-callback . ,ly:repeated-music::folded-music-length) + (types . (general-music repeated-music tremolo-repeated-music)) )) - (SkipMusic - . ( - (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)) + (TremoloSpanEvent + . ((description . "Tremolo over two stems") + (types . (general-music event span-event tremolo-span-event)) )) - - (SkipEvent - . ( - (description . "Filler that takes up duration, but does not print anything. - - -Syntax: @code{s}@var{duration}") - - (types . (general-music event rhythmic-event skip-event)) + (TrillSpanEvent + . ((description . "Start a trill spanner tr~~~") + (types . (general-music span-event event trill-span-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.") + (TupletSpanEvent + . ((description . "Used internally to signal where tuplet +brackets start and stop.") + (types . (tuplet-span-event span-event event general-music)) + )) - (types . (general-music event)) - )) - - (SustainEvent - . ( - (description . "Depress or release sustain pedal. ") - (types . (general-music event pedal-event sustain-pedal-event)) - )) - - (SostenutoEvent - . ( - (description . "Depress or release sostenuto pedal. ") - (types . (general-music event pedal-event sostenuto-pedal-event)) - )) - (UnaCordaEvent - . ( - (description . "Depress or release una-corda pedal.") - (types . (general-music event pedal-event una-corda-pedal-event)) + . ((description . "Depress or release una-corda pedal.") + (types . (general-music event pedal-event una-corda-event)) )) - - (StringNumberEvent - . ( - (description . "Specify on which string to play this note. -Syntax: @code{\\@var{number}}.") + (UnfoldedRepeatedMusic + . ((description . "Repeated music which is fully written +(and played) out.") + (iterator-ctor . ,ly:unfolded-repeat-iterator::constructor) + (start-callback . ,ly:repeated-music::first-start) + (types . (general-music repeated-music unfolded-repeated-music)) + (length-callback . ,ly:repeated-music::unfolded-music-length) + )) - (types . (general-music string-number-event event)) - )) + (UnisonoEvent + . ((description . "Print @q{a@tie{}2}.") + (part-combine-status . unisono) + (types . (general-music event part-combine-event unisono-event)))) - (MetronomeChangeEvent - . ( - (description . "Change tempo setting (in beats per minute).") - (types . (general-music metronome-change-event tempo-event event)) - )) - - (TextScriptEvent - . ( - (description . "") - (types . (general-music script-event text-script-event event)) - )) - (TieEvent - . ( - (description . "A tie. Entered as @var{note}-~.") - (types . (general-music tie-event event)) - )) - (TremoloEvent - . ( - (description . "Un measured tremolo.") - (types . (general-music event tremolo-event)) - )) - - (TremoloSpanEvent - . ( - (description . "Tremolo over two stems") - (types . (general-music event span-event tremolo-span-event)) + (UnrelativableMusic + . ((description . "Music that cannot be converted from relative +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)) )) (VoiceSeparator - . ( - (description . "Separate polyphonic voices in simultaneous music. + . ((description . "Separate polyphonic voices in simultaneous music. Syntax: @code{\\\\}") - (types . (separator general-music)) )) (VoltaRepeatedMusic - . ( + . ((description . "Repeats with alternatives placed sequentially.") (iterator-ctor . ,ly:volta-repeat-iterator::constructor) - (description . "") (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 . ,ly:unfolded-repeat-iterator::constructor) - (description . "") - (start-callback . ,ly:repeated-music::first-start) - (types . (general-music repeated-music unfolded-repeated-music)) - (length-callback . ,ly:repeated-music::unfolded-music-length) - )) - (PercentRepeatedMusic - . ( - (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 . ,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-callback . ,ly:repeated-music::folded-music-length) - (types . (general-music repeated-music tremolo-repeated-music)) - - )) - - (FoldedRepeatedMusic - . ( - (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)) - )) )) (set! music-descriptions @@ -750,9 +660,9 @@ Syntax: @code{\\\\}") (define-safe-public (make-music name . music-properties) "Create a music object of given name, and set its properties -according to `music-properties', a list of alterning property symbols +according to @code{music-properties}, a list of alternating property symbols and values. E.g: - (make-music 'OverrideProperty + (make-music 'OverrideProperty 'symbol 'Stem 'grob-property 'thickness 'grob-value (* 2 1.5))" @@ -760,7 +670,7 @@ and values. E.g: (ly:error (_ "symbol expected: ~S") name)) (let ((props (hashq-ref music-name-to-property-table name '()))) (if (not (pair? props)) - (ly:error (_ "can't find music object: ~S") name)) + (ly:error (_ "cannot find music object: ~S") name)) (let ((m (ly:make-music props))) (define (set-props mus-props) (if (and (not (null? mus-props)) @@ -775,13 +685,11 @@ and values. E.g: (let* ((handle (assoc name '(("volta" . VoltaRepeatedMusic) ("unfold" . UnfoldedRepeatedMusic) ("percent" . PercentRepeatedMusic) - ("tremolo" . TremoloRepeatedMusic) - ("fold" . FoldedRepeatedMusic)))) + ("tremolo" . TremoloRepeatedMusic)))) (music-name (if (pair? handle) (cdr handle) (begin (ly:warning (_ "unknown repeat type `~S'") name) - (ly:warning (_ "See music-types.scm for supported repeats")) + (ly:warning (_ "See define-music-types.scm for supported repeats")) 'VoltaRepeatedMusic)))) (make-music music-name))) -