fix import of old corrupted tuplets
This commit is contained in:
AntonioBL
parent
57f2791c44
commit
d1eab7abeb
5 changed files with 1136 additions and 3 deletions
|
|
@ -724,7 +724,7 @@ static void readTuplet(Tuplet* tuplet, XmlReader& e)
|
|||
else if (!tuplet->readProperties(e))
|
||||
e.unknown();
|
||||
}
|
||||
Fraction r = tuplet->ratio().reduced(); // this is wrong, but at this stage it is kept
|
||||
Fraction r = tuplet->ratio().reduced(); // this may be wrong, but at this stage it is kept
|
||||
// for compatibility. It will be corrected afterwards
|
||||
// during "sanitize" step
|
||||
Fraction f(r.denominator(), tuplet->baseLen().fraction().denominator());
|
||||
|
|
@ -1356,7 +1356,7 @@ static void readMeasure(Measure* m, int staffIdx, XmlReader& e)
|
|||
int tupletDuration = tuplet->actualTicks() - 1;
|
||||
std::vector<DurationElement*> tElements = tuplet->elements();
|
||||
for (Tuplet* tuplet2 : e.tuplets()) {
|
||||
if (tuplet2->tuplet()) // already a nested tuplet
|
||||
if ((tuplet2->tuplet()) || (tuplet2->voice() != tuplet->voice())) // already a nested tuplet or in a different voice
|
||||
continue;
|
||||
int possibleDuration = tuplet2->duration().ticks() * tuplet->ratio().denominator() / tuplet->ratio().numerator() - 1;
|
||||
if ((tuplet2 != tuplet) && (tuplet2->tick() >= tupletTick) && (tuplet2->tick() < tupletTick + tupletDuration) && (tuplet2->tick() + possibleDuration < tupletTick + tupletDuration)) {
|
||||
|
|
|
|||
|
|
@ -535,7 +535,7 @@ void Segment::add(Element* el)
|
|||
// the tick position of a tuplet is the tick position of its
|
||||
// first element:
|
||||
ChordRest* cr = toChordRest(el);
|
||||
if (cr->tuplet() && !cr->tuplet()->elements().empty() && cr->tuplet()->elements().front() == cr)
|
||||
if (cr->tuplet() && !cr->tuplet()->elements().empty() && cr->tuplet()->elements().front() == cr && cr->tuplet()->tick() < 0)
|
||||
cr->tuplet()->setTick(cr->tick());
|
||||
}
|
||||
// fall through
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ void TestCompat114::compat_data()
|
|||
QTest::newRow("markers") << "markers";
|
||||
QTest::newRow("drumset") << "drumset";
|
||||
QTest::newRow("tuplets") << "tuplets";
|
||||
QTest::newRow("tuplets_1") << "tuplets_1";
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
576
mtest/libmscore/compat114/tuplets_1-ref.mscx
Normal file
576
mtest/libmscore/compat114/tuplets_1-ref.mscx
Normal file
|
|
@ -0,0 +1,576 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<museScore version="3.00">
|
||||
<Score>
|
||||
<LayerTag id="0" tag="default"></LayerTag>
|
||||
<currentLayer>0</currentLayer>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
<lyricsMinBottomDistance>6</lyricsMinBottomDistance>
|
||||
<minMeasureWidth>4</minMeasureWidth>
|
||||
<endBarDistance>0.3</endBarDistance>
|
||||
<bracketWidth>0.35</bracketWidth>
|
||||
<bracketDistance>0.25</bracketDistance>
|
||||
<clefLeftMargin>0.5</clefLeftMargin>
|
||||
<clefKeyRightMargin>1.75</clefKeyRightMargin>
|
||||
<minNoteDistance>0.4</minNoteDistance>
|
||||
<measureSpacing>1.14</measureSpacing>
|
||||
<ledgerLineWidth>0.12</ledgerLineWidth>
|
||||
<beamWidth>0.48</beamWidth>
|
||||
<beamMinLen>1.25</beamMinLen>
|
||||
<propertyDistanceStem>0.5</propertyDistanceStem>
|
||||
<harmonyY>0</harmonyY>
|
||||
<chordStyle>custom</chordStyle>
|
||||
<chordsXmlFile>1</chordsXmlFile>
|
||||
<chordDescriptionFile>stdchords.xml</chordDescriptionFile>
|
||||
<hideInstrumentNameIfOneInstrument>0</hideInstrumentNameIfOneInstrument>
|
||||
<voltaY>0</voltaY>
|
||||
<keySigNaturals>1</keySigNaturals>
|
||||
<tupletOufOfStaff>0</tupletOufOfStaff>
|
||||
<TextStyle>
|
||||
<halign>center</halign>
|
||||
<valign>baseline</valign>
|
||||
<offsetType>spatium</offsetType>
|
||||
<name>Dynamics</name>
|
||||
<family>FreeSerif</family>
|
||||
<size>12</size>
|
||||
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
|
||||
</TextStyle>
|
||||
<TextStyle>
|
||||
<halign>left</halign>
|
||||
<valign>baseline</valign>
|
||||
<xoffset>0</xoffset>
|
||||
<yoffset>-4</yoffset>
|
||||
<offsetType>spatium</offsetType>
|
||||
<name>Chord Symbol</name>
|
||||
<family>FreeSerif</family>
|
||||
<size>12</size>
|
||||
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
|
||||
</TextStyle>
|
||||
<TextStyle>
|
||||
<halign>center</halign>
|
||||
<valign>baseline</valign>
|
||||
<xoffset>0</xoffset>
|
||||
<yoffset>-3</yoffset>
|
||||
<offsetType>spatium</offsetType>
|
||||
<name>Rehearsal Mark</name>
|
||||
<family>FreeSerif</family>
|
||||
<size>14</size>
|
||||
<bold>1</bold>
|
||||
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
|
||||
<frameWidthS>0.2</frameWidthS>
|
||||
<paddingWidthS>0.5</paddingWidthS>
|
||||
<frameRound>20</frameRound>
|
||||
<frameColor r="0" g="0" b="0" a="255"/>
|
||||
<systemFlag>1</systemFlag>
|
||||
</TextStyle>
|
||||
<page-layout>
|
||||
<page-height>1683.78</page-height>
|
||||
<page-width>1190.55</page-width>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
</page-layout>
|
||||
<Spatium>1.76389</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="lyricist"></metaTag>
|
||||
<metaTag name="movementNumber"></metaTag>
|
||||
<metaTag name="movementTitle"></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>
|
||||
<System>
|
||||
</System>
|
||||
</Page>
|
||||
</PageList>
|
||||
<Part>
|
||||
<Staff id="1">
|
||||
<StaffType group="pitched">
|
||||
</StaffType>
|
||||
</Staff>
|
||||
<trackName>Flute</trackName>
|
||||
<Instrument>
|
||||
<trackName>Flute</trackName>
|
||||
<minPitchP>59</minPitchP>
|
||||
<maxPitchP>98</maxPitchP>
|
||||
<minPitchA>60</minPitchA>
|
||||
<maxPitchA>93</maxPitchA>
|
||||
<Articulation>
|
||||
<velocity>100</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="staccato">
|
||||
<velocity>100</velocity>
|
||||
<gateTime>50</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="tenuto">
|
||||
<velocity>100</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="sforzato">
|
||||
<velocity>120</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Channel>
|
||||
<program value="73"/>
|
||||
<controller ctrl="93" value="30"/>
|
||||
<controller ctrl="91" value="30"/>
|
||||
</Channel>
|
||||
</Instrument>
|
||||
</Part>
|
||||
<Staff id="1">
|
||||
<VBox>
|
||||
<height>10</height>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<text><font face="Times New Roman"/>Tuplet 1.3 file</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
<Measure number="1">
|
||||
<Clef>
|
||||
<concertClefType>G</concertClefType>
|
||||
<transposingClefType>G</transposingClefType>
|
||||
</Clef>
|
||||
<TimeSig>
|
||||
<sigN>4</sigN>
|
||||
<sigD>4</sigD>
|
||||
<showCourtesySig>1</showCourtesySig>
|
||||
</TimeSig>
|
||||
<Tuplet id="1">
|
||||
<normalNotes>8</normalNotes>
|
||||
<actualNotes>9</actualNotes>
|
||||
<baseNote>16th</baseNote>
|
||||
<Number>
|
||||
<style>Tuplet</style>
|
||||
<text>9</text>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Tuplet id="2">
|
||||
<Tuplet>1</Tuplet>
|
||||
<numberType>1</numberType>
|
||||
<bracketType>1</bracketType>
|
||||
<normalNotes>2</normalNotes>
|
||||
<actualNotes>3</actualNotes>
|
||||
<baseNote>eighth</baseNote>
|
||||
<Number>
|
||||
<style>Tuplet</style>
|
||||
<text>3:2</text>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Chord>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Note>
|
||||
<pitch>84</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>1/12</move>
|
||||
<Chord>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Note>
|
||||
<pitch>84</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>1/6</move>
|
||||
<Chord>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Note>
|
||||
<pitch>84</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>53/240</move>
|
||||
<Rest>
|
||||
<Tuplet>1</Tuplet>
|
||||
<dots>1</dots>
|
||||
<durationType>eighth</durationType>
|
||||
</Rest>
|
||||
<move>371/960</move>
|
||||
<Tuplet id="3">
|
||||
<Tuplet>1</Tuplet>
|
||||
<numberType>1</numberType>
|
||||
<bracketType>1</bracketType>
|
||||
<normalNotes>4</normalNotes>
|
||||
<actualNotes>6</actualNotes>
|
||||
<baseNote>32nd</baseNote>
|
||||
<Number>
|
||||
<style>Tuplet</style>
|
||||
<text>6:4</text>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>391/960</move>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>137/320</move>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>431/960</move>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>451/960</move>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>157/320</move>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<move>1/2</move>
|
||||
<Rest>
|
||||
<durationType>half</durationType>
|
||||
</Rest>
|
||||
</Measure>
|
||||
<Measure number="2">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration>4/4</duration>
|
||||
</Rest>
|
||||
</Measure>
|
||||
<Measure number="3">
|
||||
<Tuplet id="4">
|
||||
<normalNotes>4</normalNotes>
|
||||
<actualNotes>6</actualNotes>
|
||||
<baseNote>quarter</baseNote>
|
||||
<Number>
|
||||
<style>Tuplet</style>
|
||||
<text>6</text>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Chord>
|
||||
<Tuplet>4</Tuplet>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>4</Tuplet>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<pitch>76</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>4</Tuplet>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<pitch>72</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Measure>
|
||||
<Measure number="4">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration>4/4</duration>
|
||||
</Rest>
|
||||
</Measure>
|
||||
<Measure number="5">
|
||||
<Tuplet id="5">
|
||||
<normalNotes>2</normalNotes>
|
||||
<actualNotes>3</actualNotes>
|
||||
<baseNote>eighth</baseNote>
|
||||
<Number>
|
||||
<style>Tuplet</style>
|
||||
<text>3</text>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Rest>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
</Rest>
|
||||
<Rest>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
</Rest>
|
||||
<Rest>
|
||||
<durationType>quarter</durationType>
|
||||
</Rest>
|
||||
<Rest>
|
||||
<durationType>half</durationType>
|
||||
</Rest>
|
||||
</Measure>
|
||||
<Measure number="6">
|
||||
<Beam id="1">
|
||||
<l1>0</l1>
|
||||
<l2>0</l2>
|
||||
</Beam>
|
||||
<Tuplet id="6">
|
||||
<normalNotes>8</normalNotes>
|
||||
<actualNotes>8</actualNotes>
|
||||
<baseNote>eighth</baseNote>
|
||||
<Number>
|
||||
<style>Tuplet</style>
|
||||
<text>8</text>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Beam id="2">
|
||||
<l1>-1</l1>
|
||||
<l2>-1</l2>
|
||||
</Beam>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>69</pitch>
|
||||
<tpc>17</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>65</pitch>
|
||||
<tpc>13</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>69</pitch>
|
||||
<tpc>17</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>65</pitch>
|
||||
<tpc>13</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Measure>
|
||||
<Measure number="7">
|
||||
<Beam id="3">
|
||||
<l1>0</l1>
|
||||
<l2>0</l2>
|
||||
</Beam>
|
||||
<Tuplet id="7">
|
||||
<normalNotes>8</normalNotes>
|
||||
<actualNotes>10</actualNotes>
|
||||
<baseNote>eighth</baseNote>
|
||||
<Number>
|
||||
<style>Tuplet</style>
|
||||
<text>10</text>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Beam id="4">
|
||||
<l1>0</l1>
|
||||
<l2>0</l2>
|
||||
</Beam>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>4</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>4</Beam>
|
||||
<Note>
|
||||
<pitch>69</pitch>
|
||||
<tpc>17</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>4</Beam>
|
||||
<Note>
|
||||
<pitch>65</pitch>
|
||||
<tpc>13</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>4</Beam>
|
||||
<Note>
|
||||
<pitch>69</pitch>
|
||||
<tpc>17</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>7</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>4</Beam>
|
||||
<Note>
|
||||
<pitch>65</pitch>
|
||||
<tpc>13</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Measure>
|
||||
<Measure number="8">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration>4/4</duration>
|
||||
</Rest>
|
||||
<BarLine>
|
||||
<subtype>end</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
</Measure>
|
||||
</Staff>
|
||||
</Score>
|
||||
</museScore>
|
||||
556
mtest/libmscore/compat114/tuplets_1.mscx
Normal file
556
mtest/libmscore/compat114/tuplets_1.mscx
Normal file
|
|
@ -0,0 +1,556 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<museScore version="1.14">
|
||||
<programVersion>1.3</programVersion>
|
||||
<programRevision>5702</programRevision>
|
||||
<Spatium>1.76389</Spatium>
|
||||
<Division>480</Division>
|
||||
<Style>
|
||||
</Style>
|
||||
<showInvisible>1</showInvisible>
|
||||
<showFrames>1</showFrames>
|
||||
<page-layout>
|
||||
<pageFormat>A4</pageFormat>
|
||||
<page-margins type="even">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-margins type="odd">
|
||||
<left-margin>56.6929</left-margin>
|
||||
<right-margin>56.6929</right-margin>
|
||||
<top-margin>56.6929</top-margin>
|
||||
<bottom-margin>113.386</bottom-margin>
|
||||
</page-margins>
|
||||
<page-offset>0</page-offset>
|
||||
</page-layout>
|
||||
<siglist>
|
||||
<sig tick="0">
|
||||
<nom>4</nom>
|
||||
<denom>4</denom>
|
||||
</sig>
|
||||
</siglist>
|
||||
<tempolist fix="2">
|
||||
</tempolist>
|
||||
<Part>
|
||||
<Staff>
|
||||
<cleflist>
|
||||
<clef tick="0" idx="0"/>
|
||||
</cleflist>
|
||||
<keylist>
|
||||
<key tick="0" idx="0"/>
|
||||
</keylist>
|
||||
<bracket type="-1" span="1"/>
|
||||
</Staff>
|
||||
<Instrument>
|
||||
<minPitchP>59</minPitchP>
|
||||
<maxPitchP>98</maxPitchP>
|
||||
<minPitchA>60</minPitchA>
|
||||
<maxPitchA>93</maxPitchA>
|
||||
<trackName>Flute</trackName>
|
||||
<Channel>
|
||||
<controller ctrl="0" value="0"/>
|
||||
<controller ctrl="32" value="0"/>
|
||||
<program value="73"/>
|
||||
<controller ctrl="7" value="100"/>
|
||||
<controller ctrl="10" value="64"/>
|
||||
<controller ctrl="93" value="30"/>
|
||||
<controller ctrl="91" value="30"/>
|
||||
</Channel>
|
||||
</Instrument>
|
||||
</Part>
|
||||
<Staff id="1">
|
||||
<VBox>
|
||||
<height>10</height>
|
||||
<leftMargin>5</leftMargin>
|
||||
<rightMargin>5</rightMargin>
|
||||
<topMargin>5</topMargin>
|
||||
<bottomMargin>5</bottomMargin>
|
||||
<Text>
|
||||
<style>2</style>
|
||||
<subtype>Title</subtype>
|
||||
<frame>0</frame>
|
||||
<html-data>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Times New Roman'; font-size:24pt; font-weight:400; font-style:normal;">
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Tuplet 1.3 file</p></body></html>
|
||||
</html-data>
|
||||
</Text>
|
||||
</VBox>
|
||||
<Measure number="1">
|
||||
<Tuplet id="0">
|
||||
<numberType>0</numberType>
|
||||
<bracketType>0</bracketType>
|
||||
<normalNotes>8</normalNotes>
|
||||
<actualNotes>9</actualNotes>
|
||||
<baseNote>16th</baseNote>
|
||||
<Number>
|
||||
<style>21</style>
|
||||
<subtype>Tuplet</subtype>
|
||||
<frame>0</frame>
|
||||
<html-data>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Times New Roman'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">9</p></body></html>
|
||||
</html-data>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Tuplet id="1">
|
||||
<numberType>1</numberType>
|
||||
<bracketType>1</bracketType>
|
||||
<normalNotes>2</normalNotes>
|
||||
<actualNotes>3</actualNotes>
|
||||
<baseNote>eighth</baseNote>
|
||||
<Number>
|
||||
<style>21</style>
|
||||
<subtype>Tuplet</subtype>
|
||||
<frame>0</frame>
|
||||
<html-data>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Times New Roman'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">3:2</p></body></html>
|
||||
</html-data>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Tuplet id="2">
|
||||
<tick>742</tick>
|
||||
<numberType>1</numberType>
|
||||
<bracketType>1</bracketType>
|
||||
<normalNotes>4</normalNotes>
|
||||
<actualNotes>6</actualNotes>
|
||||
<baseNote>16th</baseNote>
|
||||
<Number>
|
||||
<style>21</style>
|
||||
<subtype>Tuplet</subtype>
|
||||
<frame>0</frame>
|
||||
<html-data>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Times New Roman'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">6:4</p></body></html>
|
||||
</html-data>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<TimeSig>
|
||||
<subtype>260</subtype>
|
||||
<tick>0</tick>
|
||||
<den>4</den>
|
||||
<nom1>4</nom1>
|
||||
</TimeSig>
|
||||
<Beam id="0">
|
||||
</Beam>
|
||||
<Chord>
|
||||
<Tuplet>1</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>0</Beam>
|
||||
<Note>
|
||||
<pitch>84</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>1</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>0</Beam>
|
||||
<Note>
|
||||
<pitch>84</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>1</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>0</Beam>
|
||||
<Note>
|
||||
<pitch>84</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Rest>
|
||||
<tick>424</tick>
|
||||
<Tuplet>0</Tuplet>
|
||||
<dots>1</dots>
|
||||
<durationType>eighth</durationType>
|
||||
</Rest>
|
||||
<Beam id="1">
|
||||
</Beam>
|
||||
<Chord>
|
||||
<tick>742</tick>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>2</Tuplet>
|
||||
<durationType>32nd</durationType>
|
||||
<Beam>1</Beam>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Rest>
|
||||
<tick>960</tick>
|
||||
<durationType>half</durationType>
|
||||
</Rest>
|
||||
</Measure>
|
||||
<Measure number="2">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
</Rest>
|
||||
</Measure>
|
||||
<Measure number="3">
|
||||
<Tuplet id="3">
|
||||
<numberType>0</numberType>
|
||||
<bracketType>0</bracketType>
|
||||
<normalNotes>4</normalNotes>
|
||||
<actualNotes>6</actualNotes>
|
||||
<baseNote>half</baseNote>
|
||||
<Number>
|
||||
<style>21</style>
|
||||
<subtype>Tuplet</subtype>
|
||||
<frame>0</frame>
|
||||
<html-data>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Times New Roman'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">6</p></body></html>
|
||||
</html-data>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<pitch>79</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<pitch>76</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>3</Tuplet>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<pitch>72</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Measure>
|
||||
<Measure number="4">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
</Rest>
|
||||
</Measure>
|
||||
<Measure number="5">
|
||||
<Tuplet id="4">
|
||||
<numberType>0</numberType>
|
||||
<bracketType>0</bracketType>
|
||||
<normalNotes>2</normalNotes>
|
||||
<actualNotes>3</actualNotes>
|
||||
<baseNote>eighth</baseNote>
|
||||
<Number>
|
||||
<style>21</style>
|
||||
<subtype>Tuplet</subtype>
|
||||
<frame>0</frame>
|
||||
<html-data>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Times New Roman'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">3</p></body></html>
|
||||
</html-data>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Chord>
|
||||
<Tuplet>4</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Rest>
|
||||
<Tuplet>4</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
</Rest>
|
||||
<Rest>
|
||||
<Tuplet>4</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
</Rest>
|
||||
<Rest>
|
||||
<durationType>quarter</durationType>
|
||||
</Rest>
|
||||
<Rest>
|
||||
<durationType>half</durationType>
|
||||
</Rest>
|
||||
</Measure>
|
||||
<Measure number="6">
|
||||
<Tuplet id="5">
|
||||
<numberType>0</numberType>
|
||||
<bracketType>0</bracketType>
|
||||
<normalNotes>8</normalNotes>
|
||||
<actualNotes>8</actualNotes>
|
||||
<baseNote>eighth</baseNote>
|
||||
<Number>
|
||||
<style>21</style>
|
||||
<subtype>Tuplet</subtype>
|
||||
<frame>0</frame>
|
||||
<html-data>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Times New Roman'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">8</p></body></html>
|
||||
</html-data>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Beam id="2">
|
||||
</Beam>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>69</pitch>
|
||||
<tpc>17</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>65</pitch>
|
||||
<tpc>13</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>69</pitch>
|
||||
<tpc>17</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>5</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>2</Beam>
|
||||
<Note>
|
||||
<pitch>65</pitch>
|
||||
<tpc>13</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Measure>
|
||||
<Measure number="7">
|
||||
<Tuplet id="6">
|
||||
<numberType>0</numberType>
|
||||
<bracketType>0</bracketType>
|
||||
<normalNotes>8</normalNotes>
|
||||
<actualNotes>10</actualNotes>
|
||||
<baseNote>quarter</baseNote>
|
||||
<Number>
|
||||
<style>21</style>
|
||||
<subtype>Tuplet</subtype>
|
||||
<frame>0</frame>
|
||||
<html-data>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Times New Roman'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">10</p></body></html>
|
||||
</html-data>
|
||||
</Number>
|
||||
</Tuplet>
|
||||
<Beam id="3">
|
||||
</Beam>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>67</pitch>
|
||||
<tpc>15</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>69</pitch>
|
||||
<tpc>17</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>65</pitch>
|
||||
<tpc>13</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>69</pitch>
|
||||
<tpc>17</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<Tuplet>6</Tuplet>
|
||||
<durationType>eighth</durationType>
|
||||
<Beam>3</Beam>
|
||||
<Note>
|
||||
<pitch>65</pitch>
|
||||
<tpc>13</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Measure>
|
||||
<Measure number="8">
|
||||
<Text>
|
||||
<style>17</style>
|
||||
<subtype>MeasureNumber</subtype>
|
||||
</Text>
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
</Rest>
|
||||
<BarLine>
|
||||
<subtype>5</subtype>
|
||||
</BarLine>
|
||||
</Measure>
|
||||
</Staff>
|
||||
<cursorTrack>0</cursorTrack>
|
||||
</museScore>
|
||||
Loading…
Reference in a new issue