LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #18024 from asattely/convert-400-combined-artics

Browse source 
Implement #17999: Convert all combined articulations from pre-410 scores to their components
This commit is contained in:
RomanPudashkin 2023-06-26 10:14:49 +03:00 committed by GitHub
parent 93ffa8198a adea689581
commit 63631084d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 416 additions and 847 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/braille/tests/data/testArticulations_Example_22.1_MBC2015.mscx
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.01">
<programVersion>4.0.0</programVersion>
<programRevision>3543170</programRevision>
<museScore version="4.10">
<programVersion>4.2.0</programVersion>
<programRevision></programRevision>
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>

154
src/engraving/rw/compat/compatutils.cpp
View file

@ -30,6 +30,8 @@
#include "libmscore/score.h"
#include "libmscore/excerpt.h"
#include "libmscore/part.h"
#include "libmscore/stem.h"
#include "libmscore/tremolo.h"
#include "libmscore/linkedobjects.h"
#include "libmscore/measure.h"
#include "libmscore/factory.h"
@ -85,6 +87,9 @@ void CompatUtils::doCompatibilityConversions(MasterScore* masterScore)
replaceOldWithNewExpressions(masterScore);
replaceOldWithNewOrnaments(masterScore);
resetRestVerticalOffset(masterScore);
splitArticulations(masterScore);
resetArticulationOffsets(masterScore);
resetStemLengthsForTwoNoteTrems(masterScore);
}
}
@ -341,6 +346,104 @@ void CompatUtils::reconstructTypeOfCustomDynamics(MasterScore* score)
}
}
void CompatUtils::splitArticulations(MasterScore* masterScore)
{
std::set<Articulation*> toRemove;
for (Measure* meas = masterScore->firstMeasure(); meas; meas = meas->nextMeasure()) {
for (Segment& seg : meas->segments()) {
if (!seg.isChordRestType()) {
continue;
}
for (EngravingItem* item : seg.elist()) {
if (!item || !item->isChord()) {
continue;
}
Chord* chord = toChord(item);
for (Articulation* a : chord->articulations()) {
if (a->isLinked()) {
continue; // only worry about main artics, links will be done later
}
std::set<SymId> ids = mu::engraving::splitArticulations({ a->symId() });
if (ids.size() <= 1) {
continue;
}
toRemove.insert(a);
}
}
}
}
// separate into individual articulations
for (Articulation* combinedArtic : toRemove) {
auto components = mu::engraving::splitArticulations({ combinedArtic->symId() });
Chord* parentChord = toChord(combinedArtic->parentItem());
for (SymId id : components) {
Articulation* newArtic = Factory::createArticulation(masterScore->dummy()->chord());
newArtic->setSymId(id);
if (parentChord->hasArticulation(newArtic)) {
delete newArtic;
continue;
}
newArtic->setParent(parentChord);
newArtic->setTrack(combinedArtic->track());
newArtic->setPos(combinedArtic->pos());
newArtic->setDirection(combinedArtic->direction());
newArtic->setAnchor(combinedArtic->anchor());
newArtic->setColor(combinedArtic->color());
newArtic->setPlayArticulation(combinedArtic->playArticulation());
newArtic->setVisible(combinedArtic->visible());
newArtic->setOrnamentStyle(combinedArtic->ornamentStyle());
LinkedObjects* links = new LinkedObjects(masterScore);
links->push_back(newArtic);
newArtic->setLinks(links);
parentChord->add(newArtic);
// newArtic is the main articulation
LinkedObjects* oldLinks = combinedArtic->links();
if (!oldLinks || oldLinks->empty()) {
continue;
}
for (EngravingObject* linkedItem : *oldLinks) {
IF_ASSERT_FAILED(linkedItem && linkedItem->isArticulation()) {
continue;
}
if (linkedItem == combinedArtic) {
continue;
}
Articulation* oldArtic = toArticulation(linkedItem);
Chord* oldParent = toChord(oldArtic->parentItem());
oldParent->add(newArtic->linkedClone());
}
}
}
// finally, remove the combined articulations
for (Articulation* combinedArtic : toRemove) {
LinkedObjects* links = combinedArtic->links();
if (!links || links->empty()) {
Chord* parentChord = toChord(combinedArtic->parentItem());
parentChord->remove(combinedArtic);
delete combinedArtic;
continue;
}
std::set<Articulation*> removeLinks;
for (auto linked : *links) {
IF_ASSERT_FAILED(linked && linked->isArticulation()) {
continue;
}
removeLinks.insert(toArticulation(linked));
}
for (Articulation* linkedArtic : removeLinks) {
if (linkedArtic != combinedArtic) {
Chord* linkedParent = toChord(linkedArtic->parentItem());
linkedParent->remove(linkedArtic);
delete linkedArtic;
}
}
Chord* parentChord = toChord(combinedArtic->parentItem());
parentChord->remove(combinedArtic);
delete combinedArtic;
}
}
DynamicType CompatUtils::reconstructDynamicTypeFromString(Dynamic* dynamic)
{
static std::vector<Dyn> sortedDynList; // copy of dynList sorted by string length
@ -406,3 +509,54 @@ void CompatUtils::resetRestVerticalOffset(MasterScore* masterScore)
}
}
}
void CompatUtils::resetArticulationOffsets(MasterScore* masterScore)
{
for (Score* score : masterScore->scoreList()) {
for (Measure* measure = score->firstMeasure(); measure; measure = measure->nextMeasure()) {
for (Segment& segment : measure->segments()) {
if (!segment.isChordRestType()) {
continue;
}
for (EngravingItem* item : segment.elist()) {
if (!item || !item->isChord()) {
continue;
}
Chord* chord = toChord(item);
for (Articulation* artic : chord->articulations()) {
if (!artic) {
continue;
}
artic->setProperty(Pid::OFFSET, PointF());
}
}
}
}
}
}
void CompatUtils::resetStemLengthsForTwoNoteTrems(MasterScore* masterScore)
{
for (Score* score : masterScore->scoreList()) {
for (Measure* measure = score->firstMeasure(); measure; measure = measure->nextMeasure()) {
for (Segment& segment : measure->segments()) {
if (!segment.isChordRestType()) {
continue;
}
for (EngravingItem* item : segment.elist()) {
if (!item || !item->isChord()) {
continue;
}
Chord* chord = toChord(item);
Tremolo* trem = chord->tremolo();
Stem* stem = chord->stem();
if (stem && trem && trem->twoNotes()) {
if (stem->userLength() != Millimetre(0)) {
stem->setUserLength(Millimetre(0));
}
}
}
}
}
}
}

3
src/engraving/rw/compat/compatutils.h
View file

@ -50,8 +50,11 @@ private:
static void replaceOldWithNewOrnaments(MasterScore* score);
static void replaceOldWithNewExpressions(MasterScore* score);
static void reconstructTypeOfCustomDynamics(MasterScore* score);
static void splitArticulations(MasterScore* score);
static DynamicType reconstructDynamicTypeFromString(Dynamic* dynamic);
static void resetRestVerticalOffset(MasterScore* masterScore);
static void resetArticulationOffsets(MasterScore* masterScore);
static void resetStemLengthsForTwoNoteTrems(MasterScore* masterScore);
};
}
#endif // MU_ENGRAVING_COMPATUTILS_H

12
src/engraving/tests/compat114_data/articulations-ref.mscx
View file

@ -253,7 +253,11 @@
<durationType>quarter</durationType>
<Articulation>
<direction>down</direction>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<direction>down</direction>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>72</pitch>
@ -268,7 +272,11 @@
<durationType>quarter</durationType>
<Articulation>
<direction>up</direction>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
</Articulation>
<Articulation>
<direction>up</direction>
<subtype>articTenutoAbove</subtype>
</Articulation>
<Note>
<pitch>72</pitch>

194
src/engraving/tests/compat206_data/articulations-double-ref.mscx
View file

@ -75,7 +75,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articAccentStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articAccentAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -88,7 +92,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articAccentStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articAccentBelow</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -123,7 +131,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articTenutoAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -136,7 +148,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -171,7 +187,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -184,7 +204,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoStaccatoAbove</subtype>
<subtype>articStaccatoBelow</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -222,7 +246,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoAbove</subtype>
<subtype>articTenutoAbove</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -235,7 +263,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoAbove</subtype>
<subtype>articTenutoBelow</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -270,7 +302,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoAccentAbove</subtype>
<subtype>articTenutoAbove</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articAccentAbove</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -283,7 +319,11 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoAccentBelow</subtype>
<subtype>articTenutoBelow</subtype>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articAccentBelow</subtype>
<linkedMain/>
</Articulation>
<Note>
@ -446,9 +486,14 @@
<durationType>quarter</durationType>
<Articulation>
<direction>down</direction>
<subtype>articAccentStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
<ornamentStyle>baroque</ornamentStyle>
<linkedMain/>
</Articulation>
<Articulation>
<direction>down</direction>
<subtype>articAccentBelow</subtype>
<ornamentStyle>baroque</ornamentStyle>
<anchor>1</anchor>
<linkedMain/>
</Articulation>
<Note>
@ -461,7 +506,12 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
<linkedMain/>
<visible>0</visible>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
<linkedMain/>
<visible>0</visible>
</Articulation>
@ -475,7 +525,12 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
<play>0</play>
<linkedMain/>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<play>0</play>
<linkedMain/>
</Articulation>
@ -489,7 +544,12 @@
<linkedMain/>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoAbove</subtype>
<subtype>articTenutoBelow</subtype>
<linkedMain/>
<color r="255" g="0" b="0" a="255"/>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linkedMain/>
<color r="255" g="0" b="0" a="255"/>
</Articulation>
@ -1821,7 +1881,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articAccentStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articAccentAbove</subtype>
<linked>
</linked>
</Articulation>
@ -1837,7 +1902,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articAccentStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articAccentBelow</subtype>
<linked>
</linked>
</Articulation>
@ -1879,7 +1949,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articTenutoAbove</subtype>
<linked>
</linked>
</Articulation>
@ -1895,7 +1970,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
<linked>
</linked>
</Articulation>
@ -1937,7 +2017,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linked>
</linked>
</Articulation>
@ -1953,7 +2038,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoStaccatoAbove</subtype>
<subtype>articStaccatoBelow</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linked>
</linked>
</Articulation>
@ -1995,7 +2085,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoAbove</subtype>
<subtype>articTenutoAbove</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linked>
</linked>
</Articulation>
@ -2011,7 +2106,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoAbove</subtype>
<subtype>articTenutoBelow</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linked>
</linked>
</Articulation>
@ -2053,7 +2153,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoAccentAbove</subtype>
<subtype>articTenutoAbove</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articAccentAbove</subtype>
<linked>
</linked>
</Articulation>
@ -2069,7 +2174,12 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoAccentBelow</subtype>
<subtype>articTenutoBelow</subtype>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articAccentBelow</subtype>
<linked>
</linked>
</Articulation>
@ -2261,9 +2371,15 @@
<durationType>quarter</durationType>
<Articulation>
<direction>down</direction>
<subtype>articAccentStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
<ornamentStyle>baroque</ornamentStyle>
<linked>
</linked>
</Articulation>
<Articulation>
<direction>down</direction>
<subtype>articAccentBelow</subtype>
<ornamentStyle>baroque</ornamentStyle>
<anchor>1</anchor>
<linked>
</linked>
</Articulation>
@ -2279,7 +2395,13 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
<linked>
</linked>
<visible>0</visible>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
<linked>
</linked>
<visible>0</visible>
@ -2296,7 +2418,13 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
<play>0</play>
<linked>
</linked>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<play>0</play>
<linked>
</linked>
@ -2313,7 +2441,13 @@
</linked>
<durationType>quarter</durationType>
<Articulation>
<subtype>articMarcatoTenutoAbove</subtype>
<subtype>articTenutoBelow</subtype>
<linked>
</linked>
<color r="255" g="0" b="0" a="255"/>
</Articulation>
<Articulation>
<subtype>articMarcatoAbove</subtype>
<linked>
</linked>
<color r="255" g="0" b="0" a="255"/>

22
src/engraving/tests/compat206_data/articulations-ref.mscx
View file

@ -460,7 +460,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoAbove</subtype>
</Articulation>
<Note>
<pitch>72</pitch>
@ -470,7 +473,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>60</pitch>
@ -481,7 +487,11 @@
<durationType>quarter</durationType>
<Articulation>
<direction>up</direction>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
</Articulation>
<Articulation>
<direction>up</direction>
<subtype>articTenutoAbove</subtype>
</Articulation>
<Note>
<pitch>72</pitch>
@ -492,7 +502,11 @@
<durationType>quarter</durationType>
<Articulation>
<direction>up</direction>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
</Articulation>
<Articulation>
<direction>up</direction>
<subtype>articTenutoAbove</subtype>
</Articulation>
<Note>
<pitch>60</pitch>

40
src/engraving/tests/timesig_data/timesig-03-ref.mscx
View file

@ -73,7 +73,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>60</pitch>
@ -83,7 +86,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>62</pitch>
@ -93,7 +99,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>64</pitch>
@ -103,7 +112,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>65</pitch>
@ -121,7 +133,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>67</pitch>
@ -131,7 +146,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>69</pitch>
@ -141,7 +159,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoAbove</subtype>
</Articulation>
<Note>
<pitch>71</pitch>
@ -155,7 +176,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoAbove</subtype>
</Articulation>
<Note>
<pitch>72</pitch>

40
src/engraving/tests/timesig_data/timesig-05-ref.mscx
View file

@ -91,7 +91,10 @@
</next>
</Spanner>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>60</pitch>
@ -101,7 +104,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>62</pitch>
@ -111,7 +117,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>64</pitch>
@ -163,7 +172,10 @@
</prev>
</Spanner>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>60</pitch>
@ -173,7 +185,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>62</pitch>
@ -183,7 +198,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoBelow</subtype>
<subtype>articStaccatoBelow</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoBelow</subtype>
</Articulation>
<Note>
<pitch>64</pitch>
@ -230,7 +248,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoAbove</subtype>
</Articulation>
<Note>
<pitch>71</pitch>
@ -240,7 +261,10 @@
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>articTenutoStaccatoAbove</subtype>
<subtype>articStaccatoAbove</subtype>
</Articulation>
<Articulation>
<subtype>articTenutoAbove</subtype>
</Articulation>
<Note>
<pitch>72</pitch>

BIN
vtest/scores/articulation-3.mscz
View file

Binary file not shown.

BIN
vtest/scores/articulation-4.mscz
View file

Binary file not shown.

BIN
vtest/scores/articulation-6.mscz
View file

Binary file not shown.

792
vtest/scores/staff-1.mscx
View file

@ -1,792 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="2.07">
<programVersion>2.1.0</programVersion>
<programRevision>3543170</programRevision>
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Synthesizer>
</Synthesizer>
<Division>480</Division>
<Style>
<staffDistance>7.5</staffDistance>
<showMeasureNumber>0</showMeasureNumber>
<dontHidStavesInFirstSystm>0</dontHidStavesInFirstSystm>
<showFooter>0</showFooter>
<page-layout>
<page-height>396.85</page-height>
<page-width>566.929</page-width>
<page-margins type="both">
<left-margin>11.3386</left-margin>
<right-margin>11.3386</right-margin>
<top-margin>0</top-margin>
<bottom-margin>0</bottom-margin>
</page-margins>
</page-layout>
<Spatium>1.764</Spatium>
</Style>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<metaTag name="arranger"></metaTag>
<metaTag name="composer"></metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="creationDate">2015-08-10</metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="platform">Linux</metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
<Page>
<System>
</System>
</Page>
</PageList>
<Part>
<Staff id="1">
<StaffType group="percussion">
<name>perc3Line</name>
<lines>2</lines>
<lineDistance>2</lineDistance>
<keysig>0</keysig>
</StaffType>
<defaultClef>PERC</defaultClef>
<bracket type="0" span="3"/>
</Staff>
<trackName>Snare Drum</trackName>
<Instrument>
<shortName>Sn. Dr.</shortName>
<trackName>Snare Drum</trackName>
<instrumentId>drum.snare-drum</instrumentId>
<useDrumset>1</useDrumset>
<Drum pitch="37">
<head>1</head>
<line>0</line>
<voice>0</voice>
<name>Side Stick</name>
<stem>0</stem>
<shortcut>A</shortcut>
</Drum>
<Drum pitch="38">
<head>0</head>
<line>4</line>
<voice>0</voice>
<name>Acoustic Snare</name>
<stem>0</stem>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="39">
<head>2</head>
<line>2</line>
<voice>0</voice>
<name>Middle</name>
<stem>0</stem>
<shortcut>C</shortcut>
</Drum>
<Drum pitch="40">
<head>0</head>
<line>-4</line>
<voice>0</voice>
<name>Ledger</name>
<stem>0</stem>
<shortcut>D</shortcut>
</Drum>
<clef>PERC</clef>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="staccatissimo">
<velocity>100</velocity>
<gateTime>33</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>50</gateTime>
</Articulation>
<Articulation name="portato">
<velocity>100</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="marcato">
<velocity>120</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<controller ctrl="0" value="1"/>
<program value="0"/>
<synti>Fluid</synti>
</Channel>
</Instrument>
</Part>
<Part>
<Staff id="2">
<StaffType group="percussion">
<name>perc3Line</name>
<lines>3</lines>
<lineDistance>2</lineDistance>
<keysig>0</keysig>
</StaffType>
<defaultClef>PERC</defaultClef>
<bracket type="-1" span="0"/>
</Staff>
<trackName>Congas</trackName>
<Instrument>
<shortName>Co.</shortName>
<trackName>Congas</trackName>
<instrumentId>drum.conga</instrumentId>
<useDrumset>1</useDrumset>
<Drum pitch="62">
<head>1</head>
<line>0</line>
<voice>0</voice>
<name>Mute High Conga</name>
<stem>0</stem>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="63">
<head>0</head>
<line>4</line>
<voice>0</voice>
<name>High Conga</name>
<stem>0</stem>
<shortcut>C</shortcut>
</Drum>
<Drum pitch="64">
<head>0</head>
<line>8</line>
<voice>0</voice>
<name>Low Conga</name>
<stem>0</stem>
<shortcut>D</shortcut>
</Drum>
<Drum pitch="65">
<head>1</head>
<line>12</line>
<voice>0</voice>
<name>Ledger</name>
<stem>0</stem>
<shortcut>E</shortcut>
</Drum>
<clef>PERC</clef>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="staccatissimo">
<velocity>100</velocity>
<gateTime>33</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>50</gateTime>
</Articulation>
<Articulation name="portato">
<velocity>100</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="marcato">
<velocity>120</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<controller ctrl="0" value="1"/>
<program value="0"/>
<synti>Fluid</synti>
</Channel>
</Instrument>
</Part>
<Part>
<Staff id="3">
<StaffType group="percussion">
<name>perc3Line</name>
<lines>4</lines>
<lineDistance>2</lineDistance>
<keysig>0</keysig>
</StaffType>
<defaultClef>PERC</defaultClef>
<bracket type="-1" span="0"/>
</Staff>
<trackName>Drumset</trackName>
<Instrument>
<shortName>Drs.</shortName>
<trackName>Drumset</trackName>
<instrumentId>drum.group.set</instrumentId>
<useDrumset>1</useDrumset>
<Drum pitch="35">
<head>0</head>
<line>7</line>
<voice>1</voice>
<name>Acoustic Bass Drum</name>
<stem>2</stem>
</Drum>
<Drum pitch="36">
<head>0</head>
<line>7</line>
<voice>1</voice>
<name>Bass Drum 1</name>
<stem>2</stem>
</Drum>
<Drum pitch="37">
<head>1</head>
<line>3</line>
<voice>0</voice>
<name>Side Stick</name>
<stem>1</stem>
</Drum>
<Drum pitch="38">
<head>0</head>
<line>6</line>
<voice>0</voice>
<name>Acoustic Snare</name>
<stem>1</stem>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="40">
<head>0</head>
<line>3</line>
<voice>0</voice>
<name>Electric Snare</name>
<stem>1</stem>
</Drum>
<Drum pitch="41">
<head>0</head>
<line>10</line>
<voice>0</voice>
<name>Low Floor Tom</name>
<stem>1</stem>
<shortcut>C</shortcut>
</Drum>
<Drum pitch="42">
<head>1</head>
<line>-1</line>
<voice>0</voice>
<name>Closed Hi-Hat</name>
<stem>1</stem>
</Drum>
<Drum pitch="43">
<head>0</head>
<line>5</line>
<voice>1</voice>
<name>High Floor Tom</name>
<stem>2</stem>
</Drum>
<Drum pitch="44">
<head>1</head>
<line>9</line>
<voice>1</voice>
<name>Pedal Hi-Hat</name>
<stem>2</stem>
</Drum>
<Drum pitch="45">
<head>0</head>
<line>2</line>
<voice>0</voice>
<name>Low Tom</name>
<stem>1</stem>
</Drum>
<Drum pitch="46">
<head>1</head>
<line>1</line>
<voice>0</voice>
<name>Open Hi-Hat</name>
<stem>1</stem>
</Drum>
<Drum pitch="47">
<head>0</head>
<line>2</line>
<voice>0</voice>
<name>Low-Mid Tom</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
<Drum pitch="48">
<head>0</head>
<line>0</line>
<voice>0</voice>
<name>Hi-Mid Tom</name>
<stem>1</stem>
</Drum>
<Drum pitch="49">
<head>1</head>
<line>-2</line>
<voice>0</voice>
<name>Crash Cymbal 1</name>
<stem>1</stem>
</Drum>
<Drum pitch="50">
<head>0</head>
<line>0</line>
<voice>0</voice>
<name>High Tom</name>
<stem>1</stem>
</Drum>
<Drum pitch="51">
<head>1</head>
<line>0</line>
<voice>0</voice>
<name>Ride Cymbal 1</name>
<stem>1</stem>
</Drum>
<Drum pitch="52">
<head>1</head>
<line>-3</line>
<voice>0</voice>
<name>Chinese Cymbal</name>
<stem>1</stem>
</Drum>
<Drum pitch="53">
<head>2</head>
<line>0</line>
<voice>0</voice>
<name>Ride Bell</name>
<stem>1</stem>
</Drum>
<Drum pitch="54">
<head>2</head>
<line>2</line>
<voice>0</voice>
<name>Tambourine</name>
<stem>1</stem>
</Drum>
<Drum pitch="55">
<head>1</head>
<line>-3</line>
<voice>0</voice>
<name>Splash Cymbal</name>
<stem>1</stem>
</Drum>
<Drum pitch="56">
<head>3</head>
<line>1</line>
<voice>0</voice>
<name>Cowbell</name>
<stem>1</stem>
</Drum>
<Drum pitch="57">
<head>1</head>
<line>-3</line>
<voice>0</voice>
<name>Crash Cymbal 2</name>
<stem>1</stem>
</Drum>
<Drum pitch="59">
<head>1</head>
<line>4</line>
<voice>0</voice>
<name>Ride Cymbal 2</name>
<stem>1</stem>
<shortcut>E</shortcut>
</Drum>
<Drum pitch="63">
<head>1</head>
<line>8</line>
<voice>0</voice>
<name>Open Hi Conga</name>
<stem>1</stem>
<shortcut>F</shortcut>
</Drum>
<Drum pitch="64">
<head>1</head>
<line>6</line>
<voice>0</voice>
<name>Low Conga</name>
<stem>1</stem>
</Drum>
<clef>PERC</clef>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="staccatissimo">
<velocity>100</velocity>
<gateTime>33</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>50</gateTime>
</Articulation>
<Articulation name="portato">
<velocity>100</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="marcato">
<velocity>120</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<controller ctrl="0" value="1"/>
<program value="0"/>
<synti>Fluid</synti>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>sforzato</subtype>
</Articulation>
<Articulation>
<subtype>tenuto</subtype>
</Articulation>
<Note>
<pitch>37</pitch>
<tpc>21</tpc>
<head>1</head>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>tenuto</subtype>
</Articulation>
<Articulation>
<subtype>marcato</subtype>
</Articulation>
<Note>
<pitch>38</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<Chord>
<durationType>half</durationType>
<Articulation>
<subtype>staccatissimo</subtype>
</Articulation>
<Note>
<pitch>40</pitch>
<tpc>18</tpc>
</Note>
</Chord>
</Measure>
<Measure number="2">
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>fermata</subtype>
</Articulation>
<Note>
<pitch>39</pitch>
<tpc>11</tpc>
<head>2</head>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
</Measure>
<Measure number="3">
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>37</pitch>
<tpc>21</tpc>
<head>1</head>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
<tick>3840</tick>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>38</pitch>
<tpc>21</tpc>
</Note>
</Chord>
<Rest>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<track>1</track>
<durationType>half</durationType>
</Rest>
</Measure>
<Measure number="4">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<Staff id="2">
<Measure number="1">
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>tenuto</subtype>
</Articulation>
<Note>
<pitch>35</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>sforzato</subtype>
</Articulation>
<Note>
<pitch>64</pitch>
<tpc>18</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>staccatissimo</subtype>
</Articulation>
<Note>
<pitch>65</pitch>
<tpc>13</tpc>
<head>1</head>
</Note>
</Chord>
</Measure>
<Measure number="2">
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>plusstop</subtype>
</Articulation>
<Note>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
</Measure>
<Measure number="3">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="4">
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>62</pitch>
<tpc>16</tpc>
<head>1</head>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
<tick>5760</tick>
<Chord>
<track>5</track>
<durationType>quarter</durationType>
<Note>
<track>5</track>
<pitch>64</pitch>
<tpc>18</tpc>
</Note>
</Chord>
<Rest>
<track>5</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<track>5</track>
<durationType>half</durationType>
</Rest>
</Measure>
</Staff>
<Staff id="3">
<Measure number="1">
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<pitch>47</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>tenuto</subtype>
</Articulation>
<StemDirection>down</StemDirection>
<Note>
<pitch>38</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>tenuto</subtype>
</Articulation>
<StemDirection>up</StemDirection>
<Note>
<pitch>38</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>staccatissimo</subtype>
</Articulation>
<Note>
<pitch>41</pitch>
<tpc>13</tpc>
</Note>
</Chord>
</Measure>
<Measure number="2">
<Chord>
<offset x="0.1" y="0"/>
<durationType>quarter</durationType>
<Articulation>
<subtype>sforzato</subtype>
</Articulation>
<StemDirection>down</StemDirection>
<Note>
<pitch>63</pitch>
<tpc>11</tpc>
<head>1</head>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>sforzato</subtype>
</Articulation>
<StemDirection>up</StemDirection>
<Note>
<pitch>59</pitch>
<tpc>19</tpc>
<head>1</head>
</Note>
</Chord>
<Rest>
<durationType>half</durationType>
</Rest>
</Measure>
<Measure number="3">
<Chord>
<durationType>quarter</durationType>
<Articulation>
<subtype>tenuto</subtype>
</Articulation>
<Note>
<pitch>47</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
<tick>3840</tick>
<Chord>
<track>9</track>
<durationType>quarter</durationType>
<Articulation>
<subtype>tenuto</subtype>
<track>9</track>
</Articulation>
<Note>
<track>9</track>
<pitch>41</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Rest>
<track>9</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<track>9</track>
<durationType>half</durationType>
</Rest>
</Measure>
<Measure number="4">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>
</museScore>

BIN
vtest/scores/staff-1.mscz Normal file
View file

Binary file not shown.