Merge branch 'master' into accepts

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

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index e8acaa1a0c76a18082dbdab392d7a368de72e0d6..6e5bc48b0e6fcfa1b8e03fb67133c59255100762 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.3.8"
+\version "2.10.0"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -22,7 +22,7 @@ stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
 cresc =  {
   #(ly:export (make-event-chord (list cr)))
   \set crescendoText = \markup { \italic "cresc." }
-  \set crescendoSpanner = #'dashed-line
+  \set crescendoSpanner = #'text
 }
 
 
@@ -30,7 +30,7 @@ dim =  {
   #(ly:export (make-event-chord (list decr)))
 
   \set decrescendoText = \markup { \italic "dim." }
-  \set decrescendoSpanner = #'dashed-line
+  \set decrescendoSpanner = #'text
 }
 
 enddim =  {
@@ -51,21 +51,43 @@ endcresc =  {
 
 setTextCresc = {
     \set crescendoText = \markup { \italic "cresc." }
-    \set crescendoSpanner = #'dashed-line
+    \set crescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
+
 setTextDecresc = {
-    \set crescendoText = \markup { \italic "decr." }
-    \set crescendoSpanner = #'dashed-line
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
+}
+
+setTextDecr = {
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
+
 setTextDim = {
-    \set crescendoText = \markup { \italic "dim." }
-    \set crescendoSpanner = #'dashed-line
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
+
 setHairpinCresc = {
     \unset crescendoText 
     \unset crescendoSpanner 
 }
 
+setHairpinDecresc = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
+
+setHairpinDim = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
+
 
 
 % better name sustainstart/stop? 
@@ -82,26 +104,4 @@ sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
 %decresc = \set crescendoText = "decr."
 %dim = \set crescendoText = "dim."
 
-
-% for regression testing purposes.
-assertBeamQuant =
-#(def-music-function (location l r) (pair? pair?)
-  (let* ((f (check-quant-callbacks l r)))
-   
-   #{
-   \once \override Beam #'position-callbacks = $f
-   #}
-   
-))
-
-% for regression testing purposes.
-assertBeamSlope =
-#(def-music-function (location comp) (procedure?)
-  (let* ((f (check-slope-callbacks comp)))
-   
-   #{
-   \once \override Beam #'position-callbacks = $f
-   #}
-   
-))
-
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))