X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=b507d01829a527abe49866bfdf36a77fbd970732;hb=7b51a4f655755a864f7efe6818b175d5eba2b31f;hp=7b26094e497fbbfdf81c6b5fe20cc271644344c0;hpb=eeec992b7029d0982bf4ed0eb3995e9ca99c10e9;p=lilypond.git diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 7b26094e49..b507d01829 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "2.12.0" +\version "2.16.0" startGroup = #(make-span-event 'NoteGroupingEvent START) stopGroup = #(make-span-event 'NoteGroupingEvent STOP) @@ -18,56 +18,65 @@ startTrillSpan = #(make-span-event 'TrillSpanEvent START) stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP) -% STOP: junkme! -cresc = { - #(ly:export (make-event-chord (list cr))) +episemInitium = #(make-span-event 'EpisemaEvent START) +episemFinis = #(make-span-event 'EpisemaEvent STOP) + + +cresc = #(make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text "cresc.") +endcresc = #(make-span-event 'CrescendoEvent STOP) +dim = #(make-music 'DecrescendoEvent 'span-direction START 'span-type 'text 'span-text "dim.") +enddim = #(make-span-event 'DecrescendoEvent STOP) +decresc = #(make-music 'DecrescendoEvent 'span-direction START 'span-type 'text 'span-text "decresc.") +enddecresc = #(make-span-event 'DecrescendoEvent STOP) + +% Deprecated functions: +% TODO: DEPRECATED_2_13_19 +deprecatedcresc = { + $(make-event-chord (list cr)) \once \set crescendoText = \markup { \italic "cresc." } \once \set crescendoSpanner = #'text } -dim = { - #(ly:export (make-event-chord (list decr))) +deprecateddim = { + $(make-event-chord (list decr)) \once \set decrescendoText = \markup { \italic "dim." } \once \set decrescendoSpanner = #'text } -enddim = { - #(ly:export (make-event-chord (list enddecr))) +deprecatedenddim = { + $(make-event-chord (list enddecr)) % \unset decrescendoText % \unset decrescendoSpanner } -endcresc = { - #(ly:export (make-event-chord (list endcr))) +deprecatedendcresc = { + $(make-event-chord (list endcr)) % \unset crescendoText % \unset crescendoSpanner } + %%%%%%%%%%%%%%%% crescTextCresc = { \set crescendoText = \markup { \italic "cresc." } \set crescendoSpanner = #'text - \override DynamicTextSpanner #'style = #'dashed-line } dimTextDecresc = { \set decrescendoText = \markup { \italic "decresc." } \set decrescendoSpanner = #'text - \override DynamicTextSpanner #'style = #'dashed-line } dimTextDecr = { \set decrescendoText = \markup { \italic "decr." } \set decrescendoSpanner = #'text - \override DynamicTextSpanner #'style = #'dashed-line } dimTextDim = { \set decrescendoText = \markup { \italic "dim." } \set decrescendoSpanner = #'text - \override DynamicTextSpanner #'style = #'dashed-line } crescHairpin = { @@ -95,3 +104,5 @@ sostenutoOff = #(make-span-event 'SostenutoEvent STOP) %dim = \set crescendoText = "dim." newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent))) + +breakDynamicSpan = #(make-music 'BreakDynamicSpanEvent)