X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=6e5bc48b0e6fcfa1b8e03fb67133c59255100762;hb=f29496200848f78721deacd908ff4bb3262e55d6;hp=60989ede0cd2ed21a70613b7cbe4060d62f4f90a;hpb=2b695bcbe3d6a5fddd58eb03189d3272112421d9;p=lilypond.git diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 60989ede0c..6e5bc48b0e 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -22,7 +22,7 @@ stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP) cresc = { #(ly:export (make-event-chord (list cr))) \set crescendoText = \markup { \italic "cresc." } - \set crescendoSpanner = #'dashed-line + \set crescendoSpanner = #'text } @@ -30,7 +30,7 @@ dim = { #(ly:export (make-event-chord (list decr))) \set decrescendoText = \markup { \italic "dim." } - \set decrescendoSpanner = #'dashed-line + \set decrescendoSpanner = #'text } enddim = { @@ -51,31 +51,38 @@ endcresc = { setTextCresc = { \set crescendoText = \markup { \italic "cresc." } - \set crescendoSpanner = #'dashed-line + \set crescendoSpanner = #'text + \override DynamicTextSpanner #'style = #'dashed-line } setTextDecresc = { \set decrescendoText = \markup { \italic "decresc." } - \set decrescendoSpanner = #'dashed-line + \set decrescendoSpanner = #'text + \override DynamicTextSpanner #'style = #'dashed-line } setTextDecr = { \set decrescendoText = \markup { \italic "decr." } - \set decrescendoSpanner = #'dashed-line + \set decrescendoSpanner = #'text + \override DynamicTextSpanner #'style = #'dashed-line } setTextDim = { \set decrescendoText = \markup { \italic "dim." } - \set decrescendoSpanner = #'dashed-line + \set decrescendoSpanner = #'text + \override DynamicTextSpanner #'style = #'dashed-line } + setHairpinCresc = { \unset crescendoText \unset crescendoSpanner } + setHairpinDecresc = { \unset decrescendoText \unset decrescendoSpanner } + setHairpinDim = { \unset decrescendoText \unset decrescendoSpanner