Avoid collisions in full tab layout

miiizen · miiizen · commit 9a78414302b8 · 2024-05-16T11:22:46.000+01:00
diff --git a/src/engraving/dom/note.cpp b/src/engraving/dom/note.cpp
@@ -1002,6 +1002,10 @@ double Note::bboxRightPos() const
 //---------------------------------------------------------
 double Note::headBodyWidth() const
 {
+    const StaffType* st = staffType();
+    if (st && st->isTabStaff()) {
+        return tabHeadWidth(st);
+    }
     return headWidth() + 2 * bboxXShift();
 }
 
@@ -3806,4 +3810,9 @@ bool Note::negativeFretUsed() const
 {
     return engravingConfiguration()->negativeFretsAllowed() && m_fret < 0;
 }
+
+int Note::stringOrLine() const
+{
+    return staff()->staffType(tick())->isTabStaff() ? string() * 2 : line();
+}
 }
diff --git a/src/engraving/dom/note.h b/src/engraving/dom/note.h
@@ -272,6 +272,7 @@ class Note final : public EngravingItem
     bool negativeFretUsed() const;
     int string() const { return m_string; }
     void setString(int val) { m_string = val; }
+    int stringOrLine() const;
 
     bool ghost() const { return m_ghost; }
     void setGhost(bool val) { m_ghost = val; }
diff --git a/src/engraving/rendering/dev/chordlayout.cpp b/src/engraving/rendering/dev/chordlayout.cpp
@@ -1466,6 +1466,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
     const track_idx_t startTrack = staffIdx * VOICES;
     const track_idx_t endTrack   = startTrack + VOICES;
     const Fraction tick = segment->tick();
+    const StaffType* staffType = staff->staffType(segment->tick());
 
     // we need to check all the notes in all the staves of the part so that we don't get weird collisions
     // between accidentals etc with moved notes
@@ -1487,7 +1488,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
     std::vector<Note*> downStemNotes;
     int upVoices       = 0;
     int downVoices     = 0;
-    double nominalWidth = ctx.conf().noteHeadWidth() * staff->staffMag(tick);
+    double nominalWidth = !isTab ? ctx.conf().noteHeadWidth() * staff->staffMag(tick) : ctx.conf().fretWidth(staffType);
     double maxUpWidth   = 0.0;
     double maxDownWidth = 0.0;
     double maxUpMag     = 0.0;
@@ -1542,7 +1543,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
         }
     }
 
-    if (upVoices + downVoices && !isTab) {
+    if (upVoices + downVoices && staffType->stemThrough()) {
         // TODO: use track as secondary sort criteria?
         // otherwise there might be issues with unisons between voices
         // in some corner cases
@@ -1553,7 +1554,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
         // layout upstem noteheads
         if (upVoices > 1) {
             std::sort(upStemNotes.begin(), upStemNotes.end(),
-                      [](Note* n1, const Note* n2) ->bool { return n1->line() > n2->line(); });
+                      [](Note* n1, const Note* n2) ->bool { return n1->stringOrLine() > n2->stringOrLine(); });
         }
         if (upVoices) {
             double hw = layoutChords2(upStemNotes, true, ctx);
@@ -1563,7 +1564,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
         // layout downstem noteheads
         if (downVoices > 1) {
             std::sort(downStemNotes.begin(), downStemNotes.end(),
-                      [](Note* n1, const Note* n2) ->bool { return n1->line() > n2->line(); });
+                      [](Note* n1, const Note* n2) ->bool { return n1->stringOrLine() > n2->stringOrLine(); });
         }
         if (downVoices) {
             double hw = layoutChords2(downStemNotes, false, ctx);
@@ -1640,7 +1641,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
         if (upVoices && downVoices) {
             Note* bottomUpNote = upStemNotes.front();
             Note* topDownNote  = downStemNotes.back();
-            int separation = topDownNote->line() - bottomUpNote->line();
+            int separation = topDownNote->stringOrLine() - bottomUpNote->stringOrLine();
 
             std::vector<Note*> overlapNotes;
             overlapNotes.reserve(8);
@@ -1666,21 +1667,21 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
 
                 // build list of overlapping notes
                 for (size_t i = 0, n = upStemNotes.size(); i < n; ++i) {
-                    if (upStemNotes[i]->line() >= topDownNote->line() - 1) {
+                    if (upStemNotes[i]->stringOrLine() >= topDownNote->stringOrLine() - 1) {
                         overlapNotes.push_back(upStemNotes[i]);
                     } else {
                         break;
                     }
                 }
                 for (size_t i = downStemNotes.size(); i > 0; --i) {         // loop most probably needs to be in this reverse order
-                    if (downStemNotes[i - 1]->line() <= bottomUpNote->line() + 1) {
+                    if (downStemNotes[i - 1]->stringOrLine() <= bottomUpNote->stringOrLine() + 1) {
                         overlapNotes.push_back(downStemNotes[i - 1]);
                     } else {
                         break;
                     }
                 }
                 std::sort(overlapNotes.begin(), overlapNotes.end(),
-                          [](Note* n1, const Note* n2) ->bool { return n1->line() > n2->line(); });
+                          [](Note* n1, const Note* n2) ->bool { return n1->stringOrLine() > n2->stringOrLine(); });
 
                 // determine nature of overlap
                 bool shareHeads = true;               // can all overlapping notes share heads?
@@ -1704,7 +1705,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
                             continue;
                         }
                     }
-                    int line = n->line();
+                    int line = n->stringOrLine();
                     int d = lastLine - line;
                     switch (d) {
                     case 0:
@@ -1776,8 +1777,8 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
                 int topDownStemLen = 0;
                 if (!conflictUnison && topDownNote->chord()->stem()) {
                     topDownStemLen = std::round(topDownNote->chord()->stem()->ldata()->bbox().height() / sp * 2);
-                    if (bottomUpNote->line() > firstLedgerBelow - 1 && topDownNote->line() < bottomUpNote->line()
-                        && topDownNote->line() + topDownStemLen >= firstLedgerBelow) {
+                    if (bottomUpNote->stringOrLine() > firstLedgerBelow - 1 && topDownNote->stringOrLine() < bottomUpNote->stringOrLine()
+                        && topDownNote->stringOrLine() + topDownStemLen >= firstLedgerBelow) {
                         ledgerOverlapBelow = true;
                     }
                 }
@@ -1786,8 +1787,8 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
                 int bottomUpStemLen = 0;
                 if (!conflictUnison && bottomUpNote->chord()->stem()) {
                     bottomUpStemLen = std::round(bottomUpNote->chord()->stem()->ldata()->bbox().height() / sp * 2);
-                    if (topDownNote->line() < -1 && topDownNote->line() < bottomUpNote->line()
-                        && bottomUpNote->line() - bottomUpStemLen <= firstLedgerAbove) {
+                    if (topDownNote->stringOrLine() < -1 && topDownNote->stringOrLine() < bottomUpNote->stringOrLine()
+                        && bottomUpNote->stringOrLine() - bottomUpStemLen <= firstLedgerAbove) {
                         ledgerOverlapAbove = true;
                     }
                 }
@@ -1841,8 +1842,8 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
                     } else {
                         // Prevent ledger line & notehead collision
                         double adjSpace
-                            = (topDownNote->line() <= firstLedgerAbove
-                               || bottomUpNote->line() >= firstLedgerBelow) ? ledgerLen - ledgerGap - 0.2 * sp : -0.2 * sp;
+                            = (topDownNote->stringOrLine() <= firstLedgerAbove
+                               || bottomUpNote->stringOrLine() >= firstLedgerBelow) ? ledgerLen - ledgerGap - 0.2 * sp : -0.2 * sp;
                         upOffset = maxDownWidth + adjSpace;
                         if (downHooks) {
                             bool needsHookSpace = (ledgerOverlapBelow || ledgerOverlapAbove);
@@ -1854,21 +1855,23 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
                 } else {
                     // no direct conflict, so parts can overlap (downstem on left)
                     // just be sure that stems clear opposing noteheads and ledger lines
-                    double clearLeft = 0.0, clearRight = 0.0;
+                    // Stems are in the middle of fret marks on TAB staves
+                    double clearLeft = isTab ? bottomUpNote->chord()->stemPosX() : 0.0;
+                    double clearRight = isTab ? bottomUpNote->chord()->stemPosX() : 0.0;
                     if (topDownNote->chord()->stem()) {
                         if (ledgerOverlapBelow) {
                             // Create space between stem and ledger line below staff
-                            clearLeft = ledgerLen + ledgerGap + topDownNote->chord()->stem()->lineWidth();
+                            clearLeft += ledgerLen + ledgerGap + topDownNote->chord()->stem()->lineWidth();
                         } else {
-                            clearLeft = topDownNote->chord()->stem()->lineWidth() + 0.3 * sp;
+                            clearLeft += topDownNote->chord()->stem()->lineWidth() + 0.3 * sp;
                         }
                     }
                     if (bottomUpNote->chord()->stem()) {
                         if (ledgerOverlapAbove) {
                             // Create space between stem and ledger line above staff
-                            clearRight = maxDownWidth + ledgerLen + ledgerGap - maxUpWidth + bottomUpNote->chord()->stem()->lineWidth();
+                            clearRight += maxDownWidth + ledgerLen + ledgerGap - maxUpWidth + bottomUpNote->chord()->stem()->lineWidth();
                         } else {
-                            clearRight = bottomUpNote->chord()->stem()->lineWidth() + std::max(maxDownWidth - maxUpWidth, 0.0) + 0.3 * sp;
+                            clearRight += bottomUpNote->chord()->stem()->lineWidth() + std::max(maxDownWidth - maxUpWidth, 0.0) + 0.3 * sp;
                         }
                     } else {
                         downDots = 0;             // no need to adjust for dots in this case
@@ -1878,15 +1881,18 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
                     Note* topUpNote = upStemNotes.back();
                     // Move notes out of the way of straight flags
                     int pad = ctx.conf().styleB(Sid::useStraightNoteFlags) ? 2 : 1;
-                    bool overlapsFlag = topDownNote->line() + topDownStemLen + pad > topUpNote->line();
+                    bool overlapsFlag = topDownNote->stringOrLine() + topDownStemLen + pad > topUpNote->stringOrLine();
                     if (downHooks && (ledgerOverlapBelow || overlapsFlag)) {
                         // we will need more space to avoid collision with hook
                         // but we won't need as much dot adjustment
+                        Hook* hook = topDownNote->chord()->hook();
+                        double hookWidth = hook ? hook->width() : 0.0;
                         if (ledgerOverlapBelow) {
-                            Hook* hook = topDownNote->chord()->hook();
-                            double hookWidth = hook ? hook->width() : 0.0;
                             upOffset = hookWidth + ledgerLen + ledgerGap;
                         }
+                        if (isTab) {
+                            upOffset = hookWidth + maxDownWidth;
+                        }
                         upOffset = std::max(upOffset, maxDownWidth + 0.1 * sp);
                         dotAdjustThreshold = maxUpWidth - 0.3 * sp;
                     }
@@ -1937,6 +1943,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
                 Chord::LayoutData* chordLdata = chord->mutldata();
                 if (chord->up()) {
                     if (!muse::RealIsNull(upOffset)) {
+                        oversizeUp = isTab ? oversizeUp / 2 : oversizeUp;
                         chordLdata->moveX(upOffset + centerAdjustUp + oversizeUp);
                         if (downDots && !upDots) {
                             chordLdata->moveX(dotAdjust);
@@ -1967,7 +1974,7 @@ void ChordLayout::layoutChords1(LayoutContext& ctx, Segment* segment, staff_idx_
         }
         if (upVoices + downVoices > 1) {
             std::sort(notes.begin(), notes.end(),
-                      [](Note* n1, const Note* n2) ->bool { return n1->line() > n2->line(); });
+                      [](Note* n1, const Note* n2) ->bool { return n1->stringOrLine() > n2->stringOrLine(); });
         }
         layoutChords3(ctx.conf().style(), chords, notes, staff, ctx);
     }
@@ -2019,9 +2026,17 @@ double ChordLayout::layoutChords2(std::vector<Note*>& notes, bool up, LayoutCont
 
     for (int idx = startIdx; idx != endIdx; idx += incIdx) {
         Note* note    = notes[idx];                         // current note
-        int line      = note->line();                       // line of current note
+        const int line      = note->stringOrLine();                       // line of current note
         Chord* chord  = note->chord();
-        staff_idx_t staffIdx  = chord->vStaffIdx();                 // staff of current note
+        const staff_idx_t staffIdx  = chord->vStaffIdx();                 // staff of current note
+        const Staff* st = note->staff();
+        const StaffType* tab = st->staffTypeForElement(note);
+        const bool isTab = note->staff() && note->staff()->isTabStaff(note->chord()->tick());
+
+        if (isTab) {
+            // Need to lay out TAB note to know width
+            TLayout::layoutNote(note, note->mutldata());
+        }
 
         // there is a conflict
         // if this is same or adjacent line as previous note (and chords are on same staff!)
@@ -2069,7 +2084,8 @@ double ChordLayout::layoutChords2(std::vector<Note*>& notes, bool up, LayoutCont
 
         // accumulate return value
         if (!mirror) {
-            maxWidth = std::max(maxWidth, note->bboxRightPos());
+            const double noteWidth = isTab ? note->tabHeadWidth(tab) : note->bboxRightPos();
+            maxWidth = std::max(maxWidth, noteWidth);
         }
 
         // prepare for next iteration
@@ -2274,7 +2290,7 @@ void ChordLayout::placeDots(const std::vector<Chord*>& chords, const std::vector
             }
         }
     }
-    if (!chord || chord->staff()->isTabStaff(chord->tick())) {
+    if (!chord || (chord->staff()->isTabStaff(chord->tick()) && !chord->staff()->staffType(chord->tick())->stemThrough())) {
         return;
     }
     std::vector<Note*> topDownNotes;
@@ -3448,7 +3464,8 @@ void ChordLayout::layoutNote2(Note* item, LayoutContext& ctx)
         double correctMag = item->chord()->notes().size() > 1 ? item->chord()->mag() : item->mag();
         double d  = ctx.conf().point(ctx.conf().styleS(Sid::dotNoteDistance)) * correctMag;
         double dd = ctx.conf().point(ctx.conf().styleS(Sid::dotDotDistance)) * correctMag;
-        double x  = item->chord()->dotPosX() - item->pos().x() - item->chord()->pos().x();
+        double x  = isTabStaff ? item->chord()->dotPosX() - item->pos().x() : item->chord()->dotPosX() - item->pos().x()
+                    - item->chord()->pos().x();
         // in case of dots with different size, center-align them
         if (item->mag() != item->chord()->mag() && item->chord()->notes().size() > 1) {
             double relativeMag = item->mag() / item->chord()->mag();
diff --git a/src/engraving/rendering/dev/layoutcontext.cpp b/src/engraving/rendering/dev/layoutcontext.cpp
@@ -73,6 +73,17 @@ bool LayoutConfiguration::isPrintingMode() const
     return score()->printing();
 }
 
+double LayoutConfiguration::fretWidth(const StaffType* tab) const
+{
+    if (!tab || !tab->isTabStaff()) {
+        return 0.0;
+    }
+
+    muse::draw::Font f = tab->fretFont();
+    f.setPointSizeF(tab->fretFontSize());
+    return muse::draw::FontMetrics::width(f, u"0");
+}
+
 std::shared_ptr<const IEngravingFont> LayoutConfiguration::engravingFont() const
 {
     IF_ASSERT_FAILED(score()) {
diff --git a/src/engraving/rendering/dev/layoutcontext.h b/src/engraving/rendering/dev/layoutcontext.h
@@ -31,6 +31,7 @@
 #include "../../style/style.h"
 #include "../../iengravingfont.h"
 #include "../../dom/mscore.h"
+#include "../../dom/stafftype.h"
 
 #include "../layoutoptions.h"
 
@@ -103,6 +104,7 @@ class LayoutConfiguration
 
     bool isShowVBox() const { return options().isShowVBox; }
     double noteHeadWidth() const { return options().noteHeadWidth; }
+    double fretWidth(const StaffType* tab) const;
     bool isShowInvisible() const;
     int pageNumberOffset() const;
     bool isVerticalSpreadEnabled() const;
diff --git a/src/engraving/rendering/dev/tlayout.cpp b/src/engraving/rendering/dev/tlayout.cpp
@@ -4313,7 +4313,7 @@ void TLayout::layoutNote(const Note* item, Note::LayoutData* ldata)
             const_cast<Note*>(item)->setHeadHasParentheses(false, /* addToLinked= */ false);
         }
 
-        double w = item->tabHeadWidth(tab);     // !! use _fretString
+        double w = item->tabHeadWidth(tab);
         double mags = item->magS();
 
         const MStyle& style = item->style();

Original file line number	Diff line number	Diff line change
`@@ -1002,6 +1002,10 @@ double Note::bboxRightPos() const`
`1002`	`1002`	`//---------------------------------------------------------`
`1003`	`1003`	`double Note::headBodyWidth() const`
`1004`	`1004`	`{`
	`1005`	`+ const StaffType* st = staffType();`
	`1006`	`+ if (st && st->isTabStaff()) {`
	`1007`	`+ return tabHeadWidth(st);`
	`1008`	`+ }`
`1005`	`1009`	`return headWidth() + 2 * bboxXShift();`
`1006`	`1010`	`}`
`1007`	`1011`
`@@ -3806,4 +3810,9 @@ bool Note::negativeFretUsed() const`
`3806`	`3810`	`{`
`3807`	`3811`	`return engravingConfiguration()->negativeFretsAllowed() && m_fret < 0;`
`3808`	`3812`	`}`
	`3813`	`+`
	`3814`	`+int Note::stringOrLine() const`
	`3815`	`+{`
	`3816`	`+ return staff()->staffType(tick())->isTabStaff() ? string() * 2 : line();`
	`3817`	`+}`
`3809`	`3818`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4313,7 +4313,7 @@ void TLayout::layoutNote(const Note* item, Note::LayoutData* ldata)`
`4313`	`4313`	`const_cast<Note>(item)->setHeadHasParentheses(false, / addToLinked= */ false);`
`4314`	`4314`	`}`
`4315`	`4315`
`4316`		`- double w = item->tabHeadWidth(tab); // !! use _fretString`
	`4316`	`+ double w = item->tabHeadWidth(tab);`
`4317`	`4317`	`double mags = item->magS();`
`4318`	`4318`
`4319`	`4319`	`const MStyle& style = item->style();`