Merge pull request #32455 from rettinghaus/xml/style

[MusicXML] Fix unwanted text style setting

Author: miiizen

src/importexport/musicxml/internal/import/importmusicxmlpass1.cpp

@@ -1837,14 +1837,17 @@ static void updateStyles(Score* score,
         // Roman numeral analysis and harp pedal diagrams (special case, leave untouched)
         // and text types used in the title frame
         // Some further tweaking may still be required.
+        if (wordFamily.empty()) {
+            break; // If no font is specified, use default styles
+        }
 
         if (tid == TextStyleType::LYRICS_ODD || tid == TextStyleType::LYRICS_EVEN
             || tid == TextStyleType::FRET_DIAGRAM_FINGERING || tid == TextStyleType::FRET_DIAGRAM_FRET_NUMBER
-            || tid == TextStyleType::TAB_FRET_NUMBER) {
+            || tid == TextStyleType::HARMONY_ROMAN || tid == TextStyleType::TAB_FRET_NUMBER) {
             continue;
         }
 
-        bool needUseDefaultSize = configuration()->needUseDefaultFont() || tid == TextStyleType::HARMONY_ROMAN
+        bool needUseDefaultSize = configuration()->needUseDefaultFont()
                                   || tid == TextStyleType::HAMMER_ON_PULL_OFF
                                   || isTitleFrameStyle(tid)
                                   || isHarpPedalStyle(tid);
@@ -1860,13 +1863,15 @@ static void updateStyles(Score* score,
     }
 
     // handle lyrics odd and even lines separately
-    if (!needUseDefaultFont) {
-        score->style().set(Sid::lyricsOddFontFace, lyricFamily);
-        score->style().set(Sid::lyricsEvenFontFace, lyricFamily);
-    }
-    if (dblLyricSize > epsilon) {
-        score->style().set(Sid::lyricsOddFontSize, dblLyricSize);
-        score->style().set(Sid::lyricsEvenFontSize, dblLyricSize);
+    if (!lyricFamily.empty()) {
+        if (!needUseDefaultFont) {
+            score->style().set(Sid::lyricsOddFontFace, lyricFamily);
+            score->style().set(Sid::lyricsEvenFontFace, lyricFamily);
+        }
+        if (dblLyricSize > epsilon) {
+            score->style().set(Sid::lyricsOddFontSize, dblLyricSize);
+            score->style().set(Sid::lyricsEvenFontSize, dblLyricSize);
+        }
     }
 }
 
@@ -2081,7 +2086,6 @@ void MusicXmlParserPass1::defaults()
            muPrintable(wordFontFamily), muPrintable(wordFontSize),
            muPrintable(lyricFontFamily), muPrintable(lyricFontSize));
     */
-    wordFontFamily = wordFontFamily.empty() ? u"Edwin" : wordFontFamily;
     lyricFontFamily = lyricFontFamily.empty() ? wordFontFamily : lyricFontFamily;
     updateStyles(m_score, wordFontFamily, wordFontSize, lyricFontFamily, lyricFontSize);
 

src/importexport/musicxml/tests/data/importTie2_ref.mscx

@@ -28,7 +28,6 @@
       <chordSymbolAFontSize>10.25</chordSymbolAFontSize>
       <chordSymbolBFontFace>Times New Roman</chordSymbolBFontFace>
       <chordSymbolBFontSize>10.25</chordSymbolBFontSize>
-      <romanNumeralFontFace>Times New Roman</romanNumeralFontFace>
       <nashvilleNumberFontFace>Times New Roman</nashvilleNumberFontFace>
       <nashvilleNumberFontSize>10.25</nashvilleNumberFontSize>
       <smallNoteMag>0.6</smallNoteMag>

src/importexport/musicxml/tests/data/importTie3_ref.mscx

@@ -25,7 +25,6 @@
       <ledgerLineWidth>0.15625</ledgerLineWidth>
       <chordSymbolAFontFace>Times New Roman</chordSymbolAFontFace>
       <chordSymbolBFontFace>Times New Roman</chordSymbolBFontFace>
-      <romanNumeralFontFace>Times New Roman</romanNumeralFontFace>
       <nashvilleNumberFontFace>Times New Roman</nashvilleNumberFontFace>
       <smallNoteMag>0.75</smallNoteMag>
       <graceNoteMag>0.6</graceNoteMag>

src/importexport/musicxml/tests/data/importTie4_ref.mscx

@@ -27,7 +27,6 @@
       <chordSymbolAFontSize>22</chordSymbolAFontSize>
       <chordSymbolBFontFace>Palatino,serif</chordSymbolBFontFace>
       <chordSymbolBFontSize>22</chordSymbolBFontSize>
-      <romanNumeralFontFace>Palatino,serif</romanNumeralFontFace>
       <nashvilleNumberFontFace>Palatino,serif</nashvilleNumberFontFace>
       <nashvilleNumberFontSize>22</nashvilleNumberFontSize>
       <smallNoteMag>0.75</smallNoteMag>

src/importexport/musicxml/tests/data/testArpCrossVoice_ref.mscx

@@ -13,7 +13,6 @@
       <pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
       <pageOddTopMargin>0.590551</pageOddTopMargin>
       <pageOddBottomMargin>0.590551</pageOddBottomMargin>
-      <romanNumeralFontFace>Edwin</romanNumeralFontFace>
       <nashvilleNumberFontSize>10</nashvilleNumberFontSize>
       <hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
       <tupletFontSize>10</tupletFontSize>

src/importexport/musicxml/tests/data/testArpOnRest_ref.mscx

@@ -13,7 +13,6 @@
       <pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
       <pageOddTopMargin>0.590551</pageOddTopMargin>
       <pageOddBottomMargin>0.590551</pageOddBottomMargin>
-      <romanNumeralFontFace>Edwin</romanNumeralFontFace>
       <nashvilleNumberFontSize>10</nashvilleNumberFontSize>
       <hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
       <tupletFontSize>10</tupletFontSize>

src/importexport/musicxml/tests/data/testBarlineLoc_ref.mscx

@@ -13,7 +13,6 @@
       <pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
       <pageOddTopMargin>0.590551</pageOddTopMargin>
       <pageOddBottomMargin>0.590551</pageOddBottomMargin>
-      <romanNumeralFontFace>Edwin</romanNumeralFontFace>
       <nashvilleNumberFontSize>10</nashvilleNumberFontSize>
       <hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
       <tupletFontSize>10</tupletFontSize>

src/importexport/musicxml/tests/data/testBeamModes_ref.mscx

@@ -12,7 +12,6 @@
       <pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
       <pageOddTopMargin>0.590551</pageOddTopMargin>
       <pageOddBottomMargin>0.590551</pageOddBottomMargin>
-      <romanNumeralFontFace>Edwin</romanNumeralFontFace>
       <nashvilleNumberFontSize>10</nashvilleNumberFontSize>
       <hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
       <tupletFontSize>10</tupletFontSize>

src/importexport/musicxml/tests/data/testBracketTypes_ref.mscx

@@ -12,7 +12,6 @@
       <pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
       <pageOddTopMargin>0.590551</pageOddTopMargin>
       <pageOddBottomMargin>0.590551</pageOddBottomMargin>
-      <romanNumeralFontFace>Edwin</romanNumeralFontFace>
       <nashvilleNumberFontSize>10</nashvilleNumberFontSize>
       <hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
       <tupletFontSize>10</tupletFontSize>

src/importexport/musicxml/tests/data/testBuzzRoll_ref.mscx

@@ -20,7 +20,6 @@
       <stemWidth>0.125</stemWidth>
       <staffLineWidth>0.09375</staffLineWidth>
       <ledgerLineWidth>0.15625</ledgerLineWidth>
-      <romanNumeralFontFace>Edwin</romanNumeralFontFace>
       <smallNoteMag>0.75</smallNoteMag>
       <graceNoteMag>0.6</graceNoteMag>
       <concertPitch>1</concertPitch>