LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #301387: add Wyschnegradsky accidentals + collect_artifacts

Browse source
This commit is contained in:
Joachim Schmitz 2020-02-20 13:35:19 +01:00
parent 6631fee136
commit 58608ae092
3 changed files with 72 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libmscore/accidental.cpp
View file

@ -33,7 +33,7 @@ struct Acc {
Acc(AccidentalVal o, int o2, SymId s) : offset(o), centOffset(o2), sym(s) {}
};
// NOTE: keep this in sync with with AccidentalType enum, watch out for isMicrotonal()
// NOTE: keep this in sync with with AccidentalType enum in types.h, watch out for isMicrotonal()
static Acc accList[] = {
Acc(AccidentalVal::NATURAL, 0, SymId::noSym), // NONE
Acc(AccidentalVal::FLAT, 0, SymId::accidentalFlat), // FLAT
@ -128,6 +128,30 @@ static Acc accList[] = {
// Persian
Acc(AccidentalVal::NATURAL, 33, SymId::accidentalSori), // SORI
Acc(AccidentalVal::NATURAL, -67, SymId::accidentalKoron), // KORON
// Wyschnegradsky
Acc(AccidentalVal::NATURAL, -167, SymId::accidentalWyschnegradsky10TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 167, SymId::accidentalWyschnegradsky10TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -183, SymId::accidentalWyschnegradsky11TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 183, SymId::accidentalWyschnegradsky11TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -17, SymId::accidentalWyschnegradsky1TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 17, SymId::accidentalWyschnegradsky1TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -33, SymId::accidentalWyschnegradsky2TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 33, SymId::accidentalWyschnegradsky2TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -50, SymId::accidentalWyschnegradsky3TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 50, SymId::accidentalWyschnegradsky3TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -67, SymId::accidentalWyschnegradsky4TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 67, SymId::accidentalWyschnegradsky4TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -83, SymId::accidentalWyschnegradsky5TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 83, SymId::accidentalWyschnegradsky5TwelfthsSharp),
Acc(AccidentalVal::FLAT, 0, SymId::accidentalWyschnegradsky6TwelfthsFlat),
Acc(AccidentalVal::SHARP, 0, SymId::accidentalWyschnegradsky6TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -116, SymId::accidentalWyschnegradsky7TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 116, SymId::accidentalWyschnegradsky7TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -133, SymId::accidentalWyschnegradsky8TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 133, SymId::accidentalWyschnegradsky8TwelfthsSharp),
Acc(AccidentalVal::NATURAL, -150, SymId::accidentalWyschnegradsky9TwelfthsFlat),
Acc(AccidentalVal::NATURAL, 150, SymId::accidentalWyschnegradsky9TwelfthsSharp),
};
//---------------------------------------------------------

44
libmscore/sym.cpp
View file

@ -3149,28 +3149,28 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Two-third-tones sharp (Ferneyhough)",
"Wilson minus (5 comma down)",
"Wilson plus (5 comma up)",
"5/6 tone flat",
"5/6 tone sharp",
"11/12 tone flat",
"11/12 tone sharp",
"1/12 tone flat",
"1/12 tone sharp",
"1/6 tone flat",
"1/6 tone sharp",
"1/4 tone flat",
"1/4 tone sharp",
"1/3 tone flat",
"1/3 tone sharp",
"5/12 tone flat",
"5/12 tone sharp",
"1/2 tone flat",
"1/2 tone sharp",
"7/12 tone flat",
"7/12 tone sharp",
"2/3 tone flat",
"2/3 tone sharp",
"3/4 tone flat",
"3/4 tone sharp",
QT_TRANSLATE_NOOP("symUserNames", "5/6 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "5/6 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "11/12 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "11/12 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/12 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/12 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/6 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/6 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/4 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/4 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/3 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/3 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "5/12 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "5/12 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/2 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "1/2 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "7/12 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "7/12 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "2/3 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "2/3 tone sharp (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "3/4 tone flat (Wyschnegradsky)"),
QT_TRANSLATE_NOOP("symUserNames", "3/4 tone sharp (Wyschnegradsky)"),
"One-third-tone sharp (Xenakis)",
"Two-third-tones sharp (Xenakis)",
"Choralmelodie (Berg)",

25
libmscore/types.h
View file

@ -244,6 +244,31 @@ enum class AccidentalType : char {
// Persian
SORI,
KORON,
// Wyschnegradsky
TEN_TWELFTH_FLAT,
TEN_TWELFTH_SHARP,
ELEVEN_TWELFTH_FLAT,
ELEVEN_TWELFTH_SHARP,
ONE_TWELFTH_FLAT,
ONE_TWELFTH_SHARP,
TWO_TWELFTH_FLAT,
TWO_TWELFTH_SHARP,
THREE_TWELFTH_FLAT,
THREE_TWELFTH_SHARP,
FOUR_TWELFTH_FLAT,
FOUR_TWELFTH_SHARP,
FIVE_TWELFTH_FLAT,
FIVE_TWELFTH_SHARP,
SIX_TWELFTH_FLAT,
SIX_TWELFTH_SHARP,
SEVEN_TWELFTH_FLAT,
SEVEN_TWELFTH_SHARP,
EIGHT_TWELFTH_FLAT,
EIGHT_TWELFTH_SHARP,
NINE_TWELFTH_FLAT,
NINE_TWELFTH_SHARP,
END
///\}
};