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

Merge pull request #988 from jpirie/23058-fade

Browse source 
Fade-in articulation in GP4 and GP5 formats
This commit is contained in:
Nicolas Froment 2014-07-06 10:36:32 +02:00
commit c63936e73e
18 changed files with 13281 additions and 34981 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
fonts/gonville/Gonville.otf Executable file → Normal file
View file

Binary file not shown.

6
fonts/mscore/glyphnames.json
View file

@ -284,6 +284,12 @@
"graceNoteSlashStemUp": {
"codepoint": "U+e195"
},
"guitarFadeIn": {
"codepoint": "U+e843"
},
"guitarFadeOut": {
"codepoint": "U+e844"
},
"keyboardPedalHeel1": {
"codepoint": "U+e172"
},

BIN
fonts/mscore/mscore.otf
View file

Binary file not shown.

47475
fonts/mscore/mscore.sfd
View file

File diff suppressed because it is too large Load diff

BIN
fonts/mscore/mscore.ttf
View file

Binary file not shown.

2
fonttools/genft.cpp
View file

@ -195,6 +195,8 @@ QMap<QString, QString> nmap {
{ "scripts.dportato", "articTenutoSlurAbove" },
{ "scripts.umarcato", "articMarcatoAbove" },
{ "scripts.dmarcato", "articMarcatoBelow" },
{ "scripts.fadein", "guitarFadeIn" },
{ "scripts.fadeout", "guitarFadeOut" },
{ "scripts.open", "brassMuteOpen" },
{ "scripts.stopped", "brassMuteClosed" },
{ "scripts.upbow", "stringsUpBow" },

10
libmscore/articulation.cpp
View file

@ -79,6 +79,14 @@ ArticulationInfo Articulation::articulationList[int(ArticulationType::ARTICULATI
"marcato", QT_TRANSLATE_NOOP("articulation", "marcato"),
1.0, ArticulationShowIn::PITCHED_STAFF | ArticulationShowIn::TABLATURE
},
{ SymId::guitarFadeIn, SymId::guitarFadeIn,
"fadein", QT_TRANSLATE_NOOP("articulation", "fadein"),
1.0, ArticulationShowIn::PITCHED_STAFF | ArticulationShowIn::TABLATURE
},
{ SymId::guitarFadeOut, SymId::guitarFadeOut,
"fadeout", QT_TRANSLATE_NOOP("articulation", "fadeout"),
1.0, ArticulationShowIn::PITCHED_STAFF | ArticulationShowIn::TABLATURE
},
{ SymId::brassMuteOpen, SymId::brassMuteOpen,
"ouvert", QT_TRANSLATE_NOOP("articulation", "ouvert"),
1.0, ArticulationShowIn::PITCHED_STAFF | ArticulationShowIn::TABLATURE
@ -291,6 +299,8 @@ void Articulation::setSubtype(const QString& s)
bool up;
ArticulationType type;
} al[] = {
{ "fadein", true, ArticulationType::FadeIn },
{ "fadeout", true, ArticulationType::FadeOut },
{ "umarcato", true, ArticulationType::Marcato },
{ "dmarcato", false, ArticulationType::Marcato },
{ "ufermata", true, ArticulationType::Fermata },

4
libmscore/edit.cpp
View file

@ -1307,7 +1307,9 @@ void Score::cmdFlip()
Articulation* a = static_cast<Articulation*>(e);
if (a->articulationType() == ArticulationType::Staccato
|| a->articulationType() == ArticulationType::Tenuto
|| a->articulationType() == ArticulationType::Sforzatoaccent) {
|| a->articulationType() == ArticulationType::Sforzatoaccent
|| a->articulationType() == ArticulationType::FadeIn
|| a->articulationType() == ArticulationType::FadeOut) {
ArticulationAnchor aa = a->anchor();
if (aa == ArticulationAnchor::TOP_CHORD)
aa = ArticulationAnchor::BOTTOM_CHORD;

2
libmscore/mscore.h
View file

@ -89,6 +89,8 @@ enum class ArticulationType : char {
Tenuto,
Portato,
Marcato,
FadeIn,
FadeOut,
Ouvert,
Plusstop,
Upbow,

2
libmscore/style.cpp
View file

@ -534,6 +534,8 @@ StyleData::StyleData()
_articulationAnchor[int(ArticulationType::Tenuto)] = ArticulationAnchor::CHORD;
_articulationAnchor[int(ArticulationType::Portato)] = ArticulationAnchor::CHORD;
_articulationAnchor[int(ArticulationType::Marcato)] = ArticulationAnchor::CHORD;
_articulationAnchor[int(ArticulationType::FadeIn)] = ArticulationAnchor::CHORD;
_articulationAnchor[int(ArticulationType::FadeOut)] = ArticulationAnchor::CHORD;
_articulationAnchor[int(ArticulationType::Ouvert)] = ArticulationAnchor::TOP_STAFF;
_articulationAnchor[int(ArticulationType::Plusstop)] = ArticulationAnchor::TOP_STAFF;
_articulationAnchor[int(ArticulationType::Upbow)] = ArticulationAnchor::TOP_STAFF;

2
libmscore/sym.cpp
View file

@ -5011,6 +5011,8 @@ QVector<oldName> oldNames = {
{"dportato", SymId::articTenutoStaccatoBelow }, // scripts.dportato
{"umarcato", SymId::articMarcatoAbove }, // scripts.umarcato
{"dmarcato", SymId::articMarcatoBelow }, // scripts.dmarcato
{"fadein", SymId::guitarFadeIn }, // scripts.fadein
{"fadeout", SymId::guitarFadeOut }, // scripts.fadein
{"ouvert", SymId::brassMuteOpen }, // scripts.open
{"halfopen", SymId::brassMuteHalfClosed }, // scripts.halfopen CHECK!!! pre 2.0 only
{"plus stop", SymId::brassMuteClosed }, // scripts.stopped

17
mscore/importgtp.cpp
View file

@ -535,6 +535,9 @@ void GuitarPro::applyBeatEffects(Chord* chord, int beatEffect)
a->setArticulationType(ArticulationType::Popping);
break;
#endif
case 4:
a->setArticulationType(ArticulationType::FadeIn);
break;
default:
qDebug("GuitarPro import: unknown beat effect %d", beatEffect);
}
@ -1764,6 +1767,9 @@ int GuitarPro4::readBeatEffects(int track, Segment* segment)
int effects = 0;
uchar fxBits1 = readUChar();
uchar fxBits2 = readUChar();
if (fxBits1 & 0x10) {
effects = 4; // fade in
}
if (fxBits1 & 0x20) {
effects = readUChar(); // effect 1-tapping, 2-slapping, 3-popping
}
@ -2279,8 +2285,9 @@ void GuitarPro4::read(QFile* fp)
lyrics = new Lyrics(score);
lyrics->setText(readDelphiString());
}
int beatEffects = 0;
if (beatBits & 0x8)
readBeatEffects(staffIdx * VOICES, segment);
beatEffects = readBeatEffects(staffIdx * VOICES, segment);
if (beatBits & 0x10)
readMixChange(measure);
int strings = readUChar(); // used strings mask
@ -2298,8 +2305,11 @@ void GuitarPro4::read(QFile* fp)
cr = new Rest(score);
}
else {
if(!segment->cr(staffIdx * VOICES))
if(!segment->cr(staffIdx * VOICES)) {
cr = new Chord(score);
Chord* chord = static_cast<Chord*>(cr);
applyBeatEffects(chord, beatEffects);
}
}
cr->setTrack(staffIdx * VOICES);
@ -2733,6 +2743,9 @@ int GuitarPro5::readBeatEffects(int track, Segment* segment)
uchar fxBits1 = readUChar();
uchar fxBits2 = readUChar();
if (fxBits1 & 0x10) {
effects = 4; // fade in
}
if (fxBits1 & 0x20) {
effects = readUChar();
// 1 - tapping

BIN
mtest/guitarpro/fade-in.gp4 Normal file
View file

Binary file not shown.

332
mtest/guitarpro/fade-in.gp4-ref.mscx Normal file
View file

@ -0,0 +1,332 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="1.24">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<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>Track 1</trackName>
<Instrument>
<longName pos="0">Track 1</longName>
<trackName></trackName>
<StringData>
<frets>32</frets>
<string>40</string>
<string>45</string>
<string>50</string>
<string>55</string>
<string>59</string>
<string>64</string>
</StringData>
<Channel>
<program value="25"/>
<controller ctrl="7" value="127"/>
<controller ctrl="10" value="63"/>
<controller ctrl="93" value="255"/>
<controller ctrl="91" value="255"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<VBox>
<height>10</height>
<lid>0</lid>
</VBox>
<Measure number="1">
<Clef>
<concertClefType>G8vb</concertClefType>
<transposingClefType>G8vb</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<lid>2</lid>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Tempo>
<tempo>2</tempo>
<lid>3</lid>
<text><sym>noteQuarterUp</sym> = 120</text>
</Tempo>
<Rest>
<lid>4</lid>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>5</lid>
<durationType>quarter</durationType>
</Rest>
<Chord>
<lid>7</lid>
<durationType>quarter</durationType>
<Articulation>
<subtype>fadein</subtype>
<lid>6</lid>
</Articulation>
<Note>
<lid>8</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>0</fret>
<string>1</string>
</Note>
</Chord>
<Rest>
<lid>9</lid>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<createMultiMeasureRests>1</createMultiMeasureRests>
<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>
<PageList>
<Page>
<System>
</System>
<System>
</System>
</Page>
</PageList>
<Part>
<Staff id="1">
<linkedTo>1</linkedTo>
<StaffType group="pitched">
</StaffType>
<bracket type="0" span="2"/>
</Staff>
<Staff id="2">
<linkedTo>1</linkedTo>
<StaffType group="tablature">
<name>Tab. 6-str common</name>
<lines>6</lines>
<lineDistance>1.5</lineDistance>
<timesig>0</timesig>
<durations>0</durations>
<durationFontName>MuseScore Tab Modern</durationFontName>
<durationFontSize>15</durationFontSize>
<durationFontY>0</durationFontY>
<fretFontName>MuseScore Tab Serif</fretFontName>
<fretFontSize>9</fretFontSize>
<fretFontY>0</fretFontY>
<linesThrough>0</linesThrough>
<minimStyle>1</minimStyle>
<onLines>1</onLines>
<showRests>0</showRests>
<stemsDown>1</stemsDown>
<stemsThrough>0</stemsThrough>
<upsideDown>0</upsideDown>
<useNumbers>1</useNumbers>
</StaffType>
<bracket type="-1" span="0"/>
</Staff>
<trackName></trackName>
<Instrument>
<longName pos="0">Track 1</longName>
<trackName></trackName>
<StringData>
<frets>32</frets>
<string>40</string>
<string>45</string>
<string>50</string>
<string>55</string>
<string>59</string>
<string>64</string>
</StringData>
<Channel>
<program value="25"/>
<controller ctrl="7" value="127"/>
<controller ctrl="10" value="63"/>
<controller ctrl="93" value="255"/>
<controller ctrl="91" value="255"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<VBox>
<height>10</height>
<lid>0</lid>
<Text>
<style>Instrument Name (Part)</style>
<text>Track 1</text>
</Text>
</VBox>
<Measure number="1">
<Clef>
<concertClefType>G8vb</concertClefType>
<transposingClefType>G8vb</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<lid>2</lid>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Tempo>
<tempo>2</tempo>
<lid>3</lid>
<text><sym>noteQuarterUp</sym> = 120</text>
</Tempo>
<Rest>
<lid>4</lid>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>5</lid>
<durationType>quarter</durationType>
</Rest>
<Chord>
<lid>7</lid>
<durationType>quarter</durationType>
<Articulation>
<subtype>fadein</subtype>
<lid>6</lid>
</Articulation>
<Note>
<lid>8</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>0</fret>
<string>1</string>
</Note>
</Chord>
<Rest>
<lid>9</lid>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>
<accidental>0</accidental>
</KeySig>
<Rest>
<lid>4</lid>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>5</lid>
<durationType>quarter</durationType>
</Rest>
<Chord>
<lid>7</lid>
<durationType>quarter</durationType>
<Articulation>
<subtype>fadein</subtype>
<lid>6</lid>
</Articulation>
<Note>
<lid>8</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>0</fret>
<string>1</string>
</Note>
</Chord>
<Rest>
<lid>9</lid>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<name>Track 1</name>
</Score>
</Score>
</museScore>

BIN
mtest/guitarpro/fade-in.gp5 Normal file
View file

Binary file not shown.

405
mtest/guitarpro/fade-in.gp5-ref.mscx Normal file
View file

@ -0,0 +1,405 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="1.24">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<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>Track 1</trackName>
<Instrument>
<longName pos="0">Track 1</longName>
<trackName></trackName>
<StringData>
<frets>32</frets>
<string>40</string>
<string>45</string>
<string>50</string>
<string>55</string>
<string>59</string>
<string>64</string>
</StringData>
<Channel>
<program value="25"/>
<controller ctrl="7" value="127"/>
<controller ctrl="10" value="63"/>
<controller ctrl="93" value="255"/>
<controller ctrl="91" value="255"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<VBox>
<height>10</height>
<lid>0</lid>
</VBox>
<Measure number="1">
<Clef>
<concertClefType>G8vb</concertClefType>
<transposingClefType>G8vb</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<lid>2</lid>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Tempo>
<tempo>2</tempo>
<lid>3</lid>
<text><sym>noteQuarterUp</sym> = 120</text>
</Tempo>
<Rest>
<lid>4</lid>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>5</lid>
<durationType>quarter</durationType>
</Rest>
<Dynamic>
<subtype>mp</subtype>
<velocity>64</velocity>
<lid>6</lid>
</Dynamic>
<Chord>
<lid>8</lid>
<durationType>quarter</durationType>
<Articulation>
<subtype>fadein</subtype>
<lid>7</lid>
</Articulation>
<Note>
<lid>9</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>0</fret>
<string>1</string>
</Note>
</Chord>
<Rest>
<lid>10</lid>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
<tick>0</tick>
<Rest>
<lid>11</lid>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>12</lid>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>13</lid>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>14</lid>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
</Measure>
</Staff>
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<createMultiMeasureRests>1</createMultiMeasureRests>
<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>
<PageList>
<Page>
<System>
</System>
<System>
</System>
</Page>
</PageList>
<Part>
<Staff id="1">
<linkedTo>1</linkedTo>
<StaffType group="pitched">
</StaffType>
<bracket type="0" span="2"/>
</Staff>
<Staff id="2">
<linkedTo>1</linkedTo>
<StaffType group="tablature">
<name>Tab. 6-str common</name>
<lines>6</lines>
<lineDistance>1.5</lineDistance>
<timesig>0</timesig>
<durations>0</durations>
<durationFontName>MuseScore Tab Modern</durationFontName>
<durationFontSize>15</durationFontSize>
<durationFontY>0</durationFontY>
<fretFontName>MuseScore Tab Serif</fretFontName>
<fretFontSize>9</fretFontSize>
<fretFontY>0</fretFontY>
<linesThrough>0</linesThrough>
<minimStyle>1</minimStyle>
<onLines>1</onLines>
<showRests>0</showRests>
<stemsDown>1</stemsDown>
<stemsThrough>0</stemsThrough>
<upsideDown>0</upsideDown>
<useNumbers>1</useNumbers>
</StaffType>
<bracket type="-1" span="0"/>
</Staff>
<trackName></trackName>
<Instrument>
<longName pos="0">Track 1</longName>
<trackName></trackName>
<StringData>
<frets>32</frets>
<string>40</string>
<string>45</string>
<string>50</string>
<string>55</string>
<string>59</string>
<string>64</string>
</StringData>
<Channel>
<program value="25"/>
<controller ctrl="7" value="127"/>
<controller ctrl="10" value="63"/>
<controller ctrl="93" value="255"/>
<controller ctrl="91" value="255"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<VBox>
<height>10</height>
<lid>0</lid>
<Text>
<style>Instrument Name (Part)</style>
<text>Track 1</text>
</Text>
</VBox>
<Measure number="1">
<Clef>
<concertClefType>G8vb</concertClefType>
<transposingClefType>G8vb</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<lid>2</lid>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Tempo>
<tempo>2</tempo>
<lid>3</lid>
<text><sym>noteQuarterUp</sym> = 120</text>
</Tempo>
<Rest>
<lid>4</lid>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>5</lid>
<durationType>quarter</durationType>
</Rest>
<Dynamic>
<subtype>mp</subtype>
<velocity>64</velocity>
<lid>6</lid>
</Dynamic>
<Chord>
<lid>8</lid>
<durationType>quarter</durationType>
<Articulation>
<subtype>fadein</subtype>
<lid>7</lid>
</Articulation>
<Note>
<lid>9</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>0</fret>
<string>1</string>
</Note>
</Chord>
<Rest>
<lid>10</lid>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
<tick>0</tick>
<Rest>
<lid>11</lid>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>12</lid>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>13</lid>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>14</lid>
<track>1</track>
<durationType>quarter</durationType>
</Rest>
</Measure>
</Staff>
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>
<accidental>0</accidental>
</KeySig>
<Rest>
<lid>4</lid>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>5</lid>
<durationType>quarter</durationType>
</Rest>
<Chord>
<lid>8</lid>
<durationType>quarter</durationType>
<Articulation>
<subtype>fadein</subtype>
<lid>7</lid>
</Articulation>
<Note>
<lid>9</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>0</fret>
<string>1</string>
</Note>
</Chord>
<Rest>
<lid>10</lid>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
<tick>0</tick>
<Rest>
<lid>11</lid>
<track>5</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>12</lid>
<track>5</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>13</lid>
<track>5</track>
<durationType>quarter</durationType>
</Rest>
<Rest>
<lid>14</lid>
<track>5</track>
<durationType>quarter</durationType>
</Rest>
</Measure>
</Staff>
<name>Track 1</name>
</Score>
</Score>
</museScore>

2
mtest/guitarpro/tst_guitarpro.cpp
View file

@ -64,6 +64,8 @@ private slots:
void gpxFretDiagram() { gpReadTest("fret-diagram", "gpx"); }
void gp5FretDiagram() { gpReadTest("fret-diagram", "gp5"); }
void gp4FretDiagram() { gpReadTest("fret-diagram", "gp4"); }
void gp5FadeIn() { gpReadTest("fade-in", "gp5"); }
void gp4FadeIn() { gpReadTest("fade-in", "gp4"); }
};
//---------------------------------------------------------

3
mtest/guitarpro/updateReference
View file

@ -33,4 +33,7 @@ cp $MSCORE/beams-stems-ledger-lines.gp5.mscx beams-stems-ledger-lines.gp5-ref.
cp $MSCORE/fret-diagram.gpx.mscx fret-diagram.gpx-ref.mscx
cp $MSCORE/fret-diagram.gp5.mscx fret-diagram.gp5-ref.mscx
cp $MSCORE/fret-diagram.gp4.mscx fret-diagram.gp4-ref.mscx
cp $MSCORE/fade-in.gp5.mscx fade-in.gp5-ref.mscx
cp $MSCORE/fade-in.gp4.mscx fade-in.gp4-ref.mscx