Skip to content

Commit

Permalink
Fix utests
Browse files Browse the repository at this point in the history 
The vast majority of these utest fixes are due to beam positions being able to occupy a floater space outside the staff if they slant away.

A few others add tremolo anchor point information which this PR added
  • Loading branch information
@asattely
asattely committed Mar 20, 2023
1 parent a62faf7 commit 1bff2d2
Show file tree
Hide file tree
Showing 30 changed files with 139 additions and 103 deletions.
16 changes: 8 additions & 8 deletions src/engraving/tests/beam_data/Beam-A.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>-6</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand Down Expand Up @@ -731,7 +731,7 @@
</Note>
</Chord>
<Beam>
<l1>38</l1>
<l1>36</l1>
<l2>42</l2>
</Beam>
<Chord>
Expand Down Expand Up @@ -951,7 +951,7 @@
</Chord>
<Beam>
<l1>42</l1>
<l2>38</l2>
<l2>36</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand All @@ -969,7 +969,7 @@
</Chord>
<Beam>
<l1>42</l1>
<l2>38</l2>
<l2>36</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand All @@ -996,7 +996,7 @@
<Beam>
<StemDirection>down</StemDirection>
<l1>42</l1>
<l2>38</l2>
<l2>36</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand All @@ -1015,7 +1015,7 @@
<Beam>
<StemDirection>down</StemDirection>
<l1>42</l1>
<l2>38</l2>
<l2>36</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand All @@ -1035,7 +1035,7 @@
<Beam>
<StemDirection>down</StemDirection>
<l1>42</l1>
<l2>38</l2>
<l2>36</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand Down
16 changes: 8 additions & 8 deletions src/engraving/tests/beam_data/Beam-B.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,8 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>-8</l1>
<l2>-6</l2>
<l1>-6</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand All @@ -537,8 +537,8 @@
</Chord>
<Beam>
<StemDirection>up</StemDirection>
<l1>-8</l1>
<l2>-6</l2>
<l1>-6</l1>
<l2>-4</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand Down Expand Up @@ -666,8 +666,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>40</l1>
<l2>38</l2>
<l1>38</l1>
<l2>36</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand All @@ -684,8 +684,8 @@
</Note>
</Chord>
<Beam>
<l1>40</l1>
<l2>38</l2>
<l1>38</l1>
<l2>36</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand Down
26 changes: 13 additions & 13 deletions src/engraving/tests/beam_data/Beam-C.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
</Note>
</Chord>
<Beam>
<l1>-6</l1>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
Expand Down Expand Up @@ -417,8 +417,8 @@
<Measure>
<voice>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand Down Expand Up @@ -455,7 +455,7 @@
</Chord>
<Beam>
<l1>-10</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand All @@ -473,7 +473,7 @@
</Chord>
<Beam>
<l1>-10</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand All @@ -499,7 +499,7 @@
<voice>
<Beam>
<l1>-10</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand All @@ -517,7 +517,7 @@
</Chord>
<Beam>
<l1>-10</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand All @@ -536,7 +536,7 @@
</Chord>
<Beam>
<l1>-10</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand Down Expand Up @@ -703,8 +703,8 @@
<Measure>
<voice>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand Down Expand Up @@ -741,7 +741,7 @@
</Chord>
<Beam>
<l1>-10</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand All @@ -759,7 +759,7 @@
</Chord>
<Beam>
<l1>-10</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand All @@ -782,7 +782,7 @@
<voice>
<Beam>
<l1>-10</l1>
<l2>-6</l2>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand Down
8 changes: 4 additions & 4 deletions src/engraving/tests/beam_data/Beam-D.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
</Chord>
<Beam>
<StemDirection>up</StemDirection>
<l1>-6</l1>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
Expand Down Expand Up @@ -751,8 +751,8 @@
</Note>
</Chord>
<Beam>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand All @@ -771,7 +771,7 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l1>36</l1>
<l2>42</l2>
</Beam>
<Chord>
Expand Down
6 changes: 3 additions & 3 deletions src/engraving/tests/beam_data/Beam-E.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
<voice>
<Beam>
<StemDirection>up</StemDirection>
<l1>-6</l1>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
Expand Down Expand Up @@ -791,8 +791,8 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand Down
6 changes: 3 additions & 3 deletions src/engraving/tests/beam_data/Beam-F.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
</Note>
</Chord>
<Beam>
<l1>-6</l1>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
Expand Down Expand Up @@ -811,8 +811,8 @@
</Chord>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand Down
10 changes: 5 additions & 5 deletions src/engraving/tests/beam_data/Beam-G.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@
</Note>
</Chord>
<Beam>
<l1>-6</l1>
<l2>-8</l2>
<l1>-4</l1>
<l2>-6</l2>
</Beam>
<Chord>
<BeamMode>begin</BeamMode>
Expand All @@ -195,7 +195,7 @@
</Note>
</Chord>
<Beam>
<l1>-6</l1>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
Expand Down Expand Up @@ -807,8 +807,8 @@
<voice>
<Beam>
<StemDirection>down</StemDirection>
<l1>38</l1>
<l2>40</l2>
<l1>36</l1>
<l2>38</l2>
</Beam>
<Chord>
<durationType>eighth</durationType>
Expand Down
28 changes: 14 additions & 14 deletions src/engraving/tests/beam_data/beamPositions.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1365,8 +1365,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>6</l1>
<l2>6</l2>
<l1>4</l1>
<l2>4</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
Expand Down Expand Up @@ -1449,8 +1449,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>-2</l1>
<l2>-2</l2>
<l1>-4</l1>
<l2>-4</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
Expand Down Expand Up @@ -1491,8 +1491,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>-10</l1>
<l2>-10</l2>
<l1>-12</l1>
<l2>-12</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
Expand Down Expand Up @@ -1533,8 +1533,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>50</l1>
<l2>50</l2>
<l1>52</l1>
<l2>52</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
Expand Down Expand Up @@ -1578,8 +1578,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>42</l1>
<l2>42</l2>
<l1>44</l1>
<l2>44</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
Expand Down Expand Up @@ -1620,8 +1620,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>34</l1>
<l2>34</l2>
<l1>36</l1>
<l2>36</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
Expand Down Expand Up @@ -1708,8 +1708,8 @@
<durationType>32nd</durationType>
</Rest>
<Beam>
<l1>26</l1>
<l2>26</l2>
<l1>28</l1>
<l2>28</l2>
</Beam>
<Chord>
<durationType>64th</durationType>
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/tests/compat114_data/notes-ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
</Note>
</Chord>
<Beam>
<l1>-6</l1>
<l1>-4</l1>
<l2>-10</l2>
</Beam>
<Chord>
Expand Down
Loading

0 comments on commit 1bff2d2

Please sign in to comment.