Skip to content

Commit

Permalink
Rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mike-spa
mike-spa committed Nov 16, 2023
1 parent 8b37598 commit bd7c5b3
Show file tree
Hide file tree
Showing 23 changed files with 41 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/importexport/musicxml/tests/data/testBackupRoundingError_ref.mscx
View file
Expand Up @@ -24,13 +24,15 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
<bracket type="1" span="2" col="1" visible="1"/>
<barLineSpan>1</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="grand-piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testBeamModes_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testBracketTypes_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testCueGraceNotes_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testCueNotes3_ref.mscx
View file
Expand Up @@ -52,6 +52,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Voice</trackName>
<Instrument id="voice">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testDSalCodaMisplaced_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testDSalCoda_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
2 changes: 2 additions & 0 deletions src/importexport/musicxml/tests/data/testExcessHiddenStaves_ref.mscx
View file
Expand Up @@ -53,13 +53,15 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
<bracket type="1" span="2" col="1" visible="1"/>
<barLineSpan>1</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testInferredSubtitle_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testLyricBracket_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testLyricExtensions_ref.mscx
View file
Expand Up @@ -24,6 +24,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="grand-piano">
Expand Down
2 changes: 2 additions & 0 deletions src/importexport/musicxml/tests/data/testNegativeOffset_ref.mscx
View file
Expand Up @@ -51,13 +51,15 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
<bracket type="1" span="2" col="1" visible="1"/>
<barLineSpan>1</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
4 changes: 4 additions & 0 deletions src/importexport/musicxml/tests/data/testPartNames_ref.mscx
View file
Expand Up @@ -52,13 +52,15 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
<bracket type="1" span="2" col="1" visible="1"/>
<barLineSpan>1</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down Expand Up @@ -121,6 +123,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Voice</trackName>
<Instrument id="voice">
Expand Down Expand Up @@ -182,6 +185,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>P3</trackName>
<Instrument id="bass">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testPedalChangesBroken_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testPedalChanges_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
2 changes: 2 additions & 0 deletions src/importexport/musicxml/tests/data/testPlacementDefaults_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Soprano</trackName>
<Instrument id="soprano">
Expand Down Expand Up @@ -115,6 +116,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testSecondVoiceMelismata_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
5 changes: 4 additions & 1 deletion src/importexport/musicxml/tests/data/testStaffEmptiness_ref.mscx
View file
Expand Up @@ -53,7 +53,7 @@
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
<bracket type="1" span="2" col="1" visible="1"/>
<barLineSpan>2</barLineSpan>
<barLineSpan>1</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
Expand Down Expand Up @@ -1486,6 +1486,9 @@
<tpc>18</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
</BarLine>
</voice>
</Measure>
</Staff>
Expand Down
2 changes: 2 additions & 0 deletions src/importexport/musicxml/tests/data/testTempoTextSpace1_ref.mscx
View file
Expand Up @@ -51,13 +51,15 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
<bracket type="1" span="2" col="1" visible="1"/>
<barLineSpan>1</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
2 changes: 2 additions & 0 deletions src/importexport/musicxml/tests/data/testTempoTextSpace2_ref.mscx
View file
Expand Up @@ -51,13 +51,15 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
<bracket type="1" span="2" col="1" visible="1"/>
<barLineSpan>1</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testTextOrder_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down
7 changes: 7 additions & 0 deletions src/importexport/musicxml/tests/data/testTextQuirkInference_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down Expand Up @@ -144,6 +145,9 @@
<Rest>
<durationType>eighth</durationType>
</Rest>
<StaffText>
<text>N.C.</text>
</StaffText>
<Harmony>
<name>N.C.</name>
</Harmony>
Expand Down Expand Up @@ -244,6 +248,9 @@
</Measure>
<Measure>
<voice>
<StaffText>
<text>N.C.</text>
</StaffText>
<Harmony>
<name>N.C.</name>
</Harmony>
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/tests/data/testWedgeOffset_ref.mscx
View file
Expand Up @@ -51,6 +51,7 @@
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<hideWhenEmpty>3</hideWhenEmpty>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
Expand Down

0 comments on commit bd7c5b3

Please sign in to comment.