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

diff --git a/scherzo.c b/scherzo.c
index b7acce9..b0a6414 100644
--- a/scherzo.c
+++ b/scherzo.c
@@ -677,10 +677,12 @@ 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}}, "6sus" },
-	{ {{1, 0}, {3,  0}, {5,  0}, {6,  0}}, "6" },
+	{ {{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}}, "m6sus2" },
 	/* Seventh chords */
+	{ {{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" },
@@ -696,9 +698,9 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 	{ {{1, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" 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" },
+	{ {{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}}, "M9sus" },
 	{ {{1, 0}, {9,  0}, {4,  0}, {7, -1}}, "9sus" },