Merge pull request #3843 from handrok/#27498Ottavav1.14-do-not-open-i…

…n-3.0 fix #274898 Ottava in score version 1.14 do not open in 3.0
musescore · Aug 7, 2018 · 8d48f52 · 8d48f52
2 parents fde1785 + 13ab878
commit 8d48f52
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 19 deletions.
diff --git a/libmscore/ottava.cpp b/libmscore/ottava.cpp
@@ -57,25 +57,6 @@ static const ElementStyle ottavaElementStyle {
       { Sid::ottavaLineStyle,                    Pid::LINE_STYLE              },
       };
 
-//---------------------------------------------------------
-//   OttavaDefault
-//---------------------------------------------------------
-
-struct OttavaDefault {
-      OttavaType type;
-      int shift;
-      const char* name;
-      };
-
-// order is important, should be the same as OttavaType
-static const OttavaDefault ottavaDefault[] = {
-      { OttavaType::OTTAVA_8VA,  12,  "8va"   },
-      { OttavaType::OTTAVA_8VB,  -12, "8vb"   },
-      { OttavaType::OTTAVA_15MA, 24,  "15ma"  },
-      { OttavaType::OTTAVA_15MB, -24, "15mb"  },
-      { OttavaType::OTTAVA_22MA, 36,  "22ma"  },
-      { OttavaType::OTTAVA_22MB, -36, "22mb"  }
-      };
 
 //---------------------------------------------------------
 //   layout

diff --git a/libmscore/ottava.h b/libmscore/ottava.h
@@ -41,6 +41,27 @@ enum class OttavaType : char {
       OTTAVA_22MB
       };
 
+//---------------------------------------------------------
+//   OttavaDefault
+//---------------------------------------------------------
+
+struct OttavaDefault {
+      OttavaType type;
+      int shift;
+      const char* name;
+      };
+
+// order is important, should be the same as OttavaType
+static const OttavaDefault ottavaDefault[] = {
+      { OttavaType::OTTAVA_8VA,  12,  "8va"   },
+      { OttavaType::OTTAVA_8VB,  -12, "8vb"   },
+      { OttavaType::OTTAVA_15MA, 24,  "15ma"  },
+      { OttavaType::OTTAVA_15MB, -24, "15mb"  },
+      { OttavaType::OTTAVA_22MA, 36,  "22ma"  },
+      { OttavaType::OTTAVA_22MB, -36, "22mb"  }
+      };
+
+
 class Ottava;
 
 //---------------------------------------------------------

diff --git a/libmscore/read114.cpp b/libmscore/read114.cpp
@@ -1178,6 +1178,54 @@ static void readVolta114(XmlReader& e, Volta* volta)
       volta->setAutoplace(true);
       }
 
+//---------------------------------------------------------
+//   readOttava114
+//---------------------------------------------------------
+
+static void readOttava114(XmlReader& e, Ottava* ottava)
+      {
+      while (e.readNextStartElement()) {
+            const QStringRef& tag(e.name());
+            if (tag == "subtype") {
+                  QString s = e.readElementText();
+                  bool ok;
+                  int idx = s.toInt(&ok);
+                  if (!ok) {
+                        idx = int(OttavaType::OTTAVA_8VA);
+                        for (unsigned i = 0; i < sizeof(ottavaDefault)/sizeof(*ottavaDefault); ++i) {
+                              if (s == ottavaDefault[i].name) {
+                                    idx = i;
+                                    break;
+                                    }
+                              }
+                        }
+                  else if (ottava->score()->mscVersion() <= 114) {
+                        //subtype are now in a different order...
+                        if (idx == 1)
+                              idx = 2;
+                        else if (idx == 2)
+                              idx = 1;
+                        }
+                  ottava->setOttavaType(OttavaType(idx));
+                  }
+            else if (tag == "numbersOnly") {
+                  ottava->setNumbersOnly(e.readInt());
+                  }
+            else if (tag == "lineWidth") {
+                  ottava->setLineWidth(e.readDouble() * ottava->spatium());
+                  }
+            else if (tag == "lineStyle") {
+                  ottava->setLineStyle(Qt::PenStyle(e.readInt()));
+                  }
+            else if (tag == "beginSymbol") {                      // obsolete
+                  }
+            else if (tag == "continueSymbol") {                   // obsolete
+                  }
+            else if (!readTextLineProperties114(e, ottava))
+                  e.unknown();
+            }
+      }
+
 //---------------------------------------------------------
 //   readHarmony114
 //---------------------------------------------------------
@@ -2750,6 +2798,8 @@ Score::FileError MasterScore::read114(XmlReader& e)
                   Spanner* s = toSpanner(Element::name2Element(tag, this));
                   if (tag == "Volta")
                         readVolta114(e, toVolta(s));
+                  else if (tag == "Ottava")
+                        readOttava114(e, toOttava(s));
                   else
                         s->read(e);
                   if (s->track() == -1)