From: Carl Worth <cworth@cworth.org>
Date: Thu, 26 Sep 2013 21:56:18 +0000 (-0700)
Subject: Comment a couple of ambiguous chords
X-Git-Url: https://git.cworth.org/git?p=scherzo;a=commitdiff_plain;h=0354e4ef964b55ca7f952745cf50dc0ff1948a71

Comment a couple of ambiguous chords

I noticed these while going through Bach's Prelude #1, comparing what
scherzo gave with what Andrea Pauly gave for each chord.

The right thing to do is probably to make scherzo display all chord
names (and spellings) when more than one chord naming can be matched
against a set of notes.
---

diff --git a/scherzo.c b/scherzo.c
index 4882cc9..b0a6414 100644
--- a/scherzo.c
+++ b/scherzo.c
@@ -677,7 +677,7 @@ 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 */
@@ -700,7 +700,7 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 	{ {{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" },
+	{ {{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" },