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

Add more accidentals (master) #69

Closed
wants to merge 2 commits into from
Closed

Add more accidentals (master) #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58154c6
add Gould arrow down/up accidentals
Jojo-Schmitz Jun 8, 2020
0d1eb2c
add more Extended Helmholtz-Ellis accidentals
Jojo-Schmitz Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions libmscore/accidental.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions libmscore/sym.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2968,8 +2968,8 @@ const std::array<const char*, int(SymId::lastSym) + 1> 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",
Expand All @@ -2979,17 +2979,17 @@ const std::array<const char*, int(SymId::lastSym) + 1> 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"),
Expand Down
18 changes: 17 additions & 1 deletion libmscore/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
///.\{
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down