Skip to content

Commit 77ea783

Browse files
committed
do not override default style for roman numerals
1 parent d52a545 commit 77ea783

File tree

66 files changed

+3
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3
-68
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,16 +1838,16 @@ static void updateStyles(Score* score,
18381838
// and text types used in the title frame
18391839
// Some further tweaking may still be required.
18401840
if (wordFamily.empty()) {
1841-
break; // no need to loop if no font family is specified
1841+
break; // If no font is specified, use default styles
18421842
}
18431843

18441844
if (tid == TextStyleType::LYRICS_ODD || tid == TextStyleType::LYRICS_EVEN
18451845
|| tid == TextStyleType::FRET_DIAGRAM_FINGERING || tid == TextStyleType::FRET_DIAGRAM_FRET_NUMBER
1846-
|| tid == TextStyleType::TAB_FRET_NUMBER) {
1846+
|| tid == TextStyleType::HARMONY_ROMAN || tid == TextStyleType::TAB_FRET_NUMBER) {
18471847
continue;
18481848
}
18491849

1850-
bool needUseDefaultSize = configuration()->needUseDefaultFont() || tid == TextStyleType::HARMONY_ROMAN
1850+
bool needUseDefaultSize = configuration()->needUseDefaultFont()
18511851
|| tid == TextStyleType::HAMMER_ON_PULL_OFF
18521852
|| isTitleFrameStyle(tid)
18531853
|| isHarpPedalStyle(tid);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<chordSymbolAFontSize>10.25</chordSymbolAFontSize>
2929
<chordSymbolBFontFace>Times New Roman</chordSymbolBFontFace>
3030
<chordSymbolBFontSize>10.25</chordSymbolBFontSize>
31-
<romanNumeralFontFace>Times New Roman</romanNumeralFontFace>
3231
<nashvilleNumberFontFace>Times New Roman</nashvilleNumberFontFace>
3332
<nashvilleNumberFontSize>10.25</nashvilleNumberFontSize>
3433
<smallNoteMag>0.6</smallNoteMag>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<ledgerLineWidth>0.15625</ledgerLineWidth>
2626
<chordSymbolAFontFace>Times New Roman</chordSymbolAFontFace>
2727
<chordSymbolBFontFace>Times New Roman</chordSymbolBFontFace>
28-
<romanNumeralFontFace>Times New Roman</romanNumeralFontFace>
2928
<nashvilleNumberFontFace>Times New Roman</nashvilleNumberFontFace>
3029
<smallNoteMag>0.75</smallNoteMag>
3130
<graceNoteMag>0.6</graceNoteMag>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<chordSymbolAFontSize>22</chordSymbolAFontSize>
2828
<chordSymbolBFontFace>Palatino,serif</chordSymbolBFontFace>
2929
<chordSymbolBFontSize>22</chordSymbolBFontSize>
30-
<romanNumeralFontFace>Palatino,serif</romanNumeralFontFace>
3130
<nashvilleNumberFontFace>Palatino,serif</nashvilleNumberFontFace>
3231
<nashvilleNumberFontSize>22</nashvilleNumberFontSize>
3332
<smallNoteMag>0.75</smallNoteMag>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
1414
<pageOddTopMargin>0.590551</pageOddTopMargin>
1515
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
16-
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
1716
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
1817
<hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
1918
<tupletFontSize>10</tupletFontSize>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
1414
<pageOddTopMargin>0.590551</pageOddTopMargin>
1515
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
16-
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
1716
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
1817
<hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
1918
<tupletFontSize>10</tupletFontSize>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
1414
<pageOddTopMargin>0.590551</pageOddTopMargin>
1515
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
16-
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
1716
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
1817
<hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
1918
<tupletFontSize>10</tupletFontSize>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
1313
<pageOddTopMargin>0.590551</pageOddTopMargin>
1414
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
15-
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
1615
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
1716
<hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
1817
<tupletFontSize>10</tupletFontSize>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
1313
<pageOddTopMargin>0.590551</pageOddTopMargin>
1414
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
15-
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
1615
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
1716
<hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
1817
<tupletFontSize>10</tupletFontSize>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<pageEvenBottomMargin>0.590551</pageEvenBottomMargin>
1414
<pageOddTopMargin>0.590551</pageOddTopMargin>
1515
<pageOddBottomMargin>0.590551</pageOddBottomMargin>
16-
<romanNumeralFontFace>Edwin</romanNumeralFontFace>
1716
<nashvilleNumberFontSize>10</nashvilleNumberFontSize>
1817
<hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
1918
<tupletFontSize>10</tupletFontSize>

0 commit comments

Comments
 (0)