X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=e86ea4ea748e4c5669c4ac80ddc495f25ef99c22;hb=d03883358e67bb40a80a49dfc703db69dd362f25;hp=ab810296a2fe1706f13d2e5d5bb7659ebbc2c86a;hpb=471a023f5233c071584090bf08ab5c9846673580;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index ab810296a2..e86ea4ea74 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.36"
+\version "2.11.52"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -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 =  {
@@ -49,45 +49,52 @@ endcresc =  {
 
 %%%%%%%%%%%%%%%%
 
-setTextCresc = {
+crescTextCresc = {
     \set crescendoText = \markup { \italic "cresc." }
-    \set crescendoSpanner = #'dashed-line
+    \set crescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
-setTextDecresc = {
+dimTextDecresc = {
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
+}
+
+dimTextDecr = {
     \set decrescendoText = \markup { \italic "decr." }
-    \set decrescendoSpanner = #'dashed-line
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
-setTextDim = {
+dimTextDim = {
     \set decrescendoText = \markup { \italic "dim." }
-    \set decrescendoSpanner = #'dashed-line
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
-setHairpinCresc = {
+
+crescHairpin = {
     \unset crescendoText 
     \unset crescendoSpanner 
 }
-setHairpinDecresc = {
-    \unset decrescendoText 
-    \unset decrescendoSpanner 
-}
-setHairpinDim = {
+
+dimHairpin = {
     \unset decrescendoText 
     \unset decrescendoSpanner 
 }
 
 
-
-% better name sustainstart/stop? 
-sustainUp = #(make-span-event 'SustainEvent STOP)
-sustainDown = #(make-span-event 'SustainEvent START)
+sustainOff = #(make-span-event 'SustainEvent STOP)
+sustainOn = #(make-span-event 'SustainEvent START)
 
 unaCorda = #(make-span-event 'UnaCordaEvent START)
 treCorde = #(make-span-event 'UnaCordaEvent STOP)
 
-sostenutoDown = #(make-span-event 'SostenutoEvent START)
-sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
+sostenutoOn = #(make-span-event 'SostenutoEvent START)
+sostenutoOff = #(make-span-event 'SostenutoEvent STOP)
 
 %crescpoco = \set crescendoText = "cresc. poco a poco"
 %decresc = \set crescendoText = "decr."
 %dim = \set crescendoText = "dim."
+
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))