X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=b591344ed588ba5ee93fcebd0f471a71adf72273;hb=7bac3281dca81a2b66f9c5acdf30f37ee4ba3fee;hp=0e5093e8a5b8c899ba5ad5eda25d6d9957742027;hpb=d00ca5c25ad78a6de4ed5098673bb151707f28c1;p=lilypond.git diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 0e5093e8a5..b591344ed5 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -198,13 +198,14 @@ bookOutputSuffix = (set! book-output-suffix newsuffix) (make-music 'SequentialMusic 'void #t)) -%% why a function? +%% \breathe is defined as a music function rather than an event identifier to +%% ensure it gets useful input location information: as an event identifier, +%% it would have to be wrapped in an EventChord to prevent it from being +%% treated as a post_event by the parser breathe = #(define-music-function (parser location) () (_i "Insert a breath mark.") - (make-music 'EventChord - 'origin location - 'elements (list (make-music 'BreathingEvent)))) + (make-music 'BreathingEvent)) @@ -213,6 +214,15 @@ clef = (_i "Set the current clef to @var{type}.") (make-clef-set type)) +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?) @@ -223,8 +233,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)) @@ -301,7 +323,33 @@ 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 @@ -360,6 +408,29 @@ label = 'page-label label)))) +language = +#(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:warning (_ "No other language was defined previously. Ignoring."))) + (make-music 'Music 'void #t)) + makeClusters = #(define-music-function (parser location arg) (ly:music?) @@ -412,17 +483,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) @@ -599,6 +670,27 @@ that they share a staff.") (make-part-combine-music parser (list part1 part2))) +partcombineForce = +#(define-music-function (location parser type once) (symbol-or-boolean? boolean?) + (_i "Override the part-combiner.") + (make-music 'EventChord + 'elements (list (make-music 'PartCombineForceEvent + 'forced-type type + 'once once)))) +partcombineApart = \partcombineForce #'apart ##f +partcombineApartOnce = \partcombineForce #'apart ##t +partcombineChords = \partcombineForce #'chords ##f +partcombineChordsOnce = \partcombineForce #'chords ##t +partcombineUnisono = \partcombineForce #'unisono ##f +partcombineUnisonoOnce = \partcombineForce #'unisono ##t +partcombineSoloI = \partcombineForce #'solo1 ##f +partcombineSoloIOnce = \partcombineForce #'solo1 ##t +partcombineSoloII = \partcombineForce #'solo2 ##f +partcombineSoloIIOnce = \partcombineForce #'solo2 ##t +partcombineAutomatic = \partcombineForce ##f ##f +partcombineAutomaticOnce = \partcombineForce ##f ##t + + pitchedTrill = #(define-music-function (parser location main-note secondary-note) @@ -668,12 +760,12 @@ resetRelativeOctave = 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?)