Implement partial & repeat ties

src/engraving/api/v1/apitypes.h

@@ -20,8 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef MU_ENGRAVING_APIV1_APITYPES_H
-#define MU_ENGRAVING_APIV1_APITYPES_H
+#pragma once
 
 #include <QObject>
 
@@ -227,6 +226,8 @@ enum class ElementType {
     TIE_SEGMENT           = int(mu::engraving::ElementType::TIE_SEGMENT),
     LAISSEZ_VIB_SEGMENT   = int(mu::engraving::ElementType::LAISSEZ_VIB_SEGMENT),
     LAISSEZ_VIB           = int(mu::engraving::ElementType::LAISSEZ_VIB),
+    PARTIAL_TIE_SEGMENT   = int(mu::engraving::ElementType::PARTIAL_TIE_SEGMENT),
+    PARTIAL_TIE           = int(mu::engraving::ElementType::PARTIAL_TIE),
     BAR_LINE              = int(mu::engraving::ElementType::BAR_LINE),
     STAFF_LINES           = int(mu::engraving::ElementType::STAFF_LINES),
     SYSTEM_DIVIDER        = int(mu::engraving::ElementType::SYSTEM_DIVIDER),
@@ -3599,5 +3600,3 @@ Q_DECLARE_METATYPE(mu::engraving::apiv1::enums::Tid);
 Q_DECLARE_METATYPE(mu::engraving::apiv1::enums::Syllabic);
 Q_DECLARE_METATYPE(mu::engraving::apiv1::enums::Anchor);
 Q_DECLARE_METATYPE(mu::engraving::apiv1::enums::SymId);
-
-#endif // MU_ENGRAVING_APIV1_APITYPES_H

src/engraving/compat/midi/compatmidirender.cpp

@@ -1080,7 +1080,7 @@ std::set<size_t> CompatMidiRender::getNotesIndexesToRender(Chord* chord)
     }
 
     auto noteShouldBeRendered = [](Note* n) {
-        while (n->tieBack() && n != n->tieBack()->startNote()) {
+        while (n->tieBack() && !n->incomingPartialTie() && n != n->tieBack()->startNote()) {
             n = n->tieBack()->startNote();
             if (findFirstTrill(n->chord())) {
                 // The previous tied note probably has events for this note too.

src/engraving/dom/barline.cpp

@@ -103,6 +103,8 @@ static void undoChangeBarLineType(BarLine* bl, BarLineType barType, bool allStav
     // createMMRest will then set for the mmrest directly
     Measure* m2 = m->isMMRest() ? m->mmRestLast() : m;
 
+    BarLineType prevBarType = bl->barLineType();
+
     switch (barType) {
     case BarLineType::END:
     case BarLineType::NORMAL:
@@ -269,6 +271,20 @@ static void undoChangeBarLineType(BarLine* bl, BarLineType barType, bool allStav
     }
     break;
     }
+
+    if ((prevBarType == BarLineType::END_REPEAT || prevBarType == BarLineType::END_START_REPEAT)
+        && !(barType == BarLineType::END_REPEAT || prevBarType == BarLineType::END_START_REPEAT)) {
+        // Remove outgoing partial tie & endpoints
+        m->removePartialTiesOnRepeatChange(true);
+    }
+    if ((prevBarType == BarLineType::START_REPEAT || prevBarType == BarLineType::END_START_REPEAT)
+        && !(barType == BarLineType::START_REPEAT || prevBarType == BarLineType::END_START_REPEAT)) {
+        // Remove incoming partial tie
+        Measure* nextMeasure = m->nextMeasure();
+        if (nextMeasure) {
+            nextMeasure->removePartialTiesOnRepeatChange(false);
+        }
+    }
 }
 
 //---------------------------------------------------------

src/engraving/dom/beam.cpp

@@ -481,15 +481,6 @@ void Beam::startEdit(EditData& ed)
     initBeamEditData(ed);
 }
 
-//---------------------------------------------------------
-//   endEdit
-//---------------------------------------------------------
-
-void Beam::endEdit(EditData& ed)
-{
-    EngravingItem::endEdit(ed);
-}
-
 //---------------------------------------------------------
 //   triggerLayout
 //---------------------------------------------------------

src/engraving/dom/beam.h

@@ -20,8 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef MU_ENGRAVING_BEAM_H
-#define MU_ENGRAVING_BEAM_H
+#pragma once
 
 #include "beambase.h"
 #include "engravingitem.h"
@@ -64,7 +63,6 @@ class Beam final : public BeamBase
 
     bool isEditable() const override { return true; }
     void startEdit(EditData&) override;
-    void endEdit(EditData&) override;
     void editDrag(EditData&) override;
 
     Fraction tick() const override;
@@ -226,4 +224,3 @@ class Beam final : public BeamBase
     std::vector<TremAnchor> m_tremAnchors;
 };
 } // namespace mu::engraving
-#endif

src/engraving/dom/chord.cpp

@@ -1688,7 +1688,7 @@ void Chord::cmdUpdateNotes(AccidentalState* as, staff_idx_t staffIdx)
         if (vStaffIdx() == staffIdx) {
             std::vector<Note*> lnotes(notes());      // we need a copy!
             for (Note* note : lnotes) {
-                if (note->tieBack() && note->tpc() == note->tieBack()->startNote()->tpc()) {
+                if (note->tieBack() && !note->incomingPartialTie() && note->tpc() == note->tieBack()->startNote()->tpc()) {
                     // same pitch
                     if (note->accidental() && note->accidental()->role() == AccidentalRole::AUTO) {
                         // not courtesy
@@ -2635,7 +2635,7 @@ static bool noteIsBefore(const Note* n1, const Note* n2)
     }
 
     if (n1->tieBack()) {
-        if (n2->tieBack()) {
+        if (n2->tieBack() && !n2->incomingPartialTie()) {
             const Note* sn1 = n1->tieBack()->startNote();
             const Note* sn2 = n2->tieBack()->startNote();
             if (sn1->chord() == sn2->chord()) {
@@ -2870,6 +2870,7 @@ EngravingItem* Chord::nextElement()
     case ElementType::GLISSANDO_SEGMENT:
     case ElementType::NOTELINE_SEGMENT:
     case ElementType::LAISSEZ_VIB_SEGMENT:
+    case ElementType::PARTIAL_TIE_SEGMENT:
     case ElementType::TIE_SEGMENT: {
         SpannerSegment* s = toSpannerSegment(e);
         Spanner* sp = s->spanner();

src/engraving/dom/cmd.cpp

@@ -330,16 +330,17 @@ void Score::startCmd(const TranslatableString& actionName)
         LOGD("===startCmd()");
     }
 
+    if (undoStack()->hasActiveCommand()) {
+        LOGD("Score::startCmd(): cmd already active");
+        return;
+    }
+
     MScore::setError(MsError::MS_NO_ERROR);
 
     cmdState().reset();
 
     // Start collecting low-level undo operations for a
     // user-visible undo action.
-    if (undoStack()->hasActiveCommand()) {
-        LOGD("Score::startCmd(): cmd already active");
-        return;
-    }
     undoStack()->beginMacro(this, actionName);
 }
 
@@ -1691,8 +1692,11 @@ void Score::changeCRlen(ChordRest* cr, const Fraction& dstF, bool fillWithRest)
                 undoRemoveElement(c->tremoloTwoChord());
             }
             for (Note* n : c->notes()) {
-                if (n->tieFor()) {
-                    undoRemoveElement(n->tieFor());
+                if (Tie* tie = n->tieFor()) {
+                    if (tie->tieEndPoints()) {
+                        tie->removeTiesFromEndPoints();
+                    }
+                    undoRemoveElement(tie);
                 }
                 for (Spanner* sp : n->spannerFor()) {
                     if (sp->isGlissando() || sp->isGuitarBend()) {
@@ -3784,7 +3788,7 @@ void Score::cmdImplode()
                 // see if we are tying in to this chord
                 Chord* tied = 0;
                 for (Note* n : dstChord->notes()) {
-                    if (n->tieBack()) {
+                    if (n->tieBack() && !n->incomingPartialTie()) {
                         tied = n->tieBack()->startNote()->chord();
                         break;
                     }

src/engraving/dom/dom.cmake

@@ -223,6 +223,8 @@ set(DOM_SRC
     ${CMAKE_CURRENT_LIST_DIR}/ottava.h
     ${CMAKE_CURRENT_LIST_DIR}/page.cpp
     ${CMAKE_CURRENT_LIST_DIR}/page.h
+    ${CMAKE_CURRENT_LIST_DIR}/partialtie.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/partialtie.h
     ${CMAKE_CURRENT_LIST_DIR}/palmmute.cpp
     ${CMAKE_CURRENT_LIST_DIR}/palmmute.h
     ${CMAKE_CURRENT_LIST_DIR}/part.cpp