fix output

musescore · Sep 26, 2024 · d6b1fb6 · d6b1fb6
1 parent ec12b18
commit d6b1fb6
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 24 deletions.
diff --git a/src/importexport/musicxml/internal/musicxml/exportxml.cpp b/src/importexport/musicxml/internal/musicxml/exportxml.cpp
@@ -7746,26 +7746,23 @@ void ExportMusicXml::writeInstrumentChange(const InstrumentChange* instrChange)
     const Part* part = instrChange->part();
     const size_t partNr = muse::indexOf(m_score->parts(), part);
     const int instNr = muse::value(m_instrMap, instr, -1);
-    static const std::wregex acc(L"[♭♯]");
+    const String longName = instr->nameAsPlainText();
+    const String shortName = instr->abbreviatureAsPlainText();
 
     m_xml.startElement("print");
-    m_xml.tag("part-name", instr->nameAsPlainText().replace(u"♭", u"b").replace(u"♯", u"#"));
-    if (instr->nameAsPlainText().contains(acc)) {
+    if (!longName.isEmpty()) {
         m_xml.startElement("part-name-display");
-        writeDisplayName(m_xml, instr->nameAsPlainText());
+        writeDisplayName(m_xml, longName);
         m_xml.endElement();
     }
-    if (!instr->abbreviatureAsPlainText().isEmpty()) {
-        m_xml.tag("part-abbreviation", instr->abbreviatureAsPlainText().replace(u"♭", u"b").replace(u"♯", u"#"));
-        if (instr->abbreviatureAsPlainText().contains(acc)) {
-            m_xml.startElement("part-abbreviation-display");
-            writeDisplayName(m_xml, instr->abbreviatureAsPlainText());
-            m_xml.endElement();
-        }
+    if (!shortName.isEmpty()) {
+        m_xml.startElement("part-abbreviation-display");
+        writeDisplayName(m_xml, shortName);
+        m_xml.endElement();
     }
     m_xml.endElement();
 
-    writeInstrumentDetails(instrChange->instrument(), m_score->style().styleB(Sid::concertPitch));
+    writeInstrumentDetails(instr, m_score->style().styleB(Sid::concertPitch));
 
     m_xml.startElement("sound");
     m_xml.startElement("instrument-change");

diff --git a/src/importexport/musicxml/tests/data/testChangeTranspose-no-diatonic_ref.xml b/src/importexport/musicxml/tests/data/testChangeTranspose-no-diatonic_ref.xml
@@ -101,8 +101,12 @@
           </key>
         </attributes>
       <print>
-        <part-name>A Clarinet</part-name>
-        <part-abbreviation>A Cl.</part-abbreviation>
+        <part-name-display>
+          <display-text>A Clarinet</display-text>
+          </part-name-display>
+        <part-abbreviation-display>
+          <display-text>A Cl.</display-text>
+          </part-abbreviation-display>
         </print>
       <attributes>
         <transpose>

diff --git a/src/importexport/musicxml/tests/data/testChangeTranspose.xml b/src/importexport/musicxml/tests/data/testChangeTranspose.xml
@@ -101,8 +101,12 @@
           </key>
         </attributes>
       <print>
-        <part-name>A Clarinet</part-name>
-        <part-abbreviation>A Cl.</part-abbreviation>
+        <part-name-display>
+          <display-text>A Clarinet</display-text>
+          </part-name-display>
+        <part-abbreviation-display>
+          <display-text>A Cl.</display-text>
+          </part-abbreviation-display>
         </print>
       <attributes>
         <transpose>

diff --git a/src/importexport/musicxml/tests/data/testInstrumentChangeMIDIportExport_ref.xml b/src/importexport/musicxml/tests/data/testInstrumentChangeMIDIportExport_ref.xml
@@ -1061,8 +1061,12 @@
       </measure>
     <measure number="2">
       <print>
-        <part-name>Voice</part-name>
-        <part-abbreviation>Vo.</part-abbreviation>
+        <part-name-display>
+          <display-text>Voice</display-text>
+          </part-name-display>
+        <part-abbreviation-display>
+          <display-text>Vo.</display-text>
+          </part-abbreviation-display>
         </print>
       <sound>
         <instrument-change>

diff --git a/src/importexport/musicxml/tests/data/testMultiInstrumentPart1.xml b/src/importexport/musicxml/tests/data/testMultiInstrumentPart1.xml
@@ -84,8 +84,12 @@
       </measure>
     <measure number="3">
       <print>
-        <part-name>Piano</part-name>
-        <part-abbreviation>Pno.</part-abbreviation>
+        <part-name-display>
+          <display-text>Piano</display-text>
+          </part-name-display>
+        <part-abbreviation-display>
+          <display-text>Pno.</display-text>
+          </part-abbreviation-display>
         </print>
       <sound>
         <instrument-change>

diff --git a/src/importexport/musicxml/tests/data/testMultiInstrumentPart2.xml b/src/importexport/musicxml/tests/data/testMultiInstrumentPart2.xml
@@ -258,8 +258,12 @@
       </measure>
     <measure number="7">
       <print>
-        <part-name>Voice</part-name>
-        <part-abbreviation>Vo.</part-abbreviation>
+        <part-name-display>
+          <display-text>Voice</display-text>
+          </part-name-display>
+        <part-abbreviation-display>
+          <display-text>Vo.</display-text>
+          </part-abbreviation-display>
         </print>
       <sound>
         <instrument-change>

diff --git a/src/importexport/musicxml/tests/data/testMultiInstrumentPart3_ref.xml b/src/importexport/musicxml/tests/data/testMultiInstrumentPart3_ref.xml
@@ -169,13 +169,11 @@
           </key>
         </attributes>
       <print>
-        <part-name>Bb Clarinet</part-name>
         <part-name-display>
           <display-text>B</display-text>
           <accidental-text>flat</accidental-text>
           <display-text> Clarinet</display-text>
           </part-name-display>
-        <part-abbreviation>Bb Cl.</part-abbreviation>
         <part-abbreviation-display>
           <display-text>B</display-text>
           <accidental-text>flat</accidental-text>