Skip to content

Fix #24075 (second part): members of the castilian dulzaina instrument pitched in different key: F and G #33740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pacebes wants to merge 1 commit into
base: main
Choose a base branch
from
+66 −2
Open

Fix #24075 (second part): members of the castilian dulzaina instrument pitched in different key: F and G #33740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions share/instruments/instruments.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,6 +1537,26 @@
</Channel>
<genre>world</genre>
</Instrument>
<Instrument id="f-castilian-dulzaina">
<family>dulzainas</family>
<trackName>Castilian Dulzaina</trackName>
<longName>Castilian Dulzaina</longName>
<shortName>Cast. Dulz.</shortName>
<traitName type="transposition">F</traitName>
<description>Spanish double-reed folk instrument from the Castile region. In F.</description>
<musicXMLid>wind.reed.dulzaina</musicXMLid>
<clef>G</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>62-86</aPitchRange>
<pPitchRange>62-91</pPitchRange>
<transposeDiatonic>3</transposeDiatonic>
<transposeChromatic>5</transposeChromatic>
<Channel>
<!--MIDI: Bank 0, Prog 68; MS General: Oboe-->
<program value="68"/> <!--Oboe-->
</Channel>
<genre>world</genre>
</Instrument>
<Instrument id="fs-castilian-dulzaina">
<family>dulzainas</family>
<trackName>Castilian Dulzaina</trackName>
Expand All @@ -1547,8 +1567,8 @@
<musicXMLid>wind.reed.dulzaina</musicXMLid>
<clef>G</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>63-91</aPitchRange>
<pPitchRange>63-96</pPitchRange>
<aPitchRange>63-87</aPitchRange>
<pPitchRange>63-92</pPitchRange>
<transposeDiatonic>3</transposeDiatonic>
<transposeChromatic>6</transposeChromatic>
<Channel>
Expand All @@ -1557,6 +1577,26 @@
</Channel>
<genre>world</genre>
</Instrument>
<Instrument id="g-castilian-dulzaina">
<family>dulzainas</family>
<trackName>Castilian Dulzaina</trackName>
<longName>Castilian Dulzaina</longName>
<shortName>Cast. Dulz.</shortName>
<traitName type="transposition">G</traitName>
<description>Spanish double-reed folk instrument from the Castile region. In G.</description>
<musicXMLid>wind.reed.dulzaina</musicXMLid>
<clef>G</clef>
<barlineSpan>1</barlineSpan>
<aPitchRange>64-88</aPitchRange>
<pPitchRange>64-93</pPitchRange>
<transposeDiatonic>4</transposeDiatonic>
<transposeChromatic>7</transposeChromatic>
<Channel>
<!--MIDI: Bank 0, Prog 68; MS General: Oboe-->
<program value="68"/> <!--Oboe-->
</Channel>
<genre>world</genre>
</Instrument>
<Instrument id="piccolo-heckelphone">
<family>oboes</family>
<trackName>Piccolo Heckelphone</trackName>
Expand Down
22 changes: 22 additions & 0 deletions share/instruments/instrumentsxml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,17 @@ QT_TRANSLATE_NOOP3("engraving/instruments", "D Qn.", "d-quena shortName"),
//: traitName for Quena; tuning: D; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "D", "d-quena traitName"),

//: description for Castilian Dulzaina; transposition: F; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Spanish double-reed folk instrument from the Castile region. In F.", "f-castilian-dulzaina description"),
//: trackName for Castilian Dulzaina; transposition: F; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Castilian Dulzaina", "f-castilian-dulzaina trackName"),
//: longName for Castilian Dulzaina; transposition: F; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Castilian Dulzaina", "f-castilian-dulzaina longName"),
//: shortName for Castilian Dulzaina; transposition: F; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Cast. Dulz.", "f-castilian-dulzaina shortName"),
//: traitName for Castilian Dulzaina; transposition: F; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "F", "f-castilian-dulzaina traitName"),

//: description for Castilian Dulzaina; transposition: F♯; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Spanish double-reed folk instrument from the Castile region. In F♯.", "fs-castilian-dulzaina description"),
//: trackName for Castilian Dulzaina; transposition: F♯; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
Expand All @@ -826,6 +837,17 @@ QT_TRANSLATE_NOOP3("engraving/instruments", "Cast. Dulz.", "fs-castilian-dulzain
//: traitName for Castilian Dulzaina; transposition: F♯; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "F♯", "fs-castilian-dulzaina traitName"),

//: description for Castilian Dulzaina; transposition: G; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Spanish double-reed folk instrument from the Castile region. In G.", "g-castilian-dulzaina description"),
//: trackName for Castilian Dulzaina; transposition: G; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Castilian Dulzaina", "g-castilian-dulzaina trackName"),
//: longName for Castilian Dulzaina; transposition: G; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Castilian Dulzaina", "g-castilian-dulzaina longName"),
//: shortName for Castilian Dulzaina; transposition: G; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Cast. Dulz.", "g-castilian-dulzaina shortName"),
//: traitName for Castilian Dulzaina; transposition: G; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "G", "g-castilian-dulzaina traitName"),

//: description for Piccolo Heckelphone; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
QT_TRANSLATE_NOOP3("engraving/instruments", "Very rare variant of the heckelphone in F, sounding a fourth higher than the oboe.", "piccolo-heckelphone description"),
//: trackName for Piccolo Heckelphone; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
Expand Down
2 changes: 2 additions & 0 deletions src/engraving/playback/mapping/windssetupdataresolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ PlaybackSetupData WindsSetupDataResolver::doResolve(const Instrument* instrument
{ "f-quena", { SoundId::Quena, SoundCategory::Winds } },
{ "d-quena", { SoundId::Quena, SoundCategory::Winds } },

{ "f-castilian-dulzaina", { SoundId::Dulzaina, SoundCategory::Winds, { SoundSubCategory::Castilian } } },
{ "fs-castilian-dulzaina", { SoundId::Dulzaina, SoundCategory::Winds, { SoundSubCategory::Castilian } } },
{ "g-castilian-dulzaina", { SoundId::Dulzaina, SoundCategory::Winds, { SoundSubCategory::Castilian } } },

{ "piccolo-heckelphone", { SoundId::Heckelphone, SoundCategory::Winds } },
{ "heckelphone", { SoundId::Heckelphone, SoundCategory::Winds } },
Expand Down
Loading