fix #296960: Percent sign cannot be entered into text.

Resolves: https://musescore.org/en/node/296960.
musescore · Nov 13, 2019 · 33ff467 · 33ff467
1 parent 44a0382
commit 33ff467
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/libmscore/xmlwriter.cpp b/libmscore/xmlwriter.cpp
@@ -334,8 +334,6 @@ QString XmlWriter::xmlString(ushort c)
                   return QLatin1String("&amp;");
             case '\"':
                   return QLatin1String("&quot;");
-            case '%':
-                  return QLatin1String("&#37;");
             default:
                   // ignore invalid characters in xml 1.0
                   if ((c < 0x20 && c != 0x09 && c != 0x0A && c != 0x0D))

diff --git a/mscore/palette/palettetree.cpp b/mscore/palette/palettetree.cpp
@@ -212,11 +212,11 @@ void PaletteCell::write(XmlWriter& xml) const
       // using attributes for `custom` and `visible`
       // properties instead of nested tags for pre-3.3
       // version compatibility
-      xml.stag(QString("Cell%1%2%3%4")
-         .arg(!name.isEmpty() ? QString(" name=\"%1\"").arg(XmlWriter::xmlString(name)) : "")
-         .arg(custom ? " custom=\"1\"" : "")
-         .arg(!visible ? " visible=\"0\"" : "")
-         .arg(untranslatedElement ? " trElement=\"1\"" : "")
+      xml.stag(QString("Cell")
+         + (!name.isEmpty() ? " name=\"" + XmlWriter::xmlString(name) + "\"" : "")
+         + (custom ? " custom=\"1\"" : "")
+         + (!visible ? " visible=\"0\"" : "")
+         + (untranslatedElement ? " trElement=\"1\"" : "")
          );
 
       if (drawStaff)