Use abbreviated names for intervals

[scherzo] / scherzo.c

diff --git a/scherzo.c b/scherzo.c
index cffb25e1fbbf128237d821b1e032e92d61631155..1da182faec1647099decd654e4b5b408fe0f36bd 100644 (file)
--- 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
@@ -932,9 +932,15 @@ scherzo_analyze_chord (scherzo_t *scherzo)
                                          _pitch_str (root),
                                          chord_name, inversion_str);
        } else {
-           chord_name = talloc_asprintf (local, "%s%s",
-                                         _pitch_str (root),
-                                         chord_name);
+           /* Don't print root pitch for octaves and inversions,
+            * (since a pitch name alone looks like a major triad) */
+           if (num_notes < 3) {
+               chord_name = talloc_strdup (local, chord_name);
+           } else {
+               chord_name = talloc_asprintf (local, "%s%s",
+                                             _pitch_str (root),
+                                             chord_name);
+           }
        }
     } else {
        chord_name = talloc_strdup (local, "Unknown chord");