X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fauto-beam.scm;h=6479969eb8deb1c2b39b2387f8da0600df5ceb1f;hb=7426624c24e3a90efb64012b3e9903e9ebea1587;hp=2b622fda6f416ea2e96df77a5c8b218a58727308;hpb=728c1f61013a32153c647a72ca31bc2353754803;p=lilypond.git diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 2b622fda6f..6479969eb8 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,99 +23,131 @@ (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 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 + ;; 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 * * 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 2 4)) ((end 1 16 3 2) . ,(ly:make-moment 3 4)) + ((end 1 16 3 2) . ,(ly:make-moment 4 4)) ((end 1 16 3 2) . ,(ly:make-moment 5 4)) - + ((end 1 32 3 2) . ,(ly:make-moment 1 8)) - ((end 1 32 3 2) . ,(ly:make-moment 1 4)) + ((end 1 32 3 2) . ,(ly:make-moment 2 8)) ((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 4 8)) ((end 1 32 3 2) . ,(ly:make-moment 5 8)) - ((end 1 32 3 2) . ,(ly:make-moment 3 4)) + ((end 1 32 3 2) . ,(ly:make-moment 6 8)) ((end 1 32 3 2) . ,(ly:make-moment 7 8)) + ((end 1 32 3 2) . ,(ly:make-moment 8 8)) ((end 1 32 3 2) . ,(ly:make-moment 9 8)) - ((end 1 32 3 2) . ,(ly:make-moment 5 4)) + ((end 1 32 3 2) . ,(ly:make-moment 10 8)) ((end 1 32 3 2) . ,(ly:make-moment 11 8)) - ((end * * 3 4) . ,(ly:make-moment 3 4)) + ;; in 2 4 time: + ;; use beatLength for all except 32nd notes + ;; end beams with 32nd notes each 1 8 beat + + ((end 1 32 2 4) . ,(ly:make-moment 1 8)) + ((end 1 32 2 4) . ,(ly:make-moment 2 8)) + ((end 1 32 2 4) . ,(ly:make-moment 3 8)) + + ;; in 3 4 time: + ;; override beatLength which would end beams at 1 4 beats + ;; end beams with 16th notes each 1 4 beat + ;; end beams with 32nd notes each 1 8 beat + ((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 16 3 4) . ,(ly:make-moment 2 4)) ((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 2 8)) ((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 4 8)) ((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 + ;; override beatLength which would end beams at 1 4 beats + ;; end all beams at 1 2 beat + ;; end beams with 8th triplets each 1 4 beat + ;; end beams with 16th notes each 1 4 beat + ;; end beams with 32nd notes each 1 8 beat ((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)) - + ((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 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 3 8 time: + ;; override beatLength which would end beams at 1 8 beats + + ((end * * 3 8) . ,(ly:make-moment 3 8)) + + ;; in 4 8 time + ;; override beatLength which would end beams at 1 8 beats + ;; end all beams at 1 4 beat + ;; end beams with 32nd notes each 1 8 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)) + ;; in 6 8, 9 8 and 12 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)) ((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)) + ((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 4 16 time + ;; end all beams each 1 8 beat + + ((end * * 4 16) . ,(ly:make-moment 1 8)) + )) (define (override-property-setting context property setting value) @@ -145,12 +177,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)) @@ -158,13 +190,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: @@ -198,11 +231,11 @@ a fresh copy of the list-head is made." (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))))) + (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) @@ -213,60 +246,60 @@ a fresh copy of the list-head is made." ;; 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 4))) - (measure-length (get 'measureLength (ly:make-moment 1 1))) - (measure-pos (get 'measurePosition ZERO-MOMENT)) + (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))) + (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)) + (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) + (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))) + (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) + (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))) + ;; 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 + ;; 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) + (member measure-pos grouping-moments) (= (ly:moment-main-denominator - (ly:moment-div pos beat-length)) 1)))))))) + (ly:moment-div pos beat-length)) 1))))))))