Skip to content

Fix slur loss when Explode moves a grace-noted note to another staff #34810

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

Open
tharos-devs wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix slur loss when Explode moves a grace-noted note to another staff #34810

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38bd490
Fix slur loss when Explode moves a grace-noted note to another staff
tharos-devs Sep 4, 2026
4d38fed
Don't map skipped full-measure rests in the clone-voice spanner map
tharos-devs Sep 4, 2026
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
53 changes: 30 additions & 23 deletions src/engraving/editing/clonevoice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "../dom/segment.h"
#include "../dom/spanner.h"
#include "../dom/staff.h"
#include "../dom/elementmap.h"
#include "../dom/tiemap.h"
#include "../dom/tremolotwochord.h"
#include "../dom/tupletmap.h"
Expand All @@ -49,6 +50,7 @@ static void doCloneVoice(Score* destScore, track_idx_t srcTrack, track_idx_t dst
Fraction start = sourceSeg->tick();
TieMap tieMap;
TupletMap tupletMap; // tuplets cannot cross measure boundaries
ElementMap crMap; // old ChordRest/grace chord -> its clone, for spanner reconnection
TremoloTwoChord* tremolo = nullptr;

auto maybeLinkedClone = [link](EngravingItem* item) -> EngravingItem* {
Expand Down Expand Up @@ -127,6 +129,10 @@ static void doCloneVoice(Score* destScore, track_idx_t srcTrack, track_idx_t dst
}
}

// Only map ChordRests that actually survive into the destination score - a skipped full-measure
// rest above must never be found as a spanner endpoint, since it is never added anywhere.
crMap.add(ocr, ncr);

auto cloneChord = [&](Chord* oldChord, Chord* newChord) {
size_t n = oldChord->notes().size();
for (size_t i = 0; i < n; ++i) {
Expand Down Expand Up @@ -205,6 +211,7 @@ static void doCloneVoice(Score* destScore, track_idx_t srcTrack, track_idx_t dst
Chord* ogc = toChord(ocr)->graceNotes().at(i);
Chord* ngc = toChord(ncr)->graceNotes().at(i);
cloneChord(ogc, ngc);
crMap.add(ogc, ngc);
}
}

Expand Down Expand Up @@ -285,32 +292,32 @@ static void doCloneVoice(Score* destScore, track_idx_t srcTrack, track_idx_t dst
ChordRest* cr1 = sp->startCR();
ChordRest* cr2 = sp->endCR();

ns->setStartElement(0);
ns->setEndElement(0);
if (cr1 && cr1->links()) {
for (EngravingObject* e : *cr1->links()) {
ChordRest* cr = toChordRest(e);
if (cr == cr1) {
continue;
}
if ((cr->score() == destScore) && (cr->tick() == ns->tick()) && cr->track() == dstTrack) {
ns->setStartElement(cr);
break;
}
// Prefer the direct old-CR -> new-CR mapping built while cloning above: it also covers
// grace chords, which share their parent's tick and so can't be told apart by tick/track
// alone (the fallback below, kept for cross-staff endpoints not cloned here, cannot resolve them).
auto findNewCR = [&](ChordRest* cr, const Fraction& tick) -> ChordRest* {
if (!cr) {
return nullptr;
}
}
if (cr2 && cr2->links()) {
for (EngravingObject* e : *cr2->links()) {
ChordRest* cr = toChordRest(e);
if (cr == cr2) {
continue;
}
if ((cr->score() == destScore) && (cr->tick() == ns->tick2()) && cr->track() == dstTrack) {
ns->setEndElement(cr);
break;
if (EngravingItem* mapped = crMap.findNew(cr)) {
return toChordRest(mapped);
}
if (cr->links()) {
for (EngravingObject* e : *cr->links()) {
ChordRest* linkedCr = toChordRest(e);
if (linkedCr == cr) {
continue;
}
if ((linkedCr->score() == destScore) && (linkedCr->tick() == tick) && linkedCr->track() == dstTrack) {
return linkedCr;
}
}
}
}
return nullptr;
};

ns->setStartElement(findNewCR(cr1, ns->tick()));
ns->setEndElement(findNewCR(cr2, ns->tick2()));
if (link) {
destScore->doUndoAddElement(ns);
} else {
Expand Down
Loading