Skip to content

Commit

Permalink
Fix #119976: Inter-staff spacing for lyrics with dashes and melismas
Browse files Browse the repository at this point in the history
Spanner shapes need to be corrected from system to measure space, but
not lyrics line spanners.
  • Loading branch information
CombatCube committed Aug 24, 2016
1 parent e044f26 commit 2087399
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion libmscore/layout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3555,7 +3555,12 @@ System* Score::collectSystem(LayoutContext& lc)
Spanner* sp = ss->spanner();
if (sp->tick() < m->endTick() && sp->tick2() > m->tick()) {
// spanner shape must be translated from system coordinate space to measure coordinate space
m->staffShape(sp->staffIdx()).add(ss->shape().translated(ss->pos() - m->pos()));
if (ss->type() == Element::Type::LYRICSLINE_SEGMENT) {
m->staffShape(sp->staffIdx()).add(ss->shape().translated(-m->pos()));
}
else {
m->staffShape(sp->staffIdx()).add(ss->shape().translated(ss->pos() - m->pos()));
}
}
}
}
Expand Down

0 comments on commit 2087399

Please sign in to comment.