X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=531369085548a5d43b19329fd7893e7b16a3d501;hb=c26c0e17719c5c0bc00c79f7c5ca5b644c196b60;hp=464a54689ce99a5daf8b267d3c3d11cb646045a5;hpb=402045837e7134cdf90d1fcf31768c62227a4936;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 464a54689c..5313690855 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.15.18"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -9,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 {
-  #(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)
+
+
+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 =  {
+  $(make-event-chord (list cr))
+  \once \set crescendoText = \markup { \italic "cresc." }
+  \once \set crescendoSpanner = #'text
+}
+
+
+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 
+}
+
+deprecatedendcresc =  {
+  $(make-event-chord (list endcr))
+%  \unset crescendoText 
+%  \unset crescendoSpanner 
 }
 
-% ah, this is handy: maybe drop resetting of properties in
-% dynamic-engraver ?
-endcresc = \notes {
-  #(ly:export (make-event-chord (list rc)))
-  \unset crescendoText 
-  \unset crescendoSpanner 
+
+%%%%%%%%%%%%%%%%
+
+crescTextCresc = {
+    \set crescendoText = \markup { \italic "cresc." }
+    \set crescendoSpanner = #'text
 }
 
-dim = \notes {
-  #(ly:export (make-event-chord (list decr)))
+dimTextDecresc = {
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+}
 
-  \set decrescendoText =  \markup { \italic "dim." }
-  \set decrescendoSpanner =  #'dashed-line
+dimTextDecr = {
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'text
 }
 
-enddim = \notes {
-  #(ly:export (make-event-chord (list rced)))
-   \unset decrescendoText 
- \unset decrescendoSpanner 
+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 = \set crescendoText =  "cresc. poco a poco"
-%decresc = \set crescendoText =  "decr."
-%dim = \set crescendoText =  "dim."
+breakDynamicSpan = #(make-music 'BreakDynamicSpanEvent)