Don't print root pitch for octaves and intervals

The bare pitch name looked too much like a major triad.

diff --git a/scherzo.c b/scherzo.c
index cffb25e1fbbf128237d821b1e032e92d61631155..38f0c3d8520928f24c6d3ebe90eac8b990005f4d 100644 (file)
--- a/scherzo.c
+++ b/scherzo.c
@@ -932,9 +932,15 @@ scherzo_analyze_chord (scherzo_t *scherzo)
                                          _pitch_str (root),
                                          chord_name, inversion_str);
        } else {
                                          _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");
        }
     } else {
        chord_name = talloc_strdup (local, "Unknown chord");