diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt index d553150e50..7d06a32a78 100644 --- a/libmscore/CMakeLists.txt +++ b/libmscore/CMakeLists.txt @@ -66,7 +66,7 @@ add_library ( synthesizerstate.cpp mcursor.cpp groups.cpp mscoreview.cpp noteline.cpp spannermap.cpp bagpembell.cpp ambitus.cpp keylist.cpp scoreElement.cpp - shape.cpp systemdivider.cpp midimapping.cpp stafflines.cpp pageformat.cpp + shape.cpp systemdivider.cpp midimapping.cpp stafflines.cpp # read114.cpp read206.cpp read300.cpp stafftypelist.cpp stafftypechange.cpp diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp index 0eccf155f3..796ae02dff 100644 --- a/libmscore/layout.cpp +++ b/libmscore/layout.cpp @@ -1406,7 +1406,7 @@ static void checkDivider(bool left, System* s, qreal sdd) } else { divider->rypos() += s->score()->styleD(StyleIdx::dividerRightY) * SPATIUM20; - divider->rxpos() = s->score()->pageFormat()->printableWidth() * DPI - divider->width(); + divider->rxpos() = s->score()->styleD(StyleIdx::pagePrintableWidth) * DPI - divider->width(); divider->rxpos() += s->score()->styleD(StyleIdx::dividerRightX) * SPATIUM20; } divider->adjustReadPos(); @@ -2722,7 +2722,7 @@ System* Score::collectSystem(LayoutContext& lc) qreal minWidth = 0; bool firstMeasure = true; bool createHeader = false; - qreal systemWidth = pageFormat()->printableWidth() * DPI; + qreal systemWidth = styleD(StyleIdx::pagePrintableWidth) * DPI; system->setWidth(systemWidth); while (lc.curMeasure) { // collect measure for system diff --git a/libmscore/mscore.cpp b/libmscore/mscore.cpp index 3e2ee76b44..f56a4a3e71 100644 --- a/libmscore/mscore.cpp +++ b/libmscore/mscore.cpp @@ -57,7 +57,6 @@ #include "excerpt.h" #include "spatium.h" #include "barline.h" -#include "pageformat.h" namespace Ms { @@ -307,6 +306,7 @@ void MScore::init() _defaultStyleForParts.load(&f); } + // // load internal fonts // diff --git a/libmscore/page.cpp b/libmscore/page.cpp index 3badbe261c..9351d29e01 100644 --- a/libmscore/page.cpp +++ b/libmscore/page.cpp @@ -564,8 +564,8 @@ QList Page::elements() qreal Page::tm() const { - const PageFormat* pf = score()->pageFormat(); - return ((!pf->twosided() || isOdd()) ? pf->oddTopMargin() : pf->evenTopMargin()) * DPI; + return ((!score()->styleB(StyleIdx::pageTwosided) || isOdd()) + ? score()->styleD(StyleIdx::pageOddTopMargin) : score()->styleD(StyleIdx::pageEvenTopMargin)) * DPI; } //--------------------------------------------------------- @@ -574,8 +574,8 @@ qreal Page::tm() const qreal Page::bm() const { - const PageFormat* pf = score()->pageFormat(); - return ((!pf->twosided() || isOdd()) ? pf->oddBottomMargin() : pf->evenBottomMargin()) * DPI; + return ((!score()->styleB(StyleIdx::pageTwosided) || isOdd()) + ? score()->styleD(StyleIdx::pageOddBottomMargin) : score()->styleD(StyleIdx::pageEvenBottomMargin)) * DPI; } //--------------------------------------------------------- @@ -584,8 +584,8 @@ qreal Page::bm() const qreal Page::lm() const { - const PageFormat* pf = score()->pageFormat(); - return ((!pf->twosided() || isOdd()) ? pf->oddLeftMargin() : pf->evenLeftMargin()) * DPI; + return ((!score()->styleB(StyleIdx::pageTwosided) || isOdd()) + ? score()->styleD(StyleIdx::pageOddLeftMargin) : score()->styleD(StyleIdx::pageEvenLeftMargin)) * DPI; } //--------------------------------------------------------- @@ -594,8 +594,7 @@ qreal Page::lm() const qreal Page::rm() const { - const PageFormat* pf = score()->pageFormat(); - return ((!pf->twosided() || isOdd()) ? pf->oddRightMargin() : pf->evenRightMargin()) * DPI; + return score()->styleD(StyleIdx::pagePrintableWidth) * DPI - lm(); } //--------------------------------------------------------- diff --git a/libmscore/pageformat.cpp b/libmscore/pageformat.cpp deleted file mode 100644 index ce1b56acee..0000000000 --- a/libmscore/pageformat.cpp +++ /dev/null @@ -1,139 +0,0 @@ -//============================================================================= -// MuseScore -// Music Composition & Notation -// -// Copyright (C) 2002-2011 Werner Schweer -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 -// as published by the Free Software Foundation and appearing in -// the file LICENCE.GPL -//============================================================================= - -#include "pageformat.h" -#include "xml.h" - -namespace Ms { - -//--------------------------------------------------------- -// PageFormat -//--------------------------------------------------------- - -PageFormat::PageFormat() - { - _size = QSizeF(210.0/INCH, 297.0/INCH); // A4 - _evenLeftMargin = 10.0 / INCH; - _oddLeftMargin = 10.0 / INCH; - _printableWidth = _size.width() - 20.0 / INCH; - _evenTopMargin = 10.0 / INCH; - _evenBottomMargin = 20.0 / INCH; - _oddTopMargin = 10.0 / INCH; - _oddBottomMargin = 20.0 / INCH; - _twosided = true; - } - -//--------------------------------------------------------- -// read -// -// -// -// 1 -// -// 28.3465 -// 28.3465 -// 28.3465 -// 56.6929 -// -// -//--------------------------------------------------------- - -void PageFormat::read(XmlReader& e) - { - qreal _oddRightMargin = 0.0; - qreal _evenRightMargin = 0.0; - QString type; - - while (e.readNextStartElement()) { - const QStringRef& tag(e.name()); - if (tag == "page-margins") { - type = e.attribute("type","both"); - qreal lm = 0.0, rm = 0.0, tm = 0.0, bm = 0.0; - while (e.readNextStartElement()) { - const QStringRef& tag(e.name()); - qreal val = e.readDouble() * 0.5 / PPI; - if (tag == "left-margin") - lm = val; - else if (tag == "right-margin") - rm = val; - else if (tag == "top-margin") - tm = val; - else if (tag == "bottom-margin") - bm = val; - else - e.unknown(); - } - _twosided = type == "odd" || type == "even"; - if (type == "odd" || type == "both") { - _oddLeftMargin = lm; - _oddRightMargin = rm; - _oddTopMargin = tm; - _oddBottomMargin = bm; - } - if (type == "even" || type == "both") { - _evenLeftMargin = lm; - _evenRightMargin = rm; - _evenTopMargin = tm; - _evenBottomMargin = bm; - } - } - else if (tag == "page-height") - _size.rheight() = e.readDouble() * 0.5 / PPI; - else if (tag == "page-width") - _size.rwidth() = e.readDouble() * .5 / PPI; - else - e.unknown(); - } - qreal w1 = _size.width() - _oddLeftMargin - _oddRightMargin; - qreal w2 = _size.width() - _evenLeftMargin - _evenRightMargin; - _printableWidth = qMin(w1, w2); // silently adjust right margins - } - -//--------------------------------------------------------- -// write -//--------------------------------------------------------- - -void PageFormat::write(XmlWriter& xml) const - { - xml.stag("page-layout"); - - // convert inch to 1/10 spatium units - // 20 - font design size in point - // SPATIUM = 20/4 - // qreal t = 10 * PPI / (20 / 4); - qreal t = 2 * PPI; - - xml.tag("page-height", _size.height() * t); - xml.tag("page-width", _size.width() * t); - - const char* type = "both"; - if (_twosided) { - type = "even"; - xml.stag(QString("page-margins type=\"%1\"").arg(type)); - xml.tag("left-margin", evenLeftMargin() * t); - xml.tag("right-margin", evenRightMargin() * t); - xml.tag("top-margin", evenTopMargin() * t); - xml.tag("bottom-margin", evenBottomMargin() * t); - xml.etag(); - type = "odd"; - } - xml.stag(QString("page-margins type=\"%1\"").arg(type)); - xml.tag("left-margin", oddLeftMargin() * t); - xml.tag("right-margin", oddRightMargin() * t); - xml.tag("top-margin", oddTopMargin() * t); - xml.tag("bottom-margin", oddBottomMargin() * t); - xml.etag(); - - xml.etag(); - } -} - diff --git a/libmscore/pageformat.h b/libmscore/pageformat.h deleted file mode 100644 index 7d83fb22e1..0000000000 --- a/libmscore/pageformat.h +++ /dev/null @@ -1,74 +0,0 @@ -//============================================================================= -// MuseScore -// Music Composition & Notation -// -// Copyright (C) 2017 Werner Schweer -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 -// as published by the Free Software Foundation and appearing in -// the file LICENCE.GPL -//============================================================================= - -#ifndef __PAGEFORMAT_H__ -#define __PAGEFORMAT_H__ - -#include "config.h" - -namespace Ms { - -class XmlReader; -class XmlWriter; - -//--------------------------------------------------------- -// @@ PageFormat -//--------------------------------------------------------- - -class PageFormat { - QSizeF _size; - qreal _printableWidth; // _width - left margin - right margin - qreal _evenLeftMargin; // values in inch - qreal _oddLeftMargin; - qreal _evenTopMargin; - qreal _evenBottomMargin; - qreal _oddTopMargin; - qreal _oddBottomMargin; - bool _twosided; - - public: - PageFormat(); - - const QSizeF& size() const { return _size; } // size in inch - qreal width() const { return _size.width(); } - qreal height() const { return _size.height(); } - void setSize(const QSizeF& s) { _size = s; } - - void read(XmlReader&); - void write(XmlWriter&) const; - qreal evenLeftMargin() const { return _evenLeftMargin; } - qreal oddLeftMargin() const { return _oddLeftMargin; } - qreal evenTopMargin() const { return _evenTopMargin; } - qreal evenBottomMargin() const { return _evenBottomMargin; } - qreal oddTopMargin() const { return _oddTopMargin; } - qreal oddBottomMargin() const { return _oddBottomMargin; } - qreal printableWidth() const { return _printableWidth; } - - void setEvenLeftMargin(qreal val) { _evenLeftMargin = val; } - void setOddLeftMargin(qreal val) { _oddLeftMargin = val; } - void setEvenTopMargin(qreal val) { _evenTopMargin = val; } - void setEvenBottomMargin(qreal val) { _evenBottomMargin = val; } - void setOddTopMargin(qreal val) { _oddTopMargin = val; } - void setOddBottomMargin(qreal val) { _oddBottomMargin = val; } - void setPrintableWidth(qreal val) { _printableWidth = val; } - - bool twosided() const { return _twosided; } - void setTwosided(bool val) { _twosided = val; } - - // convenience functions - qreal evenRightMargin() const { return _size.width() - _printableWidth - _evenLeftMargin; } - qreal oddRightMargin() const { return _size.width() - _printableWidth - _oddLeftMargin; } - }; - -} // namespace Ms -#endif - diff --git a/libmscore/read206.cpp b/libmscore/read206.cpp index 3273381130..fe89016aba 100644 --- a/libmscore/read206.cpp +++ b/libmscore/read206.cpp @@ -49,6 +49,55 @@ namespace Ms { +//--------------------------------------------------------- +// @@ PageFormat +//--------------------------------------------------------- + +class PageFormat { + QSizeF _size; + qreal _printableWidth; // _width - left margin - right margin + qreal _evenLeftMargin; // values in inch + qreal _oddLeftMargin; + qreal _evenTopMargin; + qreal _evenBottomMargin; + qreal _oddTopMargin; + qreal _oddBottomMargin; + bool _twosided; + + public: + PageFormat(); + + const QSizeF& size() const { return _size; } // size in inch + qreal width() const { return _size.width(); } + qreal height() const { return _size.height(); } + void setSize(const QSizeF& s) { _size = s; } + + void read(XmlReader&); + void write(XmlWriter&) const; + qreal evenLeftMargin() const { return _evenLeftMargin; } + qreal oddLeftMargin() const { return _oddLeftMargin; } + qreal evenTopMargin() const { return _evenTopMargin; } + qreal evenBottomMargin() const { return _evenBottomMargin; } + qreal oddTopMargin() const { return _oddTopMargin; } + qreal oddBottomMargin() const { return _oddBottomMargin; } + qreal printableWidth() const { return _printableWidth; } + + void setEvenLeftMargin(qreal val) { _evenLeftMargin = val; } + void setOddLeftMargin(qreal val) { _oddLeftMargin = val; } + void setEvenTopMargin(qreal val) { _evenTopMargin = val; } + void setEvenBottomMargin(qreal val) { _evenBottomMargin = val; } + void setOddTopMargin(qreal val) { _oddTopMargin = val; } + void setOddBottomMargin(qreal val) { _oddBottomMargin = val; } + void setPrintableWidth(qreal val) { _printableWidth = val; } + + bool twosided() const { return _twosided; } + void setTwosided(bool val) { _twosided = val; } + + // convenience functions + qreal evenRightMargin() const { return _size.width() - _printableWidth - _evenLeftMargin; } + qreal oddRightMargin() const { return _size.width() - _printableWidth - _oddLeftMargin; } + }; + //--------------------------------------------------------- // StyleVal206 //--------------------------------------------------------- @@ -1391,6 +1440,11 @@ static void readStaffContent(Score* score, XmlReader& e) } } } + +//--------------------------------------------------------- +// readStyle +//--------------------------------------------------------- + static void readStyle(MStyle* style, XmlReader& e) { QString oldChordDescriptionFile = style->value(StyleIdx::chordDescriptionFile).toString(); @@ -1416,9 +1470,12 @@ static void readStyle(MStyle* style, XmlReader& e) else if (tag == "Spatium") style->set(StyleIdx::spatium, e.readDouble() * DPMM); else if (tag == "page-layout") { + e.skipCurrentElement(); +#if 0 // TODO PageFormat pf = *style->pageFormat(); pf.read(e); style->setPageFormat(pf); +#endif } else if (tag == "displayInConcertPitch") style->set(StyleIdx::concertPitch, QVariant(bool(e.readInt()))); @@ -1433,11 +1490,8 @@ static void readStyle(MStyle* style, XmlReader& e) } chordListTag = true; } - else { -// QString val(e.readElementText()); -// style->convertToUnit(tag, val); + else style->readProperties(e); - } } // if we just specified a new chord description file @@ -1607,20 +1661,8 @@ static bool readScore(Score* score, XmlReader& e) m->addExcerpt(ex); } } - else if (tag == "PageList") { + else if (tag == "PageList") e.skipCurrentElement(); -#if 0 - while (e.readNextStartElement()) { - if (e.name() == "Page") { - Page* page = new Page(score); - score->pages().append(page); - page->read(e); - } - else - e.unknown(); - } -#endif - } else if (tag == "name") { QString n = e.readElementText(); if (!score->isMaster()) //ignore the name if it's not a child score @@ -1713,6 +1755,72 @@ static bool readScore(Score* score, XmlReader& e) return true; } +//--------------------------------------------------------- +// read +// +// +// +// 1 +// +// 28.3465 +// 28.3465 +// 28.3465 +// 56.6929 +// +// +//--------------------------------------------------------- + +void PageFormat::read(XmlReader& e) + { + qreal _oddRightMargin = 0.0; + qreal _evenRightMargin = 0.0; + QString type; + + while (e.readNextStartElement()) { + const QStringRef& tag(e.name()); + if (tag == "page-margins") { + type = e.attribute("type","both"); + qreal lm = 0.0, rm = 0.0, tm = 0.0, bm = 0.0; + while (e.readNextStartElement()) { + const QStringRef& tag(e.name()); + qreal val = e.readDouble() * 0.5 / PPI; + if (tag == "left-margin") + lm = val; + else if (tag == "right-margin") + rm = val; + else if (tag == "top-margin") + tm = val; + else if (tag == "bottom-margin") + bm = val; + else + e.unknown(); + } + _twosided = type == "odd" || type == "even"; + if (type == "odd" || type == "both") { + _oddLeftMargin = lm; + _oddRightMargin = rm; + _oddTopMargin = tm; + _oddBottomMargin = bm; + } + if (type == "even" || type == "both") { + _evenLeftMargin = lm; + _evenRightMargin = rm; + _evenTopMargin = tm; + _evenBottomMargin = bm; + } + } + else if (tag == "page-height") + _size.rheight() = e.readDouble() * 0.5 / PPI; + else if (tag == "page-width") + _size.rwidth() = e.readDouble() * .5 / PPI; + else + e.unknown(); + } + qreal w1 = _size.width() - _oddLeftMargin - _oddRightMargin; + qreal w2 = _size.width() - _evenLeftMargin - _evenRightMargin; + _printableWidth = qMin(w1, w2); // silently adjust right margins + } + //--------------------------------------------------------- // read206 // import old version > 1.3 and < 2.x files @@ -1720,19 +1828,15 @@ static bool readScore(Score* score, XmlReader& e) Score::FileError MasterScore::read206(XmlReader& e) { + qDebug("read206"); + for (unsigned int i = 0; i < sizeof(style206)/sizeof(*style206); ++i) style().set(style206[i].idx, style206[i].val); // old text style default -#if 0 - TextStyle ts = style().textStyle("Rehearsal Mark"); - ts.setSquare(false); - ts.setFrameRound(20); - style().setTextStyle(ts); - ts = style().textStyle("Dynamics"); - ts.setItalic(false); - style().setTextStyle(ts); -#endif - qDebug("read206"); + style().set(StyleIdx::rehearsalMarkFrameSquare, false); + style().set(StyleIdx::rehearsalMarkFrameRound, 20); + style().set(StyleIdx::dynamicsFontItalic, false); + while (e.readNextStartElement()) { const QStringRef& tag(e.name()); if (tag == "programVersion") { diff --git a/libmscore/score.cpp b/libmscore/score.cpp index fa8740173b..e84967220f 100644 --- a/libmscore/score.cpp +++ b/libmscore/score.cpp @@ -266,24 +266,37 @@ Score::Score(MasterScore* parent) : Score{} { _masterScore = parent; -// TODO -// if (MScore::defaultStyleForParts()) -// style() = *MScore::defaultStyleForParts(); -// else { + QString partStyle = QSettings().value("partStyle").toString(); + if (!partStyle.isEmpty()) + style() = MScore::defaultStyleForParts(); + else { // inherit most style settings from parent style() = parent->style(); // but borrow defaultStyle page layout settings - const PageFormat* pf = MScore::defaultStyle().pageFormat(); - style().setPageFormat(*pf); - style().set(StyleIdx::spatium, MScore::defaultStyle().value(StyleIdx::spatium)); + for (auto i : + { + StyleIdx::pageWidth, + StyleIdx::pageHeight, + StyleIdx::pagePrintableWidth, + StyleIdx::pageEvenLeftMargin, + StyleIdx::pageOddLeftMargin, + StyleIdx::pageEvenTopMargin, + StyleIdx::pageEvenBottomMargin, + StyleIdx::pageOddTopMargin, + StyleIdx::pageOddBottomMargin, + StyleIdx::pageTwosided, + StyleIdx::spatium + } ) { + style().set(i, MScore::defaultStyle().value(i)); + } // and force some style settings that just make sense for parts style().set(StyleIdx::concertPitch, false); style().set(StyleIdx::createMultiMeasureRests, true); style().set(StyleIdx::dividerLeft, false); style().set(StyleIdx::dividerRight, false); -// } + } _synthesizerState = parent->_synthesizerState; } @@ -2421,7 +2434,7 @@ void Score::sortStaves(QList& dst) void Score::cmdConcertPitchChanged(bool flag, bool /*useDoubleSharpsFlats*/) { - undo(new ChangeStyleVal(this, StyleIdx::concertPitch, flag)); // change style flag + undoChangeStyleVal(StyleIdx::concertPitch, flag); // change style flag for (Staff* staff : _staves) { if (staff->staffType(0)->group() == StaffGroup::PERCUSSION) // TODO @@ -3173,7 +3186,7 @@ qreal Score::tempo(int tick) const qreal Score::loWidth() const { - return pageFormat()->size().width() * DPI; + return styleD(StyleIdx::pageWidth) * DPI; } //--------------------------------------------------------- @@ -3182,7 +3195,7 @@ qreal Score::loWidth() const qreal Score::loHeight() const { - return pageFormat()->size().height() * DPI; + return styleD(StyleIdx::pageHeight) * DPI; } //--------------------------------------------------------- @@ -4112,6 +4125,7 @@ void Score::changeVoice(int voice) endCmd(); } +#if 0 //--------------------------------------------------------- // cropPage - crop a single page score to the content /// margins will be applied on the 4 sides @@ -4124,9 +4138,6 @@ void Score::cropPage(qreal margins) if (page) { QRectF ttbox = page->tbbox(); - PageFormat* curFormat = pageFormat(); - PageFormat f = *curFormat; - qreal margin = margins / INCH; f.setSize(QSizeF((ttbox.width() / DPI) + 2 * margin, (ttbox.height()/ DPI) + 2 * margin)); @@ -4144,6 +4155,7 @@ void Score::cropPage(qreal margins) } } } +#endif //--------------------------------------------------------- // getProperty diff --git a/libmscore/score.h b/libmscore/score.h index 7715f86f1c..599418be38 100644 --- a/libmscore/score.h +++ b/libmscore/score.h @@ -62,7 +62,6 @@ class MuseScoreView; class Note; class Omr; class Page; -class PageFormat; class Parameter; class Part; class RepeatList; @@ -606,8 +605,6 @@ class Score : public ScoreElement { void undoChangeInvisible(Element*, bool); void undoChangeBracketSpan(Staff* staff, int column, int span); void undoChangeTuning(Note*, qreal); - void undoChangePageFormat(PageFormat*); - void undoChangePageFormat(PageFormat*, qreal spatium, int); void undoChangeUserMirror(Note*, MScore::DirectionH); void undoChangeKeySig(Staff* ostaff, int tick, KeySigEvent); void undoChangeClef(Staff* ostaff, Segment*, ClefType st); @@ -621,6 +618,7 @@ class Score : public ScoreElement { void undoRemoveBracket(Bracket*); void undoInsertTime(int tick, int len); void undoChangeBarLine(Measure*, BarLineType, bool beginBarLine = false); + void undoChangeStyleVal(StyleIdx idx, const QVariant& v); void setGraceNote(Chord*, int pitch, NoteType type, int len); @@ -802,9 +800,6 @@ class Score : public ScoreElement { qreal spatium() const { return styleD(StyleIdx::spatium); } void setSpatium(qreal v) { style().set(StyleIdx::spatium, v); } - PageFormat* pageFormat() { return style().pageFormat(); } - const PageFormat* pageFormat() const { return style().pageFormat(); } - void setPageFormat(const PageFormat& pf) { style().setPageFormat(pf); } bool genCourtesyTimesig() const { return styleB(StyleIdx::genCourtesyTimesig); } bool genCourtesyClef() const { return styleB(StyleIdx::genCourtesyClef); } @@ -1104,7 +1099,7 @@ class Score : public ScoreElement { QString nextRehearsalMarkText(RehearsalMark* previous, RehearsalMark* current) const; //@ ?? - Q_INVOKABLE void cropPage(qreal margins); +// Q_INVOKABLE void cropPage(qreal margins); bool sanityCheck(const QString& name = QString()); bool checkKeys(); diff --git a/libmscore/style.cpp b/libmscore/style.cpp index f3ff79db27..88e446177a 100644 --- a/libmscore/style.cpp +++ b/libmscore/style.cpp @@ -51,6 +51,17 @@ struct StyleType { #define MM(x) ((x)/INCH) static const StyleType styleTypes[] { + { StyleIdx::pageWidth, "pageWidth", 210.0/INCH }, + { StyleIdx::pageHeight, "pageHeight", 297.0/INCH }, // A4 + { StyleIdx::pagePrintableWidth, "pagePrintableWidth", 190.0/INCH }, + { StyleIdx::pageEvenLeftMargin, "pageEvenLeftMargin", 10.0/INCH }, + { StyleIdx::pageOddLeftMargin, "pageOddLeftMargin", 10.0/INCH }, + { StyleIdx::pageEvenTopMargin, "pageEvenTopMargin", 10.0/INCH }, + { StyleIdx::pageEvenBottomMargin, "pageEvenBottomMargin", 20.0/INCH }, + { StyleIdx::pageOddTopMargin, "pageOddTopMargin", 10.0/INCH }, + { StyleIdx::pageOddBottomMargin, "pageOddBottomMargin", 20.0/INCH }, + { StyleIdx::pageTwosided, "pageTwosided", true }, + { StyleIdx::staffUpperBorder, "staffUpperBorder", Spatium(7.0) }, { StyleIdx::staffLowerBorder, "staffLowerBorder", Spatium(7.0) }, { StyleIdx::staffDistance, "staffDistance", Spatium(6.5) }, @@ -1376,7 +1387,8 @@ void MStyle::load(XmlReader& e) else if (tag == "Spatium") set(StyleIdx::spatium, e.readDouble() * DPMM); else if (tag == "page-layout") - _pageFormat.read(e); + // _pageFormat.read(e); + e.skipCurrentElement(); else if (tag == "displayInConcertPitch") set(StyleIdx::concertPitch, QVariant(bool(e.readInt()))); else if (tag == "ChordList") { @@ -1452,22 +1464,10 @@ void MStyle::save(XmlWriter& xml, bool optimize) _chordList.write(xml); xml.etag(); } -// if (!MScore::saveTemplateMode || (_pageFormat.name() != "A4" && _pageFormat.name() != "Letter")) - if (!MScore::saveTemplateMode) - _pageFormat.write(xml); xml.tag("Spatium", value(StyleIdx::spatium).toDouble() / DPMM); xml.etag(); } -//--------------------------------------------------------- -// setPageFormat -//--------------------------------------------------------- - -void MStyle::setPageFormat(const PageFormat& pf) - { - _pageFormat = pf; - } - #ifndef NDEBUG //--------------------------------------------------------- // checkStyles diff --git a/libmscore/style.h b/libmscore/style.h index e63b8ace43..987d1f092b 100644 --- a/libmscore/style.h +++ b/libmscore/style.h @@ -13,7 +13,6 @@ #ifndef __STYLE_H__ #define __STYLE_H__ -#include "pageformat.h" #include "chordlist.h" namespace Ms { @@ -21,7 +20,6 @@ namespace Ms { enum class P_ID : int; class XmlWriter; struct ChordDescription; -class PageFormat; class Element; //--------------------------------------------------------- @@ -32,6 +30,18 @@ class Element; enum class StyleIdx { NOSTYLE = -1, + + pageWidth, + pageHeight, + pagePrintableWidth, + pageEvenLeftMargin, + pageOddLeftMargin, + pageEvenTopMargin, + pageEvenBottomMargin, + pageOddTopMargin, + pageOddBottomMargin, + pageTwosided, + staffUpperBorder, staffLowerBorder, staffDistance, @@ -724,8 +734,6 @@ class MStyle { std::array _precomputedValues; ChordList _chordList; - PageFormat _pageFormat; - bool _customChordList; // if true, chordlist will be saved as part of score public: @@ -748,10 +756,6 @@ class MStyle { void save(XmlWriter& xml, bool optimize); bool readProperties(XmlReader&); - PageFormat* pageFormat() { return &_pageFormat; } - const PageFormat* pageFormat() const { return &_pageFormat; } - void setPageFormat(const PageFormat& pf); - static const char* valueType(const StyleIdx); static const char* valueName(const StyleIdx); static StyleIdx styleIdx(const QString& name); diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp index 5daae6e49c..62345f3cab 100644 --- a/libmscore/undo.cpp +++ b/libmscore/undo.cpp @@ -402,6 +402,15 @@ void Score::undoPropertyChanged(ScoreElement* e, P_ID t, const QVariant& st) undoStack()->push1(new ChangeProperty(e, t, st)); } +//--------------------------------------------------------- +// undoChangeStyleVal +//--------------------------------------------------------- + +void Score::undoChangeStyleVal(StyleIdx idx, const QVariant& v) + { + undo(new ChangeStyleVal(this, idx, v)); + } + //--------------------------------------------------------- // undoChangeElement //--------------------------------------------------------- @@ -1662,24 +1671,6 @@ void Score::undoChangeUserMirror(Note* n, MScore::DirectionH d) undoChangeProperty(n, P_ID::MIRROR_HEAD, int(d)); } -//--------------------------------------------------------- -// undoChangePageFormat -//--------------------------------------------------------- - -void Score::undoChangePageFormat(PageFormat* p) - { - undoChangePageFormat(p, spatium(), pageNumberOffset()); - } - -//--------------------------------------------------------- -// undoChangePageFormat -//--------------------------------------------------------- - -void Score::undoChangePageFormat(PageFormat* p, qreal v, int pageOffset) - { - undo(new ChangePageFormat(this, p, v, pageOffset)); - } - //--------------------------------------------------------- // undoChangeTpc // TODO-TPC: check @@ -2468,47 +2459,6 @@ void ChangePatch::flip() channel->updateInitList(); } -//--------------------------------------------------------- -// ChangePageFormat -//--------------------------------------------------------- - -ChangePageFormat::ChangePageFormat(Score* cs, PageFormat* p, qreal s, int po) - { - score = cs; - pf = new PageFormat; - *pf = *p; - spatium = s; - pageOffset = po; - } - -ChangePageFormat::~ChangePageFormat() - { - delete pf; - } - -//--------------------------------------------------------- -// flip -//--------------------------------------------------------- - -void ChangePageFormat::flip() - { - PageFormat f = *(score->pageFormat()); - qreal os = score->spatium(); - int po = score->pageNumberOffset(); - - score->setPageFormat(*pf); - if (os != spatium) { - score->setSpatium(spatium); - score->spatiumChanged(os, spatium); - } - score->setPageNumberOffset(pageOffset); - score->setLayoutAll(); - - *pf = f; - spatium = os; - pageOffset = po; - } - //--------------------------------------------------------- // ChangeStaff //--------------------------------------------------------- diff --git a/libmscore/undo.h b/libmscore/undo.h index a41e6c7a62..5137fb3edd 100644 --- a/libmscore/undo.h +++ b/libmscore/undo.h @@ -66,7 +66,6 @@ class Dynamic; class Selection; class Text; struct Channel; -class PageFormat; class TextStyle; class Tuplet; class KeySig; @@ -570,26 +569,6 @@ class ChangePatch : public UndoCommand { UNDO_NAME("ChangePatch") }; -//--------------------------------------------------------- -// ChangePageFormat -//--------------------------------------------------------- - -class ChangePageFormat : public UndoCommand { - Score* score; - PageFormat* pf; - qreal spatium; - int pageOffset; - - void flip(); - - public: - ChangePageFormat(Score*, PageFormat*, qreal sp, int po); - ~ChangePageFormat(); - virtual void undo() { flip(); } - virtual void redo() { flip(); } - UNDO_NAME("ChangePageFormat") - }; - //--------------------------------------------------------- // ChangeStaff //--------------------------------------------------------- @@ -642,37 +621,6 @@ class ChangePart : public UndoCommand { UNDO_NAME("ChangePart") }; -#if 0 -//--------------------------------------------------------- -// ChangeTextStyle -//--------------------------------------------------------- - -class ChangeTextStyle : public UndoCommand { - Score* score; - TextStyle style; - void flip(); - - public: - ChangeTextStyle(Score*, const TextStyle& style); - UNDO_NAME("ChangeTextStyle") - }; - -//--------------------------------------------------------- -// AddTextStyle -//--------------------------------------------------------- - -class AddTextStyle : public UndoCommand { - Score* score; - TextStyle style; - - public: - AddTextStyle(Score* s, const TextStyle& st) : score(s), style(st) {} - virtual void undo(); - virtual void redo(); - UNDO_NAME("AddTextStyle") - }; -#endif - //--------------------------------------------------------- // ChangeStyle //--------------------------------------------------------- diff --git a/mscore/exportxml.cpp b/mscore/exportxml.cpp index 4363212098..a2a96558d5 100644 --- a/mscore/exportxml.cpp +++ b/mscore/exportxml.cpp @@ -1040,6 +1040,7 @@ void ExportMusicXml::calcDivisions() #endif } +#if 0 //--------------------------------------------------------- // writePageFormat //--------------------------------------------------------- @@ -1070,6 +1071,7 @@ static void writePageFormat(const PageFormat* pf, XmlWriter& xml, double convers xml.etag(); } +#endif //--------------------------------------------------------- // defaults @@ -1084,9 +1086,9 @@ static void defaults(XmlWriter& xml, Score* s, double& millimeters, const int& t xml.tag("millimeters", millimeters); xml.tag("tenths", tenths); xml.etag(); - const PageFormat* pf = s->pageFormat(); - if (pf) - writePageFormat(pf, xml, INCH / millimeters * tenths); +//TODO:ws const PageFormat* pf = s->pageFormat(); +// if (pf) +// writePageFormat(pf, xml, INCH / millimeters * tenths); // TODO: also write default system layout here // when exporting only manual or no breaks, system-distance is not written at all @@ -1153,14 +1155,12 @@ void ExportMusicXml::credits(XmlWriter& xml) QString rights = _score->metaTag("copyright"); // determine page formatting - const PageFormat* pf = _score->pageFormat(); - if (!pf) return; - const double h = getTenthsFromInches(pf->size().height()); - const double w = getTenthsFromInches(pf->size().width()); - const double lm = getTenthsFromInches(pf->oddLeftMargin()); - const double rm = getTenthsFromInches(pf->oddRightMargin()); + const double h = getTenthsFromInches(_score->styleD(StyleIdx::pageHeight)); + const double w = getTenthsFromInches(_score->styleD(StyleIdx::pageWidth)); + const double lm = getTenthsFromInches(_score->styleD(StyleIdx::pageOddLeftMargin)); + const double rm = getTenthsFromInches(_score->styleD(StyleIdx::pagePrintableWidth) - _score->styleD(StyleIdx::pageOddLeftMargin)); //const double tm = getTenthsFromInches(pf->oddTopMargin()); - const double bm = getTenthsFromInches(pf->oddBottomMargin()); + const double bm = getTenthsFromInches(_score->styleD(StyleIdx::pageOddBottomMargin)); //qDebug("page h=%g w=%g lm=%g rm=%g tm=%g bm=%g", h, w, lm, rm, tm, bm); // write the credits @@ -2395,8 +2395,7 @@ void ExportMusicXml::chord(Chord* chord, int staff, const std::vector* qDebug(" newtick=%d", tick); #endif - const PageFormat* pf = _score->pageFormat(); - const double pageHeight = getTenthsFromInches(pf->size().height()); + const double pageHeight = getTenthsFromInches(_score->styleD(StyleIdx::pageHeight)); // const double pageWidth = getTenthsFromInches(pf->size().width()); for (Note* note : nl) { @@ -2405,7 +2404,7 @@ void ExportMusicXml::chord(Chord* chord, int staff, const std::vector* attr.doAttr(xml, false); QString noteTag = QString("note"); - if (preferences.musicxmlExportLayout && pf) { + if (preferences.musicxmlExportLayout) { double measureX = getTenthsFromDots(chord->measure()->pagePos().x()); double measureY = pageHeight - getTenthsFromDots(chord->measure()->pagePos().y()); double noteX = getTenthsFromDots(note->pagePos().x()); @@ -4513,11 +4512,11 @@ void ExportMusicXml::print(Measure* m, int idx, int staffCount, int staves) if (doLayout) { xml.stag(QString("print%1").arg(newThing)); - const PageFormat* pf = score()->pageFormat(); - const double pageWidth = getTenthsFromInches(pf->size().width()); - const double lm = getTenthsFromInches(pf->oddLeftMargin()); - const double rm = getTenthsFromInches(pf->oddRightMargin()); - const double tm = getTenthsFromInches(pf->oddTopMargin()); + const double pageWidth = getTenthsFromInches(score()->styleD(StyleIdx::pageWidth)); + const double lm = getTenthsFromInches(score()->styleD(StyleIdx::pageOddLeftMargin)); + const double rm = getTenthsFromInches(score()->styleD(StyleIdx::pageWidth) + - score()->styleD(StyleIdx::pagePrintableWidth) - score()->styleD(StyleIdx::pageOddLeftMargin)); + const double tm = getTenthsFromInches(score()->styleD(StyleIdx::pageOddTopMargin)); // System Layout diff --git a/mscore/file.cpp b/mscore/file.cpp index 94b2e5c9c7..3e86aaa4b6 100644 --- a/mscore/file.cpp +++ b/mscore/file.cpp @@ -1477,12 +1477,10 @@ void MuseScore::printFile() } QPrinter printerDev(QPrinter::HighResolution); - const PageFormat* pf = cs->pageFormat(); - QPageSize ps(QPageSize::id(pf->size(), QPageSize::Inch)); + QSizeF size(cs->styleD(StyleIdx::pageWidth), cs->styleD(StyleIdx::pageHeight)); + QPageSize ps(QPageSize::id(size, QPageSize::Inch)); printerDev.setPageSize(ps); - printerDev.setPageOrientation( - pf->size().width() > pf->size().height() ? QPageLayout::Landscape : QPageLayout::Portrait - ); + printerDev.setPageOrientation(size.width() > size.height() ? QPageLayout::Landscape : QPageLayout::Portrait); printerDev.setCreator("MuseScore Version: " VERSION); printerDev.setFullPage(true); @@ -1899,8 +1897,9 @@ bool MuseScore::savePdf(Score* cs, const QString& saveName) QPdfWriter printerDev(saveName); printerDev.setResolution(preferences.exportPdfDpi); - const PageFormat* pf = cs->pageFormat(); - printerDev.setPageSize(QPageSize(pf->size(), QPageSize::Inch)); + QSizeF size(cs->styleD(StyleIdx::pageWidth), cs->styleD(StyleIdx::pageHeight)); + QPageSize ps(QPageSize::id(size, QPageSize::Inch)); + printerDev.setPageSize(ps); printerDev.setCreator("MuseScore Version: " VERSION); if (!printerDev.setPageMargins(QMarginsF())) @@ -1923,9 +1922,9 @@ bool MuseScore::savePdf(Score* cs, const QString& saveName) p.setRenderHint(QPainter::Antialiasing, true); p.setRenderHint(QPainter::TextAntialiasing, true); - p.setViewport(QRect(0.0, 0.0, pf->size().width() * printerDev.logicalDpiX(), - pf->size().height()*printerDev.logicalDpiY())); - p.setWindow(QRect(0.0, 0.0, pf->size().width() * DPI, pf->size().height() * DPI)); + p.setViewport(QRect(0.0, 0.0, size.width() * printerDev.logicalDpiX(), + size.height()*printerDev.logicalDpiY())); + p.setWindow(QRect(0.0, 0.0, size.width() * DPI, size.height() * DPI)); double pr = MScore::pixelRatio; MScore::pixelRatio = DPI / printerDev.logicalDpiX(); @@ -1955,8 +1954,9 @@ bool MuseScore::savePdf(QList cs, const QString& saveName) QPrinter printerDev(QPrinter::HighResolution); printerDev.setResolution(preferences.exportPdfDpi); - const PageFormat* pf = firstScore->pageFormat(); - printerDev.setPaperSize(pf->size(), QPrinter::Inch); + + QSizeF size(firstScore->styleD(StyleIdx::pageWidth), firstScore->styleD(StyleIdx::pageHeight)); + printerDev.setPaperSize(size, QPrinter::Inch); printerDev.setCreator("MuseScore Version: " VERSION); printerDev.setFullPage(true); @@ -1980,9 +1980,9 @@ bool MuseScore::savePdf(QList cs, const QString& saveName) p.setRenderHint(QPainter::Antialiasing, true); p.setRenderHint(QPainter::TextAntialiasing, true); - p.setViewport(QRect(0.0, 0.0, pf->size().width() * printerDev.logicalDpiX(), - pf->size().height()*printerDev.logicalDpiY())); - p.setWindow(QRect(0.0, 0.0, pf->size().width() * DPI, pf->size().height() * DPI)); + p.setViewport(QRect(0.0, 0.0, size.width() * printerDev.logicalDpiX(), + size.height() * printerDev.logicalDpiY())); + p.setWindow(QRect(0.0, 0.0, size.width() * DPI, size.height() * DPI)); double pr = MScore::pixelRatio; MScore::pixelRatio = DPI / printerDev.logicalDpiX(); @@ -1998,8 +1998,8 @@ bool MuseScore::savePdf(QList cs, const QString& saveName) s->doLayout(); s->setPrinting(true); - const PageFormat* pf = s->pageFormat(); - printerDev.setPaperSize(pf->size(), QPrinter::Inch); +// const PageFormat* pf = s->pageFormat(); +// printerDev.setPaperSize(pf->size(), QPrinter::Inch); const QList pl = s->pages(); int pages = pl.size(); diff --git a/mscore/importmxmlpass1.cpp b/mscore/importmxmlpass1.cpp index fd0468a696..06c907acab 100644 --- a/mscore/importmxmlpass1.cpp +++ b/mscore/importmxmlpass1.cpp @@ -643,14 +643,13 @@ static void addText2(VBox* vbx, Score* s, QString strTxt, SubStyle stl, Align v, static void doCredits(Score* score, const CreditWordsList& credits, const int pageWidth, const int pageHeight) { - const PageFormat* pf = score->pageFormat(); /* qDebug("MusicXml::doCredits()"); qDebug("page format set (inch) w=%g h=%g tm=%g spatium=%g DPMM=%g DPI=%g", pf->width(), pf->height(), pf->oddTopMargin(), score->spatium(), DPMM, DPI); */ // page width, height and odd top margin in tenths - const double ph = pf->height() * 10 * DPI / score->spatium(); + const double ph = score->styleD(StyleIdx::pageHeight) * 10 * DPI / score->spatium(); const int pw1 = pageWidth / 3; const int pw2 = pageWidth * 2 / 3; const int ph2 = pageHeight / 2; @@ -1389,8 +1388,8 @@ void MusicXMLParserPass1::defaults(int& pageWidth, int& pageHeight) else if (_e.name() == "page-layout") { PageFormat pf; pageLayout(pf, millimeter / (tenths * INCH), pageWidth, pageHeight); - if (preferences.musicxmlImportLayout) - _score->setPageFormat(pf); +//TODO:ws if (preferences.musicxmlImportLayout) +// _score->setPageFormat(pf); } else if (_e.name() == "system-layout") { while (_e.readNextStartElement()) { @@ -1487,18 +1486,18 @@ void MusicXMLParserPass1::pageLayout(PageFormat& pf, const qreal conversion, else skipLogCurrElem(); } - pf.setTwosided(type == "odd" || type == "even"); + pf.twosided = type == "odd" || type == "even"; if (type == "odd" || type == "both") { - pf.setOddLeftMargin(lm); + pf.oddLeftMargin = lm; _oddRightMargin = rm; - pf.setOddTopMargin(tm); - pf.setOddBottomMargin(bm); + pf.oddTopMargin = tm; + pf.oddBottomMargin = bm; } if (type == "even" || type == "both") { - pf.setEvenLeftMargin(lm); + pf.evenLeftMargin = lm; _evenRightMargin = rm; - pf.setEvenTopMargin(tm); - pf.setEvenBottomMargin(bm); + pf.evenTopMargin = tm; + pf.evenBottomMargin = bm; } } else if (_e.name() == "page-height") { @@ -1516,10 +1515,10 @@ void MusicXMLParserPass1::pageLayout(PageFormat& pf, const qreal conversion, else skipLogCurrElem(); } - pf.setSize(size); - qreal w1 = size.width() - pf.oddLeftMargin() - _oddRightMargin; - qreal w2 = size.width() - pf.evenLeftMargin() - _evenRightMargin; - pf.setPrintableWidth(qMax(w1, w2)); // silently adjust right margins + pf.size = size; + qreal w1 = size.width() - pf.oddLeftMargin - _oddRightMargin; + qreal w2 = size.width() - pf.evenLeftMargin - _evenRightMargin; + pf.printableWidth = qMax(w1, w2); // silently adjust right margins } //--------------------------------------------------------- diff --git a/mscore/importmxmlpass1.h b/mscore/importmxmlpass1.h index 35bd418694..2da312671c 100644 --- a/mscore/importmxmlpass1.h +++ b/mscore/importmxmlpass1.h @@ -27,6 +27,22 @@ namespace Ms { +//--------------------------------------------------------- +// PageFormat +//--------------------------------------------------------- + +struct PageFormat { + QSizeF size; + qreal printableWidth; // _width - left margin - right margin + qreal evenLeftMargin; // values in inch + qreal oddLeftMargin; + qreal evenTopMargin; + qreal evenBottomMargin; + qreal oddTopMargin; + qreal oddBottomMargin; + bool twosided; + }; + typedef QMap PartMap; typedef std::map MusicXmlPartGroupMap; diff --git a/mscore/magbox.cpp b/mscore/magbox.cpp index 1a20512d97..73eb1560e6 100644 --- a/mscore/magbox.cpp +++ b/mscore/magbox.cpp @@ -140,7 +140,8 @@ double MagBox::getMag(ScoreView* canvas) const qreal pmag = mscore->physicalDotsPerInch() / DPI; double cw = canvas->width(); double ch = canvas->height(); - const PageFormat* pf = score->pageFormat(); + qreal pw = score->styleD(StyleIdx::pageWidth); + qreal ph = score->styleD(StyleIdx::pageHeight); double nmag; switch (idx) { @@ -155,13 +156,13 @@ double MagBox::getMag(ScoreView* canvas) const case MagIdx::MAG_1600: nmag = 16.0 * pmag; break; case MagIdx::MAG_PAGE_WIDTH: // page width - nmag = cw / (pf->width() * DPI); + nmag = cw / (pw * DPI); break; case MagIdx::MAG_PAGE: // page { - double mag1 = cw / (pf->width() * DPI); - double mag2 = ch / (pf->height() * DPI); + double mag1 = cw / (pw * DPI); + double mag2 = ch / (ph * DPI); nmag = (mag1 > mag2) ? mag2 : mag1; } break; @@ -171,12 +172,12 @@ double MagBox::getMag(ScoreView* canvas) const double mag1 = 0; double mag2 = 0; if (MScore::verticalOrientation()) { - mag1 = ch / (pf->height() * 2 * DPI + MScore::verticalPageGap); - mag2 = cw / (pf->width() * DPI); + mag1 = ch / (ph * 2 * DPI + MScore::verticalPageGap); + mag2 = cw / (pw * DPI); } else { - mag1 = cw / (pf->width() * 2 * DPI + 50); - mag2 = ch / (pf->height() * DPI); + mag1 = cw / (pw * 2 * DPI + 50); + mag2 = ch / (ph * DPI); } nmag = (mag1 > mag2) ? mag2 : mag1; } diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp index 59bbe66895..346ec47ad8 100644 --- a/mscore/musescore.cpp +++ b/mscore/musescore.cpp @@ -2461,14 +2461,14 @@ static void loadScores(const QStringList& argv) { MasterScore* score = mscore->readScore(preferences.startScore); if (preferences.startScore.startsWith(":/") && score) { - score->setPageFormat(*MScore::defaultStyle().pageFormat()); + // TODO score->setPageFormat(*MScore::defaultStyle().pageFormat()); score->doLayout(); score->setCreated(true); } if (score == 0) { score = mscore->readScore(":/data/My_First_Score.mscz"); if (score) { - score->setPageFormat(*MScore::defaultStyle().pageFormat()); + // TODO score->setPageFormat(*MScore::defaultStyle().pageFormat()); score->doLayout(); score->setCreated(true); } @@ -5557,10 +5557,9 @@ int main(int argc, char* av[]) MScore::init(); // initialize libmscore if (!MScore::testMode) { QSizeF psf = QPrinter().paperSize(QPrinter::Inch); - PageFormat pf; - pf.setSize(psf); - pf.setPrintableWidth(psf.width() - 20.0 / INCH); - MScore::defaultStyle().setPageFormat(pf); + MScore::defaultStyle().set(StyleIdx::pageWidth, psf.width()); + MScore::defaultStyle().set(StyleIdx::pageHeight, psf.height()); + MScore::defaultStyle().set(StyleIdx::pagePrintableWidth, psf.width()-20.0/INCH); } #ifdef SCRIPT_INTERFACE diff --git a/mscore/noteGroups.cpp b/mscore/noteGroups.cpp index 740e3d8406..40496383a7 100644 --- a/mscore/noteGroups.cpp +++ b/mscore/noteGroups.cpp @@ -47,8 +47,8 @@ Score* NoteGroups::createScore(int n, TDuration::DurationType t, std::vectorsetBeamMode(_groups.beamMode(tick, t)); chords->push_back(chord); } - c.score()->pageFormat()->setEvenLeftMargin(0.0); - c.score()->pageFormat()->setOddLeftMargin(0.0); + c.score()->style().set(StyleIdx::pageEvenLeftMargin, 0.0); + c.score()->style().set(StyleIdx::pageOddLeftMargin, 0.0); c.score()->parts().front()->setLongName(""); c.score()->style().set(StyleIdx::linearStretch, 1.3); diff --git a/mscore/pagesettings.cpp b/mscore/pagesettings.cpp index 652bc9f821..3b22fc7b9e 100644 --- a/mscore/pagesettings.cpp +++ b/mscore/pagesettings.cpp @@ -1,21 +1,13 @@ //============================================================================= // MuseScore -// Linux Music Score Editor -// $Id: pagesettings.cpp 5568 2012-04-22 10:08:43Z wschweer $ +// Music Composition & Notation // -// Copyright (C) 2002-2016 Werner Schweer and others +// Copyright (C) 2002-2017 Werner Schweer // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// it under the terms of the GNU General Public License version 2 +// as published by the Free Software Foundation and appearing in +// the file LICENCE.GPL //============================================================================= #include "globals.h" @@ -65,8 +57,8 @@ PageSettings::PageSettings(QWidget* parent) connect(buttonApply, SIGNAL(clicked()), SLOT(apply())); connect(buttonApplyToAllParts,SIGNAL(clicked()), SLOT(applyToAllParts())); connect(buttonOk, SIGNAL(clicked()), SLOT(ok())); - connect(portraitButton, SIGNAL(clicked()), SLOT(portraitClicked())); - connect(landscapeButton, SIGNAL(clicked()), SLOT(landscapeClicked())); + connect(portraitButton, SIGNAL(clicked()), SLOT(orientationClicked())); + connect(landscapeButton, SIGNAL(clicked()), SLOT(orientationClicked())); connect(twosided, SIGNAL(toggled(bool)), SLOT(twosidedToggled(bool))); connect(pageHeight, SIGNAL(valueChanged(double)), SLOT(pageHeightChanged(double))); connect(pageWidth, SIGNAL(valueChanged(double)), SLOT(pageWidthChanged(double))); @@ -121,28 +113,36 @@ void PageSettings::setScore(MasterScore* s) void PageSettings::blockSignals(bool block) { - oddPageTopMargin->blockSignals(block); - oddPageBottomMargin->blockSignals(block); - oddPageLeftMargin->blockSignals(block); - oddPageRightMargin->blockSignals(block); - evenPageTopMargin->blockSignals(block); - evenPageBottomMargin->blockSignals(block); - evenPageLeftMargin->blockSignals(block); - evenPageRightMargin->blockSignals(block); - spatiumEntry->blockSignals(block); - pageWidth->blockSignals(block); - pageHeight->blockSignals(block); + for (auto w : { oddPageTopMargin, oddPageBottomMargin, oddPageLeftMargin, oddPageRightMargin, + evenPageTopMargin, evenPageBottomMargin, evenPageLeftMargin, evenPageRightMargin, spatiumEntry, + pageWidth, pageHeight } ) + { + w->blockSignals(block); + } pageOffsetEntry->blockSignals(block); pageGroup->blockSignals(block); } +//--------------------------------------------------------- +// setMarginsMax +//--------------------------------------------------------- + +void PageSettings::setMarginsMax(double pw) + { + oddPageLeftMargin->setMaximum(pw); + oddPageRightMargin->setMaximum(pw); + evenPageLeftMargin->setMaximum(pw); + evenPageRightMargin->setMaximum(pw); + } + //--------------------------------------------------------- // updateValues +// set gui values from style //--------------------------------------------------------- void PageSettings::updateValues() { - Score* sc = preview->score(); + Score* score = preview->score(); bool mm = mmButton->isChecked(); blockSignals(true); @@ -160,73 +160,44 @@ void PageSettings::updateValues() singleStepSize = 0.05; singleStepScale = 0.005; } - oddPageTopMargin->setSuffix(suffix); - oddPageTopMargin->setSingleStep(singleStepSize); - oddPageBottomMargin->setSuffix(suffix); - oddPageBottomMargin->setSingleStep(singleStepSize); - oddPageLeftMargin->setSuffix(suffix); - oddPageLeftMargin->setSingleStep(singleStepSize); - oddPageRightMargin->setSuffix(suffix); - oddPageRightMargin->setSingleStep(singleStepSize); - evenPageTopMargin->setSuffix(suffix); - evenPageTopMargin->setSingleStep(singleStepSize); - evenPageBottomMargin->setSuffix(suffix); - evenPageBottomMargin->setSingleStep(singleStepSize); - evenPageLeftMargin->setSuffix(suffix); - evenPageLeftMargin->setSingleStep(singleStepSize); - evenPageRightMargin->setSuffix(suffix); - evenPageRightMargin->setSingleStep(singleStepSize); - spatiumEntry->setSuffix(suffix); + for (auto w : { oddPageTopMargin, oddPageBottomMargin, oddPageLeftMargin, oddPageRightMargin, evenPageTopMargin, + evenPageBottomMargin, evenPageLeftMargin, evenPageRightMargin, spatiumEntry, pageWidth, pageHeight } ) + { + w->setSuffix(suffix); + w->setSingleStep(singleStepSize); + } spatiumEntry->setSingleStep(singleStepScale); - pageWidth->setSuffix(suffix); - pageWidth->setSingleStep(singleStepSize); - pageHeight->setSuffix(suffix); - pageHeight->setSingleStep(singleStepSize); - const PageFormat* pf = sc->pageFormat(); - pageGroup->setCurrentIndex(int(QPageSize::id(pf->size(), QPageSize::Inch, QPageSize::FuzzyOrientationMatch))); + double f = mm ? INCH : 1.0; - qreal widthValue = pf->size().width(); - if (mm) { - oddPageTopMargin->setValue(pf->oddTopMargin() * INCH); - oddPageBottomMargin->setValue(pf->oddBottomMargin() * INCH); - oddPageLeftMargin->setValue(pf->oddLeftMargin() * INCH); - oddPageRightMargin->setValue(pf->oddRightMargin() * INCH); + double w = score->styleD(StyleIdx::pageWidth); + double h = score->styleD(StyleIdx::pageHeight); + setMarginsMax(w * f); - evenPageTopMargin->setValue(pf->evenTopMargin() * INCH); - evenPageBottomMargin->setValue(pf->evenBottomMargin() * INCH); - evenPageLeftMargin->setValue(pf->evenLeftMargin() * INCH); - evenPageRightMargin->setValue(pf->evenRightMargin() * INCH); + double pw = score->styleD(StyleIdx::pagePrintableWidth); + pageGroup->setCurrentIndex(int(QPageSize::id(QSizeF(w, h), QPageSize::Inch, QPageSize::FuzzyOrientationMatch))); - spatiumEntry->setValue(sc->spatium()/DPMM); - pageHeight->setValue(pf->size().height() * INCH); - widthValue *= INCH; - } - else { - oddPageTopMargin->setValue(pf->oddTopMargin()); - oddPageBottomMargin->setValue(pf->oddBottomMargin()); - oddPageLeftMargin->setValue(pf->oddLeftMargin()); - oddPageRightMargin->setValue(pf->oddRightMargin()); + oddPageTopMargin->setValue(score->styleD(StyleIdx::pageOddTopMargin) * f); + oddPageBottomMargin->setValue(score->styleD(StyleIdx::pageOddBottomMargin) * f); + oddPageLeftMargin->setValue(score->styleD(StyleIdx::pageOddLeftMargin) * f); + oddPageRightMargin->setValue((w - pw - score->styleD(StyleIdx::pageOddLeftMargin)) * f); - evenPageTopMargin->setValue(pf->evenTopMargin()); - evenPageBottomMargin->setValue(pf->evenBottomMargin()); - evenPageLeftMargin->setValue(pf->evenLeftMargin()); - evenPageRightMargin->setValue(pf->evenRightMargin()); + evenPageTopMargin->setValue(score->styleD(StyleIdx::pageEvenTopMargin) * f); + evenPageBottomMargin->setValue(score->styleD(StyleIdx::pageEvenBottomMargin) * f); + evenPageLeftMargin->setValue(score->styleD(StyleIdx::pageEvenLeftMargin) * f); + evenPageRightMargin->setValue((w - pw - score->styleD(StyleIdx::pageEvenLeftMargin)) * f); + pageHeight->setValue(h * f); + pageWidth->setValue(w * f); - spatiumEntry->setValue(sc->spatium()/DPI); - pageHeight->setValue(pf->size().height()); - } - pageWidth->setValue(widthValue); + double f1 = mm ? 1.0/DPMM : 1.0/DPI; + spatiumEntry->setValue(score->spatium() * f1); - oddPageLeftMargin->setMaximum(widthValue); - oddPageRightMargin->setMaximum(widthValue); - evenPageLeftMargin->setMaximum(widthValue); - evenPageRightMargin->setMaximum(widthValue); - evenPageTopMargin->setEnabled(pf->twosided()); - evenPageBottomMargin->setEnabled(pf->twosided()); - evenPageLeftMargin->setEnabled(pf->twosided()); - evenPageRightMargin->setEnabled(pf->twosided()); + bool _twosided = score->styleB(StyleIdx::pageTwosided); + evenPageTopMargin->setEnabled(_twosided); + evenPageBottomMargin->setEnabled(_twosided); + evenPageLeftMargin->setEnabled(_twosided); + evenPageRightMargin->setEnabled(_twosided); if (twosided->isChecked()) { evenPageRightMargin->setValue(oddPageLeftMargin->value()); @@ -237,12 +208,12 @@ void PageSettings::updateValues() evenPageLeftMargin->setValue(oddPageLeftMargin->value()); } - landscapeButton->setChecked(pf->width() > pf->height()); - portraitButton->setChecked(pf->width() <= pf->height()); + landscapeButton->setChecked(score->styleD(StyleIdx::pageWidth) > score->styleD(StyleIdx::pageHeight)); + portraitButton->setChecked(score->styleD(StyleIdx::pageWidth) <= score->styleD(StyleIdx::pageHeight)); - twosided->setChecked(pf->twosided()); + twosided->setChecked(_twosided); - pageOffsetEntry->setValue(sc->pageNumberOffset() + 1); + pageOffsetEntry->setValue(score->pageNumberOffset() + 1); blockSignals(false); } @@ -268,30 +239,20 @@ void PageSettings::mmClicked() } //--------------------------------------------------------- -// portraitClicked +// orientationClicked +// swap width/height //--------------------------------------------------------- -void PageSettings::portraitClicked() +void PageSettings::orientationClicked() { - PageFormat pf; - double f = mmUnit ? 1.0/INCH : 1.0; - pf.setPrintableWidth(pf.width() - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f); - preview->score()->setPageFormat(pf); - updateValues(); - updatePreview(0); - } + qreal w = preview->score()->styleD(StyleIdx::pageWidth); + qreal h = preview->score()->styleD(StyleIdx::pageHeight); -//--------------------------------------------------------- -// landscapeClicked -//--------------------------------------------------------- + preview->score()->style().set(StyleIdx::pageWidth, h); + preview->score()->style().set(StyleIdx::pageHeight, w); -void PageSettings::landscapeClicked() - { - PageFormat pf; - pf.setSize(QSizeF(pf.height(), pf.width())); - double f = mmUnit ? 1.0/INCH : 1.0; - pf.setPrintableWidth(pf.width() - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f); - preview->score()->setPageFormat(pf); + double f = mmUnit ? 1.0/INCH : 1.0; + preview->score()->style().set(StyleIdx::pagePrintableWidth, h - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f); updateValues(); updatePreview(0); } @@ -302,9 +263,7 @@ void PageSettings::landscapeClicked() void PageSettings::twosidedToggled(bool flag) { - PageFormat pf = *preview->score()->pageFormat(); - pf.setTwosided(flag); - preview->score()->setPageFormat(pf); + preview->score()->style().set(StyleIdx::pageTwosided, flag); updateValues(); updatePreview(1); } @@ -325,25 +284,21 @@ void PageSettings::apply() void PageSettings::applyToScore(Score* s) { + s->startCmd(); double f = mmUnit ? 1.0/INCH : 1.0; double f1 = mmUnit ? DPMM : DPI; - PageFormat pf; + s->undoChangeStyleVal(StyleIdx::pageWidth, pageWidth->value() * f); + s->undoChangeStyleVal(StyleIdx::pageHeight, pageHeight->value() * f); + s->undoChangeStyleVal(StyleIdx::pagePrintableWidth, (pageWidth->value() - oddPageLeftMargin->value() - oddPageRightMargin->value()) * f); + s->undoChangeStyleVal(StyleIdx::pageEvenTopMargin, evenPageTopMargin->value() * f); + s->undoChangeStyleVal(StyleIdx::pageEvenBottomMargin, evenPageBottomMargin->value() * f); + s->undoChangeStyleVal(StyleIdx::pageEvenLeftMargin, evenPageLeftMargin->value() * f); + s->undoChangeStyleVal(StyleIdx::pageOddTopMargin, oddPageTopMargin->value() * f); + s->undoChangeStyleVal(StyleIdx::pageOddBottomMargin, oddPageBottomMargin->value() * f); + s->undoChangeStyleVal(StyleIdx::pageTwosided, twosided->isChecked()); + s->undoChangeStyleVal(StyleIdx::spatium, spatiumEntry->value() * f1); - pf.setSize(QSizeF(pageWidth->value(), pageHeight->value()) * f); - pf.setPrintableWidth((pageWidth->value() - oddPageLeftMargin->value() - oddPageRightMargin->value()) * f); - pf.setEvenTopMargin(evenPageTopMargin->value() * f); - pf.setEvenBottomMargin(evenPageBottomMargin->value() * f); - pf.setEvenLeftMargin(evenPageLeftMargin->value() * f); - pf.setOddTopMargin(oddPageTopMargin->value() * f); - pf.setOddBottomMargin(oddPageBottomMargin->value() * f); - pf.setOddLeftMargin(oddPageLeftMargin->value() * f); - pf.setTwosided(twosided->isChecked()); - - double sp = spatiumEntry->value() * f1; - - s->startCmd(); - s->undoChangePageFormat(&pf, sp, pageOffsetEntry->value()-1); s->endCmd(); } @@ -384,15 +339,15 @@ void PageSettings::done(int val) void PageSettings::pageFormatSelected(int size) { if (size >= 0) { - int id = pageGroup->currentData().toInt(); - PageFormat pf = *preview->score()->pageFormat(); - QSizeF s = QPageSize::size(QPageSize::PageSizeId(id), QPageSize::Inch); - pf.setSize(s); + Score* s = preview->score(); + int id = pageGroup->currentData().toInt(); + QSizeF sz = QPageSize::size(QPageSize::PageSizeId(id), QPageSize::Inch); + + s->style().set(StyleIdx::pageWidth, sz.width()); + s->style().set(StyleIdx::pageHeight, sz.height()); double f = mmUnit ? 1.0/INCH : 1.0; - pf.setPrintableWidth(s.width() - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f); - - preview->score()->setPageFormat(pf); + s->style().set(StyleIdx::pagePrintableWidth, sz.width() - (oddPageLeftMargin->value() + oddPageRightMargin->value()) * f); updateValues(); updatePreview(0); } @@ -406,9 +361,7 @@ void PageSettings::otmChanged(double val) { if (mmUnit) val /= INCH; - PageFormat pf = *preview->score()->pageFormat(); - pf.setOddTopMargin(val); - preview->score()->setPageFormat(pf); + preview->score()->style().set(StyleIdx::pageOddTopMargin, val); updatePreview(1); } @@ -421,7 +374,7 @@ void PageSettings::olmChanged(double val) if (mmUnit) val /= INCH; - if(twosided->isChecked()) { + if (twosided->isChecked()) { evenPageRightMargin->blockSignals(true); evenPageRightMargin->setValue(val * (mmUnit ? INCH : 1.0)); evenPageRightMargin->blockSignals(false); @@ -431,10 +384,9 @@ void PageSettings::olmChanged(double val) evenPageLeftMargin->setValue(val * (mmUnit ? INCH : 1.0)); evenPageLeftMargin->blockSignals(false); } - PageFormat pf = *preview->score()->pageFormat(); - pf.setPrintableWidth(pf.width() - pf.oddRightMargin() - val); - pf.setOddLeftMargin(val); - preview->score()->setPageFormat(pf); + Score* s = preview->score(); + s->style().set(StyleIdx::pageOddLeftMargin, val); + s->style().set(StyleIdx::pagePrintableWidth, s->styleD(StyleIdx::pageWidth) - s->styleD(StyleIdx::pageEvenLeftMargin) - val); updatePreview(0); } @@ -448,12 +400,11 @@ void PageSettings::ormChanged(double val) if (mmUnit) val /= INCH; - PageFormat pf = *preview->score()->pageFormat(); - + Score* s = preview->score(); if (twosided->isChecked()) { evenPageLeftMargin->blockSignals(true); evenPageLeftMargin->setValue(val * (mmUnit ? INCH : 1.0)); - pf.setEvenLeftMargin(val); + s->style().set(StyleIdx::pageEvenLeftMargin, val); evenPageLeftMargin->blockSignals(false); } else { @@ -461,10 +412,7 @@ void PageSettings::ormChanged(double val) evenPageRightMargin->setValue(val * (mmUnit ? INCH : 1.0)); evenPageRightMargin->blockSignals(false); } - - pf.setPrintableWidth(pf.width() - pf.oddLeftMargin() - val); - - preview->score()->setPageFormat(pf); + s->style().set(StyleIdx::pagePrintableWidth, s->styleD(StyleIdx::pageWidth) - s->styleD(StyleIdx::pageOddLeftMargin) - val); updatePreview(0); } @@ -476,10 +424,7 @@ void PageSettings::obmChanged(double val) { if (mmUnit) val /= INCH; - PageFormat pf = *preview->score()->pageFormat(); - pf.setOddBottomMargin(val); - preview->score()->setPageFormat(pf); - + preview->score()->style().set(StyleIdx::pageOddBottomMargin, val); updatePreview(1); } @@ -491,10 +436,7 @@ void PageSettings::etmChanged(double val) { if (mmUnit) val /= INCH; - PageFormat pf = *preview->score()->pageFormat(); - pf.setEvenTopMargin(val); - preview->score()->setPageFormat(pf); - + preview->score()->style().set(StyleIdx::pageEvenTopMargin, val); updatePreview(1); } @@ -504,19 +446,17 @@ void PageSettings::etmChanged(double val) void PageSettings::elmChanged(double val) { - if (mmUnit) - val /= INCH; + double f = mmUnit ? 1.0/INCH : 1.0; + val *= f; - if(twosided->isChecked()) { + if (twosided->isChecked()) { oddPageRightMargin->blockSignals(true); oddPageRightMargin->setValue(val * (mmUnit ? INCH : 1.0)); oddPageRightMargin->blockSignals(false); } - PageFormat pf = *preview->score()->pageFormat(); - pf.setPrintableWidth(pf.width() - pf.evenRightMargin() - val); - pf.setEvenLeftMargin(val); - preview->score()->setPageFormat(pf); - + Score* s = preview->score(); + s->style().set(StyleIdx::pageEvenLeftMargin, val); + s->style().set(StyleIdx::pagePrintableWidth, s->styleD(StyleIdx::pageWidth) - evenPageRightMargin->value() * f - val); updatePreview(0); } @@ -534,11 +474,9 @@ void PageSettings::ermChanged(double val) oddPageLeftMargin->setValue(val * (mmUnit ? INCH : 1.0)); oddPageLeftMargin->blockSignals(false); } - - PageFormat pf = *preview->score()->pageFormat(); - pf.setPrintableWidth(pf.width() - pf.evenLeftMargin() - val); - pf.setOddLeftMargin(val); - preview->score()->setPageFormat(pf); + Score* s = preview->score(); + s->style().set(StyleIdx::pagePrintableWidth, s->styleD(StyleIdx::pageWidth) - s->styleD(StyleIdx::pageEvenLeftMargin) - val); + s->style().set(StyleIdx::pageOddLeftMargin, val); updatePreview(0); } @@ -550,9 +488,7 @@ void PageSettings::ebmChanged(double val) { if (mmUnit) val /= INCH; - PageFormat pf = *preview->score()->pageFormat(); - pf.setEvenBottomMargin(val); - preview->score()->setPageFormat(pf); + preview->score()->style().set(StyleIdx::pageEvenBottomMargin, val); updatePreview(1); } @@ -591,9 +527,8 @@ void PageSettings::pageHeightChanged(double val) val2 /= INCH; } pageGroup->setCurrentIndex(0); // custom - PageFormat f = *preview->score()->pageFormat(); - f.setSize(QSizeF(val2, val)); - preview->score()->setPageFormat(f); + preview->score()->style().set(StyleIdx::pageWidth, val); + preview->score()->style().set(StyleIdx::pageHeight, val2); updatePreview(1); } @@ -604,22 +539,15 @@ void PageSettings::pageHeightChanged(double val) void PageSettings::pageWidthChanged(double val) { - double val2 = pageHeight->value(); + setMarginsMax(val); - oddPageLeftMargin->setMaximum(val); - oddPageRightMargin->setMaximum(val); - evenPageLeftMargin->setMaximum(val); - evenPageRightMargin->setMaximum(val); - - if (mmUnit) { - val /= INCH; - val2 /= INCH; - } + double f = mmUnit ? 1.0/INCH : 1.0; + double val2 = pageHeight->value() * f; + val *= f; pageGroup->setCurrentIndex(0); // custom - PageFormat f = *preview->score()->pageFormat(); - f.setSize(QSizeF(val, val2)); - preview->score()->setPageFormat(f); - + preview->score()->style().set(StyleIdx::pageWidth, val); + preview->score()->style().set(StyleIdx::pageHeight, val2); + preview->score()->style().set(StyleIdx::pagePrintableWidth, val - (oddPageLeftMargin->value() + evenPageLeftMargin->value()) * f); updatePreview(0); } @@ -629,13 +557,13 @@ void PageSettings::pageWidthChanged(double val) void PageSettings::updatePreview(int val) { -// updateValues(); + updateValues(); switch(val) { case 0: preview->score()->doLayout(); break; case 1: -//TODO-ws preview->score()->doLayoutPages(); + preview->score()->doLayout(); break; } preview->layoutChanged(); diff --git a/mscore/pagesettings.h b/mscore/pagesettings.h index 0782ac7f4d..074ce22dc1 100644 --- a/mscore/pagesettings.h +++ b/mscore/pagesettings.h @@ -1,21 +1,13 @@ //============================================================================= -// MusE Score -// Linux Music Score Editor -// $Id: pagesettings.h 4998 2011-11-17 11:04:44Z wschweer $ +// MuseScore +// Music Composition & Notation // -// Copyright (C) 2002-2016 Werner Schweer and others +// Copyright (C) 2002-2017 Werner Schweer // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// it under the terms of the GNU General Public License version 2 +// as published by the Free Software Foundation and appearing in +// the file LICENCE.GPL //============================================================================= #ifndef __PAGESETTINGS_H__ @@ -46,6 +38,7 @@ class PageSettings : public AbstractDialog, private Ui::PageSettingsBase { void updatePreview(int); void blockSignals(bool); void applyToScore(Score*); + void setMarginsMax(double); private slots: void mmClicked(); @@ -70,8 +63,7 @@ class PageSettings : public AbstractDialog, private Ui::PageSettingsBase { void pageHeightChanged(double); void pageWidthChanged(double); void pageOffsetChanged(int val); - void portraitClicked(); - void landscapeClicked(); + void orientationClicked(); protected: virtual void retranslate() { retranslateUi(this); } diff --git a/mscore/preferences.cpp b/mscore/preferences.cpp index cdb3a455ac..8f624c09b9 100644 --- a/mscore/preferences.cpp +++ b/mscore/preferences.cpp @@ -296,10 +296,10 @@ void Preferences::write() s.setValue("pngTransparent", pngTransparent); s.setValue("language", language); - s.setValue("paperWidth", MScore::defaultStyle().pageFormat()->width()); - s.setValue("paperHeight", MScore::defaultStyle().pageFormat()->height()); + s.setValue("paperWidth", MScore::defaultStyle().value(StyleIdx::pageWidth).toReal()); + s.setValue("paperHeight", MScore::defaultStyle().value(StyleIdx::pageHeight).toReal()); - s.setValue("twosided", MScore::defaultStyle().pageFormat()->twosided()); + s.setValue("twosided", MScore::defaultStyle().value(StyleIdx::pageTwosided).toBool()); s.setValue("spatium", MScore::defaultStyle().value(StyleIdx::spatium).toDouble() / DPI); s.setValue("mag", mag); @@ -1911,9 +1911,10 @@ void Preferences::updatePluginList() void PreferenceDialog::printShortcutsClicked() { QPrinter printer(QPrinter::HighResolution); - MStyle* s = &MScore::defaultStyle(); - const PageFormat* pf = s->pageFormat(); - printer.setPaperSize(pf->size(), QPrinter::Inch); + MStyle& s = MScore::defaultStyle(); + qreal pageW = s.value(StyleIdx::pageWidth).toReal(); + qreal pageH = s.value(StyleIdx::pageHeight).toReal(); + printer.setPaperSize(QSizeF(pageW, pageH), QPrinter::Inch); printer.setCreator("MuseScore Version: " VERSION); printer.setFullPage(true); diff --git a/mtest/biab/chords-ref.mscx b/mtest/biab/chords-ref.mscx index 5c50ec36d0..bbdc2ea297 100644 --- a/mtest/biab/chords-ref.mscx +++ b/mtest/biab/chords-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/capella/io/test1.cap-ref.mscx b/mtest/capella/io/test1.cap-ref.mscx index a76441e72c..2c4c549165 100644 --- a/mtest/capella/io/test1.cap-ref.mscx +++ b/mtest/capella/io/test1.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/test1.capx-ref.mscx b/mtest/capella/io/test1.capx-ref.mscx index f241af4f3a..f441c278a1 100644 --- a/mtest/capella/io/test1.capx-ref.mscx +++ b/mtest/capella/io/test1.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/test2.cap-ref.mscx b/mtest/capella/io/test2.cap-ref.mscx index 66c376e097..daa256596c 100644 --- a/mtest/capella/io/test2.cap-ref.mscx +++ b/mtest/capella/io/test2.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/test2.capx-ref.mscx b/mtest/capella/io/test2.capx-ref.mscx index b031a421ca..20593baca2 100644 --- a/mtest/capella/io/test2.capx-ref.mscx +++ b/mtest/capella/io/test2.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/test3.cap-ref.mscx b/mtest/capella/io/test3.cap-ref.mscx index 4c79a38eb5..925823faf3 100644 --- a/mtest/capella/io/test3.cap-ref.mscx +++ b/mtest/capella/io/test3.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/test3.capx-ref.mscx b/mtest/capella/io/test3.capx-ref.mscx index 2d4ed83c5b..4b9dc90314 100644 --- a/mtest/capella/io/test3.capx-ref.mscx +++ b/mtest/capella/io/test3.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/test4.cap-ref.mscx b/mtest/capella/io/test4.cap-ref.mscx index 49b1c98df0..ae34f84329 100644 --- a/mtest/capella/io/test4.cap-ref.mscx +++ b/mtest/capella/io/test4.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/test4.capx-ref.mscx b/mtest/capella/io/test4.capx-ref.mscx index 0861d75c27..83710d6c08 100644 --- a/mtest/capella/io/test4.capx-ref.mscx +++ b/mtest/capella/io/test4.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/test5.cap-ref.mscx b/mtest/capella/io/test5.cap-ref.mscx index 6c4ead8b5f..f076627685 100644 --- a/mtest/capella/io/test5.cap-ref.mscx +++ b/mtest/capella/io/test5.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/test5.capx-ref.mscx b/mtest/capella/io/test5.capx-ref.mscx index b6e4f81dad..6f0ddb204b 100644 --- a/mtest/capella/io/test5.capx-ref.mscx +++ b/mtest/capella/io/test5.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/test6.cap-ref.mscx b/mtest/capella/io/test6.cap-ref.mscx index 64841a0d9e..a2d1a806d8 100644 --- a/mtest/capella/io/test6.cap-ref.mscx +++ b/mtest/capella/io/test6.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/test6.capx-ref.mscx b/mtest/capella/io/test6.capx-ref.mscx index ec5707e0ce..d6706d72bb 100644 --- a/mtest/capella/io/test6.capx-ref.mscx +++ b/mtest/capella/io/test6.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/test7.cap-ref.mscx b/mtest/capella/io/test7.cap-ref.mscx index 7c7f6692f3..a40ebcd2a7 100644 --- a/mtest/capella/io/test7.cap-ref.mscx +++ b/mtest/capella/io/test7.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/test7.capx-ref.mscx b/mtest/capella/io/test7.capx-ref.mscx index f3b56464ff..94a412230f 100644 --- a/mtest/capella/io/test7.capx-ref.mscx +++ b/mtest/capella/io/test7.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/test8.cap-ref.mscx b/mtest/capella/io/test8.cap-ref.mscx index caba89bbf0..490a8698f5 100644 --- a/mtest/capella/io/test8.cap-ref.mscx +++ b/mtest/capella/io/test8.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/testBarline.capx-ref.mscx b/mtest/capella/io/testBarline.capx-ref.mscx index c69e7ac254..be383bdac3 100644 --- a/mtest/capella/io/testBarline.capx-ref.mscx +++ b/mtest/capella/io/testBarline.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.62766 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.88 1 diff --git a/mtest/capella/io/testPianoG4G5.capx-ref.mscx b/mtest/capella/io/testPianoG4G5.capx-ref.mscx index 316bc35b69..9c17def3a3 100644 --- a/mtest/capella/io/testPianoG4G5.capx-ref.mscx +++ b/mtest/capella/io/testPianoG4G5.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/testScaleC4C5.capx-ref.mscx b/mtest/capella/io/testScaleC4C5.capx-ref.mscx index c618686d09..54c004559e 100644 --- a/mtest/capella/io/testScaleC4C5.capx-ref.mscx +++ b/mtest/capella/io/testScaleC4C5.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/testSlurTie.capx-ref.mscx b/mtest/capella/io/testSlurTie.capx-ref.mscx index 554ceac0d4..643b59f589 100644 --- a/mtest/capella/io/testSlurTie.capx-ref.mscx +++ b/mtest/capella/io/testSlurTie.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/testText1.capx-ref.mscx b/mtest/capella/io/testText1.capx-ref.mscx index b6b480119c..7e02d1ad55 100644 --- a/mtest/capella/io/testText1.capx-ref.mscx +++ b/mtest/capella/io/testText1.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/testTuplet1.capx-ref.mscx b/mtest/capella/io/testTuplet1.capx-ref.mscx index a0a2fee9e8..d4485b5eca 100644 --- a/mtest/capella/io/testTuplet1.capx-ref.mscx +++ b/mtest/capella/io/testTuplet1.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/capella/io/testTuplet2.cap-ref.mscx b/mtest/capella/io/testTuplet2.cap-ref.mscx index 368993db35..289a3db8b2 100644 --- a/mtest/capella/io/testTuplet2.cap-ref.mscx +++ b/mtest/capella/io/testTuplet2.cap-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/testTuplet2.capx-ref.mscx b/mtest/capella/io/testTuplet2.capx-ref.mscx index 065180dc29..d1a569370f 100644 --- a/mtest/capella/io/testTuplet2.capx-ref.mscx +++ b/mtest/capella/io/testTuplet2.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.666667 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.8 1 diff --git a/mtest/capella/io/testVolta1.capx-ref.mscx b/mtest/capella/io/testVolta1.capx-ref.mscx index 550b57a0eb..b0dfcf8b48 100644 --- a/mtest/capella/io/testVolta1.capx-ref.mscx +++ b/mtest/capella/io/testVolta1.capx-ref.mscx @@ -9,22 +9,6 @@ 12 1 0.681818 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76 1 diff --git a/mtest/importmidi/chord_1_tick_long.mscx b/mtest/importmidi/chord_1_tick_long.mscx index 7913b6b2e8..f401f0f67a 100644 --- a/mtest/importmidi/chord_1_tick_long.mscx +++ b/mtest/importmidi/chord_1_tick_long.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/chord_big_error.mscx b/mtest/importmidi/chord_big_error.mscx index 3951ec8a3e..328d52f110 100644 --- a/mtest/importmidi/chord_big_error.mscx +++ b/mtest/importmidi/chord_big_error.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/chord_collect.mscx b/mtest/importmidi/chord_collect.mscx index 07e106a41c..b1376e34a2 100644 --- a/mtest/importmidi/chord_collect.mscx +++ b/mtest/importmidi/chord_collect.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/chord_legato.mscx b/mtest/importmidi/chord_legato.mscx index 0701b00312..07ff953517 100644 --- a/mtest/importmidi/chord_legato.mscx +++ b/mtest/importmidi/chord_legato.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/chord_small_error.mscx b/mtest/importmidi/chord_small_error.mscx index 3951ec8a3e..328d52f110 100644 --- a/mtest/importmidi/chord_small_error.mscx +++ b/mtest/importmidi/chord_small_error.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/clef_melody.mscx b/mtest/importmidi/clef_melody.mscx index 5c50dc624e..54eb2b93a7 100644 --- a/mtest/importmidi/clef_melody.mscx +++ b/mtest/importmidi/clef_melody.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/clef_prev.mscx b/mtest/importmidi/clef_prev.mscx index 135ae95021..3fb9eda17b 100644 --- a/mtest/importmidi/clef_prev.mscx +++ b/mtest/importmidi/clef_prev.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/clef_tied.mscx b/mtest/importmidi/clef_tied.mscx index 6ed99eb92e..6bc03b0933 100644 --- a/mtest/importmidi/clef_tied.mscx +++ b/mtest/importmidi/clef_tied.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/division.mscx b/mtest/importmidi/division.mscx index 0224fca10e..4176c9dd2f 100644 --- a/mtest/importmidi/division.mscx +++ b/mtest/importmidi/division.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/human_4-4.mscx b/mtest/importmidi/human_4-4.mscx index 749c305131..9b7bae3106 100644 --- a/mtest/importmidi/human_4-4.mscx +++ b/mtest/importmidi/human_4-4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/human_tempo.mscx b/mtest/importmidi/human_tempo.mscx index f5b67ad84d..0280901389 100644 --- a/mtest/importmidi/human_tempo.mscx +++ b/mtest/importmidi/human_tempo.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/instrument_3staff_organ.mscx b/mtest/importmidi/instrument_3staff_organ.mscx index 75c84887b0..807cd99838 100644 --- a/mtest/importmidi/instrument_3staff_organ.mscx +++ b/mtest/importmidi/instrument_3staff_organ.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/instrument_channels.mscx b/mtest/importmidi/instrument_channels.mscx index cbea967870..027c366039 100644 --- a/mtest/importmidi/instrument_channels.mscx +++ b/mtest/importmidi/instrument_channels.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/instrument_clef.mscx b/mtest/importmidi/instrument_clef.mscx index 0e59e077c0..3093aaad08 100644 --- a/mtest/importmidi/instrument_clef.mscx +++ b/mtest/importmidi/instrument_clef.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/instrument_grand.mscx b/mtest/importmidi/instrument_grand.mscx index 71b159b920..eaa5ec2c94 100644 --- a/mtest/importmidi/instrument_grand.mscx +++ b/mtest/importmidi/instrument_grand.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/instrument_grand2.mscx b/mtest/importmidi/instrument_grand2.mscx index 8f614fb630..d7af082604 100644 --- a/mtest/importmidi/instrument_grand2.mscx +++ b/mtest/importmidi/instrument_grand2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/lyrics_time_0.mscx b/mtest/importmidi/lyrics_time_0.mscx index 3533418c79..fa9bda1a80 100644 --- a/mtest/importmidi/lyrics_time_0.mscx +++ b/mtest/importmidi/lyrics_time_0.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/lyrics_voice_1.mscx b/mtest/importmidi/lyrics_voice_1.mscx index 19aaf56bc7..57751d7ebf 100644 --- a/mtest/importmidi/lyrics_voice_1.mscx +++ b/mtest/importmidi/lyrics_voice_1.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/m1.mscx b/mtest/importmidi/m1.mscx index 0e92a270a5..837a7d9f4f 100644 --- a/mtest/importmidi/m1.mscx +++ b/mtest/importmidi/m1.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/m2.mscx b/mtest/importmidi/m2.mscx index c7159abfa0..33905e3b67 100644 --- a/mtest/importmidi/m2.mscx +++ b/mtest/importmidi/m2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/m3.mscx b/mtest/importmidi/m3.mscx index bcb6c3a9c0..b8c8b98778 100644 --- a/mtest/importmidi/m3.mscx +++ b/mtest/importmidi/m3.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/m4.mscx b/mtest/importmidi/m4.mscx index 746cf33511..fd00592139 100644 --- a/mtest/importmidi/m4.mscx +++ b/mtest/importmidi/m4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/m5.mscx b/mtest/importmidi/m5.mscx index 0e92a270a5..837a7d9f4f 100644 --- a/mtest/importmidi/m5.mscx +++ b/mtest/importmidi/m5.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_12-8.mscx b/mtest/importmidi/meter_12-8.mscx index b5f4885d3a..3bb3f18d75 100644 --- a/mtest/importmidi/meter_12-8.mscx +++ b/mtest/importmidi/meter_12-8.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_15-8.mscx b/mtest/importmidi/meter_15-8.mscx index faf6baab22..91110a8f20 100644 --- a/mtest/importmidi/meter_15-8.mscx +++ b/mtest/importmidi/meter_15-8.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_4-4.mscx b/mtest/importmidi/meter_4-4.mscx index 7bf38eda1e..290d4d95bc 100644 --- a/mtest/importmidi/meter_4-4.mscx +++ b/mtest/importmidi/meter_4-4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_9-8.mscx b/mtest/importmidi/meter_9-8.mscx index e93c731c86..3dbc69abcd 100644 --- a/mtest/importmidi/meter_9-8.mscx +++ b/mtest/importmidi/meter_9-8.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_central_long_note.mscx b/mtest/importmidi/meter_central_long_note.mscx index f54cc29b76..15e3010d60 100644 --- a/mtest/importmidi/meter_central_long_note.mscx +++ b/mtest/importmidi/meter_central_long_note.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_central_long_rest.mscx b/mtest/importmidi/meter_central_long_rest.mscx index 319bcdb959..1ab39a75ff 100644 --- a/mtest/importmidi/meter_central_long_rest.mscx +++ b/mtest/importmidi/meter_central_long_rest.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_chord_example.mscx b/mtest/importmidi/meter_chord_example.mscx index b853261b4b..1fb5caaded 100644 --- a/mtest/importmidi/meter_chord_example.mscx +++ b/mtest/importmidi/meter_chord_example.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_dot_tie.mscx b/mtest/importmidi/meter_dot_tie.mscx index 356584c491..6476184bc8 100644 --- a/mtest/importmidi/meter_dot_tie.mscx +++ b/mtest/importmidi/meter_dot_tie.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_dots_example1.mscx b/mtest/importmidi/meter_dots_example1.mscx index 3ce27051a1..eeeabe0521 100644 --- a/mtest/importmidi/meter_dots_example1.mscx +++ b/mtest/importmidi/meter_dots_example1.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_dots_example2.mscx b/mtest/importmidi/meter_dots_example2.mscx index 8573a8b501..1be3afdeb9 100644 --- a/mtest/importmidi/meter_dots_example2.mscx +++ b/mtest/importmidi/meter_dots_example2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_dots_example3.mscx b/mtest/importmidi/meter_dots_example3.mscx index d241390439..8d5528c978 100644 --- a/mtest/importmidi/meter_dots_example3.mscx +++ b/mtest/importmidi/meter_dots_example3.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_first_2_8th_rests_compound.mscx b/mtest/importmidi/meter_first_2_8th_rests_compound.mscx index 559d45f47d..869f049f86 100644 --- a/mtest/importmidi/meter_first_2_8th_rests_compound.mscx +++ b/mtest/importmidi/meter_first_2_8th_rests_compound.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_half_rest_3-4.mscx b/mtest/importmidi/meter_half_rest_3-4.mscx index 797bafeca6..47547a67a9 100644 --- a/mtest/importmidi/meter_half_rest_3-4.mscx +++ b/mtest/importmidi/meter_half_rest_3-4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_last_quarter_rest_compound.mscx b/mtest/importmidi/meter_last_quarter_rest_compound.mscx index ed729d8d08..10d07c8eee 100644 --- a/mtest/importmidi/meter_last_quarter_rest_compound.mscx +++ b/mtest/importmidi/meter_last_quarter_rest_compound.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_rests.mscx b/mtest/importmidi/meter_rests.mscx index 88f0042026..1e065f5ed3 100644 --- a/mtest/importmidi/meter_rests.mscx +++ b/mtest/importmidi/meter_rests.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/meter_two_beats_over.mscx b/mtest/importmidi/meter_two_beats_over.mscx index 64137f73a8..68d2f732ce 100644 --- a/mtest/importmidi/meter_two_beats_over.mscx +++ b/mtest/importmidi/meter_two_beats_over.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/min_duration.mscx b/mtest/importmidi/min_duration.mscx index 648b7c79a4..60e9464064 100644 --- a/mtest/importmidi/min_duration.mscx +++ b/mtest/importmidi/min_duration.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_drums.mscx b/mtest/importmidi/perc_drums.mscx index 40e309ff12..b28a5b2c39 100644 --- a/mtest/importmidi/perc_drums.mscx +++ b/mtest/importmidi/perc_drums.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_no_grand_staff.mscx b/mtest/importmidi/perc_no_grand_staff.mscx index 1b8014abae..dc247b2c8d 100644 --- a/mtest/importmidi/perc_no_grand_staff.mscx +++ b/mtest/importmidi/perc_no_grand_staff.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_remove_ties.mscx b/mtest/importmidi/perc_remove_ties.mscx index 8e8b7602cb..54543b006c 100644 --- a/mtest/importmidi/perc_remove_ties.mscx +++ b/mtest/importmidi/perc_remove_ties.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_respect_beat.mscx b/mtest/importmidi/perc_respect_beat.mscx index 510c8bb04b..abbd60fb56 100755 --- a/mtest/importmidi/perc_respect_beat.mscx +++ b/mtest/importmidi/perc_respect_beat.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_short_notes.mscx b/mtest/importmidi/perc_short_notes.mscx index 1880b4a33e..fcd371e719 100644 --- a/mtest/importmidi/perc_short_notes.mscx +++ b/mtest/importmidi/perc_short_notes.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_triplet.mscx b/mtest/importmidi/perc_triplet.mscx index c3d2d1f2b2..7b0a1c4828 100755 --- a/mtest/importmidi/perc_triplet.mscx +++ b/mtest/importmidi/perc_triplet.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_tuplet_simplify.mscx b/mtest/importmidi/perc_tuplet_simplify.mscx index 6e1812410c..c4a2411408 100644 --- a/mtest/importmidi/perc_tuplet_simplify.mscx +++ b/mtest/importmidi/perc_tuplet_simplify.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_tuplet_simplify2.mscx b/mtest/importmidi/perc_tuplet_simplify2.mscx index 21c7ca77cf..9c4c9e51df 100644 --- a/mtest/importmidi/perc_tuplet_simplify2.mscx +++ b/mtest/importmidi/perc_tuplet_simplify2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/perc_tuplet_voice.mscx b/mtest/importmidi/perc_tuplet_voice.mscx index 49d831b11f..65a951bb50 100644 --- a/mtest/importmidi/perc_tuplet_voice.mscx +++ b/mtest/importmidi/perc_tuplet_voice.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/pickup.mscx b/mtest/importmidi/pickup.mscx index 8a6f4d7f87..56f80a64c5 100644 --- a/mtest/importmidi/pickup.mscx +++ b/mtest/importmidi/pickup.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/pickup_long.mscx b/mtest/importmidi/pickup_long.mscx index 3f1a48c672..6a4aa75355 100644 --- a/mtest/importmidi/pickup_long.mscx +++ b/mtest/importmidi/pickup_long.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/pickup_turn_off.mscx b/mtest/importmidi/pickup_turn_off.mscx index ba60f0678c..70fee0d4ec 100644 --- a/mtest/importmidi/pickup_turn_off.mscx +++ b/mtest/importmidi/pickup_turn_off.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/quant_dotted_4th.mscx b/mtest/importmidi/quant_dotted_4th.mscx index 8ce45ebb66..7a8867d113 100644 --- a/mtest/importmidi/quant_dotted_4th.mscx +++ b/mtest/importmidi/quant_dotted_4th.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/simplify_16th_staccato.mscx b/mtest/importmidi/simplify_16th_staccato.mscx index b5a0a68187..e5f399c044 100644 --- a/mtest/importmidi/simplify_16th_staccato.mscx +++ b/mtest/importmidi/simplify_16th_staccato.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/simplify_32nd_staccato.mscx b/mtest/importmidi/simplify_32nd_staccato.mscx index 49c9a51430..69332f0edf 100644 --- a/mtest/importmidi/simplify_32nd_staccato.mscx +++ b/mtest/importmidi/simplify_32nd_staccato.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/simplify_4th_dotted_tied.mscx b/mtest/importmidi/simplify_4th_dotted_tied.mscx index dcda5e456f..6bdb3cbde6 100644 --- a/mtest/importmidi/simplify_4th_dotted_tied.mscx +++ b/mtest/importmidi/simplify_4th_dotted_tied.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/simplify_8th_dont.mscx b/mtest/importmidi/simplify_8th_dont.mscx index 189a998ce2..83e90389e4 100644 --- a/mtest/importmidi/simplify_8th_dont.mscx +++ b/mtest/importmidi/simplify_8th_dont.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/simplify_8th_dotted_no_staccato.mscx b/mtest/importmidi/simplify_8th_dotted_no_staccato.mscx index 39031e9915..41453979d9 100644 --- a/mtest/importmidi/simplify_8th_dotted_no_staccato.mscx +++ b/mtest/importmidi/simplify_8th_dotted_no_staccato.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/simplify_dotted_3-4.mscx b/mtest/importmidi/simplify_dotted_3-4.mscx index df4543211f..0e7f8e0417 100644 --- a/mtest/importmidi/simplify_dotted_3-4.mscx +++ b/mtest/importmidi/simplify_dotted_3-4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/simplify_staccato_9-8.mscx b/mtest/importmidi/simplify_staccato_9-8.mscx index 1fb060e9a6..0f33bb0e39 100644 --- a/mtest/importmidi/simplify_staccato_9-8.mscx +++ b/mtest/importmidi/simplify_staccato_9-8.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/simplify_triplet_staccato.mscx b/mtest/importmidi/simplify_triplet_staccato.mscx index 6997941e5c..4b300c6d5f 100644 --- a/mtest/importmidi/simplify_triplet_staccato.mscx +++ b/mtest/importmidi/simplify_triplet_staccato.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/split_2_melodies.mscx b/mtest/importmidi/split_2_melodies.mscx index 75a80a9109..0147afe68f 100644 --- a/mtest/importmidi/split_2_melodies.mscx +++ b/mtest/importmidi/split_2_melodies.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/split_acid.mscx b/mtest/importmidi/split_acid.mscx index 8feec2b23b..ce4d2ca267 100644 --- a/mtest/importmidi/split_acid.mscx +++ b/mtest/importmidi/split_acid.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/split_nontuplet.mscx b/mtest/importmidi/split_nontuplet.mscx index 975913b11c..d6239aebbd 100644 --- a/mtest/importmidi/split_nontuplet.mscx +++ b/mtest/importmidi/split_nontuplet.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/split_octave.mscx b/mtest/importmidi/split_octave.mscx index c011542fa6..2d99efee3b 100644 --- a/mtest/importmidi/split_octave.mscx +++ b/mtest/importmidi/split_octave.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/split_tuplet.mscx b/mtest/importmidi/split_tuplet.mscx index f4253cedb6..68fc23c18f 100644 --- a/mtest/importmidi/split_tuplet.mscx +++ b/mtest/importmidi/split_tuplet.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/swing_clef.mscx b/mtest/importmidi/swing_clef.mscx index becc1604ad..233c57066e 100644 --- a/mtest/importmidi/swing_clef.mscx +++ b/mtest/importmidi/swing_clef.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/swing_shuffle.mscx b/mtest/importmidi/swing_shuffle.mscx index 39eff634ee..499243a7b5 100644 --- a/mtest/importmidi/swing_shuffle.mscx +++ b/mtest/importmidi/swing_shuffle.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/swing_triplets.mscx b/mtest/importmidi/swing_triplets.mscx index 7211c905f7..ebf363e79e 100644 --- a/mtest/importmidi/swing_triplets.mscx +++ b/mtest/importmidi/swing_triplets.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/timesig_changes.mscx b/mtest/importmidi/timesig_changes.mscx index a3f2e2feb2..1d39854434 100644 --- a/mtest/importmidi/timesig_changes.mscx +++ b/mtest/importmidi/timesig_changes.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_16th_8th.mscx b/mtest/importmidi/tuplet_16th_8th.mscx index 449ff5ab7e..3e27c5fc6f 100644 --- a/mtest/importmidi/tuplet_16th_8th.mscx +++ b/mtest/importmidi/tuplet_16th_8th.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_2_voices_3_5_tuplets.mscx b/mtest/importmidi/tuplet_2_voices_3_5_tuplets.mscx index f9219f2c40..fae284eef6 100644 --- a/mtest/importmidi/tuplet_2_voices_3_5_tuplets.mscx +++ b/mtest/importmidi/tuplet_2_voices_3_5_tuplets.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_2_voices_tuplet_non.mscx b/mtest/importmidi/tuplet_2_voices_tuplet_non.mscx index 12ee67f10e..2baab7225a 100644 --- a/mtest/importmidi/tuplet_2_voices_tuplet_non.mscx +++ b/mtest/importmidi/tuplet_2_voices_tuplet_non.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_3-4.mscx b/mtest/importmidi/tuplet_3-4.mscx index 2747f3e1c5..67b9ad2fa4 100644 --- a/mtest/importmidi/tuplet_3-4.mscx +++ b/mtest/importmidi/tuplet_3-4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_3_5_7_tuplets.mscx b/mtest/importmidi/tuplet_3_5_7_tuplets.mscx index 57b3e1aa69..96350a373a 100644 --- a/mtest/importmidi/tuplet_3_5_7_tuplets.mscx +++ b/mtest/importmidi/tuplet_3_5_7_tuplets.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_5_5_tuplets_rests.mscx b/mtest/importmidi/tuplet_5_5_tuplets_rests.mscx index ef1f284f28..4394883a8f 100644 --- a/mtest/importmidi/tuplet_5_5_tuplets_rests.mscx +++ b/mtest/importmidi/tuplet_5_5_tuplets_rests.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_7_staccato.mscx b/mtest/importmidi/tuplet_7_staccato.mscx index 512d7e3c67..21450951c5 100644 --- a/mtest/importmidi/tuplet_7_staccato.mscx +++ b/mtest/importmidi/tuplet_7_staccato.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_duplet.mscx b/mtest/importmidi/tuplet_duplet.mscx index 31081d3c58..21a94a1952 100644 --- a/mtest/importmidi/tuplet_duplet.mscx +++ b/mtest/importmidi/tuplet_duplet.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_mars.mscx b/mtest/importmidi/tuplet_mars.mscx index ca4aa10475..045c28083f 100644 --- a/mtest/importmidi/tuplet_mars.mscx +++ b/mtest/importmidi/tuplet_mars.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_nonuplet_3-4.mscx b/mtest/importmidi/tuplet_nonuplet_3-4.mscx index ef9da6e14c..9fd901858d 100644 --- a/mtest/importmidi/tuplet_nonuplet_3-4.mscx +++ b/mtest/importmidi/tuplet_nonuplet_3-4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_nonuplet_4-4.mscx b/mtest/importmidi/tuplet_nonuplet_4-4.mscx index 217d5e2f64..4a391ef3e2 100644 --- a/mtest/importmidi/tuplet_nonuplet_4-4.mscx +++ b/mtest/importmidi/tuplet_nonuplet_4-4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_off_time_other_bar.mscx b/mtest/importmidi/tuplet_off_time_other_bar.mscx index b9e9331694..788a4c27ac 100644 --- a/mtest/importmidi/tuplet_off_time_other_bar.mscx +++ b/mtest/importmidi/tuplet_off_time_other_bar.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_off_time_other_bar2.mscx b/mtest/importmidi/tuplet_off_time_other_bar2.mscx index e99cb33d82..abd1d39cd6 100644 --- a/mtest/importmidi/tuplet_off_time_other_bar2.mscx +++ b/mtest/importmidi/tuplet_off_time_other_bar2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_quadruplet.mscx b/mtest/importmidi/tuplet_quadruplet.mscx index faaa45f91e..813b2f1074 100644 --- a/mtest/importmidi/tuplet_quadruplet.mscx +++ b/mtest/importmidi/tuplet_quadruplet.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_septuplet.mscx b/mtest/importmidi/tuplet_septuplet.mscx index 39e3e380d1..f3542a7d8c 100644 --- a/mtest/importmidi/tuplet_septuplet.mscx +++ b/mtest/importmidi/tuplet_septuplet.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_tied_3_5_tuplets.mscx b/mtest/importmidi/tuplet_tied_3_5_tuplets.mscx index a7f438afc0..bb04b14307 100644 --- a/mtest/importmidi/tuplet_tied_3_5_tuplets.mscx +++ b/mtest/importmidi/tuplet_tied_3_5_tuplets.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_tied_3_5_tuplets2.mscx b/mtest/importmidi/tuplet_tied_3_5_tuplets2.mscx index 8754440dc7..b5e9840006 100644 --- a/mtest/importmidi/tuplet_tied_3_5_tuplets2.mscx +++ b/mtest/importmidi/tuplet_tied_3_5_tuplets2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_triplet.mscx b/mtest/importmidi/tuplet_triplet.mscx index 859fe396a5..418781c388 100644 --- a/mtest/importmidi/tuplet_triplet.mscx +++ b/mtest/importmidi/tuplet_triplet.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_triplet_first_tied.mscx b/mtest/importmidi/tuplet_triplet_first_tied.mscx index d9b502afba..f16b8e40de 100644 --- a/mtest/importmidi/tuplet_triplet_first_tied.mscx +++ b/mtest/importmidi/tuplet_triplet_first_tied.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_triplet_first_tied2.mscx b/mtest/importmidi/tuplet_triplet_first_tied2.mscx index 5d6644f276..ff2048a107 100644 --- a/mtest/importmidi/tuplet_triplet_first_tied2.mscx +++ b/mtest/importmidi/tuplet_triplet_first_tied2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_triplet_last_tied.mscx b/mtest/importmidi/tuplet_triplet_last_tied.mscx index 313c663731..3f61087056 100644 --- a/mtest/importmidi/tuplet_triplet_last_tied.mscx +++ b/mtest/importmidi/tuplet_triplet_last_tied.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/tuplet_triplets_mixed.mscx b/mtest/importmidi/tuplet_triplets_mixed.mscx index de692b06f4..422be16060 100644 --- a/mtest/importmidi/tuplet_triplets_mixed.mscx +++ b/mtest/importmidi/tuplet_triplets_mixed.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/voice_acid.mscx b/mtest/importmidi/voice_acid.mscx index 13757bd5fd..c383cbff63 100644 --- a/mtest/importmidi/voice_acid.mscx +++ b/mtest/importmidi/voice_acid.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/voice_central.mscx b/mtest/importmidi/voice_central.mscx index 598b01dbdc..5b41dec5dc 100644 --- a/mtest/importmidi/voice_central.mscx +++ b/mtest/importmidi/voice_central.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/voice_intersect.mscx b/mtest/importmidi/voice_intersect.mscx index f06f3bcfcd..d8cdbdb90e 100644 --- a/mtest/importmidi/voice_intersect.mscx +++ b/mtest/importmidi/voice_intersect.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/importmidi/voice_tuplet.mscx b/mtest/importmidi/voice_tuplet.mscx index 6d9eb4dba6..c6b94eba09 100644 --- a/mtest/importmidi/voice_tuplet.mscx +++ b/mtest/importmidi/voice_tuplet.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/barline/barline01.mscx b/mtest/libmscore/barline/barline01.mscx index b5fa851e6c..65c25c14e9 100644 --- a/mtest/libmscore/barline/barline01.mscx +++ b/mtest/libmscore/barline/barline01.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/barline/barline02.mscx b/mtest/libmscore/barline/barline02.mscx index e6f23d0688..79d019692c 100644 --- a/mtest/libmscore/barline/barline02.mscx +++ b/mtest/libmscore/barline/barline02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/barline/barline03.mscx b/mtest/libmscore/barline/barline03.mscx index 22ccdd0c66..8d04762155 100644 --- a/mtest/libmscore/barline/barline03.mscx +++ b/mtest/libmscore/barline/barline03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/barline/barline04.mscx b/mtest/libmscore/barline/barline04.mscx index 22ccdd0c66..8d04762155 100644 --- a/mtest/libmscore/barline/barline04.mscx +++ b/mtest/libmscore/barline/barline04.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/barline/barline05.mscx b/mtest/libmscore/barline/barline05.mscx index 16343d994a..66d853dd3d 100644 --- a/mtest/libmscore/barline/barline05.mscx +++ b/mtest/libmscore/barline/barline05.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/barline/barline06.mscx b/mtest/libmscore/barline/barline06.mscx index 16af7ca5f8..7b2c6a43b0 100755 --- a/mtest/libmscore/barline/barline06.mscx +++ b/mtest/libmscore/barline/barline06.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-2.mscx b/mtest/libmscore/beam/Beam-2.mscx index 123ae171ff..d8b0ba57b2 100644 --- a/mtest/libmscore/beam/Beam-2.mscx +++ b/mtest/libmscore/beam/Beam-2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-23.mscx b/mtest/libmscore/beam/Beam-23.mscx index 921661c403..923df53c55 100644 --- a/mtest/libmscore/beam/Beam-23.mscx +++ b/mtest/libmscore/beam/Beam-23.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-A.mscx b/mtest/libmscore/beam/Beam-A.mscx index ef9173ff64..ab30b414b4 100644 --- a/mtest/libmscore/beam/Beam-A.mscx +++ b/mtest/libmscore/beam/Beam-A.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-B.mscx b/mtest/libmscore/beam/Beam-B.mscx index ce4ff4c013..041dd65d46 100644 --- a/mtest/libmscore/beam/Beam-B.mscx +++ b/mtest/libmscore/beam/Beam-B.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-C.mscx b/mtest/libmscore/beam/Beam-C.mscx index 9cb534df8d..5c09f2bd4e 100644 --- a/mtest/libmscore/beam/Beam-C.mscx +++ b/mtest/libmscore/beam/Beam-C.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-D.mscx b/mtest/libmscore/beam/Beam-D.mscx index 89dc936ec9..d9694001f6 100644 --- a/mtest/libmscore/beam/Beam-D.mscx +++ b/mtest/libmscore/beam/Beam-D.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-E.mscx b/mtest/libmscore/beam/Beam-E.mscx index 9922250217..4e18d098c3 100644 --- a/mtest/libmscore/beam/Beam-E.mscx +++ b/mtest/libmscore/beam/Beam-E.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-F.mscx b/mtest/libmscore/beam/Beam-F.mscx index bd354b34fd..d3a212ec29 100644 --- a/mtest/libmscore/beam/Beam-F.mscx +++ b/mtest/libmscore/beam/Beam-F.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-G.mscx b/mtest/libmscore/beam/Beam-G.mscx index d72db22fe8..4d8859dd12 100644 --- a/mtest/libmscore/beam/Beam-G.mscx +++ b/mtest/libmscore/beam/Beam-G.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-S0.mscx b/mtest/libmscore/beam/Beam-S0.mscx index e98c8c9f73..7c3c7d3bfb 100644 --- a/mtest/libmscore/beam/Beam-S0.mscx +++ b/mtest/libmscore/beam/Beam-S0.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/beam/Beam-dir.mscx b/mtest/libmscore/beam/Beam-dir.mscx index f1af1f4c89..40f5d894a2 100644 --- a/mtest/libmscore/beam/Beam-dir.mscx +++ b/mtest/libmscore/beam/Beam-dir.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/breath/breath.mscx b/mtest/libmscore/breath/breath.mscx index 25f11adcae..d3f724d64b 100644 --- a/mtest/libmscore/breath/breath.mscx +++ b/mtest/libmscore/breath/breath.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/breath/breath01-ref.mscx b/mtest/libmscore/breath/breath01-ref.mscx index 73a36784af..847054814f 100644 --- a/mtest/libmscore/breath/breath01-ref.mscx +++ b/mtest/libmscore/breath/breath01-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/breath/breath02-ref.mscx b/mtest/libmscore/breath/breath02-ref.mscx index 25f11adcae..d3f724d64b 100644 --- a/mtest/libmscore/breath/breath02-ref.mscx +++ b/mtest/libmscore/breath/breath02-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/chordsymbol/add-link-ref.mscx b/mtest/libmscore/chordsymbol/add-link-ref.mscx index d5e227c0e7..379511d472 100644 --- a/mtest/libmscore/chordsymbol/add-link-ref.mscx +++ b/mtest/libmscore/chordsymbol/add-link-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/chordsymbol/add-link.mscx b/mtest/libmscore/chordsymbol/add-link.mscx index 3297122732..94582943ba 100644 --- a/mtest/libmscore/chordsymbol/add-link.mscx +++ b/mtest/libmscore/chordsymbol/add-link.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/chordsymbol/add-part-ref.mscx b/mtest/libmscore/chordsymbol/add-part-ref.mscx index c8b7bceeaa..ae3f45869c 100644 --- a/mtest/libmscore/chordsymbol/add-part-ref.mscx +++ b/mtest/libmscore/chordsymbol/add-part-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -120,22 +104,6 @@ 480 1 diff --git a/mtest/libmscore/chordsymbol/add-part.mscx b/mtest/libmscore/chordsymbol/add-part.mscx index b3a1f83558..b7ad8f9edd 100644 --- a/mtest/libmscore/chordsymbol/add-part.mscx +++ b/mtest/libmscore/chordsymbol/add-part.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -115,22 +99,6 @@ 480 1 diff --git a/mtest/libmscore/chordsymbol/clear-ref.mscx b/mtest/libmscore/chordsymbol/clear-ref.mscx index d76934aa66..c166af36de 100644 --- a/mtest/libmscore/chordsymbol/clear-ref.mscx +++ b/mtest/libmscore/chordsymbol/clear-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/chordsymbol/clear.mscx b/mtest/libmscore/chordsymbol/clear.mscx index 6d73a56d96..801084c1d4 100644 --- a/mtest/libmscore/chordsymbol/clear.mscx +++ b/mtest/libmscore/chordsymbol/clear.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/chordsymbol/extend-ref.mscx b/mtest/libmscore/chordsymbol/extend-ref.mscx index 8dee03e8a0..e4cae60a7a 100644 --- a/mtest/libmscore/chordsymbol/extend-ref.mscx +++ b/mtest/libmscore/chordsymbol/extend-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/chordsymbol/extend.mscx b/mtest/libmscore/chordsymbol/extend.mscx index 6d73a56d96..801084c1d4 100644 --- a/mtest/libmscore/chordsymbol/extend.mscx +++ b/mtest/libmscore/chordsymbol/extend.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/chordsymbol/no-system-ref.mscx b/mtest/libmscore/chordsymbol/no-system-ref.mscx index 8cd8caafa7..888299e423 100644 --- a/mtest/libmscore/chordsymbol/no-system-ref.mscx +++ b/mtest/libmscore/chordsymbol/no-system-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -212,22 +196,6 @@ 480 1 @@ -327,22 +295,6 @@ 480 1 diff --git a/mtest/libmscore/chordsymbol/no-system.mscx b/mtest/libmscore/chordsymbol/no-system.mscx index a6e7831c8f..488f4c54ee 100644 --- a/mtest/libmscore/chordsymbol/no-system.mscx +++ b/mtest/libmscore/chordsymbol/no-system.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/chordsymbol/transpose-part-ref.mscx b/mtest/libmscore/chordsymbol/transpose-part-ref.mscx index 98ecda04c8..0d4679f4bf 100644 --- a/mtest/libmscore/chordsymbol/transpose-part-ref.mscx +++ b/mtest/libmscore/chordsymbol/transpose-part-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -139,22 +123,6 @@ 480 1 diff --git a/mtest/libmscore/chordsymbol/transpose-part.mscx b/mtest/libmscore/chordsymbol/transpose-part.mscx index 68205bfd6b..16763b4e14 100644 --- a/mtest/libmscore/chordsymbol/transpose-part.mscx +++ b/mtest/libmscore/chordsymbol/transpose-part.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -136,22 +120,6 @@ 480 1 diff --git a/mtest/libmscore/chordsymbol/transpose-ref.mscx b/mtest/libmscore/chordsymbol/transpose-ref.mscx index a9137c523f..ffdc9f5326 100644 --- a/mtest/libmscore/chordsymbol/transpose-ref.mscx +++ b/mtest/libmscore/chordsymbol/transpose-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/chordsymbol/transpose.mscx b/mtest/libmscore/chordsymbol/transpose.mscx index da19fb6468..d267408f07 100644 --- a/mtest/libmscore/chordsymbol/transpose.mscx +++ b/mtest/libmscore/chordsymbol/transpose.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/clef/clef-1-ref.mscx b/mtest/libmscore/clef/clef-1-ref.mscx index 8b585f66b0..f858d7988b 100644 --- a/mtest/libmscore/clef/clef-1-ref.mscx +++ b/mtest/libmscore/clef/clef-1-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/clef/clef-1.mscx b/mtest/libmscore/clef/clef-1.mscx index 8b585f66b0..f858d7988b 100644 --- a/mtest/libmscore/clef/clef-1.mscx +++ b/mtest/libmscore/clef/clef-1.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/clef/clef-2-ref.mscx b/mtest/libmscore/clef/clef-2-ref.mscx index 4397739067..346fda9443 100644 --- a/mtest/libmscore/clef/clef-2-ref.mscx +++ b/mtest/libmscore/clef/clef-2-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/clef/clef-2.mscx b/mtest/libmscore/clef/clef-2.mscx index 355e4e20cf..292c074d32 100644 --- a/mtest/libmscore/clef/clef-2.mscx +++ b/mtest/libmscore/clef/clef-2.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/clef_courtesy/clef_courtesy01-ref.mscx b/mtest/libmscore/clef_courtesy/clef_courtesy01-ref.mscx index ebfe9860c3..4dc1625f91 100644 --- a/mtest/libmscore/clef_courtesy/clef_courtesy01-ref.mscx +++ b/mtest/libmscore/clef_courtesy/clef_courtesy01-ref.mscx @@ -23,22 +23,6 @@ $:copyright: $:plate: Version $:version: - - 1627.09 - 1133.86 - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - 1.76389 1 diff --git a/mtest/libmscore/clef_courtesy/clef_courtesy01.mscx b/mtest/libmscore/clef_courtesy/clef_courtesy01.mscx index c757d7495c..3163f68e4f 100644 --- a/mtest/libmscore/clef_courtesy/clef_courtesy01.mscx +++ b/mtest/libmscore/clef_courtesy/clef_courtesy01.mscx @@ -23,22 +23,6 @@ $:copyright: $:plate: Version $:version: - - 1627.09 - 1133.86 - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - 1.76389 1 diff --git a/mtest/libmscore/clef_courtesy/clef_courtesy02-ref.mscx b/mtest/libmscore/clef_courtesy/clef_courtesy02-ref.mscx index de4e5451d0..de3095882b 100644 --- a/mtest/libmscore/clef_courtesy/clef_courtesy02-ref.mscx +++ b/mtest/libmscore/clef_courtesy/clef_courtesy02-ref.mscx @@ -24,22 +24,6 @@ $:copyright: $:plate: Version $:version: - - 1627.09 - 1133.86 - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - 1.76389 1 diff --git a/mtest/libmscore/clef_courtesy/clef_courtesy02.mscx b/mtest/libmscore/clef_courtesy/clef_courtesy02.mscx index 51a59789fc..26830dcfcf 100644 --- a/mtest/libmscore/clef_courtesy/clef_courtesy02.mscx +++ b/mtest/libmscore/clef_courtesy/clef_courtesy02.mscx @@ -24,22 +24,6 @@ $:copyright: $:plate: Version $:version: - - 1627.09 - 1133.86 - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - 1.76389 1 diff --git a/mtest/libmscore/clef_courtesy/clef_courtesy03-ref.mscx b/mtest/libmscore/clef_courtesy/clef_courtesy03-ref.mscx index 2bee6485e3..348d91296f 100644 --- a/mtest/libmscore/clef_courtesy/clef_courtesy03-ref.mscx +++ b/mtest/libmscore/clef_courtesy/clef_courtesy03-ref.mscx @@ -23,22 +23,6 @@ $:copyright: $:plate: Version $:version: - - 1627.09 - 1133.86 - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - 1.76389 1 diff --git a/mtest/libmscore/clef_courtesy/clef_courtesy03.mscx b/mtest/libmscore/clef_courtesy/clef_courtesy03.mscx index 6a2fda463c..50fbc2982e 100644 --- a/mtest/libmscore/clef_courtesy/clef_courtesy03.mscx +++ b/mtest/libmscore/clef_courtesy/clef_courtesy03.mscx @@ -23,22 +23,6 @@ $:copyright: $:plate: Version $:version: - - 1627.09 - 1133.86 - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - - 56.6929 - 56.6929 - 56.6929 - 85.0394 - - 1.76389 1 diff --git a/mtest/libmscore/clef_courtesy/clef_courtesy_78196.mscx b/mtest/libmscore/clef_courtesy/clef_courtesy_78196.mscx index 0548e62564..bad06abdee 100644 --- a/mtest/libmscore/clef_courtesy/clef_courtesy_78196.mscx +++ b/mtest/libmscore/clef_courtesy/clef_courtesy_78196.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/concertpitch/concertpitchbenchmark.mscx b/mtest/libmscore/concertpitch/concertpitchbenchmark.mscx index e6ccf6c4ba..d95ac4078d 100644 --- a/mtest/libmscore/concertpitch/concertpitchbenchmark.mscx +++ b/mtest/libmscore/concertpitch/concertpitchbenchmark.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste01-ref.mscx b/mtest/libmscore/copypaste/copypaste01-ref.mscx index 1cba0417e6..66f19d91ba 100644 --- a/mtest/libmscore/copypaste/copypaste01-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste01.mscx b/mtest/libmscore/copypaste/copypaste01.mscx index e4d92b6321..557cb7a791 100644 --- a/mtest/libmscore/copypaste/copypaste01.mscx +++ b/mtest/libmscore/copypaste/copypaste01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste02-ref.mscx b/mtest/libmscore/copypaste/copypaste02-ref.mscx index 6630264bef..65ab8bec88 100644 --- a/mtest/libmscore/copypaste/copypaste02-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste02.mscx b/mtest/libmscore/copypaste/copypaste02.mscx index dc2d5c695a..6a404deca3 100644 --- a/mtest/libmscore/copypaste/copypaste02.mscx +++ b/mtest/libmscore/copypaste/copypaste02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste03-ref.mscx b/mtest/libmscore/copypaste/copypaste03-ref.mscx index dcfab6f1ce..72fdfa2f9b 100644 --- a/mtest/libmscore/copypaste/copypaste03-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste03-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste03.mscx b/mtest/libmscore/copypaste/copypaste03.mscx index 6eeec1d30a..12de248e31 100644 --- a/mtest/libmscore/copypaste/copypaste03.mscx +++ b/mtest/libmscore/copypaste/copypaste03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste04-ref.mscx b/mtest/libmscore/copypaste/copypaste04-ref.mscx index 4b92944669..201f84bb99 100644 --- a/mtest/libmscore/copypaste/copypaste04-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste04-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste04.mscx b/mtest/libmscore/copypaste/copypaste04.mscx index 508cd08966..dd7338887f 100644 --- a/mtest/libmscore/copypaste/copypaste04.mscx +++ b/mtest/libmscore/copypaste/copypaste04.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste05-ref.mscx b/mtest/libmscore/copypaste/copypaste05-ref.mscx index 7340d3e8d9..4ac0e7cea7 100644 --- a/mtest/libmscore/copypaste/copypaste05-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste05-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste05.mscx b/mtest/libmscore/copypaste/copypaste05.mscx index 0f3735d72a..1e356b33c1 100644 --- a/mtest/libmscore/copypaste/copypaste05.mscx +++ b/mtest/libmscore/copypaste/copypaste05.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste06-ref.mscx b/mtest/libmscore/copypaste/copypaste06-ref.mscx index 01fc042fd1..7a91c82d64 100644 --- a/mtest/libmscore/copypaste/copypaste06-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste06-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste06.mscx b/mtest/libmscore/copypaste/copypaste06.mscx index 27e4b340b2..b1004a0d08 100644 --- a/mtest/libmscore/copypaste/copypaste06.mscx +++ b/mtest/libmscore/copypaste/copypaste06.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste07-ref.mscx b/mtest/libmscore/copypaste/copypaste07-ref.mscx index 134756fc44..1f64967b0f 100644 --- a/mtest/libmscore/copypaste/copypaste07-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste07-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste07.mscx b/mtest/libmscore/copypaste/copypaste07.mscx index 8df8b07d41..a94ab2341e 100644 --- a/mtest/libmscore/copypaste/copypaste07.mscx +++ b/mtest/libmscore/copypaste/copypaste07.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste08-ref.mscx b/mtest/libmscore/copypaste/copypaste08-ref.mscx index 3559a0c4d8..94b8003298 100644 --- a/mtest/libmscore/copypaste/copypaste08-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste08-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste08.mscx b/mtest/libmscore/copypaste/copypaste08.mscx index 5fe949a161..e3b7859e64 100644 --- a/mtest/libmscore/copypaste/copypaste08.mscx +++ b/mtest/libmscore/copypaste/copypaste08.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste09-ref.mscx b/mtest/libmscore/copypaste/copypaste09-ref.mscx index 23c0806408..7f1121881a 100644 --- a/mtest/libmscore/copypaste/copypaste09-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste09-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste09.mscx b/mtest/libmscore/copypaste/copypaste09.mscx index 56f0bd75b0..d747bdd156 100644 --- a/mtest/libmscore/copypaste/copypaste09.mscx +++ b/mtest/libmscore/copypaste/copypaste09.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste10-ref.mscx b/mtest/libmscore/copypaste/copypaste10-ref.mscx index 218e704444..045df09fc5 100644 --- a/mtest/libmscore/copypaste/copypaste10-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste10-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste10.mscx b/mtest/libmscore/copypaste/copypaste10.mscx index 327335b169..3062fd32f0 100644 --- a/mtest/libmscore/copypaste/copypaste10.mscx +++ b/mtest/libmscore/copypaste/copypaste10.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste11-ref.mscx b/mtest/libmscore/copypaste/copypaste11-ref.mscx index 9a1237a11c..8071938408 100644 --- a/mtest/libmscore/copypaste/copypaste11-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste11-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste11.mscx b/mtest/libmscore/copypaste/copypaste11.mscx index def4dcff75..0dcb0cdd43 100644 --- a/mtest/libmscore/copypaste/copypaste11.mscx +++ b/mtest/libmscore/copypaste/copypaste11.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste12-ref.mscx b/mtest/libmscore/copypaste/copypaste12-ref.mscx index c7bdacc8c2..1fabca1312 100644 --- a/mtest/libmscore/copypaste/copypaste12-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste12-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste12.mscx b/mtest/libmscore/copypaste/copypaste12.mscx index dd2a824dd4..687f5d36dd 100644 --- a/mtest/libmscore/copypaste/copypaste12.mscx +++ b/mtest/libmscore/copypaste/copypaste12.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste13-ref.mscx b/mtest/libmscore/copypaste/copypaste13-ref.mscx index bce8c9eb43..2c2fa17735 100644 --- a/mtest/libmscore/copypaste/copypaste13-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste13-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste13.mscx b/mtest/libmscore/copypaste/copypaste13.mscx index fb9f4d89cd..944c82c0a5 100644 --- a/mtest/libmscore/copypaste/copypaste13.mscx +++ b/mtest/libmscore/copypaste/copypaste13.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste14-ref.mscx b/mtest/libmscore/copypaste/copypaste14-ref.mscx index 89b13d5b56..827a3447d8 100644 --- a/mtest/libmscore/copypaste/copypaste14-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste14-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste14.mscx b/mtest/libmscore/copypaste/copypaste14.mscx index cd7068eedb..a81c9be9f8 100644 --- a/mtest/libmscore/copypaste/copypaste14.mscx +++ b/mtest/libmscore/copypaste/copypaste14.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste15-ref.mscx b/mtest/libmscore/copypaste/copypaste15-ref.mscx index 3399c4f9cb..7498fa6c4a 100644 --- a/mtest/libmscore/copypaste/copypaste15-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste15-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste15.mscx b/mtest/libmscore/copypaste/copypaste15.mscx index 4c1997721e..eb1291f337 100644 --- a/mtest/libmscore/copypaste/copypaste15.mscx +++ b/mtest/libmscore/copypaste/copypaste15.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste16-ref.mscx b/mtest/libmscore/copypaste/copypaste16-ref.mscx index f0b4e785e1..6bd73cd927 100644 --- a/mtest/libmscore/copypaste/copypaste16-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste16-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste16.mscx b/mtest/libmscore/copypaste/copypaste16.mscx index 9df76dcba9..65d278cf96 100644 --- a/mtest/libmscore/copypaste/copypaste16.mscx +++ b/mtest/libmscore/copypaste/copypaste16.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste17-ref.mscx b/mtest/libmscore/copypaste/copypaste17-ref.mscx index cc172c850e..3ee19e01c1 100644 --- a/mtest/libmscore/copypaste/copypaste17-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste17-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste17.mscx b/mtest/libmscore/copypaste/copypaste17.mscx index be18175e2a..6f7048323f 100644 --- a/mtest/libmscore/copypaste/copypaste17.mscx +++ b/mtest/libmscore/copypaste/copypaste17.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste18-ref.mscx b/mtest/libmscore/copypaste/copypaste18-ref.mscx index 8d7d5e9c91..613f14d591 100644 --- a/mtest/libmscore/copypaste/copypaste18-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste18-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste18.mscx b/mtest/libmscore/copypaste/copypaste18.mscx index cd7068eedb..a81c9be9f8 100644 --- a/mtest/libmscore/copypaste/copypaste18.mscx +++ b/mtest/libmscore/copypaste/copypaste18.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste19-ref.mscx b/mtest/libmscore/copypaste/copypaste19-ref.mscx index e7d74864fa..9149249bda 100644 --- a/mtest/libmscore/copypaste/copypaste19-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste19-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste19.mscx b/mtest/libmscore/copypaste/copypaste19.mscx index 896768656b..0736d1cf2e 100644 --- a/mtest/libmscore/copypaste/copypaste19.mscx +++ b/mtest/libmscore/copypaste/copypaste19.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste20-ref.mscx b/mtest/libmscore/copypaste/copypaste20-ref.mscx index 8feaed382f..81071e6e92 100644 --- a/mtest/libmscore/copypaste/copypaste20-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste20-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste20.mscx b/mtest/libmscore/copypaste/copypaste20.mscx index 209f671502..726f96f0e8 100644 --- a/mtest/libmscore/copypaste/copypaste20.mscx +++ b/mtest/libmscore/copypaste/copypaste20.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste21-ref.mscx b/mtest/libmscore/copypaste/copypaste21-ref.mscx index 8096f9f710..362dd0ca4c 100644 --- a/mtest/libmscore/copypaste/copypaste21-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste21-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste21.mscx b/mtest/libmscore/copypaste/copypaste21.mscx index 06b71b4cf2..2b6b9e0cd4 100644 --- a/mtest/libmscore/copypaste/copypaste21.mscx +++ b/mtest/libmscore/copypaste/copypaste21.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste22-ref.mscx b/mtest/libmscore/copypaste/copypaste22-ref.mscx index 97b968bcbf..6e338df959 100644 --- a/mtest/libmscore/copypaste/copypaste22-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste22-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste22.mscx b/mtest/libmscore/copypaste/copypaste22.mscx index a63b8bb94f..4d2e0ca9e6 100644 --- a/mtest/libmscore/copypaste/copypaste22.mscx +++ b/mtest/libmscore/copypaste/copypaste22.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste23-ref.mscx b/mtest/libmscore/copypaste/copypaste23-ref.mscx index 9263672aac..93bcc54086 100644 --- a/mtest/libmscore/copypaste/copypaste23-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste23-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste23.mscx b/mtest/libmscore/copypaste/copypaste23.mscx index c0315cfc30..3cdef74c57 100644 --- a/mtest/libmscore/copypaste/copypaste23.mscx +++ b/mtest/libmscore/copypaste/copypaste23.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste24-ref.mscx b/mtest/libmscore/copypaste/copypaste24-ref.mscx index 08924db87f..f7164bc00f 100644 --- a/mtest/libmscore/copypaste/copypaste24-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste24-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste24.mscx b/mtest/libmscore/copypaste/copypaste24.mscx index da2ee36a14..e843350d36 100644 --- a/mtest/libmscore/copypaste/copypaste24.mscx +++ b/mtest/libmscore/copypaste/copypaste24.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste50-ref.mscx b/mtest/libmscore/copypaste/copypaste50-ref.mscx index 968e6929f5..8c6edbba0a 100644 --- a/mtest/libmscore/copypaste/copypaste50-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste50-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste50.mscx b/mtest/libmscore/copypaste/copypaste50.mscx index 97123a29e3..7c24336400 100644 --- a/mtest/libmscore/copypaste/copypaste50.mscx +++ b/mtest/libmscore/copypaste/copypaste50.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste_partial_01-ref.mscx b/mtest/libmscore/copypaste/copypaste_partial_01-ref.mscx index 5ad2dfe7df..89f7fff058 100644 --- a/mtest/libmscore/copypaste/copypaste_partial_01-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste_partial_01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste_partial_01.mscx b/mtest/libmscore/copypaste/copypaste_partial_01.mscx index 1e319082b8..e35c6d2123 100644 --- a/mtest/libmscore/copypaste/copypaste_partial_01.mscx +++ b/mtest/libmscore/copypaste/copypaste_partial_01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste_tuplet_01-ref.mscx b/mtest/libmscore/copypaste/copypaste_tuplet_01-ref.mscx index 40f8498770..309572b6b7 100644 --- a/mtest/libmscore/copypaste/copypaste_tuplet_01-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste_tuplet_01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste_tuplet_01.mscx b/mtest/libmscore/copypaste/copypaste_tuplet_01.mscx index bf7175debd..fc1fca689d 100644 --- a/mtest/libmscore/copypaste/copypaste_tuplet_01.mscx +++ b/mtest/libmscore/copypaste/copypaste_tuplet_01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste_tuplet_02-ref.mscx b/mtest/libmscore/copypaste/copypaste_tuplet_02-ref.mscx index 40f8498770..309572b6b7 100644 --- a/mtest/libmscore/copypaste/copypaste_tuplet_02-ref.mscx +++ b/mtest/libmscore/copypaste/copypaste_tuplet_02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypaste/copypaste_tuplet_02.mscx b/mtest/libmscore/copypaste/copypaste_tuplet_02.mscx index 564ca9df46..9143610c5c 100644 --- a/mtest/libmscore/copypaste/copypaste_tuplet_02.mscx +++ b/mtest/libmscore/copypaste/copypaste_tuplet_02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-ref.mscx index e2955c099d..9efc7bd146 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest-ref.mscx index eb23ec3d1e..ed38c4adde 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest.mscx index 16a59933c1..7be582b141 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation.mscx index e9e95b036b..5bd1b2d008 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01-ref.mscx index d3eebe0eb9..af193f9cef 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01.mscx index 23b89be1a0..f3148601d4 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-ref.mscx index 3a8e912615..45b9543e67 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames.mscx index 94b85cadd2..82e5951363 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest-ref.mscx index a63a4dcaea..5f27631459 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest.mscx index d96ee788b0..f25b943f52 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass-ref.mscx index 855d8db0a1..2c2707e1e7 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass.mscx index 42d59a82e9..c7305c7910 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics-ref.mscx index e9bf72ea24..e6aa335338 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics.mscx index 10a688d52b..5d6917d469 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01-ref.mscx index a05067e2be..b2e98a9f63 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01.mscx index bfa74bd9c4..70b30c5dee 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-ref.mscx index a1e42ea6e9..e465ce482d 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-ref.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-range-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-range.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-range.mscx index bfa74bd9c4..70b30c5dee 100644 --- a/mtest/libmscore/copypastesymbollist/copypastesymbollist-range.mscx +++ b/mtest/libmscore/copypastesymbollist/copypastesymbollist-range.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/earlymusic/mensurstrich01-ref.mscx b/mtest/libmscore/earlymusic/mensurstrich01-ref.mscx index 8c49bd49c7..1931a32ede 100644 --- a/mtest/libmscore/earlymusic/mensurstrich01-ref.mscx +++ b/mtest/libmscore/earlymusic/mensurstrich01-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/earlymusic/mensurstrich01.mscx b/mtest/libmscore/earlymusic/mensurstrich01.mscx index 5d8aa5a4b9..721d57b851 100644 --- a/mtest/libmscore/earlymusic/mensurstrich01.mscx +++ b/mtest/libmscore/earlymusic/mensurstrich01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/exchangevoices/exchangevoices-gliss-ref.mscx b/mtest/libmscore/exchangevoices/exchangevoices-gliss-ref.mscx index dbe11d0e0a..70f970a04f 100644 --- a/mtest/libmscore/exchangevoices/exchangevoices-gliss-ref.mscx +++ b/mtest/libmscore/exchangevoices/exchangevoices-gliss-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/exchangevoices/exchangevoices-gliss.mscx b/mtest/libmscore/exchangevoices/exchangevoices-gliss.mscx index 21ed322853..f605841338 100644 --- a/mtest/libmscore/exchangevoices/exchangevoices-gliss.mscx +++ b/mtest/libmscore/exchangevoices/exchangevoices-gliss.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/exchangevoices/exchangevoices-slurs-ref.mscx b/mtest/libmscore/exchangevoices/exchangevoices-slurs-ref.mscx index e627931de7..fe17a87693 100644 --- a/mtest/libmscore/exchangevoices/exchangevoices-slurs-ref.mscx +++ b/mtest/libmscore/exchangevoices/exchangevoices-slurs-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/exchangevoices/exchangevoices-slurs.mscx b/mtest/libmscore/exchangevoices/exchangevoices-slurs.mscx index dfcb89ae72..8b8f8794b8 100644 --- a/mtest/libmscore/exchangevoices/exchangevoices-slurs.mscx +++ b/mtest/libmscore/exchangevoices/exchangevoices-slurs.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/exchangevoices/undoChangeVoice.mscx b/mtest/libmscore/exchangevoices/undoChangeVoice.mscx index f2f5caea6c..bccc7b3547 100644 --- a/mtest/libmscore/exchangevoices/undoChangeVoice.mscx +++ b/mtest/libmscore/exchangevoices/undoChangeVoice.mscx @@ -6,22 +6,6 @@ 480 1 @@ -578,22 +562,6 @@ 1 diff --git a/mtest/libmscore/exchangevoices/undoChangeVoice01-ref.mscx b/mtest/libmscore/exchangevoices/undoChangeVoice01-ref.mscx index f5335e71c8..d75de81912 100644 --- a/mtest/libmscore/exchangevoices/undoChangeVoice01-ref.mscx +++ b/mtest/libmscore/exchangevoices/undoChangeVoice01-ref.mscx @@ -6,22 +6,6 @@ 480 1 @@ -617,22 +601,6 @@ 1 diff --git a/mtest/libmscore/exchangevoices/undoChangeVoice02-ref.mscx b/mtest/libmscore/exchangevoices/undoChangeVoice02-ref.mscx index bab5dfce1e..e9335957f7 100644 --- a/mtest/libmscore/exchangevoices/undoChangeVoice02-ref.mscx +++ b/mtest/libmscore/exchangevoices/undoChangeVoice02-ref.mscx @@ -6,22 +6,6 @@ 480 1 @@ -584,22 +568,6 @@ 1 diff --git a/mtest/libmscore/implode_explode/explode1-ref.mscx b/mtest/libmscore/implode_explode/explode1-ref.mscx index 5e0e6f7d21..3461a624df 100644 --- a/mtest/libmscore/implode_explode/explode1-ref.mscx +++ b/mtest/libmscore/implode_explode/explode1-ref.mscx @@ -12,22 +12,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 @@ -719,22 +703,6 @@ 1 @@ -955,22 +923,6 @@ 1 @@ -1196,22 +1148,6 @@ 1 @@ -1408,22 +1344,6 @@ 1 diff --git a/mtest/libmscore/implode_explode/explode1-ref2.mscx b/mtest/libmscore/implode_explode/explode1-ref2.mscx index ee3e4157e2..3be68e4f79 100644 --- a/mtest/libmscore/implode_explode/explode1-ref2.mscx +++ b/mtest/libmscore/implode_explode/explode1-ref2.mscx @@ -12,22 +12,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 @@ -762,22 +746,6 @@ 1 @@ -1233,22 +1201,6 @@ 1 @@ -1386,22 +1338,6 @@ 1 @@ -1532,22 +1468,6 @@ 1 diff --git a/mtest/libmscore/implode_explode/explode1.mscx b/mtest/libmscore/implode_explode/explode1.mscx index 28cd09c76d..6dbb7b5f7a 100644 --- a/mtest/libmscore/implode_explode/explode1.mscx +++ b/mtest/libmscore/implode_explode/explode1.mscx @@ -6,22 +6,6 @@ 480 1 @@ -756,22 +740,6 @@ 1 @@ -1227,22 +1195,6 @@ 1 @@ -1380,22 +1332,6 @@ 1 @@ -1526,22 +1462,6 @@ 1 diff --git a/mtest/libmscore/implode_explode/implode1-ref.mscx b/mtest/libmscore/implode_explode/implode1-ref.mscx index 2746c7d30b..79557d8215 100644 --- a/mtest/libmscore/implode_explode/implode1-ref.mscx +++ b/mtest/libmscore/implode_explode/implode1-ref.mscx @@ -11,22 +11,6 @@ 0 1 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/implode_explode/implode1.mscx b/mtest/libmscore/implode_explode/implode1.mscx index e73ecf375e..ce0f742bb1 100644 --- a/mtest/libmscore/implode_explode/implode1.mscx +++ b/mtest/libmscore/implode_explode/implode1.mscx @@ -11,22 +11,6 @@ 0 1 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/implode_explode/undoExplode.mscx b/mtest/libmscore/implode_explode/undoExplode.mscx index e41fabf8d5..667231fcc7 100644 --- a/mtest/libmscore/implode_explode/undoExplode.mscx +++ b/mtest/libmscore/implode_explode/undoExplode.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/implode_explode/undoExplode01-ref.mscx b/mtest/libmscore/implode_explode/undoExplode01-ref.mscx index cde9bc3003..2a2f357b60 100644 --- a/mtest/libmscore/implode_explode/undoExplode01-ref.mscx +++ b/mtest/libmscore/implode_explode/undoExplode01-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/implode_explode/undoExplode02-ref.mscx b/mtest/libmscore/implode_explode/undoExplode02-ref.mscx index 1b12f6ebcc..3e25102638 100644 --- a/mtest/libmscore/implode_explode/undoExplode02-ref.mscx +++ b/mtest/libmscore/implode_explode/undoExplode02-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/implode_explode/undoImplode.mscx b/mtest/libmscore/implode_explode/undoImplode.mscx index 82be2663a9..3491ee7df2 100644 --- a/mtest/libmscore/implode_explode/undoImplode.mscx +++ b/mtest/libmscore/implode_explode/undoImplode.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/implode_explode/undoImplode01-ref.mscx b/mtest/libmscore/implode_explode/undoImplode01-ref.mscx index 5c2213f68f..a1cedcd317 100644 --- a/mtest/libmscore/implode_explode/undoImplode01-ref.mscx +++ b/mtest/libmscore/implode_explode/undoImplode01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/implode_explode/undoImplode02-ref.mscx b/mtest/libmscore/implode_explode/undoImplode02-ref.mscx index 07a641b9e2..9c8c5a8cbb 100644 --- a/mtest/libmscore/implode_explode/undoImplode02-ref.mscx +++ b/mtest/libmscore/implode_explode/undoImplode02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/implode_explode/undoImplodeVoice.mscx b/mtest/libmscore/implode_explode/undoImplodeVoice.mscx index d6a2bff071..243ec5eb65 100644 --- a/mtest/libmscore/implode_explode/undoImplodeVoice.mscx +++ b/mtest/libmscore/implode_explode/undoImplodeVoice.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/implode_explode/undoImplodeVoice01-ref.mscx b/mtest/libmscore/implode_explode/undoImplodeVoice01-ref.mscx index e52138585b..35185e9dfc 100644 --- a/mtest/libmscore/implode_explode/undoImplodeVoice01-ref.mscx +++ b/mtest/libmscore/implode_explode/undoImplodeVoice01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/implode_explode/undoImplodeVoice02-ref.mscx b/mtest/libmscore/implode_explode/undoImplodeVoice02-ref.mscx index 72b5e4dd11..254be6f28b 100644 --- a/mtest/libmscore/implode_explode/undoImplodeVoice02-ref.mscx +++ b/mtest/libmscore/implode_explode/undoImplodeVoice02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/add-ref.mscx b/mtest/libmscore/instrumentchange/add-ref.mscx index 39419a69d7..255995f327 100644 --- a/mtest/libmscore/instrumentchange/add-ref.mscx +++ b/mtest/libmscore/instrumentchange/add-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/add.mscx b/mtest/libmscore/instrumentchange/add.mscx index d86673d066..c90fe514fc 100644 --- a/mtest/libmscore/instrumentchange/add.mscx +++ b/mtest/libmscore/instrumentchange/add.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/change-ref.mscx b/mtest/libmscore/instrumentchange/change-ref.mscx index 29c8d3c053..fc6165326b 100644 --- a/mtest/libmscore/instrumentchange/change-ref.mscx +++ b/mtest/libmscore/instrumentchange/change-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/change.mscx b/mtest/libmscore/instrumentchange/change.mscx index d3a7ae256b..6d36836f94 100644 --- a/mtest/libmscore/instrumentchange/change.mscx +++ b/mtest/libmscore/instrumentchange/change.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/copy-ref.mscx b/mtest/libmscore/instrumentchange/copy-ref.mscx index 3a1126ed51..89885babde 100644 --- a/mtest/libmscore/instrumentchange/copy-ref.mscx +++ b/mtest/libmscore/instrumentchange/copy-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/copy.mscx b/mtest/libmscore/instrumentchange/copy.mscx index 832db32f20..b417cb3c0d 100644 --- a/mtest/libmscore/instrumentchange/copy.mscx +++ b/mtest/libmscore/instrumentchange/copy.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/delete-ref.mscx b/mtest/libmscore/instrumentchange/delete-ref.mscx index 1641093374..87fb26494d 100644 --- a/mtest/libmscore/instrumentchange/delete-ref.mscx +++ b/mtest/libmscore/instrumentchange/delete-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/delete.mscx b/mtest/libmscore/instrumentchange/delete.mscx index 2d7830d39b..a79fcf474c 100644 --- a/mtest/libmscore/instrumentchange/delete.mscx +++ b/mtest/libmscore/instrumentchange/delete.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/mixer-ref.mscx b/mtest/libmscore/instrumentchange/mixer-ref.mscx index 57cab2f29a..34f5be9e54 100644 --- a/mtest/libmscore/instrumentchange/mixer-ref.mscx +++ b/mtest/libmscore/instrumentchange/mixer-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/instrumentchange/mixer.mscx b/mtest/libmscore/instrumentchange/mixer.mscx index d3a7ae256b..6d36836f94 100644 --- a/mtest/libmscore/instrumentchange/mixer.mscx +++ b/mtest/libmscore/instrumentchange/mixer.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join01-ref.mscx b/mtest/libmscore/join/join01-ref.mscx index 2e92608fdc..073b5537f1 100644 --- a/mtest/libmscore/join/join01-ref.mscx +++ b/mtest/libmscore/join/join01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join01.mscx b/mtest/libmscore/join/join01.mscx index 275d0ea584..26223f8290 100644 --- a/mtest/libmscore/join/join01.mscx +++ b/mtest/libmscore/join/join01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join02-ref.mscx b/mtest/libmscore/join/join02-ref.mscx index 6fbd82cadc..12d7766e40 100644 --- a/mtest/libmscore/join/join02-ref.mscx +++ b/mtest/libmscore/join/join02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join02.mscx b/mtest/libmscore/join/join02.mscx index e12ca42ba0..33b64d57b5 100644 --- a/mtest/libmscore/join/join02.mscx +++ b/mtest/libmscore/join/join02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join03-ref.mscx b/mtest/libmscore/join/join03-ref.mscx index c3a5236e2a..cc6ce8a063 100644 --- a/mtest/libmscore/join/join03-ref.mscx +++ b/mtest/libmscore/join/join03-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join03.mscx b/mtest/libmscore/join/join03.mscx index 934c5fcfc3..45fd951f88 100644 --- a/mtest/libmscore/join/join03.mscx +++ b/mtest/libmscore/join/join03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join04-ref.mscx b/mtest/libmscore/join/join04-ref.mscx index 45f8be6373..778fe690cc 100644 --- a/mtest/libmscore/join/join04-ref.mscx +++ b/mtest/libmscore/join/join04-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join04.mscx b/mtest/libmscore/join/join04.mscx index 9866f0eaff..08cc78e4ec 100644 --- a/mtest/libmscore/join/join04.mscx +++ b/mtest/libmscore/join/join04.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join05-ref.mscx b/mtest/libmscore/join/join05-ref.mscx index c3f5f03c7d..1967d66584 100644 --- a/mtest/libmscore/join/join05-ref.mscx +++ b/mtest/libmscore/join/join05-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join05.mscx b/mtest/libmscore/join/join05.mscx index 60973eee56..5d243f4e98 100644 --- a/mtest/libmscore/join/join05.mscx +++ b/mtest/libmscore/join/join05.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join06-ref.mscx b/mtest/libmscore/join/join06-ref.mscx index facefa4f50..a03fdb24cb 100644 --- a/mtest/libmscore/join/join06-ref.mscx +++ b/mtest/libmscore/join/join06-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join06.mscx b/mtest/libmscore/join/join06.mscx index bec81a1a1e..0f6786958d 100644 --- a/mtest/libmscore/join/join06.mscx +++ b/mtest/libmscore/join/join06.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join07-ref.mscx b/mtest/libmscore/join/join07-ref.mscx index 63d9ff52bb..29166278b7 100644 --- a/mtest/libmscore/join/join07-ref.mscx +++ b/mtest/libmscore/join/join07-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join07.mscx b/mtest/libmscore/join/join07.mscx index 87bcaf11e0..76d084b6ad 100644 --- a/mtest/libmscore/join/join07.mscx +++ b/mtest/libmscore/join/join07.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/join/join08.mscx b/mtest/libmscore/join/join08.mscx index 32be842f35..8c4351055a 100644 --- a/mtest/libmscore/join/join08.mscx +++ b/mtest/libmscore/join/join08.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/keysig/concert-pitch-01-ref.mscx b/mtest/libmscore/keysig/concert-pitch-01-ref.mscx index f07e546de3..d04e7ea109 100644 --- a/mtest/libmscore/keysig/concert-pitch-01-ref.mscx +++ b/mtest/libmscore/keysig/concert-pitch-01-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/keysig/concert-pitch-02-ref.mscx b/mtest/libmscore/keysig/concert-pitch-02-ref.mscx index 142a41cbdd..2c1b03faf7 100644 --- a/mtest/libmscore/keysig/concert-pitch-02-ref.mscx +++ b/mtest/libmscore/keysig/concert-pitch-02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/keysig/concert-pitch.mscx b/mtest/libmscore/keysig/concert-pitch.mscx index 142a41cbdd..2c1b03faf7 100644 --- a/mtest/libmscore/keysig/concert-pitch.mscx +++ b/mtest/libmscore/keysig/concert-pitch.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/keysig/keysig.mscx b/mtest/libmscore/keysig/keysig.mscx index e60f433fa4..8b7d0aab6e 100644 --- a/mtest/libmscore/keysig/keysig.mscx +++ b/mtest/libmscore/keysig/keysig.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/keysig/keysig01-ref.mscx b/mtest/libmscore/keysig/keysig01-ref.mscx index 3be54ee85d..d9b0320c76 100644 --- a/mtest/libmscore/keysig/keysig01-ref.mscx +++ b/mtest/libmscore/keysig/keysig01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/keysig/keysig02-ref.mscx b/mtest/libmscore/keysig/keysig02-ref.mscx index ef1e47b875..b8663a061a 100644 --- a/mtest/libmscore/keysig/keysig02-ref.mscx +++ b/mtest/libmscore/keysig/keysig02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/keysig/keysig_78216.mscx b/mtest/libmscore/keysig/keysig_78216.mscx index c5445ce005..2c966c0934 100644 --- a/mtest/libmscore/keysig/keysig_78216.mscx +++ b/mtest/libmscore/keysig/keysig_78216.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/layout/goldberg.mscx b/mtest/libmscore/layout/goldberg.mscx index f777b3add6..92efb00cbf 100644 --- a/mtest/libmscore/layout/goldberg.mscx +++ b/mtest/libmscore/layout/goldberg.mscx @@ -71,22 +71,6 @@ 14 1 - - 1683.78 - 1190.55 - - 96.378 - 79.3701 - 102.047 - 102.047 - - - 79.3701 - 96.378 - 102.047 - 102.047 - - 1.6 1 diff --git a/mtest/libmscore/measure/checkMeasure.mscx b/mtest/libmscore/measure/checkMeasure.mscx index 779fabc6ae..156c464120 100644 --- a/mtest/libmscore/measure/checkMeasure.mscx +++ b/mtest/libmscore/measure/checkMeasure.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/measure/gaps.mscx b/mtest/libmscore/measure/gaps.mscx index 2b4519dddb..423a175e4f 100644 --- a/mtest/libmscore/measure/gaps.mscx +++ b/mtest/libmscore/measure/gaps.mscx @@ -6,22 +6,6 @@ 480 1 @@ -305,22 +289,6 @@ 1 diff --git a/mtest/libmscore/measure/measure-1-ref.mscx b/mtest/libmscore/measure/measure-1-ref.mscx index d8391c92f6..3ac42c4862 100644 --- a/mtest/libmscore/measure/measure-1-ref.mscx +++ b/mtest/libmscore/measure/measure-1-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -318,22 +302,6 @@ 480 1 @@ -552,22 +520,6 @@ 480 1 diff --git a/mtest/libmscore/measure/measure-1.mscx b/mtest/libmscore/measure/measure-1.mscx index 5d1f08ff84..23207078a6 100644 --- a/mtest/libmscore/measure/measure-1.mscx +++ b/mtest/libmscore/measure/measure-1.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -297,22 +281,6 @@ 480 1 @@ -517,22 +485,6 @@ 480 1 diff --git a/mtest/libmscore/measure/measure-10-ref.mscx b/mtest/libmscore/measure/measure-10-ref.mscx index c5da62a87f..77f40236d3 100644 --- a/mtest/libmscore/measure/measure-10-ref.mscx +++ b/mtest/libmscore/measure/measure-10-ref.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-10.mscx b/mtest/libmscore/measure/measure-10.mscx index eec592cd63..c1b82762cd 100644 --- a/mtest/libmscore/measure/measure-10.mscx +++ b/mtest/libmscore/measure/measure-10.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-2-ref.mscx b/mtest/libmscore/measure/measure-2-ref.mscx index 2b74988834..1b7005ea50 100644 --- a/mtest/libmscore/measure/measure-2-ref.mscx +++ b/mtest/libmscore/measure/measure-2-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -315,22 +299,6 @@ 480 1 @@ -547,22 +515,6 @@ 480 1 diff --git a/mtest/libmscore/measure/measure-2.mscx b/mtest/libmscore/measure/measure-2.mscx index b7212dd2cc..046463f782 100644 --- a/mtest/libmscore/measure/measure-2.mscx +++ b/mtest/libmscore/measure/measure-2.mscx @@ -9,16 +9,6 @@ 1.3 0.08 -2 - - 1584 - 1224 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.6 1 diff --git a/mtest/libmscore/measure/measure-3-ref.mscx b/mtest/libmscore/measure/measure-3-ref.mscx index 9e62b0ca2b..1f5bdc329e 100644 --- a/mtest/libmscore/measure/measure-3-ref.mscx +++ b/mtest/libmscore/measure/measure-3-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -318,22 +302,6 @@ 480 1 @@ -552,22 +520,6 @@ 480 1 diff --git a/mtest/libmscore/measure/measure-3.mscx b/mtest/libmscore/measure/measure-3.mscx index 918cb66c2a..f96e99897a 100644 --- a/mtest/libmscore/measure/measure-3.mscx +++ b/mtest/libmscore/measure/measure-3.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-4-ref.mscx b/mtest/libmscore/measure/measure-4-ref.mscx index e3519ac682..e5dde49ba9 100644 --- a/mtest/libmscore/measure/measure-4-ref.mscx +++ b/mtest/libmscore/measure/measure-4-ref.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-4.mscx b/mtest/libmscore/measure/measure-4.mscx index 4f6ede0873..14e55f796d 100644 --- a/mtest/libmscore/measure/measure-4.mscx +++ b/mtest/libmscore/measure/measure-4.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-5-ref.mscx b/mtest/libmscore/measure/measure-5-ref.mscx index 02c139fca7..efc5be97f2 100644 --- a/mtest/libmscore/measure/measure-5-ref.mscx +++ b/mtest/libmscore/measure/measure-5-ref.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-6-ref.mscx b/mtest/libmscore/measure/measure-6-ref.mscx index 67201cd857..038571dd85 100644 --- a/mtest/libmscore/measure/measure-6-ref.mscx +++ b/mtest/libmscore/measure/measure-6-ref.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-6.mscx b/mtest/libmscore/measure/measure-6.mscx index e05b8661b9..7370ed246a 100644 --- a/mtest/libmscore/measure/measure-6.mscx +++ b/mtest/libmscore/measure/measure-6.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-7-ref.mscx b/mtest/libmscore/measure/measure-7-ref.mscx index 4f6ede0873..14e55f796d 100644 --- a/mtest/libmscore/measure/measure-7-ref.mscx +++ b/mtest/libmscore/measure/measure-7-ref.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-7.mscx b/mtest/libmscore/measure/measure-7.mscx index 918cb66c2a..f96e99897a 100644 --- a/mtest/libmscore/measure/measure-7.mscx +++ b/mtest/libmscore/measure/measure-7.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-8-ref.mscx b/mtest/libmscore/measure/measure-8-ref.mscx index 5ef5ad7007..d6a2ece812 100644 --- a/mtest/libmscore/measure/measure-8-ref.mscx +++ b/mtest/libmscore/measure/measure-8-ref.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-8.mscx b/mtest/libmscore/measure/measure-8.mscx index 8c5a991366..2b01a13e5e 100644 --- a/mtest/libmscore/measure/measure-8.mscx +++ b/mtest/libmscore/measure/measure-8.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-9-ref.mscx b/mtest/libmscore/measure/measure-9-ref.mscx index 1d3cd03af4..eed7749af4 100644 --- a/mtest/libmscore/measure/measure-9-ref.mscx +++ b/mtest/libmscore/measure/measure-9-ref.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-9.mscx b/mtest/libmscore/measure/measure-9.mscx index e05b8661b9..7370ed246a 100644 --- a/mtest/libmscore/measure/measure-9.mscx +++ b/mtest/libmscore/measure/measure-9.mscx @@ -17,22 +17,6 @@ 0.5 -2 1 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/measure/measure-insert_bf_clef-2-ref.mscx b/mtest/libmscore/measure/measure-insert_bf_clef-2-ref.mscx index d7c05fa036..add0fd7bf7 100644 --- a/mtest/libmscore/measure/measure-insert_bf_clef-2-ref.mscx +++ b/mtest/libmscore/measure/measure-insert_bf_clef-2-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/measure/measure-insert_bf_clef-ref.mscx b/mtest/libmscore/measure/measure-insert_bf_clef-ref.mscx index ba690e6a14..4638322bf2 100644 --- a/mtest/libmscore/measure/measure-insert_bf_clef-ref.mscx +++ b/mtest/libmscore/measure/measure-insert_bf_clef-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/measure/measure-insert_bf_clef.mscx b/mtest/libmscore/measure/measure-insert_bf_clef.mscx index dca1d52cb8..fc6c21d353 100644 --- a/mtest/libmscore/measure/measure-insert_bf_clef.mscx +++ b/mtest/libmscore/measure/measure-insert_bf_clef.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/measure/measure-insert_bf_key-2-ref.mscx b/mtest/libmscore/measure/measure-insert_bf_key-2-ref.mscx index f720c0e964..be70d6c24d 100644 --- a/mtest/libmscore/measure/measure-insert_bf_key-2-ref.mscx +++ b/mtest/libmscore/measure/measure-insert_bf_key-2-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/measure/measure-insert_bf_key-ref.mscx b/mtest/libmscore/measure/measure-insert_bf_key-ref.mscx index 4484eb4edf..4bed2db459 100644 --- a/mtest/libmscore/measure/measure-insert_bf_key-ref.mscx +++ b/mtest/libmscore/measure/measure-insert_bf_key-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/measure/measure-insert_bf_key.mscx b/mtest/libmscore/measure/measure-insert_bf_key.mscx index cdeddf7e00..ef6e29453d 100644 --- a/mtest/libmscore/measure/measure-insert_bf_key.mscx +++ b/mtest/libmscore/measure/measure-insert_bf_key.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testAndanteExcerpts.mscx b/mtest/libmscore/midi/testAndanteExcerpts.mscx index 33a90223df..5e940209cd 100644 --- a/mtest/libmscore/midi/testAndanteExcerpts.mscx +++ b/mtest/libmscore/midi/testAndanteExcerpts.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testBaroqueOrnaments.mscx b/mtest/libmscore/midi/testBaroqueOrnaments.mscx index 48522b1e33..a20a263273 100644 --- a/mtest/libmscore/midi/testBaroqueOrnaments.mscx +++ b/mtest/libmscore/midi/testBaroqueOrnaments.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testBeforeAfterGraceTrill.mscx b/mtest/libmscore/midi/testBeforeAfterGraceTrill.mscx index 9f9a2e8da2..9394b53507 100644 --- a/mtest/libmscore/midi/testBeforeAfterGraceTrill.mscx +++ b/mtest/libmscore/midi/testBeforeAfterGraceTrill.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testBeforeAfterGraceTrillPlay=false.mscx b/mtest/libmscore/midi/testBeforeAfterGraceTrillPlay=false.mscx index 684c1afc62..98fdce0a72 100644 --- a/mtest/libmscore/midi/testBeforeAfterGraceTrillPlay=false.mscx +++ b/mtest/libmscore/midi/testBeforeAfterGraceTrillPlay=false.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testBends1.mscx b/mtest/libmscore/midi/testBends1.mscx index 3212b30495..81158d65c5 100644 --- a/mtest/libmscore/midi/testBends1.mscx +++ b/mtest/libmscore/midi/testBends1.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testBends2.mscx b/mtest/libmscore/midi/testBends2.mscx index f831b90a64..74f1d8bc15 100644 --- a/mtest/libmscore/midi/testBends2.mscx +++ b/mtest/libmscore/midi/testBends2.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testGlissando-71826.mscx b/mtest/libmscore/midi/testGlissando-71826.mscx index 1b4811cd31..b7384672b4 100644 --- a/mtest/libmscore/midi/testGlissando-71826.mscx +++ b/mtest/libmscore/midi/testGlissando-71826.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testGlissando.mscx b/mtest/libmscore/midi/testGlissando.mscx index cfde4d27e0..588d48dc1d 100644 --- a/mtest/libmscore/midi/testGlissando.mscx +++ b/mtest/libmscore/midi/testGlissando.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testGlissandoAcrossStaffs.mscx b/mtest/libmscore/midi/testGlissandoAcrossStaffs.mscx index c9fb7f72e8..5a030b8fc4 100644 --- a/mtest/libmscore/midi/testGlissandoAcrossStaffs.mscx +++ b/mtest/libmscore/midi/testGlissandoAcrossStaffs.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testGraceBefore.mscx b/mtest/libmscore/midi/testGraceBefore.mscx index 92d900550b..6ce52d5e61 100644 --- a/mtest/libmscore/midi/testGraceBefore.mscx +++ b/mtest/libmscore/midi/testGraceBefore.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testKantataBWV140Excerpts.mscx b/mtest/libmscore/midi/testKantataBWV140Excerpts.mscx index 2991dd87d7..34ce5d6127 100644 --- a/mtest/libmscore/midi/testKantataBWV140Excerpts.mscx +++ b/mtest/libmscore/midi/testKantataBWV140Excerpts.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testMetronomeAnacrusis.mscx b/mtest/libmscore/midi/testMetronomeAnacrusis.mscx index 0d45789af6..dd39a4d1d6 100644 --- a/mtest/libmscore/midi/testMetronomeAnacrusis.mscx +++ b/mtest/libmscore/midi/testMetronomeAnacrusis.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testMetronomeCompound.mscx b/mtest/libmscore/midi/testMetronomeCompound.mscx index 0defb5fcac..030e299156 100644 --- a/mtest/libmscore/midi/testMetronomeCompound.mscx +++ b/mtest/libmscore/midi/testMetronomeCompound.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testMetronomeSimple.mscx b/mtest/libmscore/midi/testMetronomeSimple.mscx index bb59af5ad2..0a7cc045fb 100644 --- a/mtest/libmscore/midi/testMetronomeSimple.mscx +++ b/mtest/libmscore/midi/testMetronomeSimple.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testMidiPort.mscx b/mtest/libmscore/midi/testMidiPort.mscx index acc353c5e3..7ac0a36f5b 100644 --- a/mtest/libmscore/midi/testMidiPort.mscx +++ b/mtest/libmscore/midi/testMidiPort.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testMordents.mscx b/mtest/libmscore/midi/testMordents.mscx index 989016ed0a..8f8aa0132d 100644 --- a/mtest/libmscore/midi/testMordents.mscx +++ b/mtest/libmscore/midi/testMordents.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testMultiNoteTremolo.mscx b/mtest/libmscore/midi/testMultiNoteTremolo.mscx index f2c3ec402d..90c0cfabf9 100644 --- a/mtest/libmscore/midi/testMultiNoteTremolo.mscx +++ b/mtest/libmscore/midi/testMultiNoteTremolo.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testOrnamentAccidentals.mscx b/mtest/libmscore/midi/testOrnamentAccidentals.mscx index 593bfa00ac..91ac5b9377 100644 --- a/mtest/libmscore/midi/testOrnamentAccidentals.mscx +++ b/mtest/libmscore/midi/testOrnamentAccidentals.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testOrnaments.mscx b/mtest/libmscore/midi/testOrnaments.mscx index 08785c1400..5a9506421e 100644 --- a/mtest/libmscore/midi/testOrnaments.mscx +++ b/mtest/libmscore/midi/testOrnaments.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testPedal.mscx b/mtest/libmscore/midi/testPedal.mscx index 92a36e9462..d9dbbd634d 100644 --- a/mtest/libmscore/midi/testPedal.mscx +++ b/mtest/libmscore/midi/testPedal.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testSwing16thDots.mscx b/mtest/libmscore/midi/testSwing16thDots.mscx index dacd64bcc7..2f2d03050c 100644 --- a/mtest/libmscore/midi/testSwing16thDots.mscx +++ b/mtest/libmscore/midi/testSwing16thDots.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwing16thSimple.mscx b/mtest/libmscore/midi/testSwing16thSimple.mscx index 6422b3189e..433040ec6c 100644 --- a/mtest/libmscore/midi/testSwing16thSimple.mscx +++ b/mtest/libmscore/midi/testSwing16thSimple.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwing16thTies.mscx b/mtest/libmscore/midi/testSwing16thTies.mscx index 55bd00b6ed..7fc8d33e8c 100644 --- a/mtest/libmscore/midi/testSwing16thTies.mscx +++ b/mtest/libmscore/midi/testSwing16thTies.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwing16thTriplets.mscx b/mtest/libmscore/midi/testSwing16thTriplets.mscx index f85a5728ae..fac958c1c0 100644 --- a/mtest/libmscore/midi/testSwing16thTriplets.mscx +++ b/mtest/libmscore/midi/testSwing16thTriplets.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwing8thDots.mscx b/mtest/libmscore/midi/testSwing8thDots.mscx index 23a5bc7dd3..838bc2be16 100644 --- a/mtest/libmscore/midi/testSwing8thDots.mscx +++ b/mtest/libmscore/midi/testSwing8thDots.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwing8thSimple.mscx b/mtest/libmscore/midi/testSwing8thSimple.mscx index 4c59f5c3db..b09c74e544 100644 --- a/mtest/libmscore/midi/testSwing8thSimple.mscx +++ b/mtest/libmscore/midi/testSwing8thSimple.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwing8thTies.mscx b/mtest/libmscore/midi/testSwing8thTies.mscx index 19831154a2..1eff9c704d 100644 --- a/mtest/libmscore/midi/testSwing8thTies.mscx +++ b/mtest/libmscore/midi/testSwing8thTies.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwing8thTriplets.mscx b/mtest/libmscore/midi/testSwing8thTriplets.mscx index 4bbb33f9c1..7c6a354d49 100644 --- a/mtest/libmscore/midi/testSwing8thTriplets.mscx +++ b/mtest/libmscore/midi/testSwing8thTriplets.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwingOdd.mscx b/mtest/libmscore/midi/testSwingOdd.mscx index 5ba4101ad3..33323914df 100644 --- a/mtest/libmscore/midi/testSwingOdd.mscx +++ b/mtest/libmscore/midi/testSwingOdd.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testSwingPickup.mscx b/mtest/libmscore/midi/testSwingPickup.mscx index 9aafa49ee7..832d85604c 100644 --- a/mtest/libmscore/midi/testSwingPickup.mscx +++ b/mtest/libmscore/midi/testSwingPickup.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testSwingStyleText.mscx b/mtest/libmscore/midi/testSwingStyleText.mscx index b605f28bdb..07a2d1e166 100644 --- a/mtest/libmscore/midi/testSwingStyleText.mscx +++ b/mtest/libmscore/midi/testSwingStyleText.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/midi/testSwingTexts.mscx b/mtest/libmscore/midi/testSwingTexts.mscx index ededf3eeb1..316a98bb90 100644 --- a/mtest/libmscore/midi/testSwingTexts.mscx +++ b/mtest/libmscore/midi/testSwingTexts.mscx @@ -18,22 +18,6 @@ 1 1 - - 1584 - 1224 - - 56.6929 - 90.1417 - 56.6929 - 113.386 - - - 56.6929 - 90.1417 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/midi/testTieTrill.mscx b/mtest/libmscore/midi/testTieTrill.mscx index 1f6fa605f1..1f6f8b4a85 100644 --- a/mtest/libmscore/midi/testTieTrill.mscx +++ b/mtest/libmscore/midi/testTieTrill.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testTrillCrossStaff.mscx b/mtest/libmscore/midi/testTrillCrossStaff.mscx index be156ccbb2..6541545443 100644 --- a/mtest/libmscore/midi/testTrillCrossStaff.mscx +++ b/mtest/libmscore/midi/testTrillCrossStaff.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midi/testTrillLines.mscx b/mtest/libmscore/midi/testTrillLines.mscx index ba282253c4..e54170b322 100644 --- a/mtest/libmscore/midi/testTrillLines.mscx +++ b/mtest/libmscore/midi/testTrillLines.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testTrillTempos.mscx b/mtest/libmscore/midi/testTrillTempos.mscx index 11769a1afc..d83babba74 100644 --- a/mtest/libmscore/midi/testTrillTempos.mscx +++ b/mtest/libmscore/midi/testTrillTempos.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midi/testTrillTransposingInstrument.mscx b/mtest/libmscore/midi/testTrillTransposingInstrument.mscx index 31070c5149..0d40fe4d1c 100644 --- a/mtest/libmscore/midi/testTrillTransposingInstrument.mscx +++ b/mtest/libmscore/midi/testTrillTransposingInstrument.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test14-ref.mscx b/mtest/libmscore/midimapping/test14-ref.mscx index 6d205ad814..bc1928093b 100644 --- a/mtest/libmscore/midimapping/test14-ref.mscx +++ b/mtest/libmscore/midimapping/test14-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -759,22 +743,6 @@ 480 1 @@ -898,22 +866,6 @@ 480 1 @@ -1032,22 +984,6 @@ 480 1 @@ -1166,22 +1102,6 @@ 480 1 @@ -1300,22 +1220,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test15-ref.mscx b/mtest/libmscore/midimapping/test15-ref.mscx index cc007798db..26b7b18eed 100644 --- a/mtest/libmscore/midimapping/test15-ref.mscx +++ b/mtest/libmscore/midimapping/test15-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -774,22 +758,6 @@ 480 1 @@ -924,22 +892,6 @@ 480 1 @@ -1069,22 +1021,6 @@ 480 1 @@ -1214,22 +1150,6 @@ 480 1 @@ -1359,22 +1279,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test16-ref.mscx b/mtest/libmscore/midimapping/test16-ref.mscx index b0a87a7a4d..bc4e5303ad 100644 --- a/mtest/libmscore/midimapping/test16-ref.mscx +++ b/mtest/libmscore/midimapping/test16-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -769,22 +753,6 @@ 480 1 @@ -914,22 +882,6 @@ 480 1 @@ -1054,22 +1006,6 @@ 480 1 @@ -1194,22 +1130,6 @@ 480 1 @@ -1334,22 +1254,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test17-ref.mscx b/mtest/libmscore/midimapping/test17-ref.mscx index 1fcf136da9..d53095bf57 100644 --- a/mtest/libmscore/midimapping/test17-ref.mscx +++ b/mtest/libmscore/midimapping/test17-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -1049,22 +1033,6 @@ 480 1 @@ -1274,22 +1242,6 @@ 480 1 @@ -1499,22 +1451,6 @@ 480 1 @@ -1724,22 +1660,6 @@ 480 1 @@ -1949,22 +1869,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test18-ref.mscx b/mtest/libmscore/midimapping/test18-ref.mscx index 3aac43c167..7659b2ecb4 100755 --- a/mtest/libmscore/midimapping/test18-ref.mscx +++ b/mtest/libmscore/midimapping/test18-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/midimapping/test1withDrums.mscx b/mtest/libmscore/midimapping/test1withDrums.mscx index 74d9b155dc..9a58479976 100644 --- a/mtest/libmscore/midimapping/test1withDrums.mscx +++ b/mtest/libmscore/midimapping/test1withDrums.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test1withoutDrums.mscx b/mtest/libmscore/midimapping/test1withoutDrums.mscx index ee4b89dcc0..8f1e50f025 100644 --- a/mtest/libmscore/midimapping/test1withoutDrums.mscx +++ b/mtest/libmscore/midimapping/test1withoutDrums.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test2.mscx b/mtest/libmscore/midimapping/test2.mscx index 68c74072ba..cd4c036089 100644 --- a/mtest/libmscore/midimapping/test2.mscx +++ b/mtest/libmscore/midimapping/test2.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test3withMapping.mscx b/mtest/libmscore/midimapping/test3withMapping.mscx index b84c2cddd2..4a90da6f35 100644 --- a/mtest/libmscore/midimapping/test3withMapping.mscx +++ b/mtest/libmscore/midimapping/test3withMapping.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test3withoutMapping.mscx b/mtest/libmscore/midimapping/test3withoutMapping.mscx index 2f7b6fe9e3..c5e0b59ca4 100644 --- a/mtest/libmscore/midimapping/test3withoutMapping.mscx +++ b/mtest/libmscore/midimapping/test3withoutMapping.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test6-ref.mscx b/mtest/libmscore/midimapping/test6-ref.mscx index 6b1cb52a9a..bc56c8a71e 100644 --- a/mtest/libmscore/midimapping/test6-ref.mscx +++ b/mtest/libmscore/midimapping/test6-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test7-ref.mscx b/mtest/libmscore/midimapping/test7-ref.mscx index 2f7b6fe9e3..c5e0b59ca4 100644 --- a/mtest/libmscore/midimapping/test7-ref.mscx +++ b/mtest/libmscore/midimapping/test7-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test8-ref.mscx b/mtest/libmscore/midimapping/test8-ref.mscx index ee4b89dcc0..8f1e50f025 100644 --- a/mtest/libmscore/midimapping/test8-ref.mscx +++ b/mtest/libmscore/midimapping/test8-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/midimapping/test9-ref.mscx b/mtest/libmscore/midimapping/test9-ref.mscx index e3c04cb692..974502b817 100644 --- a/mtest/libmscore/midimapping/test9-ref.mscx +++ b/mtest/libmscore/midimapping/test9-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/note/empty.mscx b/mtest/libmscore/note/empty.mscx index b54b8e9391..de3f0fb0e6 100644 --- a/mtest/libmscore/note/empty.mscx +++ b/mtest/libmscore/note/empty.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/note/grace-ref.mscx b/mtest/libmscore/note/grace-ref.mscx index a2710cbea8..e4cf2fb07a 100644 --- a/mtest/libmscore/note/grace-ref.mscx +++ b/mtest/libmscore/note/grace-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/note/grace.mscx b/mtest/libmscore/note/grace.mscx index 7dfa5646dd..08206c7137 100644 --- a/mtest/libmscore/note/grace.mscx +++ b/mtest/libmscore/note/grace.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/note/notelimits-ref.mscx b/mtest/libmscore/note/notelimits-ref.mscx index 9c9d34410a..196ab9661c 100644 --- a/mtest/libmscore/note/notelimits-ref.mscx +++ b/mtest/libmscore/note/notelimits-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/note/tpc-ref.mscx b/mtest/libmscore/note/tpc-ref.mscx index af0dcaa66d..d8073669ee 100644 --- a/mtest/libmscore/note/tpc-ref.mscx +++ b/mtest/libmscore/note/tpc-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/note/tpc-transpose-ref.mscx b/mtest/libmscore/note/tpc-transpose-ref.mscx index 7948a5d6e1..52ddbfb518 100644 --- a/mtest/libmscore/note/tpc-transpose-ref.mscx +++ b/mtest/libmscore/note/tpc-transpose-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/note/tpc-transpose.mscx b/mtest/libmscore/note/tpc-transpose.mscx index 72cf286258..a4d7603ba8 100644 --- a/mtest/libmscore/note/tpc-transpose.mscx +++ b/mtest/libmscore/note/tpc-transpose.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/note/tpc-transpose2-ref.mscx b/mtest/libmscore/note/tpc-transpose2-ref.mscx index 546fbbdd02..2b35f08180 100644 --- a/mtest/libmscore/note/tpc-transpose2-ref.mscx +++ b/mtest/libmscore/note/tpc-transpose2-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/note/tpc-transpose2.mscx b/mtest/libmscore/note/tpc-transpose2.mscx index 09745a6122..981127cb95 100644 --- a/mtest/libmscore/note/tpc-transpose2.mscx +++ b/mtest/libmscore/note/tpc-transpose2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/note/tpc.mscx b/mtest/libmscore/note/tpc.mscx index 8c144cc0ef..5e9048014c 100644 --- a/mtest/libmscore/note/tpc.mscx +++ b/mtest/libmscore/note/tpc.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/parts/part-54346-parts.mscx b/mtest/libmscore/parts/part-54346-parts.mscx index 779ec1e58a..3a2a5e94e0 100644 --- a/mtest/libmscore/parts/part-54346-parts.mscx +++ b/mtest/libmscore/parts/part-54346-parts.mscx @@ -6,22 +6,6 @@ 480 1 @@ -287,22 +271,6 @@ 480 1 @@ -463,22 +431,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-54346.mscx b/mtest/libmscore/parts/part-54346.mscx index 8db279eb40..4393fe77a7 100644 --- a/mtest/libmscore/parts/part-54346.mscx +++ b/mtest/libmscore/parts/part-54346.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-all-appendmeasures.mscx b/mtest/libmscore/parts/part-all-appendmeasures.mscx index 45fd6de438..bea4c19cc5 100644 --- a/mtest/libmscore/parts/part-all-appendmeasures.mscx +++ b/mtest/libmscore/parts/part-all-appendmeasures.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -926,22 +910,6 @@ 480 1 @@ -1479,22 +1447,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-all-insertmeasures.mscx b/mtest/libmscore/parts/part-all-insertmeasures.mscx index b2915ec2da..b6a60c1472 100644 --- a/mtest/libmscore/parts/part-all-insertmeasures.mscx +++ b/mtest/libmscore/parts/part-all-insertmeasures.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -930,22 +914,6 @@ p, li { white-space: pre-wrap; } 480 1 @@ -1474,22 +1442,6 @@ p, li { white-space: pre-wrap; } 480 1 diff --git a/mtest/libmscore/parts/part-all-parts.mscx b/mtest/libmscore/parts/part-all-parts.mscx index 2f85f2af64..72ae3ea1ff 100644 --- a/mtest/libmscore/parts/part-all-parts.mscx +++ b/mtest/libmscore/parts/part-all-parts.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -912,22 +896,6 @@ 480 1 @@ -1458,22 +1426,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-all-uappendmeasures.mscx b/mtest/libmscore/parts/part-all-uappendmeasures.mscx index 2f85f2af64..72ae3ea1ff 100644 --- a/mtest/libmscore/parts/part-all-uappendmeasures.mscx +++ b/mtest/libmscore/parts/part-all-uappendmeasures.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -912,22 +896,6 @@ 480 1 @@ -1458,22 +1426,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-all-uinsertmeasures.mscx b/mtest/libmscore/parts/part-all-uinsertmeasures.mscx index 2f85f2af64..72ae3ea1ff 100644 --- a/mtest/libmscore/parts/part-all-uinsertmeasures.mscx +++ b/mtest/libmscore/parts/part-all-uinsertmeasures.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -912,22 +896,6 @@ 480 1 @@ -1458,22 +1426,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-all.mscx b/mtest/libmscore/parts/part-all.mscx index a5a04de02e..c04652fc58 100644 --- a/mtest/libmscore/parts/part-all.mscx +++ b/mtest/libmscore/parts/part-all.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/parts/part-breath-add.mscx b/mtest/libmscore/parts/part-breath-add.mscx index 7752b88b4a..7eb1e1b71c 100644 --- a/mtest/libmscore/parts/part-breath-add.mscx +++ b/mtest/libmscore/parts/part-breath-add.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-breath-del.mscx b/mtest/libmscore/parts/part-breath-del.mscx index 6d95a64768..ec8e8bfdfd 100644 --- a/mtest/libmscore/parts/part-breath-del.mscx +++ b/mtest/libmscore/parts/part-breath-del.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-breath-parts.mscx b/mtest/libmscore/parts/part-breath-parts.mscx index b27205aa0a..c1abb636f6 100644 --- a/mtest/libmscore/parts/part-breath-parts.mscx +++ b/mtest/libmscore/parts/part-breath-parts.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -674,22 +658,6 @@ 480 1 @@ -1039,22 +1007,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-breath-uadd.mscx b/mtest/libmscore/parts/part-breath-uadd.mscx index 6d95a64768..ec8e8bfdfd 100644 --- a/mtest/libmscore/parts/part-breath-uadd.mscx +++ b/mtest/libmscore/parts/part-breath-uadd.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-breath-udel.mscx b/mtest/libmscore/parts/part-breath-udel.mscx index eac3195361..888f6bab75 100644 --- a/mtest/libmscore/parts/part-breath-udel.mscx +++ b/mtest/libmscore/parts/part-breath-udel.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-breath-uradd.mscx b/mtest/libmscore/parts/part-breath-uradd.mscx index 61d80f16f6..3cfe802929 100644 --- a/mtest/libmscore/parts/part-breath-uradd.mscx +++ b/mtest/libmscore/parts/part-breath-uradd.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-breath-urdel.mscx b/mtest/libmscore/parts/part-breath-urdel.mscx index 6d95a64768..ec8e8bfdfd 100644 --- a/mtest/libmscore/parts/part-breath-urdel.mscx +++ b/mtest/libmscore/parts/part-breath-urdel.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-breath.mscx b/mtest/libmscore/parts/part-breath.mscx index 2a8a1431ad..49b7bd3d41 100644 --- a/mtest/libmscore/parts/part-breath.mscx +++ b/mtest/libmscore/parts/part-breath.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/parts/part-chordline-add.mscx b/mtest/libmscore/parts/part-chordline-add.mscx index 02f72c6faf..5665942673 100644 --- a/mtest/libmscore/parts/part-chordline-add.mscx +++ b/mtest/libmscore/parts/part-chordline-add.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-chordline-del.mscx b/mtest/libmscore/parts/part-chordline-del.mscx index a9f921316e..4da30f1083 100644 --- a/mtest/libmscore/parts/part-chordline-del.mscx +++ b/mtest/libmscore/parts/part-chordline-del.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -656,22 +640,6 @@ 480 1 @@ -1007,22 +975,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-chordline-parts.mscx b/mtest/libmscore/parts/part-chordline-parts.mscx index 7b35057fa5..6a5822b9f4 100644 --- a/mtest/libmscore/parts/part-chordline-parts.mscx +++ b/mtest/libmscore/parts/part-chordline-parts.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -660,22 +644,6 @@ 480 1 @@ -1015,22 +983,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-chordline-uadd.mscx b/mtest/libmscore/parts/part-chordline-uadd.mscx index 6d95a64768..ec8e8bfdfd 100644 --- a/mtest/libmscore/parts/part-chordline-uadd.mscx +++ b/mtest/libmscore/parts/part-chordline-uadd.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-chordline-udel.mscx b/mtest/libmscore/parts/part-chordline-udel.mscx index cfb523b432..98b56a92c5 100644 --- a/mtest/libmscore/parts/part-chordline-udel.mscx +++ b/mtest/libmscore/parts/part-chordline-udel.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -660,22 +644,6 @@ 480 1 @@ -1015,22 +983,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-chordline-uradd.mscx b/mtest/libmscore/parts/part-chordline-uradd.mscx index 7db913f5fa..f16569db81 100644 --- a/mtest/libmscore/parts/part-chordline-uradd.mscx +++ b/mtest/libmscore/parts/part-chordline-uradd.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-chordline-urdel.mscx b/mtest/libmscore/parts/part-chordline-urdel.mscx index a9f921316e..4da30f1083 100644 --- a/mtest/libmscore/parts/part-chordline-urdel.mscx +++ b/mtest/libmscore/parts/part-chordline-urdel.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -656,22 +640,6 @@ 480 1 @@ -1007,22 +975,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-chordline.mscx b/mtest/libmscore/parts/part-chordline.mscx index 06a15e7709..d3a8ab356c 100644 --- a/mtest/libmscore/parts/part-chordline.mscx +++ b/mtest/libmscore/parts/part-chordline.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/parts/part-empty-parts.mscx b/mtest/libmscore/parts/part-empty-parts.mscx index 02e0d1ed34..7ed7d457a4 100644 --- a/mtest/libmscore/parts/part-empty-parts.mscx +++ b/mtest/libmscore/parts/part-empty-parts.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-empty.mscx b/mtest/libmscore/parts/part-empty.mscx index 37386d7f20..2f987933c5 100644 --- a/mtest/libmscore/parts/part-empty.mscx +++ b/mtest/libmscore/parts/part-empty.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/parts/part-fingering-add.mscx b/mtest/libmscore/parts/part-fingering-add.mscx index 50f12dc2a0..8827e3a8b8 100644 --- a/mtest/libmscore/parts/part-fingering-add.mscx +++ b/mtest/libmscore/parts/part-fingering-add.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-fingering-del.mscx b/mtest/libmscore/parts/part-fingering-del.mscx index 77b26bcb53..6f1d9830f7 100644 --- a/mtest/libmscore/parts/part-fingering-del.mscx +++ b/mtest/libmscore/parts/part-fingering-del.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -666,22 +650,6 @@ 480 1 @@ -1027,22 +995,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-fingering-parts.mscx b/mtest/libmscore/parts/part-fingering-parts.mscx index 6730b4a213..ddb6ee44e0 100644 --- a/mtest/libmscore/parts/part-fingering-parts.mscx +++ b/mtest/libmscore/parts/part-fingering-parts.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -671,22 +655,6 @@ 480 1 @@ -1037,22 +1005,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-fingering-uadd.mscx b/mtest/libmscore/parts/part-fingering-uadd.mscx index 6d95a64768..ec8e8bfdfd 100644 --- a/mtest/libmscore/parts/part-fingering-uadd.mscx +++ b/mtest/libmscore/parts/part-fingering-uadd.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-fingering-udel.mscx b/mtest/libmscore/parts/part-fingering-udel.mscx index 53c546e2e5..bf059e5696 100644 --- a/mtest/libmscore/parts/part-fingering-udel.mscx +++ b/mtest/libmscore/parts/part-fingering-udel.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -671,22 +655,6 @@ 480 1 @@ -1037,22 +1005,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-fingering-uradd.mscx b/mtest/libmscore/parts/part-fingering-uradd.mscx index f744b2b084..7517e37026 100644 --- a/mtest/libmscore/parts/part-fingering-uradd.mscx +++ b/mtest/libmscore/parts/part-fingering-uradd.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-fingering-urdel.mscx b/mtest/libmscore/parts/part-fingering-urdel.mscx index 77b26bcb53..6f1d9830f7 100644 --- a/mtest/libmscore/parts/part-fingering-urdel.mscx +++ b/mtest/libmscore/parts/part-fingering-urdel.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -666,22 +650,6 @@ 480 1 @@ -1027,22 +995,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-fingering.mscx b/mtest/libmscore/parts/part-fingering.mscx index f138c8c031..acf89d1b35 100644 --- a/mtest/libmscore/parts/part-fingering.mscx +++ b/mtest/libmscore/parts/part-fingering.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/parts/part-image-parts.mscx b/mtest/libmscore/parts/part-image-parts.mscx index f7790e3bd1..9b5475bae8 100644 --- a/mtest/libmscore/parts/part-image-parts.mscx +++ b/mtest/libmscore/parts/part-image-parts.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -670,22 +654,6 @@ 480 1 @@ -1038,22 +1006,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-image.mscx b/mtest/libmscore/parts/part-image.mscx index 149310b517..ce9e81578b 100644 --- a/mtest/libmscore/parts/part-image.mscx +++ b/mtest/libmscore/parts/part-image.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/parts/part-symbol-add.mscx b/mtest/libmscore/parts/part-symbol-add.mscx index 7164fb6c6c..e5cf4cc3a2 100644 --- a/mtest/libmscore/parts/part-symbol-add.mscx +++ b/mtest/libmscore/parts/part-symbol-add.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-symbol-del.mscx b/mtest/libmscore/parts/part-symbol-del.mscx index 10673f6876..a6cd3cf477 100644 --- a/mtest/libmscore/parts/part-symbol-del.mscx +++ b/mtest/libmscore/parts/part-symbol-del.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-symbol-parts.mscx b/mtest/libmscore/parts/part-symbol-parts.mscx index bddd5b4cf1..489ccfea13 100644 --- a/mtest/libmscore/parts/part-symbol-parts.mscx +++ b/mtest/libmscore/parts/part-symbol-parts.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-symbol-uadd.mscx b/mtest/libmscore/parts/part-symbol-uadd.mscx index 6d95a64768..ec8e8bfdfd 100644 --- a/mtest/libmscore/parts/part-symbol-uadd.mscx +++ b/mtest/libmscore/parts/part-symbol-uadd.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-symbol-udel.mscx b/mtest/libmscore/parts/part-symbol-udel.mscx index a4dc060a46..ba2ea12d3b 100644 --- a/mtest/libmscore/parts/part-symbol-udel.mscx +++ b/mtest/libmscore/parts/part-symbol-udel.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-symbol-uradd.mscx b/mtest/libmscore/parts/part-symbol-uradd.mscx index acebb376ed..bf2304737c 100644 --- a/mtest/libmscore/parts/part-symbol-uradd.mscx +++ b/mtest/libmscore/parts/part-symbol-uradd.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -665,22 +649,6 @@ 480 1 @@ -1025,22 +993,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-symbol-urdel.mscx b/mtest/libmscore/parts/part-symbol-urdel.mscx index 10673f6876..a6cd3cf477 100644 --- a/mtest/libmscore/parts/part-symbol-urdel.mscx +++ b/mtest/libmscore/parts/part-symbol-urdel.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -661,22 +645,6 @@ 480 1 @@ -1017,22 +985,6 @@ 480 1 diff --git a/mtest/libmscore/parts/part-symbol.mscx b/mtest/libmscore/parts/part-symbol.mscx index 36002d63dc..a9f99fbb19 100644 --- a/mtest/libmscore/parts/part-symbol.mscx +++ b/mtest/libmscore/parts/part-symbol.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/parts/partStyle-score-ref.mscx b/mtest/libmscore/parts/partStyle-score-ref.mscx index 8f983c875d..ca11129ccd 100644 --- a/mtest/libmscore/parts/partStyle-score-ref.mscx +++ b/mtest/libmscore/parts/partStyle-score-ref.mscx @@ -7,22 +7,6 @@ 1 @@ -297,22 +281,6 @@ 1 @@ -479,22 +447,6 @@ 1 diff --git a/mtest/libmscore/parts/partStyle-score-reload-ref.mscx b/mtest/libmscore/parts/partStyle-score-reload-ref.mscx index eef3c4cc4d..5c7faf9335 100644 --- a/mtest/libmscore/parts/partStyle-score-reload-ref.mscx +++ b/mtest/libmscore/parts/partStyle-score-reload-ref.mscx @@ -6,22 +6,6 @@ 480 1 @@ -292,22 +276,6 @@ 1 @@ -466,22 +434,6 @@ 1 diff --git a/mtest/libmscore/parts/partStyle-score-reload.mscx b/mtest/libmscore/parts/partStyle-score-reload.mscx index 3fdea19d4b..c04d5d7724 100644 --- a/mtest/libmscore/parts/partStyle-score-reload.mscx +++ b/mtest/libmscore/parts/partStyle-score-reload.mscx @@ -14,22 +14,6 @@ Arial 48 - - 1190.55 - 1683.78 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.364 1 @@ -308,22 +292,6 @@ Arial 48 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 @@ -490,22 +458,6 @@ Arial 48 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/parts/partStyle.mscx b/mtest/libmscore/parts/partStyle.mscx index d2601e7097..676ec0c931 100644 --- a/mtest/libmscore/parts/partStyle.mscx +++ b/mtest/libmscore/parts/partStyle.mscx @@ -14,22 +14,6 @@ Arial 48 - - 1190.55 - 1683.78 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.364 1 diff --git a/mtest/libmscore/parts/voices-ref.mscx b/mtest/libmscore/parts/voices-ref.mscx index fd9dea1af5..c6a9ffa6bf 100644 --- a/mtest/libmscore/parts/voices-ref.mscx +++ b/mtest/libmscore/parts/voices-ref.mscx @@ -6,22 +6,6 @@ 480 1 @@ -925,22 +909,6 @@ 1 @@ -1435,22 +1403,6 @@ 1 diff --git a/mtest/libmscore/parts/voices.mscx b/mtest/libmscore/parts/voices.mscx index 66073ff992..7191cb1c0e 100644 --- a/mtest/libmscore/parts/voices.mscx +++ b/mtest/libmscore/parts/voices.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat01.mscx b/mtest/libmscore/repeat/repeat01.mscx index b71bb4fd7d..072388ca28 100644 --- a/mtest/libmscore/repeat/repeat01.mscx +++ b/mtest/libmscore/repeat/repeat01.mscx @@ -5,16 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat02.mscx b/mtest/libmscore/repeat/repeat02.mscx index 38f16fe728..a6fa2cb4b8 100644 --- a/mtest/libmscore/repeat/repeat02.mscx +++ b/mtest/libmscore/repeat/repeat02.mscx @@ -5,16 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat03.mscx b/mtest/libmscore/repeat/repeat03.mscx index c7ef0f7e07..bc9bc0a929 100644 --- a/mtest/libmscore/repeat/repeat03.mscx +++ b/mtest/libmscore/repeat/repeat03.mscx @@ -5,16 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat04.mscx b/mtest/libmscore/repeat/repeat04.mscx index 0d7a3b0277..ebe2c9fcee 100644 --- a/mtest/libmscore/repeat/repeat04.mscx +++ b/mtest/libmscore/repeat/repeat04.mscx @@ -70,16 +70,6 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'freeSans'; font-size:10pt; font-weight:400; font-style:normal;"> <p align="right" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">$p</p></body></html> - - 1584 - 1224 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/repeat/repeat05.mscx b/mtest/libmscore/repeat/repeat05.mscx index 1007224c84..7d094b341b 100644 --- a/mtest/libmscore/repeat/repeat05.mscx +++ b/mtest/libmscore/repeat/repeat05.mscx @@ -70,16 +70,6 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'freeSans'; font-size:10pt; font-weight:400; font-style:normal;"> <p align="right" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">$p</p></body></html> - - 1584 - 1224 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/repeat/repeat06.mscx b/mtest/libmscore/repeat/repeat06.mscx index 7428e9098d..dc38558f53 100644 --- a/mtest/libmscore/repeat/repeat06.mscx +++ b/mtest/libmscore/repeat/repeat06.mscx @@ -5,16 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat07.mscx b/mtest/libmscore/repeat/repeat07.mscx index 8bd46c7853..74e92ae577 100644 --- a/mtest/libmscore/repeat/repeat07.mscx +++ b/mtest/libmscore/repeat/repeat07.mscx @@ -5,16 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat08.mscx b/mtest/libmscore/repeat/repeat08.mscx index f3494a61c2..f2cd64de8a 100644 --- a/mtest/libmscore/repeat/repeat08.mscx +++ b/mtest/libmscore/repeat/repeat08.mscx @@ -5,16 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat09.mscx b/mtest/libmscore/repeat/repeat09.mscx index 47dbcffe32..2a41d10b44 100644 --- a/mtest/libmscore/repeat/repeat09.mscx +++ b/mtest/libmscore/repeat/repeat09.mscx @@ -70,16 +70,6 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'freeSans'; font-size:10pt; font-weight:400; font-style:normal;"> <p align="right" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">$p</p></body></html> - - 1584 - 1224 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/repeat/repeat10.mscx b/mtest/libmscore/repeat/repeat10.mscx index dcb57d2d20..2a3b6c7847 100644 --- a/mtest/libmscore/repeat/repeat10.mscx +++ b/mtest/libmscore/repeat/repeat10.mscx @@ -5,16 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat11.mscx b/mtest/libmscore/repeat/repeat11.mscx index 22da723aa3..aa9fb65c8e 100644 --- a/mtest/libmscore/repeat/repeat11.mscx +++ b/mtest/libmscore/repeat/repeat11.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat12.mscx b/mtest/libmscore/repeat/repeat12.mscx index dcb10fb903..2af47c0e2d 100644 --- a/mtest/libmscore/repeat/repeat12.mscx +++ b/mtest/libmscore/repeat/repeat12.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat13.mscx b/mtest/libmscore/repeat/repeat13.mscx index 2eeae7bc50..dcab7c29ab 100644 --- a/mtest/libmscore/repeat/repeat13.mscx +++ b/mtest/libmscore/repeat/repeat13.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat14.mscx b/mtest/libmscore/repeat/repeat14.mscx index 41bc0f7c33..a4232edd78 100644 --- a/mtest/libmscore/repeat/repeat14.mscx +++ b/mtest/libmscore/repeat/repeat14.mscx @@ -1417,16 +1417,6 @@ Maj 7 b 13 - - 1584 - 1224 - - 144 - 144 - 72 - 72 - - 1.7526 1 diff --git a/mtest/libmscore/repeat/repeat15.mscx b/mtest/libmscore/repeat/repeat15.mscx index 5ae8b90e97..949b7bf7f8 100644 --- a/mtest/libmscore/repeat/repeat15.mscx +++ b/mtest/libmscore/repeat/repeat15.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat16.mscx b/mtest/libmscore/repeat/repeat16.mscx index e411025b27..f2e60c2b29 100644 --- a/mtest/libmscore/repeat/repeat16.mscx +++ b/mtest/libmscore/repeat/repeat16.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat17.mscx b/mtest/libmscore/repeat/repeat17.mscx index 767f968e96..5ce3658c8f 100644 --- a/mtest/libmscore/repeat/repeat17.mscx +++ b/mtest/libmscore/repeat/repeat17.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat18.mscx b/mtest/libmscore/repeat/repeat18.mscx index 6f0858eaac..61ddc64053 100644 --- a/mtest/libmscore/repeat/repeat18.mscx +++ b/mtest/libmscore/repeat/repeat18.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat19.mscx b/mtest/libmscore/repeat/repeat19.mscx index ac4dde7475..89ba732817 100644 --- a/mtest/libmscore/repeat/repeat19.mscx +++ b/mtest/libmscore/repeat/repeat19.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat20.mscx b/mtest/libmscore/repeat/repeat20.mscx index f7f97c9797..15f9a7c9dc 100644 --- a/mtest/libmscore/repeat/repeat20.mscx +++ b/mtest/libmscore/repeat/repeat20.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat21.mscx b/mtest/libmscore/repeat/repeat21.mscx index 96c7bec9fd..94ebd10c6e 100644 --- a/mtest/libmscore/repeat/repeat21.mscx +++ b/mtest/libmscore/repeat/repeat21.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat22.mscx b/mtest/libmscore/repeat/repeat22.mscx index f753a35bfc..5f8bdc4e99 100644 --- a/mtest/libmscore/repeat/repeat22.mscx +++ b/mtest/libmscore/repeat/repeat22.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat23.mscx b/mtest/libmscore/repeat/repeat23.mscx index 60ab5a51a5..0b0feda63e 100644 --- a/mtest/libmscore/repeat/repeat23.mscx +++ b/mtest/libmscore/repeat/repeat23.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat24.mscx b/mtest/libmscore/repeat/repeat24.mscx index 5b14bfa1b7..dc1e59e313 100644 --- a/mtest/libmscore/repeat/repeat24.mscx +++ b/mtest/libmscore/repeat/repeat24.mscx @@ -169,22 +169,6 @@ 1 - - 1683.36 - 1190.88 - - 56.6929 - 57.0217 - 56.6929 - 113.386 - - - 56.6929 - 57.0217 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/repeat/repeat25.mscx b/mtest/libmscore/repeat/repeat25.mscx index f841b056b7..d92c75d201 100644 --- a/mtest/libmscore/repeat/repeat25.mscx +++ b/mtest/libmscore/repeat/repeat25.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat26.mscx b/mtest/libmscore/repeat/repeat26.mscx index 55349c3176..83acd311f1 100644 --- a/mtest/libmscore/repeat/repeat26.mscx +++ b/mtest/libmscore/repeat/repeat26.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat27.mscx b/mtest/libmscore/repeat/repeat27.mscx index c1990e161f..cfa9f660e8 100644 --- a/mtest/libmscore/repeat/repeat27.mscx +++ b/mtest/libmscore/repeat/repeat27.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat28.mscx b/mtest/libmscore/repeat/repeat28.mscx index c3aae1fd3d..4165ec8e78 100644 --- a/mtest/libmscore/repeat/repeat28.mscx +++ b/mtest/libmscore/repeat/repeat28.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat29.mscx b/mtest/libmscore/repeat/repeat29.mscx index ebb9504c34..c6e7179b56 100644 --- a/mtest/libmscore/repeat/repeat29.mscx +++ b/mtest/libmscore/repeat/repeat29.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat30.mscx b/mtest/libmscore/repeat/repeat30.mscx index 2e69b17cee..7e509ac6be 100644 --- a/mtest/libmscore/repeat/repeat30.mscx +++ b/mtest/libmscore/repeat/repeat30.mscx @@ -8,22 +8,6 @@ 0 1 0 - - 1683.36 - 1190.88 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/repeat/repeat31.mscx b/mtest/libmscore/repeat/repeat31.mscx index 88087f34c0..0c1576f247 100644 --- a/mtest/libmscore/repeat/repeat31.mscx +++ b/mtest/libmscore/repeat/repeat31.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat32.mscx b/mtest/libmscore/repeat/repeat32.mscx index 7d99a40825..10dfcde3b8 100644 --- a/mtest/libmscore/repeat/repeat32.mscx +++ b/mtest/libmscore/repeat/repeat32.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat33.mscx b/mtest/libmscore/repeat/repeat33.mscx index 0ddc85c1c5..ae865f7671 100644 --- a/mtest/libmscore/repeat/repeat33.mscx +++ b/mtest/libmscore/repeat/repeat33.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat34.mscx b/mtest/libmscore/repeat/repeat34.mscx index 47f81f7702..e31179e2bf 100644 --- a/mtest/libmscore/repeat/repeat34.mscx +++ b/mtest/libmscore/repeat/repeat34.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/repeat/repeat35.mscx b/mtest/libmscore/repeat/repeat35.mscx index d0c4edb07c..e1843068cd 100644 --- a/mtest/libmscore/repeat/repeat35.mscx +++ b/mtest/libmscore/repeat/repeat35.mscx @@ -8,22 +8,6 @@ 0 1 0 - - 1683.36 - 1190.88 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/repeat/repeat36.mscx b/mtest/libmscore/repeat/repeat36.mscx index 075939e387..f1adf11a93 100644 --- a/mtest/libmscore/repeat/repeat36.mscx +++ b/mtest/libmscore/repeat/repeat36.mscx @@ -5,16 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/repeat/repeat37.mscx b/mtest/libmscore/repeat/repeat37.mscx index 8be944b351..3113767833 100644 --- a/mtest/libmscore/repeat/repeat37.mscx +++ b/mtest/libmscore/repeat/repeat37.mscx @@ -9,22 +9,6 @@ 1 1 0 - - 1584 - 1224 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/repeat/repeat38.mscx b/mtest/libmscore/repeat/repeat38.mscx index 8998aaa570..5650457f2a 100644 --- a/mtest/libmscore/repeat/repeat38.mscx +++ b/mtest/libmscore/repeat/repeat38.mscx @@ -9,22 +9,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/group8ths4-4-ref.mscx b/mtest/libmscore/rhythmicGrouping/group8ths4-4-ref.mscx index f43883dbfd..c5ff50e8bc 100644 --- a/mtest/libmscore/rhythmicGrouping/group8ths4-4-ref.mscx +++ b/mtest/libmscore/rhythmicGrouping/group8ths4-4-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/group8ths4-4.mscx b/mtest/libmscore/rhythmicGrouping/group8ths4-4.mscx index a8590fb7ab..c34fb0b8ce 100644 --- a/mtest/libmscore/rhythmicGrouping/group8ths4-4.mscx +++ b/mtest/libmscore/rhythmicGrouping/group8ths4-4.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/group8thsCompound-ref.mscx b/mtest/libmscore/rhythmicGrouping/group8thsCompound-ref.mscx index 28bd8fd10a..9d12f83f33 100644 --- a/mtest/libmscore/rhythmicGrouping/group8thsCompound-ref.mscx +++ b/mtest/libmscore/rhythmicGrouping/group8thsCompound-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/group8thsCompound.mscx b/mtest/libmscore/rhythmicGrouping/group8thsCompound.mscx index 8b1eea3e86..45b3bcfba2 100644 --- a/mtest/libmscore/rhythmicGrouping/group8thsCompound.mscx +++ b/mtest/libmscore/rhythmicGrouping/group8thsCompound.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/group8thsSimple-ref.mscx b/mtest/libmscore/rhythmicGrouping/group8thsSimple-ref.mscx index af740716a0..d0e2c8505f 100644 --- a/mtest/libmscore/rhythmicGrouping/group8thsSimple-ref.mscx +++ b/mtest/libmscore/rhythmicGrouping/group8thsSimple-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/group8thsSimple.mscx b/mtest/libmscore/rhythmicGrouping/group8thsSimple.mscx index ebba23e5e6..defd8c5a9c 100644 --- a/mtest/libmscore/rhythmicGrouping/group8thsSimple.mscx +++ b/mtest/libmscore/rhythmicGrouping/group8thsSimple.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/group8thsSubbeats-ref.mscx b/mtest/libmscore/rhythmicGrouping/group8thsSubbeats-ref.mscx index fb96332a20..7b0594f094 100644 --- a/mtest/libmscore/rhythmicGrouping/group8thsSubbeats-ref.mscx +++ b/mtest/libmscore/rhythmicGrouping/group8thsSubbeats-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/groupConflicts-ref.mscx b/mtest/libmscore/rhythmicGrouping/groupConflicts-ref.mscx index bed5d48344..f2c0825ede 100644 --- a/mtest/libmscore/rhythmicGrouping/groupConflicts-ref.mscx +++ b/mtest/libmscore/rhythmicGrouping/groupConflicts-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/groupConflicts.mscx b/mtest/libmscore/rhythmicGrouping/groupConflicts.mscx index f6fc392f3e..345c372ca9 100644 --- a/mtest/libmscore/rhythmicGrouping/groupConflicts.mscx +++ b/mtest/libmscore/rhythmicGrouping/groupConflicts.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/groupSubbeats-ref.mscx b/mtest/libmscore/rhythmicGrouping/groupSubbeats-ref.mscx index fb96332a20..7b0594f094 100644 --- a/mtest/libmscore/rhythmicGrouping/groupSubbeats-ref.mscx +++ b/mtest/libmscore/rhythmicGrouping/groupSubbeats-ref.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/groupSubbeats.mscx b/mtest/libmscore/rhythmicGrouping/groupSubbeats.mscx index 2e22ec28c0..98ed2c2b1b 100644 --- a/mtest/libmscore/rhythmicGrouping/groupSubbeats.mscx +++ b/mtest/libmscore/rhythmicGrouping/groupSubbeats.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/groupVoices-ref.mscx b/mtest/libmscore/rhythmicGrouping/groupVoices-ref.mscx index 59ac682ab3..9a9f84741d 100644 --- a/mtest/libmscore/rhythmicGrouping/groupVoices-ref.mscx +++ b/mtest/libmscore/rhythmicGrouping/groupVoices-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/rhythmicGrouping/groupVoices.mscx b/mtest/libmscore/rhythmicGrouping/groupVoices.mscx index 8540b8cbb6..31e9bc26e3 100644 --- a/mtest/libmscore/rhythmicGrouping/groupVoices.mscx +++ b/mtest/libmscore/rhythmicGrouping/groupVoices.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter1.mscx b/mtest/libmscore/selectionfilter/selectionfilter1.mscx index dbb989b6f0..b9d6e35964 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter1.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter1.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter10.mscx b/mtest/libmscore/selectionfilter/selectionfilter10.mscx index eb77cec970..c67b2b8ac1 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter10.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter10.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter11.mscx b/mtest/libmscore/selectionfilter/selectionfilter11.mscx index 7c1aa97879..1bb1f8f859 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter11.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter11.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter12.mscx b/mtest/libmscore/selectionfilter/selectionfilter12.mscx index 345eefa6b8..3796fd305d 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter12.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter12.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter13.mscx b/mtest/libmscore/selectionfilter/selectionfilter13.mscx index 2c4e037aeb..934f5fcbd6 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter13.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter13.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter14.mscx b/mtest/libmscore/selectionfilter/selectionfilter14.mscx index e4e3474336..1970a6a042 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter14.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter14.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter15.mscx b/mtest/libmscore/selectionfilter/selectionfilter15.mscx index 1e93ed6ebf..0209494613 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter15.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter15.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter16.mscx b/mtest/libmscore/selectionfilter/selectionfilter16.mscx index 0ee02fe2e8..a8c04a1e1b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter16.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter16.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter17.mscx b/mtest/libmscore/selectionfilter/selectionfilter17.mscx index 15111f5485..3a78bcaaef 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter17.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter17.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter18.mscx b/mtest/libmscore/selectionfilter/selectionfilter18.mscx index fcb13f7ed3..2df3efe31f 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter18.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter18.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter2.mscx b/mtest/libmscore/selectionfilter/selectionfilter2.mscx index 02c985b1ab..9b0861b8f8 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter2.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter2.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter3.mscx b/mtest/libmscore/selectionfilter/selectionfilter3.mscx index 2cd399cca9..041de7f2bc 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter3.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter3.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter4.mscx b/mtest/libmscore/selectionfilter/selectionfilter4.mscx index 6bf94b22ae..fb608ba577 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter4.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter4.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter5.mscx b/mtest/libmscore/selectionfilter/selectionfilter5.mscx index 8428f5ae07..6b255f7546 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter5.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter5.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter6.mscx b/mtest/libmscore/selectionfilter/selectionfilter6.mscx index 956d9fd82e..67617b3def 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter6.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter6.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter7.mscx b/mtest/libmscore/selectionfilter/selectionfilter7.mscx index df3a437773..6b1e5096b8 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter7.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter7.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter8.mscx b/mtest/libmscore/selectionfilter/selectionfilter8.mscx index d651016696..7aca4f1c70 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter8.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter8.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionfilter/selectionfilter9.mscx b/mtest/libmscore/selectionfilter/selectionfilter9.mscx index a13da3d070..39467b52ec 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter9.mscx +++ b/mtest/libmscore/selectionfilter/selectionfilter9.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete01.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete01.mscx index d52525e0b8..c40cb258d9 100644 --- a/mtest/libmscore/selectionrangedelete/selectionrangedelete01.mscx +++ b/mtest/libmscore/selectionrangedelete/selectionrangedelete01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete02.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete02.mscx index 9331837080..7221138ca6 100644 --- a/mtest/libmscore/selectionrangedelete/selectionrangedelete02.mscx +++ b/mtest/libmscore/selectionrangedelete/selectionrangedelete02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete03-ref.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete03-ref.mscx index 5c7f992576..29c2c4f4a4 100644 --- a/mtest/libmscore/selectionrangedelete/selectionrangedelete03-ref.mscx +++ b/mtest/libmscore/selectionrangedelete/selectionrangedelete03-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete03.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete03.mscx index ebe3366267..5f06b7e828 100644 --- a/mtest/libmscore/selectionrangedelete/selectionrangedelete03.mscx +++ b/mtest/libmscore/selectionrangedelete/selectionrangedelete03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete04-ref.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete04-ref.mscx index 77405a8b32..f22c0c57a8 100644 --- a/mtest/libmscore/selectionrangedelete/selectionrangedelete04-ref.mscx +++ b/mtest/libmscore/selectionrangedelete/selectionrangedelete04-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete04.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete04.mscx index ebe3366267..5f06b7e828 100644 --- a/mtest/libmscore/selectionrangedelete/selectionrangedelete04.mscx +++ b/mtest/libmscore/selectionrangedelete/selectionrangedelete04.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete05-ref.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete05-ref.mscx index ab8cf66ca9..e217f4dce2 100644 --- a/mtest/libmscore/selectionrangedelete/selectionrangedelete05-ref.mscx +++ b/mtest/libmscore/selectionrangedelete/selectionrangedelete05-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete05.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete05.mscx index 0571f5ffce..17d5fe2eb9 100644 --- a/mtest/libmscore/selectionrangedelete/selectionrangedelete05.mscx +++ b/mtest/libmscore/selectionrangedelete/selectionrangedelete05.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning01-ref.mscx b/mtest/libmscore/spanners/glissando-cloning01-ref.mscx index c8f78da001..0f890abd9c 100644 --- a/mtest/libmscore/spanners/glissando-cloning01-ref.mscx +++ b/mtest/libmscore/spanners/glissando-cloning01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning01.mscx b/mtest/libmscore/spanners/glissando-cloning01.mscx index 3102c6a627..39becbcca8 100644 --- a/mtest/libmscore/spanners/glissando-cloning01.mscx +++ b/mtest/libmscore/spanners/glissando-cloning01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning02-ref.mscx b/mtest/libmscore/spanners/glissando-cloning02-ref.mscx index 3e17dc3b2a..b7ab91222b 100644 --- a/mtest/libmscore/spanners/glissando-cloning02-ref.mscx +++ b/mtest/libmscore/spanners/glissando-cloning02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -146,22 +130,6 @@ 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning02.mscx b/mtest/libmscore/spanners/glissando-cloning02.mscx index 0405333a2f..54697312ad 100644 --- a/mtest/libmscore/spanners/glissando-cloning02.mscx +++ b/mtest/libmscore/spanners/glissando-cloning02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning03-ref.mscx b/mtest/libmscore/spanners/glissando-cloning03-ref.mscx index 4eb35d5e12..54056edf04 100644 --- a/mtest/libmscore/spanners/glissando-cloning03-ref.mscx +++ b/mtest/libmscore/spanners/glissando-cloning03-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning03.mscx b/mtest/libmscore/spanners/glissando-cloning03.mscx index 58dc54e3ae..ffcc8ca426 100644 --- a/mtest/libmscore/spanners/glissando-cloning03.mscx +++ b/mtest/libmscore/spanners/glissando-cloning03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning04-ref.mscx b/mtest/libmscore/spanners/glissando-cloning04-ref.mscx index bf57a4d852..04fb0863ad 100644 --- a/mtest/libmscore/spanners/glissando-cloning04-ref.mscx +++ b/mtest/libmscore/spanners/glissando-cloning04-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -141,22 +125,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning04.mscx b/mtest/libmscore/spanners/glissando-cloning04.mscx index afa8b759aa..81adaf951e 100644 --- a/mtest/libmscore/spanners/glissando-cloning04.mscx +++ b/mtest/libmscore/spanners/glissando-cloning04.mscx @@ -5,22 +5,6 @@ 0 480 1 @@ -132,22 +116,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-cloning05-ref.mscx b/mtest/libmscore/spanners/glissando-cloning05-ref.mscx index adeddfe931..eafb2afed9 100644 --- a/mtest/libmscore/spanners/glissando-cloning05-ref.mscx +++ b/mtest/libmscore/spanners/glissando-cloning05-ref.mscx @@ -11,22 +11,6 @@ 0 0 0 - - 1683.36 - 1190.88 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 @@ -242,22 +226,6 @@ 0 1 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/spanners/glissando-cloning05.mscx b/mtest/libmscore/spanners/glissando-cloning05.mscx index fe2cb28525..1e10e80740 100644 --- a/mtest/libmscore/spanners/glissando-cloning05.mscx +++ b/mtest/libmscore/spanners/glissando-cloning05.mscx @@ -11,22 +11,6 @@ 0 0 0 - - 1683.36 - 1190.88 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/spanners/glissando-crossstaff01-ref.mscx b/mtest/libmscore/spanners/glissando-crossstaff01-ref.mscx index 59729c03ca..6abee1fa74 100644 --- a/mtest/libmscore/spanners/glissando-crossstaff01-ref.mscx +++ b/mtest/libmscore/spanners/glissando-crossstaff01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-crossstaff01.mscx b/mtest/libmscore/spanners/glissando-crossstaff01.mscx index 59729c03ca..6abee1fa74 100644 --- a/mtest/libmscore/spanners/glissando-crossstaff01.mscx +++ b/mtest/libmscore/spanners/glissando-crossstaff01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-graces01-ref.mscx b/mtest/libmscore/spanners/glissando-graces01-ref.mscx index 07149ef5ff..eafea3c6fe 100644 --- a/mtest/libmscore/spanners/glissando-graces01-ref.mscx +++ b/mtest/libmscore/spanners/glissando-graces01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando-graces01.mscx b/mtest/libmscore/spanners/glissando-graces01.mscx index 624650d776..3e613630b4 100644 --- a/mtest/libmscore/spanners/glissando-graces01.mscx +++ b/mtest/libmscore/spanners/glissando-graces01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando01-ref.mscx b/mtest/libmscore/spanners/glissando01-ref.mscx index 052577f2bc..0b2f7c0f6e 100644 --- a/mtest/libmscore/spanners/glissando01-ref.mscx +++ b/mtest/libmscore/spanners/glissando01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/glissando01.mscx b/mtest/libmscore/spanners/glissando01.mscx index 73b49d0a32..5b0ba93ea0 100644 --- a/mtest/libmscore/spanners/glissando01.mscx +++ b/mtest/libmscore/spanners/glissando01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline01-ref.mscx b/mtest/libmscore/spanners/lyricsline01-ref.mscx index 993b2a516d..7368ee7edb 100644 --- a/mtest/libmscore/spanners/lyricsline01-ref.mscx +++ b/mtest/libmscore/spanners/lyricsline01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline01.mscx b/mtest/libmscore/spanners/lyricsline01.mscx index bbe1e2644d..3ac5bab319 100644 --- a/mtest/libmscore/spanners/lyricsline01.mscx +++ b/mtest/libmscore/spanners/lyricsline01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline02-ref.mscx b/mtest/libmscore/spanners/lyricsline02-ref.mscx index ec10e42027..7e5834025a 100644 --- a/mtest/libmscore/spanners/lyricsline02-ref.mscx +++ b/mtest/libmscore/spanners/lyricsline02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline02.mscx b/mtest/libmscore/spanners/lyricsline02.mscx index 9e2c8d2177..3cb9f46b6e 100644 --- a/mtest/libmscore/spanners/lyricsline02.mscx +++ b/mtest/libmscore/spanners/lyricsline02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline03-ref.mscx b/mtest/libmscore/spanners/lyricsline03-ref.mscx index d30003c98e..22b734235d 100644 --- a/mtest/libmscore/spanners/lyricsline03-ref.mscx +++ b/mtest/libmscore/spanners/lyricsline03-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline03.mscx b/mtest/libmscore/spanners/lyricsline03.mscx index 4a7d374b4c..e16e4bf489 100644 --- a/mtest/libmscore/spanners/lyricsline03.mscx +++ b/mtest/libmscore/spanners/lyricsline03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline04-ref.mscx b/mtest/libmscore/spanners/lyricsline04-ref.mscx index 3ebb47c4fb..155f705ad5 100644 --- a/mtest/libmscore/spanners/lyricsline04-ref.mscx +++ b/mtest/libmscore/spanners/lyricsline04-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline04.mscx b/mtest/libmscore/spanners/lyricsline04.mscx index ff2668b8d0..a63580fea1 100644 --- a/mtest/libmscore/spanners/lyricsline04.mscx +++ b/mtest/libmscore/spanners/lyricsline04.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline05-ref.mscx b/mtest/libmscore/spanners/lyricsline05-ref.mscx index cbb5be7909..4f737ac3a4 100644 --- a/mtest/libmscore/spanners/lyricsline05-ref.mscx +++ b/mtest/libmscore/spanners/lyricsline05-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline05.mscx b/mtest/libmscore/spanners/lyricsline05.mscx index aad763d694..6ae49b8169 100644 --- a/mtest/libmscore/spanners/lyricsline05.mscx +++ b/mtest/libmscore/spanners/lyricsline05.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline06-ref.mscx b/mtest/libmscore/spanners/lyricsline06-ref.mscx index f044dee4c7..34b1814112 100644 --- a/mtest/libmscore/spanners/lyricsline06-ref.mscx +++ b/mtest/libmscore/spanners/lyricsline06-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/spanners/lyricsline06.mscx b/mtest/libmscore/spanners/lyricsline06.mscx index 9e2c8d2177..3cb9f46b6e 100644 --- a/mtest/libmscore/spanners/lyricsline06.mscx +++ b/mtest/libmscore/spanners/lyricsline06.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split01-ref.mscx b/mtest/libmscore/split/split01-ref.mscx index 1bcb1e0bc4..943e83fb5b 100644 --- a/mtest/libmscore/split/split01-ref.mscx +++ b/mtest/libmscore/split/split01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split01.mscx b/mtest/libmscore/split/split01.mscx index dc00c363fc..1fcc0ee46a 100644 --- a/mtest/libmscore/split/split01.mscx +++ b/mtest/libmscore/split/split01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split02-ref.mscx b/mtest/libmscore/split/split02-ref.mscx index 26fbf5aa10..0ae769c537 100644 --- a/mtest/libmscore/split/split02-ref.mscx +++ b/mtest/libmscore/split/split02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split02.mscx b/mtest/libmscore/split/split02.mscx index a3c7f780a8..ba9a15c9c7 100644 --- a/mtest/libmscore/split/split02.mscx +++ b/mtest/libmscore/split/split02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split03-ref.mscx b/mtest/libmscore/split/split03-ref.mscx index 47cf3eef8e..75c39a1a80 100644 --- a/mtest/libmscore/split/split03-ref.mscx +++ b/mtest/libmscore/split/split03-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split03.mscx b/mtest/libmscore/split/split03.mscx index f72b757995..90804242bb 100644 --- a/mtest/libmscore/split/split03.mscx +++ b/mtest/libmscore/split/split03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split04-ref.mscx b/mtest/libmscore/split/split04-ref.mscx index 0bcdba0414..3f5b6a39bf 100644 --- a/mtest/libmscore/split/split04-ref.mscx +++ b/mtest/libmscore/split/split04-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split04.mscx b/mtest/libmscore/split/split04.mscx index a096ee90c5..314199a9bf 100644 --- a/mtest/libmscore/split/split04.mscx +++ b/mtest/libmscore/split/split04.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split05-ref.mscx b/mtest/libmscore/split/split05-ref.mscx index 3b17970ec3..80ad3ffd2d 100644 --- a/mtest/libmscore/split/split05-ref.mscx +++ b/mtest/libmscore/split/split05-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split05.mscx b/mtest/libmscore/split/split05.mscx index d7eda86260..9241d3cd73 100644 --- a/mtest/libmscore/split/split05.mscx +++ b/mtest/libmscore/split/split05.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split06-ref.mscx b/mtest/libmscore/split/split06-ref.mscx index 13cf6302ff..9e84029e87 100644 --- a/mtest/libmscore/split/split06-ref.mscx +++ b/mtest/libmscore/split/split06-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split06.mscx b/mtest/libmscore/split/split06.mscx index 7b58b44ddb..9af8a0dbfb 100644 --- a/mtest/libmscore/split/split06.mscx +++ b/mtest/libmscore/split/split06.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split07-ref.mscx b/mtest/libmscore/split/split07-ref.mscx index 26375dadf3..756df0e237 100644 --- a/mtest/libmscore/split/split07-ref.mscx +++ b/mtest/libmscore/split/split07-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split07.mscx b/mtest/libmscore/split/split07.mscx index 138a8763b5..a65169d140 100644 --- a/mtest/libmscore/split/split07.mscx +++ b/mtest/libmscore/split/split07.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split08-ref.mscx b/mtest/libmscore/split/split08-ref.mscx index c2bbc5904a..380d3759c2 100644 --- a/mtest/libmscore/split/split08-ref.mscx +++ b/mtest/libmscore/split/split08-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/split/split08.mscx b/mtest/libmscore/split/split08.mscx index 7f7a2d367f..2d7816eb50 100644 --- a/mtest/libmscore/split/split08.mscx +++ b/mtest/libmscore/split/split08.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff01-ref.mscx b/mtest/libmscore/splitstaff/splitstaff01-ref.mscx index 67e76789f4..2215035d4d 100644 --- a/mtest/libmscore/splitstaff/splitstaff01-ref.mscx +++ b/mtest/libmscore/splitstaff/splitstaff01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff01.mscx b/mtest/libmscore/splitstaff/splitstaff01.mscx index 4db7e52e6d..09e013061b 100644 --- a/mtest/libmscore/splitstaff/splitstaff01.mscx +++ b/mtest/libmscore/splitstaff/splitstaff01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff02-ref.mscx b/mtest/libmscore/splitstaff/splitstaff02-ref.mscx index 94d6749f4a..317e72fcea 100644 --- a/mtest/libmscore/splitstaff/splitstaff02-ref.mscx +++ b/mtest/libmscore/splitstaff/splitstaff02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff02.mscx b/mtest/libmscore/splitstaff/splitstaff02.mscx index d754f13c03..82e6878560 100644 --- a/mtest/libmscore/splitstaff/splitstaff02.mscx +++ b/mtest/libmscore/splitstaff/splitstaff02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff03-ref.mscx b/mtest/libmscore/splitstaff/splitstaff03-ref.mscx index 9a7b855d7a..a7a2259944 100644 --- a/mtest/libmscore/splitstaff/splitstaff03-ref.mscx +++ b/mtest/libmscore/splitstaff/splitstaff03-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff03.mscx b/mtest/libmscore/splitstaff/splitstaff03.mscx index 2cca434266..b84721605f 100644 --- a/mtest/libmscore/splitstaff/splitstaff03.mscx +++ b/mtest/libmscore/splitstaff/splitstaff03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff04-ref.mscx b/mtest/libmscore/splitstaff/splitstaff04-ref.mscx index c88367651b..a4448b5048 100644 --- a/mtest/libmscore/splitstaff/splitstaff04-ref.mscx +++ b/mtest/libmscore/splitstaff/splitstaff04-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff04.mscx b/mtest/libmscore/splitstaff/splitstaff04.mscx index 9bdd96ab69..09f5976647 100644 --- a/mtest/libmscore/splitstaff/splitstaff04.mscx +++ b/mtest/libmscore/splitstaff/splitstaff04.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff05-ref.mscx b/mtest/libmscore/splitstaff/splitstaff05-ref.mscx index d78f46d4ca..b10976e7ca 100644 --- a/mtest/libmscore/splitstaff/splitstaff05-ref.mscx +++ b/mtest/libmscore/splitstaff/splitstaff05-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/splitstaff/splitstaff05.mscx b/mtest/libmscore/splitstaff/splitstaff05.mscx index 52fb7f523c..b2071dd01f 100644 --- a/mtest/libmscore/splitstaff/splitstaff05.mscx +++ b/mtest/libmscore/splitstaff/splitstaff05.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig-02-ref.mscx b/mtest/libmscore/timesig/timesig-02-ref.mscx index f1eefc5e7a..75b6325e89 100644 --- a/mtest/libmscore/timesig/timesig-02-ref.mscx +++ b/mtest/libmscore/timesig/timesig-02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig-02.mscx b/mtest/libmscore/timesig/timesig-02.mscx index f1eefc5e7a..75b6325e89 100644 --- a/mtest/libmscore/timesig/timesig-02.mscx +++ b/mtest/libmscore/timesig/timesig-02.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig-03-ref.mscx b/mtest/libmscore/timesig/timesig-03-ref.mscx index 1d283c860d..5076ed3acb 100644 --- a/mtest/libmscore/timesig/timesig-03-ref.mscx +++ b/mtest/libmscore/timesig/timesig-03-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig-03.mscx b/mtest/libmscore/timesig/timesig-03.mscx index 210b7dc645..eb7dfd473b 100644 --- a/mtest/libmscore/timesig/timesig-03.mscx +++ b/mtest/libmscore/timesig/timesig-03.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig-04-ref.mscx b/mtest/libmscore/timesig/timesig-04-ref.mscx index 4b94b0f24c..f0d385bf7b 100644 --- a/mtest/libmscore/timesig/timesig-04-ref.mscx +++ b/mtest/libmscore/timesig/timesig-04-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig-04.mscx b/mtest/libmscore/timesig/timesig-04.mscx index b8ba84f56d..3e3a6c4ee7 100644 --- a/mtest/libmscore/timesig/timesig-04.mscx +++ b/mtest/libmscore/timesig/timesig-04.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig01-ref.mscx b/mtest/libmscore/timesig/timesig01-ref.mscx index 17b684f193..4b69da9af1 100644 --- a/mtest/libmscore/timesig/timesig01-ref.mscx +++ b/mtest/libmscore/timesig/timesig01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig01.mscx b/mtest/libmscore/timesig/timesig01.mscx index d9e628fd6f..916fa0091f 100644 --- a/mtest/libmscore/timesig/timesig01.mscx +++ b/mtest/libmscore/timesig/timesig01.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/timesig/timesig_78216.mscx b/mtest/libmscore/timesig/timesig_78216.mscx index 361fd45b75..d596ea3134 100644 --- a/mtest/libmscore/timesig/timesig_78216.mscx +++ b/mtest/libmscore/timesig/timesig_78216.mscx @@ -6,22 +6,6 @@ 480 1 diff --git a/mtest/libmscore/tools/undoAddLineBreaks.mscx b/mtest/libmscore/tools/undoAddLineBreaks.mscx index e7d20f45e8..441e85dc2c 100644 --- a/mtest/libmscore/tools/undoAddLineBreaks.mscx +++ b/mtest/libmscore/tools/undoAddLineBreaks.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoAddLineBreaks01-ref.mscx b/mtest/libmscore/tools/undoAddLineBreaks01-ref.mscx index f6fb728990..92844c8f7e 100644 --- a/mtest/libmscore/tools/undoAddLineBreaks01-ref.mscx +++ b/mtest/libmscore/tools/undoAddLineBreaks01-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoAddLineBreaks02-ref.mscx b/mtest/libmscore/tools/undoAddLineBreaks02-ref.mscx index 58d40fa7c0..acaafea0ad 100644 --- a/mtest/libmscore/tools/undoAddLineBreaks02-ref.mscx +++ b/mtest/libmscore/tools/undoAddLineBreaks02-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoLockLineBreaks.mscx b/mtest/libmscore/tools/undoLockLineBreaks.mscx index a8d71ae3bc..d7bf0f4881 100644 --- a/mtest/libmscore/tools/undoLockLineBreaks.mscx +++ b/mtest/libmscore/tools/undoLockLineBreaks.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoLockLineBreaks01-ref.mscx b/mtest/libmscore/tools/undoLockLineBreaks01-ref.mscx index 3e9ec371e6..24833651a8 100644 --- a/mtest/libmscore/tools/undoLockLineBreaks01-ref.mscx +++ b/mtest/libmscore/tools/undoLockLineBreaks01-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoLockLineBreaks02-ref.mscx b/mtest/libmscore/tools/undoLockLineBreaks02-ref.mscx index a8d71ae3bc..d7bf0f4881 100644 --- a/mtest/libmscore/tools/undoLockLineBreaks02-ref.mscx +++ b/mtest/libmscore/tools/undoLockLineBreaks02-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoRemoveLineBreaks.mscx b/mtest/libmscore/tools/undoRemoveLineBreaks.mscx index 0db93fc1ed..5526708c02 100644 --- a/mtest/libmscore/tools/undoRemoveLineBreaks.mscx +++ b/mtest/libmscore/tools/undoRemoveLineBreaks.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoRemoveLineBreaks01-ref.mscx b/mtest/libmscore/tools/undoRemoveLineBreaks01-ref.mscx index e7d20f45e8..441e85dc2c 100644 --- a/mtest/libmscore/tools/undoRemoveLineBreaks01-ref.mscx +++ b/mtest/libmscore/tools/undoRemoveLineBreaks01-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoRemoveLineBreaks02-ref.mscx b/mtest/libmscore/tools/undoRemoveLineBreaks02-ref.mscx index 0db93fc1ed..5526708c02 100644 --- a/mtest/libmscore/tools/undoRemoveLineBreaks02-ref.mscx +++ b/mtest/libmscore/tools/undoRemoveLineBreaks02-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceAlpha.mscx b/mtest/libmscore/tools/undoResequenceAlpha.mscx index c8c9153c69..aab85f904a 100644 --- a/mtest/libmscore/tools/undoResequenceAlpha.mscx +++ b/mtest/libmscore/tools/undoResequenceAlpha.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceAlpha01-ref.mscx b/mtest/libmscore/tools/undoResequenceAlpha01-ref.mscx index c0ed25c077..0fd3e77c8f 100644 --- a/mtest/libmscore/tools/undoResequenceAlpha01-ref.mscx +++ b/mtest/libmscore/tools/undoResequenceAlpha01-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceAlpha02-ref.mscx b/mtest/libmscore/tools/undoResequenceAlpha02-ref.mscx index 4e860f1685..69a6572137 100644 --- a/mtest/libmscore/tools/undoResequenceAlpha02-ref.mscx +++ b/mtest/libmscore/tools/undoResequenceAlpha02-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceMeasure.mscx b/mtest/libmscore/tools/undoResequenceMeasure.mscx index 34eb32cd74..42e5a2fcf0 100644 --- a/mtest/libmscore/tools/undoResequenceMeasure.mscx +++ b/mtest/libmscore/tools/undoResequenceMeasure.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceMeasure01-ref.mscx b/mtest/libmscore/tools/undoResequenceMeasure01-ref.mscx index 24ed264e2b..3b6129b0de 100644 --- a/mtest/libmscore/tools/undoResequenceMeasure01-ref.mscx +++ b/mtest/libmscore/tools/undoResequenceMeasure01-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceMeasure02-ref.mscx b/mtest/libmscore/tools/undoResequenceMeasure02-ref.mscx index 51d64ad666..a083531db1 100644 --- a/mtest/libmscore/tools/undoResequenceMeasure02-ref.mscx +++ b/mtest/libmscore/tools/undoResequenceMeasure02-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceNumeric.mscx b/mtest/libmscore/tools/undoResequenceNumeric.mscx index ffd3c87b7d..ce08f324f7 100644 --- a/mtest/libmscore/tools/undoResequenceNumeric.mscx +++ b/mtest/libmscore/tools/undoResequenceNumeric.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceNumeric01-ref.mscx b/mtest/libmscore/tools/undoResequenceNumeric01-ref.mscx index e12a8a2343..4bcc6bb859 100644 --- a/mtest/libmscore/tools/undoResequenceNumeric01-ref.mscx +++ b/mtest/libmscore/tools/undoResequenceNumeric01-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequenceNumeric02-ref.mscx b/mtest/libmscore/tools/undoResequenceNumeric02-ref.mscx index 794a117751..102002b770 100644 --- a/mtest/libmscore/tools/undoResequenceNumeric02-ref.mscx +++ b/mtest/libmscore/tools/undoResequenceNumeric02-ref.mscx @@ -7,22 +7,6 @@ 1 diff --git a/mtest/libmscore/tools/undoResequencePart.mscx b/mtest/libmscore/tools/undoResequencePart.mscx index d506a87c1e..bd502c1123 100644 --- a/mtest/libmscore/tools/undoResequencePart.mscx +++ b/mtest/libmscore/tools/undoResequencePart.mscx @@ -7,22 +7,6 @@ 1 @@ -295,22 +279,6 @@ 0.03 0 1 - - 1584 - 1224 - - 56.6929 - 90.1417 - 56.6929 - 113.386 - - - 56.6929 - 90.1417 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tools/undoResequencePart01-ref.mscx b/mtest/libmscore/tools/undoResequencePart01-ref.mscx index b8df6d9404..762a05334a 100644 --- a/mtest/libmscore/tools/undoResequencePart01-ref.mscx +++ b/mtest/libmscore/tools/undoResequencePart01-ref.mscx @@ -7,22 +7,6 @@ 1 @@ -294,22 +278,6 @@ 0.03 0 1 - - 1584 - 1224 - - 56.6929 - 90.1417 - 56.6929 - 113.386 - - - 56.6929 - 90.1417 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tools/undoResequencePart02-ref.mscx b/mtest/libmscore/tools/undoResequencePart02-ref.mscx index 43dbcdf65c..e270b67557 100644 --- a/mtest/libmscore/tools/undoResequencePart02-ref.mscx +++ b/mtest/libmscore/tools/undoResequencePart02-ref.mscx @@ -7,22 +7,6 @@ 1 @@ -294,22 +278,6 @@ 0.03 0 1 - - 1584 - 1224 - - 56.6929 - 90.1417 - 56.6929 - 113.386 - - - 56.6929 - 90.1417 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tools/undoSlashFill.mscx b/mtest/libmscore/tools/undoSlashFill.mscx index a8e33cd104..15eba39e4e 100644 --- a/mtest/libmscore/tools/undoSlashFill.mscx +++ b/mtest/libmscore/tools/undoSlashFill.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/tools/undoSlashFill01-ref.mscx b/mtest/libmscore/tools/undoSlashFill01-ref.mscx index 0a93d367bd..18c9a01cc7 100644 --- a/mtest/libmscore/tools/undoSlashFill01-ref.mscx +++ b/mtest/libmscore/tools/undoSlashFill01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/tools/undoSlashFill02-ref.mscx b/mtest/libmscore/tools/undoSlashFill02-ref.mscx index 8550f09fa7..3ae2221d49 100644 --- a/mtest/libmscore/tools/undoSlashFill02-ref.mscx +++ b/mtest/libmscore/tools/undoSlashFill02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/tools/undoSlashRhythm.mscx b/mtest/libmscore/tools/undoSlashRhythm.mscx index dbc877122b..0aab266d71 100644 --- a/mtest/libmscore/tools/undoSlashRhythm.mscx +++ b/mtest/libmscore/tools/undoSlashRhythm.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/tools/undoSlashRhythm01-ref.mscx b/mtest/libmscore/tools/undoSlashRhythm01-ref.mscx index a466c2da82..b2d5db716d 100644 --- a/mtest/libmscore/tools/undoSlashRhythm01-ref.mscx +++ b/mtest/libmscore/tools/undoSlashRhythm01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/tools/undoSlashRhythm02-ref.mscx b/mtest/libmscore/tools/undoSlashRhythm02-ref.mscx index ed3346038f..3698da1ff1 100644 --- a/mtest/libmscore/tools/undoSlashRhythm02-ref.mscx +++ b/mtest/libmscore/tools/undoSlashRhythm02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/transpose/undoDiatonicTranspose.mscx b/mtest/libmscore/transpose/undoDiatonicTranspose.mscx index 4738a62680..0b3385a13e 100644 --- a/mtest/libmscore/transpose/undoDiatonicTranspose.mscx +++ b/mtest/libmscore/transpose/undoDiatonicTranspose.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/transpose/undoDiatonicTranspose01-ref.mscx b/mtest/libmscore/transpose/undoDiatonicTranspose01-ref.mscx index c501ccb63f..35204b4718 100644 --- a/mtest/libmscore/transpose/undoDiatonicTranspose01-ref.mscx +++ b/mtest/libmscore/transpose/undoDiatonicTranspose01-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/transpose/undoDiatonicTranspose02-ref.mscx b/mtest/libmscore/transpose/undoDiatonicTranspose02-ref.mscx index 4738a62680..0b3385a13e 100644 --- a/mtest/libmscore/transpose/undoDiatonicTranspose02-ref.mscx +++ b/mtest/libmscore/transpose/undoDiatonicTranspose02-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/transpose/undoTranspose.mscx b/mtest/libmscore/transpose/undoTranspose.mscx index 1f9f8120ec..17485004a8 100644 --- a/mtest/libmscore/transpose/undoTranspose.mscx +++ b/mtest/libmscore/transpose/undoTranspose.mscx @@ -16,22 +16,6 @@ 1.25 0.5 -2 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/transpose/undoTranspose01-ref.mscx b/mtest/libmscore/transpose/undoTranspose01-ref.mscx index 92c849cda8..961bd99a19 100644 --- a/mtest/libmscore/transpose/undoTranspose01-ref.mscx +++ b/mtest/libmscore/transpose/undoTranspose01-ref.mscx @@ -16,22 +16,6 @@ 1.25 0.5 -2 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/transpose/undoTranspose02-ref.mscx b/mtest/libmscore/transpose/undoTranspose02-ref.mscx index 1f9f8120ec..17485004a8 100644 --- a/mtest/libmscore/transpose/undoTranspose02-ref.mscx +++ b/mtest/libmscore/transpose/undoTranspose02-ref.mscx @@ -16,22 +16,6 @@ 1.25 0.5 -2 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.764 1 diff --git a/mtest/libmscore/tuplet/split1-ref.mscx b/mtest/libmscore/tuplet/split1-ref.mscx index 574488dde6..24873facb1 100644 --- a/mtest/libmscore/tuplet/split1-ref.mscx +++ b/mtest/libmscore/tuplet/split1-ref.mscx @@ -12,22 +12,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tuplet/split1.mscx b/mtest/libmscore/tuplet/split1.mscx index 89aa251d7d..90d22b506c 100644 --- a/mtest/libmscore/tuplet/split1.mscx +++ b/mtest/libmscore/tuplet/split1.mscx @@ -16,22 +16,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tuplet/split2-ref.mscx b/mtest/libmscore/tuplet/split2-ref.mscx index e8b7b68359..89404c18b5 100644 --- a/mtest/libmscore/tuplet/split2-ref.mscx +++ b/mtest/libmscore/tuplet/split2-ref.mscx @@ -12,22 +12,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tuplet/split2.mscx b/mtest/libmscore/tuplet/split2.mscx index bb640fc449..8491fb8ec8 100644 --- a/mtest/libmscore/tuplet/split2.mscx +++ b/mtest/libmscore/tuplet/split2.mscx @@ -16,22 +16,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tuplet/split3-ref.mscx b/mtest/libmscore/tuplet/split3-ref.mscx index b299b4b027..abf942571f 100644 --- a/mtest/libmscore/tuplet/split3-ref.mscx +++ b/mtest/libmscore/tuplet/split3-ref.mscx @@ -12,22 +12,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tuplet/split3.mscx b/mtest/libmscore/tuplet/split3.mscx index df550c09e3..bb1b192e15 100644 --- a/mtest/libmscore/tuplet/split3.mscx +++ b/mtest/libmscore/tuplet/split3.mscx @@ -16,22 +16,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tuplet/split4-ref.mscx b/mtest/libmscore/tuplet/split4-ref.mscx index dab0c475da..f9a790782f 100644 --- a/mtest/libmscore/tuplet/split4-ref.mscx +++ b/mtest/libmscore/tuplet/split4-ref.mscx @@ -12,22 +12,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tuplet/split4.mscx b/mtest/libmscore/tuplet/split4.mscx index adb4ea8655..ba3f4fef65 100644 --- a/mtest/libmscore/tuplet/split4.mscx +++ b/mtest/libmscore/tuplet/split4.mscx @@ -16,22 +16,6 @@ 0 0 0 - - 1683.78 - 1190.55 - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - - 56.6929 - 56.6929 - 56.6929 - 113.386 - - 1.76389 1 diff --git a/mtest/libmscore/tuplet/tuplet1-ref.mscx b/mtest/libmscore/tuplet/tuplet1-ref.mscx index 39a3056cd0..3314c3d4bc 100644 --- a/mtest/libmscore/tuplet/tuplet1-ref.mscx +++ b/mtest/libmscore/tuplet/tuplet1-ref.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/libmscore/tuplet/tuplet1.mscx b/mtest/libmscore/tuplet/tuplet1.mscx index 9b1605c3b8..ca345083a5 100644 --- a/mtest/libmscore/tuplet/tuplet1.mscx +++ b/mtest/libmscore/tuplet/tuplet1.mscx @@ -5,22 +5,6 @@ 0 480 1 diff --git a/mtest/testutils.cpp b/mtest/testutils.cpp index 6f52e059f4..babc48ef61 100644 --- a/mtest/testutils.cpp +++ b/mtest/testutils.cpp @@ -245,8 +245,9 @@ bool MTest::saveCompareMusicXmlScore(MasterScore* score, const QString& saveName bool MTest::savePdf(MasterScore* cs, const QString& saveName) { QPrinter printerDev(QPrinter::HighResolution); - const PageFormat* pf = cs->pageFormat(); - printerDev.setPaperSize(pf->size(), QPrinter::Inch); + double w = cs->styleD(StyleIdx::pageWidth); + double h = cs->styleD(StyleIdx::pageHeight); + printerDev.setPaperSize(QSizeF(w,h), QPrinter::Inch); printerDev.setCreator("MuseScore Version: " VERSION); printerDev.setFullPage(true); diff --git a/omr/importpdf.cpp b/omr/importpdf.cpp index a294370462..89b59dcd07 100644 --- a/omr/importpdf.cpp +++ b/omr/importpdf.cpp @@ -248,23 +248,19 @@ Score::FileError importPdf(MasterScore* score, const QString& path) if (sp == 0.0) sp = 1.5; score->setSpatium(sp * DPMM); - score->style().set(StyleIdx::lastSystemFillLimit, 0.0); - score->style().set(StyleIdx::staffLowerBorder, 0.0); - score->style().set(StyleIdx::measureSpacing, 1.0); - score->style().set(StyleIdx::frameSystemDistance, 0); - - PageFormat pF = *score->pageFormat(); - pF.setEvenLeftMargin(5.0 * DPMM / DPI); - pF.setEvenTopMargin(0); - pF.setEvenBottomMargin(0); - pF.setOddLeftMargin(5.0 * DPMM / DPI); - pF.setOddTopMargin(0); - pF.setOddBottomMargin(0); - score->setPageFormat(pF); - - score->style().set(StyleIdx::minSystemDistance, Spatium(omr->systemDistance())); - score->style().set(StyleIdx::maxSystemDistance, Spatium(omr->systemDistance())); - score->style().set(StyleIdx::akkoladeDistance, Spatium(omr->staffDistance())); + score->style().set(StyleIdx::lastSystemFillLimit, 0.0); + score->style().set(StyleIdx::staffLowerBorder, 0.0); + score->style().set(StyleIdx::measureSpacing, 1.0); + score->style().set(StyleIdx::frameSystemDistance, 0); + score->style().set(StyleIdx::pageEvenLeftMargin, 5.0 * DPMM / DPI); + score->style().set(StyleIdx::pageEvenTopMargin, 0); + score->style().set(StyleIdx::pageEvenBottomMargin, 0); + score->style().set(StyleIdx::pageOddLeftMargin, 5.0 * DPMM / DPI); + score->style().set(StyleIdx::pageOddTopMargin, 0); + score->style().set(StyleIdx::pageOddBottomMargin, 0); + score->style().set(StyleIdx::minSystemDistance, Spatium(omr->systemDistance())); + score->style().set(StyleIdx::maxSystemDistance, Spatium(omr->systemDistance())); + score->style().set(StyleIdx::akkoladeDistance, Spatium(omr->staffDistance())); Part* part = new Part(score); OmrPage* omrPage = omr->pages().front(); diff --git a/omr/omrview.cpp b/omr/omrview.cpp index 30410e82a4..03226527c7 100644 --- a/omr/omrview.cpp +++ b/omr/omrview.cpp @@ -70,9 +70,8 @@ void OmrView::setOmr(Omr* s) OmrPage* page = _omr->page(0); const QImage& i = page->image(); Score* score = _scoreView->score(); - const PageFormat* pf = score->pageFormat(); double mag = _omr->spatium() / score->spatium(); - pageWidth = lrint(pf->width() * mag * DPI); + pageWidth = lrint(score->styleD(StyleIdx::pageWidth) * mag * DPI); int htiles = ((pageWidth + TILE_W - 1) / TILE_W); pageWidth = htiles * TILE_W; @@ -155,9 +154,8 @@ void OmrView::paintEvent(QPaintEvent* event) double spatium = _omr->spatium(); double mag = spatium / sSpatium; - const PageFormat* pf = score->pageFormat(); int w = pageWidth; - int h = lrint(pf->height() * mag * DPI); + int h = lrint(score->styleD(StyleIdx::pageHeight) * mag * DPI); int n = _omr->numPages(); int nx = (w * n) / TILE_W;