Skip to content

Commit

Permalink
Merge pull request #21806 from miiizen/xml-font-reset
Browse files Browse the repository at this point in the history
Apply default font to all elements only when XML import config option is set
  • Loading branch information
mike-spa committed Mar 11, 2024
2 parents f49428c + 0b55fcb commit 40357e1
Show file tree
Hide file tree
Showing 30 changed files with 57 additions and 7 deletions.
19 changes: 12 additions & 7 deletions src/importexport/musicxml/internal/musicxml/importmxmlpass1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1496,24 +1496,26 @@ static void updateStyles(Score* score,
// and text types used in the title frame
// Some further tweaking may still be required.

if (tid == TextStyleType::LYRICS_ODD || tid == TextStyleType::LYRICS_EVEN
|| tid == TextStyleType::HARMONY_ROMAN
|| isTitleFrameStyle(tid)
|| isHarpPedalStyle(tid)) {
if (tid == TextStyleType::LYRICS_ODD || tid == TextStyleType::LYRICS_EVEN) {
continue;
}

bool needUseDefaultSize = tid == TextStyleType::HARMONY_ROMAN
|| isTitleFrameStyle(tid)
|| isHarpPedalStyle(tid);

const TextStyle* ts = textStyle(tid);
for (const auto& a :*ts) {
if (a.pid == Pid::FONT_FACE && wordFamily != "" && !needUseDefaultFont) {
if (a.pid == Pid::FONT_FACE && !needUseDefaultFont) {
score->style().set(a.sid, wordFamily);
} else if (a.pid == Pid::FONT_SIZE && dblWordSize > epsilon) {
} else if (a.pid == Pid::FONT_SIZE && dblWordSize > epsilon && !needUseDefaultSize) {
score->style().set(a.sid, dblWordSize);
}
}
}

// handle lyrics odd and even lines separately
if (!lyricFamily.empty() && !needUseDefaultFont) {
if (!needUseDefaultFont) {
score->style().set(Sid::lyricsOddFontFace, lyricFamily);
score->style().set(Sid::lyricsEvenFontFace, lyricFamily);
}
Expand Down Expand Up @@ -1706,7 +1708,10 @@ 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);

scaleCopyrightText(m_score);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testCodaHBox_ref.mscx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.19685</pageOddTopMargin>
<pageOddBottomMargin>0.19685</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testDSalCoda_ref.mscx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testElision_ref.mscx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<hideEmptyStaves>1</hideEmptyStaves>
<dontHideStavesInFirstSystem>0</dontHideStavesInFirstSystem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testLyricPos_ref.mscx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<lyricsOddFontSize>11</lyricsOddFontSize>
<lyricsEvenFontSize>11</lyricsEvenFontSize>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@
<pageOddBottomMargin>0.5</pageOddBottomMargin>
<pageTwosided>0</pageTwosided>
<minSystemDistance>12</minSystemDistance>
<lyricsOddFontFace>Times New Roman</lyricsOddFontFace>
<lyricsEvenFontFace>Times New Roman</lyricsEvenFontFace>
<barWidth>0.15625</barWidth>
<endBarWidth>0.5</endBarWidth>
<stemWidth>0.125</stemWidth>
<staffLineWidth>0.09375</staffLineWidth>
<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>
Expand All @@ -29,10 +32,16 @@
<tieEndWidth>0.0625</tieEndWidth>
<tieMidWidth>0.21875</tieMidWidth>
<tupletFontFace>Times New Roman</tupletFontFace>
<titleFontFace>Times New Roman</titleFontFace>
<subTitleFontFace>Times New Roman</subTitleFontFace>
<composerFontFace>Times New Roman</composerFontFace>
<lyricistFontFace>Times New Roman</lyricistFontFace>
<fingeringFontFace>Times New Roman</fingeringFontFace>
<lhGuitarFingeringFontFace>Times New Roman</lhGuitarFingeringFontFace>
<rhGuitarFingeringFontFace>Times New Roman</rhGuitarFingeringFontFace>
<stringNumberFontFace>Times New Roman</stringNumberFontFace>
<harpPedalDiagramFontFace>Times New Roman</harpPedalDiagramFontFace>
<harpPedalTextDiagramFontFace>Times New Roman</harpPedalTextDiagramFontFace>
<longInstrumentFontFace>Times New Roman</longInstrumentFontFace>
<shortInstrumentFontFace>Times New Roman</shortInstrumentFontFace>
<partInstrumentFontFace>Times New Roman</partInstrumentFontFace>
Expand Down
9 changes: 9 additions & 0 deletions src/importexport/musicxml/tests/data/testSibOttavas_ref.mscx
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@
<pageOddBottomMargin>0.5</pageOddBottomMargin>
<pageTwosided>0</pageTwosided>
<minSystemDistance>12</minSystemDistance>
<lyricsOddFontFace>Times New Roman</lyricsOddFontFace>
<lyricsEvenFontFace>Times New Roman</lyricsEvenFontFace>
<barWidth>0.15625</barWidth>
<endBarWidth>0.5</endBarWidth>
<stemWidth>0.125</stemWidth>
<staffLineWidth>0.09375</staffLineWidth>
<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>
Expand All @@ -29,10 +32,16 @@
<tieEndWidth>0.0625</tieEndWidth>
<tieMidWidth>0.21875</tieMidWidth>
<tupletFontFace>Times New Roman</tupletFontFace>
<titleFontFace>Times New Roman</titleFontFace>
<subTitleFontFace>Times New Roman</subTitleFontFace>
<composerFontFace>Times New Roman</composerFontFace>
<lyricistFontFace>Times New Roman</lyricistFontFace>
<fingeringFontFace>Times New Roman</fingeringFontFace>
<lhGuitarFingeringFontFace>Times New Roman</lhGuitarFingeringFontFace>
<rhGuitarFingeringFontFace>Times New Roman</rhGuitarFingeringFontFace>
<stringNumberFontFace>Times New Roman</stringNumberFontFace>
<harpPedalDiagramFontFace>Times New Roman</harpPedalDiagramFontFace>
<harpPedalTextDiagramFontFace>Times New Roman</harpPedalTextDiagramFontFace>
<longInstrumentFontFace>Times New Roman</longInstrumentFontFace>
<shortInstrumentFontFace>Times New Roman</shortInstrumentFontFace>
<partInstrumentFontFace>Times New Roman</partInstrumentFontFace>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
<pageOddTopMargin>0.590551</pageOddTopMargin>
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
<tupletFontSize>10</tupletFontSize>
<fingeringFontSize>10</fingeringFontSize>
Expand Down

0 comments on commit 40357e1

Please sign in to comment.