Fix #321771: Adding new SMuFL glyphs to MuseScore notehead library

musescore · Aug 1, 2022 · fe1c668 · fe1c668
1 parent f1a7e18
commit fe1c668
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/src/engraving/libmscore/note.cpp b/src/engraving/libmscore/note.cpp
@@ -204,7 +204,10 @@ static const SymId noteHeads[2][int(NoteHeadGroup::HEAD_GROUPS) - 1][int(NoteHea
         { SymId::noteGWhole,       SymId::noteGHalf,       SymId::noteGBlack,       SymId::noSym },
         { SymId::noteGFlatWhole,   SymId::noteGFlatHalf,   SymId::noteGFlatBlack,   SymId::noSym },
         { SymId::noteHWhole,       SymId::noteHHalf,       SymId::noteHBlack,       SymId::noSym },
-        { SymId::noteHSharpWhole,  SymId::noteHSharpHalf,  SymId::noteHSharpBlack,  SymId::noSym }
+        { SymId::noteHSharpWhole,  SymId::noteHSharpHalf,  SymId::noteHSharpBlack,  SymId::noSym },
+
+        { SymId::noSym, SymId::swissRudimentsNoteheadHalfFlam,   SymId::swissRudimentsNoteheadBlackFlam,   SymId::noSym },
+        { SymId::noSym, SymId::swissRudimentsNoteheadHalfDouble, SymId::swissRudimentsNoteheadBlackDouble, SymId::noSym }
     },
     {    // up stem
         { SymId::noteheadWhole,               SymId::noteheadHalf,                SymId::noteheadBlack,
@@ -316,7 +319,10 @@ static const SymId noteHeads[2][int(NoteHeadGroup::HEAD_GROUPS) - 1][int(NoteHea
         { SymId::noteGWhole,       SymId::noteGHalf,       SymId::noteGBlack,       SymId::noSym },
         { SymId::noteGFlatWhole,   SymId::noteGFlatHalf,   SymId::noteGFlatBlack,   SymId::noSym },
         { SymId::noteHWhole,       SymId::noteHHalf,       SymId::noteHBlack,       SymId::noSym },
-        { SymId::noteHSharpWhole,  SymId::noteHSharpHalf,  SymId::noteHSharpBlack,  SymId::noSym }
+        { SymId::noteHSharpWhole,  SymId::noteHSharpHalf,  SymId::noteHSharpBlack,  SymId::noSym },
+
+        { SymId::noSym, SymId::swissRudimentsNoteheadHalfFlam,   SymId::swissRudimentsNoteheadBlackFlam,   SymId::noSym },
+        { SymId::noSym, SymId::swissRudimentsNoteheadHalfDouble, SymId::swissRudimentsNoteheadBlackDouble, SymId::noSym }
     }
 };
 

diff --git a/src/engraving/types/types.h b/src/engraving/types/types.h
@@ -468,6 +468,9 @@ enum class NoteHeadGroup : signed char {
     HEAD_H,
     HEAD_H_SHARP,
 
+    HEAD_SWISS_RUDIMENTS_FLAM,
+    HEAD_SWISS_RUDIMENTS_DOUBLE,
+
     HEAD_CUSTOM,
     HEAD_GROUPS,
     HEAD_INVALID = -1

diff --git a/src/engraving/types/typesconv.cpp b/src/engraving/types/typesconv.cpp
@@ -480,6 +480,12 @@ static const std::vector<Item<NoteHeadGroup> > NOTEHEAD_GROUPS = {
     { NoteHeadGroup::HEAD_H,            "h-name",       TranslatableString("engraving/noteheadgroup",  "H (Name)") },
     { NoteHeadGroup::HEAD_H_SHARP,      "h-sharp-name", TranslatableString("engraving/noteheadgroup",  "H♯ (Name)") },
 
+    // Swiss rudiments
+    { NoteHeadGroup::HEAD_SWISS_RUDIMENTS_FLAM,   "swiss-rudiments-flam",   TranslatableString("engraving/noteheadgroup",
+                                                                                               "Swiss Rudiments Flam") },
+    { NoteHeadGroup::HEAD_SWISS_RUDIMENTS_DOUBLE, "swiss-rudiments-double", TranslatableString("engraving/noteheadgroup",
+                                                                                               "Swiss Rudiments Doublé") },
+
     { NoteHeadGroup::HEAD_CUSTOM,       "custom",       TranslatableString("engraving",  "Custom") }
 };
 

diff --git a/src/palette/view/widgets/editdrumsetdialog.cpp b/src/palette/view/widgets/editdrumsetdialog.cpp
@@ -97,6 +97,8 @@ NoteHeadGroup noteHeadNames[] = {
     NoteHeadGroup::HEAD_FA,
     NoteHeadGroup::HEAD_LA,
     NoteHeadGroup::HEAD_TI,
+    NoteHeadGroup::HEAD_SWISS_RUDIMENTS_FLAM,
+    NoteHeadGroup::HEAD_SWISS_RUDIMENTS_DOUBLE,
     NoteHeadGroup::HEAD_CUSTOM
 };
 
@@ -185,7 +187,8 @@ EditDrumsetDialog::EditDrumsetDialog(QWidget* parent)
     pitchList->setColumnWidth(2, 30);
 
     QStringList validNoteheadRanges
-        = { "Noteheads", "Round and square noteheads", "Slash noteheads", "Shape note noteheads", "Shape note noteheads supplement" };
+        = { "Noteheads", "Round and square noteheads", "Slash noteheads", "Shape note noteheads", "Shape note noteheads supplement",
+            "Techniques noteheads" };
     QSet<QString> excludeSym = { "noteheadParenthesisLeft", "noteheadParenthesisRight", "noteheadParenthesis", "noteheadNull" };
     QStringList primaryNoteheads = {
         "noteheadXOrnate",