fix #279373: manage default placement for ottavas

musescore · Jan 8, 2019 · 4e3dcb8 · 4e3dcb8
1 parent 1079b3d
commit 4e3dcb8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/libmscore/ottava.cpp b/libmscore/ottava.cpp
@@ -257,6 +257,7 @@ void Ottava::write(XmlWriter& xml) const
             return;
       xml.stag(this);
       xml.tag("subtype", ottavaDefault[int(ottavaType())].name);
+      writeProperty(xml, Pid::PLACEMENT);
 //      for (const StyledProperty& spp : *styledProperties())
 //            writeProperty(xml, spp.pid);
       TextLineBase::writeProperties(xml);
@@ -401,6 +402,8 @@ QVariant Ottava::propertyDefault(Pid pid) const
                   return Spatium(.0);
             case Pid::END_TEXT:
                   return QString("");
+            case Pid::PLACEMENT:
+                  return styleValue(Pid::PLACEMENT, getPropertyStyle(Pid::PLACEMENT));
 
             default:
                   return TextLineBase::propertyDefault(pid);

diff --git a/libmscore/textlinebase.cpp b/libmscore/textlinebase.cpp
@@ -444,7 +444,7 @@ void TextLineBase::writeProperties(XmlWriter& xml) const
 bool TextLineBase::readProperties(XmlReader& e)
       {
       const QStringRef& tag(e.name());
-      for (Pid i :pids) {
+      for (Pid i : pids) {
             if (readProperty(tag, e, i)) {
                   setPropertyFlags(i, PropertyFlags::UNSTYLED);
                   return true;