Fix frame reading and writing

musescore · Aug 9, 2024 · 119fb95 · 119fb95
1 parent 3f70187
commit 119fb95
Show file tree

Hide file tree

Showing 130 changed files with 167 additions and 12 deletions.
diff --git a/src/engraving/rw/read114/read114.cpp b/src/engraving/rw/read114/read114.cpp
@@ -2217,8 +2217,6 @@ static bool readBoxProperties(XmlReader& e, ReadContext& ctx, Box* b)
         VBox* vb = Factory::createVBox(b->system());
         readBox(e, ctx, vb);
         b->add(vb);
-        // If nested inside title frame, don't scale with spatium
-        vb->setSizeIsSpatiumDependent(!b->isTitleFrame());
     }
 //      else if (MeasureBase::readProperties(e))
 //            ;
@@ -2253,8 +2251,6 @@ static void readBox(XmlReader& e, ReadContext& ctx, Box* b)
             readBox(e, ctx, vb);
             b->add(vb);
             keepMargins = true;           // in old file, box nesting used outer box margins
-            // If nested inside title frame, don't scale with spatium
-            vb->setSizeIsSpatiumDependent(!b->isTitleFrame());
         } else if (!readBoxProperties(e, ctx, b)) {
             e.unknown();
         }
@@ -2338,7 +2334,6 @@ static void readStaffContent(Score* score, XmlReader& e, ReadContext& ctx)
             readBox(e, ctx, mb);
             mb->setTick(ctx.tick());
             score->measures()->add(mb);
-            mb->setSizeIsSpatiumDependent(!mb->isTitleFrame());
         } else if (tag == "tick") {
             ctx.setTick(Fraction::fromTicks(score->fileDivision(e.readInt())));
         } else {

diff --git a/src/engraving/rw/read206/read206.cpp b/src/engraving/rw/read206/read206.cpp
@@ -3037,8 +3037,6 @@ static void readBox(Box* b, XmlReader& e, ReadContext& ctx)
             VBox* vb = Factory::createVBox(b->score()->dummy()->system());
             read400::TRead::read(vb, e, ctx);
             b->add(vb);
-            // If nested inside title frame, don't scale with spatium
-            vb->setSizeIsSpatiumDependent(!b->isTitleFrame());
         } else if (tag == "Text") {
             Text* t;
             if (b->isTBox()) {
@@ -3124,7 +3122,6 @@ static void readStaffContent206(Score* score, XmlReader& e, ReadContext& ctx)
                 if (!readMeasureLast && !lastReadBox) {
                     b->setTopGap(b->propertyDefault(Pid::TOP_GAP).value<Spatium>());
                     b->setPropertyFlags(Pid::TOP_GAP, PropertyFlags::STYLED);
-                    b->setSizeIsSpatiumDependent(false);
                 } else if (readMeasureLast) {
                     b->setTopGap(b->topGap() + b->propertyDefault(Pid::TOP_GAP).value<Spatium>());
                 }

diff --git a/src/engraving/rw/read400/staffrw.cpp b/src/engraving/rw/read400/staffrw.cpp
@@ -83,10 +83,14 @@ void StaffRead::readStaff(Score* score, XmlReader& e, ReadContext& ctx)
                 }
             } else if (tag == "HBox" || tag == "VBox" || tag == "TBox" || tag == "FBox") {
                 MeasureBase* mb = toMeasureBase(Factory::createItemByName(tag, ctx.dummy()));
-                TRead::readItem(mb, e, ctx);
                 mb->setTick(ctx.tick());
                 score->measures()->add(mb);
-                mb->setSizeIsSpatiumDependent(!toBox(mb)->isTitleFrame());
+                // This default value needs initialising after being added to the score, as it depends on whether this is the title frame
+                if (mb->score()->mscVersion() >= 440) {
+                    mb->setSizeIsSpatiumDependent(mb->propertyDefault(Pid::SIZE_SPATIUM_DEPENDENT).toBool());
+                }
+
+                TRead::readItem(mb, e, ctx);
             } else if (tag == "tick") {
                 ctx.setTick(Fraction::fromTicks(ctx.fileDivision(e.readInt())));
             } else {

diff --git a/src/engraving/rw/read400/tread.cpp b/src/engraving/rw/read400/tread.cpp
@@ -1993,6 +1993,9 @@ void TRead::read(Box* b, XmlReader& e, ReadContext& ctx)
     if (b->score()->mscVersion() < 302) {
         b->setAutoSizeEnabled(false);    // disable auto-size for older scores by default.
     }
+    if (b->score()->mscVersion() < 440) {
+        b->setSizeIsSpatiumDependent(true);
+    }
 }
 
 void TRead::read(HBox* b, XmlReader& e, ReadContext& ctx)
@@ -2005,6 +2008,9 @@ void TRead::read(HBox* b, XmlReader& e, ReadContext& ctx)
     if (b->score()->mscVersion() < 302) {
         b->setAutoSizeEnabled(false);    // disable auto-size for older scores by default.
     }
+    if (b->score()->mscVersion() < 440) {
+        b->setSizeIsSpatiumDependent(true);
+    }
 }
 
 bool TRead::readProperties(HBox* b, XmlReader& e, ReadContext& ctx)

diff --git a/src/engraving/rw/read410/staffread.cpp b/src/engraving/rw/read410/staffread.cpp
@@ -83,10 +83,14 @@ void StaffRead::readStaff(Score* score, XmlReader& e, ReadContext& ctx)
                 }
             } else if (tag == "HBox" || tag == "VBox" || tag == "TBox" || tag == "FBox") {
                 MeasureBase* mb = toMeasureBase(Factory::createItemByName(tag, ctx.dummy()));
-                TRead::readItem(mb, e, ctx);
                 mb->setTick(ctx.tick());
                 score->measures()->add(mb);
-                mb->setSizeIsSpatiumDependent(!toBox(mb)->isTitleFrame());
+                // This default value needs initialising after being added to the score, as it depends on whether this is the title frame
+                if (mb->score()->mscVersion() >= 440) {
+                    mb->setSizeIsSpatiumDependent(mb->propertyDefault(Pid::SIZE_SPATIUM_DEPENDENT).toBool());
+                }
+
+                TRead::readItem(mb, e, ctx);
             } else if (tag == "tick") {
                 ctx.setTick(Fraction::fromTicks(ctx.fileDivision(e.readInt())));
             } else {

diff --git a/src/engraving/rw/read410/tread.cpp b/src/engraving/rw/read410/tread.cpp
@@ -2177,6 +2177,9 @@ void TRead::read(Box* b, XmlReader& e, ReadContext& ctx)
     if (b->score()->mscVersion() < 302) {
         b->setAutoSizeEnabled(false);    // disable auto-size for older scores by default.
     }
+    if (b->score()->mscVersion() < 440) {
+        b->setSizeIsSpatiumDependent(true);
+    }
 }
 
 void TRead::read(HBox* b, XmlReader& e, ReadContext& ctx)
@@ -2189,6 +2192,9 @@ void TRead::read(HBox* b, XmlReader& e, ReadContext& ctx)
     if (b->score()->mscVersion() < 302) {
         b->setAutoSizeEnabled(false);    // disable auto-size for older scores by default.
     }
+    if (b->score()->mscVersion() < 440) {
+        b->setSizeIsSpatiumDependent(true);
+    }
 }
 
 bool TRead::readProperties(HBox* b, XmlReader& e, ReadContext& ctx)

diff --git a/src/engraving/tests/box_data/undoRemoveVBox2-ref.mscx b/src/engraving/tests/box_data/undoRemoveVBox2-ref.mscx
@@ -84,6 +84,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>VBox</text>

diff --git a/src/engraving/tests/chordsymbol_data/add-part-ref.mscx b/src/engraving/tests/chordsymbol_data/add-part-ref.mscx
@@ -169,6 +169,7 @@
       <Staff id="1">
         <VBox>
           <height>10</height>
+          <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
           </VBox>
         <Measure>
           <voice>

diff --git a/src/engraving/tests/chordsymbol_data/realize-concert-pitch-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-concert-pitch-ref.mscx
@@ -92,6 +92,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         </VBox>
       <Measure>
         <voice>

diff --git a/src/engraving/tests/chordsymbol_data/realize-duration-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-duration-ref.mscx
@@ -90,6 +90,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         </VBox>
       <Measure>
         <voice>

diff --git a/src/engraving/tests/chordsymbol_data/realize-jazz-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-jazz-ref.mscx
@@ -97,6 +97,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         </VBox>
       <Measure>
         <voice>

diff --git a/src/engraving/tests/chordsymbol_data/realize-transpose-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-transpose-ref.mscx
@@ -74,6 +74,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         </VBox>
       <Measure>
         <voice>

diff --git a/src/engraving/tests/chordsymbol_data/realize-triplet-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-triplet-ref.mscx
@@ -90,6 +90,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         </VBox>
       <Measure>
         <voice>

diff --git a/src/engraving/tests/chordsymbol_data/transpose-part-ref.mscx b/src/engraving/tests/chordsymbol_data/transpose-part-ref.mscx
@@ -74,6 +74,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <linkedMain/>
         </VBox>
       <Measure>
@@ -188,6 +189,7 @@
       <Staff id="1">
         <VBox>
           <height>10</height>
+          <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
           <linked>
             </linked>
           <Text>

diff --git a/src/engraving/tests/chordsymbol_data/transpose-ref.mscx b/src/engraving/tests/chordsymbol_data/transpose-ref.mscx
@@ -74,6 +74,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         </VBox>
       <Measure>
         <voice>

diff --git a/src/engraving/tests/clef_data/clef-2-ref.mscx b/src/engraving/tests/clef_data/clef-2-ref.mscx
@@ -73,6 +73,7 @@
     <Staff id="1">
       <VBox>
         <height>10</height>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>ClefTimeSig</text>

diff --git a/src/engraving/tests/compat114_data/clefs-ref.mscx b/src/engraving/tests/compat114_data/clefs-ref.mscx
@@ -66,6 +66,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Clefs</text>

diff --git a/src/engraving/tests/compat114_data/fingering-ref.mscx b/src/engraving/tests/compat114_data/fingering-ref.mscx
@@ -74,6 +74,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>fing</text>

diff --git a/src/engraving/tests/compat114_data/hairpin-ref.mscx b/src/engraving/tests/compat114_data/hairpin-ref.mscx
@@ -70,6 +70,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Hairpin</text>

diff --git a/src/engraving/tests/compat114_data/keysig-ref.mscx b/src/engraving/tests/compat114_data/keysig-ref.mscx
@@ -65,6 +65,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>keysig</text>

diff --git a/src/engraving/tests/compat114_data/notes-ref.mscx b/src/engraving/tests/compat114_data/notes-ref.mscx
@@ -65,6 +65,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>notes</text>

diff --git a/src/engraving/tests/compat114_data/textstyles-ref.mscx b/src/engraving/tests/compat114_data/textstyles-ref.mscx
@@ -70,6 +70,7 @@
       <VBox>
         <height>6.36254</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Title</text>

diff --git a/src/engraving/tests/compat114_data/title-ref.mscx b/src/engraving/tests/compat114_data/title-ref.mscx
@@ -70,6 +70,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>title</text>

diff --git a/src/engraving/tests/compat114_data/tuplets-ref.mscx b/src/engraving/tests/compat114_data/tuplets-ref.mscx
@@ -63,6 +63,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Tuplets</text>

diff --git a/src/engraving/tests/compat114_data/tuplets_1-ref.mscx b/src/engraving/tests/compat114_data/tuplets_1-ref.mscx
@@ -63,6 +63,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Tuplet 1.3 file</text>

diff --git a/src/engraving/tests/compat114_data/tuplets_2-ref.mscx b/src/engraving/tests/compat114_data/tuplets_2-ref.mscx
@@ -63,6 +63,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Tuplet 1.3 file</text>

diff --git a/src/engraving/tests/compat206_data/articulations-double-ref.mscx b/src/engraving/tests/compat206_data/articulations-double-ref.mscx
@@ -56,6 +56,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <linkedMain/>
         <Text>
           <linkedMain/>
@@ -1855,6 +1856,7 @@
         <VBox>
           <height>10</height>
           <boxAutoSize>0</boxAutoSize>
+          <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
           <linked>
             </linked>
           <Text>

diff --git a/src/engraving/tests/compat206_data/articulations-ref.mscx b/src/engraving/tests/compat206_data/articulations-ref.mscx
@@ -75,6 +75,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Articulations</text>

diff --git a/src/engraving/tests/compat206_data/barlines-ref.mscx b/src/engraving/tests/compat206_data/barlines-ref.mscx
@@ -425,6 +425,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>barlines</text>

diff --git a/src/engraving/tests/compat206_data/clefs-ref.mscx b/src/engraving/tests/compat206_data/clefs-ref.mscx
@@ -73,6 +73,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>clefs</text>

diff --git a/src/engraving/tests/compat206_data/frame_text2-ref.mscx b/src/engraving/tests/compat206_data/frame_text2-ref.mscx
@@ -191,6 +191,7 @@
         <height>25.5926</height>
         <topMargin>3</topMargin>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>frame</style>
           <text>îèéààéà</text>

diff --git a/src/engraving/tests/compat206_data/hairpin-ref.mscx b/src/engraving/tests/compat206_data/hairpin-ref.mscx
@@ -83,6 +83,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <linkedMain/>
         <Text>
           <linkedMain/>
@@ -670,6 +671,7 @@
         <VBox>
           <height>10</height>
           <boxAutoSize>0</boxAutoSize>
+          <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
           <linked>
             </linked>
           <Text>

diff --git a/src/engraving/tests/compat206_data/lidemptytext-ref.mscx b/src/engraving/tests/compat206_data/lidemptytext-ref.mscx
@@ -135,6 +135,7 @@
         <height>8</height>
         <bottomGap>13</bottomGap>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         </VBox>
       <Measure>
         <voice>
@@ -304,6 +305,7 @@
           <height>8</height>
           <bottomGap>13</bottomGap>
           <boxAutoSize>0</boxAutoSize>
+          <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
           <Text>
             <style>instrument_excerpt</style>
             <text>Bass</text>

diff --git a/src/engraving/tests/compat206_data/textstyles-ref.mscx b/src/engraving/tests/compat206_data/textstyles-ref.mscx
@@ -231,6 +231,7 @@
         <height>7</height>
         <bottomGap>8.33333</bottomGap>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Title</text>

diff --git a/src/engraving/tests/compat206_data/tuplets-ref.mscx b/src/engraving/tests/compat206_data/tuplets-ref.mscx
@@ -74,6 +74,7 @@
       <VBox>
         <height>10</height>
         <boxAutoSize>0</boxAutoSize>
+        <sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
         <Text>
           <style>title</style>
           <text>Tuplets</text>