]> git.donarmstrong.com Git - lilypond.git/commitdiff
Fix 1524 -- Add beamExceptions to 3/4 special check
authorCarl Sorensen <c_sorensen@byu.edu>
Mon, 21 Feb 2011 00:46:43 +0000 (17:46 -0700)
committerCarl Sorensen <c_sorensen@byu.edu>
Mon, 21 Feb 2011 00:51:22 +0000 (17:51 -0700)
scm/auto-beam.scm

index 83feb9663a19900be8b3a6ec7bd5d0780797c5c1..82b5917d1c2730bc8b88d9adaa2621806e45e7f0 100644 (file)
              (exception-moments (ending-moments
                                   exception-grouping 0 grouping-moment)))
 
-        (if (= dir START)
+       (if (= dir START)
             ;; Start rules
             (or (not (equal? time-signature-fraction '(3 . 4))) ;; start anywhere if not 3/4
                 (= (ly:moment-main-numerator pos) 0) ;; start at beginning of measure
+               (not (null? exception-grouping)) ;; don't use special rules if exception
                (beat-end? pos beat-endings)  ;; are we at start of beat?
-                (and (not (equal? test-beam base-moment)) ;; is beat split?
+               (and (not (equal? test-beam base-moment)) ;; is beat split?
                      (not (beat-end? (ly:moment-add pos test-beam)
                                      beat-endings))))  ;; will this note end the beat
             ;; End rules