X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=10af2cfefb8f720f02b034d67d9894b0e08a02b4;hb=16230976a94c3fd47e8ace392975954fee1d2dbc;hp=e914b70326435296f9968343badc6d16fa7f3b78;hpb=19a89e01b2fdab5ff6c9965f294f702f21bbe998;p=lilypond.git diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index e914b70326..10af2cfefb 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -98,23 +98,24 @@ applyContext = 'procedure proc)) -balloonText = -#(define-music-function (parser location offset text) (number-pair? markup?) +balloonGrobText = +#(define-music-function (parser location grob-name offset text) (symbol? number-pair? markup?) (make-music 'AnnotateOutputEvent + 'symbol grob-name 'X-offset (car offset) 'Y-offset (cdr offset) 'text text)) -balloonGrobText = -#(define-music-function (parser location grob-name offset text) (symbol? number-pair? markup?) +balloonText = +#(define-music-function (parser location offset text) (number-pair? markup?) (make-music 'AnnotateOutputEvent - 'symbol grob-name 'X-offset (car offset) 'Y-offset (cdr offset) 'text text)) + bar = #(define-music-function (parser location type) (string?) @@ -136,6 +137,12 @@ barNumberCheck = cbn n)))))) +bendAfter = +#(define-music-function (parser location delta) (real?) + + (make-music 'BendAfterEvent + 'delta-step delta)) + %% why a function? breathe = #(define-music-function (parser location) () @@ -143,11 +150,6 @@ breathe = 'origin location 'elements (list (make-music 'BreathingEvent)))) -bendAfter = -#(define-music-function (parser location delta) (integer?) - - (make-music 'BendAfterEvent - 'delta-step delta)) clef = #(define-music-function (parser location type) @@ -157,12 +159,6 @@ clef = (make-clef-set type)) -compressMusic = -#(define-music-function - (parser location fraction music) (number-pair? ly:music?) - (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction)))) - - cueDuring = #(define-music-function (parser location what dir main-music) @@ -175,9 +171,6 @@ cueDuring = 'quoted-voice-direction dir 'origin location)) -%% The following causes an error with guile 1.6.8 (guile 1.6.7 and 1.8.x are fine) -#(use-modules (scm display-lily)) - displayLilyMusic = #(define-music-function (parser location music) (ly:music?) (newline) @@ -190,6 +183,32 @@ displayMusic = (display-scheme-music music) music) + +endSpanners = +#(define-music-function (parser location music) (ly:music?) + (if (eq? (ly:music-property music 'name) 'EventChord) + (let* + ((elts (ly:music-property music 'elements)) + (start-span-evs (filter (lambda (ev) + (and (music-has-type ev 'span-event) + (equal? (ly:music-property ev 'span-direction) + START))) + elts)) + (stop-span-evs + (map (lambda (m) + (let* ((c (music-clone m))) + (set! (ly:music-property c 'span-direction) STOP) + c)) + start-span-evs)) + (end-ev-chord (make-music 'EventChord + 'elements stop-span-evs)) + (total (make-music 'SequentialMusic + 'elements (list music + end-ev-chord)))) + total) + + (ly:input-message location (_ "argument endSpanners is not an EventChord: ~a" music)))) + featherDurations= #(define-music-function (parser location factor argument) (ly:moment? ly:music?) (_i "Rearrange durations in ARGUMENT so there is an @@ -252,6 +271,27 @@ instrumentSwitch = 'Staff))) +%% Parser used to read page-layout file, and then retreive score tweaks. +#(define page-layout-parser #f) + +includePageLayoutFile = +#(define-music-function (parser location) () + (_i "If page breaks and tweak dump is not asked, and the file +-page-layout.ly exists, include it.") + (if (not (ly:get-option 'dump-tweaks)) + (let ((tweak-filename (format #f "~a-page-layout.ly" + (ly:parser-output-name parser)))) + (if (access? tweak-filename R_OK) + (begin + (ly:message "Including tweak file ~a" tweak-filename) + (set! page-layout-parser (ly:parser-clone parser)) + (ly:parser-parse-string page-layout-parser + (format #f "\\include \"~a\"" + tweak-filename)))))) + (make-music 'SequentialMusic 'void #t)) + + + keepWithTag = #(define-music-function (parser location tag music) (symbol? ly:music?) @@ -264,7 +304,15 @@ keepWithTag = res))) music)) - +removeWithTag = +#(define-music-function + (parser location tag music) (symbol? ly:music?) + (music-filter + (lambda (m) + (let* ((tags (ly:music-property m 'tags)) + (res (memq tag tags))) + (not res))) + music)) killCues = #(define-music-function @@ -275,7 +323,15 @@ killCues = (if (string? (ly:music-property mus 'quoted-music-name)) (ly:music-property mus 'element) mus)) music)) - + +label = +#(define-music-function (parser location label) (symbol?) + (_i "Place a bookmarking label, either at top-level or inside music.") + (make-music 'EventChord + 'page-marker #t + 'page-label label + 'elements (list (make-music 'LabelEvent + 'page-label label)))) makeClusters = #(define-music-function @@ -326,29 +382,83 @@ or @code{\"GrobName\"}") grob-name) (set! (ly:grob-property grob property) value)))))) - -removeWithTag = -#(define-music-function - (parser location tag music) (symbol? ly:music?) - (music-filter - (lambda (m) - (let* ((tags (ly:music-property m 'tags)) - (res (memq tag tags))) - (not res))) - music)) +%% These are music functions (iso music indentifiers), because music identifiers +%% are not allowed at top-level. +pageBreak = +#(define-music-function (location parser) () + (_i "Force a page break. May be used at toplevel (ie between scores or +markups), or inside a score.") + (make-music 'EventChord + 'page-marker #t + 'line-break-permission 'force + 'page-break-permission 'force + 'elements (list (make-music 'LineBreakEvent + 'break-permission 'force) + (make-music 'PageBreakEvent + 'break-permission 'force)))) + +noPageBreak = +#(define-music-function (location parser) () + (_i "Forbid a page break. May be used at toplevel (ie between scores or +markups), or inside a score.") + (make-music 'EventChord + 'page-marker #t + 'page-break-permission 'forbid + 'elements (list (make-music 'PageBreakEvent + 'break-permission '())))) + +pageTurn = +#(define-music-function (location parser) () + (_i "Force a page turn between two scores or top-level markups.") + (make-music 'EventChord + 'page-marker #t + 'line-break-permission 'force + 'page-break-permission 'force + 'page-turn-permission 'force + 'elements (list (make-music 'LineBreakEvent + 'break-permission 'force) + (make-music 'PageBreakEvent + 'break-permission 'force) + (make-music 'PageTurnEvent + 'break-permission 'force)))) + +noPageTurn = +#(define-music-function (location parser) () + (_i "Forbid a page turn. May be used at toplevel (ie between scores or +markups), or inside a score.") + (make-music 'EventChord + 'page-marker #t + 'page-turn-permission 'forbid + 'elements (list (make-music 'PageTurnEvent + 'break-permission '())))) + +allowPageTurn = +#(define-music-function (location parser) () + (_i "Allow a page turn. May be used at toplevel (ie between scores or +markups), or inside a score.") + (make-music 'EventChord + 'page-marker #t + 'page-turn-permission 'allow + 'elements (list (make-music 'PageTurnEvent + 'break-permission 'allow)))) %% Todo: %% doing %% define-music-function in a .scm causes crash. -octave = +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 = #(define-music-function (parser location octave) (number?) + (_i "set the octavation ") + (make-ottava-set octave)) + partcombine = #(define-music-function (parser location part1 part2) (ly:music? ly:music?) (make-part-combine-music parser @@ -365,29 +475,28 @@ pitchedTrill = (lambda (m) (eq? 'NoteEvent (ly:music-property m 'name))) (ly:music-property ev-chord 'elements)))) (sec-note-events (get-notes secondary-note)) - (trill-events (filter (lambda (m) (memq 'trill-span-event (ly:music-property m 'types))) - (ly:music-property main-note 'elements))) - - (trill-pitch - (if (pair? sec-note-events) - (ly:music-property (car sec-note-events) 'pitch) - ))) - - (if (ly:pitch? trill-pitch) - (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: ")) - (display sec-note-events))) + (trill-events (filter (lambda (m) (music-has-type m 'trill-span-event)) + (ly:music-property main-note 'elements)))) + (if (pair? sec-note-events) + (begin + (let* + ((trill-pitch (ly:music-property (car sec-note-events) 'pitch)) + (forced (ly:music-property (car sec-note-events ) 'force-accidental))) + + (if (ly:pitch? trill-pitch) + (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: ")) + (display sec-note-events))) + + (if (eq? forced #t) + (for-each (lambda (m) (ly:music-set-property! m 'force-accidental forced)) + trill-events))))) main-note)) - -parenthesize = -#(define-music-function (parser loc arg) (ly:music?) - (_i "Tag @var{arg} to be parenthesized.") - (set! (ly:music-property arg 'parenthesize) #t) - arg) + %% for lambda* #(use-modules (ice-9 optargs)) @@ -485,6 +594,23 @@ Example: +parenthesize = +#(define-music-function (parser loc arg) (ly:music?) + (_i "Tag @var{arg} to be parenthesized.") + + (if (memq 'event-chord (ly:music-property arg 'types)) + ; arg is an EventChord -> set the parenthesize property on all child notes and rests + (map + (lambda (ev) + (if (or (memq 'note-event (ly:music-property ev 'types)) + (memq 'rest-event (ly:music-property ev 'types))) + (set! (ly:music-property ev 'parenthesize) #t))) + (ly:music-property arg 'elements)) + ; No chord, simply set property for this expression: + (set! (ly:music-property arg 'parenthesize) #t)) + arg) + + quoteDuring = # (define-music-function (parser location what main-music) @@ -515,6 +641,12 @@ resetRelativeOctave = reference-note)) +scaleDurations = +#(define-music-function + (parser location fraction music) (number-pair? ly:music?) + (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction)))) + + shiftDurations = #(define-music-function (parser location dur dots arg) (integer? integer? ly:music?) @@ -535,25 +667,6 @@ the `parameters' assoc list.") (cons 'system-Y-extent (cdr (assoc 'system-Y-extent parameters)))) #}) -%% Parser used to read page-layout file, and then retreive score tweaks. -#(define page-layout-parser #f) - -includePageLayoutFile = -#(define-music-function (parser location) () - (_i "If page breaks and tweak dump is not asked, and the file --page-layout.ly exists, include it.") - (if (not (ly:get-option 'dump-tweaks)) - (let ((tweak-filename (format #f "~a-page-layout.ly" - (ly:parser-output-name parser)))) - (if (access? tweak-filename R_OK) - (begin - (ly:message "Including tweak file ~a" tweak-filename) - (set! page-layout-parser (ly:parser-clone parser)) - (ly:parser-parse-string page-layout-parser - (format #f "\\include \"~a\"" - tweak-filename)))))) - (make-music 'SequentialMusic 'void #t)) - rightHandFinger = #(define-music-function (parser location finger) (number-or-string?) @@ -579,6 +692,20 @@ scoreTweak = (make-music 'SequentialMusic))) (make-music 'SequentialMusic))) + +tag = #(define-music-function (parser location tag arg) + (symbol? ly:music?) + + (_i "Add @var{tag} to the @code{tags} property of @var{arg}.") + + (set! + (ly:music-property arg 'tags) + (cons tag + (ly:music-property arg 'tags))) + arg) + + + transposedCueDuring = #(define-music-function (parser location what dir pitch-note main-music) @@ -621,16 +748,6 @@ tweak = #(define-music-function (parser location sym val arg) (ly:music-property arg 'tweaks))) arg) -tag = #(define-music-function (parser location tag arg) - (symbol? ly:music?) - - (_i "Add @var{tag} to the @code{tags} property of @var{arg}.") - - (set! - (ly:music-property arg 'tags) - (cons tag - (ly:music-property arg 'tags))) - arg) unfoldRepeats = @@ -645,5 +762,3 @@ withMusicProperty = (set! (ly:music-property music sym) val) music) - -