Skip to content

Commit 897f47e

Browse files
mike-spamike-spa
committed
Fix utests
1 parent c769909 commit 897f47e

18 files changed

+18
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,6 +1808,7 @@ static void updateStyles(Score* score,
18081808
}
18091809

18101810
bool needUseDefaultSize = tid == TextStyleType::HARMONY_ROMAN
1811+
|| tid == TextStyleType::HAMMER_ON_PULL_OFF
18111812
|| isTitleFrameStyle(tid)
18121813
|| isHarpPedalStyle(tid);
18131814

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<lhGuitarFingeringFontSize>10.25</lhGuitarFingeringFontSize>
4848
<rhGuitarFingeringFontFace>Times New Roman</rhGuitarFingeringFontFace>
4949
<rhGuitarFingeringFontSize>10.25</rhGuitarFingeringFontSize>
50+
<hammerOnPullOffTappingFontFace>Times New Roman</hammerOnPullOffTappingFontFace>
5051
<stringNumberFontFace>Times New Roman</stringNumberFontFace>
5152
<stringNumberFontSize>10.25</stringNumberFontSize>
5253
<stringTuningsFontSize>10.25</stringTuningsFontSize>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<fingeringFontFace>Times New Roman</fingeringFontFace>
4242
<lhGuitarFingeringFontFace>Times New Roman</lhGuitarFingeringFontFace>
4343
<rhGuitarFingeringFontFace>Times New Roman</rhGuitarFingeringFontFace>
44+
<hammerOnPullOffTappingFontFace>Times New Roman</hammerOnPullOffTappingFontFace>
4445
<stringNumberFontFace>Times New Roman</stringNumberFontFace>
4546
<harpPedalDiagramFontFace>Times New Roman</harpPedalDiagramFontFace>
4647
<harpPedalTextDiagramFontFace>Times New Roman</harpPedalTextDiagramFontFace>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<lhGuitarFingeringFontSize>22</lhGuitarFingeringFontSize>
5050
<rhGuitarFingeringFontFace>Palatino,serif</rhGuitarFingeringFontFace>
5151
<rhGuitarFingeringFontSize>22</rhGuitarFingeringFontSize>
52+
<hammerOnPullOffTappingFontFace>Palatino,serif</hammerOnPullOffTappingFontFace>
5253
<stringNumberFontFace>Palatino,serif</stringNumberFontFace>
5354
<stringNumberFontSize>22</stringNumberFontSize>
5455
<stringTuningsFontSize>22</stringTuningsFontSize>

‎src/importexport/musicxml/tests/data/testDoletOttavas_ref.mscx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<fingeringFontFace>Times New Roman</fingeringFontFace>
4141
<lhGuitarFingeringFontFace>Times New Roman</lhGuitarFingeringFontFace>
4242
<rhGuitarFingeringFontFace>Times New Roman</rhGuitarFingeringFontFace>
43+
<hammerOnPullOffTappingFontFace>Times New Roman</hammerOnPullOffTappingFontFace>
4344
<stringNumberFontFace>Times New Roman</stringNumberFontFace>
4445
<harpPedalDiagramFontFace>Times New Roman</harpPedalDiagramFontFace>
4546
<harpPedalTextDiagramFontFace>Times New Roman</harpPedalTextDiagramFontFace>

‎src/importexport/musicxml/tests/data/testDuplicateFermataOnGraceNoteAndMainNote_ref.mscx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<lhGuitarFingeringFontSize>10</lhGuitarFingeringFontSize>
3535
<rhGuitarFingeringFontFace>FreeSerif</rhGuitarFingeringFontFace>
3636
<rhGuitarFingeringFontSize>10</rhGuitarFingeringFontSize>
37+
<hammerOnPullOffTappingFontFace>FreeSerif</hammerOnPullOffTappingFontFace>
3738
<stringNumberFontFace>FreeSerif</stringNumberFontFace>
3839
<stringNumberFontSize>10</stringNumberFontSize>
3940
<stringTuningsFontSize>10</stringTuningsFontSize>

‎src/importexport/musicxml/tests/data/testDuplicateFermataOnGraceNote_ref.mscx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<lhGuitarFingeringFontSize>10</lhGuitarFingeringFontSize>
3535
<rhGuitarFingeringFontFace>FreeSerif</rhGuitarFingeringFontFace>
3636
<rhGuitarFingeringFontSize>10</rhGuitarFingeringFontSize>
37+
<hammerOnPullOffTappingFontFace>FreeSerif</hammerOnPullOffTappingFontFace>
3738
<stringNumberFontFace>FreeSerif</stringNumberFontFace>
3839
<stringNumberFontSize>10</stringNumberFontSize>
3940
<stringTuningsFontSize>10</stringTuningsFontSize>

‎src/importexport/musicxml/tests/data/testFinaleInstr2_ref.mscx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<lhGuitarFingeringFontSize>8.8</lhGuitarFingeringFontSize>
4949
<rhGuitarFingeringFontFace>Times</rhGuitarFingeringFontFace>
5050
<rhGuitarFingeringFontSize>8.8</rhGuitarFingeringFontSize>
51+
<hammerOnPullOffTappingFontFace>Times</hammerOnPullOffTappingFontFace>
5152
<stringNumberFontFace>Times</stringNumberFontFace>
5253
<stringNumberFontSize>8.8</stringNumberFontSize>
5354
<stringTuningsFontSize>8.8</stringTuningsFontSize>

‎src/importexport/musicxml/tests/data/testFinaleInstr_ref.mscx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<lhGuitarFingeringFontSize>7.4</lhGuitarFingeringFontSize>
4949
<rhGuitarFingeringFontFace>Times</rhGuitarFingeringFontFace>
5050
<rhGuitarFingeringFontSize>7.4</rhGuitarFingeringFontSize>
51+
<hammerOnPullOffTappingFontFace>Times</hammerOnPullOffTappingFontFace>
5152
<stringNumberFontFace>Times</stringNumberFontFace>
5253
<stringNumberFontSize>7.4</stringNumberFontSize>
5354
<stringTuningsFontSize>7.4</stringTuningsFontSize>

‎src/importexport/musicxml/tests/data/testInferCodaII_ref.mscx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<fingeringFontFace>Times New Roman</fingeringFontFace>
4141
<lhGuitarFingeringFontFace>Times New Roman</lhGuitarFingeringFontFace>
4242
<rhGuitarFingeringFontFace>Times New Roman</rhGuitarFingeringFontFace>
43+
<hammerOnPullOffTappingFontFace>Times New Roman</hammerOnPullOffTappingFontFace>
4344
<stringNumberFontFace>Times New Roman</stringNumberFontFace>
4445
<harpPedalDiagramFontFace>Times New Roman</harpPedalDiagramFontFace>
4546
<harpPedalTextDiagramFontFace>Times New Roman</harpPedalTextDiagramFontFace>

0 commit comments

Comments
 (0)