Skip to content

Commit 3a98ba9

Browse files
Jojo-Schmitzvpereverzev
Jojo-Schmitz
authored and
vpereverzev
committed
fix #153016: add mountain dulcimer incl. a tab preset + collect_artifacts
1 parent 1dd0254 commit 3a98ba9

File tree

4 files changed

+104
-1
lines changed

4 files changed

+104
-1
lines changed

‎libmscore/stafftype.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,6 +1357,7 @@ void StaffType::initStaffTypes()
13571357
StaffType(StaffGroup::TAB, "tab5StrFull", QObject::tr("Tab. 5-str. full"), 5, 0, 1.5, true, true, false, false, "MuseScore Tab Modern", 15, 0, false, "MuseScore Tab Serif", 9, 0, TablatureSymbolRepeat::NEVER, false, TablatureMinimStyle::SLASHED,true, true, true, true, false, false, true, true),
13581358
StaffType(StaffGroup::TAB, "tabUkulele", QObject::tr("Tab. ukulele"), 4, 0, 1.5, true, true, false, false, "MuseScore Tab Modern", 15, 0, false, "MuseScore Tab Serif", 9, 0, TablatureSymbolRepeat::NEVER, false, TablatureMinimStyle::SHORTER,true, true, true, false, false, false, true, true),
13591359
StaffType(StaffGroup::TAB, "tabBalajka", QObject::tr("Tab. balalaika"), 3, 0, 1.5, true, true, false, false, "MuseScore Tab Modern", 15, 0, false, "MuseScore Tab Serif", 9, 0, TablatureSymbolRepeat::NEVER, false, TablatureMinimStyle::SHORTER,true, true, true, false, false, false, true, true),
1360+
StaffType(StaffGroup::TAB, "tabDulcimer", QObject::tr("Tab. dulcimer"), 3, 0, 1.5, true, true, false, false, "MuseScore Tab Modern", 15, 0, false, "MuseScore Tab Serif", 9, 0, TablatureSymbolRepeat::NEVER, false, TablatureMinimStyle::SHORTER,true, true, true, false, true, false, true, true),
13601361
// StaffType(StaffGroup::TAB, "tab6StrItalian",QObject::tr("Tab. 6-str. Italian"),6, 2, 1.5, false, true, true, true, "MuseScore Tab Italian",15, 0, true, "MuseScore Tab Renaiss",10, 0, TablatureSymbolRepeat::NEVER, true, TablatureMinimStyle::NONE, true, true, false, false, true, false, true, false),
13611362
// StaffType(StaffGroup::TAB, "tab6StrFrench", QObject::tr("Tab. 6-str. French"), 6, 2, 1.5, false, true, true, true, "MuseScore Tab French", 15, 0, true, "MuseScore Tab Renaiss",10, 0, TablatureSymbolRepeat::NEVER, true, TablatureMinimStyle::NONE, false, false, false, false, false, false, false,false)
13621363
StaffType(StaffGroup::TAB, "tab6StrItalian",QObject::tr("Tab. 6-str. Italian"),6, 0, 1.5, false, true, true, true, "MuseScore Tab Italian",15, 0, true, "MuseScore Tab Renaiss",10, 0, TablatureSymbolRepeat::NEVER, true, TablatureMinimStyle::NONE, true, true, false, false, true, false, true, false),

‎libmscore/stafftype.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ enum class StaffTypes : signed char {
159159
TAB_6SIMPLE, TAB_6COMMON, TAB_6FULL,
160160
TAB_4SIMPLE, TAB_4COMMON, TAB_4FULL,
161161
TAB_5SIMPLE, TAB_5COMMON, TAB_5FULL,
162-
TAB_UKULELE, TAB_BALALAJKA, TAB_ITALIAN, TAB_FRENCH,
162+
TAB_UKULELE, TAB_BALALAJKA, TAB_DULCIMER,
163+
TAB_ITALIAN, TAB_FRENCH,
163164
TAB_7COMMON, TAB_8COMMON,
164165
STAFF_TYPES,
165166
// some useful shorthands:

‎share/instruments/instruments.xml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10218,6 +10218,98 @@ Aeolus organ synthesizer, currently disabled -->
1021810218
</Channel>
1021910219
<genre>world</genre>
1022010220
</Instrument>
10221+
<Instrument id="mtn-dulcimer-std">
10222+
<longName>Mtn. Dulcimer</longName>
10223+
<shortName>Mtn. Dc.</shortName>
10224+
<description>Standard Mountain Dulcimer</description>
10225+
<musicXMLid>pluck.dulcimer</musicXMLid>
10226+
<StringData>
10227+
<frets>20</frets>
10228+
<string>50</string>
10229+
<string>57</string>
10230+
<string>62</string>
10231+
</StringData>
10232+
<clef>G</clef>
10233+
<barlineSpan>1</barlineSpan>
10234+
<aPitchRange>50-82</aPitchRange>
10235+
<pPitchRange>50-82</pPitchRange>
10236+
<singleNoteDynamics>0</singleNoteDynamics>
10237+
<Channel>
10238+
<program value="25"/> <!--Acoustic Guitar (steel)-->
10239+
</Channel>
10240+
<genre>world</genre>
10241+
</Instrument>
10242+
10243+
<Instrument id="mtn-dulcimer-std-chrom-tab">
10244+
<trackName>Mtn. Dulcimer (Tablature)</trackName>
10245+
<init>mtn-dulcimer-std</init>
10246+
<description>Mtn. Dulcimer (3-str. chromatic TAB)</description>
10247+
<stafftype staffTypePreset="tabDulcimer">tablature</stafftype>
10248+
<!-- <clef>TAB</clef> -->
10249+
<genre>world</genre>
10250+
</Instrument>
10251+
10252+
<Instrument id="mtn-dulcimer-baritone">
10253+
<longName>Mtn. Dulcimer - Baritone</longName>
10254+
<shortName>Bar. M.D.</shortName>
10255+
<description>Baritone Mountain Dulcimer</description>
10256+
<musicXMLid>pluck.dulcimer</musicXMLid>
10257+
<StringData>
10258+
<frets>20</frets>
10259+
<string>45</string>
10260+
<string>52</string>
10261+
<string>57</string>
10262+
</StringData>
10263+
<clef>G</clef>
10264+
<barlineSpan>1</barlineSpan>
10265+
<aPitchRange>45-77</aPitchRange>
10266+
<pPitchRange>45-77</pPitchRange>
10267+
<singleNoteDynamics>0</singleNoteDynamics>
10268+
<Channel>
10269+
<program value="25"/> <!--Acoustic Guitar (steel)-->
10270+
</Channel>
10271+
<genre>world</genre>
10272+
</Instrument>
10273+
10274+
<Instrument id="mtn-dulcimer-bartn-chrom-tab">
10275+
<trackName>Mtn. Dulcimer - Baritone (Tablature)</trackName>
10276+
<init>mtn-dulcimer-baritone</init>
10277+
<description>Baritone Mtn. Dulcimer (3-str. chromatic TAB)</description>
10278+
<stafftype staffTypePreset="tabDulcimer">tablature</stafftype>
10279+
<!-- <clef>TAB</clef> -->
10280+
<genre>world</genre>
10281+
</Instrument>
10282+
10283+
<Instrument id="mtn-dulcimer-bass">
10284+
<longName>Mtn. Dulcimer - Bass</longName>
10285+
<shortName>Bs. M.D.</shortName>
10286+
<description>Bass Mountain Dulcimer</description>
10287+
<musicXMLid>pluck.dulcimer</musicXMLid>
10288+
<StringData>
10289+
<frets>20</frets>
10290+
<string>38</string>
10291+
<string>45</string>
10292+
<string>50</string>
10293+
</StringData>
10294+
<clef>G8vb</clef>
10295+
<barlineSpan>1</barlineSpan>
10296+
<aPitchRange>38-70</aPitchRange>
10297+
<pPitchRange>38-70</pPitchRange>
10298+
<singleNoteDynamics>0</singleNoteDynamics>
10299+
<Channel>
10300+
<program value="25"/> <!--Acoustic Guitar (steel)-->
10301+
</Channel>
10302+
<genre>world</genre>
10303+
</Instrument>
10304+
10305+
<Instrument id="mtn-dulcimer-bass-chrom-tab">
10306+
<trackName>Mtn. Dulcimer - Bass (Tablature)</trackName>
10307+
<init>mtn-dulcimer-bass</init>
10308+
<description>Bass Mtn. Dulcimer (3-str. chromatic TAB)</description>
10309+
<stafftype staffTypePreset="tabDulcimer">tablature</stafftype>
10310+
<!-- <clef>TAB</clef> -->
10311+
<genre>world</genre>
10312+
</Instrument>
1022110313
<Instrument id="oud">
1022210314
<longName>Oud</longName>
1022310315
<shortName>O.</shortName>

‎share/instruments/instrumentsxml.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,6 +1287,15 @@ QT_TRANSLATE_NOOP("InstrumentsXML", "staccato"),
12871287
QT_TRANSLATE_NOOP("InstrumentsXML", "flageoletti"),
12881288
QT_TRANSLATE_NOOP("InstrumentsXML", "Koto"),
12891289
QT_TRANSLATE_NOOP3("InstrumentsXML", "Ko.", "Koto"),
1290+
QT_TRANSLATE_NOOP("InstrumentsXML", "Mtn. Dulcimer"),
1291+
QT_TRANSLATE_NOOP3("InstrumentsXML", "Mtn. Dc.", "Mtn. Dulcimer"),
1292+
QT_TRANSLATE_NOOP("InstrumentsXML", "Mtn. Dulcimer (Tablature)"),
1293+
QT_TRANSLATE_NOOP("InstrumentsXML", "Mtn. Dulcimer - Baritone"),
1294+
QT_TRANSLATE_NOOP3("InstrumentsXML", "Bar. M.D.", "Mtn. Dulcimer - Baritone"),
1295+
QT_TRANSLATE_NOOP("InstrumentsXML", "Mtn. Dulcimer - Baritone (Tablature)"),
1296+
QT_TRANSLATE_NOOP("InstrumentsXML", "Mtn. Dulcimer - Bass"),
1297+
QT_TRANSLATE_NOOP3("InstrumentsXML", "Bs. M.D.", "Mtn. Dulcimer - Bass"),
1298+
QT_TRANSLATE_NOOP("InstrumentsXML", "Mtn. Dulcimer - Bass (Tablature)"),
12901299
QT_TRANSLATE_NOOP("InstrumentsXML", "Oud"),
12911300
QT_TRANSLATE_NOOP3("InstrumentsXML", "O.", "Oud"),
12921301
QT_TRANSLATE_NOOP("InstrumentsXML", "Lute"),

0 commit comments

Comments
 (0)