LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #41036: no beam over gap

Browse source
This commit is contained in:
Marc Sabatella 2014-12-10 11:37:58 -07:00
parent 716a4e049a
commit 813d97907c
5 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libmscore/groups.cpp
View file

@ -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;

BIN
vtest/beams-8-ref.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
vtest/beams-8.mscz Normal file
View file

Binary file not shown.

2
vtest/gen
View file

@ -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

2
vtest/gen.bat
View file

@ -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