X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scherzo.c;h=95890bc2500e861bc942233a254a06498dd0ed4d;hb=aaa3e53c4129345f5fc46cc6ecf131e4af204f01;hp=522f369e420ccefa29e181a29a85616fb3d10ba7;hpb=8f3ed4064e27a34fb93bf009464fd9f1831363b1;p=scherzo

diff --git a/scherzo.c b/scherzo.c
index 522f369..95890bc 100644
--- 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;
 
@@ -665,43 +665,61 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 #define SUP "<span font='33' rise='30000'>"
 #define PUS "</span>"
 
-    struct { modified_degree_t degrees[3]; const char *name; } triads[] = {
+    struct { modified_degree_t degrees[3]; const char *name; } trichords[] = {
+	/* Triads */
 	{ {{1, 0}, {3, +1}, {5,  0}}, "sus" },
 	{ {{1, 0}, {3,  0}, {5, +1}}, SUP "+" PUS },
 	{ {{1, 0}, {3,  0}, {5,  0}}, "" },
 	{ {{1, 0}, {3, -1}, {5,  0}}, "m" },
 	{ {{1, 0}, {3, -1}, {5, -1}}, "°" },
-	{ {{1, 0}, {2,  0}, {5,  0}}, "msus2" }
+	{ {{1, 0}, {2,  0}, {5,  0}}, "msus2" },
+	/* Seventh chords with no 3rd */
+	{ {{1, 0}, {5, +1}, {7,  0}}, SUP "+M7" PUS },
+	{ {{1, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS },
+	{ {{1, 0}, {5,  0}, {7,  0}}, "M7" },
+	{ {{1, 0}, {5,  0}, {7, -1}}, "7" },
+	{ {{1, 0}, {5, -1}, {7, -1}}, "7♭5" },
+	/* Seventh chords with no 5th */
+	{ {{1, 0}, {4,  0}, {7,  0}}, "M7sus" },
+	{ {{1, 0}, {4,  0}, {7, -1}}, "7sus" },
+	{ {{1, 0}, {3,  0}, {7,  0}}, "M7" },
+	{ {{1, 0}, {3,  0}, {7, -1}}, "7" },
+	{ {{1, 0}, {3, -1}, {7,  0}}, "m" SUP "M7" PUS },
+	{ {{1, 0}, {3, -1}, {7, -1}}, "m7" },
+	{ {{1, 0}, {2,  0}, {7,  0}}, "m" SUP "M7" PUS "sus2" },
+	{ {{1, 0}, {2,  0}, {7, -1}}, "m7sus2" },
     };
 
     struct { modified_degree_t degrees[4]; const char *name; } tetrachords[] = {
 	/* Sixth chords */
-	{ {{1, 0}, {4,  0}, {5,  0}, {6,  0}}, "sus" SUP "6" PUS },
-	{ {{1, 0}, {3,  0}, {5,  0}, {6,  0}}, "6" },
+	{ {{1, 0}, {4,  0}, {5,  0}, {6,  0}}, "6sus" },
+	{ {{1, 0}, {3,  0}, {5,  0}, {6,  0}}, "6" }, /* Ambiguous with m7 */
 	{ {{1, 0}, {3, -1}, {5,  0}, {6,  0}}, "m6" },
-	{ {{1, 0}, {2,  0}, {5,  0}, {6,  0}}, "msus2" SUP "6" PUS },
+	{ {{1, 0}, {2,  0}, {5,  0}, {6,  0}}, "m6sus2" },
 	/* Seventh chords */
-	{ {{1, 0}, {4,  0}, {5,  0}, {7,  0}}, "sus" SUP "M7" PUS },
-	{ {{1, 0}, {4,  0}, {5,  0}, {7, -1}}, "sus" SUP "7" PUS },
-	{ {{1, 0}, {4,  0}, {5, -1}, {7, -1}}, "sus" SUP "7♭5" PUS },
+	{ {{1, 0}, {4,  0}, {5, +1}, {7,  0}}, SUP "+M7" PUS "sus" },
+	{ {{1, 0}, {4,  0}, {5, +1}, {7, -1}}, SUP "+7" PUS "sus" },
+	{ {{1, 0}, {4,  0}, {5,  0}, {7,  0}}, "M7sus" },
+	{ {{1, 0}, {4,  0}, {5,  0}, {7, -1}}, "7sus" },
+	{ {{1, 0}, {4,  0}, {5, -1}, {7, -1}}, "7♭5sus" },
 	{ {{1, 0}, {3,  0}, {5, +1}, {7,  0}}, SUP "+M7" PUS },
 	{ {{1, 0}, {3,  0}, {5, +1}, {7, -1}}, SUP "+7" PUS },
 	{ {{1, 0}, {3,  0}, {5,  0}, {7,  0}}, "M7" },
 	{ {{1, 0}, {3,  0}, {5,  0}, {7, -1}}, "7" },
-	{ {{1, 0}, {3,  0}, {5, -1}, {7, -1}}, SUP "7♭5" PUS },
+	{ {{1, 0}, {3,  0}, {5, -1}, {7, -1}}, "7♭5" },
 	{ {{1, 0}, {3, -1}, {5,  0}, {7,  0}}, "m" SUP "M7" PUS },
 	{ {{1, 0}, {3, -1}, {5,  0}, {7, -1}}, "m7" },
 	{ {{1, 0}, {3, -1}, {5, -1}, {7,  0}}, "°" SUP "M7" PUS },
 	{ {{1, 0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS },
 	{ {{1, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "7" PUS },
-	{ {{1, 0}, {2,  0}, {5,  0}, {7,  0}}, "msus2" SUP "M7" PUS },
-	{ {{1, 0}, {2,  0}, {5,  0}, {7, -1}}, "msus2" SUP "7" PUS },
-	{ {{1, 0}, {2,  0}, {5, -1}, {7,  0}}, "msus2°" SUP "M7" PUS },
-	{ {{1, 0}, {2,  0}, {5, -1}, {7, -1}}, "msus2𝆩" SUP "7" PUS },
-	{ {{1, 0}, {2,  0}, {5, -1}, {7, -2}}, "msus2°" SUP "7" PUS },
+	{ {{1, 0}, {2,  0}, {5,  0}, {7,  0}}, "m" SUP "M7" PUS "sus2" },
+	{ {{1, 0}, {2,  0}, {5,  0}, {7, -1}}, "m7sus2" },
+	{ {{1, 0}, {2,  0}, {5, -1}, {7,  0}}, "°" SUP "M7" PUS "sus2" },
+	{ {{1, 0}, {2,  0}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS "sus2" },
+	{ {{1, 0}, {2,  0}, {5, -1}, {7, -2}}, "°" SUP "7" PUS "sus2" }, /* Ambiguous with 7 */
 	/* Ninth chords voiced with no 5th */
-	{ {{1, 0}, {9,  0}, {4,  0}, {7,  0}}, "sus" SUP "M9" PUS },
-	{ {{1, 0}, {9,  0}, {4,  0}, {7, -1}}, "sus" SUP "9" PUS },
+	{ {{1, 0}, {9,  0}, {4,  0}, {7,  0}}, "M9sus" },
+	{ {{1, 0}, {9,  0}, {4,  0}, {7, -1}}, "9sus" },
 	{ {{1, 0}, {9,  0}, {3,  0}, {7,  0}}, "M9" },
 	{ {{1, 0}, {9,  0}, {3,  0}, {7, -1}}, "9" },
 	{ {{1, 0}, {9,  0}, {3, -1}, {7,  0}}, "m" SUP "M9" PUS },
@@ -713,18 +731,31 @@ 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[] = {
-	{ {{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 },
-	{ {{1, 0}, {9,  0}, {4,  0}, {5,  0}, {7, -1}}, "sus" SUP "9" PUS },
+	/* 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}}, SUP "+M9" PUS "sus" },
+	{ {{1, 0}, {9,  0}, {4,  0}, {5, +1}, {7, -1}}, SUP "+9" PUS "sus" },
+	{ {{1, 0}, {9,  0}, {4,  0}, {5,  0}, {7,  0}}, "M9sus" },
+	{ {{1, 0}, {9,  0}, {4,  0}, {5,  0}, {7, -1}}, "9sus" },
 
 	{ {{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 +767,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;
@@ -823,12 +865,12 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 	    }
 	    break;
 	case 3:
-	    for (i = 0; i < ARRAY_SIZE (triads); i++) {
+	    for (i = 0; i < ARRAY_SIZE (trichords); i++) {
 		if (_chord_signature_matches (notes, num_notes,
-					      triads[i].degrees, 3,
+					      trichords[i].degrees, 3,
 					      inversion, &root))
 		{
-		    chord_name = triads[i].name;
+		    chord_name = trichords[i].name;
 		    goto CHORD_NAME_KNOWN;
 		}
 	    }
@@ -855,6 +897,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: