allow lyric entry to interrupt melisma

musescore · May 17, 2023 · 77fdb95 · 77fdb95
1 parent ed6d488
commit 77fdb95
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/engraving/libmscore/lyrics.cpp b/src/engraving/libmscore/lyrics.cpp
@@ -534,7 +534,7 @@ KerningType Lyrics::doComputeKerningType(const EngravingItem* nextItem) const
 void Lyrics::removeInvalidSegments()
 {
     _removeInvalidSegments = false;
-    if (_separator && isMelisma() && _ticks <= _separator->startCR()->ticks()) {
+    if (_separator && isMelisma() && _ticks < _separator->startCR()->ticks()) {
         setTicks(Fraction(0, 1));
         _separator->setTicks(Fraction(0, 1));
         _separator->removeUnmanaged();

diff --git a/src/engraving/libmscore/textedit.cpp b/src/engraving/libmscore/textedit.cpp
@@ -214,6 +214,26 @@ void TextBase::endEdit(EditData& ed)
     } else {
         triggerLayout();
     }
+    if (isLyrics()) {
+        Lyrics* prev = prevLyrics(toLyrics(this));
+        if (prev) {
+            if (prev->tick() + prev->ticks() >= tick()) {
+                // the previous lyric has a spanner attached that goes through this one
+                // we need to shorten it
+                Segment* s = score()->tick2segment(tick());
+                if (s) {
+                    s = s->prev1(SegmentType::ChordRest);
+                    if (s->tick() > prev->tick()) {
+                        prev->setTicks(s->tick() - prev->tick());
+                    } else {
+                        prev->setTicks(Fraction::fromTicks(1));
+                    }
+                }
+            }
+            prev->setRemoveInvalidSegments();
+            prev->triggerLayout();
+        }
+    }
 
     static const double w = 2.0;
     score()->addRefresh(canvasBoundingRect().adjusted(-w, -w, w, w));