Skip to content

Commit

Permalink
Fix mtests
Browse files Browse the repository at this point in the history 
2 of which came in via a backport of musescore#8530, the other 2 came in via a backport of musescore#8311 and musescore#8116, apparenrly neither have yet been ported to Mu4.
  • Loading branch information
@Jojo-Schmitz
Jojo-Schmitz committed Jun 12, 2024
1 parent 22a04d2 commit 35fb5e5
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 74 deletions.
39 changes: 39 additions & 0 deletions mtest/musicxml/io/testExcessiveFretDiagrams1_ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,45 @@
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Harmony>
<root>19</root>
<name>7</name>
</Harmony>
<Harmony>
<root>14</root>
</Harmony>
<Harmony>
<root>14</root>
<name>m</name>
</Harmony>
<Harmony>
<root>18</root>
<name>7</name>
</Harmony>
<Harmony>
<root>13</root>
<name>7</name>
</Harmony>
<Harmony>
<root>15</root>
<name>m</name>
</Harmony>
<Harmony>
<root>17</root>
<name>7</name>
</Harmony>
<Harmony>
<root>19</root>
<name>7</name>
</Harmony>
<Harmony>
<root>15</root>
<name>7</name>
</Harmony>
<Harmony>
<root>17</root>
<name>7</name>
</Harmony>
<Chord>
<durationType>quarter</durationType>
<StemDirection>up</StemDirection>
Expand Down
34 changes: 34 additions & 0 deletions mtest/musicxml/io/testExcessiveFretDiagrams2_ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,34 +148,68 @@
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Harmony>
<root>14</root>
<name>m</name>
</Harmony>
<Rest>
<visible>0</visible>
<durationType>eighth</durationType>
</Rest>
<Harmony>
<root>16</root>
<name>m</name>
</Harmony>
<Harmony>
<root>19</root>
<name>7</name>
</Harmony>
<Rest>
<visible>0</visible>
<durationType>eighth</durationType>
</Rest>
<Harmony>
<root>13</root>
<name>7</name>
</Harmony>
<Rest>
<visible>0</visible>
<durationType>eighth</durationType>
</Rest>
<Harmony>
<root>15</root>
<name>7</name>
</Harmony>
<Rest>
<visible>0</visible>
<durationType>eighth</durationType>
</Rest>
<Harmony>
<root>15</root>
<name>m</name>
</Harmony>
<Rest>
<visible>0</visible>
<durationType>eighth</durationType>
</Rest>
<Harmony>
<root>15</root>
</Harmony>
<Rest>
<visible>0</visible>
<durationType>eighth</durationType>
</Rest>
<Harmony>
<root>13</root>
<name>7</name>
</Harmony>
<Rest>
<visible>0</visible>
<durationType>eighth</durationType>
</Rest>
<Harmony>
<root>13</root>
</Harmony>
<Rest>
<visible>0</visible>
<durationType>eighth</durationType>
Expand Down
25 changes: 11 additions & 14 deletions mtest/musicxml/io/testFretDiagramLayoutOrder_ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,6 @@
<FretDiagram>
<fretOffset>2</fretOffset>
<frets>4</frets>
<Harmony>
<root>14</root>
<name>m</name>
<align>center,top</align>
</Harmony>
<fretDiagram>
<string no="0">
<marker>cross</marker>
Expand Down Expand Up @@ -181,6 +176,10 @@
<dot>2</dot>
</string>
</FretDiagram>
<Harmony>
<root>14</root>
<name>m</name>
</Harmony>
<Tempo>
<tempo>4</tempo>
<followText>1</followText>
Expand Down Expand Up @@ -810,10 +809,6 @@
<voice>
<FretDiagram>
<frets>4</frets>
<Harmony>
<root>13</root>
<align>center,top</align>
</Harmony>
<fretDiagram>
<string no="1">
<dot fret="3">normal</dot>
Expand All @@ -836,6 +831,9 @@
<dot>2</dot>
</string>
</FretDiagram>
<Harmony>
<root>13</root>
</Harmony>
<Chord>
<durationType>quarter</durationType>
<StemDirection>down</StemDirection>
Expand Down Expand Up @@ -874,11 +872,6 @@
<voice>
<FretDiagram>
<frets>4</frets>
<Harmony>
<root>16</root>
<name>7</name>
<align>center,top</align>
</Harmony>
<fretDiagram>
<string no="0">
<marker>cross</marker>
Expand Down Expand Up @@ -918,6 +911,10 @@
<dot>2</dot>
</string>
</FretDiagram>
<Harmony>
<root>16</root>
<name>7</name>
</Harmony>
<Spanner type="Volta">
<Volta>
<endHookType>1</endHookType>
Expand Down
Loading

0 comments on commit 35fb5e5

Please sign in to comment.