Merge pull request #2796 from CombatCube/119976-dash-melisma-shape

Fix #119976: Inter-staff spacing for lyrics with dashes and melismas
musescore · Aug 24, 2016 · 47bbb9d · 47bbb9d
2 parents 7c5e99a + 2087399
commit 47bbb9d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -3632,7 +3632,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()));
+                                    }
                               }
                         }
                   }