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

WIP Backport of musescore#9805
Jojo-Schmitz · Nov 21, 2021 · 53508eb · 53508eb
1 parent 16e6de2
commit 53508eb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/libmscore/note.cpp b/libmscore/note.cpp
@@ -136,8 +136,10 @@ static const SymId noteHeads[2][int(NoteHead::Group::HEAD_GROUPS) - 1][int(NoteH
       { 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,               SymId::noteheadDoubleWhole  },
@@ -206,8 +208,10 @@ static const SymId noteHeads[2][int(NoteHead::Group::HEAD_GROUPS) - 1][int(NoteH
       { 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 }
    }
 };
 
@@ -301,6 +305,11 @@ static NoteHeadName noteHeadGroupNames[] = {
       {"g-flat-name",  QT_TRANSLATE_NOOP("noteheadnames",  "G♭ (Name)") },
       {"h-name",       QT_TRANSLATE_NOOP("noteheadnames",  "H (Name)") },
       {"h-sharp-name", QT_TRANSLATE_NOOP("noteheadnames",  "H♯ (Name)") },
+
+      // Swiss rudiments
+      {"swiss-rudiments-flam",   QT_TRANSLATE_NOOP("noteheadnames", "Swiss Rudiments Flam")   },
+      {"swiss-rudiments-double", QT_TRANSLATE_NOOP("noteheadnames", "Swiss Rudiments Doublé") },
+
       {"custom",       QT_TRANSLATE_NOOP("noteheadnames",  "Custom") }
       };
 

diff --git a/libmscore/note.h b/libmscore/note.h
@@ -138,6 +138,9 @@ class NoteHead final : public Symbol {
             HEAD_H,
             HEAD_H_SHARP,
 
+            HEAD_SWISS_RUDIMENTS_FLAM,
+            HEAD_SWISS_RUDIMENTS_DOUBLE,
+
             HEAD_CUSTOM,
             HEAD_GROUPS,
             HEAD_INVALID = -1

diff --git a/mscore/editdrumset.cpp b/mscore/editdrumset.cpp
@@ -59,6 +59,8 @@ NoteHead::Group noteHeadNames[] = {
       NoteHead::Group::HEAD_FA,
       NoteHead::Group::HEAD_LA,
       NoteHead::Group::HEAD_TI,
+      NoteHead::Group::HEAD_SWISS_RUDIMENTS_FLAM,
+      NoteHead::Group::HEAD_SWISS_RUDIMENTS_DOUBLE,
       NoteHead::Group::HEAD_CUSTOM
       };
 
@@ -172,7 +174,11 @@ EditDrumset::EditDrumset(const Drumset* ds, QWidget* parent)
             "noteheadLargeArrowUpBlack",
             "noteheadLargeArrowUpHalf",
             "noteheadLargeArrowUpWhole",
-            "noteheadLargeArrowUpDoubleWhole"
+            "noteheadLargeArrowUpDoubleWhole",
+            "swissRudimentsNoteheadBlackFlam",
+            "swissRudimentsNoteheadHalfFlam",
+            "swissRudimentsNoteheadBlackDouble",
+            "swissRudimentsNoteheadHalfDouble"
       };
 
       int w = quarterCmb->iconSize().width()  * qApp->devicePixelRatio();