From cce4a033b8375e0fd293070444e2affe0b3db4a6 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 26 Sep 2013 08:00:27 -0700 Subject: [PATCH] Reduce overuse of superscripting in chord names. In particular, the presence of "sus" now no longer triggers superscripting in the rest of the chord name, (since I've moved "sus" to the end of the chord name instead). --- scherzo.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/scherzo.c b/scherzo.c index 57d9044..b7acce9 100644 --- a/scherzo.c +++ b/scherzo.c @@ -676,32 +676,32 @@ 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, 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 }, @@ -722,10 +722,10 @@ scherzo_analyze_chord (scherzo_t *scherzo) { {{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}}, "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}, {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 }, -- 2.43.0