-\version "1.5.68"
+\version "2.10.0"
+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)
+
+
+% STOP: junkme!
+cresc = {
+ #(ly:export (make-event-chord (list cr)))
+ \set crescendoText = \markup { \italic "cresc." }
+ \set crescendoSpanner = #'text
+}
+
+
+dim = {
+ #(ly:export (make-event-chord (list decr)))
+
+ \set decrescendoText = \markup { \italic "dim." }
+ \set decrescendoSpanner = #'text
+}
+
+enddim = {
+ #(ly:export (make-event-chord (list enddecr)))
+ \unset decrescendoText
+ \unset decrescendoSpanner
}
% 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
+endcresc = {
+ #(ly:export (make-event-chord (list endcr)))
+ \unset crescendoText
+ \unset crescendoSpanner
+}
+
+%%%%%%%%%%%%%%%%
+
+setTextCresc = {
+ \set crescendoText = \markup { \italic "cresc." }
+ \set crescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
+}
+
+setTextDecresc = {
+ \set decrescendoText = \markup { \italic "decresc." }
+ \set decrescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
+}
+
+setTextDecr = {
+ \set decrescendoText = \markup { \italic "decr." }
+ \set decrescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
}
-dim = \notes {
- \commandspanrequest \start "decrescendo"
- \property Voice.decrescendoText = #"dim."
- \property Voice.decrescendoSpanner = #'dashed-line
+setTextDim = {
+ \set decrescendoText = \markup { \italic "dim." }
+ \set decrescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
}
-enddim = \notes {
- \commandspanrequest \stop "decrescendo"
- \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+setHairpinCresc = {
+ \unset crescendoText
+ \unset crescendoSpanner
}
-%{
+setHairpinDecresc = {
+ \unset decrescendoText
+ \unset decrescendoSpanner
+}
+
+setHairpinDim = {
+ \unset decrescendoText
+ \unset decrescendoSpanner
+}
-cresc = \spanrequest \start "crescendo"
-endcresc = \spanrequest \stop "crescendo"
-%}
% better name sustainstart/stop?
-sustainDown = \spanrequest \start "Sustain"
-sustainUp = \spanrequest \stop "Sustain"
+sustainUp = #(make-span-event 'SustainEvent STOP)
+sustainDown = #(make-span-event 'SustainEvent START)
+
+unaCorda = #(make-span-event 'UnaCordaEvent START)
+treCorde = #(make-span-event 'UnaCordaEvent STOP)
-unaCorda = \spanrequest \start "UnaCorda"
-treCorde = \spanrequest \stop "UnaCorda"
+sostenutoDown = #(make-span-event 'SostenutoEvent START)
+sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
-sostenutoDown = \spanrequest \start "Sostenuto"
-sostenutoUp = \spanrequest \stop "Sostenuto"
+%crescpoco = \set crescendoText = "cresc. poco a poco"
+%decresc = \set crescendoText = "decr."
+%dim = \set crescendoText = "dim."
-%crescpoco = \property Voice.crescendoText = "cresc. poco a poco"
-%decresc = \property Voice.crescendoText = "decr."
-%dim = \property Voice.crescendoText = "dim."
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))