X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fspanners-init.ly;h=8d8a69444f8815af37d8080a75fdcf6a9a34688c;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=afcfaf445f986d6fcced66c81d4bab8e5057be86;hpb=f5bdd79efc48f52f3b1c86857f747afa3cb33dcf;p=lilypond.git

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index afcfaf445f..8d8a69444f 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,16 @@
-\version "2.12.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)
@@ -22,66 +38,71 @@ episemInitium = #(make-span-event 'EpisemaEvent START)
 episemFinis = #(make-span-event 'EpisemaEvent STOP)
 
 
-% STOP: junkme!
-cresc =  {
-  #(ly:export (make-event-chord (list cr)))
+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
 }
 
 
-dim =  {
-  #(ly:export (make-event-chord (list decr)))
+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
 }
 
-endcresc =  {
-  #(ly:export (make-event-chord (list endcr)))
-%  \unset crescendoText 
-%  \unset crescendoSpanner 
+deprecatedendcresc =  {
+  $(make-event-chord (list endcr))
+%  \unset crescendoText
+%  \unset crescendoSpanner
 }
 
+
 %%%%%%%%%%%%%%%%
 
 crescTextCresc = {
     \set crescendoText = \markup { \italic "cresc." }
     \set crescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
 dimTextDecresc = {
     \set decrescendoText = \markup { \italic "decresc." }
     \set decrescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
 dimTextDecr = {
     \set decrescendoText = \markup { \italic "decr." }
     \set decrescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
 dimTextDim = {
     \set decrescendoText = \markup { \italic "dim." }
     \set decrescendoSpanner = #'text
-    \override DynamicTextSpanner #'style = #'dashed-line
 }
 
 crescHairpin = {
-    \unset crescendoText 
-    \unset crescendoSpanner 
+    \unset crescendoText
+    \unset crescendoSpanner
 }
 
 dimHairpin = {
-    \unset decrescendoText 
-    \unset decrescendoSpanner 
+    \unset decrescendoText
+    \unset decrescendoSpanner
 }
 
 
@@ -99,3 +120,5 @@ sostenutoOff = #(make-span-event 'SostenutoEvent STOP)
 %dim = \set crescendoText = "dim."
 
 newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))
+
+breakDynamicSpan = #(make-music 'BreakDynamicSpanEvent)