Skip to content
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

Jump to bottom

[MU3] Fix #318837: Add Turkish folk music accidentals #7738

Merged
merged 1 commit into from
Mar 24, 2021
Merged

[MU3] Fix #318837: Add Turkish folk music accidentals #7738

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions fonttools/smufl2sym-in-trans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 11 additions & 0 deletions libmscore/accidental.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};

//---------------------------------------------------------
Expand Down
16 changes: 8 additions & 8 deletions libmscore/sym.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3173,14 +3173,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)"),
Expand Down
11 changes: 11 additions & 0 deletions libmscore/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,17 @@ enum class AccidentalType : unsigned char {
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
///\}
};
Expand Down