X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scherzo.c;h=dbaaa6120fb6dab7be613d02748c4ec6a780540d;hb=c56e33332749e86e9c099f6790df9e5102cd649c;hp=ec34f1cd771d896dfddedc3b628d5cd4308e49c6;hpb=12aa86c3243420c2153c4319546837974a687890;p=scherzo

diff --git a/scherzo.c b/scherzo.c
index ec34f1c..dbaaa61 100644
--- a/scherzo.c
+++ b/scherzo.c
@@ -676,32 +676,34 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 
     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}, {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}, {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}}, "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}}, "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,10 +715,19 @@ 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 },