X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=c8054927b025df5ebfad68bf88f02cef14e63df9;hb=95f39bf3a82cad3b0048846ebf5a911354539e37;hp=2278f85a266387dbedef8a3d3192917b2193d126;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 2278f85a26..c8054927b0 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -38,18 +38,16 @@ acciaccatura = %% keep these two together "instrument-definitions" = #'() addInstrumentDefinition = -#(define-music-function +#(define-scheme-function (parser location name lst) (string? list?) (_i "Create instrument @var{name} with properties @var{list}.") - (set! instrument-definitions (acons name lst instrument-definitions)) - (make-music 'SequentialMusic 'void #t)) + (set! instrument-definitions (acons name lst instrument-definitions))) addQuote = -#(define-music-function (parser location name music) (string? ly:music?) +#(define-scheme-function (parser location name music) (string? ly:music?) (_i "Define @var{music} as a quotable music expression named @var{name}") - (add-quotable parser name music) - (make-music 'SequentialMusic 'void #t)) + (add-quotable parser name music)) %% keep these two together afterGraceFraction = #(cons 6 8) @@ -87,6 +85,19 @@ markups), or inside a score.") 'elements (list (make-music 'PageTurnEvent 'break-permission 'allow)))) +appendToTag = +#(define-music-function (parser location tag more music) + (symbol? ly:music? ly:music?) + (_i "Append @var{more} to the @code{elements} of all music +expressions in @var{music} that are tagged with @var{tag}.") + (music-map (lambda (m) + (if (memq tag (ly:music-property m 'tags)) + (set! (ly:music-property m 'elements) + (append (ly:music-property m 'elements) + (list more)))) + m) + music)) + applyContext = #(define-music-function (parser location proc) (procedure?) (_i "Modify context properties with Scheme procedure @var{proc}.") @@ -172,7 +183,7 @@ barNumberCheck = (lambda (c) (let ((cbn (ly:context-property c 'currentBarNumber))) (if (and (number? cbn) (not (= cbn n))) - (ly:input-message location + (ly:input-warning location "Barcheck failed got ~a expect ~a" cbn n)))))) @@ -183,17 +194,15 @@ bendAfter = 'delta-step delta)) bookOutputName = -#(define-music-function (parser location newfilename) (string?) +#(define-scheme-function (parser location newfilename) (string?) (_i "Direct output for the current book block to @var{newfilename}.") - (set! book-filename newfilename) - (make-music 'SequentialMusic 'void #t)) + (set! book-filename newfilename)) bookOutputSuffix = -#(define-music-function (parser location newsuffix) (string?) +#(define-scheme-function (parser location newsuffix) (string?) (_i "Set the output filename suffix for the current book block to @var{newsuffix}.") - (set! book-output-suffix newsuffix) - (make-music 'SequentialMusic 'void #t)) + (set! book-output-suffix newsuffix)) %% \breathe is defined as a music function rather than an event identifier to %% ensure it gets useful input location information: as an event identifier, @@ -346,6 +355,7 @@ footnoteGrob = (_i "Attach @var{text} to @var{grob-name} at offset @var{offset}, with @var{text} referring to @var{footnote} (use like @code{\\once})") (make-music 'FootnoteEvent + 'automatically-numbered #f 'symbol grob-name 'X-offset (car offset) 'Y-offset (cdr offset) @@ -360,9 +370,14 @@ allowing for the footnote to be automatically numbered such that the number appears at @var{offset}. Note that, for this to take effect, auto-numbering must be turned on in the paper block. Otherwise, no number will appear. Use like @code{\\once})") - #{ - \footnoteGrob $grob-name $offset \markup { \null } $footnote - #}) + (make-music 'FootnoteEvent + 'automatically-numbered #t + 'symbol grob-name + 'X-offset (car offset) + 'Y-offset (cdr offset) + 'text (make-null-markup) + 'footnote-text footnote)) + footnote = #(define-music-function (parser location offset text footnote) @@ -370,14 +385,12 @@ footnote = (_i "Attach @var{text} at @var{offset} with @var{text} referring to @var{footnote} (use like @code{\\tweak})") (make-music 'FootnoteEvent + 'automatically-numbered #f 'X-offset (car offset) 'Y-offset (cdr offset) 'text text 'footnote-text footnote)) -% this function can't be a simple copy and past of the above because -% it needs to be encapsulated in a Sequential Music. -% so, there's a code dup of above :-( autoFootnote = #(define-music-function (parser location offset footnote) (number-pair? markup?) @@ -387,6 +400,7 @@ such that the number appears at @var{offset}. Note that, for this to take effect, auto-numbering must be turned on in the paper block. Otherwise, no number will appear. Use like @code{\\tweak})") (make-music 'FootnoteEvent + 'automatically-numbered #t 'X-offset (car offset) 'Y-offset (cdr offset) 'text (make-null-markup) @@ -397,6 +411,8 @@ grace = (_i "Insert @var{music} as grace notes.")) 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 @@ -411,6 +427,9 @@ harmonicByFret = #(define-music-function (parser location fret music) (number? l #})))) 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 +given through @var{ratio}.") (let ((pitch (ratio->pitch ratio)) (fret (ratio->fret ratio))) (make-sequential-music @@ -433,7 +452,7 @@ instrumentSwitch = (instrument-def (if handle (cdr handle) '()))) (if (not handle) - (ly:input-message location "No such instrument: ~a" name)) + (ly:input-warning location "No such instrument: ~a" name)) (context-spec-music (make-music 'SimultaneousMusic 'elements @@ -482,27 +501,24 @@ label = language = -#(define-music-function (parser location language) (string?) +#(define-scheme-function (parser location language) (string?) (_i "Set note names for language @var{language}.") - (note-names-language parser language) - (make-music 'Music 'void #t)) + (note-names-language parser language)) languageSaveAndChange = -#(define-music-function (parser location language) (string?) +#(define-scheme-function (parser location language) (string?) (_i "Store the previous pitchnames alist, and set a new one.") (set! previous-pitchnames pitchnames) - (note-names-language parser language) - (make-music 'Music 'void #t)) + (note-names-language parser language)) languageRestore = -#(define-music-function (parser location) () +#(define-scheme-function (parser location) () (_i "Restore a previously-saved pitchnames alist.") (if previous-pitchnames (begin (set! pitchnames previous-pitchnames) (ly:parser-set-note-names parser pitchnames)) - (ly:warning (_ "No other language was defined previously. Ignoring."))) - (make-music 'Music 'void #t)) + (ly:input-warning location (_ "No other language was defined previously. Ignoring.")))) makeClusters = @@ -512,7 +528,7 @@ makeClusters = modalInversion = #(define-music-function (parser location around to scale music) - (ly:music? ly:music? ly:music? ly:music?) + (ly:pitch? ly:pitch? ly:music? ly:music?) (_i "Invert @var{music} about @var{around} using @var{scale} and transpose from @var{around} to @var{to}.") (let ((inverter (make-modal-inverter around to scale))) @@ -521,7 +537,7 @@ transpose from @var{around} to @var{to}.") modalTranspose = #(define-music-function (parser location from to scale music) - (ly:music? ly:music? ly:music? ly:music?) + (ly:pitch? ly:pitch? ly:music? ly:music?) (_i "Transpose @var{music} from pitch @var{from} to pitch @var{to} using @var{scale}.") (let ((transposer (make-modal-transposer from to scale))) @@ -530,7 +546,7 @@ using @var{scale}.") inversion = #(define-music-function - (parser location around to music) (ly:music? ly:music? ly:music?) + (parser location around to music) (ly:pitch? ly:pitch? ly:music?) (_i "Invert @var{music} about @var{around} and transpose from @var{around} to @var{to}.") (music-invert around to music)) @@ -565,10 +581,10 @@ markups), or inside a score.") octaveCheck = -#(define-music-function (parser location pitch-note) (ly:music?) +#(define-music-function (parser location pitch) (ly:pitch?) (_i "Octave check.") (make-music 'RelativeOctaveCheck - 'pitch (pitch-of-note pitch-note))) + 'pitch pitch)) ottava = #(define-music-function (parser location octave) (integer?) @@ -650,7 +666,7 @@ pageTurn = 'break-permission 'force)))) parallelMusic = -#(define-music-function (parser location voice-ids music) (list? ly:music?) +#(define-scheme-function (parser location voice-ids music) (list? ly:music?) (_i "Define parallel music sequences, separated by '|' (bar check signs), and assign them to the identifiers provided in @var{voice-ids}. @@ -701,7 +717,7 @@ Example: (and (not (null? origins)) (car origins))))))) ;; ;; first, split the music and fill in voices - (map-in-order (lambda (m) + (for-each (lambda (m) (push-music m) (if (bar-check? m) (change-voice))) (ly:music-property music 'elements)) @@ -725,20 +741,18 @@ Example: (let ((moment-reference (ly:music-length (car seqs)))) (for-each (lambda (seq moment) (if (not (equal? moment moment-reference)) - (ly:music-message seq + (ly:music-warning seq "Bars in parallel music don't have the same length"))) seqs (map-in-order ly:music-length seqs)))) voices) ;; ;; bind voice identifiers to the voices - (map (lambda (voice-id voice) + (for-each (lambda (voice-id voice) (ly:parser-define! parser voice-id (make-music 'SequentialMusic 'origin location 'elements voice))) - voice-ids voices)) - ;; Return an empty sequence. This function is actually a "void" function. - (make-music 'SequentialMusic 'void #t)) + voice-ids voices))) parenthesize = #(define-music-function (parser loc arg) (ly:music?) @@ -747,7 +761,7 @@ parenthesize = (if (memq 'event-chord (ly:music-property arg 'types)) ;; arg is an EventChord -> set the parenthesize property ;; on all child notes and rests - (map + (for-each (lambda (ev) (if (or (memq 'note-event (ly:music-property ev 'types)) (memq 'rest-event (ly:music-property ev 'types))) @@ -784,6 +798,18 @@ partcombineSoloIIOnce = \partcombineForce #'solo2 ##t partcombineAutomatic = \partcombineForce ##f ##f partcombineAutomaticOnce = \partcombineForce ##f ##t +partial = +#(define-music-function (parser location dur) (ly:duration?) + (_i "Make a partial measure.") + + ;; We use `descend-to-context' here instead of `context-spec-music' to + ;; ensure \partial still works if the Timing_translator is moved + (descend-to-context + (context-spec-music (make-music 'PartialSet + 'origin location + 'partial-duration dur) + 'Timing) + 'Score)) pitchedTrill = #(define-music-function @@ -808,7 +834,7 @@ print @var{secondary-note} as a stemless note head in parentheses.") (for-each (lambda (m) (ly:music-set-property! m 'pitch trill-pitch)) trill-events) (begin - (ly:warning (_ "Second argument of \\pitchedTrill should be single note: ")) + (ly:input-warning location (_ "Second argument of \\pitchedTrill should be single note: ")) (display sec-note-events))) (if (eq? forced #t) @@ -817,6 +843,18 @@ print @var{secondary-note} as a stemless note head in parentheses.") trill-events))))) main-note)) +pushToTag = +#(define-music-function (parser location tag more music) + (symbol? ly:music? ly:music?) + (_i "Add @var{more} to the front of @code{elements} of all music +expressions in @var{music} that are tagged with @var{tag}.") + (music-map (lambda (m) + (if (memq tag (ly:music-property m 'tags)) + (set! (ly:music-property m 'elements) + (cons more (ly:music-property m 'elements)))) + m) + music)) + quoteDuring = #(define-music-function (parser location what main-music) (string? ly:music?) (_i "Indicate a section of music to be quoted. @var{what} indicates the name @@ -827,6 +865,14 @@ usually contains spacers or multi-measure rests.") 'element main-music 'quoted-music-name what)) +relative = +#(define-music-function (parser location pitch music) + ((ly:pitch? (ly:make-pitch 0 0 0)) ly:music?) + (_i "Make @var{music} relative to @var{pitch} (default @code{c'}).") + (ly:make-music-relative! music pitch) + (make-music 'RelativeOctaveMusic + 'element music)) + removeWithTag = #(define-music-function (parser location tag music) (symbol? ly:music?) (_i "Remove elements of @var{music} that are tagged with @var{tag}.") @@ -838,18 +884,12 @@ removeWithTag = music)) resetRelativeOctave = -#(define-music-function (parser location reference-note) (ly:music?) +#(define-music-function (parser location pitch) (ly:pitch?) (_i "Set the octave inside a \\relative section.") - (let* ((notes (ly:music-property reference-note 'elements)) - (pitch (ly:music-property (car notes) 'pitch))) - - (set! (ly:music-property reference-note 'elements) '()) - (set! (ly:music-property reference-note 'to-relative-callback) - (lambda (music last-pitch) - pitch)) - - reference-note)) + (make-music 'SequentialMusic + 'to-relative-callback + (lambda (music last-pitch) pitch))) retrograde = #(define-music-function (parser location music) @@ -870,16 +910,11 @@ rightHandFinger = #(define-music-function (parser location finger) (number-or-string?) (_i "Apply @var{finger} as a fingering indication.") - (apply make-music - (append - (list - 'StrokeFingerEvent - 'origin location) - (if (string? finger) - (list 'text finger) - (list 'digit finger))))) - - + (make-music + 'StrokeFingerEvent + 'origin location + (if (string? finger) 'text 'digit) + finger)) scaleDurations = #(define-music-function (parser location fraction music) @@ -891,12 +926,19 @@ scaleDurations = shiftDurations = #(define-music-function (parser location dur dots arg) (integer? integer? ly:music?) - (_i "Scale @var{arg} up by a factor of @var{2^dur*(2-(1/2)^dots)}.") + (_i "Scale @var{arg} up by a factor of 2^@var{dur}*(2-(1/2)^@var{dots}).") (music-map (lambda (x) (shift-one-duration-log x dur dots)) arg)) +skip = +#(define-music-function (parser location dur) (ly:duration?) + (_i "Skip forward by @var{dur}.") + (make-music 'SkipMusic + 'duration dur)) + + slashedGrace = #(def-grace-function startSlashedGraceMusic stopSlashedGraceMusic (_i "Create slashed graces (slashes through stems, but no slur) from @@ -938,13 +980,22 @@ tag = (ly:music-property arg 'tags))) arg) +transpose = +#(define-music-function + (parser location from to music) + (ly:pitch? ly:pitch? ly:music?) + + (_i "Transpose @var{music} from pitch @var{from} to pitch @var{to}.") + (make-music 'TransposedMusic + 'element (ly:music-transpose music (ly:pitch-diff to from)))) + transposedCueDuring = #(define-music-function - (parser location what dir pitch-note main-music) - (string? ly:dir? ly:music? ly:music?) + (parser location what dir pitch main-music) + (string? ly:dir? ly:pitch? ly:music?) (_i "Insert notes from the part @var{what} into a voice called @code{cue}, -using the transposition defined by @var{pitch-note}. This happens +using the transposition defined by @var{pitch}. This happens simultaneously with @var{main-music}, which is usually a rest. The argument @var{dir} determines whether the cue notes should be notated as a first or second voice.") @@ -955,15 +1006,15 @@ as a first or second voice.") 'quoted-context-id "cue" 'quoted-music-name what 'quoted-voice-direction dir - 'quoted-transposition (pitch-of-note pitch-note))) + 'quoted-transposition pitch)) transposition = -#(define-music-function (parser location pitch-note) (ly:music?) +#(define-music-function (parser location pitch) (ly:pitch?) (_i "Set instrument transposition") (context-spec-music (make-property-set 'instrumentTransposition - (ly:pitch-negate (pitch-of-note pitch-note))) + (ly:pitch-negate pitch)) 'Staff)) tweak = @@ -973,7 +1024,7 @@ tweak = (if (equal? (object-property sym 'backend-type?) #f) (begin - (ly:warning (_ "cannot find property type-check for ~a") sym) + (ly:input-warning location (_ "cannot find property type-check for ~a") sym) (ly:warning (_ "doing assignment anyway")))) (set! (ly:music-property arg 'tweaks)