X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=b3a009860753c54d7ab7549617ab4ba6f32d3ae5;hb=d544bd3103acc8175089ec6aeecd57376f2d201d;hp=4a58f05522f919b1f242735e0965bf8e0adbce65;hpb=7eb9c626943a47141ec2cc5fad7723f69e04bbd2;p=lilypond.git diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 4a58f05522..b3a0098607 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -2,7 +2,7 @@ %%%% This file is part of LilyPond, the GNU music typesetter. %%%% -%%%% Copyright (C) 2003--2010 Han-Wen Nienhuys +%%%% Copyright (C) 2003--2011 Han-Wen Nienhuys %%%% Jan Nieuwenhuizen %%%% %%%% LilyPond is free software: you can redistribute it and/or modify @@ -18,7 +18,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.13.29" +\version "2.14.0" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -91,7 +91,6 @@ applyContext = #(define-music-function (parser location proc) (procedure?) (_i "Modify context properties with Scheme procedure @var{proc}.") (make-music 'ApplyContext - 'origin location 'procedure proc)) applyMusic = @@ -103,7 +102,6 @@ applyOutput = #(define-music-function (parser location ctx proc) (symbol? procedure?) (_i "Apply function @code{proc} to every layout object in context @code{ctx}") (make-music 'ApplyOutputEvent - 'origin location 'procedure proc 'context-type ctx)) @@ -170,12 +168,11 @@ barNumberCheck = #(define-music-function (parser location n) (integer?) (_i "Print a warning if the current bar number is not @var{n}.") (make-music 'ApplyContext - 'origin location 'procedure (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)))))) @@ -207,13 +204,48 @@ breathe = (_i "Insert a breath mark.") (make-music 'BreathingEvent)) - - clef = #(define-music-function (parser location type) (string?) (_i "Set the current clef to @var{type}.") (make-clef-set type)) + +compoundMeter = +#(define-music-function (parser location args) (pair?) + (_i "Create compound time signatures. The argument is a Scheme list of +lists. Each list describes one fraction, with the last entry being the +denominator, while the first entries describe the summands in the +enumerator. If the time signature consists of just one fraction, +the list can be given directly, i.e. not as a list containing a single list. +For example, a time signature of (3+1)/8 + 2/4 would be created as +@code{\\compoundMeter #'((3 1 8) (2 4))}, and a time signature of (3+2)/8 +as @code{\\compoundMeter #'((3 2 8))} or shorter +@code{\\compoundMeter #'(3 2 8)}.") + (let* ((mlen (calculate-compound-measure-length args)) + (beat (calculate-compound-base-beat args)) + (beatGrouping (calculate-compound-beat-grouping args)) + (timesig (cons (ly:moment-main-numerator mlen) + (ly:moment-main-denominator mlen)))) + #{ + \once \override Staff.TimeSignature #'stencil = #(lambda (grob) + (grob-interpret-markup grob (format-compound-time $args))) + \set Timing.timeSignatureFraction = $timesig + \set Timing.baseMoment = $beat + \set Timing.beatStructure = $beatGrouping + \set Timing.beamExceptions = #'() + \set Timing.measureLength = $mlen + #} )) + + +cueClef = +#(define-music-function (parser location type) (string?) + (_i "Set the current cue clef to @var{type}.") + (make-cue-clef-set type)) +cueClefUnset = +#(define-music-function (parser location) () + (_i "Unset the current cue clef.") + (make-cue-clef-unset)) + cueDuring = #(define-music-function (parser location what dir main-music) (string? ly:dir? ly:music?) @@ -224,8 +256,20 @@ in a CueVoice oriented by @var{dir}.") 'quoted-context-type 'Voice 'quoted-context-id "cue" 'quoted-music-name what - 'quoted-voice-direction dir - 'origin location)) + 'quoted-voice-direction dir)) + +cueDuringWithClef = +#(define-music-function + (parser location what dir clef main-music) (string? ly:dir? string? ly:music?) + (_i "Insert contents of quote @var{what} corresponding to @var{main-music}, +in a CueVoice oriented by @var{dir}.") + (make-music 'QuoteMusic + 'element main-music + 'quoted-context-type 'Voice + 'quoted-context-id "cue" + 'quoted-music-name what + 'quoted-music-clef clef + 'quoted-voice-direction dir)) @@ -296,13 +340,94 @@ featherDurations= argument)) +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})") + (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})") + (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.")) - +harmonicByFret = #(define-music-function (parser location fret music) (number? ly:music?) + (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 + #})))) + +harmonicByRatio = #(define-music-function (parser location ratio music) (number? ly:music?) + (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 + #})))) instrumentSwitch = #(define-music-function @@ -313,7 +438,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 @@ -362,19 +487,27 @@ label = language = -#(define-music-function (parser location str) (string?) - (_i "Select note names language.") - (let ((language (assoc-get (string->symbol str) - language-pitch-names - '()))) - (if (pair? language) - (begin - (if (ly:get-option 'verbose) - (ly:message (_ "Using ~a note names...") str)) - (set! pitchnames language) - (ly:parser-set-note-names parser language)) - (ly:warning (_ "Could not find language ~a. Ignoring.") str)) - (make-music 'Music 'void #t))) +#(define-music-function (parser location language) (string?) + (_i "Set note names for language @var{language}.") + (note-names-language parser language) + (make-music 'Music 'void #t)) + +languageSaveAndChange = +#(define-music-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)) + +languageRestore = +#(define-music-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:input-warning location (_ "No other language was defined previously. Ignoring."))) + (make-music 'Music 'void #t)) makeClusters = @@ -382,13 +515,36 @@ makeClusters = (_i "Display chords in @var{arg} as clusters.") (music-map note-to-cluster arg)) +modalInversion = +#(define-music-function (parser location around to scale music) + (ly:music? ly:music? 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))) + (change-pitches music inverter) + music)) + +modalTranspose = +#(define-music-function (parser location from to scale music) + (ly:music? ly:music? 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))) + (change-pitches music transposer) + music)) + +inversion = +#(define-music-function + (parser location around to music) (ly:music? ly:music? ly:music?) + (_i "Invert @var{music} about @var{around} and +transpose from @var{around} to @var{to}.") + (music-invert around to music)) + 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.") (music-map proc mus)) - - %% noPageBreak and noPageTurn are music functions (not music indentifiers), %% because music identifiers are not allowed at top-level. noPageBreak = @@ -417,7 +573,6 @@ octaveCheck = #(define-music-function (parser location pitch-note) (ly:music?) (_i "Octave check.") (make-music 'RelativeOctaveCheck - 'origin location 'pitch (pitch-of-note pitch-note))) ottava = @@ -428,17 +583,17 @@ ottava = overrideTimeSignatureSettings = #(define-music-function - (parser location context time-signature base-moment beat-structure beam-exceptions) - (symbol? pair? pair? cheap-list? cheap-list?) + (parser location time-signature base-moment beat-structure beam-exceptions) + (pair? pair? cheap-list? cheap-list?) - (_i "Override @code{timeSignatureSettings} in @var{context} + (_i "Override @code{timeSignatureSettings} for time signatures of @var{time-signature} to have settings of @var{base-moment}, @var{beat-structure}, and @var{beam-exceptions}.") ;; TODO -- add warning if largest value of grouping is ;; greater than time-signature. (let ((setting (make-setting base-moment beat-structure beam-exceptions))) - (override-time-signature-setting time-signature setting context))) + (override-time-signature-setting time-signature setting))) overrideProperty = #(define-music-function (parser location name property value) @@ -459,7 +614,6 @@ or @code{\"GrobName\"}.") (set! context-name (string->symbol (list-ref name-components 0))))) (make-music 'ApplyOutputEvent - 'origin location 'context-type context-name 'procedure (lambda (grob orig-context context) @@ -576,7 +730,7 @@ 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) @@ -659,7 +813,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) @@ -676,8 +830,7 @@ of the quoted voice, as specified in an @code{\\addQuote} command. usually contains spacers or multi-measure rests.") (make-music 'QuoteMusic 'element main-music - 'quoted-music-name what - 'origin location)) + 'quoted-music-name what)) removeWithTag = #(define-music-function (parser location tag music) (symbol? ly:music?) @@ -703,14 +856,20 @@ resetRelativeOctave = reference-note)) +retrograde = +#(define-music-function (parser location music) + (ly:music?) + (_i "Return @var{music} in reverse order.") + (retrograde-music music)) + revertTimeSignatureSettings = #(define-music-function - (parser location context time-signature) - (symbol? pair?) + (parser location time-signature) + (pair?) - (_i "Revert @code{timeSignatureSettings} in @var{context} + (_i "Revert @code{timeSignatureSettings} for time signatures of @var{time-signature}.") - (revert-time-signature-setting time-signature context)) + (revert-time-signature-setting time-signature)) rightHandFinger = #(define-music-function (parser location finger) (number-or-string?) @@ -737,12 +896,17 @@ 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)) +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 @@ -796,8 +960,7 @@ 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) - 'origin location)) + 'quoted-transposition (pitch-of-note pitch-note))) transposition = #(define-music-function (parser location pitch-note) (ly:music?) @@ -815,7 +978,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)