Merge branch 'master' of git://git.sv.gnu.org/lilypond.git into td-lily

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

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 98e663f7bd5310dd8ddfc612507680aad6a5af7e..1425b22b14954315deea2483a50c4b3a110e737e 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.10.0"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -51,26 +51,38 @@ endcresc =  {
 
 setTextCresc = {
     \set crescendoText = \markup { \italic "cresc." }
-    \set crescendoSpanner = #'dashed-line
+    \set crescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
 setTextDecresc = {
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
+}
+
+setTextDecr = {
     \set decrescendoText = \markup { \italic "decr." }
-    \set decrescendoSpanner = #'dashed-line
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
 setTextDim = {
     \set decrescendoText = \markup { \italic "dim." }
-    \set decrescendoSpanner = #'dashed-line
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
+
 setHairpinCresc = {
     \unset crescendoText 
     \unset crescendoSpanner 
 }
+
 setHairpinDecresc = {
     \unset decrescendoText 
     \unset decrescendoSpanner 
 }
+
 setHairpinDim = {
     \unset decrescendoText 
     \unset decrescendoSpanner 
@@ -92,17 +104,4 @@ sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
 %decresc = \set crescendoText = "decr."
 %dim = \set crescendoText = "dim."
 
-
-% for regression testing purposes.
-assertBeamQuant =
-#(def-music-function (parser location l r) (pair? pair?)
-  (make-grob-property-override 'Beam 'position-callbacks
-   (check-quant-callbacks l r)))
-    
-% for regression testing purposes.
-assertBeamSlope =
-#(def-music-function (parser location comp) (procedure?)
-  (make-grob-property-override 'Beam 'position-callbacks
-   (check-slope-callbacks comp)))
-
-
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))