fix #286144 : no or wrong style assigned to texts in parts of 2.x scores

musescore · May 11, 2020 · 9740148 · 9740148
1 parent 90ac93a
commit 9740148
Show file tree

Hide file tree

Showing 5 changed files with 2,332 additions and 0 deletions.
diff --git a/libmscore/read206.cpp b/libmscore/read206.cpp
@@ -3804,6 +3804,7 @@ static bool readScore(Score* score, XmlReader& e)
                         e.skipCurrentElement();
                   else {
                         e.tracks().clear();
+                        e.clearUserTextStyles();
                         MasterScore* m = score->masterScore();
                         Score* s = new Score(m, MScore::baseStyle());
                         Excerpt* ex = new Excerpt(m);

diff --git a/libmscore/xml.h b/libmscore/xml.h
@@ -204,6 +204,7 @@ class XmlReader : public QXmlStreamReader {
       void checkTuplets();
       Tid addUserTextStyle(const QString& name);
       Tid lookupUserTextStyle(const QString& name);
+      void clearUserTextStyles() { userTextStyles.clear(); }
 
       // Ownership on read device is NOT transferred to XmlReader.
       void setDevice(QIODevice* dev) { if (!dev->isSequential()) _readDevice = dev; }

diff --git a/mtest/libmscore/compat206/tst_compat206.cpp b/mtest/libmscore/compat206/tst_compat206.cpp
@@ -46,6 +46,7 @@ class TestCompat206 : public QObject, public MTest
       void intrumentNameAlign() {compat("intrumentNameAlign"); }
       void fermata()          { compat("fermata");          }
       void frame_utf8()       { compat("frame_text2");      }
+      void user_style()       { compat("userstylesparts");  }
       };
 
 //---------------------------------------------------------