X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scherzo.c;h=b7acce963aef1d6f0f835ffd1738b486b633ab32;hb=cce4a033b8375e0fd293070444e2affe0b3db4a6;hp=a1ed6e3794ff09a182c55f3c355bae8826497ea5;hpb=39a9e8b1d8548408fcdfe63922b93b4776237944;p=scherzo

diff --git a/scherzo.c b/scherzo.c
index a1ed6e3..b7acce9 100644
--- a/scherzo.c
+++ b/scherzo.c
@@ -450,10 +450,15 @@ static int
 _modified_degree_to_half_steps (const modified_degree_t *degree)
 {
     int half_steps;
+    int scale_degree = degree->degree;
+
+    /* Restrict to actual degrees within a scale. */
+    if (scale_degree > 7)
+	scale_degree = (scale_degree % 8) + 1;
 
     /* Number of half steps from root to specified degree within a
      * diatonic scaled. */
-    switch (degree->degree) {
+    switch (scale_degree) {
     case 1:
 	half_steps = 0;
 	break;
@@ -492,7 +497,7 @@ _chord_signature_matches (analyzed_note_t *notes,
 			  int inversion,
 			  score_pitch_t *root)
 {
-#define MAX_DEGREES 4
+#define MAX_DEGREES 6
     int relative_pitches[MAX_DEGREES];
     int i, root_index;
 
@@ -671,29 +676,88 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 
     struct { modified_degree_t degrees[4]; const char *name; } tetrachords[] = {
 	/* Sixth chords */
-	{ {{1, 0}, {3, +1}, {5,  0}, {6,  0}}, "sus" SUP "6" PUS },
+	{ {{1, 0}, {4,  0}, {5,  0}, {6,  0}}, "6sus" },
 	{ {{1, 0}, {3,  0}, {5,  0}, {6,  0}}, "6" },
 	{ {{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}, {3, +1}, {5,  0}, {7,  0}}, "sus" SUP "M7" PUS },
-	{ {{1, 0}, {3, +1}, {5,  0}, {7, -1}}, "sus" SUP "7" PUS },
-	{ {{1, 0}, {3, +1}, {5, -1}, {7, -1}}, "sus" SUP "7♭5" PUS },
+	{ {{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}}, "m°" SUP "M7" PUS "sus2" },
+	{ {{1, 0}, {2,  0}, {5, -1}, {7, -1}}, "m𝆩" SUP "7" PUS "sus2" },
+	{ {{1, 0}, {2,  0}, {5, -1}, {7, -2}}, "m°" SUP "7" PUS "sus2" },
+	/* Ninth chords voiced with no 5th */
+	{ {{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 },
+	{ {{1, 0}, {9,  0}, {3, -1}, {7, -1}}, "m9" },
+	{ {{1, 0}, {9, -1}, {3, -1}, {7, -1}}, "m♭9" },
+    };
+
+    /* The sorting here is funny to keep the array in degree order
+     * 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}}, 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
+	 * dropping the 5th from the voicing. That suggests to me that
+	 * I'm missing names for these with a perfect 5th in the list
+	 * above. */
+	{ {{1, 0}, {9, -1}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "♭9" PUS },
+	{ {{1, 0}, {9,  0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "9" PUS },
+	{ {{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) {
@@ -794,7 +858,7 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 	    }
 	    break;
 	case 4:
-	    for (i = 0; i < ARRAY_SIZE(tetrachords); i++) {
+	    for (i = 0; i < ARRAY_SIZE (tetrachords); i++) {
 		if (_chord_signature_matches (notes, num_notes,
 					      tetrachords[i].degrees, 4,
 					      inversion, &root))
@@ -804,6 +868,28 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 		}
 	    }
 	    break;
+	case 5:
+	    for (i = 0; i < ARRAY_SIZE (pentachords); i++) {
+		if (_chord_signature_matches (notes, num_notes,
+					      pentachords[i].degrees, 5,
+					      inversion, &root))
+		{
+		    chord_name = pentachords[i].name;
+		    goto CHORD_NAME_KNOWN;
+		}
+	    }
+	    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: