cbn n))))))
bendAfter =
-#(define-music-function (parser location delta) (real?)
+#(define-event-function (parser location delta) (real?)
(_i "Create a fall or doit of pitch interval @var{delta}.")
(make-music 'BendAfterEvent
'delta-step delta))
argument))
footnote =
-#(define-music-function (parser location text offset grob-name footnote)
+#(define-event-function (parser location text offset grob-name footnote)
((markup?) number-pair? (symbol? '()) markup?)
(_i "Attach @var{text} at @var{offset} with @var{text} referring to
@var{footnote}. If @var{text} is given as @code{\\default}, use
descriptions)))
harmonicByFret = #(define-music-function (parser location fret music) (number? ly:music?)
- (_i "Convert @var{music} into harmonics; the resulting notes resemble
-harmonics played on a fretted instrument by touching the strings above @var{fret}.")
- (let* ((fret (number->string fret))
- (pitch (fret->pitch fret)))
- (make-sequential-music
- (list
- #{
- \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label fret)
- #}
- (make-harmonic
- (calc-harmonic-pitch pitch music))
- #{
- \revert TabNoteHead #'stencil
- #}))))
+ (_i "Convert @var{music} into mixed harmonics; the resulting notes resemble
+harmonics played on a fretted instrument by touching the strings at @var{fret}.")
+ #{
+ \set harmonicDots = ##t
+ \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label (number->string fret))
+ \override NoteHead #'Y-extent = #(ly:make-unpure-pure-container ly:grob::stencil-height
+ (lambda (grob start end)
+ (ly:grob::stencil-height grob)))
+ \override NoteHead #'stencil = #(lambda (grob) (ly:grob-set-property! grob 'style 'harmonic-mixed)
+ (ly:note-head::print grob))
+ $(make-harmonic
+ (calc-harmonic-pitch (fret->pitch (number->string fret)) music))
+ \unset harmonicDots
+ \revert TabNoteHead #'stencil
+ \revert NoteHead #'Y-extent
+ \revert NoteHead #'stencil
+ #})
harmonicByRatio = #(define-music-function (parser location ratio music) (number? ly:music?)
- (_i "Convert @var{music} into harmonics; the resulting notes resemble
-harmonics played on a fretted instrument by touching the strings above the point
+ (_i "Convert @var{music} into mixed harmonics; the resulting notes resemble
+harmonics played on a fretted instrument by touching the strings at the point
given through @var{ratio}.")
- (let ((pitch (ratio->pitch ratio))
- (fret (ratio->fret ratio)))
- (make-sequential-music
- (list
- #{
- \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label fret)
- #}
- (make-harmonic
- (calc-harmonic-pitch pitch music))
- #{
- \revert TabNoteHead #'stencil
- #}))))
+ #{
+ \set harmonicDots = ##t
+ \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label (ratio->fret ratio))
+ \override NoteHead #'Y-extent = #(ly:make-unpure-pure-container ly:grob::stencil-height
+ (lambda (grob start end)
+ (ly:grob::stencil-height grob)))
+ \override NoteHead #'stencil = #(lambda (grob) (ly:grob-set-property! grob 'style 'harmonic-mixed)
+ (ly:note-head::print grob))
+ $(make-harmonic
+ (calc-harmonic-pitch (ratio->pitch ratio) music))
+ \unset harmonicDots
+ \revert TabNoteHead #'stencil
+ \revert NoteHead #'Y-extent
+ \revert NoteHead #'stencil
+ #})
instrumentSwitch =
#(define-music-function
(revert-time-signature-setting time-signature))
rightHandFinger =
-#(define-music-function (parser location finger) (number-or-string?)
+#(define-event-function (parser location finger) (number-or-string?)
(_i "Apply @var{finger} as a fingering indication.")
(make-music
(list 'unset
(ly:music-property m 'symbol)))
((OverrideProperty)
- (list 'push
- (ly:music-property m 'symbol)
- (ly:music-property m 'grob-value)
- (ly:music-property m 'grob-property-path)))
+ (cons* 'push
+ (ly:music-property m 'symbol)
+ (ly:music-property m 'grob-value)
+ (ly:music-property m 'grob-property-path)))
((RevertProperty)
- (list 'pop
- (ly:music-property m 'symbol)
- (ly:music-property m 'grob-property-path)))))
+ (cons* 'pop
+ (ly:music-property m 'symbol)
+ (ly:music-property m 'grob-property-path)))))
(case (ly:music-property m 'name)
- ((SequentialMusic SimultaneousMusic)
- (for-each musicop (ly:music-property m 'elements)))
+ ((ApplyContext)
+ (ly:add-context-mod mods
+ (list 'apply
+ (ly:music-property m 'procedure))))
((ContextSpeccedMusic)
(if (or (not ctx)
(eq? ctx (ly:music-property m 'context-type)))
- (musicop (ly:music-property m 'element)))))))
+ (musicop (ly:music-property m 'element))))
+ (else
+ (let ((callback (ly:music-property m 'elements-callback)))
+ (if (procedure? callback)
+ (for-each musicop (callback m))))))))
(musicop music)
mods))