slur collisions

Author: miiizen

src/engraving/dom/slur.cpp

@@ -25,6 +25,7 @@
 
 #include "draw/types/transform.h"
 
+#include "arpeggio.h"
 #include "beam.h"
 #include "chord.h"
 #include "measure.h"
@@ -363,6 +364,11 @@ Shape SlurSegment::getSegmentShape(Segment* seg, ChordRest* startCR, ChordRest*
         }
         const EngravingItem* item = shapeEl.item();
         const EngravingItem* parent = item->parentItem();
+        // Don't remove arpeggio starting on a different voice and ending on the same voice as endCR when slur is on the outside
+        if (item->isArpeggio() && (endCR->track() == toArpeggio(item)->endTrack()) && (!slur()->up() && toArpeggio(item)->span() > 1)) {
+            return false;
+        }
+
         // Its own startCR or items belonging to it, lyrics, fingering, ledger lines, articulation on endCR
         if (item == startCR || parent == startCR || item->isTextBase() || item->isLedgerLine()
             || (item->isArticulationFamily() && parent == endCR) || item->isBend() || item->isStretchedBend()) {
@@ -379,6 +385,10 @@ Shape SlurSegment::getSegmentShape(Segment* seg, ChordRest* startCR, ChordRest*
                 || (slur()->up() && item->track() < startCR->track()))) { // slur-up: ignore higher voices
             return true;
         }
+        // Remove arpeggios spanning more than 1 voice starting on endCR's voice when the slur is on the inside
+        if (item->isArpeggio() && (endCR->track() != item->track() || (!slur()->up() && toArpeggio(item)->span() > 1))) {
+            return true;
+        }
         return false;
     });
 

src/engraving/rendering/dev/tlayout.cpp

@@ -846,15 +846,13 @@ void TLayout::layoutArpeggio(const Arpeggio* item, Arpeggio::LayoutData* ldata,
     } break;
     }
 
-    if (includeCrossStaffHeight && item->crossStaff()) {
-        // Loop through staves spanned & regenerate chord shape
-        // This makes sure the arpeggio's shape is added to the shape of each chord it spans
-        Chord* chord = item->chord();
-        Segment* seg = chord->segment();
-        staff_idx_t staveSpan = (item->track() + item->span() - 1) / VOICES;
-        for (staff_idx_t staffIdx = item->staffIdx(); staffIdx <= staveSpan; staffIdx++) {
-            seg->createShape(staffIdx);
-        }
+    // Loop through staves spanned & regenerate chord shape
+    // This makes sure the arpeggio's shape is added to the shape of each chord it spans
+    Chord* chord = item->chord();
+    Segment* seg = chord->segment();
+    staff_idx_t staveSpan = (item->track() + item->span() - 1) / VOICES;
+    for (staff_idx_t staffIdx = item->staffIdx(); staffIdx <= staveSpan; staffIdx++) {
+        seg->createShape(staffIdx);
     }
 }