Specify sus4 chords with a Perfect 4th rather than a raised 3rd.

This is much more clear, (and will help when I actually write the code
to spell these correctly on the staff itself).

diff --git a/scherzo.c b/scherzo.c
index 89a93010b9b6c54585c53ffb54145b5925d0a031..f30bfe40fbe72e1b4cbd0a9805fc49c42862d119 100644 (file)
--- 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 */
 
     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,  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" },
        { {{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" },