X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=531369085548a5d43b19329fd7893e7b16a3d501;hb=7ee874c5682fead016f10a3f5a0ef7f8841fe7b5;hp=bfccd05cabab3b94fa15da7e7a62dcb8e0f25adb;hpb=75e31df11f879be81a489a4dd9cba837d4d6bebf;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index bfccd05cab..5313690855 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,64 +1,108 @@
-\version "1.5.68"
+\version "2.15.18"
 
+startGroup = #(make-span-event 'NoteGroupingEvent START)
+stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
 
-#(define (make-span-request type spandir)
-  (let* ((m (make-music-by-name  type)))
-  (ly-set-mus-property! m 'span-direction spandir)
-  m
-  ))
 
-groupOpen = #(make-span-request 'NoteGroupingEvent START)
-groupClose = #(make-span-request 'NoteGroupingEvent STOP)
+cr = #(make-span-event 'CrescendoEvent START)
+decr = #(make-span-event 'DecrescendoEvent START)
+enddecr = #(make-span-event 'DecrescendoEvent STOP)
+endcr = #(make-span-event 'CrescendoEvent STOP) 
 
 
-cr = #(make-span-request 'CrescendoEvent START)
-rc = #(make-span-request 'CrescendoEvent STOP)
-decr = #(make-span-request 'DecrescendoEvent START)
-rced = #(make-span-request 'DecrescendoEvent STOP)
+startTextSpan = #(make-span-event 'TextSpanEvent START)
+stopTextSpan = #(make-span-event 'TextSpanEvent STOP)
 
-cresc = \notes {
-  \commandspanrequest \start "crescendo" 
-  \property Voice.crescendoText = #'((font-shape . italic) "cresc.")
-  \property Voice.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 
+}
+
+
+%%%%%%%%%%%%%%%%
+
+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
 }
 
-% ah, this is handy: maybe drop resetting of properties in
-% dynamic-engraver ?
-endcresc = \notes {
-  \commandspanrequest \stop "crescendo" 
-  \property Voice.crescendoText \unset
-  \property Voice.crescendoSpanner \unset
+dimTextDim = {
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'text
 }
 
-dim = \notes {
-  \commandspanrequest \start "decrescendo" 
-  \property Voice.decrescendoText = #"dim."
-  \property Voice.decrescendoSpanner = #'dashed-line
+crescHairpin = {
+    \unset crescendoText 
+    \unset crescendoSpanner 
 }
 
-enddim = \notes {
-  \commandspanrequest \stop "decrescendo" 
-   \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+dimHairpin = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
 }
 
-%{
 
-cresc = \spanrequest \start "crescendo"
-endcresc = \spanrequest \stop "crescendo"
+sustainOff = #(make-span-event 'SustainEvent STOP)
+sustainOn = #(make-span-event 'SustainEvent START)
 
-%}
+unaCorda = #(make-span-event 'UnaCordaEvent START)
+treCorde = #(make-span-event 'UnaCordaEvent STOP)
 
-% better name sustainstart/stop? 
-sustainDown = \spanrequest \start "Sustain"
-sustainUp = \spanrequest \stop "Sustain"
+sostenutoOn = #(make-span-event 'SostenutoEvent START)
+sostenutoOff = #(make-span-event 'SostenutoEvent STOP)
 
-unaCorda = \spanrequest \start "UnaCorda"
-treCorde = \spanrequest \stop "UnaCorda"
+%crescpoco = \set crescendoText = "cresc. poco a poco"
+%decresc = \set crescendoText = "decr."
+%dim = \set crescendoText = "dim."
 
-sostenutoDown = \spanrequest \start "Sostenuto"
-sostenutoUp = \spanrequest \stop "Sostenuto"
+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)