X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=8dbc6decc04276d15e18220d396aafecc6e00408;hb=70914e508fe4d9bdde80aeead8a5013491bd2b6e;hp=0dc1c66bcf58c7c82077e9c484fd2444e2fc9a64;hpb=794dcbdb52faf4292036cd1b0270a956cf4316a3;p=lilypond.git diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 0dc1c66bcf..8dbc6decc0 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -1,25 +1,25 @@ -;;;; define-music-types.scm -- +;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 1998--2009 Han-Wen Nienhuys +;;;; Copyright (C) 1998--2011 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen +;;;; +;;;; LilyPond is free software: you can redistribute it and/or modify +;;;; it under the terms of the GNU General Public License as published by +;;;; the Free Software Foundation, either version 3 of the License, or +;;;; (at your option) any later version. +;;;; +;;;; LilyPond is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;;; GNU General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU General Public License +;;;; along with LilyPond. If not, see . -;; TODO: should link back into user manual. +; for define-safe-public when byte-compiling using Guile V2 +(use-modules (scm safe-utility-defs)) -(define (mm-rest-child-list music) - "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 - 'origin location) - (make-event-chord (cons (make-music 'MultiMeasureRestEvent - 'origin location - 'duration duration) - (ly:music-property music 'articulations))) - (make-music 'BarCheck - 'origin location)))) +;; TODO: should link back into user manual. (define-public music-descriptions `( @@ -32,6 +32,11 @@ Syntax: @var{note}@code{\\x}, where @code{\\x} is a dynamic mark like (types . (general-music event dynamic-event absolute-dynamic-event)) )) + (AlternativeEvent + . ((description . "Create a alternative event.") + (types . (general-music event alternative-event)) + )) + (AnnotateOutputEvent . ((description . "Print an annotation of an output element.") (types . (general-music event annotate-output-event)) @@ -58,7 +63,7 @@ context, and 3.@tie{}the context where @var{func} is called.") (ArpeggioEvent . ((description . "Make an arpeggio on this note. -Syntax: @var{note}@code{-\\arpeggio}") +Syntax: @w{@var{note}@code{-\\arpeggio}}") (types . (general-music arpeggio-event event)) )) @@ -69,8 +74,8 @@ Syntax: @var{note}@code{-\\arpeggio}") 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}). +(no direction specified), and where @code{y} is an articulation +(such as @w{@code{-.}}, @w{@code{->}}, @code{\\tenuto}, @code{\\downbow}). See the Notation Reference for details.") (types . (general-music event articulation-event script-event)) )) @@ -108,8 +113,13 @@ Syntax for manual control: @code{c8-[ c c-] c8}") (types . (general-music event beam-forbid-event)) )) + (BreakDynamicSpanEvent + . ((description . "End an alignment spanner for dynamics here.") + (types . (general-music break-span-event break-dynamic-span-event event)) + )) + (BendAfterEvent - . ((description . "A drop/fall/doit jazz articulation.") + . ((description . "A drop/@/fall/@/doit jazz articulation.") (types . (general-music bend-after-event event)))) (BreathingEvent @@ -127,6 +137,13 @@ Syntax: @var{note}@code{\\breathe}") 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)) + )) + (ContextChange . ((description . "Change staves in Piano staff. @@ -166,6 +183,16 @@ An alternative syntax is @var{note}@code{\\decr} @dots{} event)) )) + (DoublePercentEvent + . ((description . "Used internally to signal double percent repeats.") + (types . (general-music event double-percent-event rhythmic-event)) + )) + + (EpisemaEvent + . ((description . "Begin or end an episema.") + (types . (general-music span-event event episema-event)) + )) + (Event . ((description . "Atomic music event.") (types . (general-music event)) @@ -190,6 +217,11 @@ An alternative syntax is @var{note}@code{\\decr} @dots{} (types . (general-music fingering-event event)) )) + (FootnoteEvent + . ((description . "Footnote a grob.") + (types . (general-music event footnote-event)) + )) + (GlissandoEvent . ((description . "Start a glissando on this note.") (types . (general-music glissando-event event)) @@ -235,7 +267,6 @@ Syntax: @var{note}@code{\\laissezVibrer}") (LigatureEvent . ((description . "Start or end a ligature.") - (span-type . ligature) (types . (general-music span-event ligature-event event)) )) @@ -309,6 +340,13 @@ Note the explicit font switch.") (types . (general-music 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)) + )) + (OverrideProperty . ((description . "Extend the definition of a graphical object. @@ -329,6 +367,17 @@ Syntax: @code{\\override} [ @var{context} @code{.} ] (types . (general-music break-event page-turn-event event)) )) + (PartCombineForceEvent + . ((description . "Override the part-combiner's strategy.") + (types . (general-music part-combine-force-event event)) + )) + + (PartialSet + . ((description . "Create an anacrusis or upbeat (partial measure).") + (iterator-ctor . ,ly:partial-iterator::constructor) + (types . (general-music partial-set)) + )) + (PartCombineMusic . ((description . "Combine two parts on a staff, either merged or as separate voices.") @@ -344,7 +393,7 @@ as separate voices.") )) (PercentRepeatedMusic - . ((description . "Repeats encoded by percents.") + . ((description . "Repeats encoded by percents and slashes.") (iterator-ctor . ,ly:percent-repeat-iterator::constructor) (start-callback . ,ly:repeated-music::first-start) (length-callback . ,ly:repeated-music::unfolded-music-length) @@ -362,6 +411,7 @@ goes down).") . ((description . "Start or end phrasing slur. Syntax: @var{note}@code{\\(} and @var{note}@code{\\)}") + (spanner-id . "") (types . (general-music span-event event phrasing-slur-event)) )) @@ -405,11 +455,25 @@ Syntax: @code{\\unset @var{context}.@var{prop}}") (types . (music-wrapper-music general-music relative-octave-music)) )) + (RepeatedChord + . ((description . "A chord repetition") + (to-relative-callback . ,ly:music-sequence::repeated-chord-relative-callback) + (iterator-ctor . ,ly:music-wrapper-iterator::constructor) + (start-callback . ,ly:music-wrapper::start-callback) + (length-callback . ,ly:music-wrapper::length-callback) + (types . (general-music music-wrapper-music)) + )) + (RepeatedMusic . ((description . "Repeat music in different ways.") (types . (general-music repeated-music)) )) + (RepeatSlashEvent + . ((description . "Used internally to signal beat repeats.") + (types . (general-music event repeat-slash-event rhythmic-event)) + )) + (RepeatTieEvent . ((description . "Ties for starting a second volta bracket.") (types . (general-music event repeat-tie-event)) @@ -479,6 +543,7 @@ Syntax: @code{\\skip} @var{duration}") . ((description . "Start or end slur. Syntax: @var{note}@code{(} and @var{note}@code{)}") + (spanner-id . "") (types . (general-music span-event event slur-event)) )) @@ -533,6 +598,11 @@ Syntax: @code{\\rightHandFinger @var{text}}") (types . (general-music event pedal-event sustain-event)) )) + (TempoChangeEvent + . ((description . "A metronome mark or tempo indication.") + (types . (general-music event tempo-change-event)) + )) + (TextScriptEvent . ((description . "Print text.") (types . (general-music script-event text-script-event event)) @@ -547,7 +617,7 @@ octavation.") (TieEvent . ((description . "A tie. -Syntax: @var{note}@code{-~}") +Syntax: @w{@var{note}@code{-~}}") (types . (general-music tie-event event)) )) @@ -558,10 +628,17 @@ 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) + (iterator-ctor . ,ly:tuplet-iterator::constructor) (types . (time-scaled-music music-wrapper-music general-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)) + )) + (TransposedMusic . ((description . "Music that has been transposed.") (iterator-ctor . ,ly:music-wrapper-iterator::constructor) @@ -640,6 +717,7 @@ Syntax: @code{\\\\}") (VoltaRepeatedMusic . ((description . "Repeats with alternatives placed sequentially.") (iterator-ctor . ,ly:volta-repeat-iterator::constructor) + (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)) @@ -649,7 +727,7 @@ Syntax: @code{\\\\}") (set! music-descriptions (sort music-descriptions alist