Text positioning refinements

src/engraving/compat/engravingcompat.cpp

@@ -41,6 +41,10 @@ void EngravingCompat::doPreLayoutCompatIfNeeded(MasterScore* score)
 {
     int mscVersion = score->mscVersion();
 
+    if (mscVersion < 470) {
+        adjustTextOffset(score);
+    }
+
     if (mscVersion < 460) {
         resetMarkerLeftFontSize(score);
         resetRestVerticalOffsets(score);
@@ -233,6 +237,39 @@ void EngravingCompat::adjustVBoxDistances(MasterScore* masterScore)
     }
 }
 
+void EngravingCompat::adjustTextOffset(MasterScore* masterScore)
+{
+    auto doAdjustTextOffset = [](EngravingItem* item) {
+        if (!item->isTextBase()) {
+            return;
+        }
+
+        TextBase* text = toTextBase(item);
+
+        // Staff text, system text, and harp pedal diagrams are the only types which are attached to notes and weren't already
+        // placed with their left edges / centres / right edges aligned to the left / centre / right of the notehead
+        if (text->positionRelativeToNoteheadRest() && (text->isStaffText() || text->isSystemText() || text->isHarpPedalDiagram())) {
+            double mag = item->staff() ? item->staff()->staffMag(item) : 1.0;
+            double xAdj = item->symWidth(SymId::noteheadBlack) * mag;
+
+            switch (text->position()) {
+            case AlignH::HCENTER:
+                text->setProperty(Pid::OFFSET, PointF(text->offset().x() - xAdj / 2, text->offset().y()));
+                break;
+            case AlignH::RIGHT:
+                text->setProperty(Pid::OFFSET, PointF(text->offset().x() - xAdj, text->offset().y()));
+                break;
+            default:
+                break;
+            }
+        }
+    };
+
+    for (Score* score : masterScore->scoreList()) {
+        score->scanElements(doAdjustTextOffset);
+    }
+}
+
 void EngravingCompat::doPostLayoutCompatIfNeeded(MasterScore* score)
 {
     bool needRelayout = false;

src/engraving/compat/engravingcompat.h

@@ -40,6 +40,7 @@ class EngravingCompat
     static void resetMarkerLeftFontSize(MasterScore* masterScore);
     static void resetRestVerticalOffsets(MasterScore* masterScore);
     static void adjustVBoxDistances(MasterScore* masterScore);
+    static void adjustTextOffset(MasterScore* masterScore);
 
     static bool relayoutUserModifiedCrossStaffBeams(MasterScore* score);
     static bool resetHookHeightSign(MasterScore* masterScore);

src/engraving/dom/dynamic.h

@@ -120,6 +120,8 @@ class Dynamic final : public TextBase
 
     bool isEditAllowed(EditData&) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
     Hairpin* leftHairpin() const { return m_leftHairpin; }
     Hairpin* rightHairpin() const { return m_rightHairpin; }
 

src/engraving/dom/expression.h

@@ -59,5 +59,7 @@ class Expression final : public TextBase
     bool hasVoiceAssignmentProperties() const override { return true; }
 
     void reset() override;
+
+    bool positionRelativeToNoteheadRest() const override { return true; }
 };
 }

src/engraving/dom/figuredbass.h

@@ -291,6 +291,8 @@ class FiguredBass final : public TextBase
     bool setProperty(Pid propertyId, const PropertyValue&) override;
     PropertyValue propertyDefault(Pid) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
     size_t itemsCount() const { return m_items.size(); }
     void appendItem(FiguredBassItem* item) { m_items.push_back(item); }
     const std::vector<FiguredBassItem*>& items() const { return m_items; }

src/engraving/dom/fingering.h

@@ -56,6 +56,8 @@ class Fingering final : public TextBase
     String accessibleInfo() const override;
 
     bool isOnCrossBeamSide() const;
+
+    bool positionRelativeToNoteheadRest() const override { return false; }
 };
 } // namespace mu::engraving
 #endif

src/engraving/dom/guitarbend.h

@@ -266,5 +266,7 @@ class GuitarBendText final : public TextBase
     GuitarBendText* clone() const override { return new GuitarBendText(*this); }
 
     bool isEditable() const override { return false; }
+
+    bool positionRelativeToNoteheadRest() const override { return false; }
 };
 }

src/engraving/dom/hammeronpulloff.h

@@ -54,6 +54,8 @@ class HammerOnPullOffText final : public TextBase
 
     PropertyValue propertyDefault(Pid id) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return false; }
+
 private:
     Chord* m_startChord = nullptr;
     Chord* m_endChord = nullptr;

src/engraving/dom/harmony.cpp

@@ -1615,6 +1615,11 @@ PropertyValue Harmony::propertyDefault(Pid id) const
     return v;
 }
 
+bool Harmony::positionRelativeToNoteheadRest() const
+{
+    return !parent()->isFretDiagram();
+}
+
 //---------------------------------------------------------
 //   getPropertyStyle
 //---------------------------------------------------------

src/engraving/dom/harmony.h

@@ -289,6 +289,8 @@ class Harmony final : public TextBase
     bool setProperty(Pid propertyId, const PropertyValue& v) override;
     PropertyValue propertyDefault(Pid id) const override;
 
+    bool positionRelativeToNoteheadRest() const override;
+
     double mag() const override;
 
     double bassScale() const { return m_bassScale; }

src/engraving/dom/harppedaldiagram.h

@@ -83,6 +83,8 @@ class HarpPedalDiagram final : public TextBase
     bool isTpcPlayable(int tpc);
     const std::set<int>& playableTpcs() const { return m_playableTpcs; }
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
 private:
 
     std::array<PedalPosition, HARP_STRING_NO> m_pedalState;

src/engraving/dom/instrchange.h

@@ -63,6 +63,8 @@ class InstrumentChange final : public TextBase
 
     PropertyValue propertyDefault(Pid) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
     bool placeMultiple() const override { return false; }
 
 private:

src/engraving/dom/instrumentname.h

@@ -67,6 +67,8 @@ class InstrumentName final : public TextBase
     bool setProperty(Pid propertyId, const PropertyValue&) override;
     PropertyValue propertyDefault(Pid) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return false; }
+
 private:
 
     InstrumentNameType m_instrumentNameType = InstrumentNameType::LONG;

src/engraving/dom/jump.h

@@ -76,6 +76,8 @@ class Jump final : public TextBase
     EngravingItem* prevSegmentElement() override;
     String accessibleInfo() const override;
 
+    bool positionRelativeToNoteheadRest() const override { return false; }
+
 private:
     String m_jumpTo;
     String m_playUntil;

src/engraving/dom/lyrics.h

@@ -70,6 +70,8 @@ class Lyrics final : public TextBase
     bool isEditAllowed(EditData&) const override;
     void endEdit(EditData&) override;
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
     const Fraction& ticks() const { return m_ticks; }
     void setTicks(const Fraction& tick) { m_ticks = tick; }
     Fraction endTick() const;

src/engraving/dom/marker.h

@@ -79,6 +79,8 @@ class Marker final : public TextBase
     EngravingItem* prevSegmentElement() override;
     String accessibleInfo() const override;
 
+    bool positionRelativeToNoteheadRest() const override { return false; }
+
     bool centerOnSymbol() const { return m_centerOnSymbol; }
     void setCenterOnSymbol(bool val) { m_centerOnSymbol = val; }
 

src/engraving/dom/measurenumberbase.h

@@ -42,6 +42,7 @@ class MeasureNumberBase : public TextBase
     Measure* measure() const { return toMeasure(explicitParent()); }
 
     bool isEditable() const override { return false; }    // The measure numbers' text should not be editable
+    bool positionRelativeToNoteheadRest() const override { return false; }
 };
 } // namespace mu::engraving
 

src/engraving/dom/playcounttext.h

@@ -51,6 +51,8 @@ class PlayCountText final : public TextBase
     bool setProperty(Pid propertyId, const PropertyValue&) override;
     PropertyValue propertyDefault(Pid propertyId) const override;
 
+    bool positionRelativeToNoteheadRest() const override { return false; }
+
 private:
     friend class Factory;
     PlayCountText(Segment* parent, TextStyleType tid = TextStyleType::REPEAT_PLAY_COUNT);

src/engraving/dom/rehearsalmark.h

@@ -58,6 +58,8 @@ class RehearsalMark final : public TextBase
 
     void styleChanged() override;
 
+    bool positionRelativeToNoteheadRest() const override { return false; }
+
 private:
     void applyTypeStyle();
 

src/engraving/dom/stafftextbase.h

@@ -73,6 +73,8 @@ class StaffTextBase : public TextBase
     bool swing() const { return m_swing; }
     int capo() const { return m_capo; }
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
 private:
 
     String m_channelNames[4];

src/engraving/dom/sticking.h

@@ -47,6 +47,8 @@ class Sticking final : public TextBase
     Measure* measure() const { return (Measure*)explicitParent()->explicitParent(); }
 
     bool isEditAllowed(EditData&) const override;
+
+    bool positionRelativeToNoteheadRest() const override { return true; }
 };
 } // namespace mu::engraving
 #endif

src/engraving/dom/tapping.h

@@ -125,5 +125,7 @@ class TappingText final : public TextBase
     TappingText* clone() const override { return new TappingText(*this); }
 
     Color curColor(const rendering::PaintOptions& opt) const override;
+
+    bool positionRelativeToNoteheadRest() const override { return true; }
 };
 } // namespace mu::engraving

src/engraving/dom/tempotext.h

@@ -93,6 +93,8 @@ class TempoText final : public TextBase
     PropertyValue propertyDefault(Pid id) const override;
     String accessibleInfo() const override;
 
+    bool positionRelativeToNoteheadRest() const override { return true; }
+
     String tempoInfo() const;
 
     static constexpr double DEFAULT_SYM_SIZE_RATIO = 5.0 / 3.0;

src/engraving/dom/text.cpp

@@ -122,4 +122,13 @@ bool mu::engraving::Text::collectForDrawing() const
 {
     return !(parent() && parent()->isTuplet());
 }
+
+bool Text::positionRelativeToNoteheadRest() const
+{
+    if (parent()->isBox() || parent()->isTuplet() || parent()->isSpannerSegment()) {
+        return false;
+    }
+
+    return true;
+}
 }

src/engraving/dom/text.h

@@ -51,6 +51,8 @@ class Text final : public TextBase
     VoiceAssignment voiceAssignment() const;
 
     bool collectForDrawing() const override;
+
+    bool positionRelativeToNoteheadRest() const override;
 };
 } // namespace mu::engraving
 

src/engraving/dom/textbase.cpp

@@ -1868,6 +1868,15 @@ void TextBase::layoutFrame(LayoutData* ldata) const
     ldata->setBbox(ldata->frame.adjusted(-w, -w, w, w));
 }
 
+// bool TextBase::positionRelativeToNoteheadRest() const
+// {
+//     if (!parent()) {
+//         return false;
+//     }
+
+//     return true;
+// }
+
 //---------------------------------------------------------
 //   lineSpacing
 //---------------------------------------------------------

src/engraving/dom/textbase.h

@@ -488,6 +488,8 @@ class TextBase : public EngravingItem
     //! At the moment it's: Text, Jump, Marker
     bool layoutToParentWidth() const { return m_layoutToParentWidth; }
 
+    virtual bool positionRelativeToNoteheadRest() const = 0;
+
     void setVoiceAssignment(VoiceAssignment v) { m_voiceAssignment = v; }
     VoiceAssignment voiceAssignment() const { return m_voiceAssignment; }
     void setDirection(DirectionV v) { m_direction = v; }

src/engraving/rendering/score/dynamicslayout.cpp

@@ -80,12 +80,6 @@ void DynamicsLayout::doLayoutDynamic(Dynamic* item, Dynamic::LayoutData* ldata,
         return;
     }
 
-    bool centerOnNote = item->centerOnNotehead() || (!item->centerOnNotehead() && item->position() == AlignH::HCENTER);
-    double mag = item->staff()->staffMag(item);
-    double noteHeadWidth = item->score()->noteHeadWidth() * mag;
-
-    ldata->moveX(noteHeadWidth * (centerOnNote ? 0.5 : 1));
-
     if (!item->centerOnNotehead()) {
         return;
     }

src/engraving/rendering/score/lyricslayout.cpp

@@ -174,19 +174,16 @@ void LyricsLayout::layout(Lyrics* item, LayoutContext& ctx)
         }
     }
 
-    double nominalWidth = item->symWidth(SymId::noteheadBlack);
     if (item->position() == AlignH::HCENTER) {
         //
         // center under notehead, not origin
         // however, lyrics that are melismas or have verse numbers will be forced to left alignment
         //
         // center under note head
-        x += nominalWidth * .5 - centerAdjust * 0.5;
+        x += -centerAdjust * 0.5;
     } else if (item->position() == AlignH::LEFT) {
         // even for left aligned syllables, ignore leading verse numbers and/or punctuation
         x -= leftAdjust;
-    } else if (item->position() == AlignH::RIGHT) {
-        x += nominalWidth;
     }
 
     ldata->setPosX(x);

src/engraving/rendering/score/textlayout.cpp

@@ -192,6 +192,10 @@ void TextLayout::textHorizontalLayout(const TextBase* item, Shape& shape, double
         default:
             ASSERT_X("Lay out to parent width only valid for items with page or frame as parent");
         }
+    } else if (item->positionRelativeToNoteheadRest()) {
+        // For items aligned to notehead/rests
+        double mag = item->staff() ? item->staff()->staffMag(item) : 1.0;
+        layoutWidth = item->symWidth(SymId::noteheadBlack) * mag;
     }
 
     // Position and alignment
@@ -217,6 +221,7 @@ void TextLayout::textHorizontalLayout(const TextBase* item, Shape& shape, double
             shape.add(textBlock.shape().translated(PointF(0.0, textBlock.y())));
             continue;
         }
+
         // Align relative to the longest line
         AlignH alignH = item->align().horizontal;
         if (alignH == AlignH::HCENTER) {

src/engraving/rendering/score/tlayout.cpp

@@ -5319,27 +5319,6 @@ void TLayout::layoutSticking(const Sticking* item, Sticking::LayoutData* ldata)
     LAYOUT_CALL_ITEM(item);
     TextLayout::layoutBaseTextBase(item, ldata);
 
-    AlignH itemPosition =  item->position();
-    if (itemPosition != AlignH::LEFT) {
-        const Segment* seg = item->segment();
-        const Chord* chord = nullptr;
-        track_idx_t sTrack = trackZeroVoice(item->track());
-        track_idx_t eTrack = sTrack + VOICES;
-        for (track_idx_t track = sTrack; track < eTrack; ++track) {
-            EngravingItem* el = seg->element(track);
-            if (el && el->isChord()) {
-                chord = toChord(el);
-                break;
-            }
-        }
-
-        if (chord) {
-            const Note* refNote = item->placeAbove() ? chord->upNote() : chord->downNote();
-            double noteWidth = refNote->ldata()->bbox().width();
-            ldata->moveX(itemPosition == AlignH::HCENTER ? 0.5 * noteWidth : noteWidth);
-        }
-    }
-
     if (item->autoplace() && item->explicitParent()) {
         const Segment* s = toSegment(item->explicitParent());
         const Measure* m = s->measure();