Fix #318837: Add Turkish folk music accidentals

musescore · Mar 16, 2021 · 0008847 · 0008847
1 parent d2a0f2e
commit 0008847
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/src/libmscore/accidental.cpp b/src/libmscore/accidental.cpp
@@ -196,6 +196,17 @@ static Acc accList[] = {
     Acc(AccidentalVal::NATURAL,  107.9, SymId::accSagittalSharp5v7kDown),
     Acc(AccidentalVal::NATURAL, -113.7, SymId::accSagittalFlat),
     Acc(AccidentalVal::NATURAL,  113.7, SymId::accSagittalSharp),
+
+    // Turkish folk music accidentals
+    Acc(AccidentalVal::NATURAL, -22.2, SymId::accidental1CommaFlat),
+    Acc(AccidentalVal::NATURAL,  22.2, SymId::accidental1CommaSharp),
+    Acc(AccidentalVal::NATURAL, -44.4, SymId::accidental2CommaFlat),
+    Acc(AccidentalVal::NATURAL,  44.4, SymId::accidental2CommaSharp),
+    Acc(AccidentalVal::NATURAL, -66.7, SymId::accidental3CommaFlat),
+    Acc(AccidentalVal::NATURAL,  66.7, SymId::accidental3CommaSharp),
+    Acc(AccidentalVal::NATURAL, -88.9, SymId::accidental4CommaFlat),
+    //Acc(AccidentalVal::NATURAL,  88.9, SymId::accidentalSharp),
+    Acc(AccidentalVal::NATURAL, 111.1, SymId::accidental5CommaSharp),
 };
 
 //---------------------------------------------------------

diff --git a/src/libmscore/symnames.cpp b/src/libmscore/symnames.cpp
@@ -3316,14 +3316,14 @@ const std::array<const char*, int(SymId::lastSym) + 1> Sym::symUserNames = { {
     QT_TRANSLATE_NOOP("symUserNames", "Combining ricochet for stem (4 tones)"),
     QT_TRANSLATE_NOOP("symUserNames", "Combining ricochet for stem (5 tones)"),
     QT_TRANSLATE_NOOP("symUserNames", "Combining ricochet for stem (6 tones)"),
-    "1-comma flat",
-    "1-comma sharp",
-    "2-comma flat",
-    "2-comma sharp",
-    "3-comma flat",
-    "3-comma sharp",
-    "4-comma flat",
-    "5-comma sharp",
+    QT_TRANSLATE_NOOP("symUserNames", "1-comma flat"),
+    QT_TRANSLATE_NOOP("symUserNames", "1-comma sharp"),
+    QT_TRANSLATE_NOOP("symUserNames", "2-comma flat"),
+    QT_TRANSLATE_NOOP("symUserNames", "2-comma sharp"),
+    QT_TRANSLATE_NOOP("symUserNames", "3-comma flat"),
+    QT_TRANSLATE_NOOP("symUserNames", "3-comma sharp"),
+    QT_TRANSLATE_NOOP("symUserNames", "4-comma flat"),
+    QT_TRANSLATE_NOOP("symUserNames", "5-comma sharp"),
     QT_TRANSLATE_NOOP("symUserNames", "Arrow down (lower by one quarter-tone)"),
     QT_TRANSLATE_NOOP("symUserNames", "Arrow up (raise by one quarter-tone)"),
     QT_TRANSLATE_NOOP("symUserNames", "Bakiye (flat)"),

diff --git a/src/libmscore/types.h b/src/libmscore/types.h
@@ -322,6 +322,17 @@ enum class AccidentalType {
     SAGITTAL_FLAT,
     SAGITTAL_SHARP,
 
+    // Turkish folk music
+    ONE_COMMA_FLAT,
+    ONE_COMMA_SHARP,
+    TWO_COMMA_FLAT,
+    TWO_COMMA_SHARP,
+    THREE_COMMA_FLAT,
+    THREE_COMMA_SHARP,
+    FOUR_COMMA_FLAT,
+    //FOUR_COMMA_SHARP,
+    FIVE_COMMA_SHARP,
+
     END
     ///\}
 };

diff --git a/tools/fonttools/smufl2sym-in-trans.json b/tools/fonttools/smufl2sym-in-trans.json
@@ -81,6 +81,14 @@
   "accdnRicochetStem4": null,
   "accdnRicochetStem5": null,
   "accdnRicochetStem6": null,
+  "accidental1CommaFlat": null,
+  "accidental1CommaSharp": null,
+  "accidental2CommaFlat": null,
+  "accidental2CommaSharp": null,
+  "accidental3CommaFlat": null,
+  "accidental3CommaSharp": null,
+  "accidental4CommaFlat": null,
+  "accidental5CommaSharp": null,
   "accidentalArrowDown": null,
   "accidentalArrowUp": null,
   "accidentalBakiyeFlat": null,