Set text style & properties position on migration from 4.6

src/engraving/rw/compat/compatutils.cpp

@@ -966,6 +966,22 @@ Sid CompatUtils::positionStyleFromAlign(Sid align)
     return muse::value(ALIGN_VALS_TO_CONVERT, align, Sid::NOSTYLE);
 }
 
+void CompatUtils::setPositionStylesFromAlign(MStyle* style, std::vector<Sid> ignoreSids)
+{
+    // Make sure new position styles are initially the same as align values
+    for (const StyleDef::StyleValue& st : StyleDef::styleValues) {
+        if (muse::contains(ignoreSids, st.sid)) {
+            continue;
+        }
+        Sid positionSid = compat::CompatUtils::positionStyleFromAlign(st.sid);
+        if (positionSid == Sid::NOSTYLE) {
+            continue;
+        }
+        AlignH val = style->value(st.sid).value<Align>().horizontal;
+        style->set(positionSid, val);
+    }
+}
+
 void CompatUtils::setTextLineTextPositionFromAlign(TextLineBase* tl)
 {
     tl->setBeginTextPosition(tl->beginTextAlign().horizontal);
@@ -982,7 +998,7 @@ void CompatUtils::setTextLineTextPositionFromAlign(TextLineBase* tl)
     }
 }
 
-void mu::engraving::compat::CompatUtils::setMusicSymbolSize470(MStyle& style)
+void compat::CompatUtils::setMusicSymbolSize470(MStyle* style)
 {
     // Music symbols have their own point size in 4.7
     // Initialize this to the text type's default font size
@@ -1009,12 +1025,12 @@ void mu::engraving::compat::CompatUtils::setMusicSymbolSize470(MStyle& style)
             continue;
         }
 
-        double size = style.value(fontSizeSid).toDouble();
+        double size = style->value(fontSizeSid).toDouble();
         if (textStyleType == TextStyleType::TEMPO) {
             size *= TempoText::DEFAULT_SYM_SIZE_RATIO;
         }
 
-        style.set(musicSymbolSizeSid, size);
+        style->set(musicSymbolSizeSid, size);
     }
 }
 

src/engraving/rw/compat/compatutils.h

@@ -47,13 +47,14 @@ class CompatUtils
     static void setHarmonyRootTpcFromFunction(HarmonyInfo* info, const Harmony* h, const muse::String& s);
     static const std::set<SymId> ORNAMENT_IDS;
     static const std::map<Sid, Sid> ALIGN_VALS_TO_CONVERT;
-    static Sid positionStyleFromAlign(Sid align);
+    static void setPositionStylesFromAlign(MStyle* style, std::vector<Sid> ignoreSids = {});
     static void setTextLineTextPositionFromAlign(TextLineBase* tl);
-    static void setMusicSymbolSize470(MStyle& style);
+    static void setMusicSymbolSize470(MStyle* style);
     static Spatium convertPre470FrameRadius(double frameRadius);
     static void doMigrateNoteParens(EngravingItem* item);
 
 private:
+    static Sid positionStyleFromAlign(Sid align);
     static void replaceStaffTextWithPlayTechniqueAnnotation(MasterScore* score);
     static void replaceOldWithNewOrnaments(MasterScore* score);
     static void replaceOldWithNewExpressions(MasterScore* score);

src/engraving/rw/read460/tread.cpp

@@ -4523,7 +4523,7 @@ bool TRead::readProperties(TextBase* t, XmlReader& e, ReadContext& ctx)
     const AsciiStringView tag(e.name());
     for (Pid i : TextBasePropertyId) {
         if (TRead::readProperty(t, tag, e, ctx, i)) {
-            if (ctx.mscVersion() < 470 || tag != "align" || t->isMarker()) {
+            if (ctx.mscVersion() >= 470 || tag != "align" || t->isMarker() || t->isJump() || t->isHarmony()) {
                 return true;
             }
 

src/engraving/style/style.cpp

@@ -638,7 +638,12 @@ void MStyle::read(XmlReader& e, compat::ReadChordListHook* readChordListHook, in
         set(Sid::dividerRightAlignToSystemBarline, false);
 
         // Musical symbol size
-        compat::CompatUtils::setMusicSymbolSize470(*this);
+        compat::CompatUtils::setMusicSymbolSize470(this);
+
+        // Make sure new position styles are initially the same as align values
+        // Exclude text styles which had align & position separated in 4.6
+        compat::CompatUtils::setPositionStylesFromAlign(this, { Sid::chordSymbolAAlign, Sid::chordSymbolBAlign, Sid::romanNumeralAlign,
+                                                                Sid::nashvilleNumberAlign, Sid::repeatLeftAlign, Sid::repeatRightAlign });
 
         if (value(Sid::chordStyle).value<ChordStylePreset>() == ChordStylePreset::JAZZ) {
             set(Sid::harmonyParenUseSmuflSym, true);
@@ -652,14 +657,7 @@ void MStyle::read(XmlReader& e, compat::ReadChordListHook* readChordListHook, in
                                   || value(Sid::maxFretShiftBelow).value<Spatium>() != 0.0_sp;
         set(Sid::verticallyAlignChordSymbols, verticalChordAlign);
         // Make sure new position styles are initially the same as align values
-        for (const StyleDef::StyleValue& st : StyleDef::styleValues) {
-            Sid positionSid = compat::CompatUtils::positionStyleFromAlign(st.sid);
-            if (positionSid == Sid::NOSTYLE) {
-                continue;
-            }
-            AlignH val = value(st.sid).value<Align>().horizontal;
-            set(positionSid, val);
-        }
+        compat::CompatUtils::setPositionStylesFromAlign(this);
 
         if (value(Sid::measureNumberPosition).value<AlignH>() == AlignH::HCENTER) {
             set(Sid::measureNumberHPlacement, AlignH::HCENTER);

src/inspector/qml/MuseScore/Inspector/text/TextInspectorView.qml

@@ -182,19 +182,23 @@ InspectorSectionView {
                 navigationRowEnd: verticalAlignmentButtonList.navigationRowEnd
 
                 isModified: root.model ? (root.model.horizontalAlignment.isModified
-                                          || root.model.verticalAlignment.isModified) : false
+                                          || root.model.verticalAlignment.isModified 
+                                          || root.model.horizontalPosition.isModified) : false
 
                 onRequestResetToDefault: {
                     if (root.model) {
                         root.model.horizontalAlignment.resetToDefault()
                         root.model.verticalAlignment.resetToDefault()
+                        root.model.horizontalPosition.resetToDefault()
                     }
                 }
 
                 onRequestApplyToStyle: {
                     if (root.model) {
                         root.model.horizontalAlignment.applyToStyle()
                         root.model.verticalAlignment.applyToStyle()
+                        root.model.horizontalPosition.applyToStyle()
+
                     }
                 }