Skip to content

Commit

Permalink
add more trumpets and cornets to instruments.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jojo-Schmitz
Jojo-Schmitz committed Feb 19, 2016
1 parent bdaddb0 commit c4c6b5d
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 30 deletions.
60 changes: 30 additions & 30 deletions libmscore/fret.cpp
View file
Expand Up @@ -589,37 +589,37 @@ void FretDiagram::readMusicXML(XmlReader& e)
void FretDiagram::writeMusicXML(Xml& xml) const
{
qDebug("FretDiagram::writeMusicXML() this %p harmony %p", this, _harmony);
int _strings = strings();
xml.stag("frame");
xml.tag("frame-strings", _strings);
xml.tag("frame-frets", frets());
QString strDots = "'";
QString strMarker = "'";
QString strFingering = "'";
for (int i = 0; i < _strings; ++i) {
// TODO print frame note
if (_dots) strDots += QString("%1'").arg(static_cast<int>(_dots[i]));
if (_marker) strMarker += QString("%1'").arg(static_cast<int>(_marker[i]));
if (_fingering) strFingering += QString("%1'").arg(static_cast<int>(_fingering[i]));
if (_marker[i] != 88) {
xml.stag("frame-note");
xml.tag("string", _strings - i);
if (_dots)
xml.tag("fret", _dots[i]);
else
xml.tag("fret", "0");
xml.etag();
}
int _strings = strings();
xml.stag("frame");
xml.tag("frame-strings", _strings);
xml.tag("frame-frets", frets());
QString strDots = "'";
QString strMarker = "'";
QString strFingering = "'";
for (int i = 0; i < _strings; ++i) {
// TODO print frame note
if (_dots) strDots += QString("%1'").arg(static_cast<int>(_dots[i]));
if (_marker) strMarker += QString("%1'").arg(static_cast<int>(_marker[i]));
if (_fingering) strFingering += QString("%1'").arg(static_cast<int>(_fingering[i]));
if (_marker[i] != 88) {
xml.stag("frame-note");
xml.tag("string", _strings - i);
if (_dots)
xml.tag("fret", _dots[i]);
else
xml.tag("fret", "0");
xml.etag();
}
qDebug("FretDiagram::writeMusicXML() this %p dots %s marker %s fingering %s",
this, qPrintable(strDots), qPrintable(strMarker), qPrintable(strFingering));
/*
xml.tag("root-step", tpc2stepName(rootTpc));
int alter = tpc2alter(rootTpc);
if (alter)
xml.tag("root-alter", alter);
*/
xml.etag();
}
qDebug("FretDiagram::writeMusicXML() this %p dots %s marker %s fingering %s",
this, qPrintable(strDots), qPrintable(strMarker), qPrintable(strFingering));
/*
xml.tag("root-step", tpc2stepName(rootTpc));
int alter = tpc2alter(rootTpc);
if (alter)
xml.tag("root-alter", alter);
*/
xml.etag();
}

#ifdef SCRIPT_INTERFACE
Expand Down
74 changes: 74 additions & 0 deletions share/instruments/instruments.xml
View file
Expand Up @@ -2868,6 +2868,23 @@
<program value="59"/>
</Channel>
</Instrument>
<Instrument id="c-cornet">
<longName>C Cornet</longName>
<shortName>C Cnt.</shortName>
<description>C Cornet</description>
<musicXMLid>brass.cornet</musicXMLid>
<clef>G</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>54-82</aPitchRange>
<pPitchRange>54-85</pPitchRange>
<Channel>
<program value="56"/>
</Channel>
<Channel name="mute">
<program value="59"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="bb-cornet">
<longName>B♭ Cornet</longName>
<shortName>B♭ Cnt.</shortName>
Expand All @@ -2888,6 +2905,25 @@
<genre>common</genre>
<genre>jazz</genre>
</Instrument>
<Instrument id="a-cornet">
<longName>A Cornet</longName>
<shortName>A Cnt.</shortName>
<description>A Cornet</description>
<musicXMLid>brass.cornet</musicXMLid>
<clef>G</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>51-79</aPitchRange>
<pPitchRange>51-84</pPitchRange>
<transposeDiatonic>-2</transposeDiatonic>
<transposeChromatic>-3</transposeChromatic>
<Channel>
<program value="56"/>
</Channel>
<Channel name="mute">
<program value="59"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="saxhorn">
<longName>Saxhorn</longName>
<shortName>Saxhorn</shortName>
Expand Down Expand Up @@ -3083,6 +3119,25 @@
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="e-trumpet">
<longName>E Trumpet</longName>
<shortName>E Tpt.</shortName>
<description>E Trumpet</description>
<musicXMLid>brass.trumpet</musicXMLid>
<clef>G</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>58-85</aPitchRange>
<pPitchRange>58-88</pPitchRange>
<transposeDiatonic>3</transposeDiatonic>
<transposeChromatic>4</transposeChromatic>
<Channel>
<program value="56"/>
</Channel>
<Channel name="mute">
<program value="59"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="eb-trumpet">
<longName>E♭ Trumpet</longName>
<shortName>E♭ Tpt.</shortName>
Expand Down Expand Up @@ -3159,6 +3214,25 @@
<genre>common</genre>
<genre>orchestra</genre>
</Instrument>
<Instrument id="a-trumpet">
<longName>A Trumpet</longName>
<shortName>A Tpt.</shortName>
<description>A Trumpet</description>
<musicXMLid>brass.trumpet</musicXMLid>
<clef>G</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>51-79</aPitchRange>
<pPitchRange>51-84</pPitchRange>
<transposeDiatonic>-2</transposeDiatonic>
<transposeChromatic>-3</transposeChromatic>
<Channel>
<program value="56"/>
</Channel>
<Channel name="mute">
<program value="59"/>
</Channel>
<genre>orchestra</genre>
</Instrument>
<Instrument id="pocket-trumpet">
<longName>Pocket Trumpet</longName>
<shortName>Pkt. Tpt.</shortName>
Expand Down
16 changes: 16 additions & 0 deletions share/instruments/instrumentsxml.h
View file
Expand Up @@ -589,10 +589,18 @@ QT_TRANSLATE_NOOP("InstrumentsXML", "E♭ Cornet"),
//: E♭ Cornet
QT_TRANSLATE_NOOP("InstrumentsXML", "E♭ Cnt."),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "C Cornet"),
//: C Cornet
QT_TRANSLATE_NOOP("InstrumentsXML", "C Cnt."),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "B♭ Cornet"),
//: B♭ Cornet
QT_TRANSLATE_NOOP("InstrumentsXML", "B♭ Cnt."),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "A Cornet"),
//: A Cornet
QT_TRANSLATE_NOOP("InstrumentsXML", "A Cnt."),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Saxhorn"),
//: Saxhorn
QT_TRANSLATE_NOOP("InstrumentsXML", "Saxhorn"),
Expand Down Expand Up @@ -635,6 +643,10 @@ QT_TRANSLATE_NOOP("InstrumentsXML", "F Trumpet"),
//: F Trumpet
QT_TRANSLATE_NOOP("InstrumentsXML", "F Tpt."),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "E Trumpet"),
//: E Trumpet
QT_TRANSLATE_NOOP("InstrumentsXML", "E Tpt."),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "E♭ Trumpet"),
//: E♭ Trumpet
QT_TRANSLATE_NOOP("InstrumentsXML", "E♭ Tpt."),
Expand All @@ -651,6 +663,10 @@ QT_TRANSLATE_NOOP("InstrumentsXML", "B♭ Trumpet"),
//: B♭ Trumpet
QT_TRANSLATE_NOOP("InstrumentsXML", "B♭ Tpt."),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "A Trumpet"),
//: A Trumpet
QT_TRANSLATE_NOOP("InstrumentsXML", "A Tpt."),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Pocket Trumpet"),
//: Pocket Trumpet
QT_TRANSLATE_NOOP("InstrumentsXML", "Pkt. Tpt."),
Expand Down

0 comments on commit c4c6b5d

Please sign in to comment.