X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scherzo.c;h=671d354a49ed56b5d628dae154e4f71d36fb7223;hb=7bab1f929a847d2b1ee569a5ed4149d374aa707a;hp=38f0c3d8520928f24c6d3ebe90eac8b990005f4d;hpb=de9c620550c07839b3cf24b814013630a478fb54;p=scherzo

diff --git a/scherzo.c b/scherzo.c
index 38f0c3d..671d354 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
@@ -911,36 +911,14 @@ scherzo_analyze_chord (scherzo_t *scherzo)
     CHORD_NAME_KNOWN:
 
     if (chord_name) {
-	if (inversion) {
-	    const char *inversion_str;
-	    switch (inversion) {
-	    case 1:
-		inversion_str = "1st inversion";
-		break;
-	    case 2:
-		inversion_str = "2nd inversion";
-		break;
-	    case 3:
-		inversion_str = "3rd inversion";
-		break;
-	    default:
-		fprintf (stderr, "Internal error: Unexpected inversion: %d\n",
-			 inversion);
-		exit(1);
-	    }
-	    chord_name = talloc_asprintf (local, "%s%s %s",
-					  _pitch_str (root),
-					  chord_name, inversion_str);
+	/* 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 {
-	    /* 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);
-	    }
+	    chord_name = talloc_asprintf (local, "%s%s",
+					  _pitch_str (root),
+					  chord_name);
 	}
     } else {
 	chord_name = talloc_strdup (local, "Unknown chord");