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 @@ up - -6 - -8 + -4 + -6 begin @@ -731,7 +731,7 @@ - 38 + 36 42 @@ -951,7 +951,7 @@ 42 - 38 + 36 eighth @@ -969,7 +969,7 @@ 42 - 38 + 36 begin @@ -996,7 +996,7 @@ down 42 - 38 + 36 eighth @@ -1015,7 +1015,7 @@ down 42 - 38 + 36 begin @@ -1035,7 +1035,7 @@ down 42 - 38 + 36 eighth 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 @@ up - -8 - -6 + -6 + -4 eighth @@ -537,8 +537,8 @@ up - -8 - -6 + -6 + -4 begin @@ -666,8 +666,8 @@ down - 40 - 38 + 38 + 36 eighth @@ -684,8 +684,8 @@ - 40 - 38 + 38 + 36 begin 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 @@ - -6 + -4 -10 @@ -417,8 +417,8 @@ - 38 - 40 + 36 + 38 eighth @@ -455,7 +455,7 @@ -10 - -6 + -4 eighth @@ -473,7 +473,7 @@ -10 - -6 + -4 begin @@ -499,7 +499,7 @@ -10 - -6 + -4 eighth @@ -517,7 +517,7 @@ -10 - -6 + -4 begin @@ -536,7 +536,7 @@ -10 - -6 + -4 eighth @@ -703,8 +703,8 @@ - 38 - 40 + 36 + 38 eighth @@ -741,7 +741,7 @@ -10 - -6 + -4 eighth @@ -759,7 +759,7 @@ -10 - -6 + -4 begin @@ -782,7 +782,7 @@ -10 - -6 + -4 eighth 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 @@ up - -6 + -4 -10 @@ -751,8 +751,8 @@ - 38 - 40 + 36 + 38 begin @@ -771,7 +771,7 @@ down - 38 + 36 42 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 @@ up - -6 + -4 -10 @@ -791,8 +791,8 @@ down - 38 - 40 + 36 + 38 eighth 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 @@ - -6 + -4 -10 @@ -811,8 +811,8 @@ down - 38 - 40 + 36 + 38 begin 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 @@ - -6 - -8 + -4 + -6 begin @@ -195,7 +195,7 @@ - -6 + -4 -10 @@ -807,8 +807,8 @@ down - 38 - 40 + 36 + 38 eighth 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 @@ 32nd - 6 - 6 + 4 + 4 64th @@ -1449,8 +1449,8 @@ 32nd - -2 - -2 + -4 + -4 64th @@ -1491,8 +1491,8 @@ 32nd - -10 - -10 + -12 + -12 64th @@ -1533,8 +1533,8 @@ 32nd - 50 - 50 + 52 + 52 64th @@ -1578,8 +1578,8 @@ 32nd - 42 - 42 + 44 + 44 64th @@ -1620,8 +1620,8 @@ 32nd - 34 - 34 + 36 + 36 64th @@ -1708,8 +1708,8 @@ 32nd - 26 - 26 + 28 + 28 64th diff --git a/src/engraving/tests/compat114_data/notes-ref.mscx b/src/engraving/tests/compat114_data/notes-ref.mscx index 7b59401965ff1..dc01d66aa7041 100644 --- a/src/engraving/tests/compat114_data/notes-ref.mscx +++ b/src/engraving/tests/compat114_data/notes-ref.mscx @@ -184,7 +184,7 @@ - -6 + -4 -10 diff --git a/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx b/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx index 478f7d16e2919..474cba4d9a05a 100644 --- a/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx +++ b/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx @@ -82,6 +82,8 @@ c8 + 34 + 30 @@ -107,6 +109,8 @@ c16 + 38 + 36 @@ -132,6 +136,8 @@ c32 + 44 + 42 diff --git a/src/engraving/tests/compat114_data/tuplets-ref.mscx b/src/engraving/tests/compat114_data/tuplets-ref.mscx index 511cbbc9c5212..6a08817cce2ca 100644 --- a/src/engraving/tests/compat114_data/tuplets-ref.mscx +++ b/src/engraving/tests/compat114_data/tuplets-ref.mscx @@ -159,8 +159,8 @@ - 40 - 38 + 38 + 36 eighth 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 @@ 1 - 40 - 38 + 38 + 36 eighth 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 @@ - -8 - -6 + -6 + -4 eighth 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 @@ - -8 - -6 + -6 + -4 eighth 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 @@ - 38 - 40 + 36 + 38 eighth @@ -912,8 +912,8 @@ - -8 - -6 + -6 + -4 eighth 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 @@ - -8 - -6 + -6 + -4 @@ -657,8 +657,8 @@ - -8 - -6 + -6 + -4 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 @@ - -8 - -6 + -6 + -4 eighth 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 @@ - 38 - 40 + 36 + 38 eighth 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 @@ c8 + 26 + 24 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 @@ c32 + -12 + -18 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 @@ c32 + 52 + 50 @@ -401,6 +403,8 @@ c32 + 52 + 42 @@ -424,6 +428,8 @@ c32 + 52 + 42 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 @@ c32 + 52 + 42 @@ -125,6 +127,8 @@ c32 + 52 + 42 @@ -148,6 +152,8 @@ c32 + 52 + 42 @@ -174,6 +180,8 @@ c32 + 52 + 42 @@ -197,6 +205,8 @@ c32 + 52 + 42 @@ -220,6 +230,8 @@ c32 + 52 + 42 @@ -243,6 +255,8 @@ c32 + 52 + 42 @@ -269,6 +283,8 @@ c32 + 52 + 42 @@ -292,6 +308,8 @@ c32 + 52 + 50 @@ -315,6 +333,8 @@ c32 + 52 + 50 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 @@ 44 - 38 + 36 16th @@ -473,7 +473,7 @@ 44 - 38 + 36 16th @@ -815,7 +815,7 @@ 44 - 38 + 36 16th @@ -1119,8 +1119,8 @@ - -8 - -6 + -6 + -4 @@ -1663,8 +1663,8 @@ - -8 - -6 + -6 + -4 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 @@ - -6 - -8 + -4 + -6 eighth 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 @@ - -6 - -8 + -4 + -6 eighth 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 @@ - -6 + -4 -10 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 @@ - 40 - 38 + 38 + 36 1 diff --git a/src/importexport/guitarpro/tests/data/grace-durations.gp-ref.mscx b/src/importexport/guitarpro/tests/data/grace-durations.gp-ref.mscx index 4a614c89e0ed9..411e7581dd27a 100644 --- a/src/importexport/guitarpro/tests/data/grace-durations.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace-durations.gp-ref.mscx @@ -216,8 +216,8 @@ - -34 - -34 + -32 + -32 16th @@ -262,8 +262,8 @@ - -34 - -34 + -32 + -32 16th @@ -315,8 +315,8 @@ - -34 - -34 + -32 + -32 16th @@ -372,8 +372,8 @@ - -34 - -34 + -32 + -32 16th 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 metNoteQuarterUp = 115 - 40 - 38 + 38 + 36 16th @@ -308,8 +308,8 @@ The Wall Acoustic Grand Piano - 40 - 38 + 38 + 36 16th 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 metNoteQuarterUp = 115 - 40 - 38 + 38 + 36 16th @@ -308,8 +308,8 @@ The Wall German-APiano - 40 - 38 + 38 + 36 16th 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 - -8 - -6 + -6 + -4 eighth