4.7 ports

src/engraving/compat/engravingcompat.cpp

@@ -29,6 +29,7 @@
 #include "engraving/dom/box.h"
 #include "engraving/dom/chord.h"
 #include "engraving/dom/instrument.h"
+#include "engraving/dom/lyrics.h"
 #include "engraving/dom/masterscore.h"
 #include "engraving/dom/note.h"
 #include "engraving/dom/parenthesis.h"
@@ -295,6 +296,10 @@ void EngravingCompat::doPostLayoutCompatIfNeeded(MasterScore* score)
 
     int mscVersion = score->mscVersion();
 
+    if (mscVersion < 470) {
+        needRelayout |= setLyricLineVisibility(score);
+    }
+
     if (mscVersion < 440) {
         needRelayout |= relayoutUserModifiedCrossStaffBeams(score);
     }
@@ -343,4 +348,26 @@ bool EngravingCompat::relayoutUserModifiedCrossStaffBeams(MasterScore* score)
 
     return found;
 }
+
+bool EngravingCompat::setLyricLineVisibility(MasterScore* masterScore)
+{
+    bool needRelayout = false;
+    for (Score* score : masterScore->scoreList()) {
+        for (Spanner* sp : score->unmanagedSpanners()) {
+            if (!sp->isLyricsLine()) {
+                continue;
+            }
+
+            LyricsLine* ll = toLyricsLine(sp);
+            if (!ll->lyrics() || ll->visible() == ll->lyrics()->visible()) {
+                continue;
+            }
+
+            ll->setVisible(ll->lyrics()->visible());
+            needRelayout = true;
+        }
+    }
+
+    return needRelayout;
+}
 } // namespace mu::engraving::compat

src/engraving/compat/engravingcompat.h

@@ -44,5 +44,6 @@ class EngravingCompat
     static void migrateNoteParens(MasterScore* masterScore);
 
     static bool relayoutUserModifiedCrossStaffBeams(MasterScore* score);
+    static bool setLyricLineVisibility(MasterScore* masterScore);
 };
 } // namespace mu::engraving::compat

src/engraving/dom/lyrics.cpp

@@ -365,15 +365,9 @@ void Lyrics::removeFromScore()
     }
 
     if (!plainText().isEmpty()) {
-        for (auto sp : score()->spannerMap().findOverlapping(tick().ticks(), tick().ticks())) {
-            if (!sp.value->isPartialLyricsLine() || sp.value->track() != track()) {
-                continue;
-            }
-            PartialLyricsLine* partialLine = toPartialLyricsLine(sp.value);
-            if (partialLine->isEndMelisma() || partialLine->verse() != verse() || partialLine->placement() != placement()) {
-                continue;
-            }
-            score()->undoRemoveElement(partialLine);
+        PartialLyricsLine* partialDash = findPrevPartialLyricsLineDash(this);
+        if (partialDash) {
+            score()->undoRemoveElement(partialDash);
         }
     }
 
@@ -471,6 +465,12 @@ bool Lyrics::setProperty(Pid propertyId, const PropertyValue& v)
     case Pid::AVOID_BARLINES:
         m_avoidBarlines = v.toBool();
         break;
+    case Pid::VISIBLE:
+        setVisible(v.toBool());
+        if (separator()) {
+            separator()->setVisible(v.toBool());
+        }
+        break;
     default:
         if (!TextBase::setProperty(propertyId, v)) {
             return false;

src/engraving/dom/utils.cpp

@@ -1757,6 +1757,23 @@ bool isValidBarLineForRepeatSection(const Segment* firstSeg, const Segment* seco
     return segEndsWithBl && adjacentAndSecondShareSegment;
 }
 
+PartialLyricsLine* findPrevPartialLyricsLineDash(Lyrics* lyrics)
+{
+    Score* score = lyrics->score();
+    for (auto sp : score->spannerMap().findOverlapping(lyrics->tick().ticks(), lyrics->tick().ticks())) {
+        if (!sp.value->isPartialLyricsLine() || sp.value->track() != lyrics->track()) {
+            continue;
+        }
+        PartialLyricsLine* partialLine = toPartialLyricsLine(sp.value);
+        if (partialLine->isEndMelisma() || partialLine->verse() != lyrics->verse() || partialLine->placement() != lyrics->placement()) {
+            continue;
+        }
+        return partialLine;
+    }
+
+    return nullptr;
+}
+
 MeasureBeat findBeat(const Score* score, int tick)
 {
     MeasureBeat measureBeat;

src/engraving/dom/utils.h

@@ -36,6 +36,7 @@ class KeySig;
 class Lyrics;
 class Measure;
 class Note;
+class PartialLyricsLine;
 class Rest;
 class Score;
 class Score;
@@ -124,6 +125,8 @@ extern bool segmentsAreAdjacent(const Segment* firstSeg, const Segment* secondSe
 extern bool segmentsAreInDifferentRepeatSegments(const Segment* firstSeg, const Segment* secondSeg);
 extern bool isValidBarLineForRepeatSection(const Segment* firstSeg, const Segment* secondSeg);
 
+extern PartialLyricsLine* findPrevPartialLyricsLineDash(Lyrics* lyrics);
+
 extern bool isElementInFretBox(const EngravingItem* item);
 
 extern std::vector<EngravingItem*> filterTargetElements(const Selection& sel, EngravingItem* dropElement, bool& unique);

src/engraving/editing/textedit.cpp

@@ -32,6 +32,7 @@
 #include "../dom/navigate.h"
 #include "../dom/score.h"
 #include "../dom/symbol.h"
+#include "../dom/utils.h"
 
 #include "log.h"
 
@@ -200,6 +201,16 @@ void TextBase::endEdit(EditData& ed)
             ted->deleteText = true;
         } else {
             score()->undoRemoveElement(this);
+
+            if (isLyrics()) {
+                PartialLyricsLine* partialDash = findPrevPartialLyricsLineDash(toLyrics(this));
+                if (partialDash) {
+                    // TODO: Making this operation undoable only makes sense if the text is restored too which is currently isn't
+                    // Otherwise, we end up with a trailing partial dash with no ending syllable
+                    score()->removeElement(partialDash);
+                }
+            }
+
             commitText();
         }
         ed.element = 0;

src/engraving/rendering/score/lyricslayout.cpp

@@ -491,7 +491,6 @@ void LyricsLayout::createOrRemoveLyricsLine(Lyrics* item, LayoutContext& ctx)
         item->separator()->setTicks(lyricsLineTicks);
         item->separator()->setTrack(item->track());
         item->separator()->setTrack2(item->track());
-        item->separator()->setVisible(item->visible());
         item->separator()->styleChanged();
     } else {
         if (item->separator()) {

src/notation/internal/notationinteraction.cpp

@@ -6992,6 +6992,8 @@ void NotationInteraction::navigateToNextSyllable()
         return;
     }
 
+    PartialLyricsLine* prevPartialLyricsLine = findPrevPartialLyricsLineDash(lyrics);
+
     endEditText();
 
     // look for the lyrics we are moving from; may be the current lyrics or a previous one
@@ -7034,6 +7036,7 @@ void NotationInteraction::navigateToNextSyllable()
 
         if (hasPrecedingRepeat) {
             score()->endCmd();
+            score()->startCmd(TranslatableString("undoableAction", "Add partial lyrics dash"));
             // No from lyrics - create incoming partial dash
             PartialLyricsLine* dash = Factory::createPartialLyricsLine(score()->dummy());
             dash->setIsEndMelisma(false);
@@ -7119,20 +7122,6 @@ void NotationInteraction::navigateToNextSyllable()
         }
     }
 
-    PartialLyricsLine* prevPartialLyricsLine = nullptr;
-
-    for (auto sp : score()->spannerMap().findOverlapping(initialCR->tick().ticks(), initialCR->tick().ticks())) {
-        if (!sp.value->isPartialLyricsLine() || sp.value->track() != track) {
-            continue;
-        }
-        PartialLyricsLine* partialLine = toPartialLyricsLine(sp.value);
-        if (partialLine->isEndMelisma() || partialLine->verse() != lyrics->verse() || partialLine->placement() != lyrics->placement()) {
-            continue;
-        }
-        prevPartialLyricsLine = partialLine;
-        break;
-    }
-
     bool newLyrics = (toLyrics == 0);
     if (!toLyrics || hasPrecedingRepeat) {
         // Don't advance cursor if we are after a repeat, there is no partial dash present and we are inputting a dash
@@ -7190,6 +7179,7 @@ void NotationInteraction::navigateToNextSyllable()
     } else if (prevPartialLyricsLine) {
         const Fraction tickDiff = cr->tick() - prevPartialLyricsLine->tick2();
         prevPartialLyricsLine->undoMoveEnd(tickDiff);
+        score()->undoAddElement(prevPartialLyricsLine);
         prevPartialLyricsLine->triggerLayout();
     }
 

src/notationscene/qml/MuseScore/NotationScene/editpercussionshortcutmodel.cpp

@@ -23,6 +23,8 @@
 #include "editpercussionshortcutmodel.h"
 #include "shortcuts/shortcutstypes.h"
 
+#include "translation.h"
+
 using namespace muse;
 using namespace mu::notation;