Skip to content

Fix regroup rhythms: split 8th note at 16th-note subbeat crossing a quarter beat #33637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
csimmons0 wants to merge 1 commit into from
+9 −8
Closed

Fix regroup rhythms: split 8th note at 16th-note subbeat crossing a quarter beat #33637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/engraving/dom/durationtype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,9 +569,15 @@ void populateRhythmicList(std::vector<TDuration>* dList, const Fraction& l, bool
if (startLevel == endLevel && strongestLevelCrossed == startLevel - 1) {
needToSplit = false;
}
// nor for the next simplest case of level 2 syncopation (allow sixteenth-note, eighth, eighth... to cross unstressed beats)
if (startLevel == endLevel && strongestLevelCrossed == startLevel - 2) {
// but disallow sixteenth-note, quarter, quarter...
// nor for the next simplest case of level 2 syncopation: a note starting and ending at the same
// subbeat level crossing a beat 2 levels stronger (e.g. 32nd position crossing an 8th beat).
// The note must be at least as long as one unit of the crossed beat level to form a valid syncopation
// (e.g. an 8th note or longer at a 32nd-note position crossing an 8th beat is OK; a shorter note is not).
// A note that is too short to form a valid syncopation must be split (e.g. an 8th note at a 16th-note
// position crossing a quarter-note beat must be split into two 16th notes).
if (startLevel == endLevel && strongestLevelCrossed == startLevel - 2
&& l.ticks() >= nominal.subbeatTicks(strongestLevelCrossed)) {
// but disallow a note that is not centered between adjacent subbets of the crossed beat level
int ticksToNext = nominal.ticksToNextSubbeat(rtickStart.ticks(), startLevel - 1);
int ticksPastPrev = nominal.ticksPastSubbeat(rtickStart.ticks(), startLevel - 1);
needToSplit = ticksToNext != ticksPastPrev;
Expand Down
5 changes: 0 additions & 5 deletions src/notationscene/qml/MuseScore/NotationScene/tests/notationviewinputcontroller_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,11 +887,6 @@ TEST_F(NotationViewInputControllerTests, Mouse_Press_On_Range_Context_Menu_New_S
EXPECT_CALL(*m_interaction, setHitElementContext(contextMenuOnMeasureContext))
.WillOnce(Return());

#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
.WillOnce(ReturnRef(contextMenuOnMeasureContext)) // for context menu
#endif
;

//! [GIVEN] No note enter mode, no playing
EXPECT_CALL(m_view, isNoteEnterMode())
.WillRepeatedly(Return(false));
Expand Down
Loading