X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=21f6c51fd7a511bf0db3529dbea5ed19edd4d840;hb=840f47a0f0617b3ab69380a0a33d6725741a4bd8;hp=7adb1b7c788ae98db097585eed68c31382007d8e;hpb=f66e6785e42f181199f6cf357434f60baba1e149;p=lilypond.git diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 7adb1b7c78..21f6c51fd7 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -178,7 +178,7 @@ barNumberCheck = 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)) @@ -342,23 +342,46 @@ featherDurations= argument)) footnote = -#(define-music-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 -autonumbering instead. Note that, for this to take effect, -auto-numbering must be turned on in the paper block. Otherwise, no -number will appear. Footnotes are applied like articulations. If a -symbol @var{grob-name} is specified, all grobs of that kind at the -current time step are affected.") - (make-music - 'FootnoteEvent - 'X-offset (car offset) - 'Y-offset (cdr offset) - 'automatically-numbered (not text) - 'text (or text (make-null-markup)) - 'footnote-text footnote - 'symbol grob-name)) +#(define-music-function (parser location mark offset grob-name footnote music) + ((markup?) number-pair? (symbol?) markup? (ly:music?)) + (_i "Make the markup @var{footnote} a footnote on @var{music}. The +footnote is marked with a markup @var{mark} moved by @var{offset} with +respect to the marked music. + +If @var{mark} is not given or specified as @var{\\default}, it is +replaced by an automatically generated sequence number. If a symbol +@var{grob-name} is specified, then grobs of that type will be marked +if they have @var{music} as their ultimate cause; by default all grobs +having @var{music} as their @emph{direct} cause will be marked, +similar to the way @code{\\tweak} works. + +If @var{music} is given as @code{\\default}, a footnote event +affecting @emph{all} grobs matching @var{grob-name} at a given time +step is generated. This may be required for creating footnotes on +time signatures, clefs, and other items not cooperating with +@code{\\tweak}. + +Like with @code{\\tweak}, if you use a footnote on a following +post-event, the @code{\\footnote} command itself needs to be attached +to the preceding note or rest as a post-event with @code{-}.") + (let ((mus (make-music + 'FootnoteEvent + 'X-offset (car offset) + 'Y-offset (cdr offset) + 'automatically-numbered (not mark) + 'text (or mark (make-null-markup)) + 'footnote-text footnote + 'symbol (or grob-name '())))) + (if music + (begin + (set! (ly:music-property music 'tweaks) + (acons (if grob-name + (cons grob-name 'footnote-music) + 'footnote-music) + mus + (ly:music-property music 'tweaks))) + music) + mus))) grace = #(def-grace-function startGraceMusic stopGraceMusic @@ -952,7 +975,7 @@ for time signatures of @var{time-signature}.") (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 @@ -988,21 +1011,27 @@ a context modification duplicating their effect.") (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)) @@ -1113,21 +1142,27 @@ transposition = 'Staff)) tweak = -#(define-music-function (parser location sym val arg) - (symbol? scheme? ly:music?) - (_i "Add @code{sym . val} to the @code{tweaks} property of @var{arg}.") - - (if (equal? (object-property sym 'backend-type?) #f) +#(define-music-function (parser location grob prop value music) + ((string?) symbol? scheme? ly:music?) + (_i "Add a tweak to the following @var{music}. +Layout objects created by @var{music} get their property @var{prop} +set to @var{value}. If @var{grob} is specified, like with +@example +\\tweak Accidental #'color #red cis' +@end example +an indirectly created grob (@samp{Accidental} is caused by +@samp{NoteHead}) can be tweaked; otherwise only directly created grobs +are affected.") + (if (not (object-property prop 'backend-type?)) (begin - (ly:input-warning location (_ "cannot find property type-check for ~a") sym) + (ly:input-warning location (_ "cannot find property type-check for ~a") prop) (ly:warning (_ "doing assignment anyway")))) (set! - (ly:music-property arg 'tweaks) - (acons sym val - (ly:music-property arg 'tweaks))) - arg) - - + (ly:music-property music 'tweaks) + (acons (if grob (cons (string->symbol grob) prop) prop) + value + (ly:music-property music 'tweaks))) + music) unfoldRepeats = #(define-music-function (parser location music) (ly:music?)