port of PR 7453 for master

src/libmscore/pedal.cpp

@@ -110,7 +110,9 @@ void Pedal::read(XmlReader& e)
         e.addSpanner(e.intAttribute("id", -1), this);
     }
     while (e.readNextStartElement()) {
-        if (!TextLineBase::readProperties(e)) {
+        const QStringRef& tag(e.name());
+        if (readStyledProperty(e, tag)) {
+        } else if (!TextLineBase::readProperties(e)) {
             e.unknown();
         }
     }

src/libmscore/rest.cpp

@@ -886,6 +886,7 @@ void Rest::write(XmlWriter& xml) const
     }
     writeBeam(xml);
     xml.stag(this);
+    writeStyledProperties(xml);
     ChordRest::writeProperties(xml);
     el().write(xml);
     bool write_dots = false;
@@ -929,6 +930,7 @@ void Rest::read(XmlReader& e)
             NoteDot* dot = new NoteDot(score());
             dot->read(e);
             add(dot);
+        } else if (readStyledProperty(e, tag)) {
         } else if (ChordRest::readProperties(e)) {
         } else {
             e.unknown();

src/libmscore/score.cpp

@@ -395,6 +395,8 @@ Score::~Score()
 
 Score* Score::clone()
 {
+    // TODO: see comments reagrding setting version in corresponding code in 3.x branch
+    // and also compare to MasterScore::clone()
     Excerpt* excerpt = new Excerpt(masterScore());
     excerpt->setTitle(title());
 

src/libmscore/tuplet.cpp

@@ -194,6 +194,12 @@ void Tuplet::layout()
             _number->setVisible(visible());
             resetNumberProperty();
         }
+        // tuplet properties are propagated to number automatically by setProperty()
+        // but we need to make sure flags are as well
+        _number->setPropertyFlags(Pid::FONT_FACE, propertyFlags(Pid::FONT_FACE));
+        _number->setPropertyFlags(Pid::FONT_SIZE, propertyFlags(Pid::FONT_SIZE));
+        _number->setPropertyFlags(Pid::FONT_STYLE, propertyFlags(Pid::FONT_STYLE));
+        _number->setPropertyFlags(Pid::ALIGN, propertyFlags(Pid::ALIGN));
         if (_numberType == TupletNumberType::SHOW_NUMBER) {
             _number->setXmlText(QString("%1").arg(_ratio.numerator()));
         } else {
@@ -797,7 +803,8 @@ void Tuplet::write(XmlWriter& xml) const
 
     if (_number) {
         xml.stag("Number", _number);
-        _number->writeProperties(xml);
+        _number->writeProperty(xml, Pid::SUB_STYLE);
+        _number->writeProperty(xml, Pid::TEXT);
         xml.etag();
     }
 
@@ -834,19 +841,25 @@ bool Tuplet::readProperties(XmlReader& e)
     if (readStyledProperty(e, tag)) {
     } else if (tag == "bold") { //important that these properties are read after number is created
         bool val = e.readInt();
-        _number->setBold(val);
+        if (_number) {
+            _number->setBold(val);
+        }
         if (isStyled(Pid::FONT_STYLE)) {
             setPropertyFlags(Pid::FONT_STYLE, PropertyFlags::UNSTYLED);
         }
     } else if (tag == "italic") {
         bool val = e.readInt();
-        _number->setItalic(val);
+        if (_number) {
+            _number->setItalic(val);
+        }
         if (isStyled(Pid::FONT_STYLE)) {
             setPropertyFlags(Pid::FONT_STYLE, PropertyFlags::UNSTYLED);
         }
     } else if (tag == "underline") {
         bool val = e.readInt();
-        _number->setUnderline(val);
+        if (_number) {
+            _number->setUnderline(val);
+        }
         if (isStyled(Pid::FONT_STYLE)) {
             setPropertyFlags(Pid::FONT_STYLE, PropertyFlags::UNSTYLED);
         }

src/libmscore/volta.cpp

@@ -149,6 +149,7 @@ void Volta::read(XmlReader& e)
                 int i = l.simplified().toInt();
                 _endings.append(i);
             }
+        } else if (readStyledProperty(e, tag)) {
         } else if (!readProperties(e)) {
             e.unknown();
         }