From: Carl Worth Date: Fri, 27 Sep 2013 04:50:53 +0000 (-0700) Subject: Use abbreviated names for intervals X-Git-Url: https://git.cworth.org/git?p=scherzo;a=commitdiff_plain;h=8633a6baf2b63a7a9077b7b3089d52e53c14355a Use abbreviated names for intervals --- diff --git a/scherzo.c b/scherzo.c index 38f0c3d..1da182f 100644 --- a/scherzo.c +++ b/scherzo.c @@ -635,21 +635,21 @@ scherzo_analyze_chord (scherzo_t *scherzo) num_notes = note_group->num_notes; struct { modified_degree_t degrees[1]; const char *name; } octaves[] = { - { {{1, 0}}, " Octave"} + { {{1, 0}}, "P8" } }; struct { modified_degree_t degrees[2]; const char *name; } intervals[] = { - { {{1, 0}, {2, -1}}, " Minor 2nd"}, - { {{1, 0}, {2, 0}}, " Major 2nd"}, - { {{1, 0}, {3, -1}}, " Minor 3rd"}, - { {{1, 0}, {3, 0}}, " Major 3rd"}, - { {{1, 0}, {4, 0}}, " Perfect 4th"}, - { {{1, 0}, {5, -1}}, " Diminished 5th"}, - { {{1, 0}, {5, 0}}, " Perfect 5th"}, - { {{1, 0}, {6, -1}}, " Minor 6th"}, - { {{1, 0}, {6, 0}}, " Major 6th"}, - { {{1, 0}, {7, -1}}, " Minor 7th"}, - { {{1, 0}, {7, 0}}, " Major 7th"} + { {{1, 0}, {2, -1}}, "m2" }, + { {{1, 0}, {2, 0}}, "M2" }, + { {{1, 0}, {3, -1}}, "m3" }, + { {{1, 0}, {3, 0}}, "M3" }, + { {{1, 0}, {4, 0}}, "P4" }, + { {{1, 0}, {5, -1}}, "Tri-tone" }, + { {{1, 0}, {5, 0}}, "P5" }, + { {{1, 0}, {6, -1}}, "m6" }, + { {{1, 0}, {6, 0}}, "M6" }, + { {{1, 0}, {7, -1}}, "m7" }, + { {{1, 0}, {7, 0}}, "M7" } }; /* XXX: The superscript rise value should be relative to the current