*** empty log message ***

[lilypond.git] / ly / spanners-init.ly

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 1e2a8a819ef0b43dac20ad822ae38104dac3848d..08fe9534a7198b78ad660346063811b4b8c44b9c 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,52 +1,67 @@
-\version "1.5.68"
+\version "1.7.18"
 
-cr = \spanrequest \start "crescendo"
-decr = \spanrequest  \start "decrescendo"
-rc = \spanrequest   \stop "crescendo"
-rced = \spanrequest \stop "decrescendo"
+startCluster = #(make-span-event 'ClusterEvent START)
+stopCluster = #(make-span-event 'ClusterEvent STOP)
+
+startGroup = #(make-span-event 'NoteGroupingEvent START)
+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) 
+
+%% TODO: remove for 2.0
+rc = \endcr
+rced = \enddecr
+
+startTextSpan = #(make-span-event 'TextSpanEvent START)
+stopTextSpan = #(make-span-event 'TextSpanEvent STOP)
 
 cresc = \notes {
-  \commandspanrequest \start "crescendo" 
-  \property Voice.crescendoText = #'((font-shape . italic) "cresc.")
+  #(ly:export (make-event-chord (list cr)))
+  \property Voice.crescendoText = \markup { \italic "cresc." }
   \property Voice.crescendoSpanner = #'dashed-line
 }
 
 % ah, this is handy: maybe drop resetting of properties in
 % dynamic-engraver ?
 endcresc = \notes {
-  \commandspanrequest \stop "crescendo" 
+  #(ly:export (make-event-chord (list rc)))
   \property Voice.crescendoText \unset
   \property Voice.crescendoSpanner \unset
 }
 
 dim = \notes {
-  \commandspanrequest \start "decrescendo" 
-  \property Voice.decrescendoText = #"dim."
+  #(ly:export (make-event-chord (list decr)))
+
+  \property Voice.decrescendoText = \markup { \italic "dim." }
   \property Voice.decrescendoSpanner = #'dashed-line
 }
 
 enddim = \notes {
-  \commandspanrequest \stop "decrescendo" 
+  #(ly:export (make-event-chord (list rced)))
    \property Voice.decrescendoText \unset
  \property Voice.decrescendoSpanner \unset
 }
 
 %{
 
-cresc = \spanrequest \start "crescendo"
-endcresc = \spanrequest \stop "crescendo"
+cresc = \spanevent \start "crescendo"
+endcresc = \spanevent \stop "crescendo"
 
 %}
 
 % better name sustainstart/stop? 
-sustainDown = \spanrequest \start "Sustain"
-sustainUp = \spanrequest \stop "Sustain"
+sustainUp = #(make-span-event 'SustainEvent STOP)
+sustainDown = #(make-span-event 'SustainEvent START)
 
-unaCorda = \spanrequest \start "UnaCorda"
-treCorde = \spanrequest \stop "UnaCorda"
+unaCorda = #(make-span-event 'UnaCordaEvent START)
+treCorde = #(make-span-event 'UnaCordaEvent STOP)
 
-sostenutoDown = \spanrequest \start "Sostenuto"
-sostenutoUp = \spanrequest \stop "Sostenuto"
+sostenutoDown = #(make-span-event 'SostenutoEvent START)
+sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
 
 %crescpoco = \property Voice.crescendoText = "cresc. poco a poco"
 %decresc = \property Voice.crescendoText = "decr."