todo squash

Author: asattely

src/engraving/libmscore/chord.cpp

@@ -4026,53 +4026,32 @@ void Chord::layoutArticulations2(bool layoutOnCrossBeamSide)
             }
         }
     }
-    Articulation* stacc = nullptr;
+
     for (Articulation* a : _articulations) {
-        double kearnHeight = 0.0;
-        if (a->isStaccato()) {
-            stacc = a;
-        } else if (stacc && a->isAccent() && stacc->up() == a->up()
-                   && (RealIsEqualOrLess(stacc->ypos(), 0.0) || RealIsEqualOrMore(stacc->ypos(), staff()->height()))) {
-            kearnHeight = stacAccentKern;
-        } else {
-            stacc = nullptr;
-        }
-        double x = (up() != a->up() || !a->isBasicArticulation()) ? headSideX : stemSideX;
         if (layoutOnCrossBeamSide && !a->isOnCrossBeamSide()) {
             continue;
         }
         ArticulationAnchor aa = a->anchor();
-        if (aa != ArticulationAnchor::TOP_CHORD && aa != ArticulationAnchor::BOTTOM_CHORD) {
+        if (!a->layoutCloseToNote() || aa == ArticulationAnchor::TOP_STAFF || aa == ArticulationAnchor::BOTTOM_STAFF) {
             continue;
         }
-
+        double x = (up() != a->up() || !a->isBasicArticulation()) ? headSideX : stemSideX;
         if (a->up()) {
-            if (!a->layoutCloseToNote()) {
-                a->layout();
-                a->setPos(x, chordTopY + kearnHeight);
-                a->doAutoplace();
-            }
             if (a->visible()) {
                 chordTopY = a->y() - a->height() - minDist;
             }
         } else {
-            if (!a->layoutCloseToNote()) {
-                a->layout();
-                a->setPos(x, chordBotY + abs(a->bbox().top()) - kearnHeight);
-                a->doAutoplace();
-            }
             if (a->visible()) {
                 chordBotY = a->y() + a->height() + minDist;
             }
         }
     }
-
     //
-    //    now place all articulations with staff top or bottom anchor
+    //    now place all articulations with staff top or bottom anchor, or chord anchor for artics that don't layout close to note
     //
     staffTopY = std::min(staffTopY, chordTopY);
     staffBotY = std::max(staffBotY, chordBotY);
-    stacc = nullptr;
+    Articulation* stacc = nullptr;
     for (Articulation* a : _articulations) {
         double kearnHeight = 0.0;
         if (layoutOnCrossBeamSide && !a->isOnCrossBeamSide()) {