Allow entering a melisma in voice 2 while a longer note sustains in voice 1 #20232
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
oktophonie
approved these changes
Nov 28, 2023
mike-spa
reviewed
Nov 29, 2023
src/engraving/dom/spanner.cpp
Outdated
| @@ -992,7 +992,8 @@ Chord* Spanner::endChord() | |||
| ChordRest* Spanner::startCR() | |||
| { | |||
| assert(m_anchor == Anchor::SEGMENT || m_anchor == Anchor::CHORD); | |||
| if (!m_startElement || m_startElement->score() != score()) { | |||
| if (!m_startElement || m_startElement->score() != score() | |||
| || (type() == ElementType::LYRICSLINE && m_startElement->track() != track())) { | |||
There was a problem hiding this comment.
This feels a bit hacky. Ideally, startCR() should be const and only return the start element, never compute it. The correct start element should be computed and set earlier, if possible, as soon as the spanner is created. Maybe we can find the function that creates the lyrics line and set the correct start chord from there? Otherwise, Spanner::computeStartElement could also be a good place to put this.
There was a problem hiding this comment.
Agreed. Spanner::computeStartElement is called a few times during layout, so it should probably go there - any startElement we set will get overwritten by this.
miiizen
force-pushed
the
19962-v2-melisma
branch
from
b1cf6e9
to
ab329a9
Compare
mike-spa
approved these changes
Nov 29, 2023
miiizen
force-pushed
the
19962-v2-melisma
branch
from
ab329a9
to
6e13583
Compare
cbjeukendrup
approved these changes
Dec 1, 2023
Merged
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.
Resolves: #19962
Melismas returned the chord in the first voice found in the segment as their
startCRwhen we really want the chord in the same voice as the melisma.See below for an example of what couldn't be inputted before.
I opted to add an exception to
Spanner::startCR()rather than overriding as I thought that was most appropriate for this single case.