Add some 7th chords with an added, altered 9th interval

[scherzo] / scherzo.c

diff --git a/scherzo.c b/scherzo.c
index c56e18b627ca3a4c3450c7c274852c853fcb6c5e..57d904442c640a87facd4905ce57bbd958b127e8 100644 (file)
--- a/scherzo.c
+++ b/scherzo.c
@@ -497,7 +497,7 @@ _chord_signature_matches (analyzed_note_t *notes,
                          int inversion,
                          score_pitch_t *root)
 {
-#define MAX_DEGREES 5
+#define MAX_DEGREES 6
     int relative_pitches[MAX_DEGREES];
     int i, root_index;
 
@@ -713,6 +713,15 @@ scherzo_analyze_chord (scherzo_t *scherzo)
      * after reducing each degree to an actual scale degree, (9 -> 2,
      * 11 -> 4, 13 -> 6) */
     struct { modified_degree_t degrees[5]; const char *name; } pentachords[] = {
+       /* Sixth plus 9 */
+       { {{1, 0}, {9,  0}, {3,  0}, {5,  0}, {6,  0}}, "6/9" },
+       { {{1, 0}, {9,  0}, {3,  0}, {5,  0}, {6,  0}}, "m6/9" },
+       /* Seventh plus altered 9 */
+       { {{1, 0}, {9, +1}, {3,  0}, {5,  0}, {7, -1}}, "7♯9" },
+       { {{1, 0}, {9, -1}, {3,  0}, {5,  0}, {7, -1}}, "7♭9" },
+       { {{1, 0}, {9, +1}, {3,  0}, {5, -1}, {7, -1}}, "7♭5♯9" },
+       { {{1, 0}, {9, -1}, {3,  0}, {5, -1}, {7, -1}}, "7♭5♭9" },
+       /* Ninth chords */
        { {{1, 0}, {9,  0}, {4,  0}, {5, +1}, {7,  0}}, "sus" SUP "+M9" PUS },
        { {{1, 0}, {9,  0}, {4,  0}, {5, +1}, {7, -1}}, "sus" SUP "+9" PUS },
        { {{1, 0}, {9,  0}, {4,  0}, {5,  0}, {7,  0}}, "sus" SUP "M9" PUS },
@@ -740,6 +749,17 @@ scherzo_analyze_chord (scherzo_t *scherzo)
        { {{1, 0}, {9, -1}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "♭9" PUS },
     };
 
+    struct { modified_degree_t degrees[6]; const char *name; } hexachords[] = {
+       { {{1, 0}, {9,  0}, {3,  0}, {11,  0}, {5, +1}, {7,  0}}, SUP "+M11" PUS },
+       { {{1, 0}, {9,  0}, {3,  0}, {11,  0}, {5, +1}, {7, -1}}, SUP "+11" PUS },
+       { {{1, 0}, {9,  0}, {3,  0}, {11,  0}, {5,  0}, {7,  0}}, "M11" },
+       { {{1, 0}, {9,  0}, {3,  0}, {11,  0}, {5,  0}, {7, -1}}, "11" },
+       { {{1, 0}, {9,  0}, {3, -1}, {11,  0}, {5,  0}, {7,  0}}, "m" SUP "M11" PUS },
+       { {{1, 0}, {9,  0}, {3, -1}, {11,  0}, {5,  0}, {7, -1}}, "m11" },
+       { {{1, 0}, {9, -1}, {3, -1}, {11,  0}, {5, -1}, {7, -1}}, "𝆩" SUP "11" PUS },
+       { {{1, 0}, {9, -1}, {3, -1}, {11, -1}, {5, -1}, {7, -2}}, "°" SUP "11" PUS }
+    };
+
     if (scherzo->chord) {
        score_remove_chord (scherzo->chord);
        scherzo->chord = NULL;
@@ -859,6 +879,17 @@ scherzo_analyze_chord (scherzo_t *scherzo)
                }
            }
            break;
+       case 6:
+           for (i = 0; i < ARRAY_SIZE (hexachords); i++) {
+               if (_chord_signature_matches (notes, num_notes,
+                                             hexachords[i].degrees, 6,
+                                             inversion, &root))
+               {
+                   chord_name = hexachords[i].name;
+                   goto CHORD_NAME_KNOWN;
+               }
+           }
+           break;
        }
     }
     CHORD_NAME_KNOWN: