return midi_note;
}
+/* octave can optionally by NULL */
static void
_midi_to_score_pitch_and_octave (unsigned char midi_note,
score_pitch_t *pitch,
int *octave)
{
- *octave = midi_note / 12 - 1;
+ if (octave)
+ *octave = midi_note / 12 - 1;
switch (midi_note % 12)
{
scale_degree = (scale_degree % 8) + 1;
/* Number of half steps from root to specified degree within a
- * diatonic scaled. */
+ * diatonic scale. */
switch (scale_degree) {
case 1:
half_steps = 0;
return half_steps + degree->modification;
}
+/* Number of half steps from 'root' up to 'pitch' (that is, counting
+ * the steps up a chromatic scale). */
+static int
+_pitch_from_root_in_half_steps (score_pitch_t pitch, score_pitch_t root)
+{
+ int root_midi = _score_pitch_and_octave_to_midi (root, 0);
+ int pitch_midi = _score_pitch_and_octave_to_midi (pitch, 0);
+
+ if (pitch_midi < root_midi)
+ pitch_midi += 12;
+
+ if (pitch_midi < root_midi) {
+ fprintf (stderr, "Internal error: midi values differ by more than expected.\n");
+ exit (1);
+ }
+
+ return (pitch_midi - root_midi) % 12;
+}
+
static int
_chord_signature_matches (analyzed_note_t *notes,
int num_notes,
exit (1);
}
+typedef struct chord_signature
+{
+ int num_degrees;
+ modified_degree_t degrees[MAX_DEGREES];
+ const char *name;
+} chord_signature_t;
+
+/* XXX: The superscript rise value should be relative to the current
+ * font size. Best would be for pango to support this. See:
+ *
+ * https://bugzilla.gnome.org/show_bug.cgi?id=708780
+ *
+ * For now, these are emipirically-derived values that look reasonable
+ * at the default size that score.c is using to draw the staff. If the
+ * user scales the staff up or down then these will look wrong.
+ */
+
+#define SUP "<span font='33' rise='30000'>"
+#define PUS "</span>"
+
+chord_signature_t signatures[] = {
+ /* Octave */
+ { 1, {{1, 0}}, "P8" },
+
+ /* Intervals */
+ { 2, {{1, 0}, {2, -1}}, "m2" },
+ { 2, {{1, 0}, {2, 0}}, "M2" },
+ { 2, {{1, 0}, {3, -1}}, "m3" },
+ { 2, {{1, 0}, {3, 0}}, "M3" },
+ { 2, {{1, 0}, {4, 0}}, "P4" },
+ { 2, {{1, 0}, {5, -1}}, "Tri-tone" },
+ { 2, {{1, 0}, {5, 0}}, "P5" },
+ { 2, {{1, 0}, {6, -1}}, "m6" },
+ { 2, {{1, 0}, {6, 0}}, "M6" },
+ { 2, {{1, 0}, {7, -1}}, "m7" },
+ { 2, {{1, 0}, {7, 0}}, "M7" },
+
+ /* Triads */
+ { 3, {{1, 0}, {4, 0}, {5, 0}}, "sus" },
+ { 3, {{1, 0}, {3, 0}, {5, +1}}, SUP "+" PUS },
+ { 3, {{1, 0}, {3, 0}, {5, 0}}, "" },
+ { 3, {{1, 0}, {3, -1}, {5, 0}}, "m" },
+ { 3, {{1, 0}, {3, -1}, {5, -1}}, "°" },
+ { 3, {{1, 0}, {2, 0}, {5, 0}}, "msus2" },
+
+ /* Seventh chords with no 3rd */
+ { 3, {{1, 0}, {5, +1}, {7, 0}}, SUP "+M7" PUS },
+ { 3, {{1, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS },
+ { 3, {{1, 0}, {5, 0}, {7, 0}}, "M7" },
+ { 3, {{1, 0}, {5, 0}, {7, -1}}, "7" },
+ { 3, {{1, 0}, {5, -1}, {7, -1}}, "7♭5" },
+
+ /* Seventh chords with no 5th */
+ { 3, {{1, 0}, {4, 0}, {7, 0}}, "M7sus" },
+ { 3, {{1, 0}, {4, 0}, {7, -1}}, "7sus" },
+ { 3, {{1, 0}, {3, 0}, {7, 0}}, "M7" },
+ { 3, {{1, 0}, {3, 0}, {7, -1}}, "7" },
+ { 3, {{1, 0}, {3, -1}, {7, 0}}, "m" SUP "M7" PUS },
+ { 3, {{1, 0}, {3, -1}, {7, -1}}, "m7" },
+ { 3, {{1, 0}, {2, 0}, {7, 0}}, "m" SUP "M7" PUS "sus2" },
+ { 3, {{1, 0}, {2, 0}, {7, -1}}, "m7sus2" },
+
+ /* Sixth chords */
+ { 4, {{1, 0}, {4, 0}, {5, 0}, {6, 0}}, "6sus" },
+ { 4, {{1, 0}, {3, 0}, {5, 0}, {6, 0}}, "6" }, /* Ambiguous with m7 */
+ { 4, {{1, 0}, {3, -1}, {5, 0}, {6, 0}}, "m6" },
+ { 4, {{1, 0}, {2, 0}, {5, 0}, {6, 0}}, "m6sus2" },
+
+ /* Seventh chords */
+ { 4, {{1, 0}, {4, 0}, {5, +1}, {7, 0}}, SUP "+M7" PUS "sus" },
+ { 4, {{1, 0}, {4, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS "sus" },
+ { 4, {{1, 0}, {4, 0}, {5, 0}, {7, 0}}, "M7sus" },
+ { 4, {{1, 0}, {4, 0}, {5, 0}, {7, -1}}, "7sus" },
+ { 4, {{1, 0}, {4, 0}, {5, -1}, {7, -1}}, "7♭5sus" },
+ { 4, {{1, 0}, {3, 0}, {5, +1}, {7, 0}}, SUP "+M7" PUS },
+ { 4, {{1, 0}, {3, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS },
+ { 4, {{1, 0}, {3, 0}, {5, 0}, {7, 0}}, "M7" },
+ { 4, {{1, 0}, {3, 0}, {5, 0}, {7, -1}}, "7" },
+ { 4, {{1, 0}, {3, 0}, {5, -1}, {7, -1}}, "7♭5" },
+ { 4, {{1, 0}, {3, -1}, {5, 0}, {7, 0}}, "m" SUP "M7" PUS },
+ { 4, {{1, 0}, {3, -1}, {5, 0}, {7, -1}}, "m7" },
+ { 4, {{1, 0}, {3, -1}, {5, -1}, {7, 0}}, "°" SUP "M7" PUS },
+ { 4, {{1, 0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS },
+ { 4, {{1, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "7" PUS },
+ { 4, {{1, 0}, {2, 0}, {5, 0}, {7, 0}}, "m" SUP "M7" PUS "sus2" },
+ { 4, {{1, 0}, {2, 0}, {5, 0}, {7, -1}}, "m7sus2" },
+ { 4, {{1, 0}, {2, 0}, {5, -1}, {7, 0}}, "°" SUP "M7" PUS "sus2" },
+ { 4, {{1, 0}, {2, 0}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS "sus2" },
+ { 4, {{1, 0}, {2, 0}, {5, -1}, {7, -2}}, "°" SUP "7" PUS "sus2" }, /* Ambiguous with 7 */
+
+ /* The sorting for chords with degree higher than 9 is funny
+ * to keep the array in degree order after reducing each
+ * degree to an actual scale degree, (9 -> 2, 11 -> 4, 13 ->
+ * 6) */
+
+ /* Ninth chords voiced with no 5th */
+ { 4, {{1, 0}, {9, 0}, {4, 0}, {7, 0}}, "M9sus" },
+ { 4, {{1, 0}, {9, 0}, {4, 0}, {7, -1}}, "9sus" },
+ { 4, {{1, 0}, {9, 0}, {3, 0}, {7, 0}}, "M9" },
+ { 4, {{1, 0}, {9, 0}, {3, 0}, {7, -1}}, "9" },
+ { 4, {{1, 0}, {9, 0}, {3, -1}, {7, 0}}, "m" SUP "M9" PUS },
+ { 4, {{1, 0}, {9, 0}, {3, -1}, {7, -1}}, "m9" },
+ { 4, {{1, 0}, {9, -1}, {3, -1}, {7, -1}}, "m♭9" },
+ { 4, {{1, 0}, {9, 0}, {3, -1}, {6, 0}}, "m6/9" },
+ { 4, {{1, 0}, {9, -1}, {3, -1}, {6, 0}}, "m6/♭9" },
+
+ /* Sixth plus 9 */
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {6, 0}}, "6/9" },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, 0}, {6, 0}}, "m6/9" },
+ { 5, {{1, 0}, {9, -1}, {3, -1}, {5, 0}, {6, 0}}, "m6/♭9" },
+
+ /* Seventh plus altered 9 */
+ { 5, {{1, 0}, {9, +1}, {3, 0}, {5, 0}, {7, -1}}, "7♯9" },
+ { 5, {{1, 0}, {9, -1}, {3, 0}, {5, 0}, {7, -1}}, "7♭9" },
+ { 5, {{1, 0}, {9, +1}, {3, 0}, {5, -1}, {7, -1}}, "7♭5♯9" },
+ { 5, {{1, 0}, {9, -1}, {3, 0}, {5, -1}, {7, -1}}, "7♭5♭9" },
+
+ /* Ninth chords */
+ { 5, {{1, 0}, {9, 0}, {4, 0}, {5, +1}, {7, 0}}, SUP "+M9" PUS "sus" },
+ { 5, {{1, 0}, {9, 0}, {4, 0}, {5, +1}, {7, -1}}, SUP "+9" PUS "sus" },
+ { 5, {{1, 0}, {9, 0}, {4, 0}, {5, 0}, {7, 0}}, "M9sus" },
+ { 5, {{1, 0}, {9, 0}, {4, 0}, {5, 0}, {7, -1}}, "9sus" },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, +1}, {7, 0}}, SUP "+M9" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, +1}, {7, -1}}, SUP "+9" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {7, 0}}, "M9" },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {7, -1}}, "9" },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, 0}, {7, 0}}, "m" SUP "M9" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, 0}, {7, -1}}, "m9" },
+ { 5, {{1, 0}, {9, -1}, {3, -1}, {5, 0}, {7, -1}}, "m♭9" },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, -1}, {7, 0}}, "M9" SUP "♭5" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, -1}, {7, -1}}, "9" SUP "♭5" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, 0}}, "m" SUP "M9♭5" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "9" PUS },
+ { 5, {{1, 0}, {9, -1}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "♭9" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "9" PUS },
+ { 5, {{1, 0}, {9, -1}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "♭9" PUS },
+
+ /* Eleventh chords */
+ { 6, {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, +1}, {7, 0}}, SUP "+M11" PUS },
+ { 6, {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, +1}, {7, -1}}, SUP "+11" PUS },
+ { 6, {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, 0}, {7, 0}}, "M11" },
+ { 6, {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, 0}, {7, -1}}, "11" },
+ { 6, {{1, 0}, {9, 0}, {3, -1}, {11, 0}, {5, 0}, {7, 0}}, "m" SUP "M11" PUS },
+ { 6, {{1, 0}, {9, 0}, {3, -1}, {11, 0}, {5, 0}, {7, -1}}, "m11" },
+ { 6, {{1, 0}, {9, -1}, {3, -1}, {11, 0}, {5, -1}, {7, -1}}, "𝆩" SUP "11" PUS },
+ { 6, {{1, 0}, {9, -1}, {3, -1}, {11, -1}, {5, -1}, {7, -2}}, "°" SUP "11" PUS }
+};
+
+static void
+scherzo_adjust_note_to_match_modified_degree (score_note_t *note,
+ score_pitch_t root,
+ modified_degree_t *degree)
+{
+ score_pitch_name_t name = SCORE_PITCH_NAME (note->pitch);
+ score_pitch_accidental_t accidental = SCORE_PITCH_ACCIDENTAL (note->pitch);
+ int degree_zero_based = (degree->degree - 1) % 7;
+ int degree_delta;
+
+ int note_degree_zero_based = name - SCORE_PITCH_NAME (root);
+ if (note_degree_zero_based < 0)
+ note_degree_zero_based += 7;
+
+ if (note_degree_zero_based == degree_zero_based)
+ return;
+
+ degree_delta = note_degree_zero_based - degree_zero_based;
+ if (degree_delta > 3)
+ degree_delta = - (7 - degree_delta);
+ if (degree_delta < -3)
+ degree_delta = - (-7 - degree_delta);
+
+ if (abs (degree_delta) != 1) {
+ fprintf (stderr, "Internal error: Cannot adjust a note more than one degree (%d vs. %d).\n", note_degree_zero_based + 1, degree->degree);
+ exit (1);
+ }
+
+ if (degree_delta == -1) {
+ if (name == SCORE_PITCH_NAME_B) {
+ name = SCORE_PITCH_NAME_C;
+ note->octave++;
+ } else {
+ name++;
+ }
+ switch (name) {
+ case SCORE_PITCH_NAME_D:
+ case SCORE_PITCH_NAME_E:
+ case SCORE_PITCH_NAME_G:
+ case SCORE_PITCH_NAME_A:
+ case SCORE_PITCH_NAME_B:
+ accidental -= 2;
+ break;
+ case SCORE_PITCH_NAME_C:
+ case SCORE_PITCH_NAME_F:
+ accidental -= 1;
+ break;
+ }
+ }
+
+ if (degree_delta == +1) {
+ if (name == SCORE_PITCH_NAME_C) {
+ name = SCORE_PITCH_NAME_B;
+ note->octave--;
+ } else {
+ name--;
+ }
+ switch (name) {
+ case SCORE_PITCH_NAME_C:
+ case SCORE_PITCH_NAME_D:
+ case SCORE_PITCH_NAME_F:
+ case SCORE_PITCH_NAME_G:
+ case SCORE_PITCH_NAME_A:
+ accidental += 2;
+ break;
+ case SCORE_PITCH_NAME_E:
+ case SCORE_PITCH_NAME_B:
+ accidental += 1;
+ }
+ }
+
+ if (accidental < 0 || accidental > SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP) {
+ fprintf (stderr, "Internal error: Trying to adjust an accidental out of range (degree_delta == %d (%d - %d), new accidental == %d).\n", degree_delta, note_degree_zero_based, degree_zero_based, accidental);
+ exit (1);
+ }
+
+ note->pitch = SCORE_PITCH (name, accidental);
+}
+
+static void
+_spell_chord_by_signature (note_group_t *chord,
+ int num_notes,
+ chord_signature_t *signature,
+ score_pitch_t root)
+{
+ int i, degree, note_half_steps, degree_half_steps;
+ int root_midi;
+
+ /* Sanitize root to eliminate things like double-flats,
+ * double-sharps, Cb, E#, etc. */
+ root_midi = _score_pitch_and_octave_to_midi (root, 0);
+ _midi_to_score_pitch_and_octave (root_midi, &root, NULL);
+
+ for (i = 0; i < num_notes; i++) {
+ note_half_steps = _pitch_from_root_in_half_steps (chord->notes[i]->pitch,
+ root);
+ for (degree = 0; degree < signature->num_degrees; degree++) {
+ degree_half_steps = _modified_degree_to_half_steps (&signature->degrees[degree]);
+ if (note_half_steps == degree_half_steps) {
+ scherzo_adjust_note_to_match_modified_degree (chord->notes[i],
+ root,
+ &signature->degrees[degree]);
+ break;
+ }
+ }
+ if (note_half_steps != degree_half_steps) {
+ fprintf (stderr, "Internal error: Chord and degree mis-match\n");
+ exit (1);
+ }
+ }
+}
+
static void
scherzo_analyze_chord (scherzo_t *scherzo)
{
unsigned i, j, num_notes;
int bass_pitch, inversion;
score_pitch_t root;
- const char *chord_name = NULL;
+ chord_signature_t *match = NULL;
+ char *chord_name;
if (scherzo->pedal_pressed)
note_group = &scherzo->notes_pedaled;
num_notes = note_group->num_notes;
- struct { modified_degree_t degrees[1]; const char *name; } octaves[] = {
- { {{1, 0}}, " Octave"}
- };
-
- 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"}
- };
-
-/* XXX: The superscript rise value should be relative to the current
- * font size. Best would be for pango to support this. See:
- *
- * https://bugzilla.gnome.org/show_bug.cgi?id=708780
- *
- * For now, these are emipirically-derived values that look reasonable
- * at the default size that score.c is using to draw the staff. If the
- * user scales the staff up or down then these will look wrong.
- */
-
-#define SUP "<span font='33' rise='30000'>"
-#define PUS "</span>"
-
- struct { modified_degree_t degrees[3]; const char *name; } triads[] = {
- { {{1, 0}, {3, +1}, {5, 0}}, "sus" },
- { {{1, 0}, {3, 0}, {5, +1}}, SUP "+" PUS },
- { {{1, 0}, {3, 0}, {5, 0}}, "" },
- { {{1, 0}, {3, -1}, {5, 0}}, "m" },
- { {{1, 0}, {3, -1}, {5, -1}}, "°" },
- { {{1, 0}, {2, 0}, {5, 0}}, "msus2" }
- };
-
- struct { modified_degree_t degrees[4]; const char *name; } tetrachords[] = {
- /* Sixth chords */
- { {{1, 0}, {4, 0}, {5, 0}, {6, 0}}, "6sus" },
- { {{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}}, "m6sus2" },
- /* Seventh chords */
- { {{1, 0}, {4, 0}, {5, +1}, {7, 0}}, SUP "+M7" PUS "sus" },
- { {{1, 0}, {4, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS "sus" },
- { {{1, 0}, {4, 0}, {5, 0}, {7, 0}}, "M7sus" },
- { {{1, 0}, {4, 0}, {5, 0}, {7, -1}}, "7sus" },
- { {{1, 0}, {4, 0}, {5, -1}, {7, -1}}, "7♭5sus" },
- { {{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, 0}, {7, -1}}, "7" },
- { {{1, 0}, {3, 0}, {5, -1}, {7, -1}}, "7♭5" },
- { {{1, 0}, {3, -1}, {5, 0}, {7, 0}}, "m" SUP "M7" PUS },
- { {{1, 0}, {3, -1}, {5, 0}, {7, -1}}, "m7" },
- { {{1, 0}, {3, -1}, {5, -1}, {7, 0}}, "°" SUP "M7" PUS },
- { {{1, 0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS },
- { {{1, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "7" PUS },
- { {{1, 0}, {2, 0}, {5, 0}, {7, 0}}, "m" SUP "M7" PUS "sus2" },
- { {{1, 0}, {2, 0}, {5, 0}, {7, -1}}, "m7sus2" },
- { {{1, 0}, {2, 0}, {5, -1}, {7, 0}}, "°" SUP "M7" PUS "sus2" },
- { {{1, 0}, {2, 0}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS "sus2" },
- { {{1, 0}, {2, 0}, {5, -1}, {7, -2}}, "°" SUP "7" PUS "sus2" },
- /* Ninth chords voiced with no 5th */
- { {{1, 0}, {9, 0}, {4, 0}, {7, 0}}, "M9sus" },
- { {{1, 0}, {9, 0}, {4, 0}, {7, -1}}, "9sus" },
- { {{1, 0}, {9, 0}, {3, 0}, {7, 0}}, "M9" },
- { {{1, 0}, {9, 0}, {3, 0}, {7, -1}}, "9" },
- { {{1, 0}, {9, 0}, {3, -1}, {7, 0}}, "m" SUP "M9" PUS },
- { {{1, 0}, {9, 0}, {3, -1}, {7, -1}}, "m9" },
- { {{1, 0}, {9, -1}, {3, -1}, {7, -1}}, "m♭9" },
- };
-
- /* The sorting here is funny to keep the array in degree order
- * after reducing each degree to an actual scale degree, (9 -> 2,
- * 11 -> 4, 13 -> 6) */
- struct { modified_degree_t degrees[5]; const char *name; } pentachords[] = {
- /* Sixth plus 9 */
- { {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {6, 0}}, "6/9" },
- { {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {6, 0}}, "m6/9" },
- /* Seventh plus altered 9 */
- { {{1, 0}, {9, +1}, {3, 0}, {5, 0}, {7, -1}}, "7♯9" },
- { {{1, 0}, {9, -1}, {3, 0}, {5, 0}, {7, -1}}, "7♭9" },
- { {{1, 0}, {9, +1}, {3, 0}, {5, -1}, {7, -1}}, "7♭5♯9" },
- { {{1, 0}, {9, -1}, {3, 0}, {5, -1}, {7, -1}}, "7♭5♭9" },
- /* Ninth chords */
- { {{1, 0}, {9, 0}, {4, 0}, {5, +1}, {7, 0}}, SUP "+M9" PUS "sus" },
- { {{1, 0}, {9, 0}, {4, 0}, {5, +1}, {7, -1}}, SUP "+9" PUS "sus" },
- { {{1, 0}, {9, 0}, {4, 0}, {5, 0}, {7, 0}}, "M9sus" },
- { {{1, 0}, {9, 0}, {4, 0}, {5, 0}, {7, -1}}, "9sus" },
-
- { {{1, 0}, {9, 0}, {3, 0}, {5, +1}, {7, 0}}, SUP "+M9" PUS },
- { {{1, 0}, {9, 0}, {3, 0}, {5, +1}, {7, -1}}, SUP "+9" PUS },
-
- { {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {7, 0}}, "M9" },
- { {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {7, -1}}, "9" },
- { {{1, 0}, {9, 0}, {3, -1}, {5, 0}, {7, 0}}, "m" SUP "M9" PUS },
- { {{1, 0}, {9, 0}, {3, -1}, {5, 0}, {7, -1}}, "m9" },
- { {{1, 0}, {9, -1}, {3, -1}, {5, 0}, {7, -1}}, "m♭9" },
- { {{1, 0}, {9, 0}, {3, 0}, {5, -1}, {7, 0}}, "M9" SUP "♭5" PUS },
- { {{1, 0}, {9, 0}, {3, 0}, {5, -1}, {7, -1}}, "9" SUP "♭5" PUS },
- { {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, 0}}, "m" SUP "M9♭5" PUS },
- { {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "9" PUS },
-
- /* FIXME: I don't have names for these last three after
- * dropping the 5th from the voicing. That suggests to me that
- * I'm missing names for these with a perfect 5th in the list
- * above. */
- { {{1, 0}, {9, -1}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "♭9" PUS },
- { {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "9" PUS },
- { {{1, 0}, {9, -1}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "♭9" PUS },
- };
-
- struct { modified_degree_t degrees[6]; const char *name; } hexachords[] = {
- { {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, +1}, {7, 0}}, SUP "+M11" PUS },
- { {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, +1}, {7, -1}}, SUP "+11" PUS },
- { {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, 0}, {7, 0}}, "M11" },
- { {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, 0}, {7, -1}}, "11" },
- { {{1, 0}, {9, 0}, {3, -1}, {11, 0}, {5, 0}, {7, 0}}, "m" SUP "M11" PUS },
- { {{1, 0}, {9, 0}, {3, -1}, {11, 0}, {5, 0}, {7, -1}}, "m11" },
- { {{1, 0}, {9, -1}, {3, -1}, {11, 0}, {5, -1}, {7, -1}}, "𝆩" SUP "11" PUS },
- { {{1, 0}, {9, -1}, {3, -1}, {11, -1}, {5, -1}, {7, -2}}, "°" SUP "11" PUS }
- };
-
if (scherzo->chord) {
score_remove_chord (scherzo->chord);
scherzo->chord = NULL;
}
for (inversion = 0; inversion < 4; inversion++) {
- switch (num_notes) {
- case 1:
- for (i = 0; i < ARRAY_SIZE (octaves); i++) {
- if (_chord_signature_matches (notes, num_notes,
- octaves[i].degrees, 1,
- inversion, &root))
- {
- chord_name = octaves[i].name;
- goto CHORD_NAME_KNOWN;
- }
+ for (i = 0; i < ARRAY_SIZE (signatures); i++) {
+ if (_chord_signature_matches (notes, num_notes,
+ signatures[i].degrees,
+ signatures[i].num_degrees,
+ inversion, &root))
+ {
+ match = &signatures[i];
+ goto HAVE_MATCH;
}
- break;
- case 2:
- for (i = 0; i < ARRAY_SIZE (intervals); i++) {
- if (_chord_signature_matches (notes, num_notes,
- intervals[i].degrees, 2,
- inversion, &root))
- {
- chord_name = intervals[i].name;
- goto CHORD_NAME_KNOWN;
- }
- }
- break;
- case 3:
- for (i = 0; i < ARRAY_SIZE (triads); i++) {
- if (_chord_signature_matches (notes, num_notes,
- triads[i].degrees, 3,
- inversion, &root))
- {
- chord_name = triads[i].name;
- goto CHORD_NAME_KNOWN;
- }
- }
- break;
- case 4:
- for (i = 0; i < ARRAY_SIZE (tetrachords); i++) {
- if (_chord_signature_matches (notes, num_notes,
- tetrachords[i].degrees, 4,
- inversion, &root))
- {
- chord_name = tetrachords[i].name;
- goto CHORD_NAME_KNOWN;
- }
- }
- break;
- case 5:
- for (i = 0; i < ARRAY_SIZE (pentachords); i++) {
- if (_chord_signature_matches (notes, num_notes,
- pentachords[i].degrees, 5,
- inversion, &root))
- {
- chord_name = pentachords[i].name;
- goto CHORD_NAME_KNOWN;
- }
- }
- break;
- case 6:
- for (i = 0; i < ARRAY_SIZE (hexachords); i++) {
- if (_chord_signature_matches (notes, num_notes,
- hexachords[i].degrees, 6,
- inversion, &root))
- {
- chord_name = hexachords[i].name;
- goto CHORD_NAME_KNOWN;
- }
- }
- break;
}
}
- 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);
+HAVE_MATCH:
+
+ chord_name = (char *) signatures[i].name;
+
+ if (match) {
+ /* 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);
}
+
+ _spell_chord_by_signature (note_group, num_notes,
+ match, root);
} else {
- chord_name = talloc_strdup (local, "Unknown chord");
+ chord_name = talloc_strdup (local, "?");
}
scherzo->chord = score_add_chord (scherzo->treble, chord_name);
score_note_t *note;
int i;
int found = 0;
+ int target_midi = _score_pitch_and_octave_to_midi (pitch, octave);
+ int note_midi;
for (i = scherzo->notes_pressed.num_notes - 1; i >=0; i--) {
note = scherzo->notes_pressed.notes[i];
- if (note->pitch == pitch && note->octave == octave) {
+ note_midi = _score_pitch_and_octave_to_midi (note->pitch, note->octave);
+ if (note_midi == target_midi) {
found = 1;
if (! scherzo->pedal_pressed)
score_remove_note (note);
projects / scherzo / blobdiff