From 4d10066e0439415c6c1ad83e9095f455415727fb Mon Sep 17 00:00:00 2001
From: Pedro Acebes <pedroantonio.acebesbayon@gmail.com>
Date: Mon, 8 Jun 2026 20:06:58 +0200
Subject: [PATCH] Fix #24075 new members of the castilian dulzaina instrument
 pitched in different key: F and G

---
 share/instruments/instruments.xml             | 44 ++++++++++++++++++-
 share/instruments/instrumentsxml.h            | 22 ++++++++++
 .../mapping/windssetupdataresolver.cpp        |  2 +
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml
index 9cc0cdeff730d..ff9fe9e254676 100644
--- a/share/instruments/instruments.xml
+++ b/share/instruments/instruments.xml
@@ -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>
@@ -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>
@@ -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>
diff --git a/share/instruments/instrumentsxml.h b/share/instruments/instrumentsxml.h
index c86c01cafe1ba..66f7b833149c8 100644
--- a/share/instruments/instrumentsxml.h
+++ b/share/instruments/instrumentsxml.h
@@ -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
@@ -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
diff --git a/src/engraving/playback/mapping/windssetupdataresolver.cpp b/src/engraving/playback/mapping/windssetupdataresolver.cpp
index 95852dd0ccbdd..c297011863d33 100644
--- a/src/engraving/playback/mapping/windssetupdataresolver.cpp
+++ b/src/engraving/playback/mapping/windssetupdataresolver.cpp
@@ -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 } },