X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=7b26094e497fbbfdf81c6b5fe20cc271644344c0;hb=ac37f67b8b3590f0c92b18f1e4e3fe05ec2d7443;hp=e43cad0cca10bf2847f26a90e4b9c3d36f474f7c;hpb=641486a1a5522a9e66b470d8c762a1f789219573;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index e43cad0cca..7b26094e49 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.12.0"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -21,95 +21,77 @@ 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
+  \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 = #'dashed-line
+  \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 
 }
 
 %%%%%%%%%%%%%%%%
 
-setTextCresc = {
+crescTextCresc = {
     \set crescendoText = \markup { \italic "cresc." }
-    \set crescendoSpanner = #'dashed-line
+    \set crescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
+}
+
+dimTextDecresc = {
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
-setTextDecresc = {
+
+dimTextDecr = {
     \set decrescendoText = \markup { \italic "decr." }
-    \set decrescendoSpanner = #'dashed-line
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
-setTextDim = {
+
+dimTextDim = {
     \set decrescendoText = \markup { \italic "dim." }
-    \set decrescendoSpanner = #'dashed-line
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
-setHairpinCresc = {
+
+crescHairpin = {
     \unset crescendoText 
     \unset crescendoSpanner 
 }
-setHairpinDecresc = {
-    \unset decrescendoText 
-    \unset decrescendoSpanner 
-}
-setHairpinDim = {
+
+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)))