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

Merge pull request #939 from mgavioli/Phasing_out_PERC2_and_TAB2_clefs

Browse source 
Removing default usages of the PERC2 and TAB2 clefs.
This commit is contained in:
Nicolas Froment 2014-05-30 19:24:47 +02:00
commit f7b34054c3
26 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/clef.cpp
View file

@ -562,7 +562,7 @@ ClefType Clef::clefType(const QString& s)
case 16: ct = ClefType::G4; break;
case 17: ct = ClefType::F_8VA; break;
case 18: ct = ClefType::F_15MA; break;
case 19: ct = ClefType::PERC2; break;
case 19: ct = ClefType::PERC; break; // PERC2 no longer supported
case 20: ct = ClefType::TAB2; break;
}
}

2
libmscore/style.cpp
View file

@ -495,7 +495,7 @@ StyleData::StyleData()
{ StyleIdx::ottavaLineWidth, QVariant(.1) },
{ StyleIdx::ottavaLineStyle, QVariant(int(Qt::DashLine)) },
{ StyleIdx::ottavaNumbersOnly, true },
{ StyleIdx::tabClef, QVariant(int(ClefType::TAB2)) },
{ StyleIdx::tabClef, QVariant(int(ClefType::TAB)) },
{ StyleIdx::tremoloWidth, QVariant(1.2) }, // tremolo stroke width: note head width
{ StyleIdx::tremoloBoxHeight, QVariant(0.65) },
{ StyleIdx::tremoloStrokeWidth, QVariant(0.35) },

4
mscore/importxml.cpp
View file

@ -5492,11 +5492,11 @@ StaffTypes MusicXml::xmlClef(QDomElement e, int staffIdx, Measure* measure)
clef = ClefType::C1;
}
else if (c == "percussion") {
clef = ClefType::PERC2;
clef = ClefType::PERC;
res = StaffTypes::PERC_DEFAULT;
}
else if (c == "TAB") {
clef = ClefType::TAB2;
clef = ClefType::TAB;
res = StaffTypes::TAB_DEFAULT;
}
else

4
mtest/guitarpro/arpeggio_up_down.gp4-ref.mscx
View file

@ -408,8 +408,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/basic-bend.gp5-ref.mscx
View file

@ -304,8 +304,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/bend.gp3-ref.mscx
View file

@ -494,8 +494,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<Chord>
<lid>3</lid>

4
mtest/guitarpro/bend.gp4-ref.mscx
View file

@ -502,8 +502,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/bend.gp5-ref.mscx
View file

@ -502,8 +502,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/copyright.gp3-ref.mscx
View file

@ -275,8 +275,8 @@ All Rights Reserved - International Copyright Secured</metaTag>
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<Chord>
<lid>3</lid>

4
mtest/guitarpro/copyright.gp4-ref.mscx
View file

@ -283,8 +283,8 @@ All Rights Reserved - International Copyright Secured</metaTag>
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/copyright.gp5-ref.mscx
View file

@ -283,8 +283,8 @@ All Rights Reserved - International Copyright Secured</metaTag>
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/dynamic.gp5-ref.mscx
View file

@ -492,8 +492,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/ghost_note.gp3-ref.mscx
View file

@ -560,8 +560,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<Chord>
<lid>4</lid>

4
mtest/guitarpro/grace.gp5-ref.mscx
View file

@ -763,8 +763,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/heavy-accent.gp5-ref.mscx
View file

@ -294,8 +294,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/sforzato.gp4-ref.mscx
View file

@ -308,8 +308,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/slur.gp4-ref.mscx
View file

@ -322,8 +322,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/tempo.gp3-ref.mscx
View file

@ -524,8 +524,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<Chord>
<lid>3</lid>

4
mtest/guitarpro/tempo.gp4-ref.mscx
View file

@ -532,8 +532,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/tempo.gp5-ref.mscx
View file

@ -532,8 +532,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/testIrrTuplet.gp4-ref.mscx
View file

@ -406,8 +406,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/tremolos.gp5-ref.mscx
View file

@ -324,8 +324,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/trill.gp4-ref.mscx
View file

@ -294,8 +294,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/volta.gp3-ref.mscx
View file

@ -1778,8 +1778,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<Chord>
<lid>4</lid>

4
mtest/guitarpro/volta.gp4-ref.mscx
View file

@ -1458,8 +1458,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>1</lid>

4
mtest/guitarpro/volta.gp5-ref.mscx
View file

@ -3844,8 +3844,8 @@
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>TAB2</concertClefType>
<transposingClefType>TAB2</transposingClefType>
<concertClefType>TAB</concertClefType>
<transposingClefType>TAB</transposingClefType>
</Clef>
<KeySig>
<lid>3</lid>