-\version "1.7.18"
-
-startCluster = #(make-span-event 'ClusterEvent START)
-stopCluster = #(make-span-event 'ClusterEvent STOP)
+\version "2.11.52"
startGroup = #(make-span-event 'NoteGroupingEvent START)
stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
enddecr = #(make-span-event 'DecrescendoEvent STOP)
endcr = #(make-span-event 'CrescendoEvent STOP)
-%% TODO: remove for 2.0
-rc = \endcr
-rced = \enddecr
startTextSpan = #(make-span-event 'TextSpanEvent START)
stopTextSpan = #(make-span-event 'TextSpanEvent STOP)
-cresc = \notes {
+
+startTrillSpan = #(make-span-event 'TrillSpanEvent START)
+stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
+
+
+% STOP: junkme!
+cresc = {
#(ly:export (make-event-chord (list cr)))
- \property Voice.crescendoText = \markup { \italic "cresc." }
- \property Voice.crescendoSpanner = #'dashed-line
+ \once \set crescendoText = \markup { \italic "cresc." }
+ \once \set crescendoSpanner = #'text
}
-% ah, this is handy: maybe drop resetting of properties in
-% dynamic-engraver ?
-endcresc = \notes {
- #(ly:export (make-event-chord (list rc)))
- \property Voice.crescendoText \unset
- \property Voice.crescendoSpanner \unset
-}
-dim = \notes {
+dim = {
#(ly:export (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
+}
+
+endcresc = {
+ #(ly:export (make-event-chord (list endcr)))
+% \unset crescendoText
+% \unset crescendoSpanner
+}
+
+%%%%%%%%%%%%%%%%
- \property Voice.decrescendoText = \markup { \italic "dim." }
- \property Voice.decrescendoSpanner = #'dashed-line
+crescTextCresc = {
+ \set crescendoText = \markup { \italic "cresc." }
+ \set crescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
}
-enddim = \notes {
- #(ly:export (make-event-chord (list rced)))
- \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+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
+}
-cresc = \spanevent \start "crescendo"
-endcresc = \spanevent \stop "crescendo"
+dimTextDim = {
+ \set decrescendoText = \markup { \italic "dim." }
+ \set decrescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
+}
-%}
+crescHairpin = {
+ \unset crescendoText
+ \unset crescendoSpanner
+}
+
+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."
-%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)))