-\version "1.7.3"
+\version "2.10.0"
-startCluster = #(make-span-event 'ClusterEvent START)
-stopCluster = #(make-span-event 'ClusterEvent STOP)
-
-
-groupOpen = #(make-span-event 'NoteGroupingEvent START)
-groupClose = #(make-span-event 'NoteGroupingEvent STOP)
+startGroup = #(make-span-event 'NoteGroupingEvent START)
+stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
cr = #(make-span-event 'CrescendoEvent START)
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
+ \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 {
- #(ly:export (make-event-chord (list rc)))
- \property Voice.crescendoText \unset
- \property Voice.crescendoSpanner \unset
+endcresc = {
+ #(ly:export (make-event-chord (list endcr)))
+ \unset crescendoText
+ \unset crescendoSpanner
}
-dim = \notes {
- #(ly:export (make-event-chord (list decr)))
+%%%%%%%%%%%%%%%%
+
+setTextCresc = {
+ \set crescendoText = \markup { \italic "cresc." }
+ \set crescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
+}
- \property Voice.decrescendoText = \markup { \italic "dim." }
- \property Voice.decrescendoSpanner = #'dashed-line
+setTextDecresc = {
+ \set decrescendoText = \markup { \italic "decresc." }
+ \set decrescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
}
-enddim = \notes {
- #(ly:export (make-event-chord (list rced)))
- \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+setTextDecr = {
+ \set decrescendoText = \markup { \italic "decr." }
+ \set decrescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
}
-%{
+setTextDim = {
+ \set decrescendoText = \markup { \italic "dim." }
+ \set decrescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dashed-line
+}
+
+setHairpinCresc = {
+ \unset crescendoText
+ \unset crescendoSpanner
+}
+
+setHairpinDecresc = {
+ \unset decrescendoText
+ \unset decrescendoSpanner
+}
+
+setHairpinDim = {
+ \unset decrescendoText
+ \unset decrescendoSpanner
+}
-cresc = \spanevent \start "crescendo"
-endcresc = \spanevent \stop "crescendo"
-%}
% better name sustainstart/stop?
sustainUp = #(make-span-event 'SustainEvent STOP)
sostenutoDown = #(make-span-event 'SostenutoEvent START)
sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
-%crescpoco = \property Voice.crescendoText = "cresc. poco a poco"
-%decresc = \property Voice.crescendoText = "decr."
-%dim = \property Voice.crescendoText = "dim."
+%crescpoco = \set crescendoText = "cresc. poco a poco"
+%decresc = \set crescendoText = "decr."
+%dim = \set crescendoText = "dim."
+
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))