From 1bff2d2a79c3aa6e4a83f7546fa6ce7ab561f84d Mon Sep 17 00:00:00 2001
From: Aaron Sattely <a.sattely@musescore.com>
Date: Mon, 27 Feb 2023 20:40:30 -0500
Subject: [PATCH] Fix utests

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
---
 src/engraving/tests/beam_data/Beam-A.mscx     | 16 +++++------
 src/engraving/tests/beam_data/Beam-B.mscx     | 16 +++++------
 src/engraving/tests/beam_data/Beam-C.mscx     | 26 ++++++++---------
 src/engraving/tests/beam_data/Beam-D.mscx     |  8 +++---
 src/engraving/tests/beam_data/Beam-E.mscx     |  6 ++--
 src/engraving/tests/beam_data/Beam-F.mscx     |  6 ++--
 src/engraving/tests/beam_data/Beam-G.mscx     | 10 +++----
 .../tests/beam_data/beamPositions.mscx        | 28 +++++++++----------
 .../tests/compat114_data/notes-ref.mscx       |  2 +-
 .../compat114_data/tremolo2notes-ref.mscx     |  6 ++++
 .../tests/compat114_data/tuplets-ref.mscx     |  4 +--
 .../tests/compat206_data/tuplets-ref.mscx     |  4 +--
 .../implode_explode_data/implode1-ref.mscx    |  4 +--
 .../tests/implode_explode_data/implode1.mscx  |  4 +--
 .../undoExplode01-ref.mscx                    |  8 +++---
 .../tests/parts_data/part-stemless-parts.mscx |  8 +++---
 .../tests/parts_data/part-stemless.mscx       |  4 +--
 .../groupArticulationsTies-ref.mscx           |  4 +--
 .../selectionfilter16-base-ref.xml            |  2 ++
 .../tests/timesig_data/timesig-06-ref.mscx    |  2 ++
 .../tests/timesig_data/timesig-09-ref.mscx    |  6 ++++
 .../tests/timesig_data/timesig-09.mscx        | 20 +++++++++++++
 .../unrollrepeats_data/clef-key-ts-ref.mscx   | 14 +++++-----
 .../capella/tests/data/test4.cap-ref.mscx     |  4 +--
 .../capella/tests/data/test4.capx-ref.mscx    |  4 +--
 .../capella/tests/data/test7.cap-ref.mscx     |  2 +-
 .../tests/data/dotted-tuplets.gp5-ref.mscx    |  4 +--
 .../tests/data/instr-change.gp-ref.mscx       |  8 +++---
 .../tests/data/instr-change.gpx-ref.mscx      |  8 +++---
 .../tests/data/tuplets2.gpx-ref.mscx          |  4 +--
 30 files changed, 139 insertions(+), 103 deletions(-)

diff --git a/src/engraving/tests/beam_data/Beam-A.mscx b/src/engraving/tests/beam_data/Beam-A.mscx
index 4e31fc6d55bd2..4e6d216da52b2 100644
--- a/src/engraving/tests/beam_data/Beam-A.mscx
+++ b/src/engraving/tests/beam_data/Beam-A.mscx
@@ -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>
@@ -731,7 +731,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>38</l1>
+            <l1>36</l1>
             <l2>42</l2>
             </Beam>
           <Chord>
@@ -951,7 +951,7 @@
             </Chord>
           <Beam>
             <l1>42</l1>
-            <l2>38</l2>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -969,7 +969,7 @@
             </Chord>
           <Beam>
             <l1>42</l1>
-            <l2>38</l2>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -996,7 +996,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>42</l1>
-            <l2>38</l2>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -1015,7 +1015,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>42</l1>
-            <l2>38</l2>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -1035,7 +1035,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>42</l1>
-            <l2>38</l2>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/beam_data/Beam-B.mscx b/src/engraving/tests/beam_data/Beam-B.mscx
index 1dac2bbed6864..d9325309a72ed 100644
--- a/src/engraving/tests/beam_data/Beam-B.mscx
+++ b/src/engraving/tests/beam_data/Beam-B.mscx
@@ -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>
@@ -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>
@@ -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>
@@ -684,8 +684,8 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>40</l1>
-            <l2>38</l2>
+            <l1>38</l1>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
diff --git a/src/engraving/tests/beam_data/Beam-C.mscx b/src/engraving/tests/beam_data/Beam-C.mscx
index 1abc77ccdc091..6ee3a56c4059b 100644
--- a/src/engraving/tests/beam_data/Beam-C.mscx
+++ b/src/engraving/tests/beam_data/Beam-C.mscx
@@ -274,7 +274,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-6</l1>
+            <l1>-4</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>
@@ -417,8 +417,8 @@
       <Measure>
         <voice>
           <Beam>
-            <l1>38</l1>
-            <l2>40</l2>
+            <l1>36</l1>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -455,7 +455,7 @@
             </Chord>
           <Beam>
             <l1>-10</l1>
-            <l2>-6</l2>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -473,7 +473,7 @@
             </Chord>
           <Beam>
             <l1>-10</l1>
-            <l2>-6</l2>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -499,7 +499,7 @@
         <voice>
           <Beam>
             <l1>-10</l1>
-            <l2>-6</l2>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -517,7 +517,7 @@
             </Chord>
           <Beam>
             <l1>-10</l1>
-            <l2>-6</l2>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -536,7 +536,7 @@
             </Chord>
           <Beam>
             <l1>-10</l1>
-            <l2>-6</l2>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -703,8 +703,8 @@
       <Measure>
         <voice>
           <Beam>
-            <l1>38</l1>
-            <l2>40</l2>
+            <l1>36</l1>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -741,7 +741,7 @@
             </Chord>
           <Beam>
             <l1>-10</l1>
-            <l2>-6</l2>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -759,7 +759,7 @@
             </Chord>
           <Beam>
             <l1>-10</l1>
-            <l2>-6</l2>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -782,7 +782,7 @@
         <voice>
           <Beam>
             <l1>-10</l1>
-            <l2>-6</l2>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/beam_data/Beam-D.mscx b/src/engraving/tests/beam_data/Beam-D.mscx
index 62647c702c8e6..738c6981465fd 100644
--- a/src/engraving/tests/beam_data/Beam-D.mscx
+++ b/src/engraving/tests/beam_data/Beam-D.mscx
@@ -261,7 +261,7 @@
             </Chord>
           <Beam>
             <StemDirection>up</StemDirection>
-            <l1>-6</l1>
+            <l1>-4</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>
@@ -751,8 +751,8 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>38</l1>
-            <l2>40</l2>
+            <l1>36</l1>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -771,7 +771,7 @@
             </Chord>
           <Beam>
             <StemDirection>down</StemDirection>
-            <l1>38</l1>
+            <l1>36</l1>
             <l2>42</l2>
             </Beam>
           <Chord>
diff --git a/src/engraving/tests/beam_data/Beam-E.mscx b/src/engraving/tests/beam_data/Beam-E.mscx
index 7798d75f98836..9accaf86adac5 100644
--- a/src/engraving/tests/beam_data/Beam-E.mscx
+++ b/src/engraving/tests/beam_data/Beam-E.mscx
@@ -241,7 +241,7 @@
         <voice>
           <Beam>
             <StemDirection>up</StemDirection>
-            <l1>-6</l1>
+            <l1>-4</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>
@@ -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>
diff --git a/src/engraving/tests/beam_data/Beam-F.mscx b/src/engraving/tests/beam_data/Beam-F.mscx
index c9e44062eae0a..aee8db2290143 100644
--- a/src/engraving/tests/beam_data/Beam-F.mscx
+++ b/src/engraving/tests/beam_data/Beam-F.mscx
@@ -214,7 +214,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-6</l1>
+            <l1>-4</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>
@@ -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>
diff --git a/src/engraving/tests/beam_data/Beam-G.mscx b/src/engraving/tests/beam_data/Beam-G.mscx
index 0f0b5663ab942..8a93fe35f0549 100644
--- a/src/engraving/tests/beam_data/Beam-G.mscx
+++ b/src/engraving/tests/beam_data/Beam-G.mscx
@@ -176,8 +176,8 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-6</l1>
-            <l2>-8</l2>
+            <l1>-4</l1>
+            <l2>-6</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -195,7 +195,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-6</l1>
+            <l1>-4</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>
@@ -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>
diff --git a/src/engraving/tests/beam_data/beamPositions.mscx b/src/engraving/tests/beam_data/beamPositions.mscx
index 9c94820e4137f..2854d6c72cd6f 100644
--- a/src/engraving/tests/beam_data/beamPositions.mscx
+++ b/src/engraving/tests/beam_data/beamPositions.mscx
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/src/engraving/tests/compat114_data/notes-ref.mscx b/src/engraving/tests/compat114_data/notes-ref.mscx
index 0115ec7cd33af..ceacc6f0a6960 100644
--- a/src/engraving/tests/compat114_data/notes-ref.mscx
+++ b/src/engraving/tests/compat114_data/notes-ref.mscx
@@ -187,7 +187,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-6</l1>
+            <l1>-4</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>
diff --git a/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx b/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx
index 1ebfb9e6146b6..90ebe7b246f07 100644
--- a/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx
+++ b/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx
@@ -85,6 +85,8 @@
               </Note>
             <Tremolo>
               <subtype>c8</subtype>
+              <l1>34</l1>
+              <l2>30</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -110,6 +112,8 @@
               </Note>
             <Tremolo>
               <subtype>c16</subtype>
+              <l1>38</l1>
+              <l2>36</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -135,6 +139,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>44</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
diff --git a/src/engraving/tests/compat114_data/tuplets-ref.mscx b/src/engraving/tests/compat114_data/tuplets-ref.mscx
index 15352fa15a2a9..3eace4282eccf 100644
--- a/src/engraving/tests/compat114_data/tuplets-ref.mscx
+++ b/src/engraving/tests/compat114_data/tuplets-ref.mscx
@@ -162,8 +162,8 @@
               </Number>
             </Tuplet>
           <Beam>
-            <l1>40</l1>
-            <l2>38</l2>
+            <l1>38</l1>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/compat206_data/tuplets-ref.mscx b/src/engraving/tests/compat206_data/tuplets-ref.mscx
index 591f8d4ba50b1..84c4fb0c85f5d 100644
--- a/src/engraving/tests/compat206_data/tuplets-ref.mscx
+++ b/src/engraving/tests/compat206_data/tuplets-ref.mscx
@@ -164,8 +164,8 @@
             <numberType>1</numberType>
             </Tuplet>
           <Beam>
-            <l1>40</l1>
-            <l2>38</l2>
+            <l1>38</l1>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/implode_explode_data/implode1-ref.mscx b/src/engraving/tests/implode_explode_data/implode1-ref.mscx
index bba6984126d0b..d917f0d96649a 100644
--- a/src/engraving/tests/implode_explode_data/implode1-ref.mscx
+++ b/src/engraving/tests/implode_explode_data/implode1-ref.mscx
@@ -1113,8 +1113,8 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-8</l1>
-            <l2>-6</l2>
+            <l1>-6</l1>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/implode_explode_data/implode1.mscx b/src/engraving/tests/implode_explode_data/implode1.mscx
index f558af95613d7..e97e8463a79a4 100644
--- a/src/engraving/tests/implode_explode_data/implode1.mscx
+++ b/src/engraving/tests/implode_explode_data/implode1.mscx
@@ -698,8 +698,8 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-8</l1>
-            <l2>-6</l2>
+            <l1>-6</l1>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/implode_explode_data/undoExplode01-ref.mscx b/src/engraving/tests/implode_explode_data/undoExplode01-ref.mscx
index 9232031e02900..e887ccbfb39aa 100644
--- a/src/engraving/tests/implode_explode_data/undoExplode01-ref.mscx
+++ b/src/engraving/tests/implode_explode_data/undoExplode01-ref.mscx
@@ -732,8 +732,8 @@
               </Number>
             </Tuplet>
           <Beam>
-            <l1>38</l1>
-            <l2>40</l2>
+            <l1>36</l1>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -912,8 +912,8 @@
               </Number>
             </Tuplet>
           <Beam>
-            <l1>-8</l1>
-            <l2>-6</l2>
+            <l1>-6</l1>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/parts_data/part-stemless-parts.mscx b/src/engraving/tests/parts_data/part-stemless-parts.mscx
index eed3570889a85..1125de7de9b72 100644
--- a/src/engraving/tests/parts_data/part-stemless-parts.mscx
+++ b/src/engraving/tests/parts_data/part-stemless-parts.mscx
@@ -233,8 +233,8 @@
       <Measure>
         <voice>
           <Beam>
-            <l1>-8</l1>
-            <l2>-6</l2>
+            <l1>-6</l1>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <linkedMain/>
@@ -657,8 +657,8 @@
         <Measure>
           <voice>
             <Beam>
-              <l1>-8</l1>
-              <l2>-6</l2>
+              <l1>-6</l1>
+              <l2>-4</l2>
               </Beam>
             <Chord>
               <linked>
diff --git a/src/engraving/tests/parts_data/part-stemless.mscx b/src/engraving/tests/parts_data/part-stemless.mscx
index 9487770331040..acde12fecaede 100644
--- a/src/engraving/tests/parts_data/part-stemless.mscx
+++ b/src/engraving/tests/parts_data/part-stemless.mscx
@@ -218,8 +218,8 @@
       <Measure>
         <voice>
           <Beam>
-            <l1>-8</l1>
-            <l2>-6</l2>
+            <l1>-6</l1>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/rhythmicGrouping_data/groupArticulationsTies-ref.mscx b/src/engraving/tests/rhythmicGrouping_data/groupArticulationsTies-ref.mscx
index ac0557fc6fc98..cfa574c2e59a9 100644
--- a/src/engraving/tests/rhythmicGrouping_data/groupArticulationsTies-ref.mscx
+++ b/src/engraving/tests/rhythmicGrouping_data/groupArticulationsTies-ref.mscx
@@ -90,8 +90,8 @@
               </Number>
             </Tuplet>
           <Beam>
-            <l1>38</l1>
-            <l2>40</l2>
+            <l1>36</l1>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/engraving/tests/selectionfilter_data/selectionfilter16-base-ref.xml b/src/engraving/tests/selectionfilter_data/selectionfilter16-base-ref.xml
index 93f2421c507b2..d4803e9cb0478 100644
--- a/src/engraving/tests/selectionfilter_data/selectionfilter16-base-ref.xml
+++ b/src/engraving/tests/selectionfilter_data/selectionfilter16-base-ref.xml
@@ -33,6 +33,8 @@
         </Note>
       <Tremolo>
         <subtype>c8</subtype>
+        <l1>26</l1>
+        <l2>24</l2>
         </Tremolo>
       </Chord>
     <Chord>
diff --git a/src/engraving/tests/timesig_data/timesig-06-ref.mscx b/src/engraving/tests/timesig_data/timesig-06-ref.mscx
index 6911f68704da9..f46c80828a175 100644
--- a/src/engraving/tests/timesig_data/timesig-06-ref.mscx
+++ b/src/engraving/tests/timesig_data/timesig-06-ref.mscx
@@ -98,6 +98,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>-12</l1>
+              <l2>-18</l2>
               </Tremolo>
             </Chord>
           <Chord>
diff --git a/src/engraving/tests/timesig_data/timesig-09-ref.mscx b/src/engraving/tests/timesig_data/timesig-09-ref.mscx
index 8e33550195ffa..0945660bbffc0 100644
--- a/src/engraving/tests/timesig_data/timesig-09-ref.mscx
+++ b/src/engraving/tests/timesig_data/timesig-09-ref.mscx
@@ -102,6 +102,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>50</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -401,6 +403,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -424,6 +428,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
diff --git a/src/engraving/tests/timesig_data/timesig-09.mscx b/src/engraving/tests/timesig_data/timesig-09.mscx
index 84f24ac66a966..422ba2dfb3dc5 100644
--- a/src/engraving/tests/timesig_data/timesig-09.mscx
+++ b/src/engraving/tests/timesig_data/timesig-09.mscx
@@ -102,6 +102,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -125,6 +127,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -148,6 +152,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -174,6 +180,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -197,6 +205,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -220,6 +230,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -243,6 +255,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -269,6 +283,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>42</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -292,6 +308,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>50</l2>
               </Tremolo>
             </Chord>
           <Chord>
@@ -315,6 +333,8 @@
               </Note>
             <Tremolo>
               <subtype>c32</subtype>
+              <l1>52</l1>
+              <l2>50</l2>
               </Tremolo>
             </Chord>
           <Chord>
diff --git a/src/engraving/tests/unrollrepeats_data/clef-key-ts-ref.mscx b/src/engraving/tests/unrollrepeats_data/clef-key-ts-ref.mscx
index d1e986c1c350c..486aa9b1de253 100644
--- a/src/engraving/tests/unrollrepeats_data/clef-key-ts-ref.mscx
+++ b/src/engraving/tests/unrollrepeats_data/clef-key-ts-ref.mscx
@@ -270,7 +270,7 @@
             </Chord>
           <Beam>
             <l1>44</l1>
-            <l2>38</l2>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>16th</durationType>
@@ -473,7 +473,7 @@
             </Chord>
           <Beam>
             <l1>44</l1>
-            <l2>38</l2>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>16th</durationType>
@@ -815,7 +815,7 @@
             </Chord>
           <Beam>
             <l1>44</l1>
-            <l2>38</l2>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>16th</durationType>
@@ -1119,8 +1119,8 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-8</l1>
-            <l2>-6</l2>
+            <l1>-6</l1>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <linkedMain/>
@@ -1663,8 +1663,8 @@
                 </Note>
               </Chord>
             <Beam>
-              <l1>-8</l1>
-              <l2>-6</l2>
+              <l1>-6</l1>
+              <l2>-4</l2>
               </Beam>
             <Chord>
               <linked>
diff --git a/src/importexport/capella/tests/data/test4.cap-ref.mscx b/src/importexport/capella/tests/data/test4.cap-ref.mscx
index abab69a98ec37..f84c1add8d8eb 100644
--- a/src/importexport/capella/tests/data/test4.cap-ref.mscx
+++ b/src/importexport/capella/tests/data/test4.cap-ref.mscx
@@ -140,8 +140,8 @@
           </LayoutBreak>
         <voice>
           <Beam>
-            <l1>-6</l1>
-            <l2>-8</l2>
+            <l1>-4</l1>
+            <l2>-6</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/importexport/capella/tests/data/test4.capx-ref.mscx b/src/importexport/capella/tests/data/test4.capx-ref.mscx
index 969dfe08ce837..40d758b21f895 100644
--- a/src/importexport/capella/tests/data/test4.capx-ref.mscx
+++ b/src/importexport/capella/tests/data/test4.capx-ref.mscx
@@ -140,8 +140,8 @@
           </LayoutBreak>
         <voice>
           <Beam>
-            <l1>-6</l1>
-            <l2>-8</l2>
+            <l1>-4</l1>
+            <l2>-6</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
diff --git a/src/importexport/capella/tests/data/test7.cap-ref.mscx b/src/importexport/capella/tests/data/test7.cap-ref.mscx
index e6d2785eecc27..24f1b98f5b263 100644
--- a/src/importexport/capella/tests/data/test7.cap-ref.mscx
+++ b/src/importexport/capella/tests/data/test7.cap-ref.mscx
@@ -92,7 +92,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-6</l1>
+            <l1>-4</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>
diff --git a/src/importexport/guitarpro/tests/data/dotted-tuplets.gp5-ref.mscx b/src/importexport/guitarpro/tests/data/dotted-tuplets.gp5-ref.mscx
index 065a93a4c693c..92792b66d008d 100644
--- a/src/importexport/guitarpro/tests/data/dotted-tuplets.gp5-ref.mscx
+++ b/src/importexport/guitarpro/tests/data/dotted-tuplets.gp5-ref.mscx
@@ -104,8 +104,8 @@
               </Number>
             </Tuplet>
           <Beam>
-            <l1>40</l1>
-            <l2>38</l2>
+            <l1>38</l1>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <dots>1</dots>
diff --git a/src/importexport/guitarpro/tests/data/instr-change.gp-ref.mscx b/src/importexport/guitarpro/tests/data/instr-change.gp-ref.mscx
index 392e87384cf51..fd8e79ca31a94 100644
--- a/src/importexport/guitarpro/tests/data/instr-change.gp-ref.mscx
+++ b/src/importexport/guitarpro/tests/data/instr-change.gp-ref.mscx
@@ -113,8 +113,8 @@ The Wall</text>
             <text><sym>metNoteQuarterUp</sym> = 115</text>
             </Tempo>
           <Beam>
-            <l1>40</l1>
-            <l2>38</l2>
+            <l1>38</l1>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>16th</durationType>
@@ -308,8 +308,8 @@ The Wall</text>
             <text>Acoustic Grand Piano</text>
             </InstrumentChange>
           <Beam>
-            <l1>40</l1>
-            <l2>38</l2>
+            <l1>38</l1>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>16th</durationType>
diff --git a/src/importexport/guitarpro/tests/data/instr-change.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/instr-change.gpx-ref.mscx
index de0698fd52d6b..5f4e024159574 100644
--- a/src/importexport/guitarpro/tests/data/instr-change.gpx-ref.mscx
+++ b/src/importexport/guitarpro/tests/data/instr-change.gpx-ref.mscx
@@ -113,8 +113,8 @@ The Wall</text>
             <text><sym>metNoteQuarterUp</sym> = 115</text>
             </Tempo>
           <Beam>
-            <l1>40</l1>
-            <l2>38</l2>
+            <l1>38</l1>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>16th</durationType>
@@ -308,8 +308,8 @@ The Wall</text>
             <text>German-APiano</text>
             </InstrumentChange>
           <Beam>
-            <l1>40</l1>
-            <l2>38</l2>
+            <l1>38</l1>
+            <l2>36</l2>
             </Beam>
           <Chord>
             <durationType>16th</durationType>
diff --git a/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx
index 911a2bad0c27c..5b76f92fef3f2 100644
--- a/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx
+++ b/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx
@@ -252,8 +252,8 @@ solo concert</text>
               </Number>
             </Tuplet>
           <Beam>
-            <l1>-8</l1>
-            <l2>-6</l2>
+            <l1>-6</l1>
+            <l2>-4</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>