X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=756a55579e377935ab3b7242db358a54eb499576;hb=154642299c33cad6594a3c9f494e3171449954d3;hp=065827ab591bd5ad2ba4478266ae2c9d09174828;hpb=7bd6884c300f1a032b5b9f2e0b9ffa5a7938244a;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 065827ab59..756a55579e 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,19 @@
-\version "2.12.0"
+\version "2.19.29"
+
+"\\=" =
+#(define-event-function (id event) (number-or-string? ly:event?)
+  (_i "This sets the @code{spanner-id} property of the following
+@var{event} to the given @var{id} (numbers will be converted to a
+string).  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)
+	(if (number? id)
+	    (number->string id)
+	    id))
+  event)
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -7,7 +22,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)
@@ -32,28 +51,28 @@ enddecresc =  #(make-span-event 'DecrescendoEvent STOP)
 % Deprecated functions:
 % TODO: DEPRECATED_2_13_19
 deprecatedcresc =  {
-  #(ly:export (make-event-chord (list cr)))
+  $(make-event-chord (list cr))
   \once \set crescendoText = \markup { \italic "cresc." }
   \once \set crescendoSpanner = #'text
 }
 
 
 deprecateddim =  {
-  #(ly:export (make-event-chord (list decr)))
+  $(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 
+  $(make-event-chord (list enddecr))
+%  \unset decrescendoText
+%  \unset decrescendoSpanner
 }
 
 deprecatedendcresc =  {
-  #(ly:export (make-event-chord (list endcr)))
-%  \unset crescendoText 
-%  \unset crescendoSpanner 
+  $(make-event-chord (list endcr))
+%  \unset crescendoText
+%  \unset crescendoSpanner
 }
 
 
@@ -80,13 +99,13 @@ dimTextDim = {
 }
 
 crescHairpin = {
-    \unset crescendoText 
-    \unset crescendoSpanner 
+    \unset crescendoText
+    \unset crescendoSpanner
 }
 
 dimHairpin = {
-    \unset decrescendoText 
-    \unset decrescendoSpanner 
+    \unset decrescendoText
+    \unset decrescendoSpanner
 }
 
 
@@ -104,3 +123,5 @@ sostenutoOff = #(make-span-event 'SostenutoEvent STOP)
 %dim = \set crescendoText = "dim."
 
 newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))
+
+breakDynamicSpan = #(make-music 'BreakDynamicSpanEvent)