X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=8d8a69444f8815af37d8080a75fdcf6a9a34688c;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=6e5bc48b0e6fcfa1b8e03fb67133c59255100762;hpb=41933f2bb53d0fe28422212e1673fef536b1cead;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 6e5bc48b0e..8d8a69444f 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,16 @@
-\version "2.10.0"
+\version "2.19.29"
+
+"\\=" =
+#(define-event-function (id event) (key? ly:event?)
+  (_i "This sets the @code{spanner-id} property of the following
+@var{event} to the given @var{id} (non-negative integer or symbol).
+This can be used to tell LilyPond how to connect overlapping
+or parallel slurs or phrasing slurs within a single @code{Voice}.
+@lilypond[quote,verbatim]
+\\fixed c' { c\\=1( d\\=2( e\\=1) f\\=2) }
+@end lilypond\n")
+  (set! (ly:music-property event 'spanner-id) id)
+  event)
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -7,7 +19,11 @@ stopGroup = #(make-span-event '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) 
+endcr = #(make-span-event 'CrescendoEvent STOP)
+
+
+startMeasureCount = #(make-span-event 'MeasureCounterEvent START)
+stopMeasureCount = #(make-span-event 'MeasureCounterEvent STOP)
 
 
 startTextSpan = #(make-span-event 'TextSpanEvent START)
@@ -18,90 +34,91 @@ startTrillSpan = #(make-span-event 'TrillSpanEvent START)
 stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
 
 
-% STOP: junkme!
-cresc =  {
-  #(ly:export (make-event-chord (list cr)))
-  \set crescendoText = \markup { \italic "cresc." }
-  \set crescendoSpanner = #'text
-}
+episemInitium = #(make-span-event 'EpisemaEvent START)
+episemFinis = #(make-span-event 'EpisemaEvent STOP)
 
 
-dim =  {
-  #(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)
+
+% Deprecated functions:
+% TODO: DEPRECATED_2_13_19
+deprecatedcresc =  {
+  $(make-event-chord (list cr))
+  \once \set crescendoText = \markup { \italic "cresc." }
+  \once \set crescendoSpanner = #'text
+}
+
 
-  \set decrescendoText = \markup { \italic "dim." }
-  \set decrescendoSpanner = #'text
+deprecateddim =  {
+  $(make-event-chord (list decr))
+  \once \set decrescendoText = \markup { \italic "dim." }
+  \once \set decrescendoSpanner = #'text
 }
 
-enddim =  {
-  #(ly:export (make-event-chord (list enddecr)))
-  \unset decrescendoText 
-  \unset decrescendoSpanner 
+deprecatedenddim =  {
+  $(make-event-chord (list enddecr))
+%  \unset decrescendoText
+%  \unset decrescendoSpanner
 }
 
-% ah, this is handy: maybe drop resetting of properties in
-% dynamic-engraver ?
-endcresc =  {
-  #(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 = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
-setTextDecresc = {
+dimTextDecresc = {
     \set decrescendoText = \markup { \italic "decresc." }
     \set decrescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
-setTextDecr = {
+dimTextDecr = {
     \set decrescendoText = \markup { \italic "decr." }
     \set decrescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
-setTextDim = {
+dimTextDim = {
     \set decrescendoText = \markup { \italic "dim." }
     \set decrescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
-}
-
-setHairpinCresc = {
-    \unset crescendoText 
-    \unset crescendoSpanner 
 }
 
-setHairpinDecresc = {
-    \unset decrescendoText 
-    \unset decrescendoSpanner 
+crescHairpin = {
+    \unset crescendoText
+    \unset crescendoSpanner
 }
 
-setHairpinDim = {
-    \unset decrescendoText 
-    \unset decrescendoSpanner 
+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)