Fix GH#16363: Accidentals in chord symbols rendered incorrectly when …

…using custom XML file
musescore · Apr 23, 2024 · 9e939b2 · 9e939b2
1 parent 8526264
commit 9e939b2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/engraving/dom/chordlist.cpp b/src/engraving/dom/chordlist.cpp
@@ -1685,6 +1685,10 @@ void ChordList::read(XmlReader& e)
                     String code = e.attribute("code");
                     String symClass = e.attribute("class");
                     if (!code.empty()) {
+                        if (!code.startsWith(u"0x") && !code.startsWith(u"0") && !code.startsWith('&') && !code.endsWith(';')) {
+                            // fix broken chord lists, see https://github.com/musescore/MuseScore/issues/16363
+                            code = u"0x" + code;
+                        }
                         bool ok = true;
                         char32_t val = code.toUInt(&ok, 0);
                         if (!ok) {
@@ -1780,7 +1784,8 @@ void ChordList::write(XmlWriter& xml) const
                 if (s.code.isNull()) {
                     xml.tag("sym", { { "name", s.name }, { "value", s.value } });
                 } else {
-                    xml.tag("sym", { { "name", s.name }, { "code", String::number(s.code.unicode(), 16) } });
+                    // write hex numbers with a "0x" prefix, so they can convert back properly on read
+                    xml.tag("sym", { { "name", s.name }, { "code", u"0x" + String::number(s.code.unicode(), 16) } });
                 }
             }
         }