Fix #320818: Chord symbols with a bass extension don't export to Musi…

…cXML correctly (nor import back)
musescore · Jun 22, 2023 · 05d15f9 · 05d15f9
1 parent d49baaf
commit 05d15f9
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/src/importexport/musicxml/internal/musicxml/exportxml.cpp b/src/importexport/musicxml/internal/musicxml/exportxml.cpp
@@ -7758,6 +7758,18 @@ void ExportMusicXml::harmony(Harmony const* const h, FretDiagram const* const fd
                 s += " parentheses-degrees=\"yes\"";
             }
             _xml.tagRaw(s, h->xmlKind());
+
+            int baseTpc = h->baseTpc();
+            if (baseTpc != Tpc::TPC_INVALID) {
+                _xml.startElement("bass");
+                _xml.tag("bass-step", tpc2stepName(baseTpc));
+                alter = int(tpc2alter(baseTpc));
+                if (alter) {
+                    _xml.tag("bass-alter", alter);
+                }
+                _xml.endElement();
+            }
+
             StringList l = h->xmlDegrees();
             if (!l.empty()) {
                 for (const String& _tag : qAsConst(l)) {
@@ -7806,18 +7818,19 @@ void ExportMusicXml::harmony(Harmony const* const h, FretDiagram const* const fd
             } else {
                 _xml.tag("kind", { { "text", h->extensionName() } }, "");
             }
-        }
 
-        int baseTpc = h->baseTpc();
-        if (baseTpc != Tpc::TPC_INVALID) {
-            _xml.startElement("bass");
-            _xml.tag("bass-step", tpc2stepName(baseTpc));
-            alter = int(tpc2alter(baseTpc));
-            if (alter) {
-                _xml.tag("bass-alter", alter);
+            int baseTpc = h->baseTpc();
+            if (baseTpc != Tpc::TPC_INVALID) {
+                _xml.startElement("bass");
+                _xml.tag("bass-step", tpc2stepName(baseTpc));
+                alter = int(tpc2alter(baseTpc));
+                if (alter) {
+                    _xml.tag("bass-alter", alter);
+                }
+                _xml.endElement();
             }
-            _xml.endElement();
         }
+
         if (offset > 0) {
             _xml.tag("offset", offset);
         }