Add 11th chords

[scherzo] / scherzo.c

diff --git a/scherzo.c b/scherzo.c
index 522f369e420ccefa29e181a29a85616fb3d10ba7..ec34f1cd771d896dfddedc3b628d5cd4308e49c6 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;
 
@@ -720,11 +720,15 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 
        { {{1, 0}, {9,  0}, {3,  0}, {5, +1}, {7,  0}}, SUP "+M9" PUS },
        { {{1, 0}, {9,  0}, {3,  0}, {5, +1}, {7, -1}}, SUP "+9" PUS },
+
        { {{1, 0}, {9,  0}, {3,  0}, {5,  0}, {7,  0}}, "M9" },
        { {{1, 0}, {9,  0}, {3,  0}, {5,  0}, {7, -1}}, "9" },
        { {{1, 0}, {9,  0}, {3, -1}, {5,  0}, {7,  0}}, "m" SUP "M9" PUS },
        { {{1, 0}, {9,  0}, {3, -1}, {5,  0}, {7, -1}}, "m9" },
        { {{1, 0}, {9, -1}, {3, -1}, {5,  0}, {7, -1}}, "m♭9" },
+       { {{1, 0}, {9,  0}, {3,  0}, {5, -1}, {7,  0}}, "M9" SUP "♭5" PUS },
+       { {{1, 0}, {9,  0}, {3,  0}, {5, -1}, {7, -1}}, "9" SUP "♭5" PUS },
+       { {{1, 0}, {9,  0}, {3, -1}, {5, -1}, {7,  0}}, "m" SUP "M9♭5" PUS },
        { {{1, 0}, {9,  0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "9" PUS },
 
        /* FIXME: I don't have names for these last three after
@@ -736,6 +740,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;
@@ -855,6 +870,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: