X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=9aec0756e2746359c4b8676b4a12c707dc9494a0;hb=1f0eb66148be1af3c0abfd080421cea27af3248b;hp=78d81ad99965a99c722b1debe8914739dcebfcb7;hpb=a0a40c02de757661518577105dbb644a6ecdbc4d;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 78d81ad999..9aec0756e2 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,53 +1,82 @@
-\version "1.7.3"
+\version "2.10.0"
 
-startCluster = #(make-span-event 'ClusterEvent START)
-stopCluster = #(make-span-event 'ClusterEvent STOP)
-
-groupOpen = #(make-span-event 'NoteGroupingEvent START)
-groupClose = #(make-span-event 'NoteGroupingEvent STOP)
+startGroup = #(make-span-event 'NoteGroupingEvent START)
+stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
 
 
 cr = #(make-span-event 'CrescendoEvent START)
-rc = #(make-span-event 'CrescendoEvent STOP)
 decr = #(make-span-event 'DecrescendoEvent START)
-rced = #(make-span-event 'DecrescendoEvent STOP)
+enddecr = #(make-span-event 'DecrescendoEvent STOP)
+endcr = #(make-span-event 'CrescendoEvent STOP) 
+
 
 startTextSpan = #(make-span-event 'TextSpanEvent START)
 stopTextSpan = #(make-span-event 'TextSpanEvent STOP)
 
-cresc = \notes {
+
+startTrillSpan = #(make-span-event 'TrillSpanEvent START)
+stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
+
+
+% STOP: junkme!
+cresc =  {
   #(ly:export (make-event-chord (list cr)))
-  \property Voice.crescendoText = #'((font-shape . italic) "cresc.")
-  \property Voice.crescendoSpanner = #'dashed-line
+  \set crescendoText = \markup { \italic "cresc." }
+  \set crescendoSpanner = #'dashed-line
+}
+
+
+dim =  {
+  #(ly:export (make-event-chord (list decr)))
+
+  \set decrescendoText = \markup { \italic "dim." }
+  \set decrescendoSpanner = #'dashed-line
+}
+
+enddim =  {
+  #(ly:export (make-event-chord (list enddecr)))
+  \unset decrescendoText 
+  \unset decrescendoSpanner 
 }
 
 % ah, this is handy: maybe drop resetting of properties in
 % dynamic-engraver ?
-endcresc = \notes {
-  #(ly:export (make-event-chord (list rc)))
-  \property Voice.crescendoText \unset
-  \property Voice.crescendoSpanner \unset
+endcresc =  {
+  #(ly:export (make-event-chord (list endcr)))
+  \unset crescendoText 
+  \unset crescendoSpanner 
 }
 
-dim = \notes {
-  #(ly:export (make-event-chord (list decr)))
+%%%%%%%%%%%%%%%%
 
-  \property Voice.decrescendoText = #"dim."
-  \property Voice.decrescendoSpanner = #'dashed-line
+setTextCresc = {
+    \set crescendoText = \markup { \italic "cresc." }
+    \set crescendoSpanner = #'dashed-line
 }
 
-enddim = \notes {
-  #(ly:export (make-event-chord (list rced)))
-   \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+setTextDecresc = {
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'dashed-line
 }
 
-%{
+setTextDim = {
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'dashed-line
+}
+setHairpinCresc = {
+    \unset crescendoText 
+    \unset crescendoSpanner 
+}
+setHairpinDecresc = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
+setHairpinDim = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
 
-cresc = \spanevent \start "crescendo"
-endcresc = \spanevent \stop "crescendo"
 
-%}
 
 % better name sustainstart/stop? 
 sustainUp = #(make-span-event 'SustainEvent STOP)
@@ -59,6 +88,8 @@ treCorde = #(make-span-event 'UnaCordaEvent STOP)
 sostenutoDown = #(make-span-event 'SostenutoEvent START)
 sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
 
-%crescpoco = \property Voice.crescendoText = "cresc. poco a poco"
-%decresc = \property Voice.crescendoText = "decr."
-%dim = \property Voice.crescendoText = "dim."
+%crescpoco = \set crescendoText = "cresc. poco a poco"
+%decresc = \set crescendoText = "decr."
+%dim = \set crescendoText = "dim."
+
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))