From 119fb95ee622b9c9eedf86e8fe6f3e4c802de932 Mon Sep 17 00:00:00 2001 From: James Mizen Date: Fri, 9 Aug 2024 16:38:35 +0100 Subject: [PATCH] Fix frame reading and writing --- src/engraving/rw/read114/read114.cpp | 5 ----- src/engraving/rw/read206/read206.cpp | 3 --- src/engraving/rw/read400/staffrw.cpp | 8 ++++++-- src/engraving/rw/read400/tread.cpp | 6 ++++++ src/engraving/rw/read410/staffread.cpp | 8 ++++++-- src/engraving/rw/read410/tread.cpp | 6 ++++++ src/engraving/tests/box_data/undoRemoveVBox2-ref.mscx | 1 + src/engraving/tests/chordsymbol_data/add-part-ref.mscx | 1 + .../tests/chordsymbol_data/realize-concert-pitch-ref.mscx | 1 + .../tests/chordsymbol_data/realize-duration-ref.mscx | 1 + .../tests/chordsymbol_data/realize-jazz-ref.mscx | 1 + .../tests/chordsymbol_data/realize-transpose-ref.mscx | 1 + .../tests/chordsymbol_data/realize-triplet-ref.mscx | 1 + .../tests/chordsymbol_data/transpose-part-ref.mscx | 2 ++ src/engraving/tests/chordsymbol_data/transpose-ref.mscx | 1 + src/engraving/tests/clef_data/clef-2-ref.mscx | 1 + src/engraving/tests/compat114_data/clefs-ref.mscx | 1 + src/engraving/tests/compat114_data/fingering-ref.mscx | 1 + src/engraving/tests/compat114_data/hairpin-ref.mscx | 1 + src/engraving/tests/compat114_data/keysig-ref.mscx | 1 + src/engraving/tests/compat114_data/notes-ref.mscx | 1 + src/engraving/tests/compat114_data/textstyles-ref.mscx | 1 + src/engraving/tests/compat114_data/title-ref.mscx | 1 + src/engraving/tests/compat114_data/tuplets-ref.mscx | 1 + src/engraving/tests/compat114_data/tuplets_1-ref.mscx | 1 + src/engraving/tests/compat114_data/tuplets_2-ref.mscx | 1 + .../tests/compat206_data/articulations-double-ref.mscx | 2 ++ src/engraving/tests/compat206_data/articulations-ref.mscx | 1 + src/engraving/tests/compat206_data/barlines-ref.mscx | 1 + src/engraving/tests/compat206_data/clefs-ref.mscx | 1 + src/engraving/tests/compat206_data/frame_text2-ref.mscx | 1 + src/engraving/tests/compat206_data/hairpin-ref.mscx | 2 ++ src/engraving/tests/compat206_data/lidemptytext-ref.mscx | 2 ++ src/engraving/tests/compat206_data/textstyles-ref.mscx | 1 + src/engraving/tests/compat206_data/tuplets-ref.mscx | 1 + .../tests/compat206_data/userstylesparts-ref.mscx | 4 ++++ src/engraving/tests/copypaste_data/copypaste01-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste02-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste03-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste04-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste05-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste06-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste08-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste09-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste10-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste11-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste12-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste13-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste17-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste18-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste19-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste20-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste22-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste25-ref.mscx | 1 + src/engraving/tests/copypaste_data/copypaste50-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote01-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote02-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote03-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote04-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote05-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote06-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote07-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote08-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote09-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote10-ref.mscx | 1 + .../tests/copypaste_data/copypasteNote11-ref.mscx | 1 + .../copypastesymbollist-articulation-rest-ref.mscx | 1 + .../copypastesymbollist-range-01-ref.mscx | 1 + .../copypastesymbollist-range-ref.mscx | 1 + .../tests/exchangevoices_data/undoChangeVoice01-ref.mscx | 2 ++ .../tests/exchangevoices_data/undoChangeVoice02-ref.mscx | 2 ++ src/engraving/tests/instrumentchange_data/add-ref.mscx | 1 + src/engraving/tests/instrumentchange_data/change-ref.mscx | 1 + src/engraving/tests/instrumentchange_data/copy-ref.mscx | 1 + src/engraving/tests/instrumentchange_data/delete-ref.mscx | 1 + src/engraving/tests/instrumentchange_data/mixer-ref.mscx | 1 + src/engraving/tests/join_data/join01-ref.mscx | 1 + src/engraving/tests/join_data/join02-ref.mscx | 1 + src/engraving/tests/join_data/join03-ref.mscx | 1 + src/engraving/tests/join_data/join04-ref.mscx | 1 + src/engraving/tests/join_data/join05-ref.mscx | 1 + src/engraving/tests/join_data/join06-ref.mscx | 1 + src/engraving/tests/join_data/join07-ref.mscx | 1 + .../tests/measure_data/measure-insert_beginning-ref.mscx | 1 + src/engraving/tests/measure_data/mmrest-ref.mscx | 1 + .../tests/measure_data/undoDelInitialVBox_269919-ref.mscx | 1 + src/engraving/tests/note_data/notelimits-ref.mscx | 1 + src/engraving/tests/parts_data/partStyle-score-ref.mscx | 3 +++ .../tests/parts_data/partStyle-score-reload-ref.mscx | 3 +++ src/engraving/tests/parts_data/voices-ref.mscx | 4 ++++ .../tests/rhythmicGrouping_data/groupConflicts-ref.mscx | 1 + .../tests/rhythmicGrouping_data/groupSubbeats-ref.mscx | 1 + .../tests/rhythmicGrouping_data/groupVoices-ref.mscx | 1 + .../selectionrangedelete03-ref.mscx | 1 + .../selectionrangedelete04-ref.mscx | 1 + .../selectionrangedelete05-ref.mscx | 1 + .../selectionrangedelete06_partialnestedtuplets-ref.mscx | 1 + .../tests/spanners_data/glissando-cloning04-ref.mscx | 2 ++ src/engraving/tests/split_data/split01-ref.mscx | 1 + src/engraving/tests/split_data/split02-ref.mscx | 1 + src/engraving/tests/split_data/split03-ref.mscx | 1 + src/engraving/tests/split_data/split04-ref.mscx | 1 + src/engraving/tests/split_data/split05-ref.mscx | 1 + src/engraving/tests/split_data/split06-ref.mscx | 1 + src/engraving/tests/split_data/split07-ref.mscx | 1 + src/engraving/tests/split_data/split08-ref.mscx | 1 + src/engraving/tests/split_data/split295207-ref.mscx | 1 + src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx | 1 + src/engraving/tests/textbase_data/createDynamic-ref.mscx | 1 + .../tests/textbase_data/dynamicAddTextAfter-ref.mscx | 1 + .../tests/textbase_data/dynamicAddTextBefore-ref.mscx | 1 + .../tests/textbase_data/dynamicAddTextNoItalic-ref.mscx | 1 + src/engraving/tests/timesig_data/timesig-02-ref.mscx | 1 + src/engraving/tests/timesig_data/timesig-04-ref.mscx | 1 + src/engraving/tests/timesig_data/timesig-06-ref.mscx | 1 + src/engraving/tests/timesig_data/timesig-07-ref.mscx | 1 + src/engraving/tests/timesig_data/timesig01-ref.mscx | 1 + .../tests/tools_data/change-enharmonic-both-01-ref.mscx | 1 + .../tests/tools_data/change-enharmonic-both-02-ref.mscx | 1 + .../tests/tools_data/change-enharmonic-both-03-ref.mscx | 1 + .../tests/tools_data/change-enharmonic-both-04-ref.mscx | 1 + .../tests/tools_data/change-enharmonic-both-05-ref.mscx | 1 + .../tools_data/change-enharmonic-current-01-ref.mscx | 1 + .../tools_data/change-enharmonic-current-02-ref.mscx | 1 + .../tools_data/change-enharmonic-current-03-ref.mscx | 1 + .../tools_data/change-enharmonic-current-04-ref.mscx | 1 + .../tools_data/change-enharmonic-current-05-ref.mscx | 1 + .../tests/tools_data/undoResequencePart01-ref.mscx | 2 ++ .../tests/tools_data/undoResequencePart02-ref.mscx | 2 ++ .../tests/tuplet_data/nestedTuplets_addStaff-ref.mscx | 1 + 130 files changed, 167 insertions(+), 12 deletions(-) diff --git a/src/engraving/rw/read114/read114.cpp b/src/engraving/rw/read114/read114.cpp index 4b6e6fd4eb445..05e61225d0bd2 100644 --- a/src/engraving/rw/read114/read114.cpp +++ b/src/engraving/rw/read114/read114.cpp @@ -2217,8 +2217,6 @@ static bool readBoxProperties(XmlReader& e, ReadContext& ctx, Box* b) VBox* vb = Factory::createVBox(b->system()); readBox(e, ctx, vb); b->add(vb); - // If nested inside title frame, don't scale with spatium - vb->setSizeIsSpatiumDependent(!b->isTitleFrame()); } // else if (MeasureBase::readProperties(e)) // ; @@ -2253,8 +2251,6 @@ static void readBox(XmlReader& e, ReadContext& ctx, Box* b) readBox(e, ctx, vb); b->add(vb); keepMargins = true; // in old file, box nesting used outer box margins - // If nested inside title frame, don't scale with spatium - vb->setSizeIsSpatiumDependent(!b->isTitleFrame()); } else if (!readBoxProperties(e, ctx, b)) { e.unknown(); } @@ -2338,7 +2334,6 @@ static void readStaffContent(Score* score, XmlReader& e, ReadContext& ctx) readBox(e, ctx, mb); mb->setTick(ctx.tick()); score->measures()->add(mb); - mb->setSizeIsSpatiumDependent(!mb->isTitleFrame()); } else if (tag == "tick") { ctx.setTick(Fraction::fromTicks(score->fileDivision(e.readInt()))); } else { diff --git a/src/engraving/rw/read206/read206.cpp b/src/engraving/rw/read206/read206.cpp index b3ef44d301af5..3421a86295885 100644 --- a/src/engraving/rw/read206/read206.cpp +++ b/src/engraving/rw/read206/read206.cpp @@ -3037,8 +3037,6 @@ static void readBox(Box* b, XmlReader& e, ReadContext& ctx) VBox* vb = Factory::createVBox(b->score()->dummy()->system()); read400::TRead::read(vb, e, ctx); b->add(vb); - // If nested inside title frame, don't scale with spatium - vb->setSizeIsSpatiumDependent(!b->isTitleFrame()); } else if (tag == "Text") { Text* t; if (b->isTBox()) { @@ -3124,7 +3122,6 @@ static void readStaffContent206(Score* score, XmlReader& e, ReadContext& ctx) if (!readMeasureLast && !lastReadBox) { b->setTopGap(b->propertyDefault(Pid::TOP_GAP).value()); b->setPropertyFlags(Pid::TOP_GAP, PropertyFlags::STYLED); - b->setSizeIsSpatiumDependent(false); } else if (readMeasureLast) { b->setTopGap(b->topGap() + b->propertyDefault(Pid::TOP_GAP).value()); } diff --git a/src/engraving/rw/read400/staffrw.cpp b/src/engraving/rw/read400/staffrw.cpp index 1c50e1e29d7ea..5097a219df258 100644 --- a/src/engraving/rw/read400/staffrw.cpp +++ b/src/engraving/rw/read400/staffrw.cpp @@ -83,10 +83,14 @@ void StaffRead::readStaff(Score* score, XmlReader& e, ReadContext& ctx) } } else if (tag == "HBox" || tag == "VBox" || tag == "TBox" || tag == "FBox") { MeasureBase* mb = toMeasureBase(Factory::createItemByName(tag, ctx.dummy())); - TRead::readItem(mb, e, ctx); mb->setTick(ctx.tick()); score->measures()->add(mb); - mb->setSizeIsSpatiumDependent(!toBox(mb)->isTitleFrame()); + // This default value needs initialising after being added to the score, as it depends on whether this is the title frame + if (mb->score()->mscVersion() >= 440) { + mb->setSizeIsSpatiumDependent(mb->propertyDefault(Pid::SIZE_SPATIUM_DEPENDENT).toBool()); + } + + TRead::readItem(mb, e, ctx); } else if (tag == "tick") { ctx.setTick(Fraction::fromTicks(ctx.fileDivision(e.readInt()))); } else { diff --git a/src/engraving/rw/read400/tread.cpp b/src/engraving/rw/read400/tread.cpp index 0d89e9238fe7b..aecef6f14fcae 100644 --- a/src/engraving/rw/read400/tread.cpp +++ b/src/engraving/rw/read400/tread.cpp @@ -1993,6 +1993,9 @@ void TRead::read(Box* b, XmlReader& e, ReadContext& ctx) if (b->score()->mscVersion() < 302) { b->setAutoSizeEnabled(false); // disable auto-size for older scores by default. } + if (b->score()->mscVersion() < 440) { + b->setSizeIsSpatiumDependent(true); + } } void TRead::read(HBox* b, XmlReader& e, ReadContext& ctx) @@ -2005,6 +2008,9 @@ void TRead::read(HBox* b, XmlReader& e, ReadContext& ctx) if (b->score()->mscVersion() < 302) { b->setAutoSizeEnabled(false); // disable auto-size for older scores by default. } + if (b->score()->mscVersion() < 440) { + b->setSizeIsSpatiumDependent(true); + } } bool TRead::readProperties(HBox* b, XmlReader& e, ReadContext& ctx) diff --git a/src/engraving/rw/read410/staffread.cpp b/src/engraving/rw/read410/staffread.cpp index 943c72df9914e..91815f8c68756 100644 --- a/src/engraving/rw/read410/staffread.cpp +++ b/src/engraving/rw/read410/staffread.cpp @@ -83,10 +83,14 @@ void StaffRead::readStaff(Score* score, XmlReader& e, ReadContext& ctx) } } else if (tag == "HBox" || tag == "VBox" || tag == "TBox" || tag == "FBox") { MeasureBase* mb = toMeasureBase(Factory::createItemByName(tag, ctx.dummy())); - TRead::readItem(mb, e, ctx); mb->setTick(ctx.tick()); score->measures()->add(mb); - mb->setSizeIsSpatiumDependent(!toBox(mb)->isTitleFrame()); + // This default value needs initialising after being added to the score, as it depends on whether this is the title frame + if (mb->score()->mscVersion() >= 440) { + mb->setSizeIsSpatiumDependent(mb->propertyDefault(Pid::SIZE_SPATIUM_DEPENDENT).toBool()); + } + + TRead::readItem(mb, e, ctx); } else if (tag == "tick") { ctx.setTick(Fraction::fromTicks(ctx.fileDivision(e.readInt()))); } else { diff --git a/src/engraving/rw/read410/tread.cpp b/src/engraving/rw/read410/tread.cpp index b215197416eaa..826f5e30045d4 100644 --- a/src/engraving/rw/read410/tread.cpp +++ b/src/engraving/rw/read410/tread.cpp @@ -2177,6 +2177,9 @@ void TRead::read(Box* b, XmlReader& e, ReadContext& ctx) if (b->score()->mscVersion() < 302) { b->setAutoSizeEnabled(false); // disable auto-size for older scores by default. } + if (b->score()->mscVersion() < 440) { + b->setSizeIsSpatiumDependent(true); + } } void TRead::read(HBox* b, XmlReader& e, ReadContext& ctx) @@ -2189,6 +2192,9 @@ void TRead::read(HBox* b, XmlReader& e, ReadContext& ctx) if (b->score()->mscVersion() < 302) { b->setAutoSizeEnabled(false); // disable auto-size for older scores by default. } + if (b->score()->mscVersion() < 440) { + b->setSizeIsSpatiumDependent(true); + } } bool TRead::readProperties(HBox* b, XmlReader& e, ReadContext& ctx) diff --git a/src/engraving/tests/box_data/undoRemoveVBox2-ref.mscx b/src/engraving/tests/box_data/undoRemoveVBox2-ref.mscx index baf1aaae142b2..6b023012ebf16 100644 --- a/src/engraving/tests/box_data/undoRemoveVBox2-ref.mscx +++ b/src/engraving/tests/box_data/undoRemoveVBox2-ref.mscx @@ -84,6 +84,7 @@ 10 + 1 VBox diff --git a/src/engraving/tests/chordsymbol_data/add-part-ref.mscx b/src/engraving/tests/chordsymbol_data/add-part-ref.mscx index 86cc8bfad5e14..921cfe0e9941b 100644 --- a/src/engraving/tests/chordsymbol_data/add-part-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/add-part-ref.mscx @@ -169,6 +169,7 @@ 10 + 1 diff --git a/src/engraving/tests/chordsymbol_data/realize-concert-pitch-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-concert-pitch-ref.mscx index 2add6c913fe27..7f79cd0aff4f3 100644 --- a/src/engraving/tests/chordsymbol_data/realize-concert-pitch-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/realize-concert-pitch-ref.mscx @@ -92,6 +92,7 @@ 10 + 1 diff --git a/src/engraving/tests/chordsymbol_data/realize-duration-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-duration-ref.mscx index f040a21573af1..4af0eff48c693 100644 --- a/src/engraving/tests/chordsymbol_data/realize-duration-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/realize-duration-ref.mscx @@ -90,6 +90,7 @@ 10 + 1 diff --git a/src/engraving/tests/chordsymbol_data/realize-jazz-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-jazz-ref.mscx index 080fde8f0669f..792bea646a48f 100644 --- a/src/engraving/tests/chordsymbol_data/realize-jazz-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/realize-jazz-ref.mscx @@ -97,6 +97,7 @@ 10 + 1 diff --git a/src/engraving/tests/chordsymbol_data/realize-transpose-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-transpose-ref.mscx index f9364c469be99..8db55dd421980 100644 --- a/src/engraving/tests/chordsymbol_data/realize-transpose-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/realize-transpose-ref.mscx @@ -74,6 +74,7 @@ 10 + 1 diff --git a/src/engraving/tests/chordsymbol_data/realize-triplet-ref.mscx b/src/engraving/tests/chordsymbol_data/realize-triplet-ref.mscx index a604cdf811e02..1c3190e9fe23b 100644 --- a/src/engraving/tests/chordsymbol_data/realize-triplet-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/realize-triplet-ref.mscx @@ -90,6 +90,7 @@ 10 + 1 diff --git a/src/engraving/tests/chordsymbol_data/transpose-part-ref.mscx b/src/engraving/tests/chordsymbol_data/transpose-part-ref.mscx index 61e663a79b720..f0dda5ab211f4 100644 --- a/src/engraving/tests/chordsymbol_data/transpose-part-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/transpose-part-ref.mscx @@ -74,6 +74,7 @@ 10 + 1 @@ -188,6 +189,7 @@ 10 + 1 diff --git a/src/engraving/tests/chordsymbol_data/transpose-ref.mscx b/src/engraving/tests/chordsymbol_data/transpose-ref.mscx index 51c2ef3553852..7f43d7802c9b8 100644 --- a/src/engraving/tests/chordsymbol_data/transpose-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/transpose-ref.mscx @@ -74,6 +74,7 @@ 10 + 1 diff --git a/src/engraving/tests/clef_data/clef-2-ref.mscx b/src/engraving/tests/clef_data/clef-2-ref.mscx index e89a71402a5d6..65d224eea3fba 100644 --- a/src/engraving/tests/clef_data/clef-2-ref.mscx +++ b/src/engraving/tests/clef_data/clef-2-ref.mscx @@ -73,6 +73,7 @@ 10 + 1 ClefTimeSig diff --git a/src/engraving/tests/compat114_data/clefs-ref.mscx b/src/engraving/tests/compat114_data/clefs-ref.mscx index d5467e964a5b3..1de352815ed54 100644 --- a/src/engraving/tests/compat114_data/clefs-ref.mscx +++ b/src/engraving/tests/compat114_data/clefs-ref.mscx @@ -66,6 +66,7 @@ 10 0 + 1 Clefs diff --git a/src/engraving/tests/compat114_data/fingering-ref.mscx b/src/engraving/tests/compat114_data/fingering-ref.mscx index 819bfb9ee8ba0..f35f6b789ca74 100644 --- a/src/engraving/tests/compat114_data/fingering-ref.mscx +++ b/src/engraving/tests/compat114_data/fingering-ref.mscx @@ -74,6 +74,7 @@ 10 0 + 1 fing diff --git a/src/engraving/tests/compat114_data/hairpin-ref.mscx b/src/engraving/tests/compat114_data/hairpin-ref.mscx index 523ea998f7830..787625281a704 100644 --- a/src/engraving/tests/compat114_data/hairpin-ref.mscx +++ b/src/engraving/tests/compat114_data/hairpin-ref.mscx @@ -70,6 +70,7 @@ 10 0 + 1 Hairpin diff --git a/src/engraving/tests/compat114_data/keysig-ref.mscx b/src/engraving/tests/compat114_data/keysig-ref.mscx index 7a0e796cb8443..0c89355bf0787 100644 --- a/src/engraving/tests/compat114_data/keysig-ref.mscx +++ b/src/engraving/tests/compat114_data/keysig-ref.mscx @@ -65,6 +65,7 @@ 10 0 + 1 keysig diff --git a/src/engraving/tests/compat114_data/notes-ref.mscx b/src/engraving/tests/compat114_data/notes-ref.mscx index 615e6c53bc797..c4561fead1a6d 100644 --- a/src/engraving/tests/compat114_data/notes-ref.mscx +++ b/src/engraving/tests/compat114_data/notes-ref.mscx @@ -65,6 +65,7 @@ 10 0 + 1 notes diff --git a/src/engraving/tests/compat114_data/textstyles-ref.mscx b/src/engraving/tests/compat114_data/textstyles-ref.mscx index 72d143e18852d..e31d85eb9217a 100644 --- a/src/engraving/tests/compat114_data/textstyles-ref.mscx +++ b/src/engraving/tests/compat114_data/textstyles-ref.mscx @@ -70,6 +70,7 @@ 6.36254 0 + 1 Title diff --git a/src/engraving/tests/compat114_data/title-ref.mscx b/src/engraving/tests/compat114_data/title-ref.mscx index 80f700dd8a26d..a14f3039e9e8a 100644 --- a/src/engraving/tests/compat114_data/title-ref.mscx +++ b/src/engraving/tests/compat114_data/title-ref.mscx @@ -70,6 +70,7 @@ 10 0 + 1 title diff --git a/src/engraving/tests/compat114_data/tuplets-ref.mscx b/src/engraving/tests/compat114_data/tuplets-ref.mscx index 99012df9e67c6..a90c57e887803 100644 --- a/src/engraving/tests/compat114_data/tuplets-ref.mscx +++ b/src/engraving/tests/compat114_data/tuplets-ref.mscx @@ -63,6 +63,7 @@ 10 0 + 1 Tuplets diff --git a/src/engraving/tests/compat114_data/tuplets_1-ref.mscx b/src/engraving/tests/compat114_data/tuplets_1-ref.mscx index cc24fb386fff5..a23985919b5b7 100644 --- a/src/engraving/tests/compat114_data/tuplets_1-ref.mscx +++ b/src/engraving/tests/compat114_data/tuplets_1-ref.mscx @@ -63,6 +63,7 @@ 10 0 + 1 Tuplet 1.3 file diff --git a/src/engraving/tests/compat114_data/tuplets_2-ref.mscx b/src/engraving/tests/compat114_data/tuplets_2-ref.mscx index 9dc676e8e7423..bdb77d44f2327 100644 --- a/src/engraving/tests/compat114_data/tuplets_2-ref.mscx +++ b/src/engraving/tests/compat114_data/tuplets_2-ref.mscx @@ -63,6 +63,7 @@ 10 0 + 1 Tuplet 1.3 file diff --git a/src/engraving/tests/compat206_data/articulations-double-ref.mscx b/src/engraving/tests/compat206_data/articulations-double-ref.mscx index b111110d8e732..0f30c3e3956e2 100644 --- a/src/engraving/tests/compat206_data/articulations-double-ref.mscx +++ b/src/engraving/tests/compat206_data/articulations-double-ref.mscx @@ -56,6 +56,7 @@ 10 0 + 1 @@ -1855,6 +1856,7 @@ 10 0 + 1 diff --git a/src/engraving/tests/compat206_data/articulations-ref.mscx b/src/engraving/tests/compat206_data/articulations-ref.mscx index e99ca1777e45d..1a96332ac48c6 100644 --- a/src/engraving/tests/compat206_data/articulations-ref.mscx +++ b/src/engraving/tests/compat206_data/articulations-ref.mscx @@ -75,6 +75,7 @@ 10 0 + 1 Articulations diff --git a/src/engraving/tests/compat206_data/barlines-ref.mscx b/src/engraving/tests/compat206_data/barlines-ref.mscx index 8b3b492d7e090..ef86a6943e5f7 100644 --- a/src/engraving/tests/compat206_data/barlines-ref.mscx +++ b/src/engraving/tests/compat206_data/barlines-ref.mscx @@ -425,6 +425,7 @@ 10 0 + 1 barlines diff --git a/src/engraving/tests/compat206_data/clefs-ref.mscx b/src/engraving/tests/compat206_data/clefs-ref.mscx index 521883b7b100e..a19712a6a8f04 100644 --- a/src/engraving/tests/compat206_data/clefs-ref.mscx +++ b/src/engraving/tests/compat206_data/clefs-ref.mscx @@ -73,6 +73,7 @@ 10 0 + 1 clefs diff --git a/src/engraving/tests/compat206_data/frame_text2-ref.mscx b/src/engraving/tests/compat206_data/frame_text2-ref.mscx index 113f26d71a235..5dd3302d22463 100644 --- a/src/engraving/tests/compat206_data/frame_text2-ref.mscx +++ b/src/engraving/tests/compat206_data/frame_text2-ref.mscx @@ -191,6 +191,7 @@ 25.5926 3 0 + 1 îèéààéà diff --git a/src/engraving/tests/compat206_data/hairpin-ref.mscx b/src/engraving/tests/compat206_data/hairpin-ref.mscx index be075ca9a1c3e..dd9ebb9aeb1d7 100644 --- a/src/engraving/tests/compat206_data/hairpin-ref.mscx +++ b/src/engraving/tests/compat206_data/hairpin-ref.mscx @@ -83,6 +83,7 @@ 10 0 + 1 @@ -670,6 +671,7 @@ 10 0 + 1 diff --git a/src/engraving/tests/compat206_data/lidemptytext-ref.mscx b/src/engraving/tests/compat206_data/lidemptytext-ref.mscx index 4e0eef3f8c0d0..22a1b9b76106f 100644 --- a/src/engraving/tests/compat206_data/lidemptytext-ref.mscx +++ b/src/engraving/tests/compat206_data/lidemptytext-ref.mscx @@ -135,6 +135,7 @@ 8 13 0 + 1 @@ -304,6 +305,7 @@ 8 13 0 + 1 Bass diff --git a/src/engraving/tests/compat206_data/textstyles-ref.mscx b/src/engraving/tests/compat206_data/textstyles-ref.mscx index b2b3b26c4df24..224c39330fdba 100644 --- a/src/engraving/tests/compat206_data/textstyles-ref.mscx +++ b/src/engraving/tests/compat206_data/textstyles-ref.mscx @@ -231,6 +231,7 @@ 7 8.33333 0 + 1 Title diff --git a/src/engraving/tests/compat206_data/tuplets-ref.mscx b/src/engraving/tests/compat206_data/tuplets-ref.mscx index d2c6c3b8b0b7f..589bc92e344e0 100644 --- a/src/engraving/tests/compat206_data/tuplets-ref.mscx +++ b/src/engraving/tests/compat206_data/tuplets-ref.mscx @@ -74,6 +74,7 @@ 10 0 + 1 Tuplets diff --git a/src/engraving/tests/compat206_data/userstylesparts-ref.mscx b/src/engraving/tests/compat206_data/userstylesparts-ref.mscx index 13a38b0d92fa2..47376504a5f10 100644 --- a/src/engraving/tests/compat206_data/userstylesparts-ref.mscx +++ b/src/engraving/tests/compat206_data/userstylesparts-ref.mscx @@ -227,6 +227,7 @@ 36.9323 0 + 1 @@ -501,6 +502,7 @@ 36.9323 0 + 1 @@ -734,6 +736,7 @@ 36.9323 0 + 1 -1 @@ -991,6 +994,7 @@ 36.9323 0 + 1 -2 diff --git a/src/engraving/tests/copypaste_data/copypaste01-ref.mscx b/src/engraving/tests/copypaste_data/copypaste01-ref.mscx index a211263a3a936..f4b54d78a4ffb 100644 --- a/src/engraving/tests/copypaste_data/copypaste01-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste01-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste02-ref.mscx b/src/engraving/tests/copypaste_data/copypaste02-ref.mscx index 8fa279310599a..6b6f2fedb3cf5 100644 --- a/src/engraving/tests/copypaste_data/copypaste02-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste02-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste03-ref.mscx b/src/engraving/tests/copypaste_data/copypaste03-ref.mscx index 2d5635cc872ee..491e03fd52ff8 100644 --- a/src/engraving/tests/copypaste_data/copypaste03-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste03-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste04-ref.mscx b/src/engraving/tests/copypaste_data/copypaste04-ref.mscx index bdbad6aa55ef0..7a1ca2d0ece2e 100644 --- a/src/engraving/tests/copypaste_data/copypaste04-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste04-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste05-ref.mscx b/src/engraving/tests/copypaste_data/copypaste05-ref.mscx index f3d644044d21f..4dc9fe9c2872d 100644 --- a/src/engraving/tests/copypaste_data/copypaste05-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste05-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste06-ref.mscx b/src/engraving/tests/copypaste_data/copypaste06-ref.mscx index ccc9600bd76a0..c2be5f2a85bf3 100644 --- a/src/engraving/tests/copypaste_data/copypaste06-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste06-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste08-ref.mscx b/src/engraving/tests/copypaste_data/copypaste08-ref.mscx index 26bdd0827a9fd..b545190007993 100644 --- a/src/engraving/tests/copypaste_data/copypaste08-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste08-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste09-ref.mscx b/src/engraving/tests/copypaste_data/copypaste09-ref.mscx index 17ecd98b3a58a..703213af302bd 100644 --- a/src/engraving/tests/copypaste_data/copypaste09-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste09-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste10-ref.mscx b/src/engraving/tests/copypaste_data/copypaste10-ref.mscx index 7679af00bc24f..58c806b20d60a 100644 --- a/src/engraving/tests/copypaste_data/copypaste10-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste10-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste11-ref.mscx b/src/engraving/tests/copypaste_data/copypaste11-ref.mscx index 9fc131176daf0..7a4ed84ea8501 100644 --- a/src/engraving/tests/copypaste_data/copypaste11-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste11-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste12-ref.mscx b/src/engraving/tests/copypaste_data/copypaste12-ref.mscx index 0f6d21d933a19..2283856519a23 100644 --- a/src/engraving/tests/copypaste_data/copypaste12-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste12-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste13-ref.mscx b/src/engraving/tests/copypaste_data/copypaste13-ref.mscx index e0aab81dba283..4f920f3abe480 100644 --- a/src/engraving/tests/copypaste_data/copypaste13-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste13-ref.mscx @@ -72,6 +72,7 @@ 10 + 1 voice-paste1 diff --git a/src/engraving/tests/copypaste_data/copypaste17-ref.mscx b/src/engraving/tests/copypaste_data/copypaste17-ref.mscx index 472f821746a82..8f418c303cb98 100644 --- a/src/engraving/tests/copypaste_data/copypaste17-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste17-ref.mscx @@ -72,6 +72,7 @@ 10 + 1 voice-paste diff --git a/src/engraving/tests/copypaste_data/copypaste18-ref.mscx b/src/engraving/tests/copypaste_data/copypaste18-ref.mscx index 97174df8e84d7..43f92efe03728 100644 --- a/src/engraving/tests/copypaste_data/copypaste18-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste18-ref.mscx @@ -72,6 +72,7 @@ 10 + 1 voice-paste diff --git a/src/engraving/tests/copypaste_data/copypaste19-ref.mscx b/src/engraving/tests/copypaste_data/copypaste19-ref.mscx index 819ee0ef349c6..09be4d2470f9d 100644 --- a/src/engraving/tests/copypaste_data/copypaste19-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste19-ref.mscx @@ -60,6 +60,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste20-ref.mscx b/src/engraving/tests/copypaste_data/copypaste20-ref.mscx index 766ea2ceaba31..b9a4c4ca5e7be 100644 --- a/src/engraving/tests/copypaste_data/copypaste20-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste20-ref.mscx @@ -72,6 +72,7 @@ 10 + 1 voice-paste diff --git a/src/engraving/tests/copypaste_data/copypaste22-ref.mscx b/src/engraving/tests/copypaste_data/copypaste22-ref.mscx index 1d1c383f35399..7762c9fc1406b 100644 --- a/src/engraving/tests/copypaste_data/copypaste22-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste22-ref.mscx @@ -63,6 +63,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste25-ref.mscx b/src/engraving/tests/copypaste_data/copypaste25-ref.mscx index c640ee53fa22f..7e507ed378fc2 100644 --- a/src/engraving/tests/copypaste_data/copypaste25-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste25-ref.mscx @@ -75,6 +75,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypaste50-ref.mscx b/src/engraving/tests/copypaste_data/copypaste50-ref.mscx index 297b1a2e316cf..fd114a0e55ab0 100644 --- a/src/engraving/tests/copypaste_data/copypaste50-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste50-ref.mscx @@ -92,6 +92,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx index 25a4decc493b0..d98b9ccf3cdcd 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx index 25a4decc493b0..d98b9ccf3cdcd 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx index 25a4decc493b0..d98b9ccf3cdcd 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx index 25a4decc493b0..d98b9ccf3cdcd 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx index 9b9217cfb96a6..1c85daec801b0 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx index 9b9217cfb96a6..1c85daec801b0 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx index 2ed55af7fd88c..2718b25dcb5eb 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx index d54aeb5830992..814c52da477d1 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx index ee887f17e3249..a649a1f751401 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx index 9cfcb3bb32f78..0d62f72e54c5c 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx @@ -59,6 +59,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx index e31593ced8b70..fcf34b71168c8 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-rest-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-rest-ref.mscx index 36265c83667dc..6eff82ce7a5cd 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-rest-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-rest-ref.mscx @@ -72,6 +72,7 @@ 10 + 1 copypastesymbollist-articulation-rest diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-01-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-01-ref.mscx index 3d1437f2143a2..144ade935e2c9 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-01-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-01-ref.mscx @@ -122,6 +122,7 @@ 10 + 1 tst_copy_symbol_list diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-ref.mscx index c0bdc7210e817..5c21d83f72af0 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-ref.mscx @@ -122,6 +122,7 @@ 10 + 1 tst_copy_symbol_list diff --git a/src/engraving/tests/exchangevoices_data/undoChangeVoice01-ref.mscx b/src/engraving/tests/exchangevoices_data/undoChangeVoice01-ref.mscx index 5076535771500..8841e9616bc9c 100644 --- a/src/engraving/tests/exchangevoices_data/undoChangeVoice01-ref.mscx +++ b/src/engraving/tests/exchangevoices_data/undoChangeVoice01-ref.mscx @@ -73,6 +73,7 @@ 10 + 1 @@ -620,6 +621,7 @@ 10 + 1 diff --git a/src/engraving/tests/exchangevoices_data/undoChangeVoice02-ref.mscx b/src/engraving/tests/exchangevoices_data/undoChangeVoice02-ref.mscx index 2a33eafbb6dc6..49aecdbd6910d 100644 --- a/src/engraving/tests/exchangevoices_data/undoChangeVoice02-ref.mscx +++ b/src/engraving/tests/exchangevoices_data/undoChangeVoice02-ref.mscx @@ -73,6 +73,7 @@ 10 + 1 @@ -601,6 +602,7 @@ 10 + 1 diff --git a/src/engraving/tests/instrumentchange_data/add-ref.mscx b/src/engraving/tests/instrumentchange_data/add-ref.mscx index 5d2fc236f1654..e6cec7c5e2d41 100644 --- a/src/engraving/tests/instrumentchange_data/add-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/add-ref.mscx @@ -100,6 +100,7 @@ 10 + 1 Instrument Change diff --git a/src/engraving/tests/instrumentchange_data/change-ref.mscx b/src/engraving/tests/instrumentchange_data/change-ref.mscx index 2f444638d2ffe..820cb16aa8533 100644 --- a/src/engraving/tests/instrumentchange_data/change-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/change-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 Instrument Change diff --git a/src/engraving/tests/instrumentchange_data/copy-ref.mscx b/src/engraving/tests/instrumentchange_data/copy-ref.mscx index 75ce28fc81d24..d10f1b1bc95fb 100644 --- a/src/engraving/tests/instrumentchange_data/copy-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/copy-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 Instrument Change diff --git a/src/engraving/tests/instrumentchange_data/delete-ref.mscx b/src/engraving/tests/instrumentchange_data/delete-ref.mscx index c9155cd4014e9..c7c4c012f711e 100644 --- a/src/engraving/tests/instrumentchange_data/delete-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/delete-ref.mscx @@ -100,6 +100,7 @@ 10 + 1 Instrument Change diff --git a/src/engraving/tests/instrumentchange_data/mixer-ref.mscx b/src/engraving/tests/instrumentchange_data/mixer-ref.mscx index 12b94b2347339..e11c8b711a088 100644 --- a/src/engraving/tests/instrumentchange_data/mixer-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/mixer-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 Instrument Change diff --git a/src/engraving/tests/join_data/join01-ref.mscx b/src/engraving/tests/join_data/join01-ref.mscx index 8639e97cf12ca..e64888c23de8e 100644 --- a/src/engraving/tests/join_data/join01-ref.mscx +++ b/src/engraving/tests/join_data/join01-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/join_data/join02-ref.mscx b/src/engraving/tests/join_data/join02-ref.mscx index 66bd9496ec2db..c3d915b57ce4a 100644 --- a/src/engraving/tests/join_data/join02-ref.mscx +++ b/src/engraving/tests/join_data/join02-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/join_data/join03-ref.mscx b/src/engraving/tests/join_data/join03-ref.mscx index 05fb718a58d23..eefb208c3de65 100644 --- a/src/engraving/tests/join_data/join03-ref.mscx +++ b/src/engraving/tests/join_data/join03-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/join_data/join04-ref.mscx b/src/engraving/tests/join_data/join04-ref.mscx index c56445d7f21b1..14c9270261245 100644 --- a/src/engraving/tests/join_data/join04-ref.mscx +++ b/src/engraving/tests/join_data/join04-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/join_data/join05-ref.mscx b/src/engraving/tests/join_data/join05-ref.mscx index 2f549ec510869..e58945b7a4213 100644 --- a/src/engraving/tests/join_data/join05-ref.mscx +++ b/src/engraving/tests/join_data/join05-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/join_data/join06-ref.mscx b/src/engraving/tests/join_data/join06-ref.mscx index 24f797aa710f6..d10c2af811ade 100644 --- a/src/engraving/tests/join_data/join06-ref.mscx +++ b/src/engraving/tests/join_data/join06-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/join_data/join07-ref.mscx b/src/engraving/tests/join_data/join07-ref.mscx index 7c05cdec3862d..a0bf106b57cea 100644 --- a/src/engraving/tests/join_data/join07-ref.mscx +++ b/src/engraving/tests/join_data/join07-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/measure_data/measure-insert_beginning-ref.mscx b/src/engraving/tests/measure_data/measure-insert_beginning-ref.mscx index ad4eea088e5a5..435f19239ee8d 100644 --- a/src/engraving/tests/measure_data/measure-insert_beginning-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_beginning-ref.mscx @@ -132,6 +132,7 @@ 10 + 1 Untitled score diff --git a/src/engraving/tests/measure_data/mmrest-ref.mscx b/src/engraving/tests/measure_data/mmrest-ref.mscx index 5db52383b3470..0fd2703f7b8ad 100644 --- a/src/engraving/tests/measure_data/mmrest-ref.mscx +++ b/src/engraving/tests/measure_data/mmrest-ref.mscx @@ -83,6 +83,7 @@ 10 + 1 Title diff --git a/src/engraving/tests/measure_data/undoDelInitialVBox_269919-ref.mscx b/src/engraving/tests/measure_data/undoDelInitialVBox_269919-ref.mscx index b809716382972..b7ebc69dcc490 100644 --- a/src/engraving/tests/measure_data/undoDelInitialVBox_269919-ref.mscx +++ b/src/engraving/tests/measure_data/undoDelInitialVBox_269919-ref.mscx @@ -82,6 +82,7 @@ 10 + 1 Title diff --git a/src/engraving/tests/note_data/notelimits-ref.mscx b/src/engraving/tests/note_data/notelimits-ref.mscx index f043f2cc7f0fe..aaee5bfd3de18 100644 --- a/src/engraving/tests/note_data/notelimits-ref.mscx +++ b/src/engraving/tests/note_data/notelimits-ref.mscx @@ -73,6 +73,7 @@ 10 + 1 Title diff --git a/src/engraving/tests/parts_data/partStyle-score-ref.mscx b/src/engraving/tests/parts_data/partStyle-score-ref.mscx index 44ff6edcedefc..1e9322df424f2 100644 --- a/src/engraving/tests/parts_data/partStyle-score-ref.mscx +++ b/src/engraving/tests/parts_data/partStyle-score-ref.mscx @@ -100,6 +100,7 @@ 10 + 1 @@ -356,6 +357,7 @@ 10 + 1 @@ -554,6 +556,7 @@ 10 + 1 -1 diff --git a/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx b/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx index 4e6244a3d2a6e..4b8b935c4102c 100644 --- a/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx +++ b/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx @@ -99,6 +99,7 @@ 10 + 1 Style Score @@ -358,6 +359,7 @@ 10 + 1 Style Score @@ -553,6 +555,7 @@ 10 + 1 Style Score diff --git a/src/engraving/tests/parts_data/voices-ref.mscx b/src/engraving/tests/parts_data/voices-ref.mscx index 21e3b4146b4a1..b9c62303a859a 100644 --- a/src/engraving/tests/parts_data/voices-ref.mscx +++ b/src/engraving/tests/parts_data/voices-ref.mscx @@ -143,6 +143,7 @@ 10 + 1 @@ -1139,6 +1140,7 @@ 10 + 1 @@ -1874,6 +1876,7 @@ 10 + 1 -2 @@ -2372,6 +2375,7 @@ 10 + 1 -2 diff --git a/src/engraving/tests/rhythmicGrouping_data/groupConflicts-ref.mscx b/src/engraving/tests/rhythmicGrouping_data/groupConflicts-ref.mscx index 0572f200f10d9..b78d752af5f96 100644 --- a/src/engraving/tests/rhythmicGrouping_data/groupConflicts-ref.mscx +++ b/src/engraving/tests/rhythmicGrouping_data/groupConflicts-ref.mscx @@ -123,6 +123,7 @@ 10 + 1 Grouping conflicts diff --git a/src/engraving/tests/rhythmicGrouping_data/groupSubbeats-ref.mscx b/src/engraving/tests/rhythmicGrouping_data/groupSubbeats-ref.mscx index b92a541a93c32..909e7f8da98a3 100644 --- a/src/engraving/tests/rhythmicGrouping_data/groupSubbeats-ref.mscx +++ b/src/engraving/tests/rhythmicGrouping_data/groupSubbeats-ref.mscx @@ -73,6 +73,7 @@ 10 + 1 Subbeat Groupings diff --git a/src/engraving/tests/rhythmicGrouping_data/groupVoices-ref.mscx b/src/engraving/tests/rhythmicGrouping_data/groupVoices-ref.mscx index af1a4904486af..63b338b0b141a 100644 --- a/src/engraving/tests/rhythmicGrouping_data/groupVoices-ref.mscx +++ b/src/engraving/tests/rhythmicGrouping_data/groupVoices-ref.mscx @@ -71,6 +71,7 @@ 10 + 1 Grouping with multiple voices diff --git a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete03-ref.mscx b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete03-ref.mscx index 9fdc5a33bdbaa..de92beb2c3d27 100644 --- a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete03-ref.mscx +++ b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete03-ref.mscx @@ -72,6 +72,7 @@ 10 + 1 selection-range-delete diff --git a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete04-ref.mscx b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete04-ref.mscx index 4ad2c1c1f58c6..e23d7a2a92c36 100644 --- a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete04-ref.mscx +++ b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete04-ref.mscx @@ -72,6 +72,7 @@ 10 + 1 selection-range-delete diff --git a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete05-ref.mscx b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete05-ref.mscx index bf39ca0222691..899a5af2a38a5 100644 --- a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete05-ref.mscx +++ b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete05-ref.mscx @@ -75,6 +75,7 @@ 10 + 1 delete-skip-annotations diff --git a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete06_partialnestedtuplets-ref.mscx b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete06_partialnestedtuplets-ref.mscx index d552c60e586c8..c20debe9aa67a 100644 --- a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete06_partialnestedtuplets-ref.mscx +++ b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete06_partialnestedtuplets-ref.mscx @@ -91,6 +91,7 @@ 8.79108 0 + 1 delete nested tuplet diff --git a/src/engraving/tests/spanners_data/glissando-cloning04-ref.mscx b/src/engraving/tests/spanners_data/glissando-cloning04-ref.mscx index dc093dac8ded0..101ca99339838 100644 --- a/src/engraving/tests/spanners_data/glissando-cloning04-ref.mscx +++ b/src/engraving/tests/spanners_data/glissando-cloning04-ref.mscx @@ -71,6 +71,7 @@ 10 + 1 @@ -196,6 +197,7 @@ 10 + 1 diff --git a/src/engraving/tests/split_data/split01-ref.mscx b/src/engraving/tests/split_data/split01-ref.mscx index 6316e58eec58c..a8af6c4832c54 100644 --- a/src/engraving/tests/split_data/split01-ref.mscx +++ b/src/engraving/tests/split_data/split01-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/split_data/split02-ref.mscx b/src/engraving/tests/split_data/split02-ref.mscx index 1e3ba26f99296..2681a51020948 100644 --- a/src/engraving/tests/split_data/split02-ref.mscx +++ b/src/engraving/tests/split_data/split02-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/split_data/split03-ref.mscx b/src/engraving/tests/split_data/split03-ref.mscx index 9ae5b0dabcc33..2c440137cb738 100644 --- a/src/engraving/tests/split_data/split03-ref.mscx +++ b/src/engraving/tests/split_data/split03-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/split_data/split04-ref.mscx b/src/engraving/tests/split_data/split04-ref.mscx index 9e99c6d721c75..e629904f42c53 100644 --- a/src/engraving/tests/split_data/split04-ref.mscx +++ b/src/engraving/tests/split_data/split04-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/split_data/split05-ref.mscx b/src/engraving/tests/split_data/split05-ref.mscx index d7316a23c73d2..cdebe0efccd0e 100644 --- a/src/engraving/tests/split_data/split05-ref.mscx +++ b/src/engraving/tests/split_data/split05-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/split_data/split06-ref.mscx b/src/engraving/tests/split_data/split06-ref.mscx index 1a6881e3b4e24..f66c63e40e435 100644 --- a/src/engraving/tests/split_data/split06-ref.mscx +++ b/src/engraving/tests/split_data/split06-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/split_data/split07-ref.mscx b/src/engraving/tests/split_data/split07-ref.mscx index 3b5d3b495e3fc..e7ac2a55bfdbe 100644 --- a/src/engraving/tests/split_data/split07-ref.mscx +++ b/src/engraving/tests/split_data/split07-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/split_data/split08-ref.mscx b/src/engraving/tests/split_data/split08-ref.mscx index 560cf45363c12..a33656e2b6c05 100644 --- a/src/engraving/tests/split_data/split08-ref.mscx +++ b/src/engraving/tests/split_data/split08-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/split_data/split295207-ref.mscx b/src/engraving/tests/split_data/split295207-ref.mscx index 270c2ac69387b..ef3736752b2ff 100644 --- a/src/engraving/tests/split_data/split295207-ref.mscx +++ b/src/engraving/tests/split_data/split295207-ref.mscx @@ -57,6 +57,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx b/src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx index 69067b99bc2cb..0081323386ddf 100644 --- a/src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx +++ b/src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx @@ -66,6 +66,7 @@ 10 + 1 Test diff --git a/src/engraving/tests/textbase_data/createDynamic-ref.mscx b/src/engraving/tests/textbase_data/createDynamic-ref.mscx index 84ca2c5bad665..620b57be35a45 100644 --- a/src/engraving/tests/textbase_data/createDynamic-ref.mscx +++ b/src/engraving/tests/textbase_data/createDynamic-ref.mscx @@ -108,6 +108,7 @@ 10 0 + 1 Test diff --git a/src/engraving/tests/textbase_data/dynamicAddTextAfter-ref.mscx b/src/engraving/tests/textbase_data/dynamicAddTextAfter-ref.mscx index ef46d4e539da9..d8f198b6a85eb 100644 --- a/src/engraving/tests/textbase_data/dynamicAddTextAfter-ref.mscx +++ b/src/engraving/tests/textbase_data/dynamicAddTextAfter-ref.mscx @@ -108,6 +108,7 @@ 10 0 + 1 Test diff --git a/src/engraving/tests/textbase_data/dynamicAddTextBefore-ref.mscx b/src/engraving/tests/textbase_data/dynamicAddTextBefore-ref.mscx index e725ee41d928e..90bb180e7be0d 100644 --- a/src/engraving/tests/textbase_data/dynamicAddTextBefore-ref.mscx +++ b/src/engraving/tests/textbase_data/dynamicAddTextBefore-ref.mscx @@ -108,6 +108,7 @@ 10 0 + 1 Test diff --git a/src/engraving/tests/textbase_data/dynamicAddTextNoItalic-ref.mscx b/src/engraving/tests/textbase_data/dynamicAddTextNoItalic-ref.mscx index a55793f30a62b..40ce7e93b27bc 100644 --- a/src/engraving/tests/textbase_data/dynamicAddTextNoItalic-ref.mscx +++ b/src/engraving/tests/textbase_data/dynamicAddTextNoItalic-ref.mscx @@ -108,6 +108,7 @@ 10 0 + 1 Test diff --git a/src/engraving/tests/timesig_data/timesig-02-ref.mscx b/src/engraving/tests/timesig_data/timesig-02-ref.mscx index 50e972742ebe1..939046070598a 100644 --- a/src/engraving/tests/timesig_data/timesig-02-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig-02-ref.mscx @@ -64,6 +64,7 @@ 10 + 1 Test invalid shortening of time signature diff --git a/src/engraving/tests/timesig_data/timesig-04-ref.mscx b/src/engraving/tests/timesig_data/timesig-04-ref.mscx index f64e4d501e81e..40bd6d051b339 100644 --- a/src/engraving/tests/timesig_data/timesig-04-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig-04-ref.mscx @@ -71,6 +71,7 @@ 10 + 1 timesig diff --git a/src/engraving/tests/timesig_data/timesig-06-ref.mscx b/src/engraving/tests/timesig_data/timesig-06-ref.mscx index 8b15aeff2963c..b003455ac4aa5 100644 --- a/src/engraving/tests/timesig_data/timesig-06-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig-06-ref.mscx @@ -63,6 +63,7 @@ 10 + 1 Timesig change with tremolo diff --git a/src/engraving/tests/timesig_data/timesig-07-ref.mscx b/src/engraving/tests/timesig_data/timesig-07-ref.mscx index e2551c9628e80..d840f117fea48 100644 --- a/src/engraving/tests/timesig_data/timesig-07-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig-07-ref.mscx @@ -63,6 +63,7 @@ 10 + 1 Timesig change with tremolo diff --git a/src/engraving/tests/timesig_data/timesig01-ref.mscx b/src/engraving/tests/timesig_data/timesig01-ref.mscx index 92032a93e8a1a..5aa9f21dd3535 100644 --- a/src/engraving/tests/timesig_data/timesig01-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig01-ref.mscx @@ -60,6 +60,7 @@ 10 + 1 timesig1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-both-01-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-both-01-ref.mscx index f274a057b0e06..95b50ff25d58e 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-both-01-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-both-01-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-both-02-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-both-02-ref.mscx index 20ccc0fedf8d1..251e293d37c69 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-both-02-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-both-02-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-both-03-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-both-03-ref.mscx index 8704a2a80e970..bbf0542a9ca0b 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-both-03-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-both-03-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-both-04-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-both-04-ref.mscx index ee4ade6523999..ca4e1bab8be69 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-both-04-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-both-04-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-both-05-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-both-05-ref.mscx index 872021d56c1cc..0c75d025871c7 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-both-05-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-both-05-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-current-01-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-current-01-ref.mscx index b7ea3cd50f34d..0ecdb875bfcd5 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-current-01-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-current-01-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-current-02-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-current-02-ref.mscx index 055d408d08cab..27407055ef945 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-current-02-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-current-02-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-current-03-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-current-03-ref.mscx index 0c4e54f0d6d31..7b6cb92af0ec1 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-current-03-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-current-03-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-current-04-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-current-04-ref.mscx index e57bb90eb784d..6fc224fc2404e 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-current-04-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-current-04-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/change-enharmonic-current-05-ref.mscx b/src/engraving/tests/tools_data/change-enharmonic-current-05-ref.mscx index 359d7edf85fc0..b7deaca7c4d4d 100644 --- a/src/engraving/tests/tools_data/change-enharmonic-current-05-ref.mscx +++ b/src/engraving/tests/tools_data/change-enharmonic-current-05-ref.mscx @@ -96,6 +96,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/undoResequencePart01-ref.mscx b/src/engraving/tests/tools_data/undoResequencePart01-ref.mscx index 9c561e29df6d7..eb5c8aaf95e82 100644 --- a/src/engraving/tests/tools_data/undoResequencePart01-ref.mscx +++ b/src/engraving/tests/tools_data/undoResequencePart01-ref.mscx @@ -73,6 +73,7 @@ 10 + 1 @@ -366,6 +367,7 @@ 10 + 1 diff --git a/src/engraving/tests/tools_data/undoResequencePart02-ref.mscx b/src/engraving/tests/tools_data/undoResequencePart02-ref.mscx index de4bfb71e85ab..ca029678c8ec4 100644 --- a/src/engraving/tests/tools_data/undoResequencePart02-ref.mscx +++ b/src/engraving/tests/tools_data/undoResequencePart02-ref.mscx @@ -73,6 +73,7 @@ 10 + 1 @@ -366,6 +367,7 @@ 10 + 1 diff --git a/src/engraving/tests/tuplet_data/nestedTuplets_addStaff-ref.mscx b/src/engraving/tests/tuplet_data/nestedTuplets_addStaff-ref.mscx index 43312c27dd0ae..24903ed2bf3db 100644 --- a/src/engraving/tests/tuplet_data/nestedTuplets_addStaff-ref.mscx +++ b/src/engraving/tests/tuplet_data/nestedTuplets_addStaff-ref.mscx @@ -89,6 +89,7 @@ 10 + 1 Title