diff --git a/mtest/guitarpro/repeated-bars.gp-ref.mscx b/mtest/guitarpro/repeated-bars.gp-ref.mscx index 11dc115ba8ddb..7d76e888da282 100644 --- a/mtest/guitarpro/repeated-bars.gp-ref.mscx +++ b/mtest/guitarpro/repeated-bars.gp-ref.mscx @@ -127,12 +127,15 @@ + 1 - + + 1 + 0 measure 4/4 - + @@ -296,13 +299,16 @@ + 1 - + + 1 + 0 measure 4/4 - + @@ -372,13 +378,16 @@ + 1 - + + 1 + 0 measure 4/4 - + diff --git a/mtest/guitarpro/repeated-bars.gpx-ref.mscx b/mtest/guitarpro/repeated-bars.gpx-ref.mscx index 8ecec1772a410..54d0faf500f57 100644 --- a/mtest/guitarpro/repeated-bars.gpx-ref.mscx +++ b/mtest/guitarpro/repeated-bars.gpx-ref.mscx @@ -176,12 +176,15 @@ + 1 - + + 1 + 0 measure 4/4 - + @@ -394,13 +397,16 @@ + 1 - + + 1 + 0 measure 4/4 - + @@ -470,13 +476,16 @@ + 1 - + + 1 + 0 measure 4/4 - + diff --git a/mtest/libmscore/all_elements/tst_layout_elements.cpp b/mtest/libmscore/all_elements/tst_layout_elements.cpp index 1b507037740d0..9bc2aba5d574d 100644 --- a/mtest/libmscore/all_elements/tst_layout_elements.cpp +++ b/mtest/libmscore/all_elements/tst_layout_elements.cpp @@ -14,6 +14,7 @@ #include "mtest/testutils.h" #include "libmscore/measure.h" #include "libmscore/page.h" +#include "libmscore/rest.h" #include "libmscore/score.h" #include "libmscore/staff.h" #include "libmscore/system.h" @@ -81,6 +82,10 @@ static void isLayoutDone(void* data, Element* e) return; } } + if (e->isRest() && toRest(e)->shouldNotBeDrawn()) { + // another valid exception + return; + } // If layout of element is done it (usually?) has a valid // bounding box (bbox). if (e->visible() && !e->bbox().isValid()) { diff --git a/mtest/libmscore/compat206/markers-ref.mscx b/mtest/libmscore/compat206/markers-ref.mscx index da6e59920a0d4..ef23a945c198a 100644 --- a/mtest/libmscore/compat206/markers-ref.mscx +++ b/mtest/libmscore/compat206/markers-ref.mscx @@ -305,11 +305,14 @@ + 1 - + + 1 + 0 measure 4/4 - + end diff --git a/mtest/libmscore/element/tst_element.cpp b/mtest/libmscore/element/tst_element.cpp index 32dfdb8fad0de..13fc98e351107 100644 --- a/mtest/libmscore/element/tst_element.cpp +++ b/mtest/libmscore/element/tst_element.cpp @@ -67,7 +67,7 @@ void TestElement::testIds() ElementType::LAYOUT_BREAK, ElementType::MARKER, ElementType::JUMP, - ElementType::REPEAT_MEASURE, + ElementType::MEASURE_REPEAT, ElementType::ICON, ElementType::NOTE, ElementType::SYMBOL, diff --git a/mtest/libmscore/midi/testMeasureRepeats-ref.mid b/mtest/libmscore/midi/testMeasureRepeats-ref.mid new file mode 100644 index 0000000000000..cf624e4654c41 Binary files /dev/null and b/mtest/libmscore/midi/testMeasureRepeats-ref.mid differ diff --git a/mtest/libmscore/midi/testMeasureRepeats.mscx b/mtest/libmscore/midi/testMeasureRepeats.mscx new file mode 100644 index 0000000000000..b7e55e119d931 --- /dev/null +++ b/mtest/libmscore/midi/testMeasureRepeats.mscx @@ -0,0 +1,498 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + nobreak + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + nobreak + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + 2 + + + measure + 3/4 + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + 2 + + + measure + 3/4 + + + + + + + 1 + half + down + + 71 + 19 + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + 1 + + + measure + 3/4 + + + + + 2 + + + 4 + 0 + measure + 3/4 + + + + + 3 + + + measure + 3/4 + + + + + 4 + + + measure + 3/4 + + + + + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + quarter + down + + 55 + 15 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + 1 + half + down + + 55 + 15 + + + + + + + diff --git a/mtest/libmscore/midi/tst_midi.cpp b/mtest/libmscore/midi/tst_midi.cpp index e9b501dab377b..e00e8a972daa3 100644 --- a/mtest/libmscore/midi/tst_midi.cpp +++ b/mtest/libmscore/midi/tst_midi.cpp @@ -61,6 +61,7 @@ private slots: void midiPortExport() { midiExportTestRef("testMidiPort"); } void midiArpeggio() { midiExportTestRef("testArpeggio"); } void midiMutedUnison() { midiExportTestRef("testMutedUnison"); } + void midiMeasureRepeats() { midiExportTestRef("testMeasureRepeats"); } void midi184376ExportMidiInitialKeySig() { midiExportTestRef("testInitialKeySigThenRepeatToMeas2"); // tick 0 has Bb keysig. Meas 2 has no key sig. Meas 2 repeats back to start of Meas 2. Result should have initial Bb keysig diff --git a/mtest/libmscore/parts/README.md b/mtest/libmscore/parts/README.md index 5b31a8efa7e29..beeeff0015837 100644 --- a/mtest/libmscore/parts/README.md +++ b/mtest/libmscore/parts/README.md @@ -85,6 +85,7 @@ x xxx xxx FINGERING - --- --- NOTEDOT - --- --- TREMOLO - --- --- MEASURE +x xxx xxx MEASURE_REPEAT - --- --- STAFF_LINES - --- --- RUBBERBAND - --- --- TAB_DURATION_SYMBOL diff --git a/mtest/libmscore/parts/part-measure-repeat-add.mscx b/mtest/libmscore/parts/part-measure-repeat-add.mscx new file mode 100644 index 0000000000000..0089cda4a18e6 --- /dev/null +++ b/mtest/libmscore/parts/part-measure-repeat-add.mscx @@ -0,0 +1,1700 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + testpart1 + + + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + testpart1 + + + + + + G + G + + + + + 4 + 4 + + + 1.66667 + + 𝅘𝅥 = 100 + + + + quarter + + + 72 + 14 + + + + + quarter + + + 74 + 16 + + + + + quarter + + + 76 + 18 + + + + + quarter + + + + + 1 + + nobreak + + + + + measure + 4/4 + + + + + 2 + + nobreak + + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + nobreak + + + + + measure + 4/4 + + + + + 4 + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + + G8vb + G8vb + + + + + 4 + 4 + + + + quarter + + + 55 + 15 + + + + + quarter + + + 57 + 17 + + + + + quarter + + + 59 + 19 + + + + + quarter + + + 60 + 14 + + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Alto + + + 1 + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + + + testpart1 + + + + Alto + + + + + + G + G + + + + + + + 4 + 4 + + + 1.66667 + + + 𝅘𝅥 = 100 + + + + + quarter + + + + 72 + 14 + + + + + + quarter + + + + 74 + 16 + + + + + + quarter + + + + 76 + 18 + + + + + + quarter + + + + + 1 + + + + + measure + 4/4 + + + + + 2 + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + + measure + 4/4 + + + + + 4 + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 27 + + + measure + 108/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Alto + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Tenor + + + 2 + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + -1 + + + + + + -1 + + + + testpart1 + + + + Tenor + + + + + + G8vb + G8vb + + + + + + + 4 + 4 + + + 1.66667 + + + -1 + + 4 + + 𝅘𝅥 = 100 + + + + 2 + + quarter + + + 2 + + 55 + 15 + + + + + + quarter + + + + 57 + 17 + + + + + + quarter + + + + 59 + 19 + + + + + + quarter + + + + 60 + 14 + + + + + + + + + + measure + 4/4 + + + + + 31 + + + measure + 124/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Tenor + + + diff --git a/mtest/libmscore/parts/part-measure-repeat-del.mscx b/mtest/libmscore/parts/part-measure-repeat-del.mscx new file mode 100644 index 0000000000000..df8022168415c --- /dev/null +++ b/mtest/libmscore/parts/part-measure-repeat-del.mscx @@ -0,0 +1,1828 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + testpart1 + + + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + testpart1 + + + + + + G + G + + + + + 4 + 4 + + + 1.66667 + + 𝅘𝅥 = 100 + + + + quarter + + + 72 + 14 + + + + + quarter + + + 74 + 16 + + + + + quarter + + + 76 + 18 + + + + + quarter + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + nobreak + + + + + measure + 4/4 + + + + + 1 + + + nobreak + + + + + measure + 4/4 + + + + + 2 + + + nobreak + + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + + nobreak + + + + + measure + 4/4 + + + + + 4 + + + nobreak + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + + G8vb + G8vb + + + + + 4 + 4 + + + + quarter + + + 55 + 15 + + + + + quarter + + + 57 + 17 + + + + + quarter + + + 59 + 19 + + + + + quarter + + + 60 + 14 + + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + 2 + 0 + + measure + 4/4 + + + + + 2 + + + + measure + 4/4 + + + + + 1 + + + + measure + 4/4 + + + + + 2 + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + + + measure + 4/4 + + + + + 4 + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Alto + + + 1 + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + + + testpart1 + + + + Alto + + + + + + G + G + + + + + + + 4 + 4 + + + 1.66667 + + + 𝅘𝅥 = 100 + + + + + quarter + + + + 72 + 14 + + + + + + quarter + + + + 74 + 16 + + + + + + quarter + + + + 76 + 18 + + + + + + quarter + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 2 + + nobreak + + + + measure + 8/4 + + + + + + + + nobreak + + + + + + measure + 4/4 + + + + + 1 + + + + nobreak + + + + + + measure + 4/4 + + + + + 2 + + + + nobreak + + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + nobreak + + + + + + measure + 4/4 + + + + + 4 + + + + nobreak + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 24 + + + measure + 96/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Alto + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Tenor + + + 2 + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + -1 + + + + + + -1 + + + + testpart1 + + + + Tenor + + + + + + G8vb + G8vb + + + + + + + 4 + 4 + + + 1.66667 + + + -1 + + 4 + + 𝅘𝅥 = 100 + + + + 2 + + quarter + + + 2 + + 55 + 15 + + + + + + quarter + + + + 57 + 17 + + + + + + quarter + + + + 59 + 19 + + + + + + quarter + + + + 60 + 14 + + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + 2 + 0 + + + measure + 4/4 + + + + + 2 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 2 + + + + -1 + + + nobreak + + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 4 + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 23 + + + measure + 92/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Tenor + + + diff --git a/mtest/libmscore/parts/part-measure-repeat-parts.mscx b/mtest/libmscore/parts/part-measure-repeat-parts.mscx new file mode 100644 index 0000000000000..95ad19fe5044c --- /dev/null +++ b/mtest/libmscore/parts/part-measure-repeat-parts.mscx @@ -0,0 +1,1841 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + testpart1 + + + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + testpart1 + + + + + + G + G + + + + + 4 + 4 + + + 1.66667 + + 𝅘𝅥 = 100 + + + + quarter + + + 72 + 14 + + + + + quarter + + + 74 + 16 + + + + + quarter + + + 76 + 18 + + + + + quarter + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + nobreak + + + + 2 + 0 + + measure + 4/4 + + + + + 2 + + + nobreak + + + + + measure + 4/4 + + + + + 1 + + + nobreak + + + + + measure + 4/4 + + + + + 2 + + + nobreak + + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + + nobreak + + + + + measure + 4/4 + + + + + 4 + + + nobreak + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + + G8vb + G8vb + + + + + 4 + 4 + + + + quarter + + + 55 + 15 + + + + + quarter + + + 57 + 17 + + + + + quarter + + + 59 + 19 + + + + + quarter + + + 60 + 14 + + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + 2 + 0 + + measure + 4/4 + + + + + 2 + + + + measure + 4/4 + + + + + 1 + + + + measure + 4/4 + + + + + 2 + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + + + measure + 4/4 + + + + + 4 + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Alto + + + 1 + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + + + testpart1 + + + + Alto + + + + + + G + G + + + + + + + 4 + 4 + + + 1.66667 + + + 𝅘𝅥 = 100 + + + + + quarter + + + + 72 + 14 + + + + + + quarter + + + + 74 + 16 + + + + + + quarter + + + + 76 + 18 + + + + + + quarter + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + + nobreak + + + + 2 + 0 + + + measure + 4/4 + + + + + 2 + + + + nobreak + + + + + + measure + 4/4 + + + + + 1 + + + + nobreak + + + + + + measure + 4/4 + + + + + 2 + + + + nobreak + + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + nobreak + + + + + + measure + 4/4 + + + + + 4 + + + + nobreak + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 24 + + + measure + 96/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Alto + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Tenor + + + 2 + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + -1 + + + + + + -1 + + + + testpart1 + + + + Tenor + + + + + + G8vb + G8vb + + + + + + + 4 + 4 + + + 1.66667 + + + -1 + + 4 + + 𝅘𝅥 = 100 + + + + 2 + + quarter + + + 2 + + 55 + 15 + + + + + + quarter + + + + 57 + 17 + + + + + + quarter + + + + 59 + 19 + + + + + + quarter + + + + 60 + 14 + + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + 2 + 0 + + + measure + 4/4 + + + + + 2 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 2 + + + + -1 + + + nobreak + + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 4 + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 23 + + + measure + 92/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Tenor + + + diff --git a/mtest/libmscore/parts/part-measure-repeat-uadd.mscx b/mtest/libmscore/parts/part-measure-repeat-uadd.mscx new file mode 100644 index 0000000000000..14b17dba2e20c --- /dev/null +++ b/mtest/libmscore/parts/part-measure-repeat-uadd.mscx @@ -0,0 +1,1679 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + testpart1 + + + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + testpart1 + + + + + + G + G + + + + + 4 + 4 + + + 1.66667 + + 𝅘𝅥 = 100 + + + + quarter + + + 72 + 14 + + + + + quarter + + + 74 + 16 + + + + + quarter + + + 76 + 18 + + + + + quarter + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + + G8vb + G8vb + + + + + 4 + 4 + + + + quarter + + + 55 + 15 + + + + + quarter + + + 57 + 17 + + + + + quarter + + + 59 + 19 + + + + + quarter + + + 60 + 14 + + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Alto + + + 1 + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + + + testpart1 + + + + Alto + + + + + + G + G + + + + + + + 4 + 4 + + + 1.66667 + + + 𝅘𝅥 = 100 + + + + + quarter + + + + 72 + 14 + + + + + + quarter + + + + 74 + 16 + + + + + + quarter + + + + 76 + 18 + + + + + + quarter + + + + + + + + + measure + 4/4 + + + + + 31 + + + measure + 124/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Alto + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Tenor + + + 2 + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + -1 + + + + + + -1 + + + + testpart1 + + + + Tenor + + + + + + G8vb + G8vb + + + + + + + 4 + 4 + + + 1.66667 + + + -1 + + 4 + + 𝅘𝅥 = 100 + + + + 2 + + quarter + + + 2 + + 55 + 15 + + + + + + quarter + + + + 57 + 17 + + + + + + quarter + + + + 59 + 19 + + + + + + quarter + + + + 60 + 14 + + + + + + + + + + measure + 4/4 + + + + + 31 + + + measure + 124/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Tenor + + + diff --git a/mtest/libmscore/parts/part-measure-repeat-udel.mscx b/mtest/libmscore/parts/part-measure-repeat-udel.mscx new file mode 100644 index 0000000000000..95ad19fe5044c --- /dev/null +++ b/mtest/libmscore/parts/part-measure-repeat-udel.mscx @@ -0,0 +1,1841 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + testpart1 + + + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + testpart1 + + + + + + G + G + + + + + 4 + 4 + + + 1.66667 + + 𝅘𝅥 = 100 + + + + quarter + + + 72 + 14 + + + + + quarter + + + 74 + 16 + + + + + quarter + + + 76 + 18 + + + + + quarter + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + nobreak + + + + 2 + 0 + + measure + 4/4 + + + + + 2 + + + nobreak + + + + + measure + 4/4 + + + + + 1 + + + nobreak + + + + + measure + 4/4 + + + + + 2 + + + nobreak + + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + + nobreak + + + + + measure + 4/4 + + + + + 4 + + + nobreak + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + + G8vb + G8vb + + + + + 4 + 4 + + + + quarter + + + 55 + 15 + + + + + quarter + + + 57 + 17 + + + + + quarter + + + 59 + 19 + + + + + quarter + + + 60 + 14 + + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + 2 + 0 + + measure + 4/4 + + + + + 2 + + + + measure + 4/4 + + + + + 1 + + + + measure + 4/4 + + + + + 2 + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + + + measure + 4/4 + + + + + 4 + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Alto + + + 1 + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + + + testpart1 + + + + Alto + + + + + + G + G + + + + + + + 4 + 4 + + + 1.66667 + + + 𝅘𝅥 = 100 + + + + + quarter + + + + 72 + 14 + + + + + + quarter + + + + 74 + 16 + + + + + + quarter + + + + 76 + 18 + + + + + + quarter + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + + nobreak + + + + 2 + 0 + + + measure + 4/4 + + + + + 2 + + + + nobreak + + + + + + measure + 4/4 + + + + + 1 + + + + nobreak + + + + + + measure + 4/4 + + + + + 2 + + + + nobreak + + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + nobreak + + + + + + measure + 4/4 + + + + + 4 + + + + nobreak + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 24 + + + measure + 96/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Alto + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Tenor + + + 2 + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + -1 + + + + + + -1 + + + + testpart1 + + + + Tenor + + + + + + G8vb + G8vb + + + + + + + 4 + 4 + + + 1.66667 + + + -1 + + 4 + + 𝅘𝅥 = 100 + + + + 2 + + quarter + + + 2 + + 55 + 15 + + + + + + quarter + + + + 57 + 17 + + + + + + quarter + + + + 59 + 19 + + + + + + quarter + + + + 60 + 14 + + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + 2 + 0 + + + measure + 4/4 + + + + + 2 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 2 + + + + -1 + + + nobreak + + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 4 + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 23 + + + measure + 92/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Tenor + + + diff --git a/mtest/libmscore/parts/part-measure-repeat-uradd.mscx b/mtest/libmscore/parts/part-measure-repeat-uradd.mscx new file mode 100644 index 0000000000000..0089cda4a18e6 --- /dev/null +++ b/mtest/libmscore/parts/part-measure-repeat-uradd.mscx @@ -0,0 +1,1700 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + testpart1 + + + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + testpart1 + + + + + + G + G + + + + + 4 + 4 + + + 1.66667 + + 𝅘𝅥 = 100 + + + + quarter + + + 72 + 14 + + + + + quarter + + + 74 + 16 + + + + + quarter + + + 76 + 18 + + + + + quarter + + + + + 1 + + nobreak + + + + + measure + 4/4 + + + + + 2 + + nobreak + + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + nobreak + + + + + measure + 4/4 + + + + + 4 + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + + G8vb + G8vb + + + + + 4 + 4 + + + + quarter + + + 55 + 15 + + + + + quarter + + + 57 + 17 + + + + + quarter + + + 59 + 19 + + + + + quarter + + + 60 + 14 + + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Alto + + + 1 + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + + + testpart1 + + + + Alto + + + + + + G + G + + + + + + + 4 + 4 + + + 1.66667 + + + 𝅘𝅥 = 100 + + + + + quarter + + + + 72 + 14 + + + + + + quarter + + + + 74 + 16 + + + + + + quarter + + + + 76 + 18 + + + + + + quarter + + + + + 1 + + + + + measure + 4/4 + + + + + 2 + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + + measure + 4/4 + + + + + 4 + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 27 + + + measure + 108/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Alto + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Tenor + + + 2 + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + -1 + + + + + + -1 + + + + testpart1 + + + + Tenor + + + + + + G8vb + G8vb + + + + + + + 4 + 4 + + + 1.66667 + + + -1 + + 4 + + 𝅘𝅥 = 100 + + + + 2 + + quarter + + + 2 + + 55 + 15 + + + + + + quarter + + + + 57 + 17 + + + + + + quarter + + + + 59 + 19 + + + + + + quarter + + + + 60 + 14 + + + + + + + + + + measure + 4/4 + + + + + 31 + + + measure + 124/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Tenor + + + diff --git a/mtest/libmscore/parts/part-measure-repeat-urdel.mscx b/mtest/libmscore/parts/part-measure-repeat-urdel.mscx new file mode 100644 index 0000000000000..df8022168415c --- /dev/null +++ b/mtest/libmscore/parts/part-measure-repeat-urdel.mscx @@ -0,0 +1,1828 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + testpart1 + + + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + testpart1 + + + + + + G + G + + + + + 4 + 4 + + + 1.66667 + + 𝅘𝅥 = 100 + + + + quarter + + + 72 + 14 + + + + + quarter + + + 74 + 16 + + + + + quarter + + + 76 + 18 + + + + + quarter + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + nobreak + + + + + measure + 4/4 + + + + + 1 + + + nobreak + + + + + measure + 4/4 + + + + + 2 + + + nobreak + + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + + nobreak + + + + + measure + 4/4 + + + + + 4 + + + nobreak + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + + G8vb + G8vb + + + + + 4 + 4 + + + + quarter + + + 55 + 15 + + + + + quarter + + + 57 + 17 + + + + + quarter + + + 59 + 19 + + + + + quarter + + + 60 + 14 + + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + 1 + 0 + + measure + 4/4 + + + + + 1 + + + 2 + 0 + + measure + 4/4 + + + + + 2 + + + + measure + 4/4 + + + + + 1 + + + + measure + 4/4 + + + + + 2 + + + 4 + 0 + + measure + 4/4 + + + + + 3 + + + + measure + 4/4 + + + + + 4 + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Alto + + + 1 + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + + + + + testpart1 + + + + Alto + + + + + + G + G + + + + + + + 4 + 4 + + + 1.66667 + + + 𝅘𝅥 = 100 + + + + + quarter + + + + 72 + 14 + + + + + + quarter + + + + 74 + 16 + + + + + + quarter + + + + 76 + 18 + + + + + + quarter + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 2 + + nobreak + + + + measure + 8/4 + + + + + + + + nobreak + + + + + + measure + 4/4 + + + + + 1 + + + + nobreak + + + + + + measure + 4/4 + + + + + 2 + + + + nobreak + + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + nobreak + + + + + + measure + 4/4 + + + + + 4 + + + + nobreak + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 24 + + + measure + 96/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Alto + + + + 0 + 480 + + 1 + 1 + 1 + 0 + Tenor + + + 2 + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + -1 + + + + + + -1 + + + + testpart1 + + + + Tenor + + + + + + G8vb + G8vb + + + + + + + 4 + 4 + + + 1.66667 + + + -1 + + 4 + + 𝅘𝅥 = 100 + + + + 2 + + quarter + + + 2 + + 55 + 15 + + + + + + quarter + + + + 57 + 17 + + + + + + quarter + + + + 59 + 19 + + + + + + quarter + + + + 60 + 14 + + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + 1 + 0 + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + 2 + 0 + + + measure + 4/4 + + + + + 2 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 1 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 2 + + + + -1 + + + nobreak + + + + 4 + 0 + + + measure + 4/4 + + + + + 3 + + + + -1 + + + nobreak + + + + + + measure + 4/4 + + + + + 4 + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + 23 + + + measure + 92/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + + + + + measure + 4/4 + + + + + Tenor + + + diff --git a/mtest/libmscore/parts/part-measure-repeat.mscx b/mtest/libmscore/parts/part-measure-repeat.mscx new file mode 100644 index 0000000000000..d1249c2ad0995 --- /dev/null +++ b/mtest/libmscore/parts/part-measure-repeat.mscx @@ -0,0 +1,732 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + testpart1 + + + + Standard + + + Alto + + Alto + A. + Alto + 55 + 77 + 55 + 74 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + + Standard + + + Tenor + + Tenor + T. + Tenor + 48 + 72 + 48 + 69 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + + + 10 + + + testpart1 + + + + + + G + G + + + 4 + 4 + + + 1.66667 + 𝅘𝅥 = 100 + + + quarter + + 72 + 14 + + + + quarter + + 74 + 16 + + + + quarter + + 76 + 18 + + + + quarter + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 4/4 + + + + + 2 + + nobreak + + + + measure + 4/4 + + + + + 1 + + nobreak + + + + measure + 4/4 + + + + + 2 + + nobreak + + + + 4 + 0 + measure + 4/4 + + + + + 3 + + nobreak + + + + measure + 4/4 + + + + + 4 + + nobreak + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + + + G8vb + G8vb + + + 4 + 4 + + + quarter + + 55 + 15 + + + + quarter + + 57 + 17 + + + + quarter + + 59 + 19 + + + + quarter + + 60 + 14 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + 1 + + + 2 + 0 + measure + 4/4 + + + + + 2 + + + measure + 4/4 + + + + + 1 + + + measure + 4/4 + + + + + 2 + + + 4 + 0 + measure + 4/4 + + + + + 3 + + + measure + 4/4 + + + + + 4 + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + diff --git a/mtest/libmscore/parts/tst_parts.cpp b/mtest/libmscore/parts/tst_parts.cpp index f9060a46e59a3..9374c07cab8c7 100644 --- a/mtest/libmscore/parts/tst_parts.cpp +++ b/mtest/libmscore/parts/tst_parts.cpp @@ -16,6 +16,7 @@ #include "libmscore/part.h" #include "libmscore/undo.h" #include "libmscore/measure.h" +#include "libmscore/measurerepeat.h" #include "libmscore/chord.h" #include "libmscore/note.h" #include "libmscore/breath.h" @@ -53,6 +54,8 @@ class TestParts : public QObject, public MTest MasterScore* doRemoveSymbol(); MasterScore* doAddChordline(); MasterScore* doRemoveChordline(); + MasterScore* doAddMeasureRepeat(); + MasterScore* doRemoveMeasureRepeat(); // MasterScore* doAddImage(); // MasterScore* doRemoveImage(); @@ -95,6 +98,14 @@ private slots: void undoRemoveChordline(); void undoRedoRemoveChordline(); + void createPartMeasureRepeat(); + void addMeasureRepeat(); + void undoAddMeasureRepeat(); + void undoRedoAddMeasureRepeat(); + void removeMeasureRepeat(); + void undoRemoveMeasureRepeat(); + void undoRedoRemoveMeasureRepeat(); + // void createPartImage(); // void addImage(); // void undoAddImage(); @@ -412,6 +423,11 @@ void TestParts::createPartChordline() testPartCreation("part-chordline"); } +void TestParts::createPartMeasureRepeat() +{ + testPartCreation("part-measure-repeat"); +} + #if 0 void TestParts::createPartImage() { @@ -493,7 +509,7 @@ MasterScore* TestParts::doRemoveBreath() Measure* m = score->firstMeasure(); Segment* s = m->first()->next(SegmentType::Breath); - Breath* b = static_cast(s->element(0)); + Breath* b = toBreath(s->element(0)); score->select(b); score->startCmd(); @@ -550,7 +566,7 @@ MasterScore* TestParts::doAddFingering() Measure* m = score->firstMeasure(); Segment* s = m->tick2segment(Fraction(1,4)); - Ms::Chord* chord = static_cast(s->element(0)); + Ms::Chord* chord = toChord(s->element(0)); Note* note = chord->upNote(); EditData dd(0); Fingering* b = new Fingering(score); @@ -609,10 +625,10 @@ MasterScore* TestParts::doRemoveFingering() Measure* m = score->firstMeasure(); Segment* s = m->first()->next(SegmentType::ChordRest); - Ms::Chord* chord = static_cast(s->element(0)); + Ms::Chord* chord = toChord(s->element(0)); Note* note = chord->upNote(); Element* fingering = 0; - foreach (Element* e, note->el()) { + for (Element* e : note->el()) { if (e->type() == ElementType::FINGERING) { fingering = e; break; @@ -673,7 +689,7 @@ MasterScore* TestParts::doAddSymbol() Measure* m = score->firstMeasure(); Segment* s = m->tick2segment(Fraction(1,4)); - Ms::Chord* chord = static_cast(s->element(0)); + Ms::Chord* chord = toChord(s->element(0)); Note* note = chord->upNote(); EditData dd(0); Symbol* b = new Symbol(score); @@ -732,10 +748,10 @@ MasterScore* TestParts::doRemoveSymbol() Measure* m = score->firstMeasure(); Segment* s = m->first()->next(SegmentType::ChordRest); - Ms::Chord* chord = static_cast(s->element(0)); + Ms::Chord* chord = toChord(s->element(0)); Note* note = chord->upNote(); Element* se = 0; - foreach (Element* e, note->el()) { + for (Element* e : note->el()) { if (e->type() == ElementType::SYMBOL) { se = e; break; @@ -796,7 +812,7 @@ MasterScore* TestParts::doAddChordline() Measure* m = score->firstMeasure(); Segment* s = m->tick2segment(Fraction(1,4)); - Ms::Chord* chord = static_cast(s->element(0)); + Ms::Chord* chord = toChord(s->element(0)); Note* note = chord->upNote(); EditData dd(0); ChordLine* b = new ChordLine(score); @@ -855,10 +871,10 @@ MasterScore* TestParts::doRemoveChordline() Measure* m = score->firstMeasure(); Segment* s = m->first()->next(SegmentType::ChordRest); - Ms::Chord* chord = static_cast(s->element(0)); + Ms::Chord* chord = toChord(s->element(0)); Element* se = 0; - foreach (Element* e, chord->el()) { + for (Element* e : chord->el()) { if (e->type() == ElementType::CHORDLINE) { se = e; break; @@ -909,6 +925,119 @@ void TestParts::undoRedoRemoveChordline() delete score; } +//--------------------------------------------------------- +// doAddMeasureRepeat +//--------------------------------------------------------- + +MasterScore* TestParts::doAddMeasureRepeat() +{ + MasterScore* score = readScore(DIR + "part-empty-parts.mscx"); + Measure* m = score->firstMeasure()->nextMeasure(); + + score->startCmd(); + score->cmdAddMeasureRepeat(m, 4, 0); // test with 4-measure repeat in first staff + score->setLayoutAll(); + score->endCmd(); + + return score; +} + +//--------------------------------------------------------- +// addMeasureRepeat +//--------------------------------------------------------- + +void TestParts::addMeasureRepeat() +{ + MasterScore* score = doAddMeasureRepeat(); + QVERIFY(saveCompareScore(score, "part-measure-repeat-add.mscx", DIR + "part-measure-repeat-add.mscx")); + delete score; +} + +//--------------------------------------------------------- +// undoAddMeasureRepeat +//--------------------------------------------------------- + +void TestParts::undoAddMeasureRepeat() +{ + MasterScore* score = doAddMeasureRepeat(); + + score->undoRedo(true, 0); + + QVERIFY(saveCompareScore(score, "part-measure-repeat-uadd.mscx", DIR + "part-measure-repeat-uadd.mscx")); + delete score; +} + +//--------------------------------------------------------- +// undoRedoAddMeasureRepeat +//--------------------------------------------------------- + +void TestParts::undoRedoAddMeasureRepeat() +{ + MasterScore* score = doAddMeasureRepeat(); + + score->undoRedo(true, 0); + score->undoRedo(false, 0); + + QVERIFY(saveCompareScore(score, "part-measure-repeat-uradd.mscx", DIR + "part-measure-repeat-uradd.mscx")); + delete score; +} + +//--------------------------------------------------------- +// doRemoveMeasureRepeat +//--------------------------------------------------------- + +MasterScore* TestParts::doRemoveMeasureRepeat() +{ + MasterScore* score = readScore(DIR + "part-measure-repeat-parts.mscx"); + + Measure* m = score->firstMeasure()->nextMeasure()->nextMeasure(); + MeasureRepeat* mr = m->measureRepeatElement(0); + score->select(mr); + + score->startCmd(); + score->cmdDeleteSelection(); + score->setLayoutAll(); + score->endCmd(); + return score; +} + +//--------------------------------------------------------- +// removeMeasureRepeat +//--------------------------------------------------------- + +void TestParts::removeMeasureRepeat() +{ + MasterScore* score = doRemoveMeasureRepeat(); + QVERIFY(saveCompareScore(score, "part-measure-repeat-del.mscx", DIR + "part-measure-repeat-del.mscx")); + delete score; +} + +//--------------------------------------------------------- +// undoRemoveMeasureRepeat +//--------------------------------------------------------- + +void TestParts::undoRemoveMeasureRepeat() +{ + MasterScore* score = doRemoveMeasureRepeat(); + score->undoRedo(true, 0); + QVERIFY(saveCompareScore(score, "part-measure-repeat-udel.mscx", DIR + "part-measure-repeat-udel.mscx")); + delete score; +} + +//--------------------------------------------------------- +// undoRedoRemoveMeasureRepeat +//--------------------------------------------------------- + +void TestParts::undoRedoRemoveMeasureRepeat() +{ + MasterScore* score = doRemoveMeasureRepeat(); + score->undoRedo(true, 0); + score->undoRedo(false, 0); + + QVERIFY(saveCompareScore(score, "part-measure-repeat-urdel.mscx", DIR + "part-measure-repeat-urdel.mscx")); + delete score; +} + #if 0 //--------------------------------------------------------- // doAddImage @@ -920,7 +1049,7 @@ MasterScore* TestParts::doAddImage() Measure* m = score->firstMeasure(); Segment* s = m->tick2segment(MScore::division); - Ms::Chord* chord = static_cast(s->element(0)); + Ms::Chord* chord = toChord(s->element(0)); Note* note = chord->upNote(); EditData dd(0); RasterImage* b = new RasterImage(score); @@ -979,10 +1108,10 @@ MasterScore* TestParts::doRemoveImage() Measure* m = score->firstMeasure(); Segment* s = m->first()->next(SegChordRest); - Ms::Chord* chord = static_cast(s->element(0)); + Ms::Chord* chord = toChord(s->element(0)); Note* note = chord->upNote(); Element* fingering = 0; - foreach (Element* e, note->el()) { + for (Element* e : note->el()) { if (e->type() == IMAGE) { fingering = e; break; diff --git a/mtest/musicxml/io/testMeasureRepeats1.pdf b/mtest/musicxml/io/testMeasureRepeats1.pdf new file mode 100644 index 0000000000000..6d92905237f16 Binary files /dev/null and b/mtest/musicxml/io/testMeasureRepeats1.pdf differ diff --git a/mtest/musicxml/io/testMeasureRepeats1.xml b/mtest/musicxml/io/testMeasureRepeats1.xml new file mode 100644 index 0000000000000..1fa7affebd770 --- /dev/null +++ b/mtest/musicxml/io/testMeasureRepeats1.xml @@ -0,0 +1,471 @@ + + + + + Measure Repeats 1 (Sibelius, all subtypes) + + + Isaac Weiss + + 2020-08-17 + Sibelius 19.5.0 + Direct export, not from Dolet + Sibelius / MusicXML 3.0 + + + + + + + + + + 215.9 + 1233 + + + 1596 + 1233 + + 85 + 85 + 85 + 85 + + + + + 22 + 0 + + 92 + + + 0.9375 + 5 + 0.9375 + 1.5625 + 5 + 1.5625 + 1.5625 + 1.25 + 0.9375 + 1.25 + 5 + 1.5625 + 0.9375 + 1.5625 + 1.5625 + 1.5625 + 0.625 + 1.5625 + 0.625 + 75 + 60 + + + + + + + Measure Repeats 1 (Sibelius, all subtypes) + + + MuseScore test file + + + Isaac Weiss + + + + + + + + + + + + + + + General MIDI + Bright Piano + + + + + + + + + + + 22 + 0 + + 218 + + + + 256 + + 0 + major + + + 1 + + G + 2 + + + + + + B + 4 + + 256 + + 1 + quarter + down + 1 + + + + C + 5 + + 256 + + 1 + quarter + down + 1 + + + + + + + 1 + + + + + 512 + + whole + 1 + + + + + + + 512 + + whole + 1 + + + + + + + + + + + + B + 4 + + 256 + + 1 + quarter + down + 1 + + + + G + 4 + + 256 + + 1 + quarter + up + 1 + + + + + + + A + 4 + + 512 + + 1 + half + up + 1 + + + + + + + 2 + + + + + 512 + + whole + 1 + + + + + + + 512 + + 1 + whole + 1 + + + + + + + 512 + + whole + 1 + + + + + + + 512 + + 1 + whole + 1 + + + + + + + + + + + + C + 5 + + 512 + + + 1 + half + down + 1 + + + + + + + + + + + 22 + 0 + + 92 + + + + + + + + C + 5 + + 256 + + + 1 + quarter + down + 1 + + + + + + + B + 4 + + 256 + + + 1 + quarter + down + 1 + + + + + + + + + + B + 4 + + 512 + + + 1 + half + down + 1 + + + + + + + + + + G + 4 + + 512 + + 1 + half + up + 1 + + + + + + + 4 + + + + + 512 + + whole + 1 + + + + + + + 512 + + 1 + whole + 1 + + + + + + + 512 + + 1 + whole + 1 + + + + + + + 512 + + 1 + whole + 1 + + + + + + + 512 + + whole + 1 + + + + + + + 512 + + 1 + whole + 1 + + + + + + + 512 + + 1 + whole + 1 + + + + + + + 512 + + 1 + whole + 1 + + + light-heavy + + + + diff --git a/mtest/musicxml/io/testMeasureRepeats1_ref.xml b/mtest/musicxml/io/testMeasureRepeats1_ref.xml new file mode 100644 index 0000000000000..c1fa61be5a562 --- /dev/null +++ b/mtest/musicxml/io/testMeasureRepeats1_ref.xml @@ -0,0 +1,470 @@ + + + + + Measure Repeats 1 (Sibelius, all subtypes) + + + Isaac Weiss + + MuseScore 0.7.0 + 2007-09-10 + + + + + + + + + + + + + + + + + 1 + 1 + 78.7402 + 0 + + + + + + + 1 + + 0 + + + + G + 2 + + + + + B + 4 + + 1 + 1 + quarter + down + + + + C + 5 + + 1 + 1 + quarter + down + + + + + + 1 + + + + + B + 4 + + 1 + 1 + quarter + down + + + + C + 5 + + 1 + 1 + quarter + down + + + + + + B + 4 + + 1 + 1 + quarter + down + + + + C + 5 + + 1 + 1 + quarter + down + + + + + + + + + + + B + 4 + + 1 + 1 + quarter + down + + + + G + 4 + + 1 + 1 + quarter + up + + + + + + A + 4 + + 2 + 1 + half + up + + + + + + 2 + + + + + B + 4 + + 1 + 1 + quarter + down + + + + G + 4 + + 1 + 1 + quarter + up + + + + + + A + 4 + + 2 + 1 + half + up + + + + + + B + 4 + + 1 + 1 + quarter + down + + + + G + 4 + + 1 + 1 + quarter + up + + + + + + A + 4 + + 2 + 1 + half + up + + + + + + + + + + + C + 5 + + 2 + + 1 + half + down + + + + + + + + + + C + 5 + + 1 + + 1 + quarter + down + + + + + + + B + 4 + + 1 + + 1 + quarter + down + + + + + + + + + B + 4 + + 2 + + 1 + half + down + + + + + + + + + G + 4 + + 2 + 1 + half + up + + + + + + 4 + + + + + C + 5 + + 2 + + 1 + half + down + + + + + + + + + C + 5 + + 1 + + 1 + quarter + down + + + + + + + B + 4 + + 1 + + 1 + quarter + down + + + + + + + + + B + 4 + + 2 + + 1 + half + down + + + + + + + + + G + 4 + + 2 + 1 + half + up + + + + + + C + 5 + + 2 + + 1 + half + down + + + + + + + + + C + 5 + + 1 + + 1 + quarter + down + + + + + + + B + 4 + + 1 + + 1 + quarter + down + + + + + + + + + B + 4 + + 2 + + 1 + half + down + + + + + + + + + G + 4 + + 2 + 1 + half + up + + + light-heavy + + + + diff --git a/mtest/musicxml/io/testMeasureRepeats2.pdf b/mtest/musicxml/io/testMeasureRepeats2.pdf new file mode 100644 index 0000000000000..2f29a2ebb6b89 Binary files /dev/null and b/mtest/musicxml/io/testMeasureRepeats2.pdf differ diff --git a/mtest/musicxml/io/testMeasureRepeats2.xml b/mtest/musicxml/io/testMeasureRepeats2.xml new file mode 100644 index 0000000000000..25673281a02fa --- /dev/null +++ b/mtest/musicxml/io/testMeasureRepeats2.xml @@ -0,0 +1,477 @@ + + + + Measure Repeats (Finale, two staves) + + Isaac Weiss + + Finale v26.2.2 for Windows + 2020-08-17 + + + + + + + + + + 7.2319 + 40 + + + 1545 + 1194 + + 70 + 70 + 88 + 88 + + + + + 0 + 0 + + 121 + 70 + + + 80 + + + 0.918 + 5 + 0.918 + 0.918 + 5 + 1.0807 + 0.957 + 0.918 + 0.918 + 0.918 + 60 + 60 + 120 + 7.5 + + + + + + title + Measure Repeats (Finale, two staves) + + + composer + Isaac Weiss + + + subtitle + MuseScore test file + + + + MusicXML Part + + SmartMusic SoftSynth + + + Bank 2 + + 1 + 15489 + 1 + 80 + 0 + + + + + + + + + + 1 + 0 + + 177 + + system + + + 2 + + 0 + major + + + 2 + + G + 2 + + + F + 4 + + + + + + D + 4 + + 2 + 1 + quarter + up + 1 + + + + E + 4 + + 2 + 1 + quarter + up + 1 + + + + F + 4 + + 2 + 1 + quarter + up + 1 + + + 6 + + + + 6 + 2 + 2 + + + + + + + G + 4 + + 2 + 1 + quarter + up + 1 + + + + E + 4 + + 2 + 1 + quarter + up + 1 + + + + C + 4 + + 2 + 1 + quarter + up + 1 + + + 6 + + + + A + 2 + + 2 + 2 + quarter + up + 2 + + + + B + 2 + + 2 + 2 + quarter + up + 2 + + + + C + 3 + + 2 + 2 + quarter + up + 2 + + + + + + + 1 + + + + + 6 + 1 + 1 + + + 6 + + + + D + 3 + + 2 + 2 + quarter + down + 2 + + + + B + 2 + + 2 + 2 + quarter + up + 2 + + + + G + 2 + + 2 + 2 + quarter + up + 2 + + + + + + + 6 + 1 + 1 + + + + 2 + + + + 6 + + + + 6 + 2 + 2 + + + + + + + + + + + + D + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + E + 5 + + 1 + 1 + eighth + down + 1 + end + + + + F + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + G + 5 + + 1 + 1 + eighth + down + 1 + end + + + + E + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + C + 5 + + 1 + 1 + eighth + down + 1 + end + + + 6 + + + + 6 + 2 + 2 + + + + + + + 1 + + + + + 6 + 1 + 1 + + + 6 + + + + 6 + 2 + 2 + + + + + + + 6 + 1 + 1 + + + 6 + + + + 6 + 2 + 2 + + + + + + + 6 + 1 + 1 + + + + + + + + 6 + + + + A + 2 + + 6 + 2 + half + + up + 2 + + + light-heavy + + + + + diff --git a/mtest/musicxml/io/testMeasureRepeats2_ref.xml b/mtest/musicxml/io/testMeasureRepeats2_ref.xml new file mode 100644 index 0000000000000..eb2acd757f93c --- /dev/null +++ b/mtest/musicxml/io/testMeasureRepeats2_ref.xml @@ -0,0 +1,767 @@ + + + + Measure Repeats (Finale, two staves) + + Isaac Weiss + + MuseScore 0.7.0 + 2007-09-10 + + + + + + + + + + MusicXML Part + + SmartMusic SoftSynth + + + + 1 + 1 + 79.5276 + 0 + + + + + + + 2 + + 0 + + + 2 + + G + 2 + + + F + 4 + + + + + + quarter + 120 + + + 1 + + + + + D + 4 + + 2 + 1 + quarter + up + 1 + + + + E + 4 + + 2 + 1 + quarter + up + 1 + + + + F + 4 + + 2 + 1 + quarter + up + 1 + + + 6 + + + + 6 + 5 + 2 + + + + + + G + 4 + + 2 + 1 + quarter + up + 1 + + + + E + 4 + + 2 + 1 + quarter + up + 1 + + + + C + 4 + + 2 + 1 + quarter + up + 1 + + + 6 + + + + A + 2 + + 2 + 5 + quarter + up + 2 + + + + B + 2 + + 2 + 5 + quarter + up + 2 + + + + C + 3 + + 2 + 5 + quarter + up + 2 + + + + + + 1 + + + + + G + 4 + + 2 + 1 + quarter + up + 1 + + + + E + 4 + + 2 + 1 + quarter + up + 1 + + + + C + 4 + + 2 + 1 + quarter + up + 1 + + + 6 + + + + D + 3 + + 2 + 5 + quarter + down + 2 + + + + B + 2 + + 2 + 5 + quarter + up + 2 + + + + G + 2 + + 2 + 5 + quarter + up + 2 + + + + + + 2 + + + + + G + 4 + + 2 + 1 + quarter + up + 1 + + + + E + 4 + + 2 + 1 + quarter + up + 1 + + + + C + 4 + + 2 + 1 + quarter + up + 1 + + + 6 + + + + A + 2 + + 2 + 5 + quarter + up + 2 + + + + B + 2 + + 2 + 5 + quarter + up + 2 + + + + C + 3 + + 2 + 5 + quarter + up + 2 + + + + + + + + + + + D + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + E + 5 + + 1 + 1 + eighth + down + 1 + end + + + + F + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + G + 5 + + 1 + 1 + eighth + down + 1 + end + + + + E + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + C + 5 + + 1 + 1 + eighth + down + 1 + end + + + 6 + + + + D + 3 + + 2 + 5 + quarter + down + 2 + + + + B + 2 + + 2 + 5 + quarter + up + 2 + + + + G + 2 + + 2 + 5 + quarter + up + 2 + + + + + + 1 + + + + + D + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + E + 5 + + 1 + 1 + eighth + down + 1 + end + + + + F + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + G + 5 + + 1 + 1 + eighth + down + 1 + end + + + + E + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + C + 5 + + 1 + 1 + eighth + down + 1 + end + + + 6 + + + + A + 2 + + 2 + 5 + quarter + up + 2 + + + + B + 2 + + 2 + 5 + quarter + up + 2 + + + + C + 3 + + 2 + 5 + quarter + up + 2 + + + + + + D + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + E + 5 + + 1 + 1 + eighth + down + 1 + end + + + + F + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + G + 5 + + 1 + 1 + eighth + down + 1 + end + + + + E + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + C + 5 + + 1 + 1 + eighth + down + 1 + end + + + 6 + + + + D + 3 + + 2 + 5 + quarter + down + 2 + + + + B + 2 + + 2 + 5 + quarter + up + 2 + + + + G + 2 + + 2 + 5 + quarter + up + 2 + + + + + + + + + + + D + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + E + 5 + + 1 + 1 + eighth + down + 1 + end + + + + F + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + G + 5 + + 1 + 1 + eighth + down + 1 + end + + + + E + 5 + + 1 + 1 + eighth + down + 1 + begin + + + + C + 5 + + 1 + 1 + eighth + down + 1 + end + + + 6 + + + + A + 2 + + 6 + 5 + half + + up + 2 + + + light-heavy + + + + diff --git a/mtest/musicxml/io/testMeasureRepeats3.pdf b/mtest/musicxml/io/testMeasureRepeats3.pdf new file mode 100644 index 0000000000000..6fda68bb29a94 Binary files /dev/null and b/mtest/musicxml/io/testMeasureRepeats3.pdf differ diff --git a/mtest/musicxml/io/testMeasureRepeats3.xml b/mtest/musicxml/io/testMeasureRepeats3.xml new file mode 100644 index 0000000000000..5a00783145daa --- /dev/null +++ b/mtest/musicxml/io/testMeasureRepeats3.xml @@ -0,0 +1,839 @@ + + + + + MuseScore test file + Measure Repeats (content repeated) + + + Isaac Weiss + + MuseScore 0.7.0 + 2007-09-10 + + + + + + + + + + Piano + Pno. + + Piano + + + + 1 + 1 + 78.7402 + 0 + + + + + + + 1 + + 0 + + + 2 + + G + 2 + + + F + 4 + + + + + B + 4 + + 1 + 1 + quarter + down + 1 + + + + G + 4 + + 1 + 1 + quarter + up + 1 + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + + 3 + + + + G + 3 + + 1 + 5 + quarter + down + 2 + + + + E + 3 + + 1 + 5 + quarter + down + 2 + + + + D + 3 + + 1 + 5 + quarter + down + 2 + + + + + + 1 + + + + + B + 4 + + 1 + 1 + quarter + down + 1 + + + + G + 4 + + 1 + 1 + quarter + up + 1 + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + + 3 + + + + C + 3 + + 1 + 5 + quarter + up + 2 + + + + B + 2 + + 1 + 5 + quarter + up + 2 + + + + A + 2 + + 1 + 5 + quarter + up + 2 + + + + + + B + 4 + + 1 + 1 + quarter + down + 1 + + + + G + 4 + + 1 + 1 + quarter + up + 1 + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + + 3 + + + + G + 2 + + 1 + 5 + quarter + up + 2 + + + + A + 2 + + 1 + 5 + quarter + up + 2 + + + + B + 2 + + 1 + 5 + quarter + up + 2 + + + + + + B + 4 + + 1 + 1 + quarter + down + 1 + + + + G + 4 + + 1 + 1 + quarter + up + 1 + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + + 3 + + + + C + 3 + + 1 + 5 + quarter + up + 2 + + + + D + 3 + + 1 + 5 + quarter + down + 2 + + + + E + 3 + + 1 + 5 + quarter + down + 2 + + + + + + + + + 4 + + + + + B + 4 + + 1 + 1 + quarter + down + 1 + + + + C + 5 + + 1 + 1 + quarter + down + 1 + + + + D + 5 + + 1 + 1 + quarter + down + 1 + + + 3 + + + + G + 3 + + 1 + 5 + quarter + down + 2 + + + + E + 3 + + 1 + 5 + quarter + down + 2 + + + + D + 3 + + 1 + 5 + quarter + down + 2 + + + + + + E + 5 + + 1 + 1 + quarter + down + 1 + + + + D + 5 + + 1 + 1 + quarter + down + 1 + + + + C + 5 + + 1 + 1 + quarter + down + 1 + + + 3 + + + + C + 3 + + 1 + 5 + quarter + up + 2 + + + + B + 2 + + 1 + 5 + quarter + up + 2 + + + + A + 2 + + 1 + 5 + quarter + up + 2 + + + + + + 2 + + + + + B + 4 + + 1 + 1 + quarter + down + 1 + + + + C + 5 + + 1 + 1 + quarter + down + 1 + + + + D + 5 + + 1 + 1 + quarter + down + 1 + + + 3 + + + + G + 2 + + 1 + 5 + quarter + up + 2 + + + + A + 2 + + 1 + 5 + quarter + up + 2 + + + + B + 2 + + 1 + 5 + quarter + up + 2 + + + + + + E + 5 + + 1 + 1 + quarter + down + 1 + + + + D + 5 + + 1 + 1 + quarter + down + 1 + + + + C + 5 + + 1 + 1 + quarter + down + 1 + + + 3 + + + + C + 3 + + 1 + 5 + quarter + up + 2 + + + + D + 3 + + 1 + 5 + quarter + down + 2 + + + + E + 3 + + 1 + 5 + quarter + down + 2 + + + + + + + + + + + B + 4 + + 1 + 1 + quarter + down + 1 + + + + C + 5 + + 1 + 1 + quarter + down + 1 + + + + D + 5 + + 1 + 1 + quarter + down + 1 + + + 3 + + + + G + 3 + + 1 + 5 + quarter + down + 2 + + + + F + 1 + 3 + + 1 + 5 + quarter + sharp + down + 2 + + + + G + 3 + + 1 + 5 + quarter + down + 2 + + + + + + 1 + + + + + E + 5 + + 1 + 1 + quarter + down + 1 + + + + D + 5 + + 1 + 1 + quarter + down + 1 + + + + C + 5 + + 1 + 1 + quarter + down + 1 + + + 3 + + + + G + 3 + + 1 + 5 + quarter + down + 2 + + + + F + 1 + 3 + + 1 + 5 + quarter + sharp + down + 2 + + + + G + 3 + + 1 + 5 + quarter + down + 2 + + + + + + + + + + + + + + B + 4 + + 3 + 1 + half + + down + 1 + + + 3 + + + + G + 3 + + 3 + 5 + half + + down + 2 + + + light-heavy + + + + diff --git a/mtest/musicxml/io/tst_mxml_io.cpp b/mtest/musicxml/io/tst_mxml_io.cpp index 62cfe2d7f1683..7f424f2bd2465 100644 --- a/mtest/musicxml/io/tst_mxml_io.cpp +++ b/mtest/musicxml/io/tst_mxml_io.cpp @@ -127,6 +127,9 @@ private slots: void lyricsVoice2a() { mxmlIoTest("testLyricsVoice2a"); } void lyricsVoice2b() { mxmlIoTestRef("testLyricsVoice2b"); } void measureLength() { mxmlIoTestRef("testMeasureLength"); } + void measureRepeats1() { mxmlIoTestRef("testMeasureRepeats1"); } + void measureRepeats2() { mxmlIoTestRef("testMeasureRepeats2"); } + void measureRepeats3() { mxmlIoTest("testMeasureRepeats3"); } void midiPortExport() { mxmlMscxExportTestRef("testMidiPortExport"); } void multiInstrumentPart1() { mxmlIoTest("testMultiInstrumentPart1"); } void multiInstrumentPart2() { mxmlIoTest("testMultiInstrumentPart2"); } diff --git a/mtest/testscript/scripts/init/MeasureRepeats.mscx b/mtest/testscript/scripts/init/MeasureRepeats.mscx new file mode 100644 index 0000000000000..b7e55e119d931 --- /dev/null +++ b/mtest/testscript/scripts/init/MeasureRepeats.mscx @@ -0,0 +1,498 @@ + + + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + + + + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + nobreak + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + nobreak + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + 2 + + + measure + 3/4 + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + 2 + + + measure + 3/4 + + + + + + + 1 + half + down + + 71 + 19 + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + 1 + + + measure + 3/4 + + + + + 2 + + + 4 + 0 + measure + 3/4 + + + + + 3 + + + measure + 3/4 + + + + + 4 + + + measure + 3/4 + + + + + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + quarter + down + + 55 + 15 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + 1 + half + down + + 55 + 15 + + + + + + + diff --git a/mtest/testscript/scripts/measure-repeat-add.mscx b/mtest/testscript/scripts/measure-repeat-add.mscx new file mode 100644 index 0000000000000..7332394b156ae --- /dev/null +++ b/mtest/testscript/scripts/measure-repeat-add.mscx @@ -0,0 +1,473 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2018-11-12 + + + + + + + + + Treble + + + + stdNormal + + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 120 + 100 + + + + Fluid + + + + + + 10 + + + Treble + + + + + + + 4 + 4 + + + quarter + + 72 + 14 + + + + quarter + + + half + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + + + quarter + + 74 + 16 + + + + quarter + + + half + + + + + + + + quarter + + 76 + 18 + + + + quarter + + + half + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 4/4 + + + + + + 2 + + + measure + 4/4 + + + + + + + + quarter + + 77 + 13 + + + + quarter + + + half + + + + + + + + quarter + + 76 + 18 + + + + quarter + + + half + + + + + + + + quarter + + 74 + 16 + + + + quarter + + + half + + + + + + + + quarter + + 72 + 14 + + + + quarter + + + half + + + + + + 1 + + nobreak + + + + measure + 4/4 + + + + + + 2 + + nobreak + + + + 4 + 0 + measure + 4/4 + + + + + + 3 + + nobreak + + + + measure + 4/4 + + + + + + 4 + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + diff --git a/mtest/testscript/scripts/measure-repeat-add.script b/mtest/testscript/scripts/measure-repeat-add.script new file mode 100644 index 0000000000000..01f533be79fa7 --- /dev/null +++ b/mtest/testscript/scripts/measure-repeat-add.script @@ -0,0 +1,23 @@ +init init/Treble.mscx +cmd note-input +cmd note-c +cmd next-measure +palette MeasureRepeat subtype 1 +cmd next-measure +cmd note-d +cmd next-measure +cmd note-e +cmd next-measure +palette MeasureRepeat subtype 2 +cmd next-measure +cmd next-measure +cmd note-f +cmd next-measure +cmd note-e +cmd next-measure +cmd note-d +cmd next-measure +cmd note-c +cmd next-measure +palette MeasureRepeat subtype 4 +test score measure-repeat-add.mscx diff --git a/mtest/testscript/scripts/measure_repeat_barlines.mscx b/mtest/testscript/scripts/measure_repeat_barlines.mscx new file mode 100644 index 0000000000000..4125615431b50 --- /dev/null +++ b/mtest/testscript/scripts/measure_repeat_barlines.mscx @@ -0,0 +1,521 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-19 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + nobreak + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + + 1 + + + 2 + 0 + measure + 3/4 + + + + + + 2 + 2 + + + measure + 3/4 + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + + + 1 + half + down + + 71 + 19 + + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + + 1 + + + measure + 3/4 + + + + + + 2 + + + 4 + 0 + measure + 3/4 + + + + + + 3 + + + measure + 3/4 + + + + + + 4 + + + measure + 3/4 + + + + + + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + quarter + down + + 55 + 15 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + 1 + half + down + + 55 + 15 + + + + + + + diff --git a/mtest/testscript/scripts/measure_repeat_barlines.script b/mtest/testscript/scripts/measure_repeat_barlines.script new file mode 100644 index 0000000000000..2ddef3c407da5 --- /dev/null +++ b/mtest/testscript/scripts/measure_repeat_barlines.script @@ -0,0 +1,14 @@ +init init/MeasureRepeats.mscx +cmd rewind +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +palette BarLine subtype start-repeat +cmd next-measure +palette BarLine subtype end-repeat +cmd next-measure +palette BarLine subtype end-repeat +cmd next-measure +palette BarLine subtype end-repeat +test score measure_repeat_barlines.mscx diff --git a/mtest/testscript/scripts/measure_repeat_timesig.mscx b/mtest/testscript/scripts/measure_repeat_timesig.mscx new file mode 100644 index 0000000000000..3d226ee3e1b16 --- /dev/null +++ b/mtest/testscript/scripts/measure_repeat_timesig.mscx @@ -0,0 +1,501 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-19 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + + + + 4 + 4 + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + 1 + half + down + + 71 + 19 + + + + quarter + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + + + + measure + 3/4 + + + + + + + + measure + 3/4 + + + + + + + + 4 + 4 + + + measure + 4/4 + + + + + + + + half + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + + + + + + quarter + down + + 55 + 15 + + + + 0 + 2700 + half + + + 0 + 2700 + quarter + + + + + + + + 1 + half + down + + 55 + 15 + + + + quarter + + + + + + diff --git a/mtest/testscript/scripts/measure_repeat_timesig.script b/mtest/testscript/scripts/measure_repeat_timesig.script new file mode 100644 index 0000000000000..8cf6730105e52 --- /dev/null +++ b/mtest/testscript/scripts/measure_repeat_timesig.script @@ -0,0 +1,10 @@ +init init/MeasureRepeats.mscx +cmd rewind +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +palette TimeSig timesig 4/4 +test score measure_repeat_timesig.mscx diff --git a/mtest/testscript/scripts/measurerepeat_allow_insert_timedelete.mscx b/mtest/testscript/scripts/measurerepeat_allow_insert_timedelete.mscx new file mode 100644 index 0000000000000..5f62dd262916e --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_allow_insert_timedelete.mscx @@ -0,0 +1,446 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-19 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + nobreak + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + + nobreak + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + + + measure + 3/4 + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + + 1 + + + measure + 3/4 + + + + + + 2 + + + 4 + 0 + measure + 3/4 + + + + + + 3 + + + measure + 3/4 + + + + + + 4 + + + measure + 3/4 + + + + + + + + measure + 3/4 + + + + + + diff --git a/mtest/testscript/scripts/measurerepeat_allow_insert_timedelete.script b/mtest/testscript/scripts/measurerepeat_allow_insert_timedelete.script new file mode 100644 index 0000000000000..db2ea7e015ce3 --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_allow_insert_timedelete.script @@ -0,0 +1,14 @@ +init init/MeasureRepeats.mscx +cmd rewind +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd insert-measure +cmd select-next-chord +cmd time-delete +test score measurerepeat_allow_insert_timedelete.mscx diff --git a/mtest/testscript/scripts/measurerepeat_paste_into_group.mscx b/mtest/testscript/scripts/measurerepeat_paste_into_group.mscx new file mode 100644 index 0000000000000..75c1d4aa6ddb3 --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_paste_into_group.mscx @@ -0,0 +1,534 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-19 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + + + + quarter + + 74 + 16 + + + + quarter + + + quarter + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + + + 1 + half + down + + 71 + 19 + + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + + + + + + + + measure + 3/4 + + + + + + + + measure + 3/4 + + + + + + + + measure + 3/4 + + + + + + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + quarter + down + + 55 + 15 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + 1 + half + down + + 55 + 15 + + + + + + + diff --git a/mtest/testscript/scripts/measurerepeat_paste_into_group.script b/mtest/testscript/scripts/measurerepeat_paste_into_group.script new file mode 100644 index 0000000000000..543684813dd0b --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_paste_into_group.script @@ -0,0 +1,12 @@ +init init/MeasureRepeats.mscx +cmd rewind +cmd down-chord +cmd next-measure +cmd next-measure +cmd select-next-chord +cmd copy +cmd next-chord +cmd next-chord +cmd next-measure +cmd paste +test score measurerepeat_paste_into_group.mscx diff --git a/mtest/testscript/scripts/measurerepeat_prevent_insert_timedelete.mscx b/mtest/testscript/scripts/measurerepeat_prevent_insert_timedelete.mscx new file mode 100644 index 0000000000000..45eb1d882901d --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_prevent_insert_timedelete.mscx @@ -0,0 +1,525 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-19 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + nobreak + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + + nobreak + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + + + 1 + half + down + + 71 + 19 + + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + + 1 + + + measure + 3/4 + + + + + + 2 + + + 4 + 0 + measure + 3/4 + + + + + + 3 + + + measure + 3/4 + + + + + + 4 + + + measure + 3/4 + + + + + + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + quarter + down + + 55 + 15 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + 1 + half + down + + 55 + 15 + + + + + + + diff --git a/mtest/testscript/scripts/measurerepeat_prevent_insert_timedelete.script b/mtest/testscript/scripts/measurerepeat_prevent_insert_timedelete.script new file mode 100644 index 0000000000000..31654b5999c30 --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_prevent_insert_timedelete.script @@ -0,0 +1,11 @@ +init init/MeasureRepeats.mscx +cmd rewind +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd insert-measure +cmd prev-chord +cmd time-delete +test score measurerepeat_prevent_insert_timedelete.mscx diff --git a/mtest/testscript/scripts/measurerepeat_prevent_partial_cut.mscx b/mtest/testscript/scripts/measurerepeat_prevent_partial_cut.mscx new file mode 100644 index 0000000000000..45eb1d882901d --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_prevent_partial_cut.mscx @@ -0,0 +1,525 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-19 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + nobreak + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + + nobreak + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + + + 1 + half + down + + 71 + 19 + + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + + 1 + + + measure + 3/4 + + + + + + 2 + + + 4 + 0 + measure + 3/4 + + + + + + 3 + + + measure + 3/4 + + + + + + 4 + + + measure + 3/4 + + + + + + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + quarter + down + + 55 + 15 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + 1 + half + down + + 55 + 15 + + + + + + + diff --git a/mtest/testscript/scripts/measurerepeat_prevent_partial_cut.script b/mtest/testscript/scripts/measurerepeat_prevent_partial_cut.script new file mode 100644 index 0000000000000..8f5b489d83de7 --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_prevent_partial_cut.script @@ -0,0 +1,11 @@ +init init/MeasureRepeats.mscx +cmd rewind +cmd down-chord +cmd next-measure +cmd next-measure +cmd next-measure +cmd select-next-chord +cmd select-next-chord +cmd select-next-chord +cmd cut +test score measurerepeat_prevent_partial_cut.mscx diff --git a/mtest/testscript/scripts/measurerepeat_prevent_split_join.mscx b/mtest/testscript/scripts/measurerepeat_prevent_split_join.mscx new file mode 100644 index 0000000000000..45eb1d882901d --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_prevent_split_join.mscx @@ -0,0 +1,525 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-19 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + nobreak + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + + nobreak + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 3/4 + + + + + + 2 + + + measure + 3/4 + + + + + + + + 1 + half + down + + 71 + 19 + + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + + 1 + + + measure + 3/4 + + + + + + 2 + + + 4 + 0 + measure + 3/4 + + + + + + 3 + + + measure + 3/4 + + + + + + 4 + + + measure + 3/4 + + + + + + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + quarter + down + + 55 + 15 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + 1 + half + down + + 55 + 15 + + + + + + + diff --git a/mtest/testscript/scripts/measurerepeat_prevent_split_join.script b/mtest/testscript/scripts/measurerepeat_prevent_split_join.script new file mode 100644 index 0000000000000..72c4616e50a88 --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_prevent_split_join.script @@ -0,0 +1,14 @@ +init init/MeasureRepeats.mscx +cmd rewind +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd select-next-chord +cmd select-next-chord +cmd select-next-chord +cmd select-next-chord +cmd join-measures +cmd next-chord +cmd split-measure +test score measurerepeat_prevent_split_join.mscx diff --git a/mtest/testscript/scripts/measurerepeat_repeat_sel_into_group.mscx b/mtest/testscript/scripts/measurerepeat_repeat_sel_into_group.mscx new file mode 100644 index 0000000000000..032b3b39d63a4 --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_repeat_sel_into_group.mscx @@ -0,0 +1,555 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-19 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 3 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + nobreak + + + + quarter + down + + 71 + 19 + + + + quarter + down + + 72 + 14 + + + + quarter + down + + 74 + 16 + + + + + + + + nobreak + + + + quarter + down + + 76 + 18 + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + + + + + nobreak + + + + quarter + down + + 74 + 16 + + + + quarter + down + + 72 + 14 + + + + quarter + + + + + + + + quarter + + 71 + 19 + + + + quarter + + 72 + 14 + + + + quarter + + 69 + 17 + + + + + + + + + quarter + + 69 + 17 + + + + quarter + + + quarter + + + + + + + + measure + 3/4 + + + + + + + + 1 + half + down + + 71 + 19 + + + + + + + + + + + 3 + 4 + + + quarter + down + + 55 + 15 + + + + quarter + down + + 52 + 18 + + + + quarter + down + + 50 + 16 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + up + + 47 + 19 + + + + quarter + up + + 45 + 17 + + + + + + + + + quarter + up + + 43 + 15 + + + + quarter + up + + 45 + 17 + + + + quarter + up + + 47 + 19 + + + + + + + + + quarter + up + + 48 + 14 + + + + quarter + down + + 50 + 16 + + + + quarter + down + + 52 + 18 + + + + + + + 1 + + + measure + 3/4 + + + + + + 2 + + + 4 + 0 + measure + 3/4 + + + + + + 3 + + + measure + 3/4 + + + + + + 4 + + + measure + 3/4 + + + + + + + + quarter + down + + 55 + 15 + + + + quarter + down + + + accidentalSharp + + 54 + 20 + + + + quarter + down + + 55 + 15 + + + + + + + 1 + + + 1 + 0 + measure + 3/4 + + + + + + + + 1 + half + down + + 55 + 15 + + + + + + + diff --git a/mtest/testscript/scripts/measurerepeat_repeat_sel_into_group.script b/mtest/testscript/scripts/measurerepeat_repeat_sel_into_group.script new file mode 100644 index 0000000000000..81e8cd12a48ba --- /dev/null +++ b/mtest/testscript/scripts/measurerepeat_repeat_sel_into_group.script @@ -0,0 +1,19 @@ +init init/MeasureRepeats.mscx +cmd rewind +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-measure +cmd next-chord +cmd select-next-chord +cmd repeat-sel +cmd next-chord +cmd next-chord +cmd note-input +cmd note-b +cmd note-c +cmd note-a +cmd repeat-sel +cmd escape +test score measurerepeat_repeat_sel_into_group.mscx diff --git a/vtest/bravura-mmrest-ref.png b/vtest/bravura-mmrest-1-ref.png similarity index 100% rename from vtest/bravura-mmrest-ref.png rename to vtest/bravura-mmrest-1-ref.png diff --git a/vtest/bravura-mmrest-1.mscx b/vtest/bravura-mmrest-1.mscx new file mode 100644 index 0000000000000..cc59c5e5be319 --- /dev/null +++ b/vtest/bravura-mmrest-1.mscx @@ -0,0 +1,949 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2013-09-17 + + + + X11 + + + + + + + + + stdNormal + + + Flute + + +

Fl.

 + Flute + 59 + 98 + 60 + 93 + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + Fluid + + + + + + + perc5Line + 0 + + + Drumset + + +

Drs.

 + Drumset + 1 + + normal + 7 + 1 + Acoustic Bass Drum + 2 + + + normal + 7 + 1 + Bass Drum + 2 + C + + + cross + 3 + 0 + Side Stick + 1 + + + normal + 3 + 0 + Snare (Acoustic) + 1 + + + normal + 3 + 0 + Snare (Electric) + 1 + + + normal + 5 + 0 + Tom 5 + 1 + + + cross + -1 + 0 + Hi-Hat Closed + 1 + + + normal + 5 + 1 + Tom 4 + 2 + + + cross + 9 + 1 + Hi-Hat Pedal + 2 + + + normal + 2 + 0 + Tom 3 + 1 + + + cross + 1 + 0 + Hi-Hat Open + 1 + + + normal + 1 + 0 + Tom 2 + 1 + + + normal + 0 + 0 + Tom 1 + 1 + + + cross + -2 + 0 + Crash 1 + 1 + + + normal + 0 + 0 + Tom + 1 + + + cross + 0 + 0 + Ride + 1 + D + + + cross + -3 + 0 + China + 1 + + + diamond + 0 + 0 + Ride (Bell) + 1 + + + diamond + 2 + 0 + Tambourine + 1 + + + cross + -3 + 0 + Ride (Bell) + 1 + + + triangle-down + 1 + 0 + Ride (Bell) + 1 + + + cross + -3 + 0 + Ride (Bell) + 1 + + + cross + 2 + 0 + Ride (Bell) + 1 + + + cross + 4 + 0 + open high conga + 1 + + + cross + 6 + 0 + low conga + 1 + + + 100 + 100 + + + 100 + 85 + + + 100 + 100 + + + 120 + 100 + + + + + + Fluid + + + + + + + + 4 + 4 + + + Bravura - multi measure rest + + + measure + 4/4 + + + + + + + 7 + + + measure + 4/4 + + + + + 31 + + + 7 + + + measure + 4/4 + + + 30/1 + + + end + + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + end + + -1 + + + + + + + + + + 4 + 4 + + + measure + 4/4 + + + + + + + 7 + + + measure + 4/4 + + + + + 31 + + + 7 + + + measure + 4/4 + + + 30/1 + + + end + + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + + + + + measure + 4/4 + + + end + + -1 + + + + + + + diff --git a/vtest/bravura-mmrest-2-ref.png b/vtest/bravura-mmrest-2-ref.png new file mode 100644 index 0000000000000..403b71963106f Binary files /dev/null and b/vtest/bravura-mmrest-2-ref.png differ diff --git a/vtest/bravura-mmrest-2.mscx b/vtest/bravura-mmrest-2.mscx new file mode 100644 index 0000000000000..30f6d8dd1a011 --- /dev/null +++ b/vtest/bravura-mmrest-2.mscx @@ -0,0 +1,604 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2013-09-17 + + + + X11 + + + + + + + + + stdNormal + + + Piano + + +

Pno.

 + Piano + 21 + 108 + 21 + 108 + + 100 + 70 + + + 100 + 40 + + + 100 + 100 + + + 120 + 100 + + + + Fluid + + + + + + + + + 0 + + 4 + 4 + + + measure + 4/4 + + + + + + 7 + + + 0 + + -1 + + 4 + 4 + + + measure + 28/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + + + measure + 4/4 + + + + + + 1 + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 10 + + line + + + + measure + 40/4 + + + double + 1 + + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + line + + + + measure + 4/4 + + + double + 1 + + -1 + + + + + + + + + measure + 4/4 + + + + + + 6 + + + measure + 24/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 2 + + + measure + 8/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 8 + + + measure + 16/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + diff --git a/vtest/bravura-mmrest.mscx b/vtest/bravura-mmrest.mscx deleted file mode 100644 index d44f03a85159b..0000000000000 --- a/vtest/bravura-mmrest.mscx +++ /dev/null @@ -1,764 +0,0 @@ - - - 2.1.0 - 3543170 - - - 0 - - - 480 - - 1 - 1 - 1 - 0 - - - - 2013-09-17 - - - - X11 - - - - - - - - - - - - - - - stdNormal - - - - Flute - - -

Fl.

 - Flute - 59 - 98 - 60 - 93 - - 100 - 100 - - - 100 - 85 - - - 100 - 100 - - - 120 - 100 - - - - Fluid - - - - - - - perc5Line - 0 - - - - Drumset - - -

Drs.

 - Drumset - 1 - - 0 - 7 - 1 - Acoustic Bass Drum - 2 - - - 0 - 7 - 1 - Bass Drum - 2 - C - - - 1 - 3 - 0 - Side Stick - 1 - - - 0 - 3 - 0 - Snare (Acoustic) - 1 - - - 0 - 3 - 0 - Snare (Electric) - 1 - - - 0 - 5 - 0 - Tom 5 - 1 - - - 1 - -1 - 0 - Hi-Hat Closed - 1 - - - 0 - 5 - 1 - Tom 4 - 2 - - - 1 - 9 - 1 - Hi-Hat Pedal - 2 - - - 0 - 2 - 0 - Tom 3 - 1 - - - 1 - 1 - 0 - Hi-Hat Open - 1 - - - 0 - 1 - 0 - Tom 2 - 1 - - - 0 - 0 - 0 - Tom 1 - 1 - - - 1 - -2 - 0 - Crash 1 - 1 - - - 0 - 0 - 0 - Tom - 1 - - - 1 - 0 - 0 - Ride - 1 - D - - - 1 - -3 - 0 - China - 1 - - - 2 - 0 - 0 - Ride (Bell) - 1 - - - 2 - 2 - 0 - Tambourine - 1 - - - 1 - -3 - 0 - Ride (Bell) - 1 - - - 3 - 1 - 0 - Ride (Bell) - 1 - - - 1 - -3 - 0 - Ride (Bell) - 1 - - - 1 - 2 - 0 - Ride (Bell) - 1 - - - 1 - 4 - 0 - open high conga - 1 - - - 1 - 6 - 0 - low conga - 1 - - - 100 - 100 - - - 100 - 85 - - - 100 - 100 - - - 120 - 100 - - - - - Fluid - - - - - - - G - G - - - 4 - 4 - 1 - - - Bravura - multi measure rest - - - measure - - - - - - 7 - - - measure - - - - - 31 - - 7 - - - measure - - - 61440 - - end - 1 - - - 3840 - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - end - 1 - - - - - - - PERC - PERC - - - 4 - 4 - 1 - - - measure - - - - - - 7 - - - measure - - - - - 31 - - 7 - - - measure - - - 61440 - - end - 1 - - - 3840 - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - - - measure - - - - end - 1 - - - - - diff --git a/vtest/gen b/vtest/gen index 86fc3ab7de1c2..201a242cea695 100755 --- a/vtest/gen +++ b/vtest/gen @@ -22,9 +22,10 @@ fi if test -n "$1"; then SRC=$1 else - SRC="mmrest-1 bravura-mmrest gonville-mmrest mmrest-2 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest-8 mmrest-9\ - mmrest-10 mmrest-11 mmrest-12 fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 fmrest-6 measure-repeat-1\ + SRC="mmrest-1 mmrest-2 mmrest-3 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest-8 mmrest-9 mmrest-10 mmrest-11 mmrest-12\ + fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 fmrest-6 measure-repeat-1 measure-repeat-2 measure-repeat-3\ noteheadposition-1 valign-1 valign-2 valign-3\ + bravura-mmrest-1 bravura-mmrest-2 gonville-mmrest-1 gonville-mmrest-2 musejazz-mmrest-2\ emmentaler-1 bravura-1 gonville-1 musejazz-1\ emmentaler-2 bravura-2 gonville-2 musejazz-2\ emmentaler-3 bravura-3 gonville-3 musejazz-3\ diff --git a/vtest/gen.bat b/vtest/gen.bat index 3851173e6b622..e69f3e7ef0d65 100644 --- a/vtest/gen.bat +++ b/vtest/gen.bat @@ -1,10 +1,10 @@ @echo off rem "magick compare" - image magick compare program - -set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmrest-8,mmrest-9, ^ - mmrest-10,mmrest-11,mmrest-12,fmrest-1,fmrest-2,fmrest-3,fmrest-4,fmrest-5,fmrest-6,measure-repeat-1, ^ +set SRC=mmrest-1,mmrest-2,mmrest-3,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmrest-8,mmrest-9,mmrest-10,mmrest-11,mmrest-12, ^ + fmrest-1,fmrest-2,fmrest-3,fmrest-4,fmrest-5,fmrest-6,measure-repeat-1,measure-repeat-2,measure-repeat-3, ^ noteheadposition-1,valign-1,valign-2,valign-3, ^ + bravura-mmrest-1,bravura-mmrest-2,gonville-mmrest-1,gonville-mmrest-2,musejazz-mmrest-2, ^ emmentaler-1,bravura-1,gonville-1, musejazz-1, ^ emmentaler-2,bravura-2,gonville-2, musejazz-2, ^ emmentaler-3,bravura-3,gonville-3, musejazz-3, ^ diff --git a/vtest/gonville-mmrest-ref.png b/vtest/gonville-mmrest-1-ref.png similarity index 100% rename from vtest/gonville-mmrest-ref.png rename to vtest/gonville-mmrest-1-ref.png diff --git a/vtest/gonville-mmrest.mscx b/vtest/gonville-mmrest-1.mscx similarity index 100% rename from vtest/gonville-mmrest.mscx rename to vtest/gonville-mmrest-1.mscx diff --git a/vtest/gonville-mmrest-2-ref.png b/vtest/gonville-mmrest-2-ref.png new file mode 100644 index 0000000000000..2c8ae58ac230c Binary files /dev/null and b/vtest/gonville-mmrest-2-ref.png differ diff --git a/vtest/gonville-mmrest-2.mscx b/vtest/gonville-mmrest-2.mscx new file mode 100644 index 0000000000000..47af6a21dc4a5 --- /dev/null +++ b/vtest/gonville-mmrest-2.mscx @@ -0,0 +1,602 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2013-09-17 + + + + X11 + + + + + + + + + stdNormal + + + Piano + + +

Pno.

 + Piano + 21 + 108 + 21 + 108 + + 100 + 70 + + + 100 + 40 + + + 100 + 100 + + + 120 + 100 + + + + Fluid + + + + + + + + + 0 + + 4 + 4 + + + measure + 4/4 + + + + + + 7 + + + 0 + + -1 + + 4 + 4 + + + measure + 28/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + + + measure + 4/4 + + + + + + 1 + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 10 + + line + + + + measure + 40/4 + + + double + 1 + + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + line + + + + measure + 4/4 + + + double + 1 + + -1 + + + + + + + + + measure + 4/4 + + + + + + 6 + + + measure + 24/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 2 + + + measure + 8/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 8 + + + measure + 16/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + diff --git a/vtest/measure-repeat-2-ref.png b/vtest/measure-repeat-2-ref.png new file mode 100644 index 0000000000000..00ae4f8731f89 Binary files /dev/null and b/vtest/measure-repeat-2-ref.png differ diff --git a/vtest/measure-repeat-2.mscx b/vtest/measure-repeat-2.mscx new file mode 100644 index 0000000000000..e928107e9bd6b --- /dev/null +++ b/vtest/measure-repeat-2.mscx @@ -0,0 +1,242 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-23 + + + + Microsoft Windows + + + + + + + + + stdNormal + + + 1 + + + + stdNormal + + F + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + nobreak + + + + 4 + 4 + + + quarter + down + + 71 + 19 + + + + quarter + up + + 67 + 15 + + + + quarter + up + + 69 + 17 + + + + quarter + + 71 + 19 + + + + + + + 1 + + nobreak + + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + nobreak + + + + 2 + 0 + measure + 4/4 + + + + + + 2 + + + measure + 4/4 + + + + + + + + 1 + + + 4 + 4 + + + measure + 4/4 + + + + + + 2 + + + 4 + 0 + measure + 4/4 + + + + + + 3 + + + measure + 4/4 + + + + + + 4 + + + measure + 4/4 + + + + + + diff --git a/vtest/measure-repeat-3-ref.png b/vtest/measure-repeat-3-ref.png new file mode 100644 index 0000000000000..1ba6a0e8de0fd Binary files /dev/null and b/vtest/measure-repeat-3-ref.png differ diff --git a/vtest/measure-repeat-3.mscx b/vtest/measure-repeat-3.mscx new file mode 100644 index 0000000000000..28370dc63760b --- /dev/null +++ b/vtest/measure-repeat-3.mscx @@ -0,0 +1,322 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2020-08-23 + + + + Microsoft Windows + + + + + + + + + stdNormal + + 1 + + Piano + + Piano + Pno. + Piano + 21 + 108 + 21 + 108 + keyboard.piano + F + + 100 + 95 + + + 100 + 33 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 150 + 100 + + + 150 + 50 + + + 120 + 50 + + + 120 + 100 + + + + Fluid + + + + + + + + + 4 + 4 + + + half + down + + 71 + 19 + + + + half + + 69 + 17 + + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + 1 + + + 1 + 0 + measure + 4/4 + + + + + + diff --git a/vtest/mmrest-3-ref.png b/vtest/mmrest-3-ref.png new file mode 100644 index 0000000000000..be6a719ac3bca Binary files /dev/null and b/vtest/mmrest-3-ref.png differ diff --git a/vtest/mmrest-3.mscx b/vtest/mmrest-3.mscx new file mode 100644 index 0000000000000..d7d2a04e21e74 --- /dev/null +++ b/vtest/mmrest-3.mscx @@ -0,0 +1,588 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2013-09-17 + + + + X11 + + + + + + + + + stdNormal + + + Piano + + +

Pno.

 + Piano + 21 + 108 + 21 + 108 + + 100 + 70 + + + 100 + 40 + + + 100 + 100 + + + 120 + 100 + + + + Fluid + + + + + + + + + 0 + + 4 + 4 + + + measure + 4/4 + + + + + + 7 + + + 0 + + -1 + + 4 + 4 + + + measure + 28/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + + + measure + 4/4 + + + + + + 1 + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 10 + + line + + + + measure + 40/4 + + + double + 1 + + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + line + + + + measure + 4/4 + + + double + 1 + + -1 + + + + + + + + + measure + 4/4 + + + + + + 6 + + + measure + 24/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 2 + + + measure + 8/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 8 + + + measure + 16/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + diff --git a/vtest/musejazz-mmrest-2-ref.png b/vtest/musejazz-mmrest-2-ref.png new file mode 100644 index 0000000000000..e96dbbf1886b2 Binary files /dev/null and b/vtest/musejazz-mmrest-2-ref.png differ diff --git a/vtest/musejazz-mmrest-2.mscx b/vtest/musejazz-mmrest-2.mscx new file mode 100644 index 0000000000000..b775b75988c31 --- /dev/null +++ b/vtest/musejazz-mmrest-2.mscx @@ -0,0 +1,607 @@ + + + 4.0.0 + 3543170 + + + 0 + 480 + + 1 + 1 + 1 + 0 + + + + 2013-09-17 + + + + X11 + + + + + + + + + stdNormal + + + Piano + + +

Pno.

 + Piano + 21 + 108 + 21 + 108 + + 100 + 70 + + + 100 + 40 + + + 100 + 100 + + + 120 + 100 + + + + Fluid + + + + + + + + + 0 + + 4 + 4 + + + measure + 4/4 + + + + + + 7 + + + 0 + + -1 + + 4 + 4 + + + measure + 28/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + + + measure + 4/4 + + + + + + 1 + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 10 + + line + + + + measure + 40/4 + + + double + 1 + + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + line + + + + measure + 4/4 + + + double + 1 + + -1 + + + + + + + + + measure + 4/4 + + + + + + 6 + + + measure + 24/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 2 + + + measure + 8/4 + + + + + + + + measure + 4/4 + + + + + + + + whole + + 72 + 14 + + + + + + + + + measure + 4/4 + + + + + + 8 + + + measure + 16/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + + + + measure + 4/4 + + + + + +