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 b41dff50d66555b85e8508d19ad2119cdcd567ad..d2493903c99f186582b674e26fe3e1c6718505ed 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.7.39"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -9,26 +9,31 @@ 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)
 
 
-% TODO: junkme!
-cresc = \notes {
+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 = #'dashed-line
 }
 
 
-dim = \notes {
+dim =  {
   #(ly:export (make-event-chord (list decr)))
 
   \set decrescendoText = \markup { \italic "dim." }
   \set decrescendoSpanner = #'dashed-line
 }
 
-enddim = \notes {
+enddim =  {
   #(ly:export (make-event-chord (list enddecr)))
   \unset decrescendoText 
   \unset decrescendoSpanner 
@@ -36,7 +41,7 @@ enddim = \notes {
 
 % ah, this is handy: maybe drop resetting of properties in
 % dynamic-engraver ?
-endcresc = \notes {
+endcresc =  {
   #(ly:export (make-event-chord (list endcr)))
   \unset crescendoText 
   \unset crescendoSpanner 
@@ -48,18 +53,28 @@ setTextCresc = {
     \set crescendoText = \markup { \italic "cresc." }
     \set crescendoSpanner = #'dashed-line
 }
+
 setTextDecresc = {
-    \set crescendoText = \markup { \italic "decr." }
-    \set crescendoSpanner = #'dashed-line
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'dashed-line
 }
+
 setTextDim = {
-    \set crescendoText = \markup { \italic "dim." }
-    \set crescendoSpanner = #'dashed-line
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'dashed-line
 }
 setHairpinCresc = {
     \unset crescendoText 
     \unset crescendoSpanner 
 }
+setHairpinDecresc = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
+setHairpinDim = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}