Merge branch 'stable/2.16' into staging

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

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 9c4e53db80f9e65e32b6ee8134ee2f8b9b68ce93..b507d01829a527abe49866bfdf36a77fbd970732 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.2.0"
+\version "2.16.0"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -9,70 +9,100 @@ 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!
-cresc = \notes {
-  #(ly:export (make-event-chord (list cr)))
-  \set crescendoText = \markup { \italic "cresc." }
-  \set crescendoSpanner = #'dashed-line
-}
+startTrillSpan = #(make-span-event 'TrillSpanEvent START)
+stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
+
+
+episemInitium = #(make-span-event 'EpisemaEvent START)
+episemFinis = #(make-span-event 'EpisemaEvent STOP)
 
 
-dim = \notes {
-  #(ly:export (make-event-chord (list decr)))
+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)
 
-  \set decrescendoText = \markup { \italic "dim." }
-  \set decrescendoSpanner = #'dashed-line
+% Deprecated functions:
+% TODO: DEPRECATED_2_13_19
+deprecatedcresc =  {
+  $(make-event-chord (list cr))
+  \once \set crescendoText = \markup { \italic "cresc." }
+  \once \set crescendoSpanner = #'text
 }
 
-enddim = \notes {
-  #(ly:export (make-event-chord (list enddecr)))
-  \unset decrescendoText 
-  \unset decrescendoSpanner 
+
+deprecateddim =  {
+  $(make-event-chord (list decr))
+  \once \set decrescendoText = \markup { \italic "dim." }
+  \once \set decrescendoSpanner = #'text
+}
+
+deprecatedenddim =  {
+  $(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 endcr)))
-  \unset crescendoText 
-  \unset crescendoSpanner 
+deprecatedendcresc =  {
+  $(make-event-chord (list endcr))
+%  \unset crescendoText 
+%  \unset crescendoSpanner 
 }
 
+
 %%%%%%%%%%%%%%%%
 
-setTextCresc = {
+crescTextCresc = {
     \set crescendoText = \markup { \italic "cresc." }
-    \set crescendoSpanner = #'dashed-line
+    \set crescendoSpanner = #'text
 }
-setTextDecresc = {
-    \set crescendoText = \markup { \italic "decr." }
-    \set crescendoSpanner = #'dashed-line
+
+dimTextDecresc = {
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+}
+
+dimTextDecr = {
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'text
 }
-setTextDim = {
-    \set crescendoText = \markup { \italic "dim." }
-    \set crescendoSpanner = #'dashed-line
+
+dimTextDim = {
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'text
 }
-setHairpinCresc = {
+
+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."
+
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))
+
+breakDynamicSpan = #(make-music 'BreakDynamicSpanEvent)