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

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 1e2a8a819e..e86ea4ea74 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,53 +1,100 @@
-\version "1.5.68"
+\version "2.11.52"
 
-cr = \spanrequest \start "crescendo"
-decr = \spanrequest  \start "decrescendo"
-rc = \spanrequest   \stop "crescendo"
-rced = \spanrequest \stop "decrescendo"
+startGroup = #(make-span-event 'NoteGroupingEvent START)
+stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
 
-cresc = \notes {
-  \commandspanrequest \start "crescendo" 
-  \property Voice.crescendoText = #'((font-shape . italic) "cresc.")
-  \property Voice.crescendoSpanner = #'dashed-line
+
+cr = #(make-span-event 'CrescendoEvent START)
+decr = #(make-span-event 'DecrescendoEvent START)
+enddecr = #(make-span-event 'DecrescendoEvent STOP)
+endcr = #(make-span-event 'CrescendoEvent STOP) 
+
+
+startTextSpan = #(make-span-event 'TextSpanEvent START)
+stopTextSpan = #(make-span-event 'TextSpanEvent STOP)
+
+
+startTrillSpan = #(make-span-event 'TrillSpanEvent START)
+stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
+
+
+% STOP: junkme!
+cresc =  {
+  #(ly:export (make-event-chord (list cr)))
+  \set crescendoText = \markup { \italic "cresc." }
+  \set crescendoSpanner = #'text
+}
+
+
+dim =  {
+  #(ly:export (make-event-chord (list decr)))
+
+  \set decrescendoText = \markup { \italic "dim." }
+  \set decrescendoSpanner = #'text
+}
+
+enddim =  {
+  #(ly:export (make-event-chord (list enddecr)))
+  \unset decrescendoText 
+  \unset decrescendoSpanner 
 }
 
 % ah, this is handy: maybe drop resetting of properties in
 % dynamic-engraver ?
-endcresc = \notes {
-  \commandspanrequest \stop "crescendo" 
-  \property Voice.crescendoText \unset
-  \property Voice.crescendoSpanner \unset
+endcresc =  {
+  #(ly:export (make-event-chord (list endcr)))
+  \unset crescendoText 
+  \unset crescendoSpanner 
+}
+
+%%%%%%%%%%%%%%%%
+
+crescTextCresc = {
+    \set crescendoText = \markup { \italic "cresc." }
+    \set crescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
-dim = \notes {
-  \commandspanrequest \start "decrescendo" 
-  \property Voice.decrescendoText = #"dim."
-  \property Voice.decrescendoSpanner = #'dashed-line
+dimTextDecresc = {
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
-enddim = \notes {
-  \commandspanrequest \stop "decrescendo" 
-   \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+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 = {
+    \unset crescendoText 
+    \unset crescendoSpanner 
+}
+
+dimHairpin = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
 
-cresc = \spanrequest \start "crescendo"
-endcresc = \spanrequest \stop "crescendo"
 
-%}
+sustainOff = #(make-span-event 'SustainEvent STOP)
+sustainOn = #(make-span-event 'SustainEvent START)
 
-% better name sustainstart/stop? 
-sustainDown = \spanrequest \start "Sustain"
-sustainUp = \spanrequest \stop "Sustain"
+unaCorda = #(make-span-event 'UnaCordaEvent START)
+treCorde = #(make-span-event 'UnaCordaEvent STOP)
 
-unaCorda = \spanrequest \start "UnaCorda"
-treCorde = \spanrequest \stop "UnaCorda"
+sostenutoOn = #(make-span-event 'SostenutoEvent START)
+sostenutoOff = #(make-span-event 'SostenutoEvent STOP)
 
-sostenutoDown = \spanrequest \start "Sostenuto"
-sostenutoUp = \spanrequest \stop "Sostenuto"
+%crescpoco = \set crescendoText = "cresc. poco a poco"
+%decresc = \set crescendoText = "decr."
+%dim = \set crescendoText = "dim."
 
-%crescpoco = \property Voice.crescendoText = "cresc. poco a poco"
-%decresc = \property Voice.crescendoText = "decr."
-%dim = \property Voice.crescendoText = "dim."
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))