-\version "1.7.3"
+\version "2.15.18"
-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)
-rc = #(make-span-event 'CrescendoEvent STOP)
decr = #(make-span-event 'DecrescendoEvent START)
-rced = #(make-span-event 'DecrescendoEvent STOP)
+enddecr = #(make-span-event 'DecrescendoEvent STOP)
+endcr = #(make-span-event 'CrescendoEvent STOP)
+
startTextSpan = #(make-span-event 'TextSpanEvent START)
stopTextSpan = #(make-span-event 'TextSpanEvent STOP)
-cresc = \notes {
- #(ly:export (make-event-chord (list cr)))
- \property Voice.crescendoText = \markup { \italic "cresc." }
- \property Voice.crescendoSpanner = #'dashed-line
+
+startTrillSpan = #(make-span-event 'TrillSpanEvent START)
+stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
+
+
+episemInitium = #(make-span-event 'EpisemaEvent START)
+episemFinis = #(make-span-event 'EpisemaEvent STOP)
+
+
+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
}
-% 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
+
+deprecateddim = {
+ $(make-event-chord (list decr))
+ \once \set decrescendoText = \markup { \italic "dim." }
+ \once \set decrescendoSpanner = #'text
}
-dim = \notes {
- #(ly:export (make-event-chord (list decr)))
+deprecatedenddim = {
+ $(make-event-chord (list enddecr))
+% \unset decrescendoText
+% \unset decrescendoSpanner
+}
- \property Voice.decrescendoText = \markup { \italic "dim." }
- \property Voice.decrescendoSpanner = #'dashed-line
+deprecatedendcresc = {
+ $(make-event-chord (list endcr))
+% \unset crescendoText
+% \unset crescendoSpanner
}
-enddim = \notes {
- #(ly:export (make-event-chord (list rced)))
- \property Voice.decrescendoText \unset
- \property Voice.decrescendoSpanner \unset
+
+%%%%%%%%%%%%%%%%
+
+crescTextCresc = {
+ \set crescendoText = \markup { \italic "cresc." }
+ \set crescendoSpanner = #'text
}
-%{
+dimTextDecresc = {
+ \set decrescendoText = \markup { \italic "decresc." }
+ \set decrescendoSpanner = #'text
+}
-cresc = \spanevent \start "crescendo"
-endcresc = \spanevent \stop "crescendo"
+dimTextDecr = {
+ \set decrescendoText = \markup { \italic "decr." }
+ \set decrescendoSpanner = #'text
+}
-%}
+dimTextDim = {
+ \set decrescendoText = \markup { \italic "dim." }
+ \set decrescendoSpanner = #'text
+}
-% better name sustainstart/stop?
-sustainUp = #(make-span-event 'SustainEvent STOP)
-sustainDown = #(make-span-event 'SustainEvent START)
+crescHairpin = {
+ \unset crescendoText
+ \unset crescendoSpanner
+}
+
+dimHairpin = {
+ \unset decrescendoText
+ \unset decrescendoSpanner
+}
+
+
+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."
+
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))
-%crescpoco = \property Voice.crescendoText = "cresc. poco a poco"
-%decresc = \property Voice.crescendoText = "decr."
-%dim = \property Voice.crescendoText = "dim."
+breakDynamicSpan = #(make-music 'BreakDynamicSpanEvent)