X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fauto-beam.scm;h=4f23d06198d21564a23de21a6d40d9bdeb655ca1;hb=57f59aac2359f93d8ee3312eb3ae3a389ddf789a;hp=56d1ce7311aaa572caaef09ca2a6035db4d56b87;hpb=8c00ef0a0eb95417f6db5056c0c03b7cfa2e7571;p=lilypond.git diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 56d1ce7311..4f23d06198 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -1,10 +1,10 @@ ;;;; auto-beam.scm -- Auto-beam-engraver settings ;;;; ;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 2000--2007 Jan Nieuwenhuizen +;;;; +;;;; (c) 2000--2009 Jan Nieuwenhuizen -;;; specify generic beam begin and end times +;;; specify generic beam end times ;;; format: ;;; @@ -23,98 +23,189 @@ (define-public default-auto-beam-settings `( + ;; in 2 2 time: + ;; use beatLength for all except 32nd notes + ;; end beams with 32nd notes each 1 4 beat + + ((end 1 32 2 2) . ,(ly:make-moment 1 4)) + ((end 1 32 2 2) . ,(ly:make-moment 2 4)) + ((end 1 32 2 2) . ,(ly:make-moment 3 4)) + + ;; in 2 4, 2 8 and 2 16 time: + ;; use beatLength + ;; in 3 2 time: - ;; end beams each 1 2 note - ;; end beams with 16th notes each 1 4 note - ;; end beams with 32th notes each 1 8 note - - ((end * * 3 2) . ,(ly:make-moment 1 2)) - ((end * * 3 2) . ,(ly:make-moment 2 2)) - - ((end 1 16 3 2) . ,(ly:make-moment 1 4)) - ((end 1 16 3 2) . ,(ly:make-moment 1 2)) - ((end 1 16 3 2) . ,(ly:make-moment 3 4)) - ((end 1 16 3 2) . ,(ly:make-moment 5 4)) - - ((end 1 32 3 2) . ,(ly:make-moment 1 8)) + ;; use beatLength for all except 32nd notes + ;; end beams with 32nd notes each 1 4 beat + ((end 1 32 3 2) . ,(ly:make-moment 1 4)) - ((end 1 32 3 2) . ,(ly:make-moment 3 8)) - ((end 1 32 3 2) . ,(ly:make-moment 1 2)) - ((end 1 32 3 2) . ,(ly:make-moment 5 8)) + ((end 1 32 3 2) . ,(ly:make-moment 2 4)) ((end 1 32 3 2) . ,(ly:make-moment 3 4)) - ((end 1 32 3 2) . ,(ly:make-moment 9 8)) + ((end 1 32 3 2) . ,(ly:make-moment 4 4)) ((end 1 32 3 2) . ,(ly:make-moment 5 4)) - ((end 1 32 3 2) . ,(ly:make-moment 11 8)) - - ((end * * 3 4) . ,(ly:make-moment 3 4)) - - ((end 1 16 3 4) . ,(ly:make-moment 1 4)) - ((end 1 16 3 4) . ,(ly:make-moment 1 2)) - - ((end 1 32 3 4) . ,(ly:make-moment 1 8)) - ((end 1 32 3 4) . ,(ly:make-moment 1 4)) - ((end 1 32 3 4) . ,(ly:make-moment 3 8)) - ((end 1 32 3 4) . ,(ly:make-moment 1 2)) - ((end 1 32 3 4) . ,(ly:make-moment 5 8)) - - ((end * * 3 8) . ,(ly:make-moment 3 8)) - - ;; in common time: - ;; end beams each 1 2 note - ;; end beams with 32th notes each 1 8 note - ;; end beams with 1 8 triplets each 1 4 note - - ((end * * 4 4) . ,(ly:make-moment 1 2)) - ((end 1 12 4 4) . ,(ly:make-moment 1 4)) - ((end 1 12 4 4) . ,(ly:make-moment 3 4)) - - ((end 1 16 4 4) . ,(ly:make-moment 1 4)) - ((end 1 16 4 4) . ,(ly:make-moment 3 4)) - + + ;; in 3 4, 3 8 and 3 16 time: + ;; use beatLength + + ;; in 4 2 time: + ;; use beatLength for all except 16th and 32nd notes + ;; end beams with 16th notes each 1 4 beat + ;; end beams with 32nd notes each 1 8 beat + + ((end 1 16 4 2) . ,(ly:make-moment 1 4)) + ((end 1 16 4 2) . ,(ly:make-moment 2 4)) + ((end 1 16 4 2) . ,(ly:make-moment 3 4)) + ((end 1 16 4 2) . ,(ly:make-moment 4 4)) + ((end 1 16 4 2) . ,(ly:make-moment 5 4)) + ((end 1 16 4 2) . ,(ly:make-moment 6 4)) + ((end 1 16 4 2) . ,(ly:make-moment 7 4)) + + ((end 1 32 4 2) . ,(ly:make-moment 1 8)) + ((end 1 32 4 2) . ,(ly:make-moment 2 8)) + ((end 1 32 4 2) . ,(ly:make-moment 3 8)) + ((end 1 32 4 2) . ,(ly:make-moment 4 8)) + ((end 1 32 4 2) . ,(ly:make-moment 5 8)) + ((end 1 32 4 2) . ,(ly:make-moment 6 8)) + ((end 1 32 4 2) . ,(ly:make-moment 7 8)) + ((end 1 32 4 2) . ,(ly:make-moment 8 8)) + ((end 1 32 4 2) . ,(ly:make-moment 9 8)) + ((end 1 32 4 2) . ,(ly:make-moment 10 8)) + ((end 1 32 4 2) . ,(ly:make-moment 11 8)) + ((end 1 32 4 2) . ,(ly:make-moment 12 8)) + ((end 1 32 4 2) . ,(ly:make-moment 13 8)) + ((end 1 32 4 2) . ,(ly:make-moment 14 8)) + ((end 1 32 4 2) . ,(ly:make-moment 15 8)) + + ;; in 4 4 (common) time: + ;; use beatLength for all except 32nd notes: + ;; end beams with 32nd notes each 1 8 beat + ((end 1 32 4 4) . ,(ly:make-moment 1 8)) - ((end 1 32 4 4) . ,(ly:make-moment 1 4)) + ((end 1 32 4 4) . ,(ly:make-moment 2 8)) ((end 1 32 4 4) . ,(ly:make-moment 3 8)) + ((end 1 32 4 4) . ,(ly:make-moment 4 8)) ((end 1 32 4 4) . ,(ly:make-moment 5 8)) - ((end 1 32 4 4) . ,(ly:make-moment 3 4)) + ((end 1 32 4 4) . ,(ly:make-moment 6 8)) ((end 1 32 4 4) . ,(ly:make-moment 7 8)) - ((end * * 2 4) . #f) ;; switch-off at-any-beat feature - ((end * * 2 4) . ,(ly:make-moment 1 4)) - ((end 1 32 2 4) . ,(ly:make-moment 1 8)) - ((end 1 32 2 4) . ,(ly:make-moment 3 8)) + ;; in 4 8 and 4 16 time: + ;; use beatLength + + ;; in 6 4 time: + ;; use beatGrouping for all except 16th, 32nd notes + ;; end beams with 16th or 32nd notes each 1 4 beat - ((end * * 4 8) . #f) ;; switch-off at-any-beat feature - ((end * * 4 8) . ,(ly:make-moment 1 4)) - ((end 1 32 4 8) . ,(ly:make-moment 1 8)) - ((end 1 32 4 8) . ,(ly:make-moment 3 8)) - ((end * * 4 16) . #f) ;; switch-off at-any-beat feature - ((end * * 4 16) . ,(ly:make-moment 1 8)) + ((end 1 16 6 4) . ,(ly:make-moment 1 4)) + ((end 1 16 6 4) . ,(ly:make-moment 2 4)) + ((end 1 16 6 4) . ,(ly:make-moment 3 4)) + ((end 1 16 6 4) . ,(ly:make-moment 4 4)) + ((end 1 16 6 4) . ,(ly:make-moment 5 4)) + + ((end 1 32 6 4) . ,(ly:make-moment 1 4)) + ((end 1 32 6 4) . ,(ly:make-moment 2 4)) + ((end 1 32 6 4) . ,(ly:make-moment 3 4)) + ((end 1 32 6 4) . ,(ly:make-moment 4 4)) + ((end 1 32 6 4) . ,(ly:make-moment 5 4)) + + ;; in 6 8 time: + ;; use beatGrouping for all except 32nd notes + ;; end beams with 32nd notes each 1 8 beat - ((end * * 6 8) . #f) ;; switch-off at-any-beat feature - ((end * * 6 8) . ,(ly:make-moment 3 8)) ((end 1 32 6 8) . ,(ly:make-moment 1 8)) - ((end 1 32 6 8) . ,(ly:make-moment 1 4)) - ((end 1 32 6 8) . ,(ly:make-moment 1 2)) + ((end 1 32 6 8) . ,(ly:make-moment 2 8)) + ((end 1 32 6 8) . ,(ly:make-moment 3 8)) + ((end 1 32 6 8) . ,(ly:make-moment 4 8)) ((end 1 32 6 8) . ,(ly:make-moment 5 8)) - ((end * * 9 8) . #f) ;; switch-off at-any-beat feature - ((end * * 9 8) . ,(ly:make-moment 3 8)) - ((end * * 9 8) . ,(ly:make-moment 3 4)) + ;; in 6 16 time: + ;; use beatGrouping + + ;; in 9 4 time: + ;; use beatGrouping for all except 16th, 32nd notes + ;; end beams with 16th or 32nd notes each 1 4 beat + + ((end 1 16 9 4) . ,(ly:make-moment 1 4)) + ((end 1 16 9 4) . ,(ly:make-moment 2 4)) + ((end 1 16 9 4) . ,(ly:make-moment 3 4)) + ((end 1 16 9 4) . ,(ly:make-moment 4 4)) + ((end 1 16 9 4) . ,(ly:make-moment 5 4)) + ((end 1 16 9 4) . ,(ly:make-moment 6 4)) + ((end 1 16 9 4) . ,(ly:make-moment 7 4)) + ((end 1 16 9 4) . ,(ly:make-moment 8 4)) + + ((end 1 32 9 4) . ,(ly:make-moment 1 4)) + ((end 1 32 9 4) . ,(ly:make-moment 2 4)) + ((end 1 32 9 4) . ,(ly:make-moment 3 4)) + ((end 1 32 9 4) . ,(ly:make-moment 4 4)) + ((end 1 32 9 4) . ,(ly:make-moment 5 4)) + ((end 1 32 9 4) . ,(ly:make-moment 6 4)) + ((end 1 32 9 4) . ,(ly:make-moment 7 4)) + ((end 1 32 9 4) . ,(ly:make-moment 8 4)) + + ;; in 9 8 time: + ;; use beatGrouping for all except 32nd notes + ;; end beams with 32nd notes each 1 8 beat + ((end 1 32 9 8) . ,(ly:make-moment 1 8)) - ((end 1 32 9 8) . ,(ly:make-moment 1 4)) - ((end 1 32 9 8) . ,(ly:make-moment 1 2)) + ((end 1 32 9 8) . ,(ly:make-moment 2 8)) + ((end 1 32 9 8) . ,(ly:make-moment 3 8)) + ((end 1 32 9 8) . ,(ly:make-moment 4 8)) ((end 1 32 9 8) . ,(ly:make-moment 5 8)) + ((end 1 32 9 8) . ,(ly:make-moment 6 8)) ((end 1 32 9 8) . ,(ly:make-moment 7 8)) - ((end 1 32 9 8) . ,(ly:make-moment 1 1)) - ((end 1 32 9 8) . ,(ly:make-moment 9 8)) - - ((end * * 12 8) . #f) ;; switch-off at-every-beat - ((end * * 12 8) . ,(ly:make-moment 3 8)) - ((end * * 12 8) . ,(ly:make-moment 3 4)) - ((end * * 12 8) . ,(ly:make-moment 9 8)) - ((end * * 12 8) . ,(ly:make-moment 2 1)) + ((end 1 32 9 8) . ,(ly:make-moment 8 8)) + + ;; in 9 16 time + ;; use beatGrouping + + ;; in 12 4 time: + ;; use beatGrouping for all except 16th, 32nd notes + ;; end beams with 16th or 32nd notes each 1 4 beat + + ((end 1 16 12 4) . ,(ly:make-moment 1 4)) + ((end 1 16 12 4) . ,(ly:make-moment 2 4)) + ((end 1 16 12 4) . ,(ly:make-moment 3 4)) + ((end 1 16 12 4) . ,(ly:make-moment 4 4)) + ((end 1 16 12 4) . ,(ly:make-moment 5 4)) + ((end 1 16 12 4) . ,(ly:make-moment 6 4)) + ((end 1 16 12 4) . ,(ly:make-moment 7 4)) + ((end 1 16 12 4) . ,(ly:make-moment 8 4)) + ((end 1 16 12 4) . ,(ly:make-moment 9 4)) + ((end 1 16 12 4) . ,(ly:make-moment 10 4)) + ((end 1 16 12 4) . ,(ly:make-moment 11 4)) + + ((end 1 32 12 4) . ,(ly:make-moment 1 4)) + ((end 1 32 12 4) . ,(ly:make-moment 2 4)) + ((end 1 32 12 4) . ,(ly:make-moment 3 4)) + ((end 1 32 12 4) . ,(ly:make-moment 4 4)) + ((end 1 32 12 4) . ,(ly:make-moment 5 4)) + ((end 1 32 12 4) . ,(ly:make-moment 6 4)) + ((end 1 32 12 4) . ,(ly:make-moment 7 4)) + ((end 1 32 12 4) . ,(ly:make-moment 8 4)) + ((end 1 32 12 4) . ,(ly:make-moment 9 4)) + ((end 1 32 12 4) . ,(ly:make-moment 10 4)) + ((end 1 32 12 4) . ,(ly:make-moment 11 4)) + + ;; in 12 8 time: + ;; use beatGrouping for all except 32nd notes + ;; end beams with 32nd notes each 1 8 beat + ((end 1 32 12 8) . ,(ly:make-moment 1 8)) + ((end 1 32 12 8) . ,(ly:make-moment 2 8)) + ((end 1 32 12 8) . ,(ly:make-moment 3 8)) + ((end 1 32 12 8) . ,(ly:make-moment 4 8)) + ((end 1 32 12 8) . ,(ly:make-moment 5 8)) + ((end 1 32 12 8) . ,(ly:make-moment 6 8)) + ((end 1 32 12 8) . ,(ly:make-moment 7 8)) + ((end 1 32 12 8) . ,(ly:make-moment 8 8)) + ((end 1 32 12 8) . ,(ly:make-moment 9 8)) + ((end 1 32 12 8) . ,(ly:make-moment 10 8)) + ((end 1 32 12 8) . ,(ly:make-moment 11 8)) + + ;; in 12 16 time: + ;; use beatGrouping + )) (define (override-property-setting context property setting value) @@ -144,12 +235,12 @@ a fresh copy of the list-head is made." (ly:export (context-spec-music (make-apply-context (lambda (c) - (override-property-setting - c 'autoBeamSettings - setting (ly:make-moment num den)))) + (override-property-setting + c 'autoBeamSettings + setting (ly:make-moment num den)))) (if (and (pair? rest) (symbol? (car rest))) - (car rest) - 'Voice)))) + (car rest) + 'Voice)))) (define-public (score-override-auto-beam-setting setting num den) (override-auto-beam-setting setting num den 'Score)) @@ -157,13 +248,14 @@ a fresh copy of the list-head is made." (define-public (revert-auto-beam-setting setting num den . rest) (ly:export (context-spec-music - (make-apply-context (lambda (c) - (revert-property-setting - c 'autoBeamSettings - (cons setting (ly:make-moment num den))))) + (make-apply-context + (lambda (c) + (revert-property-setting + c 'autoBeamSettings + (cons setting (ly:make-moment num den))))) (if (and (pair? rest) (symbol? (car rest))) - (car rest) - 'Voice)))) + (car rest) + 'Voice)))) ;; Determine end moment for auto beaming (or begin moment, but mostly ;; 0== anywhere). In order of decreasing priority: @@ -172,7 +264,12 @@ a fresh copy of the list-head is made." ;; 2. end * * * ;; 3. end ;; 4. end * -;; 5. if 1-4 not specified: begin anywhere, end at every beat +;; 5. if 1-4 not specified, begin anywhere, end at time determined by +;; beatGrouping and beatLength: +;; if beatGrouping and beatLength are consistent with measureLength, +;; use beatGrouping to determine end of beams. +;; if beatGrouping and beatLength are inconsistent with measureLength, +;; use beatLength to determine end of beams. ;; ;; Rationale: ;; @@ -185,50 +282,82 @@ a fresh copy of the list-head is made." ;; 4. exceptions for specific time signature ;; 5. easy catch-all rule for non-specified measure types + (define-public (default-auto-beam-check context dir test) (define (get name default) (let ((value (ly:context-property context name))) (if (not (null? value)) value default))) + (define (ending-moments group-list start-beat beat-length) + (if (null? group-list) + '() + (let ((new-start (+ start-beat (car group-list)))) + (cons (ly:moment-mul (ly:make-moment new-start 1) beat-length) + (ending-moments (cdr group-list) new-start beat-length))))) + + (define (make-end-settings time ending-list moment-den) + (if (null? ending-list) + '() + (cons (cons (append '(end * *) time) + (ly:make-moment (car ending-list) moment-den)) + (make-end-settings time (cdr ending-list) moment-den)))) + ;; Don't start auto beams on grace notes (if (and (!= (ly:moment-grace-numerator (ly:context-now context)) 0) - (= dir START)) + (= dir START)) #f - (let* ((beat-length (get 'beatLength (ly:make-moment 1 1))) - (measure-length (get 'measureLength (ly:make-moment 1 1))) - (measure-pos (get 'measurePosition ZERO-MOMENT)) - (settings (get 'autoBeamSettings '())) - (function (list (if (= dir START) 'begin 'end))) - (num-mom (ly:moment-div measure-length beat-length)) - (num (inexact->exact - (round (/ (ly:moment-main-numerator num-mom) - (ly:moment-main-denominator num-mom))))) - (den (ly:moment-main-denominator beat-length)) - (time (list num den)) - (type (list (ly:moment-main-numerator test) - (ly:moment-main-denominator test))) - (pos (if (>= (ly:moment-main-numerator measure-pos) 0) - measure-pos - (ly:moment-add measure-length measure-pos))) - (lst (list - ;; Hmm, should junk user-override feature, - ;; or split this in user-override and config section? - (append function type '(* *)) - (append function '(* * * *)) - (append function type time) - (append function '(* *) time)))) - - (if (or - ;; always begin or end beams at beginning/ending of measure - (= (ly:moment-main-numerator pos) 0) - (first-member (map (lambda (x) (cons x pos)) lst) settings)) - #t - (if (= dir START) - ;; if no entry matches our function + time or type, - ;; start anywhere - (not (first-assoc lst settings)) - ;; if no entry matches our function + time or type, - ;; end at any beat - (and (not (first-assoc lst settings)) - (= (ly:moment-main-denominator - (ly:moment-div pos beat-length)) 1))))))) + (let* ((beat-length (get 'beatLength (ly:make-moment 1 4))) + (measure-length (get 'measureLength (ly:make-moment 1 1))) + (measure-pos (get 'measurePosition ZERO-MOMENT)) + (beat-grouping (get 'beatGrouping '())) + (settings (get 'autoBeamSettings '())) + (function (list (if (= dir START) 'begin 'end))) + ;; Calculate implied time signature based on measureLength + ;; and beatLength for default value in get + (num-mom (ly:moment-div measure-length beat-length)) + (num (inexact->exact + (round (/ (ly:moment-main-numerator num-mom) + (ly:moment-main-denominator num-mom))))) + (den (ly:moment-main-denominator beat-length)) + (time-signature-fraction + (get 'timeSignatureFraction (cons num den))) + (time (list (car time-signature-fraction) + (cdr time-signature-fraction))) + (type (list (ly:moment-main-numerator test) + (ly:moment-main-denominator test))) + (pos (if (>= (ly:moment-main-numerator measure-pos) 0) + measure-pos + (ly:moment-add measure-length measure-pos))) + (grouping-moments (ending-moments beat-grouping 0 beat-length)) + ;; Calculate implied measure length from beatGrouping + ;; and beatLength + (grouping-length (if (null? grouping-moments) + ZERO-MOMENT + (list-ref grouping-moments + (1- (length grouping-moments))))) + (lst (list + ;; Hmm, should junk user-override feature, + ;; or split this in user-override and config section? + (append function type '(* *)) + (append function '(* * * *)) + (append function type time) + (append function '(* *) time))) + (predefined-setting (first-assoc lst settings))) + (if (or + ;; always begin or end beams at beginning/ending of measure + (= (ly:moment-main-numerator pos) 0) + (first-member (map (lambda (x) (cons x pos)) lst) settings)) + #t + (if (= dir START) + ;; if no entry matches our function + time or type, + ;; start anywhere + (not predefined-setting) + ;; if entry matches our function + time or type, check moment + (if predefined-setting + (equal? measure-pos (cdr predefined-setting)) + ;; if measure-length matches grouping-length, use + ;; grouping moments, else use beat-length + (if (equal? measure-length grouping-length) + (member measure-pos grouping-moments) + (= (ly:moment-main-denominator + (ly:moment-div pos beat-length)) 1))))))))