diff --git a/libmscore/accidental.cpp b/libmscore/accidental.cpp index 71ae4137446e0..0361c8c6ca949 100644 --- a/libmscore/accidental.cpp +++ b/libmscore/accidental.cpp @@ -58,6 +58,8 @@ static Acc accList[] = { Acc(AccidentalVal::NATURAL, 150, SymId::accidentalThreeQuarterTonesSharpArrowDown), // SHARP2_ARROW_DOWN Acc(AccidentalVal::NATURAL, -250, SymId::accidentalThreeQuarterTonesFlatArrowUp), // FLAT2_ARROW_UP Acc(AccidentalVal::NATURAL, -150, SymId::accidentalFiveQuarterTonesFlatArrowDown), // FLAT2_ARROW_DOWN + Acc(AccidentalVal::NATURAL, -50, SymId::accidentalArrowDown), + Acc(AccidentalVal::NATURAL, 50, SymId::accidentalArrowUp), // Stein-Zimmermann Acc(AccidentalVal::NATURAL, -50, SymId::accidentalQuarterToneFlatStein), // MIRRORED_FLAT @@ -125,6 +127,20 @@ static Acc accList[] = { Acc(AccidentalVal::NATURAL, 0, SymId::accidentalQuarterFlatEqualTempered), Acc(AccidentalVal::NATURAL, 0, SymId::accidentalQuarterSharpEqualTempered), + Acc(AccidentalVal::NATURAL, -6.8, SymId::accidentalCombiningLower17Schisma), + Acc(AccidentalVal::NATURAL, 6.8, SymId::accidentalCombiningRaise17Schisma), + Acc(AccidentalVal::NATURAL, -3.4, SymId::accidentalCombiningLower19Schisma), + Acc(AccidentalVal::NATURAL, 3.4, SymId::accidentalCombiningRaise19Schisma), + Acc(AccidentalVal::NATURAL,-16.5, SymId::accidentalCombiningLower23Limit29LimitComma), + Acc(AccidentalVal::NATURAL, 16.5, SymId::accidentalCombiningRaise23Limit29LimitComma), + Acc(AccidentalVal::NATURAL, -1.7, SymId::accidentalCombiningLower31Schisma), + Acc(AccidentalVal::NATURAL, 1.7, SymId::accidentalCombiningRaise31Schisma), + Acc(AccidentalVal::NATURAL,-10.9, SymId::accidentalCombiningLower53LimitComma), + Acc(AccidentalVal::NATURAL, 10.9, SymId::accidentalCombiningRaise53LimitComma), + //Acc(AccidentalVal::NATURAL, 0, SymId::accidentalEnharmonicAlmostEqualTo), + //Acc(AccidentalVal::NATURAL, 0, SymId::accidentalEnharmonicEquals), + //Acc(AccidentalVal::NATURAL, 0, SymId::accidentalEnharmonicTilde), + // Persian Acc(AccidentalVal::NATURAL, 33, SymId::accidentalSori), // SORI Acc(AccidentalVal::NATURAL, -67, SymId::accidentalKoron), // KORON diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp index dc8c1aeb225cc..53fc9a0608835 100644 --- a/libmscore/sym.cpp +++ b/libmscore/sym.cpp @@ -2968,8 +2968,8 @@ const std::array Sym::symUserNames = { { "3-comma sharp", "4-comma flat", "5-comma sharp", - "Arrow down (lower by one quarter-tone)", - "Arrow up (raise by one quarter-tone)", + 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)"), "Bakiye (sharp)", "Accidental bracket, left", @@ -2979,17 +2979,17 @@ const std::array Sym::symUserNames = { { //QT_TRANSLATE_NOOP("symUserNames", "B\u00fcy\u00fck m\u00fccenneb (sharp)"), QT_TRANSLATE_NOOP("symUserNames", "B\u00fcy\u00fck mücenneb (sharp)"), "Combining close curly brace", - "Combining lower by one 17-limit schisma", - "Combining lower by one 19-limit schisma", - "Combining lower by one 23-limit comma or 29-limit comma", - "Combining lower by one 31-limit schisma", - "Combining lower by one 53-limit comma", + QT_TRANSLATE_NOOP("symUserNames", "Combining lower by one 17-limit schisma"), + QT_TRANSLATE_NOOP("symUserNames", "Combining lower by one 19-limit schisma"), + QT_TRANSLATE_NOOP("symUserNames", "Combining lower by one 23-limit comma or 29-limit comma"), + QT_TRANSLATE_NOOP("symUserNames", "Combining lower by one 31-limit schisma"), + QT_TRANSLATE_NOOP("symUserNames", "Combining lower by one 53-limit comma"), "Combining open curly brace", - "Combining raise by one 17-limit schisma", - "Combining raise by one 19-limit schisma", - "Combining raise by one 23-limit comma or 29-limit comma", - "Combining raise by one 31-limit schisma", - "Combining raise by one 53-limit comma", + QT_TRANSLATE_NOOP("symUserNames", "Combining raise by one 17-limit schisma)"), + QT_TRANSLATE_NOOP("symUserNames", "Combining raise by one 19-limit schisma)"), + QT_TRANSLATE_NOOP("symUserNames", "Combining raise by one 23-limit comma or 29-limit comma"), + QT_TRANSLATE_NOOP("symUserNames", "Combining raise by one 31-limit schisma"), + QT_TRANSLATE_NOOP("symUserNames", "Combining raise by one 53-limit comma"), "Syntonic/Didymus comma (80:81) down (Bosanquet)", "Syntonic/Didymus comma (80:81) up (Bosanquet)", QT_TRANSLATE_NOOP("symUserNames", "Double flat"), diff --git a/libmscore/types.h b/libmscore/types.h index 9ce0be7841fae..89d1db40a2a80 100644 --- a/libmscore/types.h +++ b/libmscore/types.h @@ -153,7 +153,7 @@ inline uint qHash(const ElementType& key) //--------------------------------------------------------- // AccidentalType //--------------------------------------------------------- -// NOTE: keep this in sync with with accList array +// NOTE: keep this in sync with with accList array in accidentals.cpp enum class AccidentalType : char { ///.\{ @@ -180,6 +180,8 @@ enum class AccidentalType : char { SHARP2_ARROW_DOWN, FLAT2_ARROW_UP, FLAT2_ARROW_DOWN, + ARROW_DOWN, + ARROW_UP, // Stein-Zimmermann MIRRORED_FLAT, @@ -247,6 +249,20 @@ enum class AccidentalType : char { QUARTER_FLAT_EQUAL_TEMPERED, QUARTER_SHARP_EQUAL_TEMPERED, + FLAT_17, + SHARP_17, + FLAT_19, + SHARP_19, + FLAT_23, + SHARP_23, + FLAT_31, + SHARP_31, + FLAT_53, + SHARP_53, + //EQUALS_ALMOST, + //EQUALS, + //TILDE, + // Persian SORI, KORON,