X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=50cf12dbb2d188db45321083b1fd40bd21f0d418;hb=96878a6d45fadb44725c34699157f490b7833d7a;hp=065827ab591bd5ad2ba4478266ae2c9d09174828;hpb=bf5e2a2a8feba1a38d620049d426b4f26bd55bb6;p=lilypond.git diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 065827ab59..50cf12dbb2 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) @@ -7,7 +7,11 @@ stopGroup = #(make-span-event 'NoteGroupingEvent STOP) cr = #(make-span-event 'CrescendoEvent START) decr = #(make-span-event 'DecrescendoEvent START) enddecr = #(make-span-event 'DecrescendoEvent STOP) -endcr = #(make-span-event 'CrescendoEvent STOP) +endcr = #(make-span-event 'CrescendoEvent STOP) + + +startMeasureCount = #(make-span-event 'MeasureCounterEvent START) +stopMeasureCount = #(make-span-event 'MeasureCounterEvent STOP) startTextSpan = #(make-span-event 'TextSpanEvent START) @@ -32,28 +36,28 @@ enddecresc = #(make-span-event 'DecrescendoEvent STOP) % Deprecated functions: % TODO: DEPRECATED_2_13_19 deprecatedcresc = { - #(ly:export (make-event-chord (list cr))) + $(make-event-chord (list cr)) \once \set crescendoText = \markup { \italic "cresc." } \once \set crescendoSpanner = #'text } deprecateddim = { - #(ly:export (make-event-chord (list decr))) + $(make-event-chord (list decr)) \once \set decrescendoText = \markup { \italic "dim." } \once \set decrescendoSpanner = #'text } deprecatedenddim = { - #(ly:export (make-event-chord (list enddecr))) -% \unset decrescendoText -% \unset decrescendoSpanner + $(make-event-chord (list enddecr)) +% \unset decrescendoText +% \unset decrescendoSpanner } deprecatedendcresc = { - #(ly:export (make-event-chord (list endcr))) -% \unset crescendoText -% \unset crescendoSpanner + $(make-event-chord (list endcr)) +% \unset crescendoText +% \unset crescendoSpanner } @@ -80,13 +84,13 @@ dimTextDim = { } crescHairpin = { - \unset crescendoText - \unset crescendoSpanner + \unset crescendoText + \unset crescendoSpanner } dimHairpin = { - \unset decrescendoText - \unset decrescendoSpanner + \unset decrescendoText + \unset decrescendoSpanner } @@ -104,3 +108,5 @@ sostenutoOff = #(make-span-event 'SostenutoEvent STOP) %dim = \set crescendoText = "dim." newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent))) + +breakDynamicSpan = #(make-music 'BreakDynamicSpanEvent)