X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=02e6b8647e7b55324dbc7faf4dadd07f7df13912;hb=d58942c56765b8606c636355c2b01d147599eb8a;hp=b627c43a9779161555389e4e458cee24a32c229b;hpb=2f320e9722ec20d6f13ec567d007763cc912c5da;p=lilypond.git diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index b627c43a97..02e6b8647e 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -18,7 +18,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.14.0" +\version "2.15.18" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38,18 +38,16 @@ acciaccatura = %% keep these two together "instrument-definitions" = #'() addInstrumentDefinition = -#(define-music-function +#(define-void-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-void-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}.") @@ -113,23 +124,13 @@ appoggiatura = assertBeamQuant = #(define-music-function (parser location l r) (pair? pair?) (_i "Testing function: check whether the beam quants @var{l} and @var{r} are correct") - (make-grob-property-override 'Beam 'positions - (ly:make-simple-closure - (ly:make-simple-closure - (append - (list chain-grob-member-functions `(,cons 0 0)) - (check-quant-callbacks l r)))))) + (make-grob-property-override 'Beam 'positions (check-quant-callbacks l r))) % for regression testing purposes. assertBeamSlope = #(define-music-function (parser location comp) (procedure?) (_i "Testing function: check whether the slope of the beam is the same as @code{comp}") - (make-grob-property-override 'Beam 'positions - (ly:make-simple-closure - (ly:make-simple-closure - (append - (list chain-grob-member-functions `(,cons 0 0)) - (check-slope-callbacks comp)))))) + (make-grob-property-override 'Beam 'positions (check-slope-callbacks comp))) autochange = #(define-music-function (parser location music) (ly:music?) @@ -172,7 +173,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 +184,15 @@ bendAfter = 'delta-step delta)) bookOutputName = -#(define-music-function (parser location newfilename) (string?) +#(define-void-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-void-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, @@ -228,7 +227,7 @@ as @code{\\compoundMeter #'((3 2 8))} or shorter (ly:moment-main-denominator mlen)))) #{ \once \override Staff.TimeSignature #'stencil = #(lambda (grob) - (grob-interpret-markup grob (format-compound-time $args))) + (grob-interpret-markup grob (format-compound-time args))) \set Timing.timeSignatureFraction = $timesig \set Timing.baseMoment = $beat \set Timing.beatStructure = $beatGrouping @@ -314,7 +313,9 @@ without the need of a specific end spanner.") end-ev-chord)))) total) - (ly:input-message location (_ "argument endSpanners is not an EventChord: ~a" music)))) + (begin + (ly:input-message location (_ "argument endSpanners is not an EventChord: ~a" music)) + music))) @@ -344,36 +345,81 @@ footnoteGrob = #(define-music-function (parser location grob-name offset text footnote) (symbol? number-pair? markup? markup?) (_i "Attach @var{text} to @var{grob-name} at offset @var{offset}, - with @var{text} referring to @var{footnote} (use like @code{\\once})") +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) 'text text 'footnote-text footnote)) +autoFootnoteGrob = +#(define-music-function (parser location grob-name offset footnote) + (symbol? number-pair? markup?) + (_i "Footnote @var{grob-name} with the text in @var{footnote} +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})") + (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) (number-pair? markup? markup?) (_i "Attach @var{text} at @var{offset} with @var{text} referring - to @var{footnote} (use like @code{\\tweak})") +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)) +autoFootnote = +#(define-music-function (parser location offset footnote) + (number-pair? markup?) + (_i "Footnote the item after which this comes with the text in +@var{footnote} 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{\\tweak})") + (make-music 'FootnoteEvent + 'automatically-numbered #t + 'X-offset (car offset) + 'Y-offset (cdr offset) + 'text (make-null-markup) + 'footnote-text footnote)) + grace = #(def-grace-function startGraceMusic stopGraceMusic (_i "Insert @var{music} as grace notes.")) +grobdescriptions = +#(define-scheme-function (parser location descriptions) (list?) + (_i "Create a context modification from @var{descriptions}, a list +in the format of @code{all-grob-descriptions}.") + (ly:make-context-mod + (map (lambda (p) + (list 'assign (car p) (list (cdr p)))) + 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) + \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label fret) #} (make-harmonic (calc-harmonic-pitch pitch music)) @@ -382,12 +428,15 @@ 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 (list #{ - \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label $fret) + \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label fret) #} (make-harmonic (calc-harmonic-pitch pitch music)) @@ -404,7 +453,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 @@ -429,6 +478,23 @@ keepWithTag = res))) music)) +key = +#(define-music-function (parser location tonic pitch-alist) + ((ly:pitch? '()) (list? '())) + (_i "Set key to @var{tonic} and scale @var{pitch-alist}. +If both are null, just generate @code{KeyChangeEvent}.") + (cond ((null? tonic) (make-music 'KeyChangeEvent)) + ((null? pitch-alist) + (ly:parser-error parser (_ "second argument must be pitch list") + location) + (make-music 'SequentialMusic 'void #t)) + (else + (ly:music-transpose + (make-music 'KeyChangeEvent + 'tonic (ly:make-pitch 0 0 0) + 'pitch-alist pitch-alist) + tonic)))) + killCues = #(define-music-function (parser location music) (ly:music?) (_i "Remove cue notes from @var{music}.") @@ -453,27 +519,24 @@ label = language = -#(define-music-function (parser location language) (string?) +#(define-void-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-void-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-void-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 = @@ -483,7 +546,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))) @@ -492,7 +555,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))) @@ -501,11 +564,27 @@ 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)) +mark = +#(define-music-function + (parser location label) ((scheme? '())) + "Make the music for the \\mark command." + (let* ((set (and (integer? label) + (context-spec-music (make-property-set 'rehearsalMark label) + 'Score))) + (ev (make-music 'MarkEvent + 'origin location))) + + (if set + (make-sequential-music (list set ev)) + (begin + (set! (ly:music-property ev 'label) label) + ev)))) + musicMap = #(define-music-function (parser location proc mus) (procedure? ly:music?) (_i "Apply @var{proc} to @var{mus} and all of the music it contains.") @@ -536,10 +615,22 @@ 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)) + +once = +#(define-music-function (parser location music) (ly:music?) + (_i "Set @code{once} to @code{#t} on all layout instruction events in @var{music}.") + (music-map + (lambda (m) + (cond ((music-is-of-type? m 'layout-instruction-event) + (set! (ly:music-property m 'once) #t)) + ((ly:duration? (ly:music-property m 'duration)) + (ly:music-warning m (_ "Cannot apply \\once to timed music")))) + m) + music)) ottava = #(define-music-function (parser location octave) (integer?) @@ -621,7 +712,7 @@ pageTurn = 'break-permission 'force)))) parallelMusic = -#(define-music-function (parser location voice-ids music) (list? ly:music?) +#(define-void-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}. @@ -672,10 +763,16 @@ Example: (and (not (null? origins)) (car origins))))))) ;; ;; first, split the music and fill in voices - (map-in-order (lambda (m) - (push-music m) - (if (bar-check? m) (change-voice))) - (ly:music-property music 'elements)) + ;; We flatten direct layers of SequentialMusic since they are + ;; pretty much impossible to avoid when writing music functions. + (let rec ((music music)) + (for-each (lambda (m) + (if (eq? (ly:music-property m 'name) 'SequentialMusic) + (rec m) + (begin + (push-music m) + (if (bar-check? m) (change-voice))))) + (ly:music-property music 'elements))) (if (not (null? current-sequence)) (change-voice)) ;; un-circularize `voices' and reorder the voices (set! voices (map-in-order (lambda (dummy seqs) @@ -696,20 +793,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?) @@ -718,7 +813,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))) @@ -733,7 +828,21 @@ partcombine = (_i "Take the music in @var{part1} and @var{part2} and typeset so that they share a staff.") (make-part-combine-music parser - (list part1 part2))) + (list part1 part2) #f)) + +partcombineUp = +#(define-music-function (parser location part1 part2) (ly:music? ly:music?) + (_i "Take the music in @var{part1} and @var{part2} and typeset so +that they share a staff with stems directed upward.") + (make-part-combine-music parser + (list part1 part2) UP)) + +partcombineDown = +#(define-music-function (parser location part1 part2) (ly:music? ly:music?) + (_i "Take the music in @var{part1} and @var{part2} and typeset so +that they share a staff with stems directed downward.") + (make-part-combine-music parser + (list part1 part2) DOWN)) partcombineForce = #(define-music-function (location parser type once) (symbol-or-boolean? boolean?) @@ -755,6 +864,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 @@ -779,7 +900,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) @@ -788,6 +909,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 @@ -798,6 +931,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}.") @@ -809,18 +950,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) @@ -841,33 +976,79 @@ 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) - (number-pair? ly:music?) + (fraction? ly:music?) (_i "Multiply the duration of events in @var{music} by @var{fraction}.") (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction)))) +settingsFrom = +#(define-scheme-function (parser location ctx music) + ((symbol?) ly:music?) + (_i "Take the layout instruction events from @var{music}, optionally +restricted to those applying to context type @var{ctx}, and return +a context modification duplicating their effect.") + (let ((mods (ly:make-context-mod))) + (define (musicop m) + (if (music-is-of-type? m 'layout-instruction-event) + (ly:add-context-mod + mods + (case (ly:music-property m 'name) + ((PropertySet) + (list 'assign + (ly:music-property m 'symbol) + (ly:music-property m 'value))) + ((PropertyUnset) + (list 'unset + (ly:music-property m 'symbol))) + ((OverrideProperty) + (list 'push + (ly:music-property m 'symbol) + (ly:music-property m 'grob-property-path) + (ly:music-property m 'grob-value))) + ((RevertProperty) + (list '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))) + ((ContextSpeccedMusic) + (if (or (not ctx) + (eq? ctx (ly:music-property m 'context-type))) + (musicop (ly:music-property m 'element))))))) + (musicop music) + mods)) + 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 "Change the duration of @var{arg} by adding @var{dur} to the +@code{durlog} of @var{arg} and @var{dots} to the @code{dots} of @var{arg}.") (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 +the following music expression")) + spacingTweaks = #(define-music-function (parser location parameters) (list?) (_i "Set the system stretch, by reading the 'system-stretch property of @@ -875,7 +1056,7 @@ the `parameters' assoc list.") #{ \overrideProperty #"Score.NonMusicalPaperColumn" #'line-break-system-details - #$(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters))) + #(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters))) (cons 'system-Y-extent (cdr (assoc 'system-Y-extent parameters)))) #}) @@ -904,13 +1085,41 @@ tag = (ly:music-property arg 'tags))) arg) +time = +#(define-music-function (parser location beat-structure fraction) + ((number-list? '()) fraction?) + (_i "Set @var{fraction} as time signature, with optional +number list @var{beat-structure} before it.") + (make-music 'TimeSignatureMusic + 'numerator (car fraction) + 'denominator (cdr fraction) + 'beat-structure beat-structure)) + +times = +#(define-music-function (parser location fraction music) + (fraction? ly:music?) + (_i "Scale @var{music} in time by @var{fraction}.") + (make-music 'TimeScaledMusic + 'element (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction))) + 'numerator (car fraction) + 'denominator (cdr fraction))) + +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.") @@ -921,15 +1130,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 = @@ -939,7 +1148,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) @@ -956,7 +1165,11 @@ unfoldRepeats = as @code{\\repeat unfold}.") (unfold-repeats music)) - +void = +#(define-void-function (parser location arg) (scheme?) + (_i "Accept a scheme argument, return a void expression. +Use this if you want to have a scheme expression evaluated +because of its side-effects, but its value ignored.")) withMusicProperty = #(define-music-function (parser location sym val music)