Skip to content
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

Jump to bottom

[MU3 Backend] ENG-34: Fix erroneous space created for melismas #8176

Merged
merged 1 commit into from
Jul 5, 2021
Merged

[MU3 Backend] ENG-34: Fix erroneous space created for melismas #8176

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 2 additions & 12 deletions libmscore/chordrest.cpp
View file
Open in desktop
Expand Up @@ -1243,19 +1243,9 @@ bool ChordRest::isMelismaEnd() const
// No-op and return false if Lyrics not present in _melismaEnds.
//---------------------------------------------------------

bool ChordRest::removeMelismaEnd(const Lyrics* l)
void ChordRest::removeMelismaEnd(Lyrics* const l)
{
bool found = false;
for (std::set<Lyrics*>::iterator it = _melismaEnds.begin(); it != _melismaEnds.end(); ) {
if (*it == l) {
it = _melismaEnds.erase(it); // Returns next iterator
found = true;
}
else {
++it;
}
}
return found;
_melismaEnds.erase(l);
}

//---------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion libmscore/chordrest.h
View file
Open in desktop
Expand Up @@ -140,7 +140,7 @@ class ChordRest : public DurationElement {
int lastVerse(Placement) const;
const std::set<Lyrics*>& melismaEnds() const { return _melismaEnds; }
std::set<Lyrics*>& melismaEnds() { return _melismaEnds; }
bool removeMelismaEnd(const Lyrics* l);
void removeMelismaEnd(Lyrics* const l);
bool isMelismaEnd() const;

virtual void add(Element*);
Expand Down