fix #41036: no beam over gap

chenlung · Dec 10, 2014 · 813d979 · 813d979
1 parent 716a4e0
commit 813d979
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/libmscore/groups.cpp b/libmscore/groups.cpp
@@ -91,6 +91,11 @@ Beam::Mode Groups::endBeam(ChordRest* cr, ChordRest* prev)
                   else
                         val = g.beamMode(tick, TDuration::DurationType::V_64TH);
                   }
+            // if there is a hole between previous and current cr, break beam
+            // exclude tuplets from this check; tick calculations can be unreliable
+            // and they seem to be handled well anyhow
+            if (cr->voice() && prev && !prev->tuplet() && prev->tick() + prev->actualTicks() < cr->tick())
+                  val = Beam::Mode::BEGIN;
             }
 
       return val;

diff --git a/vtest/beams-8-ref.png b/vtest/beams-8-ref.png
diff --git a/vtest/beams-8.mscz b/vtest/beams-8.mscz
diff --git a/vtest/gen b/vtest/gen
@@ -46,7 +46,7 @@ else
        accidental-6 accidental-7 accidental-8 accidental-9\
        tie-1 tie-2 tie-3 grace-1 grace-2 grace-3 grace-4\
        harmony-1 harmony-2 harmony-3 harmony-4 harmony-5 harmony-6 harmony-7 harmony-8 harmony-9 harmony-10\
-       beams-1 beams-2 beams-3 beams-4 beams-5 beams-6 beams-7\
+       beams-1 beams-2 beams-3 beams-4 beams-5 beams-6 beams-7 beams-8\
        user-offset-1 user-offset-2 chord-space-1 chord-space-2 tablature-1 image-1\
        lyrics-1 lyrics-2 lyrics-3 voice-1 slash-1 slash-2"
 fi

diff --git a/vtest/gen.bat b/vtest/gen.bat
@@ -21,7 +21,7 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
  accidental-6,accidental-7,accidental-8,accidental-9, ^
  tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4, ^
  harmony-1,harmony-2,harmony-3,harmony-4,harmony-5,harmony-6,harmony-7,harmony-8,harmony-9,harmony-10, ^
- beams-1,beams-2,beams-3,beams-4,beams-5,beams-6,beams-7, ^
+ beams-1,beams-2,beams-3,beams-4,beams-5,beams-6,beams-7,beams-8, ^
  user-offset-1,user-offset-2,chord-space-1,chord-space-2,tablature-1,image-1, ^
  lyrics-1,lyrics-2,lyrics-3,voice-1,slash-1,slash-2