This commit is contained in:
Rockettwo 2016-07-31 15:23:30 +02:00
parent c92ec846c9
commit a777d01c0b
9 changed files with 2724 additions and 162 deletions

View file

@ -409,8 +409,6 @@
<string>4</string>
</Note>
</Chord>
<move>3/4</move>
<endSpanner id="5"/>
</Measure>
<Measure number="2">
<Chord>
@ -424,7 +422,7 @@
<string>2</string>
</Note>
</Chord>
<HairPin id="6">
<HairPin id="5">
<subtype>1</subtype>
<lid>21</lid>
</HairPin>
@ -439,7 +437,7 @@
<string>3</string>
</Note>
</Chord>
<endSpanner id="6"/>
<endSpanner id="5"/>
<Chord>
<lid>17</lid>
<durationType>quarter</durationType>
@ -451,8 +449,6 @@
<string>4</string>
</Note>
</Chord>
<move>3/4</move>
<endSpanner id="7"/>
</Measure>
</Staff>
<Staff id="2">
@ -472,7 +468,7 @@
<string>2</string>
</Note>
</Chord>
<HairPin id="5">
<HairPin id="6">
<subtype>0</subtype>
<lid>20</lid>
</HairPin>
@ -487,6 +483,7 @@
<string>3</string>
</Note>
</Chord>
<endSpanner id="6"/>
<Chord>
<lid>10</lid>
<durationType>quarter</durationType>
@ -526,6 +523,7 @@
<string>3</string>
</Note>
</Chord>
<endSpanner id="7"/>
<Chord>
<lid>17</lid>
<durationType>quarter</durationType>

View file

@ -503,10 +503,6 @@
<name>segno</name>
<lid>102</lid>
</Symbol>
<Symbol>
<name>segno</name>
<lid>112</lid>
</Symbol>
<Rest>
<lid>103</lid>
<durationType>measure</durationType>
@ -533,10 +529,6 @@
<name>coda</name>
<lid>109</lid>
</Symbol>
<Symbol>
<name>coda</name>
<lid>113</lid>
</Symbol>
<Rest>
<lid>110</lid>
<durationType>measure</durationType>
@ -1136,10 +1128,6 @@
<name>segno</name>
<lid>102</lid>
</Symbol>
<Symbol>
<name>segno</name>
<lid>112</lid>
</Symbol>
<Rest>
<lid>103</lid>
<durationType>measure</durationType>
@ -1166,10 +1154,6 @@
<name>coda</name>
<lid>109</lid>
</Symbol>
<Symbol>
<name>coda</name>
<lid>113</lid>
</Symbol>
<Rest>
<lid>110</lid>
<durationType>measure</durationType>
@ -1551,7 +1535,6 @@
<Measure number="33">
<Symbol>
<name>segno</name>
<lid>112</lid>
</Symbol>
<Rest>
<lid>103</lid>
@ -1569,7 +1552,6 @@
<Measure number="35">
<Symbol>
<name>coda</name>
<lid>113</lid>
</Symbol>
<Rest>
<lid>110</lid>

View file

@ -140,11 +140,6 @@
<lid>6</lid>
<text><sym>metNoteQuarterUp</sym> = 120</text>
</Tempo>
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="-125" vibrato="0"/>
<point time="100" pitch="-250" vibrato="0"/>
</TremoloBar>
<Chord>
<lid>7</lid>
<durationType>quarter</durationType>
@ -170,11 +165,6 @@
</Rest>
</Measure>
<Measure number="2">
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="150" vibrato="0"/>
<point time="100" pitch="0" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="150" vibrato="0"/>
@ -205,11 +195,6 @@
</Rest>
</Measure>
<Measure number="3">
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="-550" vibrato="0"/>
<point time="100" pitch="-550" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="-550" vibrato="0"/>
@ -231,11 +216,6 @@
<point time="50" pitch="-550" vibrato="0"/>
<point time="100" pitch="-400" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="-550" vibrato="0"/>
<point time="50" pitch="-550" vibrato="0"/>
<point time="100" pitch="-400" vibrato="0"/>
</TremoloBar>
<Chord>
<lid>24</lid>
<durationType>quarter</durationType>
@ -257,11 +237,6 @@
</Rest>
</Measure>
<Measure number="4">
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="200" vibrato="0"/>
<point time="100" pitch="300" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="200" vibrato="0"/>
@ -282,10 +257,6 @@
<point time="0" pitch="300" vibrato="0"/>
<point time="100" pitch="300" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="300" vibrato="0"/>
<point time="100" pitch="300" vibrato="0"/>
</TremoloBar>
<Chord>
<lid>33</lid>
<durationType>quarter</durationType>
@ -468,11 +439,6 @@
<lid>6</lid>
<text><sym>metNoteQuarterUp</sym> = 120</text>
</Tempo>
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="-125" vibrato="0"/>
<point time="100" pitch="-250" vibrato="0"/>
</TremoloBar>
<Chord>
<lid>7</lid>
<durationType>quarter</durationType>
@ -498,11 +464,6 @@
</Rest>
</Measure>
<Measure number="2">
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="150" vibrato="0"/>
<point time="100" pitch="0" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="150" vibrato="0"/>
@ -533,11 +494,6 @@
</Rest>
</Measure>
<Measure number="3">
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="-550" vibrato="0"/>
<point time="100" pitch="-550" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="-550" vibrato="0"/>
@ -559,11 +515,6 @@
<point time="50" pitch="-550" vibrato="0"/>
<point time="100" pitch="-400" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="-550" vibrato="0"/>
<point time="50" pitch="-550" vibrato="0"/>
<point time="100" pitch="-400" vibrato="0"/>
</TremoloBar>
<Chord>
<lid>24</lid>
<durationType>quarter</durationType>
@ -585,11 +536,6 @@
</Rest>
</Measure>
<Measure number="4">
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="200" vibrato="0"/>
<point time="100" pitch="300" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="0" vibrato="0"/>
<point time="50" pitch="200" vibrato="0"/>
@ -610,10 +556,6 @@
<point time="0" pitch="300" vibrato="0"/>
<point time="100" pitch="300" vibrato="0"/>
</TremoloBar>
<TremoloBar>
<point time="0" pitch="300" vibrato="0"/>
<point time="100" pitch="300" vibrato="0"/>
</TremoloBar>
<Chord>
<lid>33</lid>
<durationType>quarter</durationType>

View file

@ -137,18 +137,16 @@ void TestChordSymbol::testNoSystem()
//
QList<Part*> parts;
parts.append(score->parts().at(0));
Score* nscore = new Score(score);
score->Score::undo(new AddExcerpt(nscore));
{
Excerpt ex(score);
ex.setPartScore(nscore);
ex.setTitle(parts.front()->longName());
ex.setParts(parts);
::createExcerpt(&ex);
Excerpt* ex = new Excerpt(score);
ex->setPartScore(nscore);
nscore->setExcerpt(ex);
score->excerpts().append(ex);
ex->setTitle(parts.front()->longName());
ex->setParts(parts);
::createExcerpt(ex);
QVERIFY(nscore);
}
nscore->setName(parts.front()->partName());
nscore->style()->set(StyleIdx::createMultiMeasureRests, true);
@ -159,19 +157,20 @@ void TestChordSymbol::testNoSystem()
parts.clear();
parts.append(score->parts().at(1));
nscore = new Score(score);
score->Score::undo(new AddExcerpt(nscore));
{
Excerpt ex(score);
ex.setTitle(parts.front()->longName());
ex.setParts(parts);
ex.setPartScore(nscore);
::createExcerpt(&ex);
ex = new Excerpt(score);
ex->setPartScore(nscore);
nscore->setExcerpt(ex);
score->excerpts().append(ex);
ex->setTitle(parts.front()->longName());
ex->setParts(parts);
::createExcerpt(ex);
QVERIFY(nscore);
}
nscore->setName(parts.front()->partName());
nscore->style()->set(StyleIdx::createMultiMeasureRests, true);
score->setExcerptsChanged(true);
score->doLayout();
test_post(score, "no-system");
}

View file

@ -61,6 +61,7 @@ class TestParts : public QObject, public MTest
void createPart1();
void createPart2();
void voicesExcerpt();
void createPartBreath();
void addBreath();
@ -140,15 +141,16 @@ void TestParts::createParts(MasterScore* score)
parts.append(score->parts().at(0));
Score* nscore = new Score(score);
Excerpt ex(score);
ex.setPartScore(nscore);
ex.setTitle(parts.front()->longName());
ex.setParts(parts);
::createExcerpt(&ex);
Excerpt* ex = new Excerpt(score);
ex->setPartScore(nscore);
nscore->setExcerpt(ex);
score->excerpts().append(ex);
ex->setTitle(parts.front()->longName());
ex->setParts(parts);
::createExcerpt(ex);
QVERIFY(nscore);
nscore->setName(parts.front()->partName());
score->undo(new AddExcerpt(nscore));
//
// create second part
@ -156,14 +158,80 @@ void TestParts::createParts(MasterScore* score)
parts.clear();
parts.append(score->parts().at(1));
nscore = new Score(score);
ex.setTitle(parts.front()->longName());
ex.setPartScore(nscore);
ex.setParts(parts);
::createExcerpt(&ex);
ex = new Excerpt(score);
ex->setPartScore(nscore);
nscore->setExcerpt(ex);
score->excerpts().append(ex);
ex->setTitle(parts.front()->longName());
ex->setParts(parts);
::createExcerpt(ex);
QVERIFY(nscore);
nscore->setName(parts.front()->partName());
score->undo(new AddExcerpt(nscore));
score->setExcerptsChanged(true);
}
//---------------------------------------------------------
// voicesExcerpt
//---------------------------------------------------------
void TestParts::voicesExcerpt()
{
MasterScore* score = readScore(DIR + "voices.mscx");
//
// create first part
//
QList<Part*> parts;
QMultiMap<int, int> trackList;
parts.append(score->parts().at(0));
Score* nscore = new Score(score);
trackList.insert(1, 0);
trackList.insert(2, 1);
trackList.insert(4, 4);
Excerpt* ex = new Excerpt(score);
ex->setPartScore(nscore);
nscore->setExcerpt(ex);
score->excerpts().append(ex);
ex->setTitle(parts.front()->longName());
ex->setParts(parts);
ex->setTracks(trackList);
::createExcerpt(ex);
QVERIFY(nscore);
nscore->setName(parts.front()->partName());
//
// create second part
//
parts.clear();
parts.append(score->parts().at(1));
nscore = new Score(score);
trackList.clear();
trackList.insert(11, 0);
ex = new Excerpt(score);
ex->setPartScore(nscore);
nscore->setExcerpt(ex);
score->excerpts().append(ex);
ex->setTitle(parts.front()->longName());
ex->setParts(parts);
ex->setTracks(trackList);
::createExcerpt(ex);
QVERIFY(nscore);
nscore->setName(parts.front()->partName());
score->setExcerptsChanged(true);
QVERIFY(saveCompareScore(score, "voices.mscx", DIR + "voices-ref.mscx"));
delete score;
}
//---------------------------------------------------------

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,807 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<lastSystemFillLimit>0</lastSystemFillLimit>
<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">voices</metaTag>
<PageList>
<Page>
<System>
</System>
<System>
</System>
</Page>
</PageList>
<Part>
<Staff id="1">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<bracket type="1" span="2"/>
<barLineSpan>2</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<defaultClef>F</defaultClef>
<bracket type="-1" span="0"/>
<barLineSpan>0</barLineSpan>
</Staff>
<trackName>Piano</trackName>
<Instrument>
<longName>Piano</longName>
<shortName>Pno.</shortName>
<trackName>Piano</trackName>
<minPitchP>21</minPitchP>
<maxPitchP>108</maxPitchP>
<minPitchA>21</minPitchA>
<maxPitchA>108</maxPitchA>
<instrumentId>keyboard.piano</instrumentId>
<clef staff="2">F</clef>
<Articulation>
<velocity>100</velocity>
<gateTime>95</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>
<program value="0"/>
<midiPort>0</midiPort>
<midiChannel>2</midiChannel>
</Channel>
</Instrument>
</Part>
<Part>
<Staff id="3">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<defaultClef>F</defaultClef>
<bracket type="-1" span="0"/>
</Staff>
<trackName>Trombone</trackName>
<Instrument>
<longName>Trombone</longName>
<shortName>Tbn.</shortName>
<trackName>Trombone</trackName>
<minPitchP>35</minPitchP>
<maxPitchP>74</maxPitchP>
<minPitchA>35</minPitchA>
<maxPitchA>70</maxPitchA>
<instrumentId>brass.trombone</instrumentId>
<clef>F</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>
<program value="57"/>
<midiPort>0</midiPort>
<midiChannel>0</midiChannel>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<VBox>
<height>10</height>
<Text>
<style>Title</style>
<text>voices</text>
</Text>
</VBox>
<Measure number="1">
<KeySig>
<accidental>-4</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Dynamic>
<subtype>pp</subtype>
<velocity>33</velocity>
</Dynamic>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>0</tick>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>68</pitch>
<tpc>10</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>70</pitch>
<tpc>12</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Rest>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<tick>0</tick>
<Chord>
<track>2</track>
<durationType>quarter</durationType>
<Note>
<track>2</track>
<pitch>75</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>2</track>
<durationType>quarter</durationType>
<Note>
<track>2</track>
<pitch>77</pitch>
<tpc>13</tpc>
</Note>
</Chord>
<Chord>
<track>2</track>
<durationType>quarter</durationType>
<Note>
<track>2</track>
<pitch>79</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>2</track>
<durationType>quarter</durationType>
<Note>
<track>2</track>
<pitch>80</pitch>
<tpc>10</tpc>
</Note>
</Chord>
</Measure>
<Measure number="2">
<HairPin id="2">
<subtype>0</subtype>
<veloChange>10</veloChange>
<beginText>
<text>cresc.</text>
</beginText>
<continueText>
<text>(cresc.)</text>
</continueText>
</HairPin>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>2400</tick>
<endSpanner id="2"/>
<tick>1920</tick>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<Fingering>
<pos x="1.05809" y="-4.67501"/>
<track>1</track>
<text>2</text>
</Fingering>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Articulation>
<subtype>sforzato</subtype>
<track>1</track>
</Articulation>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<tick>1920</tick>
<Rest>
<track>2</track>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="3">
<Harmony>
<root>11</root>
<name>7</name>
<pos x="0" y="-3.22581"/>
</Harmony>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>3840</tick>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<tick>3840</tick>
<Chord>
<track>2</track>
<durationType>quarter</durationType>
<Note>
<track>2</track>
<pitch>75</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>2</track>
<durationType>quarter</durationType>
<Note>
<track>2</track>
<pitch>75</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>2</track>
<durationType>quarter</durationType>
<Note>
<track>2</track>
<pitch>75</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>2</track>
<durationType>quarter</durationType>
<Note>
<track>2</track>
<pitch>75</pitch>
<tpc>11</tpc>
</Note>
</Chord>
</Measure>
<Measure number="4">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>5760</tick>
<Slur id="3">
<track>1</track>
</Slur>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Slur type="start" id="3"/>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Slur type="stop" id="3"/>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<tick>5760</tick>
<Rest>
<track>2</track>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="5">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>7680</tick>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<Tie id="4">
<track>1</track>
</Tie>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<endSpanner id="4"/>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Chord>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<track>1</track>
<pitch>63</pitch>
<tpc>11</tpc>
</Note>
</Chord>
<Rest>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<tick>7680</tick>
<Rest>
<track>2</track>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
</Staff>
<Staff id="2">
<Measure number="1">
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="2">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="3">
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>55</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>57</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>59</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
</Measure>
<Measure number="4">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="5">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
</Staff>
<Staff id="3">
<Measure number="1">
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>0</tick>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>48</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>50</pitch>
<tpc>16</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>52</pitch>
<tpc>18</tpc>
</Note>
</Chord>
<Rest>
<track>11</track>
<durationType>quarter</durationType>
</Rest>
</Measure>
<Measure number="2">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>1920</tick>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<Fingering>
<pos x="1.05809" y="-4.67501"/>
<track>11</track>
<text>2</text>
</Fingering>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Articulation>
<subtype>sforzato</subtype>
<track>11</track>
</Articulation>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
</Measure>
<Measure number="3">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>3840</tick>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
</Measure>
<Measure number="4">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>5760</tick>
<Slur id="5">
<track>11</track>
</Slur>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Slur type="start" id="5"/>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Slur type="stop" id="5"/>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
</Measure>
<Measure number="5">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<tick>7680</tick>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<Tie id="6">
<track>11</track>
</Tie>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<endSpanner id="6"/>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Chord>
<track>11</track>
<durationType>quarter</durationType>
<Note>
<track>11</track>
<pitch>43</pitch>
<tpc>15</tpc>
</Note>
</Chord>
<Rest>
<track>11</track>
<durationType>quarter</durationType>
</Rest>
</Measure>
</Staff>
</Score>
</museScore>

View file

@ -302,13 +302,16 @@ void TestSpanners::spanners05()
Excerpt ex(score);
ex.setPartScore(nscore);
nscore->setExcerpt(&ex);
ex.setTitle(parts.front()->longName());
ex.setParts(parts);
::createExcerpt(&ex);
QVERIFY(nscore);
nscore->setName(parts.front()->partName());
score->undo(new AddExcerpt(nscore));
QMultiMap<int, int> tracks;
score->Score::undo(new AddExcerpt(nscore, tracks));
QVERIFY(saveCompareScore(score, "glissando-cloning02.mscx", DIR + "glissando-cloning02-ref.mscx"));
delete score;

View file

@ -129,11 +129,11 @@
</Chord>
<move>0/1</move>
<Chord>
<lid>88</lid>
<lid>89</lid>
<track>1</track>
<durationType>whole</durationType>
<Note>
<lid>89</lid>
<lid>90</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -142,16 +142,16 @@
</Measure>
<Measure number="2">
<Rest>
<lid>93</lid>
<lid>94</lid>
<durationType>whole</durationType>
</Rest>
<move>0/1</move>
<Chord>
<lid>91</lid>
<lid>92</lid>
<track>1</track>
<durationType>whole</durationType>
<Note>
<lid>92</lid>
<lid>93</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -189,18 +189,18 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>94</lid>
<lid>95</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<lid>95</lid>
<lid>96</lid>
<track>1</track>
<durationType>half</durationType>
<Note>
<lid>96</lid>
<lid>97</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -245,11 +245,11 @@
</Chord>
<move>1/2</move>
<Chord>
<lid>98</lid>
<lid>99</lid>
<track>1</track>
<durationType>half</durationType>
<Note>
<lid>99</lid>
<lid>100</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -324,27 +324,27 @@
</Note>
</Chord>
<Rest>
<lid>106</lid>
<lid>107</lid>
<durationType>quarter</durationType>
</Rest>
<move>0/1</move>
<Chord>
<lid>101</lid>
<lid>102</lid>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<lid>102</lid>
<lid>103</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<lid>103</lid>
<lid>104</lid>
<track>1</track>
<durationType>half</durationType>
<Note>
<lid>104</lid>
<lid>105</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -361,7 +361,7 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>105</lid>
<lid>106</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -390,7 +390,7 @@
</Note>
</Chord>
<Rest>
<lid>109</lid>
<lid>110</lid>
<Tuplet>1</Tuplet>
<durationType>quarter</durationType>
</Rest>
@ -512,7 +512,7 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>107</lid>
<lid>108</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -530,19 +530,19 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>108</lid>
<lid>109</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<lid>110</lid>
<lid>111</lid>
<track>1</track>
<Tuplet>3</Tuplet>
<durationType>quarter</durationType>
<Note>
<lid>111</lid>
<lid>112</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -572,7 +572,7 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>112</lid>
<lid>113</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -590,13 +590,13 @@
<l2>24</l2>
</Beam>
<Chord>
<lid>113</lid>
<lid>114</lid>
<track>1</track>
<Tuplet>4</Tuplet>
<durationType>eighth</durationType>
<Beam>2</Beam>
<Note>
<lid>114</lid>
<lid>115</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -615,7 +615,7 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>115</lid>
<lid>116</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -748,11 +748,11 @@
</Chord>
<move>0/1</move>
<Chord>
<lid>88</lid>
<lid>89</lid>
<track>1</track>
<durationType>whole</durationType>
<Note>
<lid>89</lid>
<lid>90</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -761,16 +761,16 @@
</Measure>
<Measure number="2">
<Rest>
<lid>93</lid>
<lid>94</lid>
<durationType>whole</durationType>
</Rest>
<move>0/1</move>
<Chord>
<lid>91</lid>
<lid>92</lid>
<track>1</track>
<durationType>whole</durationType>
<Note>
<lid>92</lid>
<lid>93</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -808,18 +808,18 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>94</lid>
<lid>95</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<lid>95</lid>
<lid>96</lid>
<track>1</track>
<durationType>half</durationType>
<Note>
<lid>96</lid>
<lid>97</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -864,11 +864,11 @@
</Chord>
<move>1/2</move>
<Chord>
<lid>98</lid>
<lid>99</lid>
<track>1</track>
<durationType>half</durationType>
<Note>
<lid>99</lid>
<lid>100</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -943,27 +943,27 @@
</Note>
</Chord>
<Rest>
<lid>106</lid>
<lid>107</lid>
<durationType>quarter</durationType>
</Rest>
<move>0/1</move>
<Chord>
<lid>101</lid>
<lid>102</lid>
<track>1</track>
<durationType>quarter</durationType>
<Note>
<lid>102</lid>
<lid>103</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<lid>103</lid>
<lid>104</lid>
<track>1</track>
<durationType>half</durationType>
<Note>
<lid>104</lid>
<lid>105</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -980,7 +980,7 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>105</lid>
<lid>106</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -1009,7 +1009,7 @@
</Note>
</Chord>
<Rest>
<lid>109</lid>
<lid>110</lid>
<Tuplet>5</Tuplet>
<durationType>quarter</durationType>
</Rest>
@ -1131,7 +1131,7 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>107</lid>
<lid>108</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -1149,19 +1149,19 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>108</lid>
<lid>109</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<lid>110</lid>
<lid>111</lid>
<track>1</track>
<Tuplet>7</Tuplet>
<durationType>quarter</durationType>
<Note>
<lid>111</lid>
<lid>112</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -1191,7 +1191,7 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>112</lid>
<lid>113</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -1209,13 +1209,13 @@
<l2>24</l2>
</Beam>
<Chord>
<lid>113</lid>
<lid>114</lid>
<track>1</track>
<Tuplet>8</Tuplet>
<durationType>eighth</durationType>
<Beam>4</Beam>
<Note>
<lid>114</lid>
<lid>115</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>
@ -1234,7 +1234,7 @@
<tpc>15</tpc>
</Note>
<Note>
<lid>115</lid>
<lid>116</lid>
<track>1</track>
<pitch>72</pitch>
<tpc>14</tpc>