From 12aa86c3243420c2153c4319546837974a687890 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 26 Sep 2013 07:43:19 -0700 Subject: [PATCH] Add 11th chords Working from: http://en.wikipedia.org/wiki/Chord_notation#11ths I still have some confusion about half-diminished and diminished chords larger than 7th chords. The 9th and 11th versions of these as currently programmed seem inconsistent. So I need to double-check against some additional sources rather than just relying on wikipedia. --- scherzo.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/scherzo.c b/scherzo.c index c56e18b..ec34f1c 100644 --- a/scherzo.c +++ b/scherzo.c @@ -497,7 +497,7 @@ _chord_signature_matches (analyzed_note_t *notes, int inversion, score_pitch_t *root) { -#define MAX_DEGREES 5 +#define MAX_DEGREES 6 int relative_pitches[MAX_DEGREES]; int i, root_index; @@ -740,6 +740,17 @@ scherzo_analyze_chord (scherzo_t *scherzo) { {{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) { score_remove_chord (scherzo->chord); scherzo->chord = NULL; @@ -859,6 +870,17 @@ scherzo_analyze_chord (scherzo_t *scherzo) } } 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: -- 2.43.0