Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index f4d704fbedad995cf6d623473e12f53ada02a2cb..d2493903c99f186582b674e26fe3e1c6718505ed 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,8 +1,4 @@
-\version "1.7.3"
-
-startCluster = #(make-span-event 'ClusterEvent START)
-stopCluster = #(make-span-event 'ClusterEvent STOP)
-
+\version "2.7.39"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -13,46 +9,74 @@ 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 {
+
+startTrillSpan = #(make-span-event 'TrillSpanEvent START)
+stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
+
+
+% STOP: junkme!
+cresc =  {
   #(ly:export (make-event-chord (list cr)))
-  \property Voice.crescendoText = \markup { \italic "cresc." }
-  \property Voice.crescendoSpanner = #'dashed-line
+  \set crescendoText = \markup { \italic "cresc." }
+  \set crescendoSpanner = #'dashed-line
+}
+
+
+dim =  {
+  #(ly:export (make-event-chord (list decr)))
+
+  \set decrescendoText = \markup { \italic "dim." }
+  \set decrescendoSpanner = #'dashed-line
+}
+
+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 {
-  #(ly:export (make-event-chord (list rc)))
-  \property Voice.crescendoText \unset
-  \property Voice.crescendoSpanner \unset
+endcresc =  {
+  #(ly:export (make-event-chord (list endcr)))
+  \unset crescendoText 
+  \unset crescendoSpanner 
 }
 
-dim = \notes {
-  #(ly:export (make-event-chord (list decr)))
+%%%%%%%%%%%%%%%%
 
-  \property Voice.decrescendoText = \markup { \italic "dim." }
-  \property Voice.decrescendoSpanner = #'dashed-line
+setTextCresc = {
+    \set crescendoText = \markup { \italic "cresc." }
+    \set crescendoSpanner = #'dashed-line
 }
 
-enddim = \notes {
-  #(ly:export (make-event-chord (list rced)))
-   \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+setTextDecresc = {
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'dashed-line
 }
 
-%{
+setTextDim = {
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'dashed-line
+}
+setHairpinCresc = {
+    \unset crescendoText 
+    \unset crescendoSpanner 
+}
+setHairpinDecresc = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
+setHairpinDim = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
 
-cresc = \spanevent \start "crescendo"
-endcresc = \spanevent \stop "crescendo"
 
-%}
 
 % better name sustainstart/stop? 
 sustainUp = #(make-span-event 'SustainEvent STOP)
@@ -64,6 +88,6 @@ treCorde = #(make-span-event 'UnaCordaEvent STOP)
 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."
-%dim = \property Voice.crescendoText = "dim."
+%crescpoco = \set crescendoText = "cresc. poco a poco"
+%decresc = \set crescendoText = "decr."
+%dim = \set crescendoText = "dim."