_modified_degree_to_half_steps (const modified_degree_t *degree)
{
int half_steps;
+ int scale_degree = degree->degree;
+
+ /* Restrict to actual degrees within a scale. */
+ if (scale_degree > 7)
+ scale_degree = (scale_degree % 8) + 1;
/* Number of half steps from root to specified degree within a
* diatonic scaled. */
- switch (degree->degree) {
+ switch (scale_degree) {
case 1:
half_steps = 0;
break;
int num_notes,
modified_degree_t *degrees,
int num_degrees,
- int *inversion_ret,
+ int inversion,
score_pitch_t *root)
{
-#define MAX_DEGREES 4
+#define MAX_DEGREES 6
int relative_pitches[MAX_DEGREES];
- int inversion, max_inversions;
int i, root_index;
assert (num_degrees <= MAX_DEGREES);
if (num_notes != num_degrees)
- return 0;
+ return 0;
- max_inversions = num_degrees;
+ if (inversion >= num_degrees)
+ return 0;
/* We never spell simple intervals as inversions. */
- if (num_degrees == 2)
- max_inversions = 1;
-
- for (inversion = 0; inversion < max_inversions; inversion++) {
- for (i = 0; i < num_degrees; i++) {
- /* The num_degrees is in the addition just to ensure all
- * inputs to the modulus operator remain positive. */
- int index = (i + num_degrees - inversion) % num_degrees;
-
- /* Again, adding a 12 to keep things positive. */
- relative_pitches[index] =
- (12 +
- _modified_degree_to_half_steps (°rees[i]) -
- _modified_degree_to_half_steps (°rees[inversion])) % 12;
+ if (num_degrees == 2 && inversion > 0)
+ return 0;
+
+ for (i = 0; i < num_degrees; i++) {
+ /* The num_degrees is in the addition just to ensure all
+ * inputs to the modulus operator remain positive. */
+ int index = (i + num_degrees - inversion) % num_degrees;
+
+ /* Again, adding a 12 to keep things positive. */
+ relative_pitches[index] =
+ (12 +
+ _modified_degree_to_half_steps (°rees[i]) -
+ _modified_degree_to_half_steps (°rees[inversion])) % 12;
- }
-
- for (i = 0; i < num_notes; i++)
- if (notes[i].relative_pitch != relative_pitches[i])
- goto NEXT_INVERSION;
-
- root_index = (num_notes - inversion) % num_notes;
- *root = notes[root_index].note->pitch;
-
- *inversion_ret = inversion;
+ }
- return 1;
+ for (i = 0; i < num_notes; i++)
+ if (notes[i].relative_pitch != relative_pitches[i])
+ return 0;
- NEXT_INVERSION:
- ;
- }
+ root_index = (num_notes - inversion) % num_notes;
+ *root = notes[root_index].note->pitch;
- return 0;
+ return 1;
}
static const char *
#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}}, "M" },
+ { {{1, 0}, {3, 0}, {5, 0}}, "" },
{ {{1, 0}, {3, -1}, {5, 0}}, "m" },
- { {{1, 0}, {3, -1}, {5, -1}}, "°" }
+ { {{1, 0}, {3, -1}, {5, -1}}, "°" },
+ { {{1, 0}, {2, 0}, {5, 0}}, "msus2" }
};
- struct { modified_degree_t degrees[4]; const char *name; } sevenths[] = {
+ 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, 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}, {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}}, "m°" SUP "M7" PUS "sus2" },
+ { {{1, 0}, {2, 0}, {5, -1}, {7, -1}}, "m𝆩" SUP "7" PUS "sus2" },
+ { {{1, 0}, {2, 0}, {5, -1}, {7, -2}}, "m°" 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) {
}
}
- 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;
- break;
+ 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;
+ }
}
- }
- 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;
- break;
+ 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;
- break;
+ 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(sevenths); i++) {
- if (_chord_signature_matches (notes, num_notes,
- sevenths[i].degrees, 4,
- &inversion, &root))
- {
- chord_name = sevenths[i].name;
- break;
+ 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;
}
- break;
}
+ CHORD_NAME_KNOWN:
if (chord_name) {
if (inversion) {
projects / scherzo / blobdiff