Fix musescore#18573: Doubled articulation prevention

mathesoncalum · Oct 2, 2023 · fa24d7b · fa24d7b
1 parent 804d948
commit fa24d7b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/engraving/dom/chord.cpp b/src/engraving/dom/chord.cpp
@@ -1861,7 +1861,13 @@ EngravingItem* Chord::drop(EditData& data)
             }
             atr->setParent(this);
             atr->setTrack(track());
-            score()->undoAddElement(atr);
+
+            // Immediately add if the chord has no existing articulations, toggle otherwise...
+            if (m_articulations.empty()) {
+                score()->undoAddElement(atr);
+            } else {
+                score()->toggleArticulation(this, atr);
+            }
         }
         return atr;
     }

diff --git a/src/engraving/dom/cmd.cpp b/src/engraving/dom/cmd.cpp
@@ -2157,9 +2157,28 @@ bool Score::toggleArticulation(EngravingItem* el, Articulation* a)
         undoRemoveElement(oa);
         return false;
     }
-    a->setParent(c);
-    a->setTrack(c->track());   // make sure it propagates between score and parts
-    undoAddElement(a);
+
+    if (!a->isDouble()) {
+        a->setParent(c);
+        a->setTrack(c->track());
+        undoAddElement(a);
+        return true;
+    }
+
+    // Split the new articulation into "sub-components", only add the unique ones (not present in the chord)...
+    std::set<SymId> newSubComponentIds = splitArticulations({ a->symId() });
+    for (const SymId& id : newSubComponentIds) {
+        Articulation* articCopy = a->clone();
+        articCopy->setSymId(id);
+
+        if (!c->hasArticulation(articCopy)) {
+            articCopy->setParent(c);
+            articCopy->setTrack(c->track());
+            undoAddElement(articCopy);
+            continue;
+        }
+        delete articCopy;
+    }
     return true;
 }