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

diff --git a/scherzo.c b/scherzo.c
index 89a9301..522f369 100644
--- a/scherzo.c
+++ b/scherzo.c
@@ -676,14 +676,14 @@ 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}}, "sus" SUP "6" PUS },
 	{ {{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 },
 	/* 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}}, "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}, {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" },
@@ -700,6 +700,8 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 	{ {{1, 0}, {2,  0}, {5, -1}, {7, -1}}, "msus2𝆩" SUP "7" PUS },
 	{ {{1, 0}, {2,  0}, {5, -1}, {7, -2}}, "msus2°" SUP "7" PUS },
 	/* 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}, {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 },
@@ -711,6 +713,11 @@ 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 },
+
 	{ {{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" },