fixed reading of scores with excerpts

musescore · Aug 6, 2021 · f6e0502 · f6e0502
1 parent 77a7e30
commit f6e0502
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 41 deletions.
diff --git a/src/engraving/libmscore/masterscore.cpp b/src/engraving/libmscore/masterscore.cpp
@@ -533,7 +533,7 @@ Score::FileError MasterScore::read(XmlReader& e, bool ignoreVersionError, mu::en
                 error = compat::Read114::read114(this, e);
             } else if (mscVersion() <= 207) {
                 error = compat::Read206::read206(this, e);
-            } else if (mscVersion() <= 400) {
+            } else if (mscVersion() < 400) {
                 error = compat::Read302::read302(this, e);
             } else {
                 error = doRead(e);
@@ -559,7 +559,7 @@ Score::FileError MasterScore::doRead(XmlReader& e)
         } else if (tag == "programRevision") {
             setMscoreRevision(e.readIntHex());
         } else if (tag == "Score") {
-            if (!Score::read400(e)) {
+            if (!Score::readScore400(e)) {
                 if (e.error() == QXmlStreamReader::CustomError) {
                     return FileError::FILE_CRITICALLY_CORRUPTED;
                 }

diff --git a/src/engraving/libmscore/read400.cpp b/src/engraving/libmscore/read400.cpp
@@ -33,18 +33,6 @@ using namespace Ms;
 
 bool Score::read400(XmlReader& e)
 {
-    // HACK
-    // style setting compatibility settings for minor versions
-    // this allows new style settings to be added
-    // with different default values for older vs newer scores
-    // note: older templates get the default values for older scores
-    // these can be forced back in MuseScore::getNewFile() if necessary
-    QString programVersion = masterScore()->mscoreVersion();
-    bool disableHarmonyPlay = MScore::harmonyPlayDisableCompatibility && !MScore::testMode;
-    if (!programVersion.isEmpty() && programVersion < "3.5" && disableHarmonyPlay) {
-        style().set(Sid::harmonyPlay, false);
-    }
-
     if (!e.readNextStartElement()) {
         qDebug("%s: xml file is empty", qPrintable(e.getDocName()));
         return false;
@@ -72,38 +60,23 @@ bool Score::read400(XmlReader& e)
         return false;
     }
 
-    connectTies();
-    relayoutForStyles(); // force relayout if certain style settings are enabled
-
-    _fileDivision = MScore::division;
-
-    // Make sure every instrument has an instrumentId set.
-    for (Part* part : parts()) {
-        const InstrumentList* il = part->instruments();
-        for (auto it = il->begin(); it != il->end(); it++) {
-            static_cast<Instrument*>(it->second)->updateInstrumentId();
-        }
-    }
-
-    fixTicks();
-
-    for (Part* p : qAsConst(_parts)) {
-        p->updateHarmonyChannels(false);
-    }
-
-    masterScore()->rebuildMidiMapping();
-    masterScore()->updateChannel();
-
-    for (Staff* staff : staves()) {
-        staff->updateOttava();
-    }
-
-//      createPlayEvents();
     return true;
 }
 
 bool Score::readScore400(XmlReader& e)
 {
+    // HACK
+    // style setting compatibility settings for minor versions
+    // this allows new style settings to be added
+    // with different default values for older vs newer scores
+    // note: older templates get the default values for older scores
+    // these can be forced back in MuseScore::getNewFile() if necessary
+    QString programVersion = masterScore()->mscoreVersion();
+    bool disableHarmonyPlay = MScore::harmonyPlayDisableCompatibility && !MScore::testMode;
+    if (!programVersion.isEmpty() && programVersion < "3.5" && disableHarmonyPlay) {
+        style().set(Sid::harmonyPlay, false);
+    }
+
     while (e.readNextStartElement()) {
         e.setTrack(-1);
         const QStringRef& tag(e.name());
@@ -236,5 +209,33 @@ bool Score::readScore400(XmlReader& e)
         return false;
     }
 
+    connectTies();
+    relayoutForStyles(); // force relayout if certain style settings are enabled
+
+    _fileDivision = MScore::division;
+
+    // Make sure every instrument has an instrumentId set.
+    for (Part* part : parts()) {
+        const InstrumentList* il = part->instruments();
+        for (auto it = il->begin(); it != il->end(); it++) {
+            static_cast<Instrument*>(it->second)->updateInstrumentId();
+        }
+    }
+
+    fixTicks();
+
+    for (Part* p : qAsConst(_parts)) {
+        p->updateHarmonyChannels(false);
+    }
+
+    masterScore()->rebuildMidiMapping();
+    masterScore()->updateChannel();
+
+    for (Staff* staff : staves()) {
+        staff->updateOttava();
+    }
+
+//      createPlayEvents();
+
     return true;
 }