Skip to content

Commit b25a49f

Browse files
Recognize dim. as diminished chord.
Backport of musescore#32787 and fix a clazy warning Co-Authored-By: David Stephen Grant <8159281+davidstephengrant@users.noreply.github.com>
1 parent 24f45a7 commit b25a49f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libmscore/chordlist.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ void ParsedChord::configure(const ChordList* cl)
452452
// TODO: allow this to be parameterized via chord list
453453
major << "ma" << "maj" << "major" << "t" << "^";
454454
minor << "mi" << "min" << "minor" << "-" << "=";
455-
diminished << "dim" << "o";
455+
diminished << "dim" << "dim." << "o";
456456
augmented << "aug" << "+";
457457
lower << "b" << "-" << "dim";
458458
raise << "#" << "+" << "aug";
@@ -625,8 +625,8 @@ bool ParsedChord::parse(const QString& s, const ChordList* cl, bool syntaxOnly,
625625
firstLeadingToken = _tokenList.size();
626626
while (i < len && leading.contains(s[i]))
627627
addToken(QString(s[i++]),ChordTokenClass::EXTENSION);
628-
#endif
629628
lastLeadingToken = _tokenList.size();
629+
#endif
630630
// get extension - up to first non-digit other than comma or slash
631631
for (tok1 = ""; i < len; ++i) {
632632
if (!s[i].isDigit() && s[i] != ',' && s[i] != '/')

0 commit comments

Comments
 (0)