MIDI: midiChannelMapping = #'staff mode creates only one Track per staff.

[lilypond.git] / scm / auto-beam.scm

diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm
index c8877ecd7ae1b46b82c1992e8ae7ec7fa968e3ab..82b5917d1c2730bc8b88d9adaa2621806e45e7f0 100644 (file)
--- a/scm/auto-beam.scm
+++ b/scm/auto-beam.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2000--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -105,11 +105,13 @@
              (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 anywher if not 3/4
-                (beat-end? pos beat-endings)  ;; are we at start of beat?
-                (and (not (equal? test-beam base-moment)) ;; is beat split?
+            (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?
                      (not (beat-end? (ly:moment-add pos test-beam)
                                      beat-endings))))  ;; will this note end the beat
             ;; End rules