From 831d4e7058268ee67a1189224c89c6618b398346 Mon Sep 17 00:00:00 2001 From: Michele Spagnolo Date: Thu, 13 Apr 2023 14:48:43 +0200 Subject: [PATCH 1/6] Clef positioning corrections --- src/engraving/libmscore/edit.cpp | 5 +++++ src/engraving/libmscore/measure.cpp | 25 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/engraving/libmscore/edit.cpp b/src/engraving/libmscore/edit.cpp index 281fc6164bf66..8d07c733d6ad1 100644 --- a/src/engraving/libmscore/edit.cpp +++ b/src/engraving/libmscore/edit.cpp @@ -4870,6 +4870,11 @@ void Score::undoChangeClef(Staff* ostaff, EngravingItem* e, ClefType ct, bool fo } else { st = SegmentType::HeaderClef; } + } else if (e->rtick() == Fraction(0, 1)) { + Measure* curMeasure = e->findMeasure(); + if (curMeasure && curMeasure->prevMeasure()) { + moveClef = true; + } } else if (e->isClef()) { Clef* clef = toClef(e); if (clef->segment()->isHeaderClefType()) { diff --git a/src/engraving/libmscore/measure.cpp b/src/engraving/libmscore/measure.cpp index 941e6a441fa6b..46a5ac27b51d3 100644 --- a/src/engraving/libmscore/measure.cpp +++ b/src/engraving/libmscore/measure.cpp @@ -4121,7 +4121,7 @@ void Measure::computeWidth(Segment* s, double x, bool isSystemHeader, Fraction m // skipped in computeMinWidth() -- the only way this would be an issue here is // if this method was called specifically with the invisible segment specified // which I'm pretty sure doesn't happen at this point. still... - if (!s->enabled() || !s->visible() || s->allElementsInvisible() || s->isRightAligned()) { + if (!s->enabled() || !s->visible() || s->allElementsInvisible() || (s->isRightAligned() && s != firstEnabled())) { s->setWidth(0); s = s->next(); continue; @@ -4348,7 +4348,7 @@ void Measure::spaceRightAlignedSegments() for (Segment* raSegment : rightAlignedSegments) { // 1) right-align the segment against the following ones double minDistAfter = arbitraryLowReal; - for (Segment* seg = raSegment->nextActive(); seg; seg = seg->nextActive()) { + for (Segment* seg = raSegment->next(); seg; seg = seg->next()) { double xDiff = seg->x() - raSegment->x(); double minDist = raSegment->minHorizontalCollidingDistance(seg); minDistAfter = std::max(minDistAfter, minDist - xDiff); @@ -4409,12 +4409,16 @@ double Measure::computeFirstSegmentXPosition(Segment* segment) // First, try to compute first segment x-position by padding against end barline of previous measure Measure* prevMeas = (prev() && prev()->isMeasure() && prev()->system() == system()) ? toMeasure(prev()) : nullptr; - Segment* prevMeasEnd = prevMeas ? prevMeas->last() : nullptr; - if (prevMeasEnd && prevMeasEnd->isEndBarLineType() - && !(segment->isBeginBarLineType() || segment->isStartRepeatBarLineType() || segment->isBarLineType())) { - x = prevMeasEnd->minHorizontalCollidingDistance(segment) - prevMeasEnd->minRight(); + Segment* prevMeasEnd = prevMeas ? prevMeas->lastEnabled() : nullptr; + bool ignorePrev = !prevMeas || prevMeas->system() != system() || !prevMeasEnd + || (prevMeasEnd->segmentType() & SegmentType::BarLineType && segment->segmentType() & SegmentType::BarLineType); + if (!ignorePrev) { + qDebug() << prevMeasEnd->subTypeName() << segment->subTypeName(); + x = prevMeasEnd->minHorizontalCollidingDistance(segment); } - if (x <= 0) { // If that doesn't succeed (e.g. first bar) then just use left-margins + + // If that doesn't succeed (e.g. first bar) then just use left-margins + if (x <= 0) { x = segment->minLeft(ls); if (segment->isChordRestType()) { x += score()->styleMM(segment->hasAccidentals() ? Sid::barAccidentalDistance : Sid::barNoteDistance); @@ -4426,10 +4430,13 @@ double Measure::computeFirstSegmentXPosition(Segment* segment) x = std::max(x, score()->styleMM(Sid::timesigLeftMargin).val()); } } - if (prevMeas && prevMeas->repeatEnd() && segment->isStartRepeatBarLineType() && (prevMeas->system() == system())) { - // The start-repeat should overlap the end-repeat of the previous measure + + // Special case: the start-repeat should overlap the end-repeat of the previous measure + bool prevIsEndRepeat = prevMeas && prevMeas->repeatEnd() && prevMeasEnd && prevMeasEnd->isEndBarLineType(); + if (prevIsEndRepeat && segment->isStartRepeatBarLineType() && (prevMeas->system() == system())) { x -= score()->styleMM(Sid::endBarWidth); } + // Do a final check of chord distances (invisible items may in some cases elude the 2 previous steps) if (segment->isChordRestType()) { double barNoteDist = score()->styleMM(Sid::barNoteDistance).val(); From 5b5182b14130b3041d82a3c9dc4a8636131c899e Mon Sep 17 00:00:00 2001 From: Michele Spagnolo Date: Thu, 13 Apr 2023 16:01:50 +0200 Subject: [PATCH 2/6] KeySig positioning correction --- src/engraving/libmscore/chordrest.cpp | 11 ++++++++--- src/engraving/libmscore/measure.cpp | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/engraving/libmscore/chordrest.cpp b/src/engraving/libmscore/chordrest.cpp index ef204cbe04b1e..e5ae3584a6e26 100644 --- a/src/engraving/libmscore/chordrest.cpp +++ b/src/engraving/libmscore/chordrest.cpp @@ -372,10 +372,15 @@ EngravingItem* ChordRest::drop(EditData& data) { KeySig* ks = toKeySig(e); KeySigEvent k = ks->keySigEvent(); - delete ks; - // apply only to this stave - score()->undoChangeKeySig(staff(), tick(), k); + if (data.modifiers & ControlModifier) { + // apply only to this stave, before the selected chordRest + score()->undoChangeKeySig(staff(), tick(), k); + delete ks; + } else { + // apply to all staves, at the beginning of the measure + return m->drop(data); + } } break; diff --git a/src/engraving/libmscore/measure.cpp b/src/engraving/libmscore/measure.cpp index 46a5ac27b51d3..9aafffb85a93b 100644 --- a/src/engraving/libmscore/measure.cpp +++ b/src/engraving/libmscore/measure.cpp @@ -4413,8 +4413,8 @@ double Measure::computeFirstSegmentXPosition(Segment* segment) bool ignorePrev = !prevMeas || prevMeas->system() != system() || !prevMeasEnd || (prevMeasEnd->segmentType() & SegmentType::BarLineType && segment->segmentType() & SegmentType::BarLineType); if (!ignorePrev) { - qDebug() << prevMeasEnd->subTypeName() << segment->subTypeName(); x = prevMeasEnd->minHorizontalCollidingDistance(segment); + x -= prevMeas->width() - prevMeasEnd->x(); } // If that doesn't succeed (e.g. first bar) then just use left-margins From 7103e0f917a45a355f7eae72273ec8b31bd56815 Mon Sep 17 00:00:00 2001 From: Michele Spagnolo Date: Mon, 17 Apr 2023 10:20:12 +0200 Subject: [PATCH 3/6] Fix trailing time signature bug --- src/engraving/libmscore/measure.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/engraving/libmscore/measure.cpp b/src/engraving/libmscore/measure.cpp index 9aafffb85a93b..76abf5b51dbd7 100644 --- a/src/engraving/libmscore/measure.cpp +++ b/src/engraving/libmscore/measure.cpp @@ -3900,6 +3900,9 @@ void Measure::addSystemTrailer(Measure* nm) TimeSig* ts = nullptr; bool showCourtesySig = false; Segment* s = findSegmentR(SegmentType::TimeSigAnnounce, _rtick); + if (s) { + s->setTrailer(true); + } if (nm && score()->genCourtesyTimesig() && !isFinalMeasure && !score()->layoutOptions().isMode(LayoutMode::FLOAT)) { Segment* tss = nm->findSegmentR(SegmentType::TimeSig, Fraction(0, 1)); if (tss) { From 8aba8f68194eb1aeb7ef350a56fa6b8e739602e5 Mon Sep 17 00:00:00 2001 From: Michele Spagnolo Date: Fri, 28 Apr 2023 11:37:14 +0200 Subject: [PATCH 4/6] New engraving features for Clefs - Introduce Auto/Before/After barline option for clefs - Tag clefs as "header" when needed, instead of trying to guess from context. - Changes and corrections to the courtesy VS main clef interaction, especially when changing options from inspector. --- src/engraving/libmscore/clef.cpp | 182 +++++++++++++++++- src/engraving/libmscore/clef.h | 7 + src/engraving/libmscore/edit.cpp | 4 +- src/engraving/libmscore/measure.cpp | 10 +- src/engraving/libmscore/property.cpp | 2 + src/engraving/libmscore/property.h | 2 + src/engraving/libmscore/score.cpp | 1 + src/engraving/libmscore/segment.cpp | 32 +++ src/engraving/libmscore/segment.h | 2 + src/engraving/libmscore/shape.cpp | 10 +- src/engraving/rw/400/measurerw.cpp | 51 +++-- src/engraving/rw/400/tread.cpp | 4 + src/engraving/rw/400/twrite.cpp | 2 + src/engraving/style/style.cpp | 3 + src/engraving/types/propertyvalue.cpp | 2 + src/engraving/types/propertyvalue.h | 4 + src/engraving/types/types.h | 6 + .../services/elementrepositoryservice.cpp | 24 --- .../services/elementrepositoryservice.h | 1 - .../notation/clefs/clefsettingsmodel.cpp | 39 ++++ .../models/notation/clefs/clefsettingsmodel.h | 15 ++ .../Inspector/notation/clefs/ClefSettings.qml | 18 ++ 22 files changed, 367 insertions(+), 54 deletions(-) diff --git a/src/engraving/libmscore/clef.cpp b/src/engraving/libmscore/clef.cpp index 9d925662c7a28..75a51f1c2deb7 100644 --- a/src/engraving/libmscore/clef.cpp +++ b/src/engraving/libmscore/clef.cpp @@ -39,6 +39,7 @@ #include "segment.h" #include "staff.h" #include "stafftype.h" +#include "undo.h" #include "log.h" @@ -96,7 +97,10 @@ const ClefInfo ClefInfo::clefTable[] = { Clef::Clef(Segment* parent) : EngravingItem(ElementType::CLEF, parent, ElementFlag::ON_STAFF), symId(SymId::noSym) -{} +{ + _clefToBarlinePosition = ClefToBarlinePosition::AUTO; + _isHeader = parent->isHeaderClefType(); +} //--------------------------------------------------------- // mag @@ -406,6 +410,8 @@ PropertyValue Clef::getProperty(Pid propertyId) const case Pid::CLEF_TYPE_TRANSPOSING: return _clefTypes._transposingClef; case Pid::SHOW_COURTESY: return showCourtesy(); case Pid::SMALL: return isSmall(); + case Pid::CLEF_TO_BARLINE_POS: return _clefToBarlinePosition; + case Pid::IS_HEADER: return _isHeader; default: return EngravingItem::getProperty(propertyId); } @@ -424,9 +430,26 @@ bool Clef::setProperty(Pid propertyId, const PropertyValue& v) case Pid::CLEF_TYPE_TRANSPOSING: setTransposingClef(v.value()); break; - case Pid::SHOW_COURTESY: _showCourtesy = v.toBool(); + case Pid::SHOW_COURTESY: + _showCourtesy = v.toBool(); + if (_showCourtesy && isHeader() && selected()) { + Clef* courtesyClef = otherClef(); + if (courtesyClef) { + score()->deselect(this); + score()->select(courtesyClef, SelectType::ADD, staffIdx()); + } + } + break; + case Pid::SMALL: + setSmall(v.toBool()); break; - case Pid::SMALL: setSmall(v.toBool()); + case Pid::CLEF_TO_BARLINE_POS: + if (v.value() != _clefToBarlinePosition && !_isHeader) { + changeClefToBarlinePos(v.value()); + } + break; + case Pid::IS_HEADER: + setIsHeader(v.toBool()); break; default: return EngravingItem::setProperty(propertyId, v); @@ -435,6 +458,152 @@ bool Clef::setProperty(Pid propertyId, const PropertyValue& v) return true; } +void Clef::changeClefToBarlinePos(ClefToBarlinePosition newPos) +{ + _clefToBarlinePosition = newPos; + + if (!explicitParent()) { + return; + } + + Segment* seg = segment(); + Measure* meas = seg->measure(); + + staff_idx_t nStaves = score()->nstaves(); + for (staff_idx_t staffIndex = 0; staffIndex < nStaves; ++staffIndex) { + Clef* clef = static_cast(seg->elementAt(staffIndex * VOICES)); + if (clef) { + clef->setClefToBarlinePosition(newPos); + } + } + + Segment* endBarlineSeg = nullptr; + Segment* endRepeatSeg = nullptr; + Segment* startRepeatSeg = nullptr; + + // Search first segment at this tick + Segment* firstSegAtThisTick = seg; + while (true) { + Segment* prev1 = firstSegAtThisTick->prev1(); + if (prev1 && prev1->tick() == seg->tick()) { + firstSegAtThisTick = prev1; + } else { + break; + } + } + for (Segment* s = firstSegAtThisTick; s && s->tick() == seg->tick(); s = s->next1enabled()) { + // Scan all segments at this tick looking for the ones we need + if (s->isEndBarLineType() && s->measure()->repeatEnd()) { + endRepeatSeg = s; + } else if (s->isEndBarLineType()) { + endBarlineSeg = s; + } else if (s->isStartRepeatBarLineType()) { + startRepeatSeg = s; + } + } + + if (newPos == ClefToBarlinePosition::AFTER) { + undoChangeProperty(Pid::SHOW_COURTESY, false, propertyFlags(Pid::SHOW_COURTESY)); + } + + if (newPos == ClefToBarlinePosition::AUTO) { + if (endBarlineSeg) { + // Clef before the end bar line + Measure* destMeas = endBarlineSeg->measure(); + meas->segments().remove(seg); + destMeas->segments().insert(seg, endBarlineSeg); + seg->setRtick(endBarlineSeg->rtick()); + seg->setParent(destMeas); + } else if (endRepeatSeg) { + // Clef after the end repeat + Measure* destMeas = endRepeatSeg->measure(); + meas->segments().remove(seg); + destMeas->segments().insert(seg, endRepeatSeg->next()); + seg->setRtick(endRepeatSeg->rtick()); + seg->setParent(destMeas); + } else if (startRepeatSeg) { + // End of previous measure + Measure* destMeas = startRepeatSeg->measure()->prevMeasure(); + if (destMeas) { + meas->segments().remove(seg); + destMeas->segments().push_back(seg); + seg->setRtick(destMeas->ticks()); + seg->setParent(destMeas); + } + } + } else if (newPos == ClefToBarlinePosition::BEFORE) { + if (endBarlineSeg || endRepeatSeg) { + // Before the bar line + Segment* refSeg = endBarlineSeg ? endBarlineSeg : endRepeatSeg; + Measure* destMeas = refSeg->measure(); + meas->segments().remove(seg); + destMeas->segments().insert(seg, refSeg); + seg->setRtick(refSeg->rtick()); + seg->setParent(destMeas); + } else if (startRepeatSeg) { + // End of previous measure + Measure* destMeas = startRepeatSeg->measure()->prevMeasure(); + if (destMeas) { + meas->segments().remove(seg); + destMeas->segments().push_back(seg); + seg->setRtick(destMeas->ticks()); + seg->setParent(destMeas); + } + } + } else if (newPos == ClefToBarlinePosition::AFTER) { + bool isAtMeasureEnd = seg->rtick() == meas->ticks(); + if (startRepeatSeg) { + // After the start repeat + Measure* destMeas = startRepeatSeg->measure(); + meas->segments().remove(seg); + destMeas->segments().insert(seg, startRepeatSeg->next()); + seg->setRtick(startRepeatSeg->rtick()); + seg->setParent(destMeas); + } else if (isAtMeasureEnd) { + Measure* destMeas = meas->nextMeasure(); + if (destMeas && !destMeas->header()) { + meas->segments().remove(seg); + destMeas->segments().push_front(seg); + seg->setRtick(Fraction(0, 1)); + seg->setParent(destMeas); + } else if (destMeas) { + Segment* refSeg = destMeas->firstEnabled(); + while (refSeg && refSeg->header()) { + refSeg = refSeg->nextEnabled(); + } + if (refSeg) { + meas->segments().remove(seg); + destMeas->segments().insert(seg, refSeg); + seg->setRtick(refSeg->rtick()); + seg->setParent(destMeas); + } + } + } + } + + if ((newPos == ClefToBarlinePosition::AUTO || newPos == ClefToBarlinePosition::BEFORE)) { + undoChangeProperty(Pid::SHOW_COURTESY, true, PropertyFlags::STYLED); + } +} + +void Clef::undoChangeProperty(Pid id, const PropertyValue& v, PropertyFlags ps) +{ + if (id == Pid::SHOW_COURTESY) { + if (v.toBool() != _showCourtesy) { + score()->undo(new ChangeProperty(this, id, v, ps)); + Clef* pairedClef = otherClef(); + if (pairedClef) { + score()->undo(new ChangeProperty(pairedClef, id, v, ps)); + } + if (!segment()->isHeaderClefType()) { + setGenerated(false); + } + } + } else { + EngravingObject::undoChangeProperty(id, v, ps); + } +} + //--------------------------------------------------------- // propertyDefault //--------------------------------------------------------- @@ -446,6 +615,8 @@ PropertyValue Clef::propertyDefault(Pid id) const case Pid::CLEF_TYPE_TRANSPOSING: return ClefType::INVALID; case Pid::SHOW_COURTESY: return true; case Pid::SMALL: return false; + case Pid::CLEF_TO_BARLINE_POS: return ClefToBarlinePosition::AUTO; + case Pid::IS_HEADER: return false; default: return EngravingItem::propertyDefault(id); } } @@ -489,5 +660,10 @@ void Clef::clear() { setbbox(RectF()); symId = SymId::noSym; + Clef* pairedClef = otherClef(); + if (selected() && !isHeader() && pairedClef) { + score()->deselect(this); + score()->select(pairedClef, SelectType::ADD, staffIdx()); + } } } diff --git a/src/engraving/libmscore/clef.h b/src/engraving/libmscore/clef.h index 8ff589e8011ac..0bd8826d5db43 100644 --- a/src/engraving/libmscore/clef.h +++ b/src/engraving/libmscore/clef.h @@ -95,6 +95,8 @@ class Clef final : public EngravingItem bool _showCourtesy = true; bool m_isSmall = false; bool _forInstrumentChange = false; + M_PROPERTY(ClefToBarlinePosition, clefToBarlinePosition, setClefToBarlinePosition) + M_PROPERTY(bool, isHeader, setIsHeader) ClefTypeList _clefTypes { ClefType::INVALID }; @@ -148,6 +150,11 @@ class Clef final : public EngravingItem EngravingItem* prevSegmentElement() override; String accessibleInfo() const override; void clear(); + + void changeClefToBarlinePos(ClefToBarlinePosition newPos); + + void undoChangeProperty(Pid id, const PropertyValue& v) { EngravingObject::undoChangeProperty(id, v); } + void undoChangeProperty(Pid id, const PropertyValue& v, PropertyFlags ps) override; }; } // namespace mu::engraving #endif diff --git a/src/engraving/libmscore/edit.cpp b/src/engraving/libmscore/edit.cpp index 8d07c733d6ad1..42538ae321950 100644 --- a/src/engraving/libmscore/edit.cpp +++ b/src/engraving/libmscore/edit.cpp @@ -4872,7 +4872,8 @@ void Score::undoChangeClef(Staff* ostaff, EngravingItem* e, ClefType ct, bool fo } } else if (e->rtick() == Fraction(0, 1)) { Measure* curMeasure = e->findMeasure(); - if (curMeasure && curMeasure->prevMeasure()) { + Measure* prevMeasure = curMeasure ? curMeasure->prevMeasure() : nullptr; + if (prevMeasure && !prevMeasure->sectionBreak()) { moveClef = true; } } else if (e->isClef()) { @@ -4966,6 +4967,7 @@ void Score::undoChangeClef(Staff* ostaff, EngravingItem* e, ClefType ct, bool fo clef->setTrack(track); clef->setClefType(ct); clef->setParent(destSeg); + clef->setIsHeader(st == SegmentType::HeaderClef); score->undo(new AddElement(clef)); clef->layout(); } diff --git a/src/engraving/libmscore/measure.cpp b/src/engraving/libmscore/measure.cpp index 76abf5b51dbd7..e5afd6b8d0459 100644 --- a/src/engraving/libmscore/measure.cpp +++ b/src/engraving/libmscore/measure.cpp @@ -932,7 +932,7 @@ void Measure::add(EngravingItem* e) LOGD("there is already a <%s> segment", seg->subTypeName()); return; } - if (s->segmentType() > st) { + if (seg->goesBefore(s)) { break; } s = s->next(); @@ -3578,6 +3578,7 @@ double Measure::createEndBarLines(bool isLastMeasureInSystem) // set relative position of end barline and clef // if end repeat, clef goes after, otherwise clef goes before Segment* clefSeg = findSegmentR(SegmentType::Clef, ticks()); + ClefToBarlinePosition clefToBarlinePosition = ClefToBarlinePosition::AUTO; if (clefSeg) { bool wasVisible = clefSeg->visible(); int visibleInt = 0; @@ -3588,6 +3589,7 @@ double Measure::createEndBarLines(bool isLastMeasureInSystem) track_idx_t track = staffIdx * VOICES; Clef* clef = toClef(clefSeg->element(track)); if (clef) { + clefToBarlinePosition = clef->clefToBarlinePosition(); bool showCourtesy = score()->genCourtesyClef() && clef->showCourtesy(); // normally show a courtesy clef // check if the measure is the last measure of the system or the last measure before a frame bool lastMeasure = isLastMeasureInSystem || (nm ? !(next() == nm) : true); @@ -3620,7 +3622,7 @@ double Measure::createEndBarLines(bool isLastMeasureInSystem) if (seg) { Segment* s1; Segment* s2; - if (repeatEnd()) { + if (repeatEnd() && clefToBarlinePosition != ClefToBarlinePosition::BEFORE) { s1 = seg; s2 = clefSeg; } else { @@ -3692,6 +3694,7 @@ void Measure::addSystemHeader(bool isFirstSystem) if (isFirstSystem || score()->styleB(Sid::genClef)) { // find the clef type at the previous tick ClefTypeList cl = staff->clefType(tick() - Fraction::fromTicks(1)); + bool showCourtesy = true; Segment* s = nullptr; if (prevMeasure()) { // look for a clef change at the end of the previous measure @@ -3704,6 +3707,7 @@ void Measure::addSystemHeader(bool isFirstSystem) Clef* c = toClef(s->element(track)); if (c) { cl = c->clefTypeList(); + showCourtesy = c->showCourtesy(); } } Clef* clef = nullptr; @@ -3723,6 +3727,8 @@ void Measure::addSystemHeader(bool isFirstSystem) clef->setTrack(track); clef->setGenerated(true); clef->setParent(cSegment); + clef->setIsHeader(true); + clef->setShowCourtesy(showCourtesy); cSegment->add(clef); } if (clef->generated()) { diff --git a/src/engraving/libmscore/property.cpp b/src/engraving/libmscore/property.cpp index 81e4ababe599f..d72d20d4ae9c9 100644 --- a/src/engraving/libmscore/property.cpp +++ b/src/engraving/libmscore/property.cpp @@ -356,6 +356,8 @@ static constexpr PropertyMetaData propertyList[] = { { Pid::CLEF_TYPE_CONCERT, true, "concertClefType", P_TYPE::CLEF_TYPE, DUMMY_QT_TR_NOOP("propertyName", "concert clef type") }, { Pid::CLEF_TYPE_TRANSPOSING, true, "transposingClefType", P_TYPE::CLEF_TYPE, DUMMY_QT_TR_NOOP("propertyName", "transposing clef type") }, + { Pid::CLEF_TO_BARLINE_POS, true, "clefToBarlinePos", P_TYPE::INT, DUMMY_QT_TR_NOOP("propertyName", "clef to barline position") }, + { Pid::IS_HEADER, true, "isHeader", P_TYPE::BOOL, DUMMY_QT_TR_NOOP("propertyName", "is header")}, { Pid::KEY, true, "accidental", P_TYPE::INT, DUMMY_QT_TR_NOOP("propertyName", "key") }, { Pid::ACTION, false, "action", P_TYPE::STRING, 0 }, { Pid::MIN_DISTANCE, false, "minDistance", P_TYPE::SPATIUM, DUMMY_QT_TR_NOOP("propertyName", "autoplace minimum distance") }, diff --git a/src/engraving/libmscore/property.h b/src/engraving/libmscore/property.h index d474ac326f58d..e25ce502a4bf7 100644 --- a/src/engraving/libmscore/property.h +++ b/src/engraving/libmscore/property.h @@ -364,6 +364,8 @@ enum class Pid { CLEF_TYPE_CONCERT, CLEF_TYPE_TRANSPOSING, + CLEF_TO_BARLINE_POS, + IS_HEADER, // for clefs KEY, ACTION, // for ActionIcon MIN_DISTANCE, diff --git a/src/engraving/libmscore/score.cpp b/src/engraving/libmscore/score.cpp index 13ee58e6b702b..05448c95c095e 100644 --- a/src/engraving/libmscore/score.cpp +++ b/src/engraving/libmscore/score.cpp @@ -2367,6 +2367,7 @@ void Score::splitStaff(staff_idx_t staffIdx, int splitPoint) clef->setClefType(ClefType::F); clef->setTrack((staffIdx + 1) * VOICES); clef->setParent(seg); + clef->setIsHeader(true); undoAddElement(clef); clef->layout(); diff --git a/src/engraving/libmscore/segment.cpp b/src/engraving/libmscore/segment.cpp index 52004a029d049..aea9d33e0cf25 100644 --- a/src/engraving/libmscore/segment.cpp +++ b/src/engraving/libmscore/segment.cpp @@ -2858,4 +2858,36 @@ double Segment::computeDurationStretch(Segment* prevSeg, Fraction minTicks, Frac return durStretch; } + +bool Segment::goesBefore(const Segment* nextSegment) const +{ + bool thisIsClef = isClefType(); + bool nextIsClef = nextSegment->isClefType(); + bool thisIsBarline = isType(SegmentType::BarLine | SegmentType::EndBarLine | SegmentType::StartRepeatBarLine); + bool nextIsBarline = nextSegment->isType(SegmentType::BarLine | SegmentType::EndBarLine | SegmentType::StartRepeatBarLine); + + if (thisIsClef && nextIsBarline) { + ClefToBarlinePosition clefPos = ClefToBarlinePosition::AUTO; + for (EngravingItem* item : elist()) { + if (item && item->isClef()) { + clefPos = toClef(item)->clefToBarlinePosition(); + break; + } + } + return clefPos != ClefToBarlinePosition::AFTER; + } + + if (thisIsBarline && nextIsClef) { + ClefToBarlinePosition clefPos = ClefToBarlinePosition::AUTO; + for (EngravingItem* item : nextSegment->elist()) { + if (item && item->isClef()) { + clefPos = toClef(item)->clefToBarlinePosition(); + break; + } + } + return clefPos == ClefToBarlinePosition::AFTER; + } + + return segmentType() < nextSegment->segmentType(); +} } // namespace mu::engraving diff --git a/src/engraving/libmscore/segment.h b/src/engraving/libmscore/segment.h index 3b82fabcdbfe8..14017e3c1deac 100644 --- a/src/engraving/libmscore/segment.h +++ b/src/engraving/libmscore/segment.h @@ -329,6 +329,8 @@ class Segment final : public EngravingItem void clearPreAppended(int track) { _preAppendedItems[track] = nullptr; } void addPreAppendedToShape(); + bool goesBefore(const Segment* nextSegment) const; + static constexpr SegmentType durationSegmentsMask = SegmentType::ChordRest; // segment types which may have non-zero tick length }; diff --git a/src/engraving/libmscore/shape.cpp b/src/engraving/libmscore/shape.cpp index a3b3d42dcdef6..67066eadcd739 100644 --- a/src/engraving/libmscore/shape.cpp +++ b/src/engraving/libmscore/shape.cpp @@ -104,10 +104,16 @@ double Shape::minHorizontalDistance(const Shape& a) const double absoluteMinPadding = 0.1 * _spatium * _squeezeFactor; double verticalClearance = 0.2 * _spatium * _squeezeFactor; for (const ShapeElement& r2 : a) { + if (r2.isNull()) { + continue; + } const EngravingItem* item2 = r2.toItem; double by1 = r2.top(); double by2 = r2.bottom(); for (const ShapeElement& r1 : *this) { + if (r1.isNull()) { + continue; + } const EngravingItem* item1 = r1.toItem; double ay1 = r1.top(); double ay2 = r1.bottom(); @@ -121,8 +127,8 @@ double Shape::minHorizontalDistance(const Shape& a) const kerningType = item1->computeKerningType(item2); } if ((intersection && kerningType != KerningType::ALLOW_COLLISION) - || (r1.width() == 0 || r2.width() == 0) // Temporary hack: shapes of zero-width are assumed to collide with everyghin - || (!item1 && item2 && item2->isLyrics()) // Temporary hack: avoids collision with melisma line + || (r1.width() == 0 || r2.width() == 0) // Temporary hack: shapes of zero-width are assumed to collide with everyghin + || (!item1 && item2 && item2->isLyrics()) // Temporary hack: avoids collision with melisma line || kerningType == KerningType::NON_KERNING) { dist = std::max(dist, r1.right() - r2.left() + padding); } diff --git a/src/engraving/rw/400/measurerw.cpp b/src/engraving/rw/400/measurerw.cpp index 5af4c2d796274..41ec690ccbd1c 100644 --- a/src/engraving/rw/400/measurerw.cpp +++ b/src/engraving/rw/400/measurerw.cpp @@ -354,32 +354,41 @@ void MeasureRW::readVoice(Measure* measure, XmlReader& e, ReadContext& ctx, int segment->add(mr); ctx.incTick(measure->ticks()); } else if (tag == "Clef") { - // there may be more than one clef segment for same tick position - // the first clef may be missing and is added later in layout - - bool header; - if (ctx.tick() != measure->tick()) { - header = false; - } else if (!segment) { - header = true; - } else { - header = true; - for (Segment* s = measure->m_segments.first(); s && s->rtick().isZero(); s = s->next()) { - if (s->isKeySigType() || s->isTimeSigType()) { - // hack: there may be other segment types which should - // generate a clef at current position - header = false; - break; - } - } - } - segment = measure->getSegment(header ? SegmentType::HeaderClef : SegmentType::Clef, ctx.tick()); - Clef* clef = Factory::createClef(segment); + Clef* clef = Factory::createClef(ctx.dummy()->segment()); clef->setTrack(ctx.track()); TRead::read(clef, e, ctx); clef->setGenerated(false); + bool header = false; + if (ctx.score()->mscVersion() < 410) { + /*********************************************************************** + * LEGACY: we used to try to guess if the clef is a header based + * on context, which is very unreliable. After 4.1, we just TAG it. + * *********************************************************************/ + // there may be more than one clef segment for same tick position + // the first clef may be missing and is added later in layout + if (ctx.tick() != measure->tick()) { + header = false; + } else if (!segment) { + header = true; + } else { + header = true; + for (Segment* s = measure->m_segments.first(); s && s->rtick().isZero(); s = s->next()) { + if (s->isKeySigType() || s->isTimeSigType()) { + // hack: there may be other segment types which should + // generate a clef at current position + header = false; + break; + } + } + } + } else { + header = clef->isHeader(); + } + + segment = measure->getSegment(header ? SegmentType::HeaderClef : SegmentType::Clef, ctx.tick()); segment->add(clef); + clef->setIsHeader(header); } else if (tag == "TimeSig") { TimeSig* ts = Factory::createTimeSig(ctx.dummy()->segment()); ts->setTrack(ctx.track()); diff --git a/src/engraving/rw/400/tread.cpp b/src/engraving/rw/400/tread.cpp index fb3561dd9b4c8..4a85f7f14f02e 100644 --- a/src/engraving/rw/400/tread.cpp +++ b/src/engraving/rw/400/tread.cpp @@ -2525,6 +2525,10 @@ void TRead::read(Clef* c, XmlReader& e, ReadContext& ctx) c->setShowCourtesy(e.readInt()); } else if (tag == "forInstrumentChange") { c->setForInstrumentChange(e.readBool()); + } else if (tag == "clefToBarlinePos") { + c->setClefToBarlinePosition(ClefToBarlinePosition(e.readInt())); + } else if (tag == "isHeader") { + c->setIsHeader(e.readBool()); } else if (!readItemProperties(c, e, ctx)) { e.unknown(); } diff --git a/src/engraving/rw/400/twrite.cpp b/src/engraving/rw/400/twrite.cpp index 414c15c2e0c45..cd2e2d66de3a2 100644 --- a/src/engraving/rw/400/twrite.cpp +++ b/src/engraving/rw/400/twrite.cpp @@ -840,6 +840,8 @@ void TWrite::write(const Clef* item, XmlWriter& xml, WriteContext& ctx) xml.startElement(item); writeProperty(item, xml, Pid::CLEF_TYPE_CONCERT); writeProperty(item, xml, Pid::CLEF_TYPE_TRANSPOSING); + writeProperty(item, xml, Pid::CLEF_TO_BARLINE_POS); + writeProperty(item, xml, Pid::IS_HEADER); if (!item->showCourtesy()) { xml.tag("showCourtesyClef", item->showCourtesy()); } diff --git a/src/engraving/style/style.cpp b/src/engraving/style/style.cpp index 4e64d7576a2ce..9061bef9683ab 100644 --- a/src/engraving/style/style.cpp +++ b/src/engraving/style/style.cpp @@ -176,6 +176,9 @@ bool MStyle::readProperties(XmlReader& e) case P_TYPE::LINE_TYPE: set(idx, TConv::fromXml(e.readAsciiText(), LineType::SOLID)); break; + case P_TYPE::CLEF_TO_BARLINE_POS: + set(idx, ClefToBarlinePosition(e.readInt())); + break; default: ASSERT_X(u"unhandled type " + String::number(int(type))); } diff --git a/src/engraving/types/propertyvalue.cpp b/src/engraving/types/propertyvalue.cpp index 745b06044654b..61c37a06d8367 100644 --- a/src/engraving/types/propertyvalue.cpp +++ b/src/engraving/types/propertyvalue.cpp @@ -148,6 +148,7 @@ QVariant PropertyValue::toQVariant() const case P_TYPE::NOTEHEAD_SCHEME: return static_cast(value()); case P_TYPE::NOTEHEAD_GROUP: return static_cast(value()); case P_TYPE::CLEF_TYPE: return static_cast(value()); + case P_TYPE::CLEF_TO_BARLINE_POS: return static_cast(value()); case P_TYPE::DYNAMIC_TYPE: return static_cast(value()); case P_TYPE::DYNAMIC_RANGE: return static_cast(value()); case P_TYPE::DYNAMIC_SPEED: return static_cast(value()); @@ -239,6 +240,7 @@ PropertyValue PropertyValue::fromQVariant(const QVariant& v, P_TYPE type) case P_TYPE::NOTEHEAD_SCHEME: return PropertyValue(NoteHeadScheme(v.toInt())); case P_TYPE::NOTEHEAD_GROUP: return PropertyValue(NoteHeadGroup(v.toInt())); case P_TYPE::CLEF_TYPE: return PropertyValue(ClefType(v.toInt())); + case P_TYPE::CLEF_TO_BARLINE_POS: return PropertyValue(ClefToBarlinePosition(v.toInt())); case P_TYPE::DYNAMIC_TYPE: return PropertyValue(DynamicType(v.toInt())); case P_TYPE::DYNAMIC_RANGE: return PropertyValue(DynamicRange(v.toInt())); case P_TYPE::DYNAMIC_SPEED: return PropertyValue(DynamicSpeed(v.toInt())); diff --git a/src/engraving/types/propertyvalue.h b/src/engraving/types/propertyvalue.h index 1aff0b2651e95..575ad4de80d51 100644 --- a/src/engraving/types/propertyvalue.h +++ b/src/engraving/types/propertyvalue.h @@ -92,6 +92,7 @@ enum class P_TYPE { NOTEHEAD_SCHEME, NOTEHEAD_GROUP, CLEF_TYPE, + CLEF_TO_BARLINE_POS, DYNAMIC_TYPE, DYNAMIC_RANGE, DYNAMIC_SPEED, @@ -232,6 +233,9 @@ class PropertyValue PropertyValue(ClefType v) : m_type(P_TYPE::CLEF_TYPE), m_data(make_data(v)) {} + PropertyValue(ClefToBarlinePosition v) + : m_type(P_TYPE::CLEF_TO_BARLINE_POS), m_data(make_data(v)) {} + PropertyValue(DynamicType v) : m_type(P_TYPE::DYNAMIC_TYPE), m_data(make_data(v)) {} PropertyValue(DynamicRange v) diff --git a/src/engraving/types/types.h b/src/engraving/types/types.h index 7d7f953223d91..25d8474c6f209 100644 --- a/src/engraving/types/types.h +++ b/src/engraving/types/types.h @@ -525,6 +525,12 @@ enum class ClefType : signed char { MAX }; +enum class ClefToBarlinePosition : char { + AUTO, + BEFORE, + AFTER +}; + // P_TYPE::DYNAMIC_TYPE enum class DynamicType : char { OTHER, diff --git a/src/inspector/internal/services/elementrepositoryservice.cpp b/src/inspector/internal/services/elementrepositoryservice.cpp index 4763a523f4728..43f444bc15fc0 100644 --- a/src/inspector/internal/services/elementrepositoryservice.cpp +++ b/src/inspector/internal/services/elementrepositoryservice.cpp @@ -85,7 +85,6 @@ QList ElementRepositoryService::findElementsByTyp case mu::engraving::ElementType::BEAM: return findBeams(); case mu::engraving::ElementType::STAFF: return findStaffs(); case mu::engraving::ElementType::LAYOUT_BREAK: return findSectionBreaks(); //Page breaks and line breaks are of type LAYOUT_BREAK, but they don't appear in the inspector for now. - case mu::engraving::ElementType::CLEF: return findPairedClefs(); case mu::engraving::ElementType::TEXT: return findTexts(); case mu::engraving::ElementType::TREMOLO: return findTremolos(); case mu::engraving::ElementType::BRACKET: return findBrackets(); @@ -372,29 +371,6 @@ QList ElementRepositoryService::findSectionBreaks return resultList; } -QList ElementRepositoryService::findPairedClefs() const -{ - QList resultList; - - for (mu::engraving::EngravingItem* element : m_exposedElementList) { - if (element->type() == mu::engraving::ElementType::CLEF) { - auto clef = mu::engraving::toClef(element); - IF_ASSERT_FAILED(clef) { - continue; - } - - resultList << clef; //could be both main clef and courtesy clef - - auto courtesyPairClef = clef->otherClef(); //seeking for a "pair" clef - if (courtesyPairClef) { - resultList << courtesyPairClef; - } - } - } - - return resultList; -} - QList ElementRepositoryService::findTexts() const { QList resultList; diff --git a/src/inspector/internal/services/elementrepositoryservice.h b/src/inspector/internal/services/elementrepositoryservice.h index fd4a6769fef6b..bfbfbf4cf31de 100644 --- a/src/inspector/internal/services/elementrepositoryservice.h +++ b/src/inspector/internal/services/elementrepositoryservice.h @@ -60,7 +60,6 @@ class ElementRepositoryService : public QObject, public IElementRepositoryServic QList findBeams() const; QList findStaffs() const; QList findSectionBreaks() const; - QList findPairedClefs() const; QList findTexts() const; QList findTremolos() const; QList findBrackets() const; diff --git a/src/inspector/models/notation/clefs/clefsettingsmodel.cpp b/src/inspector/models/notation/clefs/clefsettingsmodel.cpp index 67d0c3b4b975d..e5bbecd736e66 100644 --- a/src/inspector/models/notation/clefs/clefsettingsmodel.cpp +++ b/src/inspector/models/notation/clefs/clefsettingsmodel.cpp @@ -20,6 +20,7 @@ * along with this program. If not, see . */ #include "clefsettingsmodel.h" +#include "clef.h" #include "translation.h" @@ -37,6 +38,8 @@ ClefSettingsModel::ClefSettingsModel(QObject* parent, IElementRepositoryService* void ClefSettingsModel::createProperties() { m_shouldShowCourtesy = buildPropertyItem(mu::engraving::Pid::SHOW_COURTESY); + m_clefToBarlinePosition = buildPropertyItem(mu::engraving::Pid::CLEF_TO_BARLINE_POS); + updateIsClefToBarPosAvailable(); } void ClefSettingsModel::requestElements() @@ -47,14 +50,50 @@ void ClefSettingsModel::requestElements() void ClefSettingsModel::loadProperties() { loadPropertyItem(m_shouldShowCourtesy); + loadPropertyItem(m_clefToBarlinePosition); + updateIsClefToBarPosAvailable(); } void ClefSettingsModel::resetProperties() { m_shouldShowCourtesy->resetToDefault(); + m_clefToBarlinePosition->resetToDefault(); } PropertyItem* ClefSettingsModel::shouldShowCourtesy() const { return m_shouldShowCourtesy; } + +PropertyItem* ClefSettingsModel::clefToBarlinePosition() const +{ + return m_clefToBarlinePosition; +} + +bool ClefSettingsModel::isClefToBarPosAvailable() const +{ + return m_isClefToBarPosAvailable; +} + +void ClefSettingsModel::setIsClefToBarPosAvailable(bool available) +{ + if (available == m_isClefToBarPosAvailable) { + return; + } + + m_isClefToBarPosAvailable = available; + emit isClefToBarPosAvailableChanged(available); +} + +void ClefSettingsModel::updateIsClefToBarPosAvailable() +{ + bool available = true; + for (mu::engraving::EngravingItem* item : m_elementList) { + if (static_cast(item)->segment()->isHeaderClefType()) { + available = false; + break; + } + } + + setIsClefToBarPosAvailable(available); +} diff --git a/src/inspector/models/notation/clefs/clefsettingsmodel.h b/src/inspector/models/notation/clefs/clefsettingsmodel.h index c62a9510a3e62..d9a5258764b8b 100644 --- a/src/inspector/models/notation/clefs/clefsettingsmodel.h +++ b/src/inspector/models/notation/clefs/clefsettingsmodel.h @@ -30,6 +30,8 @@ class ClefSettingsModel : public AbstractInspectorModel Q_OBJECT Q_PROPERTY(PropertyItem * shouldShowCourtesy READ shouldShowCourtesy CONSTANT) + Q_PROPERTY(PropertyItem * clefToBarlinePosition READ clefToBarlinePosition CONSTANT) + Q_PROPERTY(bool isClefToBarPosAvailable READ isClefToBarPosAvailable NOTIFY isClefToBarPosAvailableChanged) public: explicit ClefSettingsModel(QObject* parent, IElementRepositoryService* repository); @@ -40,9 +42,22 @@ class ClefSettingsModel : public AbstractInspectorModel void resetProperties() override; PropertyItem* shouldShowCourtesy() const; + PropertyItem* clefToBarlinePosition() const; + + bool isClefToBarPosAvailable() const; + +private slots: + void setIsClefToBarPosAvailable(bool available); + +signals: + void isClefToBarPosAvailableChanged(bool newValue); private: PropertyItem* m_shouldShowCourtesy = nullptr; + PropertyItem* m_clefToBarlinePosition = nullptr; + + bool m_isClefToBarPosAvailable = true; + void updateIsClefToBarPosAvailable(); }; } diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/clefs/ClefSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/clefs/ClefSettings.qml index d1b5e31664a0d..a980ef8f5d4a3 100644 --- a/src/inspector/view/qml/MuseScore/Inspector/notation/clefs/ClefSettings.qml +++ b/src/inspector/view/qml/MuseScore/Inspector/notation/clefs/ClefSettings.qml @@ -53,4 +53,22 @@ Column { text: qsTrc("inspector", "Show courtesy clef on previous system") propertyItem: root.model ? root.model.shouldShowCourtesy : null } + + FlatRadioButtonGroupPropertyView { + id: clefToBarlinePosition + enabled: root.model ? root.model.isClefToBarPosAvailable : false + + titleText: qsTrc("inspector", "Position relative to bar line") + propertyItem: root.model ? root.model.clefToBarlinePosition : null + + navigationName: "ClefToBarlinePosition" + navigationPanel: root.navigationPanel + navigationRowStart: showCourtesyClef.navigation.row + 1 + + model: [ + { text: qsTrc("inspector", "Auto"), value: 0, title: qsTrc("inspector", "Auto") }, + { text: qsTrc("inspector", "Before"), value: 1, title: qsTrc("inspector", "Before") }, + { text: qsTrc("inspector", "After"), value: 2, title: qsTrc("inspector", "After") } + ] + } } From 0ebbb3d30880b07167bd2e86c549eef0b6980749 Mon Sep 17 00:00:00 2001 From: Michele Spagnolo Date: Fri, 28 Apr 2023 11:40:03 +0200 Subject: [PATCH 5/6] added vtest --- vtest/scores/clefNotShowCourtesy.mscz | Bin 0 -> 16084 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 vtest/scores/clefNotShowCourtesy.mscz diff --git a/vtest/scores/clefNotShowCourtesy.mscz b/vtest/scores/clefNotShowCourtesy.mscz new file mode 100644 index 0000000000000000000000000000000000000000..70e14314db59850c03279c43be1e7e90ec250d7c GIT binary patch literal 16084 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 yzrNt#`v2z7|LDK-{D0W=Z}opu{ey%0N- Date: Sat, 29 Apr 2023 12:06:26 +0200 Subject: [PATCH 6/6] Fix unit tests (all diffs are due to writing "isHeader" property) --- src/engraving/tests/beam_data/Beam-A.mscx | 1 + src/engraving/tests/beam_data/Beam-B.mscx | 1 + src/engraving/tests/beam_data/Beam-C.mscx | 1 + src/engraving/tests/beam_data/Beam-D.mscx | 1 + src/engraving/tests/beam_data/Beam-E.mscx | 1 + src/engraving/tests/beam_data/Beam-F.mscx | 1 + src/engraving/tests/beam_data/Beam-G.mscx | 1 + .../tests/chordsymbol_data/add-link-ref.mscx | 2 ++ .../tests/chordsymbol_data/add-part-ref.mscx | 2 ++ .../tests/chordsymbol_data/clear-ref.mscx | 1 + .../tests/chordsymbol_data/extend-ref.mscx | 1 + .../tests/chordsymbol_data/no-system-ref.mscx | 4 ++++ .../clef_courtesy_data/clef_courtesy01-ref.mscx | 1 + .../clef_courtesy_data/clef_courtesy02-ref.mscx | 1 + .../clef_courtesy_data/clef_courtesy04-ref.mscx | 11 +---------- src/engraving/tests/clef_data/clef-1-ref.mscx | 2 ++ src/engraving/tests/clef_data/clef-3-ref.mscx | 1 + .../tests/compat114_data/accidentals-ref.mscx | 1 + .../tests/compat114_data/articulations-ref.mscx | 1 + .../tests/compat114_data/chord_symbol-ref.mscx | 1 + .../compat114_data/clef_missing_first-ref.mscx | 1 + src/engraving/tests/compat114_data/clefs-ref.mscx | 1 + .../tests/compat114_data/drumset-ref.mscx | 1 + .../tests/compat114_data/fingering-ref.mscx | 1 + .../tests/compat114_data/hairpin-ref.mscx | 2 ++ .../compat114_data/hor_frame_and_mmrest-ref.mscx | 1 + src/engraving/tests/compat114_data/keysig-ref.mscx | 1 + .../tests/compat114_data/markers-ref.mscx | 1 + .../tests/compat114_data/noteheads-ref.mscx | 1 + src/engraving/tests/compat114_data/notes-ref.mscx | 1 + .../tests/compat114_data/notes_useroffset-ref.mscx | 1 + src/engraving/tests/compat114_data/ottava-ref.mscx | 2 ++ src/engraving/tests/compat114_data/pedal-ref.mscx | 2 ++ src/engraving/tests/compat114_data/slurs-ref.mscx | 2 ++ src/engraving/tests/compat114_data/style-ref.mscx | 1 + src/engraving/tests/compat114_data/tamtam-ref.mscx | 1 + .../tests/compat114_data/text_scaling-ref.mscx | 1 + .../tests/compat114_data/textline-ref.mscx | 2 ++ .../tests/compat114_data/textstyles-ref.mscx | 1 + src/engraving/tests/compat114_data/title-ref.mscx | 2 ++ .../tests/compat114_data/tremolo2notes-ref.mscx | 1 + .../tests/compat114_data/tuplets-ref.mscx | 1 + .../tests/compat114_data/tuplets_1-ref.mscx | 1 + .../tests/compat114_data/tuplets_2-ref.mscx | 1 + .../tests/copypaste_data/copypaste01-ref.mscx | 1 + .../tests/copypaste_data/copypaste02-ref.mscx | 1 + .../tests/copypaste_data/copypaste03-ref.mscx | 1 + .../tests/copypaste_data/copypaste04-ref.mscx | 1 + .../tests/copypaste_data/copypaste05-ref.mscx | 1 + .../tests/copypaste_data/copypaste06-ref.mscx | 1 + .../tests/copypaste_data/copypaste08-ref.mscx | 1 + .../tests/copypaste_data/copypaste09-ref.mscx | 1 + .../tests/copypaste_data/copypaste10-ref.mscx | 1 + .../tests/copypaste_data/copypaste11-ref.mscx | 1 + .../tests/copypaste_data/copypaste12-ref.mscx | 1 + .../tests/copypaste_data/copypaste13-ref.mscx | 1 + .../tests/copypaste_data/copypaste17-ref.mscx | 1 + .../tests/copypaste_data/copypaste18-ref.mscx | 1 + .../tests/copypaste_data/copypaste19-ref.mscx | 1 + .../tests/copypaste_data/copypaste20-ref.mscx | 1 + .../tests/copypaste_data/copypaste22-ref.mscx | 1 + .../tests/copypaste_data/copypaste50-ref.mscx | 2 ++ .../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 + .../copypaste_data/copypaste_partial_01-ref.mscx | 2 ++ .../copypastesymbollist-articulation-ref.mscx | 1 + .../copypastesymbollist-articulation-rest-ref.mscx | 1 + .../copypastesymbollist-chordnames-01-ref.mscx | 1 + .../copypastesymbollist-chordnames-ref.mscx | 1 + .../copypastesymbollist-lyrics-ref.mscx | 1 + .../copypastesymbollist-range-01-ref.mscx | 2 ++ .../copypastesymbollist-range-ref.mscx | 2 ++ .../copypastesymbollist-stafftext-ref.mscx | 1 + .../copypastesymbollist-sticking-ref.mscx | 1 + .../tests/instrumentchange_data/add-ref.mscx | 2 ++ .../tests/instrumentchange_data/change-ref.mscx | 2 ++ .../tests/instrumentchange_data/copy-ref.mscx | 2 ++ .../tests/instrumentchange_data/delete-ref.mscx | 2 ++ .../tests/instrumentchange_data/mixer-ref.mscx | 2 ++ 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 + src/engraving/tests/keysig_data/keysig.mscx | 1 + src/engraving/tests/keysig_data/keysig01-ref.mscx | 1 + src/engraving/tests/keysig_data/keysig02-ref.mscx | 1 + .../tests/measure_data/measure-10-ref.mscx | 1 + .../tests/measure_data/measure-4-ref.mscx | 1 + .../tests/measure_data/measure-5-ref.mscx | 1 + .../tests/measure_data/measure-7-ref.mscx | 1 + .../tests/measure_data/measure-8-ref.mscx | 1 + .../tests/measure_data/measure-9-ref.mscx | 1 + .../measure_data/measure-insert_bf_clef-2-ref.mscx | 1 + .../measure_data/measure-insert_bf_clef-ref.mscx | 1 + .../tests/measure_data/measure-insert_bf_clef.mscx | 1 + .../measure_data/measure-insert_bf_key-2-ref.mscx | 1 + .../measure_data/measure-insert_bf_key-ref.mscx | 1 + .../tests/measure_data/measure-insert_bf_key.mscx | 1 + .../tests/parts_data/part-all-appendmeasures.mscx | 4 ++++ .../tests/parts_data/part-all-insertmeasures.mscx | 4 ++++ src/engraving/tests/parts_data/part-all-parts.mscx | 4 ++++ .../tests/parts_data/part-all-uappendmeasures.mscx | 4 ++++ .../tests/parts_data/part-all-uinsertmeasures.mscx | 4 ++++ src/engraving/tests/parts_data/part-all.mscx | 2 ++ .../tests/parts_data/part-breath-add.mscx | 4 ++++ .../tests/parts_data/part-breath-del.mscx | 4 ++++ .../tests/parts_data/part-breath-parts.mscx | 4 ++++ .../tests/parts_data/part-breath-uadd.mscx | 4 ++++ .../tests/parts_data/part-breath-udel.mscx | 4 ++++ .../tests/parts_data/part-breath-uradd.mscx | 4 ++++ .../tests/parts_data/part-breath-urdel.mscx | 4 ++++ src/engraving/tests/parts_data/part-breath.mscx | 2 ++ .../tests/parts_data/part-chordline-add.mscx | 4 ++++ .../tests/parts_data/part-chordline-del.mscx | 4 ++++ .../tests/parts_data/part-chordline-parts.mscx | 4 ++++ .../tests/parts_data/part-chordline-uadd.mscx | 4 ++++ .../tests/parts_data/part-chordline-udel.mscx | 4 ++++ .../tests/parts_data/part-chordline-uradd.mscx | 4 ++++ .../tests/parts_data/part-chordline-urdel.mscx | 4 ++++ src/engraving/tests/parts_data/part-chordline.mscx | 2 ++ .../tests/parts_data/part-empty-parts.mscx | 4 ++++ src/engraving/tests/parts_data/part-empty.mscx | 2 ++ .../tests/parts_data/part-fingering-add.mscx | 4 ++++ .../tests/parts_data/part-fingering-del.mscx | 4 ++++ .../tests/parts_data/part-fingering-parts.mscx | 4 ++++ .../tests/parts_data/part-fingering-uadd.mscx | 4 ++++ .../tests/parts_data/part-fingering-udel.mscx | 4 ++++ .../tests/parts_data/part-fingering-uradd.mscx | 4 ++++ .../tests/parts_data/part-fingering-urdel.mscx | 4 ++++ src/engraving/tests/parts_data/part-fingering.mscx | 2 ++ src/engraving/tests/parts_data/part-image-add.mscx | 4 ++++ src/engraving/tests/parts_data/part-image-del.mscx | 4 ++++ .../tests/parts_data/part-image-parts.mscx | 4 ++++ .../tests/parts_data/part-image-uadd.mscx | 4 ++++ .../tests/parts_data/part-image-udel.mscx | 4 ++++ .../tests/parts_data/part-image-uradd.mscx | 4 ++++ .../tests/parts_data/part-image-urdel.mscx | 4 ++++ src/engraving/tests/parts_data/part-image.mscx | 2 ++ .../tests/parts_data/part-measure-repeat-add.mscx | 4 ++++ .../tests/parts_data/part-measure-repeat-del.mscx | 4 ++++ .../parts_data/part-measure-repeat-parts.mscx | 4 ++++ .../tests/parts_data/part-measure-repeat-uadd.mscx | 4 ++++ .../tests/parts_data/part-measure-repeat-udel.mscx | 4 ++++ .../parts_data/part-measure-repeat-uradd.mscx | 4 ++++ .../parts_data/part-measure-repeat-urdel.mscx | 4 ++++ .../tests/parts_data/part-measure-repeat.mscx | 2 ++ .../tests/parts_data/part-symbol-add.mscx | 4 ++++ .../tests/parts_data/part-symbol-del.mscx | 4 ++++ .../tests/parts_data/part-symbol-parts.mscx | 4 ++++ .../tests/parts_data/part-symbol-uadd.mscx | 4 ++++ .../tests/parts_data/part-symbol-udel.mscx | 4 ++++ .../tests/parts_data/part-symbol-uradd.mscx | 4 ++++ .../tests/parts_data/part-symbol-urdel.mscx | 4 ++++ src/engraving/tests/parts_data/part-symbol.mscx | 2 ++ .../tests/parts_data/partStyle-score-ref.mscx | 4 ++++ .../parts_data/partStyle-score-reload-ref.mscx | 4 ++++ .../selectionrangedelete03-ref.mscx | 1 + .../selectionrangedelete04-ref.mscx | 1 + .../selectionrangedelete05-ref.mscx | 1 + 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 + .../tests/split_data/split295207-ref.mscx | 1 + .../tests/splitstaff_data/splitstaff01-ref.mscx | 3 +++ .../tests/splitstaff_data/splitstaff02-ref.mscx | 2 ++ .../tests/splitstaff_data/splitstaff03-ref.mscx | 1 + .../tests/splitstaff_data/splitstaff04-ref.mscx | 2 ++ .../tests/splitstaff_data/splitstaff05-ref.mscx | 2 ++ .../tests/splitstaff_data/splitstaff06-ref.mscx | 2 ++ .../tests/timesig_data/timesig-02-ref.mscx | 2 ++ .../tests/timesig_data/timesig-03-ref.mscx | 1 + .../tests/timesig_data/timesig-06-ref.mscx | 1 + .../tests/timesig_data/timesig-07-ref.mscx | 1 + .../tests/timesig_data/timesig01-ref.mscx | 1 + .../undoDiatonicTranspose01-ref.mscx | 2 ++ .../undoDiatonicTranspose02-ref.mscx | 2 ++ .../tests/transpose_data/undoTranspose01-ref.mscx | 2 ++ .../tests/transpose_data/undoTranspose02-ref.mscx | 2 ++ src/engraving/tests/tuplet_data/tuplet1-ref.mscx | 1 + .../capella/tests/data/test1.cap-ref.mscx | 2 ++ .../capella/tests/data/test1.capx-ref.mscx | 2 ++ .../capella/tests/data/test2.cap-ref.mscx | 2 ++ .../capella/tests/data/test2.capx-ref.mscx | 2 ++ .../capella/tests/data/test3.cap-ref.mscx | 2 ++ .../capella/tests/data/test3.capx-ref.mscx | 2 ++ .../capella/tests/data/test4.cap-ref.mscx | 1 + .../capella/tests/data/test4.capx-ref.mscx | 1 + .../capella/tests/data/test5.cap-ref.mscx | 2 ++ .../capella/tests/data/test5.capx-ref.mscx | 2 ++ .../capella/tests/data/test6.cap-ref.mscx | 2 ++ .../capella/tests/data/test6.capx-ref.mscx | 2 ++ .../capella/tests/data/test7.cap-ref.mscx | 6 ++++++ .../capella/tests/data/test8.cap-ref.mscx | 2 ++ .../tests/data/testEmptyStaff1.capx-ref.mscx | 5 +++++ .../tests/data/testEmptyStaff2.capx-ref.mscx | 3 +++ .../capella/tests/data/testPianoG4G5.capx-ref.mscx | 2 ++ .../capella/tests/data/testScaleC4C5.capx-ref.mscx | 1 + .../capella/tests/data/testSlurTie.capx-ref.mscx | 1 + .../capella/tests/data/testText1.capx-ref.mscx | 1 + .../capella/tests/data/testTuplet1.capx-ref.mscx | 1 + .../capella/tests/data/testTuplet2.cap-ref.mscx | 14 ++++++++++++++ .../capella/tests/data/testTuplet2.capx-ref.mscx | 14 ++++++++++++++ .../capella/tests/data/testVolta1.capx-ref.mscx | 1 + .../guitarpro/tests/data/bend.gp3-ref.mscx | 1 + .../guitarpro/tests/data/capo-fret.gp3-ref.mscx | 1 + .../guitarpro/tests/data/copyright.gp3-ref.mscx | 1 + .../guitarpro/tests/data/dotted-gliss.gp3-ref.mscx | 1 + .../guitarpro/tests/data/ghost_note.gp3-ref.mscx | 1 + .../guitarpro/tests/data/tempo.gp3-ref.mscx | 1 + .../guitarpro/tests/data/volta.gp3-ref.mscx | 1 + .../tests/data/testDurationLargeError_ref.mscx | 1 + .../tests/data/testDurationRoundingError_ref.mscx | 1 + .../tests/data/testMeasureStyleSlash_ref.mscx | 1 + .../tests/data/testSystemBrackets3_ref.mscx | 9 +++++++++ .../tests/data/testUnnecessaryBarlines_ref.mscx | 1 + .../musicxml/tests/data/testVoltaHiding_ref.mscx | 3 +++ 233 files changed, 482 insertions(+), 10 deletions(-) diff --git a/src/engraving/tests/beam_data/Beam-A.mscx b/src/engraving/tests/beam_data/Beam-A.mscx index 4e6d216da52b2..1038731d354fd 100644 --- a/src/engraving/tests/beam_data/Beam-A.mscx +++ b/src/engraving/tests/beam_data/Beam-A.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/beam_data/Beam-B.mscx b/src/engraving/tests/beam_data/Beam-B.mscx index d9325309a72ed..1b43b6cd9aa55 100644 --- a/src/engraving/tests/beam_data/Beam-B.mscx +++ b/src/engraving/tests/beam_data/Beam-B.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/beam_data/Beam-C.mscx b/src/engraving/tests/beam_data/Beam-C.mscx index 6ee3a56c4059b..725aecf808de8 100644 --- a/src/engraving/tests/beam_data/Beam-C.mscx +++ b/src/engraving/tests/beam_data/Beam-C.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/beam_data/Beam-D.mscx b/src/engraving/tests/beam_data/Beam-D.mscx index 738c6981465fd..461ccd3307b0b 100644 --- a/src/engraving/tests/beam_data/Beam-D.mscx +++ b/src/engraving/tests/beam_data/Beam-D.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/beam_data/Beam-E.mscx b/src/engraving/tests/beam_data/Beam-E.mscx index 9accaf86adac5..300286a55880a 100644 --- a/src/engraving/tests/beam_data/Beam-E.mscx +++ b/src/engraving/tests/beam_data/Beam-E.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/beam_data/Beam-F.mscx b/src/engraving/tests/beam_data/Beam-F.mscx index aee8db2290143..b3ef7746466ba 100644 --- a/src/engraving/tests/beam_data/Beam-F.mscx +++ b/src/engraving/tests/beam_data/Beam-F.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/beam_data/Beam-G.mscx b/src/engraving/tests/beam_data/Beam-G.mscx index 8a93fe35f0549..3932ee6e4eaf5 100644 --- a/src/engraving/tests/beam_data/Beam-G.mscx +++ b/src/engraving/tests/beam_data/Beam-G.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/chordsymbol_data/add-link-ref.mscx b/src/engraving/tests/chordsymbol_data/add-link-ref.mscx index afa0b366f1e43..d77387db8b22b 100644 --- a/src/engraving/tests/chordsymbol_data/add-link-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/add-link-ref.mscx @@ -82,6 +82,7 @@ G8vb G8vb + 1 4 @@ -140,6 +141,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/chordsymbol_data/add-part-ref.mscx b/src/engraving/tests/chordsymbol_data/add-part-ref.mscx index c2d912cb5314f..1efdc4a46ddd1 100644 --- a/src/engraving/tests/chordsymbol_data/add-part-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/add-part-ref.mscx @@ -75,6 +75,7 @@ G8vb G8vb + 1 @@ -178,6 +179,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/chordsymbol_data/clear-ref.mscx b/src/engraving/tests/chordsymbol_data/clear-ref.mscx index abfee61903f77..380ebd2607298 100644 --- a/src/engraving/tests/chordsymbol_data/clear-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/clear-ref.mscx @@ -72,6 +72,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/chordsymbol_data/extend-ref.mscx b/src/engraving/tests/chordsymbol_data/extend-ref.mscx index 96a08a29231f9..571105db21349 100644 --- a/src/engraving/tests/chordsymbol_data/extend-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/extend-ref.mscx @@ -75,6 +75,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/chordsymbol_data/no-system-ref.mscx b/src/engraving/tests/chordsymbol_data/no-system-ref.mscx index 560841d189b71..f1442a814b702 100644 --- a/src/engraving/tests/chordsymbol_data/no-system-ref.mscx +++ b/src/engraving/tests/chordsymbol_data/no-system-ref.mscx @@ -107,6 +107,7 @@ G G + 1 @@ -149,6 +150,7 @@ G G + 1 @@ -259,6 +261,7 @@ G G + 1 @@ -373,6 +376,7 @@ G G + 1 diff --git a/src/engraving/tests/clef_courtesy_data/clef_courtesy01-ref.mscx b/src/engraving/tests/clef_courtesy_data/clef_courtesy01-ref.mscx index 7d5518e9d7e2d..489ca493d65f4 100644 --- a/src/engraving/tests/clef_courtesy_data/clef_courtesy01-ref.mscx +++ b/src/engraving/tests/clef_courtesy_data/clef_courtesy01-ref.mscx @@ -78,6 +78,7 @@ G G + 1 4 diff --git a/src/engraving/tests/clef_courtesy_data/clef_courtesy02-ref.mscx b/src/engraving/tests/clef_courtesy_data/clef_courtesy02-ref.mscx index 6dc935c915e9f..83388901ccf86 100644 --- a/src/engraving/tests/clef_courtesy_data/clef_courtesy02-ref.mscx +++ b/src/engraving/tests/clef_courtesy_data/clef_courtesy02-ref.mscx @@ -79,6 +79,7 @@ G G + 1 4 diff --git a/src/engraving/tests/clef_courtesy_data/clef_courtesy04-ref.mscx b/src/engraving/tests/clef_courtesy_data/clef_courtesy04-ref.mscx index b79b51357b766..36dab996ff408 100644 --- a/src/engraving/tests/clef_courtesy_data/clef_courtesy04-ref.mscx +++ b/src/engraving/tests/clef_courtesy_data/clef_courtesy04-ref.mscx @@ -143,6 +143,7 @@ G G + 1 4 @@ -189,11 +190,6 @@ - - G8va - G8va - 0 - whole @@ -374,11 +370,6 @@ - - G8va - G8va - 0 - whole diff --git a/src/engraving/tests/clef_data/clef-1-ref.mscx b/src/engraving/tests/clef_data/clef-1-ref.mscx index 44ba28968874a..dcd8ca6cf806d 100644 --- a/src/engraving/tests/clef_data/clef-1-ref.mscx +++ b/src/engraving/tests/clef_data/clef-1-ref.mscx @@ -71,6 +71,7 @@ G G + 1 3 @@ -164,6 +165,7 @@ F F + 1 3 diff --git a/src/engraving/tests/clef_data/clef-3-ref.mscx b/src/engraving/tests/clef_data/clef-3-ref.mscx index a3f0628e75a4a..6bf629a375c9b 100644 --- a/src/engraving/tests/clef_data/clef-3-ref.mscx +++ b/src/engraving/tests/clef_data/clef-3-ref.mscx @@ -92,6 +92,7 @@ F F + 1 4 diff --git a/src/engraving/tests/compat114_data/accidentals-ref.mscx b/src/engraving/tests/compat114_data/accidentals-ref.mscx index 81f2abb231ae5..caef938bc8dc9 100644 --- a/src/engraving/tests/compat114_data/accidentals-ref.mscx +++ b/src/engraving/tests/compat114_data/accidentals-ref.mscx @@ -68,6 +68,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/articulations-ref.mscx b/src/engraving/tests/compat114_data/articulations-ref.mscx index fff2c613ef1b9..355b917ff04f3 100644 --- a/src/engraving/tests/compat114_data/articulations-ref.mscx +++ b/src/engraving/tests/compat114_data/articulations-ref.mscx @@ -71,6 +71,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/chord_symbol-ref.mscx b/src/engraving/tests/compat114_data/chord_symbol-ref.mscx index 63cf686afee5c..0e73ddba8d551 100644 --- a/src/engraving/tests/compat114_data/chord_symbol-ref.mscx +++ b/src/engraving/tests/compat114_data/chord_symbol-ref.mscx @@ -75,6 +75,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/clef_missing_first-ref.mscx b/src/engraving/tests/compat114_data/clef_missing_first-ref.mscx index 948678efffac1..45650d090001f 100644 --- a/src/engraving/tests/compat114_data/clef_missing_first-ref.mscx +++ b/src/engraving/tests/compat114_data/clef_missing_first-ref.mscx @@ -74,6 +74,7 @@ G8va G8va + 1 0 diff --git a/src/engraving/tests/compat114_data/clefs-ref.mscx b/src/engraving/tests/compat114_data/clefs-ref.mscx index 901784be766c1..25d8d4520f931 100644 --- a/src/engraving/tests/compat114_data/clefs-ref.mscx +++ b/src/engraving/tests/compat114_data/clefs-ref.mscx @@ -83,6 +83,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/drumset-ref.mscx b/src/engraving/tests/compat114_data/drumset-ref.mscx index 5f718b6e99d21..e43927bef612e 100644 --- a/src/engraving/tests/compat114_data/drumset-ref.mscx +++ b/src/engraving/tests/compat114_data/drumset-ref.mscx @@ -248,6 +248,7 @@ PERC PERC + 1 4 diff --git a/src/engraving/tests/compat114_data/fingering-ref.mscx b/src/engraving/tests/compat114_data/fingering-ref.mscx index 14f9210e66e5b..5ce3c378844bc 100644 --- a/src/engraving/tests/compat114_data/fingering-ref.mscx +++ b/src/engraving/tests/compat114_data/fingering-ref.mscx @@ -91,6 +91,7 @@ G8vb G8vb + 1 0 diff --git a/src/engraving/tests/compat114_data/hairpin-ref.mscx b/src/engraving/tests/compat114_data/hairpin-ref.mscx index 87f58f81f8bcc..aa43d00c2754a 100644 --- a/src/engraving/tests/compat114_data/hairpin-ref.mscx +++ b/src/engraving/tests/compat114_data/hairpin-ref.mscx @@ -87,6 +87,7 @@ G G + 1 0 @@ -430,6 +431,7 @@ F F + 1 0 diff --git a/src/engraving/tests/compat114_data/hor_frame_and_mmrest-ref.mscx b/src/engraving/tests/compat114_data/hor_frame_and_mmrest-ref.mscx index 07a1a7f170b55..e9123bc8bb006 100644 --- a/src/engraving/tests/compat114_data/hor_frame_and_mmrest-ref.mscx +++ b/src/engraving/tests/compat114_data/hor_frame_and_mmrest-ref.mscx @@ -79,6 +79,7 @@ G G + 1 diff --git a/src/engraving/tests/compat114_data/keysig-ref.mscx b/src/engraving/tests/compat114_data/keysig-ref.mscx index 244d81bc89d64..0147fdf2155b5 100644 --- a/src/engraving/tests/compat114_data/keysig-ref.mscx +++ b/src/engraving/tests/compat114_data/keysig-ref.mscx @@ -82,6 +82,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/markers-ref.mscx b/src/engraving/tests/compat114_data/markers-ref.mscx index 59af3843af437..e157dd1dfeeaf 100644 --- a/src/engraving/tests/compat114_data/markers-ref.mscx +++ b/src/engraving/tests/compat114_data/markers-ref.mscx @@ -76,6 +76,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/noteheads-ref.mscx b/src/engraving/tests/compat114_data/noteheads-ref.mscx index 59f3a03effdb7..a67c258c002ef 100644 --- a/src/engraving/tests/compat114_data/noteheads-ref.mscx +++ b/src/engraving/tests/compat114_data/noteheads-ref.mscx @@ -68,6 +68,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/notes-ref.mscx b/src/engraving/tests/compat114_data/notes-ref.mscx index 29ff626a7d857..b0de5c1067aea 100644 --- a/src/engraving/tests/compat114_data/notes-ref.mscx +++ b/src/engraving/tests/compat114_data/notes-ref.mscx @@ -82,6 +82,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/notes_useroffset-ref.mscx b/src/engraving/tests/compat114_data/notes_useroffset-ref.mscx index 2da84ce0bfbd4..a3c86aa27262d 100644 --- a/src/engraving/tests/compat114_data/notes_useroffset-ref.mscx +++ b/src/engraving/tests/compat114_data/notes_useroffset-ref.mscx @@ -68,6 +68,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/ottava-ref.mscx b/src/engraving/tests/compat114_data/ottava-ref.mscx index 766bd8e226f87..6565b6cee9d3d 100644 --- a/src/engraving/tests/compat114_data/ottava-ref.mscx +++ b/src/engraving/tests/compat114_data/ottava-ref.mscx @@ -75,6 +75,7 @@ G G + 1 0 @@ -147,6 +148,7 @@ F F + 1 0 diff --git a/src/engraving/tests/compat114_data/pedal-ref.mscx b/src/engraving/tests/compat114_data/pedal-ref.mscx index fb35d3a58f2a8..097450b17fd82 100644 --- a/src/engraving/tests/compat114_data/pedal-ref.mscx +++ b/src/engraving/tests/compat114_data/pedal-ref.mscx @@ -75,6 +75,7 @@ G G + 1 0 @@ -146,6 +147,7 @@ F F + 1 0 diff --git a/src/engraving/tests/compat114_data/slurs-ref.mscx b/src/engraving/tests/compat114_data/slurs-ref.mscx index 41e15b71f9b23..f73597a417549 100644 --- a/src/engraving/tests/compat114_data/slurs-ref.mscx +++ b/src/engraving/tests/compat114_data/slurs-ref.mscx @@ -73,6 +73,7 @@ G G + 1 0 @@ -791,6 +792,7 @@ F F + 1 0 diff --git a/src/engraving/tests/compat114_data/style-ref.mscx b/src/engraving/tests/compat114_data/style-ref.mscx index 4a5b9a8ca8a4d..a668e5e138f46 100644 --- a/src/engraving/tests/compat114_data/style-ref.mscx +++ b/src/engraving/tests/compat114_data/style-ref.mscx @@ -131,6 +131,7 @@ G G + 1 diff --git a/src/engraving/tests/compat114_data/tamtam-ref.mscx b/src/engraving/tests/compat114_data/tamtam-ref.mscx index 40c54c19989c2..b7ba9d26ec272 100644 --- a/src/engraving/tests/compat114_data/tamtam-ref.mscx +++ b/src/engraving/tests/compat114_data/tamtam-ref.mscx @@ -81,6 +81,7 @@ PERC PERC + 1 4 diff --git a/src/engraving/tests/compat114_data/text_scaling-ref.mscx b/src/engraving/tests/compat114_data/text_scaling-ref.mscx index 1e623cdaf3780..69b94c35c30a2 100644 --- a/src/engraving/tests/compat114_data/text_scaling-ref.mscx +++ b/src/engraving/tests/compat114_data/text_scaling-ref.mscx @@ -87,6 +87,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/textline-ref.mscx b/src/engraving/tests/compat114_data/textline-ref.mscx index 63ce37aa59758..2c8c2f5c05918 100644 --- a/src/engraving/tests/compat114_data/textline-ref.mscx +++ b/src/engraving/tests/compat114_data/textline-ref.mscx @@ -75,6 +75,7 @@ G G + 1 0 @@ -142,6 +143,7 @@ F F + 1 0 diff --git a/src/engraving/tests/compat114_data/textstyles-ref.mscx b/src/engraving/tests/compat114_data/textstyles-ref.mscx index 5dacb7d47c45e..8ab5567599dfc 100644 --- a/src/engraving/tests/compat114_data/textstyles-ref.mscx +++ b/src/engraving/tests/compat114_data/textstyles-ref.mscx @@ -99,6 +99,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/title-ref.mscx b/src/engraving/tests/compat114_data/title-ref.mscx index 1033eab231f6f..4d1dc534f7e7a 100644 --- a/src/engraving/tests/compat114_data/title-ref.mscx +++ b/src/engraving/tests/compat114_data/title-ref.mscx @@ -99,6 +99,7 @@ G G + 1 0 @@ -372,6 +373,7 @@ F F + 1 0 diff --git a/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx b/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx index 3f707a2e99ed9..996dcbdbe2fd0 100644 --- a/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx +++ b/src/engraving/tests/compat114_data/tremolo2notes-ref.mscx @@ -68,6 +68,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/tuplets-ref.mscx b/src/engraving/tests/compat114_data/tuplets-ref.mscx index 8949867fd0d29..319850641424b 100644 --- a/src/engraving/tests/compat114_data/tuplets-ref.mscx +++ b/src/engraving/tests/compat114_data/tuplets-ref.mscx @@ -80,6 +80,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/tuplets_1-ref.mscx b/src/engraving/tests/compat114_data/tuplets_1-ref.mscx index c009881486993..ca4749a2a5c65 100644 --- a/src/engraving/tests/compat114_data/tuplets_1-ref.mscx +++ b/src/engraving/tests/compat114_data/tuplets_1-ref.mscx @@ -80,6 +80,7 @@ G G + 1 0 diff --git a/src/engraving/tests/compat114_data/tuplets_2-ref.mscx b/src/engraving/tests/compat114_data/tuplets_2-ref.mscx index 2cc671ce7c4d9..c127c17b563d5 100644 --- a/src/engraving/tests/compat114_data/tuplets_2-ref.mscx +++ b/src/engraving/tests/compat114_data/tuplets_2-ref.mscx @@ -80,6 +80,7 @@ G G + 1 0 diff --git a/src/engraving/tests/copypaste_data/copypaste01-ref.mscx b/src/engraving/tests/copypaste_data/copypaste01-ref.mscx index b3a9f9efeef98..f63c6d564c6fb 100644 --- a/src/engraving/tests/copypaste_data/copypaste01-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste01-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste02-ref.mscx b/src/engraving/tests/copypaste_data/copypaste02-ref.mscx index 87b1f7ee997c8..9917a986e5b24 100644 --- a/src/engraving/tests/copypaste_data/copypaste02-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste02-ref.mscx @@ -74,6 +74,7 @@ G G + 1 quarter diff --git a/src/engraving/tests/copypaste_data/copypaste03-ref.mscx b/src/engraving/tests/copypaste_data/copypaste03-ref.mscx index 5d75c22480e87..5b1330aab2db8 100644 --- a/src/engraving/tests/copypaste_data/copypaste03-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste03-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste04-ref.mscx b/src/engraving/tests/copypaste_data/copypaste04-ref.mscx index f654ab55007ce..684e514299d38 100644 --- a/src/engraving/tests/copypaste_data/copypaste04-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste04-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste05-ref.mscx b/src/engraving/tests/copypaste_data/copypaste05-ref.mscx index 8975ea2d5fb44..346b31aa81b26 100644 --- a/src/engraving/tests/copypaste_data/copypaste05-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste05-ref.mscx @@ -74,6 +74,7 @@ G G + 1 quarter diff --git a/src/engraving/tests/copypaste_data/copypaste06-ref.mscx b/src/engraving/tests/copypaste_data/copypaste06-ref.mscx index 3e297d21ef794..df5e906837bad 100644 --- a/src/engraving/tests/copypaste_data/copypaste06-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste06-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste08-ref.mscx b/src/engraving/tests/copypaste_data/copypaste08-ref.mscx index 26dc760c6376f..5ef9a567c07d3 100644 --- a/src/engraving/tests/copypaste_data/copypaste08-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste08-ref.mscx @@ -74,6 +74,7 @@ G G + 1 quarter diff --git a/src/engraving/tests/copypaste_data/copypaste09-ref.mscx b/src/engraving/tests/copypaste_data/copypaste09-ref.mscx index 84a3702185be0..ccc187f42bb34 100644 --- a/src/engraving/tests/copypaste_data/copypaste09-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste09-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste10-ref.mscx b/src/engraving/tests/copypaste_data/copypaste10-ref.mscx index 5cb9271725878..6a9a8d830ea49 100644 --- a/src/engraving/tests/copypaste_data/copypaste10-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste10-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste11-ref.mscx b/src/engraving/tests/copypaste_data/copypaste11-ref.mscx index 7a4a7059a87ef..64e67460c45b4 100644 --- a/src/engraving/tests/copypaste_data/copypaste11-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste11-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste12-ref.mscx b/src/engraving/tests/copypaste_data/copypaste12-ref.mscx index 5879c5238409b..e16600b722e06 100644 --- a/src/engraving/tests/copypaste_data/copypaste12-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste12-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste13-ref.mscx b/src/engraving/tests/copypaste_data/copypaste13-ref.mscx index 3dcf5e023b86e..83b01100a0abf 100644 --- a/src/engraving/tests/copypaste_data/copypaste13-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste13-ref.mscx @@ -85,6 +85,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste17-ref.mscx b/src/engraving/tests/copypaste_data/copypaste17-ref.mscx index edfc37282d2fb..aeaf4980f78a2 100644 --- a/src/engraving/tests/copypaste_data/copypaste17-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste17-ref.mscx @@ -85,6 +85,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste18-ref.mscx b/src/engraving/tests/copypaste_data/copypaste18-ref.mscx index 28148f591258a..cfe595d75fdbb 100644 --- a/src/engraving/tests/copypaste_data/copypaste18-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste18-ref.mscx @@ -85,6 +85,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste19-ref.mscx b/src/engraving/tests/copypaste_data/copypaste19-ref.mscx index 984e86cae1f13..542ab3d0fb853 100644 --- a/src/engraving/tests/copypaste_data/copypaste19-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste19-ref.mscx @@ -77,6 +77,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste20-ref.mscx b/src/engraving/tests/copypaste_data/copypaste20-ref.mscx index 1bb27a2fec0c8..6f6791598659b 100644 --- a/src/engraving/tests/copypaste_data/copypaste20-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste20-ref.mscx @@ -85,6 +85,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste22-ref.mscx b/src/engraving/tests/copypaste_data/copypaste22-ref.mscx index 2cefd5014b952..1756ae4aa37a0 100644 --- a/src/engraving/tests/copypaste_data/copypaste22-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste22-ref.mscx @@ -80,6 +80,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste50-ref.mscx b/src/engraving/tests/copypaste_data/copypaste50-ref.mscx index ca49f6ca80ff8..120b6c2e7af63 100644 --- a/src/engraving/tests/copypaste_data/copypaste50-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste50-ref.mscx @@ -109,6 +109,7 @@ G G + 1 4 @@ -225,6 +226,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx index b72358d5b3466..05dd6c81649df 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote01-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx index b72358d5b3466..05dd6c81649df 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote02-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx index b72358d5b3466..05dd6c81649df 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote03-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx index b72358d5b3466..05dd6c81649df 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote04-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx index 9f7ba56878414..f1c86f584380c 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote05-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx index 9f7ba56878414..f1c86f584380c 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote06-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx index 67aba1d0302d5..67b0512986ea1 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote07-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx index 07c2eb9efed72..9f33c48e4485f 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote08-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx index 96a7f8ce94d5e..8cbeb2a43e8b0 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote09-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx index 844acb7d1b64b..d1e643ec27148 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote10-ref.mscx @@ -76,6 +76,7 @@ G G + 1 diff --git a/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx b/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx index d80996af0e6f9..bcfd813c59de5 100644 --- a/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypasteNote11-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypaste_data/copypaste_partial_01-ref.mscx b/src/engraving/tests/copypaste_data/copypaste_partial_01-ref.mscx index cf798d291491d..502f34c6d3fb9 100644 --- a/src/engraving/tests/copypaste_data/copypaste_partial_01-ref.mscx +++ b/src/engraving/tests/copypaste_data/copypaste_partial_01-ref.mscx @@ -70,6 +70,7 @@ G G + 1 4 @@ -135,6 +136,7 @@ F F + 1 4 diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-ref.mscx index d335088dc733c..12a88e1ed46c3 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-ref.mscx @@ -63,6 +63,7 @@ G G + 1 4 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 5c8e1bdc61de2..590a4c1ccef74 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-rest-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-articulation-rest-ref.mscx @@ -85,6 +85,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-chordnames-01-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-chordnames-01-ref.mscx index 36b5679708257..0a63b0dbae320 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-chordnames-01-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-chordnames-01-ref.mscx @@ -66,6 +66,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-chordnames-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-chordnames-ref.mscx index ed98942731c15..e2a294cdd7354 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-chordnames-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-chordnames-ref.mscx @@ -66,6 +66,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-lyrics-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-lyrics-ref.mscx index 539e31da03729..48925e17dba16 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-lyrics-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-lyrics-ref.mscx @@ -63,6 +63,7 @@ G G + 1 4 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 977265e4b7e24..6b807e86613f1 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-01-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-01-ref.mscx @@ -135,6 +135,7 @@ G G + 1 4 @@ -257,6 +258,7 @@ C3 C3 + 1 4 diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-ref.mscx index 72d86d514c011..9dbc526058e8d 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-range-ref.mscx @@ -135,6 +135,7 @@ G G + 1 4 @@ -257,6 +258,7 @@ C3 C3 + 1 4 diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-stafftext-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-stafftext-ref.mscx index f46bbc6045b85..d1a94e52f5146 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-stafftext-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-stafftext-ref.mscx @@ -65,6 +65,7 @@ G G + 1 4 diff --git a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-sticking-ref.mscx b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-sticking-ref.mscx index 737f317f2722c..11e815e9606ee 100644 --- a/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-sticking-ref.mscx +++ b/src/engraving/tests/copypastesymbollist_data/copypastesymbollist-sticking-ref.mscx @@ -65,6 +65,7 @@ G G + 1 4 diff --git a/src/engraving/tests/instrumentchange_data/add-ref.mscx b/src/engraving/tests/instrumentchange_data/add-ref.mscx index 4d6d479bdc6c2..e78d6eb1ffeab 100644 --- a/src/engraving/tests/instrumentchange_data/add-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/add-ref.mscx @@ -113,6 +113,7 @@ G G + 1 4 @@ -301,6 +302,7 @@ G G + 1 4 diff --git a/src/engraving/tests/instrumentchange_data/change-ref.mscx b/src/engraving/tests/instrumentchange_data/change-ref.mscx index f37bb2a6a63cf..5369b32ea7824 100644 --- a/src/engraving/tests/instrumentchange_data/change-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/change-ref.mscx @@ -109,6 +109,7 @@ G G + 1 4 @@ -295,6 +296,7 @@ G G + 1 4 diff --git a/src/engraving/tests/instrumentchange_data/copy-ref.mscx b/src/engraving/tests/instrumentchange_data/copy-ref.mscx index 7eeddc92bf8e7..040d04a08104f 100644 --- a/src/engraving/tests/instrumentchange_data/copy-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/copy-ref.mscx @@ -109,6 +109,7 @@ G G + 1 4 @@ -312,6 +313,7 @@ G G + 1 4 diff --git a/src/engraving/tests/instrumentchange_data/delete-ref.mscx b/src/engraving/tests/instrumentchange_data/delete-ref.mscx index 245df96b3edfb..cbe5b91eb8feb 100644 --- a/src/engraving/tests/instrumentchange_data/delete-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/delete-ref.mscx @@ -113,6 +113,7 @@ G G + 1 4 @@ -267,6 +268,7 @@ G G + 1 4 diff --git a/src/engraving/tests/instrumentchange_data/mixer-ref.mscx b/src/engraving/tests/instrumentchange_data/mixer-ref.mscx index 8c0022ed1bffb..bd8f9547162aa 100644 --- a/src/engraving/tests/instrumentchange_data/mixer-ref.mscx +++ b/src/engraving/tests/instrumentchange_data/mixer-ref.mscx @@ -109,6 +109,7 @@ G G + 1 4 @@ -295,6 +296,7 @@ G G + 1 4 diff --git a/src/engraving/tests/join_data/join01-ref.mscx b/src/engraving/tests/join_data/join01-ref.mscx index f0d860466a4a1..ac9f35c6dedc2 100644 --- a/src/engraving/tests/join_data/join01-ref.mscx +++ b/src/engraving/tests/join_data/join01-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/join_data/join02-ref.mscx b/src/engraving/tests/join_data/join02-ref.mscx index 9cd10fb8509b7..774369a55ef7e 100644 --- a/src/engraving/tests/join_data/join02-ref.mscx +++ b/src/engraving/tests/join_data/join02-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/join_data/join03-ref.mscx b/src/engraving/tests/join_data/join03-ref.mscx index e72b9f72f8d07..dff5c1fcd3801 100644 --- a/src/engraving/tests/join_data/join03-ref.mscx +++ b/src/engraving/tests/join_data/join03-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/join_data/join04-ref.mscx b/src/engraving/tests/join_data/join04-ref.mscx index a0e00554d1b11..882e1199faf89 100644 --- a/src/engraving/tests/join_data/join04-ref.mscx +++ b/src/engraving/tests/join_data/join04-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/join_data/join05-ref.mscx b/src/engraving/tests/join_data/join05-ref.mscx index 5da3c8ef7e637..89b1d6ab1d405 100644 --- a/src/engraving/tests/join_data/join05-ref.mscx +++ b/src/engraving/tests/join_data/join05-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/join_data/join06-ref.mscx b/src/engraving/tests/join_data/join06-ref.mscx index feb2157a85831..6e22b1429aa3b 100644 --- a/src/engraving/tests/join_data/join06-ref.mscx +++ b/src/engraving/tests/join_data/join06-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/join_data/join07-ref.mscx b/src/engraving/tests/join_data/join07-ref.mscx index 49eb3b12e1740..ded68a456252f 100644 --- a/src/engraving/tests/join_data/join07-ref.mscx +++ b/src/engraving/tests/join_data/join07-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/keysig_data/keysig.mscx b/src/engraving/tests/keysig_data/keysig.mscx index 9b13ae04b7c25..84f86b71670be 100644 --- a/src/engraving/tests/keysig_data/keysig.mscx +++ b/src/engraving/tests/keysig_data/keysig.mscx @@ -63,6 +63,7 @@ G G + 1 4 diff --git a/src/engraving/tests/keysig_data/keysig01-ref.mscx b/src/engraving/tests/keysig_data/keysig01-ref.mscx index 391f7ec242a52..bf969ee2253af 100644 --- a/src/engraving/tests/keysig_data/keysig01-ref.mscx +++ b/src/engraving/tests/keysig_data/keysig01-ref.mscx @@ -63,6 +63,7 @@ G G + 1 4 diff --git a/src/engraving/tests/keysig_data/keysig02-ref.mscx b/src/engraving/tests/keysig_data/keysig02-ref.mscx index 0dcf4be052dab..b52913086e6bb 100644 --- a/src/engraving/tests/keysig_data/keysig02-ref.mscx +++ b/src/engraving/tests/keysig_data/keysig02-ref.mscx @@ -63,6 +63,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-10-ref.mscx b/src/engraving/tests/measure_data/measure-10-ref.mscx index d6b433caca133..8c01ee4f8d01f 100644 --- a/src/engraving/tests/measure_data/measure-10-ref.mscx +++ b/src/engraving/tests/measure_data/measure-10-ref.mscx @@ -59,6 +59,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-4-ref.mscx b/src/engraving/tests/measure_data/measure-4-ref.mscx index ec3871db2837a..815fa954b7472 100644 --- a/src/engraving/tests/measure_data/measure-4-ref.mscx +++ b/src/engraving/tests/measure_data/measure-4-ref.mscx @@ -59,6 +59,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-5-ref.mscx b/src/engraving/tests/measure_data/measure-5-ref.mscx index 789bdfca441f2..43d825e7a6aea 100644 --- a/src/engraving/tests/measure_data/measure-5-ref.mscx +++ b/src/engraving/tests/measure_data/measure-5-ref.mscx @@ -59,6 +59,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-7-ref.mscx b/src/engraving/tests/measure_data/measure-7-ref.mscx index 57b28bb218c87..cae7c51d6c9d5 100644 --- a/src/engraving/tests/measure_data/measure-7-ref.mscx +++ b/src/engraving/tests/measure_data/measure-7-ref.mscx @@ -59,6 +59,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-8-ref.mscx b/src/engraving/tests/measure_data/measure-8-ref.mscx index 1ae2da9c4243d..326537e52a48a 100644 --- a/src/engraving/tests/measure_data/measure-8-ref.mscx +++ b/src/engraving/tests/measure_data/measure-8-ref.mscx @@ -59,6 +59,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-9-ref.mscx b/src/engraving/tests/measure_data/measure-9-ref.mscx index 8f0bbf8545325..8e854050bac3d 100644 --- a/src/engraving/tests/measure_data/measure-9-ref.mscx +++ b/src/engraving/tests/measure_data/measure-9-ref.mscx @@ -59,6 +59,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_clef-2-ref.mscx b/src/engraving/tests/measure_data/measure-insert_bf_clef-2-ref.mscx index 4c2eba3d1a83a..da0e051c4da34 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_clef-2-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_clef-2-ref.mscx @@ -63,6 +63,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_clef-ref.mscx b/src/engraving/tests/measure_data/measure-insert_bf_clef-ref.mscx index 42c7dd8f54e30..20ff250c3241e 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_clef-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_clef-ref.mscx @@ -63,6 +63,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_clef.mscx b/src/engraving/tests/measure_data/measure-insert_bf_clef.mscx index 1a9e759aa54d5..5424aab75df6e 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_clef.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_clef.mscx @@ -63,6 +63,7 @@ G G + 1 4 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_key-2-ref.mscx b/src/engraving/tests/measure_data/measure-insert_bf_key-2-ref.mscx index b4a5850f141d2..a4619efa3e6d7 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_key-2-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_key-2-ref.mscx @@ -66,6 +66,7 @@ G G + 1 -2 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_key-ref.mscx b/src/engraving/tests/measure_data/measure-insert_bf_key-ref.mscx index 393fa67055f44..fe1e4dc7a1643 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_key-ref.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_key-ref.mscx @@ -66,6 +66,7 @@ G G + 1 -2 diff --git a/src/engraving/tests/measure_data/measure-insert_bf_key.mscx b/src/engraving/tests/measure_data/measure-insert_bf_key.mscx index bd54bc6e2fd0c..69906e2981e05 100644 --- a/src/engraving/tests/measure_data/measure-insert_bf_key.mscx +++ b/src/engraving/tests/measure_data/measure-insert_bf_key.mscx @@ -66,6 +66,7 @@ G G + 1 -2 diff --git a/src/engraving/tests/parts_data/part-all-appendmeasures.mscx b/src/engraving/tests/parts_data/part-all-appendmeasures.mscx index 027183a7d6a53..a539ccda5bf55 100644 --- a/src/engraving/tests/parts_data/part-all-appendmeasures.mscx +++ b/src/engraving/tests/parts_data/part-all-appendmeasures.mscx @@ -119,6 +119,7 @@ G G + 1 @@ -686,6 +687,7 @@ G8vb G8vb + 1 @@ -1150,6 +1152,7 @@ G G + 1 @@ -1869,6 +1872,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-all-insertmeasures.mscx b/src/engraving/tests/parts_data/part-all-insertmeasures.mscx index 764beb6b989cd..7133bcfaa8ebc 100644 --- a/src/engraving/tests/parts_data/part-all-insertmeasures.mscx +++ b/src/engraving/tests/parts_data/part-all-insertmeasures.mscx @@ -119,6 +119,7 @@ G G + 1 4 @@ -684,6 +685,7 @@ G8vb G8vb + 1 4 @@ -1146,6 +1148,7 @@ G G + 1 4 @@ -1864,6 +1867,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/part-all-parts.mscx b/src/engraving/tests/parts_data/part-all-parts.mscx index 7e6f21b47780c..ab9ff9924a566 100644 --- a/src/engraving/tests/parts_data/part-all-parts.mscx +++ b/src/engraving/tests/parts_data/part-all-parts.mscx @@ -119,6 +119,7 @@ G G + 1 @@ -677,6 +678,7 @@ G8vb G8vb + 1 @@ -1132,6 +1134,7 @@ G G + 1 @@ -1841,6 +1844,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-all-uappendmeasures.mscx b/src/engraving/tests/parts_data/part-all-uappendmeasures.mscx index 7e6f21b47780c..ab9ff9924a566 100644 --- a/src/engraving/tests/parts_data/part-all-uappendmeasures.mscx +++ b/src/engraving/tests/parts_data/part-all-uappendmeasures.mscx @@ -119,6 +119,7 @@ G G + 1 @@ -677,6 +678,7 @@ G8vb G8vb + 1 @@ -1132,6 +1134,7 @@ G G + 1 @@ -1841,6 +1844,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-all-uinsertmeasures.mscx b/src/engraving/tests/parts_data/part-all-uinsertmeasures.mscx index 7e6f21b47780c..ab9ff9924a566 100644 --- a/src/engraving/tests/parts_data/part-all-uinsertmeasures.mscx +++ b/src/engraving/tests/parts_data/part-all-uinsertmeasures.mscx @@ -119,6 +119,7 @@ G G + 1 @@ -677,6 +678,7 @@ G8vb G8vb + 1 @@ -1132,6 +1134,7 @@ G G + 1 @@ -1841,6 +1844,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-all.mscx b/src/engraving/tests/parts_data/part-all.mscx index 0868aab2d33bd..e32105eed675f 100644 --- a/src/engraving/tests/parts_data/part-all.mscx +++ b/src/engraving/tests/parts_data/part-all.mscx @@ -117,6 +117,7 @@ G G + 1 4 @@ -593,6 +594,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/part-breath-add.mscx b/src/engraving/tests/parts_data/part-breath-add.mscx index 11ff30454fe49..ef799db48c961 100644 --- a/src/engraving/tests/parts_data/part-breath-add.mscx +++ b/src/engraving/tests/parts_data/part-breath-add.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-breath-del.mscx b/src/engraving/tests/parts_data/part-breath-del.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-breath-del.mscx +++ b/src/engraving/tests/parts_data/part-breath-del.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-breath-parts.mscx b/src/engraving/tests/parts_data/part-breath-parts.mscx index d30a0784d7305..c88c354754a10 100644 --- a/src/engraving/tests/parts_data/part-breath-parts.mscx +++ b/src/engraving/tests/parts_data/part-breath-parts.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -451,6 +452,7 @@ G8vb G8vb + 1 @@ -857,6 +859,7 @@ G G + 1 @@ -1316,6 +1319,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-breath-uadd.mscx b/src/engraving/tests/parts_data/part-breath-uadd.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-breath-uadd.mscx +++ b/src/engraving/tests/parts_data/part-breath-uadd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-breath-udel.mscx b/src/engraving/tests/parts_data/part-breath-udel.mscx index 11ff30454fe49..ef799db48c961 100644 --- a/src/engraving/tests/parts_data/part-breath-udel.mscx +++ b/src/engraving/tests/parts_data/part-breath-udel.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-breath-uradd.mscx b/src/engraving/tests/parts_data/part-breath-uradd.mscx index 11ff30454fe49..ef799db48c961 100644 --- a/src/engraving/tests/parts_data/part-breath-uradd.mscx +++ b/src/engraving/tests/parts_data/part-breath-uradd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-breath-urdel.mscx b/src/engraving/tests/parts_data/part-breath-urdel.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-breath-urdel.mscx +++ b/src/engraving/tests/parts_data/part-breath-urdel.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-breath.mscx b/src/engraving/tests/parts_data/part-breath.mscx index 9a2863e8c9340..3ce72f3951fdd 100644 --- a/src/engraving/tests/parts_data/part-breath.mscx +++ b/src/engraving/tests/parts_data/part-breath.mscx @@ -113,6 +113,7 @@ G G + 1 4 @@ -406,6 +407,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/part-chordline-add.mscx b/src/engraving/tests/parts_data/part-chordline-add.mscx index c589370e0e04e..ce72620f519ae 100644 --- a/src/engraving/tests/parts_data/part-chordline-add.mscx +++ b/src/engraving/tests/parts_data/part-chordline-add.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-chordline-del.mscx b/src/engraving/tests/parts_data/part-chordline-del.mscx index 22e6363be2655..c50ba98037d58 100644 --- a/src/engraving/tests/parts_data/part-chordline-del.mscx +++ b/src/engraving/tests/parts_data/part-chordline-del.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -437,6 +438,7 @@ G8vb G8vb + 1 @@ -834,6 +836,7 @@ G G + 1 @@ -1274,6 +1277,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-chordline-parts.mscx b/src/engraving/tests/parts_data/part-chordline-parts.mscx index 679dfbdc21038..18eafd46e2092 100644 --- a/src/engraving/tests/parts_data/part-chordline-parts.mscx +++ b/src/engraving/tests/parts_data/part-chordline-parts.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -441,6 +442,7 @@ G8vb G8vb + 1 @@ -837,6 +839,7 @@ G G + 1 @@ -1281,6 +1284,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-chordline-uadd.mscx b/src/engraving/tests/parts_data/part-chordline-uadd.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-chordline-uadd.mscx +++ b/src/engraving/tests/parts_data/part-chordline-uadd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-chordline-udel.mscx b/src/engraving/tests/parts_data/part-chordline-udel.mscx index 12896f5973626..f0d439398879c 100644 --- a/src/engraving/tests/parts_data/part-chordline-udel.mscx +++ b/src/engraving/tests/parts_data/part-chordline-udel.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -441,6 +442,7 @@ G8vb G8vb + 1 @@ -838,6 +840,7 @@ G G + 1 @@ -1283,6 +1286,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-chordline-uradd.mscx b/src/engraving/tests/parts_data/part-chordline-uradd.mscx index c589370e0e04e..ce72620f519ae 100644 --- a/src/engraving/tests/parts_data/part-chordline-uradd.mscx +++ b/src/engraving/tests/parts_data/part-chordline-uradd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-chordline-urdel.mscx b/src/engraving/tests/parts_data/part-chordline-urdel.mscx index 22e6363be2655..c50ba98037d58 100644 --- a/src/engraving/tests/parts_data/part-chordline-urdel.mscx +++ b/src/engraving/tests/parts_data/part-chordline-urdel.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -437,6 +438,7 @@ G8vb G8vb + 1 @@ -834,6 +836,7 @@ G G + 1 @@ -1274,6 +1277,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-chordline.mscx b/src/engraving/tests/parts_data/part-chordline.mscx index dba5eea5888eb..6d3c303c940c3 100644 --- a/src/engraving/tests/parts_data/part-chordline.mscx +++ b/src/engraving/tests/parts_data/part-chordline.mscx @@ -109,6 +109,7 @@ G G + 1 4 @@ -398,6 +399,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/part-empty-parts.mscx b/src/engraving/tests/parts_data/part-empty-parts.mscx index 0cb1448fc4aee..24a1ffe8936a2 100644 --- a/src/engraving/tests/parts_data/part-empty-parts.mscx +++ b/src/engraving/tests/parts_data/part-empty-parts.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -838,6 +840,7 @@ G G + 1 @@ -1283,6 +1286,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-empty.mscx b/src/engraving/tests/parts_data/part-empty.mscx index 92d30534d1050..36ebd3eb4b37e 100644 --- a/src/engraving/tests/parts_data/part-empty.mscx +++ b/src/engraving/tests/parts_data/part-empty.mscx @@ -109,6 +109,7 @@ G G + 1 4 @@ -399,6 +400,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/part-fingering-add.mscx b/src/engraving/tests/parts_data/part-fingering-add.mscx index 79ec4fb40e737..0945300e93e9f 100644 --- a/src/engraving/tests/parts_data/part-fingering-add.mscx +++ b/src/engraving/tests/parts_data/part-fingering-add.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-fingering-del.mscx b/src/engraving/tests/parts_data/part-fingering-del.mscx index 5f6c1c7a1a477..5f7ccc0e2edfe 100644 --- a/src/engraving/tests/parts_data/part-fingering-del.mscx +++ b/src/engraving/tests/parts_data/part-fingering-del.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -447,6 +448,7 @@ G8vb G8vb + 1 @@ -850,6 +852,7 @@ G G + 1 @@ -1305,6 +1308,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-fingering-parts.mscx b/src/engraving/tests/parts_data/part-fingering-parts.mscx index 428483467830d..736824d11e717 100644 --- a/src/engraving/tests/parts_data/part-fingering-parts.mscx +++ b/src/engraving/tests/parts_data/part-fingering-parts.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -452,6 +453,7 @@ G8vb G8vb + 1 @@ -854,6 +856,7 @@ G G + 1 @@ -1314,6 +1317,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-fingering-uadd.mscx b/src/engraving/tests/parts_data/part-fingering-uadd.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-fingering-uadd.mscx +++ b/src/engraving/tests/parts_data/part-fingering-uadd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-fingering-udel.mscx b/src/engraving/tests/parts_data/part-fingering-udel.mscx index 780601e75566b..b96255ad3b3c9 100644 --- a/src/engraving/tests/parts_data/part-fingering-udel.mscx +++ b/src/engraving/tests/parts_data/part-fingering-udel.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -452,6 +453,7 @@ G8vb G8vb + 1 @@ -855,6 +857,7 @@ G G + 1 @@ -1316,6 +1319,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-fingering-uradd.mscx b/src/engraving/tests/parts_data/part-fingering-uradd.mscx index 79ec4fb40e737..0945300e93e9f 100644 --- a/src/engraving/tests/parts_data/part-fingering-uradd.mscx +++ b/src/engraving/tests/parts_data/part-fingering-uradd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-fingering-urdel.mscx b/src/engraving/tests/parts_data/part-fingering-urdel.mscx index 5f6c1c7a1a477..5f7ccc0e2edfe 100644 --- a/src/engraving/tests/parts_data/part-fingering-urdel.mscx +++ b/src/engraving/tests/parts_data/part-fingering-urdel.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -447,6 +448,7 @@ G8vb G8vb + 1 @@ -850,6 +852,7 @@ G G + 1 @@ -1305,6 +1308,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-fingering.mscx b/src/engraving/tests/parts_data/part-fingering.mscx index 5be9ec9edfb21..b0cf93d909deb 100644 --- a/src/engraving/tests/parts_data/part-fingering.mscx +++ b/src/engraving/tests/parts_data/part-fingering.mscx @@ -113,6 +113,7 @@ G G + 1 4 @@ -407,6 +408,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/part-image-add.mscx b/src/engraving/tests/parts_data/part-image-add.mscx index afc0bd4b056c6..7d48ba68f9949 100644 --- a/src/engraving/tests/parts_data/part-image-add.mscx +++ b/src/engraving/tests/parts_data/part-image-add.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -447,6 +448,7 @@ G8vb G8vb + 1 @@ -844,6 +846,7 @@ G G + 1 @@ -1296,6 +1299,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-image-del.mscx b/src/engraving/tests/parts_data/part-image-del.mscx index 48a47ade24847..5a04c045d7e32 100644 --- a/src/engraving/tests/parts_data/part-image-del.mscx +++ b/src/engraving/tests/parts_data/part-image-del.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -844,6 +846,7 @@ G G + 1 @@ -1284,6 +1287,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-image-parts.mscx b/src/engraving/tests/parts_data/part-image-parts.mscx index 5c6965f73eeaf..0e9261edda0e8 100644 --- a/src/engraving/tests/parts_data/part-image-parts.mscx +++ b/src/engraving/tests/parts_data/part-image-parts.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -453,6 +454,7 @@ G8vb G8vb + 1 @@ -854,6 +856,7 @@ G G + 1 @@ -1305,6 +1308,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-image-uadd.mscx b/src/engraving/tests/parts_data/part-image-uadd.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-image-uadd.mscx +++ b/src/engraving/tests/parts_data/part-image-uadd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-image-udel.mscx b/src/engraving/tests/parts_data/part-image-udel.mscx index 19ff315e3b8ac..75614f597381d 100644 --- a/src/engraving/tests/parts_data/part-image-udel.mscx +++ b/src/engraving/tests/parts_data/part-image-udel.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -453,6 +454,7 @@ G8vb G8vb + 1 @@ -855,6 +857,7 @@ G G + 1 @@ -1307,6 +1310,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-image-uradd.mscx b/src/engraving/tests/parts_data/part-image-uradd.mscx index afc0bd4b056c6..7d48ba68f9949 100644 --- a/src/engraving/tests/parts_data/part-image-uradd.mscx +++ b/src/engraving/tests/parts_data/part-image-uradd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -447,6 +448,7 @@ G8vb G8vb + 1 @@ -844,6 +846,7 @@ G G + 1 @@ -1296,6 +1299,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-image-urdel.mscx b/src/engraving/tests/parts_data/part-image-urdel.mscx index 48a47ade24847..5a04c045d7e32 100644 --- a/src/engraving/tests/parts_data/part-image-urdel.mscx +++ b/src/engraving/tests/parts_data/part-image-urdel.mscx @@ -116,6 +116,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -844,6 +846,7 @@ G G + 1 @@ -1284,6 +1287,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-image.mscx b/src/engraving/tests/parts_data/part-image.mscx index 5084bf8a2887a..981e5a4cdd278 100644 --- a/src/engraving/tests/parts_data/part-image.mscx +++ b/src/engraving/tests/parts_data/part-image.mscx @@ -114,6 +114,7 @@ G G + 1 4 @@ -410,6 +411,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-add.mscx b/src/engraving/tests/parts_data/part-measure-repeat-add.mscx index 1e3f8d04640d4..0cc9d490a9eda 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-add.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-add.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -456,6 +457,7 @@ G8vb G8vb + 1 @@ -853,6 +855,7 @@ G G + 1 @@ -1304,6 +1307,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-del.mscx b/src/engraving/tests/parts_data/part-measure-repeat-del.mscx index 1d83beff3edb5..c781bec1a2c42 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-del.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-del.mscx @@ -113,6 +113,7 @@ G G + 1 @@ -461,6 +462,7 @@ G8vb G8vb + 1 @@ -871,6 +873,7 @@ G G + 1 @@ -1333,6 +1336,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-parts.mscx b/src/engraving/tests/parts_data/part-measure-repeat-parts.mscx index 1b899d3c4cc38..8942792821471 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-parts.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-parts.mscx @@ -113,6 +113,7 @@ G G + 1 @@ -478,6 +479,7 @@ G8vb G8vb + 1 @@ -886,6 +888,7 @@ G G + 1 @@ -1389,6 +1392,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-uadd.mscx b/src/engraving/tests/parts_data/part-measure-repeat-uadd.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-uadd.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-uadd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-udel.mscx b/src/engraving/tests/parts_data/part-measure-repeat-udel.mscx index 1002095fa1b3d..b164e7a7bdd41 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-udel.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-udel.mscx @@ -113,6 +113,7 @@ G G + 1 @@ -466,6 +467,7 @@ G8vb G8vb + 1 @@ -876,6 +878,7 @@ G G + 1 @@ -1332,6 +1335,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-uradd.mscx b/src/engraving/tests/parts_data/part-measure-repeat-uradd.mscx index 1e3f8d04640d4..0cc9d490a9eda 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-uradd.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-uradd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -456,6 +457,7 @@ G8vb G8vb + 1 @@ -853,6 +855,7 @@ G G + 1 @@ -1304,6 +1307,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat-urdel.mscx b/src/engraving/tests/parts_data/part-measure-repeat-urdel.mscx index 1d83beff3edb5..c781bec1a2c42 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat-urdel.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat-urdel.mscx @@ -113,6 +113,7 @@ G G + 1 @@ -461,6 +462,7 @@ G8vb G8vb + 1 @@ -871,6 +873,7 @@ G G + 1 @@ -1333,6 +1336,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-measure-repeat.mscx b/src/engraving/tests/parts_data/part-measure-repeat.mscx index 6abe04dd4c17f..b124e683d41d6 100644 --- a/src/engraving/tests/parts_data/part-measure-repeat.mscx +++ b/src/engraving/tests/parts_data/part-measure-repeat.mscx @@ -111,6 +111,7 @@ G G + 1 4 @@ -429,6 +430,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/part-symbol-add.mscx b/src/engraving/tests/parts_data/part-symbol-add.mscx index e991271cac79c..01e146de4d11c 100644 --- a/src/engraving/tests/parts_data/part-symbol-add.mscx +++ b/src/engraving/tests/parts_data/part-symbol-add.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-symbol-del.mscx b/src/engraving/tests/parts_data/part-symbol-del.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-symbol-del.mscx +++ b/src/engraving/tests/parts_data/part-symbol-del.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-symbol-parts.mscx b/src/engraving/tests/parts_data/part-symbol-parts.mscx index bd22f02c85ece..963d368bcbee5 100644 --- a/src/engraving/tests/parts_data/part-symbol-parts.mscx +++ b/src/engraving/tests/parts_data/part-symbol-parts.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -842,6 +844,7 @@ G G + 1 @@ -1292,6 +1295,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-symbol-uadd.mscx b/src/engraving/tests/parts_data/part-symbol-uadd.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-symbol-uadd.mscx +++ b/src/engraving/tests/parts_data/part-symbol-uadd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-symbol-udel.mscx b/src/engraving/tests/parts_data/part-symbol-udel.mscx index 1d244ed653d93..411aa427965e3 100644 --- a/src/engraving/tests/parts_data/part-symbol-udel.mscx +++ b/src/engraving/tests/parts_data/part-symbol-udel.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-symbol-uradd.mscx b/src/engraving/tests/parts_data/part-symbol-uradd.mscx index e991271cac79c..01e146de4d11c 100644 --- a/src/engraving/tests/parts_data/part-symbol-uradd.mscx +++ b/src/engraving/tests/parts_data/part-symbol-uradd.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -446,6 +447,7 @@ G8vb G8vb + 1 @@ -843,6 +845,7 @@ G G + 1 @@ -1294,6 +1297,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-symbol-urdel.mscx b/src/engraving/tests/parts_data/part-symbol-urdel.mscx index 95417cbf0eb86..afd6a86185cbb 100644 --- a/src/engraving/tests/parts_data/part-symbol-urdel.mscx +++ b/src/engraving/tests/parts_data/part-symbol-urdel.mscx @@ -111,6 +111,7 @@ G G + 1 @@ -442,6 +443,7 @@ G8vb G8vb + 1 @@ -839,6 +841,7 @@ G G + 1 @@ -1285,6 +1288,7 @@ G8vb G8vb + 1 diff --git a/src/engraving/tests/parts_data/part-symbol.mscx b/src/engraving/tests/parts_data/part-symbol.mscx index 98610ea1b4da4..247e0bd0a8f3c 100644 --- a/src/engraving/tests/parts_data/part-symbol.mscx +++ b/src/engraving/tests/parts_data/part-symbol.mscx @@ -109,6 +109,7 @@ G G + 1 4 @@ -402,6 +403,7 @@ G8vb G8vb + 1 4 diff --git a/src/engraving/tests/parts_data/partStyle-score-ref.mscx b/src/engraving/tests/parts_data/partStyle-score-ref.mscx index 0ee3f2c72551a..a5d7434bb10c2 100644 --- a/src/engraving/tests/parts_data/partStyle-score-ref.mscx +++ b/src/engraving/tests/parts_data/partStyle-score-ref.mscx @@ -115,6 +115,7 @@ G G + 1 @@ -231,6 +232,7 @@ G G + 1 @@ -378,6 +380,7 @@ G G + 1 @@ -584,6 +587,7 @@ G G + 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 79ca87259f3d6..3413d2e33eb04 100644 --- a/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx +++ b/src/engraving/tests/parts_data/partStyle-score-reload-ref.mscx @@ -112,6 +112,7 @@ G G + 1 @@ -227,6 +228,7 @@ G G + 1 @@ -372,6 +374,7 @@ G G + 1 @@ -569,6 +572,7 @@ G G + 1 diff --git a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete03-ref.mscx b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete03-ref.mscx index 3c0432158610f..bc0c5fbf4e23f 100644 --- a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete03-ref.mscx +++ b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete03-ref.mscx @@ -85,6 +85,7 @@ G G + 1 4 diff --git a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete04-ref.mscx b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete04-ref.mscx index 2ad962becc1e3..a4453e387e83e 100644 --- a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete04-ref.mscx +++ b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete04-ref.mscx @@ -85,6 +85,7 @@ G G + 1 4 diff --git a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete05-ref.mscx b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete05-ref.mscx index c24a509d13223..ba5a5818f9f75 100644 --- a/src/engraving/tests/selectionrangedelete_data/selectionrangedelete05-ref.mscx +++ b/src/engraving/tests/selectionrangedelete_data/selectionrangedelete05-ref.mscx @@ -88,6 +88,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split01-ref.mscx b/src/engraving/tests/split_data/split01-ref.mscx index 09b11e5b40982..dbab3b5ddb341 100644 --- a/src/engraving/tests/split_data/split01-ref.mscx +++ b/src/engraving/tests/split_data/split01-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split02-ref.mscx b/src/engraving/tests/split_data/split02-ref.mscx index ff420c99a94f3..0d408d84ea843 100644 --- a/src/engraving/tests/split_data/split02-ref.mscx +++ b/src/engraving/tests/split_data/split02-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split03-ref.mscx b/src/engraving/tests/split_data/split03-ref.mscx index 1965bb1f8e53d..6dca8e50df52b 100644 --- a/src/engraving/tests/split_data/split03-ref.mscx +++ b/src/engraving/tests/split_data/split03-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split04-ref.mscx b/src/engraving/tests/split_data/split04-ref.mscx index 8065c84ff2b53..511c4520bb8b3 100644 --- a/src/engraving/tests/split_data/split04-ref.mscx +++ b/src/engraving/tests/split_data/split04-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split05-ref.mscx b/src/engraving/tests/split_data/split05-ref.mscx index 3aacff55f6770..75fc3278666c8 100644 --- a/src/engraving/tests/split_data/split05-ref.mscx +++ b/src/engraving/tests/split_data/split05-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split06-ref.mscx b/src/engraving/tests/split_data/split06-ref.mscx index 7b4ed47f4c643..830ba35924bde 100644 --- a/src/engraving/tests/split_data/split06-ref.mscx +++ b/src/engraving/tests/split_data/split06-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split07-ref.mscx b/src/engraving/tests/split_data/split07-ref.mscx index 6e07a57be060f..91cb5938a9881 100644 --- a/src/engraving/tests/split_data/split07-ref.mscx +++ b/src/engraving/tests/split_data/split07-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split08-ref.mscx b/src/engraving/tests/split_data/split08-ref.mscx index 948a885d5326f..cd75921f24c13 100644 --- a/src/engraving/tests/split_data/split08-ref.mscx +++ b/src/engraving/tests/split_data/split08-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/split_data/split295207-ref.mscx b/src/engraving/tests/split_data/split295207-ref.mscx index 8c3b14fb2910e..a8792fcc8120e 100644 --- a/src/engraving/tests/split_data/split295207-ref.mscx +++ b/src/engraving/tests/split_data/split295207-ref.mscx @@ -74,6 +74,7 @@ G G + 1 4 diff --git a/src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx b/src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx index 691f64e8c20c4..9226c9d222e18 100644 --- a/src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx +++ b/src/engraving/tests/splitstaff_data/splitstaff01-ref.mscx @@ -83,6 +83,7 @@ G G + 1 4 @@ -145,6 +146,7 @@ F F + 1 0 @@ -198,6 +200,7 @@ F F + 1 4 diff --git a/src/engraving/tests/splitstaff_data/splitstaff02-ref.mscx b/src/engraving/tests/splitstaff_data/splitstaff02-ref.mscx index 01c3b3f78bb85..485601ce41048 100644 --- a/src/engraving/tests/splitstaff_data/splitstaff02-ref.mscx +++ b/src/engraving/tests/splitstaff_data/splitstaff02-ref.mscx @@ -68,6 +68,7 @@ G G + 1 4 @@ -108,6 +109,7 @@ F F + 1 0 diff --git a/src/engraving/tests/splitstaff_data/splitstaff03-ref.mscx b/src/engraving/tests/splitstaff_data/splitstaff03-ref.mscx index 13acde0bd1a5a..11abc618cb563 100644 --- a/src/engraving/tests/splitstaff_data/splitstaff03-ref.mscx +++ b/src/engraving/tests/splitstaff_data/splitstaff03-ref.mscx @@ -242,6 +242,7 @@ F F + 1 0 diff --git a/src/engraving/tests/splitstaff_data/splitstaff04-ref.mscx b/src/engraving/tests/splitstaff_data/splitstaff04-ref.mscx index 7c1070be036e5..d3a265fca1843 100644 --- a/src/engraving/tests/splitstaff_data/splitstaff04-ref.mscx +++ b/src/engraving/tests/splitstaff_data/splitstaff04-ref.mscx @@ -82,6 +82,7 @@ G G + 1 3 @@ -127,6 +128,7 @@ F F + 1 0 diff --git a/src/engraving/tests/splitstaff_data/splitstaff05-ref.mscx b/src/engraving/tests/splitstaff_data/splitstaff05-ref.mscx index 98d1340f93260..1d3f6f90dd369 100644 --- a/src/engraving/tests/splitstaff_data/splitstaff05-ref.mscx +++ b/src/engraving/tests/splitstaff_data/splitstaff05-ref.mscx @@ -82,6 +82,7 @@ G G + 1 3 @@ -129,6 +130,7 @@ F F + 1 0 diff --git a/src/engraving/tests/splitstaff_data/splitstaff06-ref.mscx b/src/engraving/tests/splitstaff_data/splitstaff06-ref.mscx index 4a9c19b9fe068..b4d60d206f406 100644 --- a/src/engraving/tests/splitstaff_data/splitstaff06-ref.mscx +++ b/src/engraving/tests/splitstaff_data/splitstaff06-ref.mscx @@ -68,6 +68,7 @@ G G + 1 4 @@ -209,6 +210,7 @@ F F + 1 0 diff --git a/src/engraving/tests/timesig_data/timesig-02-ref.mscx b/src/engraving/tests/timesig_data/timesig-02-ref.mscx index 116675404bf79..e600dfc0e0b64 100644 --- a/src/engraving/tests/timesig_data/timesig-02-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig-02-ref.mscx @@ -81,6 +81,7 @@ G G + 1 4 @@ -134,6 +135,7 @@ F F + 1 4 diff --git a/src/engraving/tests/timesig_data/timesig-03-ref.mscx b/src/engraving/tests/timesig_data/timesig-03-ref.mscx index 30e2c54428b6e..fe546ca55c6ec 100644 --- a/src/engraving/tests/timesig_data/timesig-03-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig-03-ref.mscx @@ -66,6 +66,7 @@ G G + 1 4 diff --git a/src/engraving/tests/timesig_data/timesig-06-ref.mscx b/src/engraving/tests/timesig_data/timesig-06-ref.mscx index f46c80828a175..a0d7b674fa0d4 100644 --- a/src/engraving/tests/timesig_data/timesig-06-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig-06-ref.mscx @@ -76,6 +76,7 @@ G G + 1 5 diff --git a/src/engraving/tests/timesig_data/timesig-07-ref.mscx b/src/engraving/tests/timesig_data/timesig-07-ref.mscx index acef6525ea41c..0106d32a09dec 100644 --- a/src/engraving/tests/timesig_data/timesig-07-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig-07-ref.mscx @@ -76,6 +76,7 @@ G G + 1 3 diff --git a/src/engraving/tests/timesig_data/timesig01-ref.mscx b/src/engraving/tests/timesig_data/timesig01-ref.mscx index ea20cc01cb1df..b460c43b84ac2 100644 --- a/src/engraving/tests/timesig_data/timesig01-ref.mscx +++ b/src/engraving/tests/timesig_data/timesig01-ref.mscx @@ -73,6 +73,7 @@ G G + 1 4 diff --git a/src/engraving/tests/transpose_data/undoDiatonicTranspose01-ref.mscx b/src/engraving/tests/transpose_data/undoDiatonicTranspose01-ref.mscx index 68e1406e87693..208e512905a24 100644 --- a/src/engraving/tests/transpose_data/undoDiatonicTranspose01-ref.mscx +++ b/src/engraving/tests/transpose_data/undoDiatonicTranspose01-ref.mscx @@ -70,6 +70,7 @@ G G + 1 4 @@ -222,6 +223,7 @@ F F + 1 4 diff --git a/src/engraving/tests/transpose_data/undoDiatonicTranspose02-ref.mscx b/src/engraving/tests/transpose_data/undoDiatonicTranspose02-ref.mscx index 244cff4dcd133..f029d1c9da49f 100644 --- a/src/engraving/tests/transpose_data/undoDiatonicTranspose02-ref.mscx +++ b/src/engraving/tests/transpose_data/undoDiatonicTranspose02-ref.mscx @@ -70,6 +70,7 @@ G G + 1 4 @@ -222,6 +223,7 @@ F F + 1 4 diff --git a/src/engraving/tests/transpose_data/undoTranspose01-ref.mscx b/src/engraving/tests/transpose_data/undoTranspose01-ref.mscx index 70d7ff2cc3c4b..85df03182f851 100644 --- a/src/engraving/tests/transpose_data/undoTranspose01-ref.mscx +++ b/src/engraving/tests/transpose_data/undoTranspose01-ref.mscx @@ -64,6 +64,7 @@ G G + 1 2 @@ -333,6 +334,7 @@ F F + 1 2 diff --git a/src/engraving/tests/transpose_data/undoTranspose02-ref.mscx b/src/engraving/tests/transpose_data/undoTranspose02-ref.mscx index dd1f01c27a46c..7e0568c843412 100644 --- a/src/engraving/tests/transpose_data/undoTranspose02-ref.mscx +++ b/src/engraving/tests/transpose_data/undoTranspose02-ref.mscx @@ -64,6 +64,7 @@ G G + 1 4 @@ -330,6 +331,7 @@ F F + 1 4 diff --git a/src/engraving/tests/tuplet_data/tuplet1-ref.mscx b/src/engraving/tests/tuplet_data/tuplet1-ref.mscx index 216a6850e0134..d58657cc50124 100644 --- a/src/engraving/tests/tuplet_data/tuplet1-ref.mscx +++ b/src/engraving/tests/tuplet_data/tuplet1-ref.mscx @@ -63,6 +63,7 @@ G G + 1 4 diff --git a/src/importexport/capella/tests/data/test1.cap-ref.mscx b/src/importexport/capella/tests/data/test1.cap-ref.mscx index 708ce07283b76..3d43b4f2bbe13 100644 --- a/src/importexport/capella/tests/data/test1.cap-ref.mscx +++ b/src/importexport/capella/tests/data/test1.cap-ref.mscx @@ -51,6 +51,7 @@ G G + 1 4 @@ -158,6 +159,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/test1.capx-ref.mscx b/src/importexport/capella/tests/data/test1.capx-ref.mscx index e40d88bfaabd0..5dc9408782a9e 100644 --- a/src/importexport/capella/tests/data/test1.capx-ref.mscx +++ b/src/importexport/capella/tests/data/test1.capx-ref.mscx @@ -51,6 +51,7 @@ G G + 1 quarter @@ -154,6 +155,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/test2.cap-ref.mscx b/src/importexport/capella/tests/data/test2.cap-ref.mscx index 898d52c8d1588..6f296d5ca9705 100644 --- a/src/importexport/capella/tests/data/test2.cap-ref.mscx +++ b/src/importexport/capella/tests/data/test2.cap-ref.mscx @@ -51,6 +51,7 @@ F F + 1 4 @@ -190,6 +191,7 @@ F F + 1 quarter diff --git a/src/importexport/capella/tests/data/test2.capx-ref.mscx b/src/importexport/capella/tests/data/test2.capx-ref.mscx index 2382ad31efd20..316dd889b087b 100644 --- a/src/importexport/capella/tests/data/test2.capx-ref.mscx +++ b/src/importexport/capella/tests/data/test2.capx-ref.mscx @@ -51,6 +51,7 @@ F F + 1 quarter @@ -186,6 +187,7 @@ F F + 1 quarter diff --git a/src/importexport/capella/tests/data/test3.cap-ref.mscx b/src/importexport/capella/tests/data/test3.cap-ref.mscx index 4dcad45938a52..b5306af0daf93 100644 --- a/src/importexport/capella/tests/data/test3.cap-ref.mscx +++ b/src/importexport/capella/tests/data/test3.cap-ref.mscx @@ -51,6 +51,7 @@ G G + 1 -1 @@ -164,6 +165,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/test3.capx-ref.mscx b/src/importexport/capella/tests/data/test3.capx-ref.mscx index 7df7206c9796c..e404d8dbec293 100644 --- a/src/importexport/capella/tests/data/test3.capx-ref.mscx +++ b/src/importexport/capella/tests/data/test3.capx-ref.mscx @@ -51,6 +51,7 @@ G G + 1 -1 @@ -164,6 +165,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/test4.cap-ref.mscx b/src/importexport/capella/tests/data/test4.cap-ref.mscx index f84c1add8d8eb..ac55765d4a4b2 100644 --- a/src/importexport/capella/tests/data/test4.cap-ref.mscx +++ b/src/importexport/capella/tests/data/test4.cap-ref.mscx @@ -51,6 +51,7 @@ G G + 1 4 diff --git a/src/importexport/capella/tests/data/test4.capx-ref.mscx b/src/importexport/capella/tests/data/test4.capx-ref.mscx index 40d758b21f895..28aa41c016ce3 100644 --- a/src/importexport/capella/tests/data/test4.capx-ref.mscx +++ b/src/importexport/capella/tests/data/test4.capx-ref.mscx @@ -51,6 +51,7 @@ G G + 1 4 diff --git a/src/importexport/capella/tests/data/test5.cap-ref.mscx b/src/importexport/capella/tests/data/test5.cap-ref.mscx index 567b4216c34a0..02aab1ddc3e33 100644 --- a/src/importexport/capella/tests/data/test5.cap-ref.mscx +++ b/src/importexport/capella/tests/data/test5.cap-ref.mscx @@ -51,6 +51,7 @@ G G + 1 1 @@ -167,6 +168,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/test5.capx-ref.mscx b/src/importexport/capella/tests/data/test5.capx-ref.mscx index a710ce692fd80..1d3c63508163a 100644 --- a/src/importexport/capella/tests/data/test5.capx-ref.mscx +++ b/src/importexport/capella/tests/data/test5.capx-ref.mscx @@ -51,6 +51,7 @@ G G + 1 1 @@ -167,6 +168,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/test6.cap-ref.mscx b/src/importexport/capella/tests/data/test6.cap-ref.mscx index 61208f05797cf..40bd7bb248135 100644 --- a/src/importexport/capella/tests/data/test6.cap-ref.mscx +++ b/src/importexport/capella/tests/data/test6.cap-ref.mscx @@ -51,6 +51,7 @@ G G + 1 2 @@ -173,6 +174,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/test6.capx-ref.mscx b/src/importexport/capella/tests/data/test6.capx-ref.mscx index 1c23d53c2832b..f10f323565e6e 100644 --- a/src/importexport/capella/tests/data/test6.capx-ref.mscx +++ b/src/importexport/capella/tests/data/test6.capx-ref.mscx @@ -51,6 +51,7 @@ G G + 1 2 @@ -173,6 +174,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/test7.cap-ref.mscx b/src/importexport/capella/tests/data/test7.cap-ref.mscx index 24f1b98f5b263..1421fbf7e3d35 100644 --- a/src/importexport/capella/tests/data/test7.cap-ref.mscx +++ b/src/importexport/capella/tests/data/test7.cap-ref.mscx @@ -51,6 +51,7 @@ G G + 1 3 @@ -204,6 +205,7 @@ G G + 1 5 @@ -353,6 +355,7 @@ G G + 1 7 @@ -502,6 +505,7 @@ G G + 1 -3 @@ -651,6 +655,7 @@ G G + 1 -5 @@ -803,6 +808,7 @@ G G + 1 -7 diff --git a/src/importexport/capella/tests/data/test8.cap-ref.mscx b/src/importexport/capella/tests/data/test8.cap-ref.mscx index 9e567738301c0..0200a44f22c1c 100644 --- a/src/importexport/capella/tests/data/test8.cap-ref.mscx +++ b/src/importexport/capella/tests/data/test8.cap-ref.mscx @@ -51,6 +51,7 @@ G G + 1 4 @@ -210,6 +211,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/testEmptyStaff1.capx-ref.mscx b/src/importexport/capella/tests/data/testEmptyStaff1.capx-ref.mscx index 18e48ef6657f0..0d0408e321c9a 100644 --- a/src/importexport/capella/tests/data/testEmptyStaff1.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testEmptyStaff1.capx-ref.mscx @@ -79,6 +79,7 @@ G G + 1 whole @@ -97,6 +98,7 @@ G G + 1 whole @@ -114,6 +116,7 @@ G G + 1 whole @@ -129,6 +132,7 @@ G G + 1 whole @@ -144,6 +148,7 @@ G G + 1 whole diff --git a/src/importexport/capella/tests/data/testEmptyStaff2.capx-ref.mscx b/src/importexport/capella/tests/data/testEmptyStaff2.capx-ref.mscx index 22243cc98f5c5..72a97801dda86 100644 --- a/src/importexport/capella/tests/data/testEmptyStaff2.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testEmptyStaff2.capx-ref.mscx @@ -83,6 +83,7 @@ G G + 1 1 @@ -101,6 +102,7 @@ G G + 1 3 @@ -121,6 +123,7 @@ G G + 1 1 diff --git a/src/importexport/capella/tests/data/testPianoG4G5.capx-ref.mscx b/src/importexport/capella/tests/data/testPianoG4G5.capx-ref.mscx index 7cf399357763d..5ede7e59ff39d 100644 --- a/src/importexport/capella/tests/data/testPianoG4G5.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testPianoG4G5.capx-ref.mscx @@ -68,6 +68,7 @@ G G + 1 quarter @@ -85,6 +86,7 @@ F F + 1 quarter diff --git a/src/importexport/capella/tests/data/testScaleC4C5.capx-ref.mscx b/src/importexport/capella/tests/data/testScaleC4C5.capx-ref.mscx index ac39c614aeb33..2fcd8043aafdc 100644 --- a/src/importexport/capella/tests/data/testScaleC4C5.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testScaleC4C5.capx-ref.mscx @@ -51,6 +51,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/testSlurTie.capx-ref.mscx b/src/importexport/capella/tests/data/testSlurTie.capx-ref.mscx index 639fb716d329e..1fd91b9bc1013 100644 --- a/src/importexport/capella/tests/data/testSlurTie.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testSlurTie.capx-ref.mscx @@ -54,6 +54,7 @@ G G + 1 4 diff --git a/src/importexport/capella/tests/data/testText1.capx-ref.mscx b/src/importexport/capella/tests/data/testText1.capx-ref.mscx index f90befdc14169..2b809fe09d335 100644 --- a/src/importexport/capella/tests/data/testText1.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testText1.capx-ref.mscx @@ -51,6 +51,7 @@ G G + 1 4 diff --git a/src/importexport/capella/tests/data/testTuplet1.capx-ref.mscx b/src/importexport/capella/tests/data/testTuplet1.capx-ref.mscx index 308fefe10ff39..323b55dd2c8ef 100644 --- a/src/importexport/capella/tests/data/testTuplet1.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testTuplet1.capx-ref.mscx @@ -51,6 +51,7 @@ G G + 1 quarter diff --git a/src/importexport/capella/tests/data/testTuplet2.cap-ref.mscx b/src/importexport/capella/tests/data/testTuplet2.cap-ref.mscx index 290c1e942097d..10117f96caac1 100644 --- a/src/importexport/capella/tests/data/testTuplet2.cap-ref.mscx +++ b/src/importexport/capella/tests/data/testTuplet2.cap-ref.mscx @@ -54,6 +54,7 @@ G G + 1 4 @@ -125,6 +126,7 @@ G G + 1 quarter @@ -199,6 +201,7 @@ G G + 1 quarter @@ -294,6 +297,7 @@ G G + 1 quarter @@ -396,6 +400,7 @@ G G + 1 quarter @@ -484,6 +489,7 @@ G G + 1 12 @@ -557,6 +563,7 @@ G G + 1 3 @@ -648,6 +655,7 @@ G G + 1 6 @@ -753,6 +761,7 @@ G G + 1 6 @@ -872,6 +881,7 @@ G G + 1 12 @@ -1049,6 +1059,7 @@ G G + 1 4 @@ -1176,6 +1187,7 @@ G G + 1 8 @@ -1303,6 +1315,7 @@ G G + 1 8 @@ -1451,6 +1464,7 @@ G G + 1 8 diff --git a/src/importexport/capella/tests/data/testTuplet2.capx-ref.mscx b/src/importexport/capella/tests/data/testTuplet2.capx-ref.mscx index 4efd4baf98cfe..85ac02657a4d4 100644 --- a/src/importexport/capella/tests/data/testTuplet2.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testTuplet2.capx-ref.mscx @@ -54,6 +54,7 @@ G G + 1 4 @@ -125,6 +126,7 @@ G G + 1 quarter @@ -199,6 +201,7 @@ G G + 1 quarter @@ -294,6 +297,7 @@ G G + 1 quarter @@ -396,6 +400,7 @@ G G + 1 quarter @@ -484,6 +489,7 @@ G G + 1 12 @@ -557,6 +563,7 @@ G G + 1 3 @@ -648,6 +655,7 @@ G G + 1 6 @@ -753,6 +761,7 @@ G G + 1 6 @@ -872,6 +881,7 @@ G G + 1 12 @@ -1049,6 +1059,7 @@ G G + 1 4 @@ -1176,6 +1187,7 @@ G G + 1 8 @@ -1303,6 +1315,7 @@ G G + 1 8 @@ -1451,6 +1464,7 @@ G G + 1 8 diff --git a/src/importexport/capella/tests/data/testVolta1.capx-ref.mscx b/src/importexport/capella/tests/data/testVolta1.capx-ref.mscx index 541abf76e69a2..b8f59e79b85fd 100644 --- a/src/importexport/capella/tests/data/testVolta1.capx-ref.mscx +++ b/src/importexport/capella/tests/data/testVolta1.capx-ref.mscx @@ -53,6 +53,7 @@ G8vb G8vb + 1 4 diff --git a/src/importexport/guitarpro/tests/data/bend.gp3-ref.mscx b/src/importexport/guitarpro/tests/data/bend.gp3-ref.mscx index 6ecf0346764ef..01c9e8c54286a 100644 --- a/src/importexport/guitarpro/tests/data/bend.gp3-ref.mscx +++ b/src/importexport/guitarpro/tests/data/bend.gp3-ref.mscx @@ -79,6 +79,7 @@ G8vb G8vb + 1 4 diff --git a/src/importexport/guitarpro/tests/data/capo-fret.gp3-ref.mscx b/src/importexport/guitarpro/tests/data/capo-fret.gp3-ref.mscx index b37c0d63c0fea..97c004189a942 100644 --- a/src/importexport/guitarpro/tests/data/capo-fret.gp3-ref.mscx +++ b/src/importexport/guitarpro/tests/data/capo-fret.gp3-ref.mscx @@ -86,6 +86,7 @@ G8vb G8vb + 1 4 diff --git a/src/importexport/guitarpro/tests/data/copyright.gp3-ref.mscx b/src/importexport/guitarpro/tests/data/copyright.gp3-ref.mscx index 4e93fd8f8ad44..9fbad09d01525 100644 --- a/src/importexport/guitarpro/tests/data/copyright.gp3-ref.mscx +++ b/src/importexport/guitarpro/tests/data/copyright.gp3-ref.mscx @@ -79,6 +79,7 @@ G8vb G8vb + 1 4 diff --git a/src/importexport/guitarpro/tests/data/dotted-gliss.gp3-ref.mscx b/src/importexport/guitarpro/tests/data/dotted-gliss.gp3-ref.mscx index 379a4b7cb0daf..cf744fb49256c 100644 --- a/src/importexport/guitarpro/tests/data/dotted-gliss.gp3-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dotted-gliss.gp3-ref.mscx @@ -97,6 +97,7 @@ Innuendo G8vb G8vb + 1 12 diff --git a/src/importexport/guitarpro/tests/data/ghost_note.gp3-ref.mscx b/src/importexport/guitarpro/tests/data/ghost_note.gp3-ref.mscx index c7834225b3259..8bea88a38681f 100644 --- a/src/importexport/guitarpro/tests/data/ghost_note.gp3-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ghost_note.gp3-ref.mscx @@ -77,6 +77,7 @@ F8vb F8vb + 1 4 diff --git a/src/importexport/guitarpro/tests/data/tempo.gp3-ref.mscx b/src/importexport/guitarpro/tests/data/tempo.gp3-ref.mscx index bd9788da075d2..c73ec4f3199d0 100644 --- a/src/importexport/guitarpro/tests/data/tempo.gp3-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tempo.gp3-ref.mscx @@ -79,6 +79,7 @@ G8vb G8vb + 1 4 diff --git a/src/importexport/guitarpro/tests/data/volta.gp3-ref.mscx b/src/importexport/guitarpro/tests/data/volta.gp3-ref.mscx index 39e10f5b2ab1b..7f12f64f26a86 100644 --- a/src/importexport/guitarpro/tests/data/volta.gp3-ref.mscx +++ b/src/importexport/guitarpro/tests/data/volta.gp3-ref.mscx @@ -87,6 +87,7 @@ G8vb G8vb + 1 4 diff --git a/src/importexport/musicxml/tests/data/testDurationLargeError_ref.mscx b/src/importexport/musicxml/tests/data/testDurationLargeError_ref.mscx index b96bae17b1289..ef1661bba6140 100644 --- a/src/importexport/musicxml/tests/data/testDurationLargeError_ref.mscx +++ b/src/importexport/musicxml/tests/data/testDurationLargeError_ref.mscx @@ -105,6 +105,7 @@ G G + 1 4 diff --git a/src/importexport/musicxml/tests/data/testDurationRoundingError_ref.mscx b/src/importexport/musicxml/tests/data/testDurationRoundingError_ref.mscx index e5fc89fdb7900..eabc04055b7be 100644 --- a/src/importexport/musicxml/tests/data/testDurationRoundingError_ref.mscx +++ b/src/importexport/musicxml/tests/data/testDurationRoundingError_ref.mscx @@ -113,6 +113,7 @@ G8vb G8vb + 1 2 diff --git a/src/importexport/musicxml/tests/data/testMeasureStyleSlash_ref.mscx b/src/importexport/musicxml/tests/data/testMeasureStyleSlash_ref.mscx index 6f8514dc06a94..811ccb62699dc 100644 --- a/src/importexport/musicxml/tests/data/testMeasureStyleSlash_ref.mscx +++ b/src/importexport/musicxml/tests/data/testMeasureStyleSlash_ref.mscx @@ -120,6 +120,7 @@ G G + 1 4 diff --git a/src/importexport/musicxml/tests/data/testSystemBrackets3_ref.mscx b/src/importexport/musicxml/tests/data/testSystemBrackets3_ref.mscx index 8df32230f2a19..93f4d96fad991 100644 --- a/src/importexport/musicxml/tests/data/testSystemBrackets3_ref.mscx +++ b/src/importexport/musicxml/tests/data/testSystemBrackets3_ref.mscx @@ -544,6 +544,7 @@ Gtr. G G + 1 4 @@ -565,6 +566,7 @@ Gtr. G8vb G8vb + 1 4 @@ -586,6 +588,7 @@ Gtr. TAB TAB + 1 4 @@ -604,6 +607,7 @@ Gtr. G8vb G8vb + 1 4 @@ -625,6 +629,7 @@ Gtr. TAB TAB + 1 4 @@ -643,6 +648,7 @@ Gtr. G8vb G8vb + 1 4 @@ -664,6 +670,7 @@ Gtr. TAB TAB + 1 4 @@ -682,6 +689,7 @@ Gtr. G G + 1 4 @@ -703,6 +711,7 @@ Gtr. F F + 1 4 diff --git a/src/importexport/musicxml/tests/data/testUnnecessaryBarlines_ref.mscx b/src/importexport/musicxml/tests/data/testUnnecessaryBarlines_ref.mscx index d1a602a5335eb..a4aa18f3a004f 100644 --- a/src/importexport/musicxml/tests/data/testUnnecessaryBarlines_ref.mscx +++ b/src/importexport/musicxml/tests/data/testUnnecessaryBarlines_ref.mscx @@ -94,6 +94,7 @@ G G + 1 4 diff --git a/src/importexport/musicxml/tests/data/testVoltaHiding_ref.mscx b/src/importexport/musicxml/tests/data/testVoltaHiding_ref.mscx index 5adbe9d2d562f..5c153bba42485 100644 --- a/src/importexport/musicxml/tests/data/testVoltaHiding_ref.mscx +++ b/src/importexport/musicxml/tests/data/testVoltaHiding_ref.mscx @@ -198,6 +198,7 @@ G G + 1 4 @@ -735,6 +736,7 @@ G G + 1 4 @@ -1265,6 +1267,7 @@ F F + 1 4