Manually merged musescore#6460 to master

iveshenry18 · Sep 1, 2020 · 663b393 · 663b393
1 parent d594f0e
commit 663b393
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/libmscore/chordlist.cpp b/libmscore/chordlist.cpp
@@ -927,6 +927,17 @@ bool ParsedChord::parse(const QString& s, const ChordList* cl, bool syntaxOnly,
                 tok1L = "#";
                 tok2L = "5";
             }
+        } else if (diminished.contains(tok1)) {
+            _quality = "diminished";
+            if (!syntaxOnly) {
+                _xmlKind = "diminished";
+                _xmlText = _extension + tok1;
+                chord -= 4;
+                chord += 3;
+                chord -= 7;
+                chord += 6;
+            }
+            tok1L = "";
         } else if ((lower.contains(tok1L) || raise.contains(tok1L)) && tok2L == "") {
             // trailing alteration - treat as applying to extension (and convert to modifier)
             // this handles C5b, C9#, etc
@@ -1141,6 +1152,8 @@ bool ParsedChord::parse(const QString& s, const ChordList* cl, bool syntaxOnly,
             } else if (raise.contains(tok1L)) {
                 tok1L = "#";
                 alter = true;
+            } else if (tok1L == "") {
+                // token was already handled fully
             } else {
                 _understandable = false;
                 if (s.startsWith(tok1)) {