X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=e86ea4ea748e4c5669c4ac80ddc495f25ef99c22;hb=7e57eb7daf165db3cc1ed70c8173f8692818f83b;hp=781cd31df831f8b8eaf7590b34a13d8988937619;hpb=8144751cb757612145b419a3ef53c972c1703747;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 781cd31df8..e86ea4ea74 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.3.8"
+\version "2.11.52"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -9,15 +9,20 @@ 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!
+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
+  \set crescendoSpanner = #'text
 }
 
 
@@ -25,7 +30,7 @@ dim =  {
   #(ly:export (make-event-chord (list decr)))
 
   \set decrescendoText = \markup { \italic "dim." }
-  \set decrescendoSpanner = #'dashed-line
+  \set decrescendoSpanner = #'text
 }
 
 enddim =  {
@@ -44,59 +49,52 @@ endcresc =  {
 
 %%%%%%%%%%%%%%%%
 
-setTextCresc = {
+crescTextCresc = {
     \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
+
+dimTextDecresc = {
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
-setTextDim = {
-    \set crescendoText = \markup { \italic "dim." }
-    \set crescendoSpanner = #'dashed-line
+
+dimTextDecr = {
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
-setHairpinCresc = {
+
+dimTextDim = {
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
+}
+
+crescHairpin = {
     \unset crescendoText 
     \unset crescendoSpanner 
 }
 
+dimHairpin = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
 
 
-% better name sustainstart/stop? 
-sustainUp = #(make-span-event 'SustainEvent STOP)
-sustainDown = #(make-span-event 'SustainEvent START)
+sustainOff = #(make-span-event 'SustainEvent STOP)
+sustainOn = #(make-span-event 'SustainEvent START)
 
 unaCorda = #(make-span-event 'UnaCordaEvent START)
 treCorde = #(make-span-event 'UnaCordaEvent STOP)
 
-sostenutoDown = #(make-span-event 'SostenutoEvent START)
-sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
+sostenutoOn = #(make-span-event 'SostenutoEvent START)
+sostenutoOff = #(make-span-event 'SostenutoEvent STOP)
 
 %crescpoco = \set crescendoText = "cresc. poco a poco"
 %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)))