Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index b67deb117af2e80c25791a3b846804651239b89f..7b26094e497fbbfdf81c6b5fe20cc271644344c0 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.12.0"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -21,30 +21,27 @@ stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
 % STOP: junkme!
 cresc =  {
   #(ly:export (make-event-chord (list cr)))
-  \set crescendoText = \markup { \italic "cresc." }
-  \set crescendoSpanner = #'text
+  \once \set crescendoText = \markup { \italic "cresc." }
+  \once \set crescendoSpanner = #'text
 }
 
 
 dim =  {
   #(ly:export (make-event-chord (list decr)))
-
-  \set decrescendoText = \markup { \italic "dim." }
-  \set decrescendoSpanner = #'text
+  \once \set decrescendoText = \markup { \italic "dim." }
+  \once \set decrescendoSpanner = #'text
 }
 
 enddim =  {
   #(ly:export (make-event-chord (list enddecr)))
-  \unset decrescendoText 
-  \unset decrescendoSpanner 
+%  \unset decrescendoText 
+%  \unset decrescendoSpanner 
 }
 
-% ah, this is handy: maybe drop resetting of properties in
-% dynamic-engraver ?
 endcresc =  {
   #(ly:export (make-event-chord (list endcr)))
-  \unset crescendoText 
-  \unset crescendoSpanner 
+%  \unset crescendoText 
+%  \unset crescendoSpanner 
 }
 
 %%%%%%%%%%%%%%%%
@@ -83,14 +80,7 @@ dimHairpin = {
     \unset decrescendoSpanner 
 }
 
-setHairpinDim = {
-    \unset decrescendoText 
-    \unset decrescendoSpanner 
-}
-
-
 
-% better name sustainstart/stop? 
 sustainOff = #(make-span-event 'SustainEvent STOP)
 sustainOn = #(make-span-event 'SustainEvent START)