X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=6ebb6fbdbecf7d29c14a63d75fe4b3df46be1a78;hb=4e1c6143411ffed26d21c066a5eb4569ad54e18b;hp=6bbdcf93cc1e4a051c249cd12ee9a10aded2c214;hpb=a39bbb061430d10d408fda2c032891d80d2f136a;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 6bbdcf93cc..6ebb6fbdbe 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,11 +1,7 @@
-\version "1.7.3"
+\version "2.12.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)
@@ -13,57 +9,100 @@ decr = #(make-span-event 'DecrescendoEvent START)
 enddecr = #(make-span-event 'DecrescendoEvent STOP)
 endcr = #(make-span-event 'CrescendoEvent STOP) 
 
-%% TODO: remove for 2.0
-rc = \endcr
-rced = \enddecr
 
 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)
+
+
+episemInitium = #(make-span-event 'EpisemaEvent START)
+episemFinis = #(make-span-event 'EpisemaEvent STOP)
+
+
+cresc = #(make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text "cresc.")
+endcresc =  #(make-span-event 'CrescendoEvent STOP)
+dim = #(make-music 'DecrescendoEvent 'span-direction START 'span-type 'text 'span-text "dim.")
+enddim =  #(make-span-event 'DecrescendoEvent STOP)
+decresc = #(make-music 'DecrescendoEvent 'span-direction START 'span-type 'text 'span-text "decresc.")
+enddecresc =  #(make-span-event 'DecrescendoEvent STOP)
+
+% Deprecated functions:
+% TODO: DEPRECATED_2_13_19
+deprecatedcresc =  {
   #(ly:export (make-event-chord (list cr)))
-  \property Voice.crescendoText = \markup { \italic "cresc." }
-  \property Voice.crescendoSpanner = #'dashed-line
+  \once \set crescendoText = \markup { \italic "cresc." }
+  \once \set crescendoSpanner = #'text
 }
 
-% 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
-}
 
-dim = \notes {
+deprecateddim =  {
   #(ly:export (make-event-chord (list decr)))
+  \once \set decrescendoText = \markup { \italic "dim." }
+  \once \set decrescendoSpanner = #'text
+}
+
+deprecatedenddim =  {
+  #(ly:export (make-event-chord (list enddecr)))
+%  \unset decrescendoText 
+%  \unset decrescendoSpanner 
+}
 
-  \property Voice.decrescendoText = \markup { \italic "dim." }
-  \property Voice.decrescendoSpanner = #'dashed-line
+deprecatedendcresc =  {
+  #(ly:export (make-event-chord (list endcr)))
+%  \unset crescendoText 
+%  \unset crescendoSpanner 
 }
 
-enddim = \notes {
-  #(ly:export (make-event-chord (list rced)))
-   \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+
+%%%%%%%%%%%%%%%%
+
+crescTextCresc = {
+    \set crescendoText = \markup { \italic "cresc." }
+    \set crescendoSpanner = #'text
+}
+
+dimTextDecresc = {
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+}
+
+dimTextDecr = {
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'text
 }
 
-%{
+dimTextDim = {
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'text
+}
+
+crescHairpin = {
+    \unset crescendoText 
+    \unset crescendoSpanner 
+}
 
-cresc = \spanevent \start "crescendo"
-endcresc = \spanevent \stop "crescendo"
+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."
+
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))
 
-%crescpoco = \property Voice.crescendoText = "cresc. poco a poco"
-%decresc = \property Voice.crescendoText = "decr."
-%dim = \property Voice.crescendoText = "dim."
+breakDynamicSpan = #(make-music 'BreakDynamicSpanEvent)