-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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
Fix computation of smallness for tuplets #9850
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Aaaaaand the build fails. Seems to not be able to find Qt in the windows build environment |
Root cause seems that it fails to install wget, and therefore it fails to download the dependencies. Probably a temporary issue. |
Yeah, likely. None of the changes I've made should affect any of that so I'll just push an empty amend commit in a little bit and see if it fixes itself edit: looks like it did! |
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets
asattely
force-pushed
the
nested-tuplet-size
branch
from
November 23, 2021 20:23
2a14883
to
660c8ad
Compare
oktophonie
approved these changes
Nov 23, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 23, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 24, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 24, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 24, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 24, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
igorkorsukov
approved these changes
Nov 24, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 26, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 28, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 28, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 30, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Dec 7, 2021
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
May 12, 2022
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 5, 2023
Tuplets will now be small if all containing elements are either 1) small chordrests or 2) tuplets with all small chordrests or tuplets Backport of musescore#9850
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The problem:
The issue was that a tuplet is set to small if all of its elements are small chordrests. More accurately, it is set to regular size if any of its elements are normal-sized chordrests. This fails for tuplets whose elements are only other tuplets, and the containing tuplet remains small.
Since tuplets are laid out from contained to containing, the fix adds an
isSmall
value which is set in the layout function, which layout checks in a way similar to how it checks the smallness of chordrests: