forked from musescore/MuseScore
-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ENG-34: Fix erroneous space created for melismas
Previously, melismas were treated the same as normal Lyrics in terms of horizontal spacing—they would cause a spacer to be added to the ChordRest to which they were attached, causing an unnecessary gap after the first note of a melisma. This commit prevents a melisma from adding a right spacer to their first ChordRest, and rather creates a right spacer on the last ChordRest of a lyric if necessary. In pursuit of this, this commit refactors ChordRest::_melismaEnd(s) from a bool to a std::set<*Lyrics>, giving a ChordRest a way to access the melismatic Lyrics that end on it. This change also solves the problem of said bool being untrustworthy (i.e. erroneously being changged to false when one of multiple melismas was removed). Duplicate pf musescore#8296
- Loading branch information
1 parent
9fd5a90
commit eb9fe3f
Showing
6 changed files
with
741 additions
and
24 deletions.
There are no files selected for viewing
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
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
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
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
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
Oops, something went wrong.