/* Full width of staff */
int width;
- /* the pitch class of the current (diatonic) key */
- pitch_t key;
+ /* Current (diatonic) key */
+ scherzo_key_t key;
score_brace_t **braces;
int num_braces;
score->width = 1000;
/* Default to C, of course */
- score->key = PITCH_CLASS_LITERAL (C, NATURAL);
+ score->key.pitch = PITCH_CLASS_LITERAL (C, NATURAL);
+ score->key.num_sharps = 0;
+ score->key.num_flats = 0;
score->braces = NULL;
score->num_braces = 0;
void
score_set_key (score_t *score, pitch_t key)
{
- score->key = key;
+ scherzo_key_init (&score->key, key);
}
+
/* Returns in brace_width the width of the brace */
static void
_draw_brace (score_t *score, cairo_t *cr,
cairo_restore (cr);
}
-/* Draw 'note' with accidental (if not NATURAL) at its correct
- * position on 'staff'.
+/* Draw 'note' at its correct position on 'staff'.
+ * If the accidental of 'note' is not contained within the current
+ * key, then draw the accidental as well.
+ *
+ * As a special case, if the note's duration is 0, draw the accidental
+ * alone, regardless of the key. This is useful for drawing the
+ * accidentals of the key signature.
*
* Returns the width of the drawn glyphs.
*/
break;
}
- if (PITCH_ACCIDENTAL (note->pitch) != PITCH_ACCIDENTAL_NATURAL)
+ if (note->duration == 0 ||
+ ! scherzo_key_contains_pitch (&score->key, note->pitch))
{
note_glyph[num_glyphs].x = 0;
}
static void
-_draw_sharps_key_signature (score_t *score, cairo_t *cr,
- score_staff_t *staff, int num_sharps)
+_draw_key_signature (score_t *score, cairo_t *cr,
+ score_staff_t *staff)
{
pitch_t pitch;
double width;
PITCH_LITERAL (B, SHARP, 4)
};
- for (i = 0; i < num_sharps; i++) {
- pitch = sharps_order[i];
-
- if (staff->clef == SCORE_CLEF_BASS)
- pitch = pitch_lower_by_octaves (pitch, 2);
-
- width = _draw_accidental (score, cr, staff, pitch);
-
-#define KEY_SIGNATURE_ACCIDENTAL_SPACING (score->space_height * .15)
- cairo_translate (cr, ceil (width + KEY_SIGNATURE_ACCIDENTAL_SPACING), 0);
- }
-}
-
-static void
-_draw_flats_key_signature (score_t *score, cairo_t *cr,
- score_staff_t *staff, int num_flats)
-{
- pitch_t pitch;
- double width;
- int i;
-
- /* These octave numbers are correct for treble clef. For bass
- * clef, subtract two.
- */
- pitch_name_t flats_order[] = {
+ pitch_t flats_order[] = {
PITCH_LITERAL (B, FLAT, 4),
PITCH_LITERAL (E, FLAT, 5),
PITCH_LITERAL (A, FLAT, 4),
PITCH_LITERAL (F, FLAT, 4),
};
- for (i = 0; i < num_flats; i++) {
- pitch = flats_order[i];
+ for (i = 0; i < score->key.num_sharps; i++) {
+ pitch = sharps_order[i];
if (staff->clef == SCORE_CLEF_BASS)
pitch = pitch_lower_by_octaves (pitch, 2);
width = _draw_accidental (score, cr, staff, pitch);
+#define KEY_SIGNATURE_ACCIDENTAL_SPACING (score->space_height * .15)
cairo_translate (cr, ceil (width + KEY_SIGNATURE_ACCIDENTAL_SPACING), 0);
}
-}
-
-static void
-_draw_key_signature (score_t *score, cairo_t *cr,
- score_staff_t *staff, pitch_t key)
-{
- int i;
- pitch_t sharp_keys[] = {
- PITCH_CLASS_LITERAL (C, NATURAL),
- PITCH_CLASS_LITERAL (G, NATURAL),
- PITCH_CLASS_LITERAL (D, NATURAL),
- PITCH_CLASS_LITERAL (A, NATURAL),
- PITCH_CLASS_LITERAL (E, NATURAL),
- PITCH_CLASS_LITERAL (B, NATURAL),
- PITCH_CLASS_LITERAL (F, SHARP),
- PITCH_CLASS_LITERAL (C, SHARP),
- };
+ for (i = 0; i < score->key.num_flats; i++) {
+ pitch = flats_order[i];
- pitch_t flat_keys[] = {
- PITCH_CLASS_LITERAL (C, NATURAL),
- PITCH_CLASS_LITERAL (F, NATURAL),
- PITCH_CLASS_LITERAL (B, FLAT),
- PITCH_CLASS_LITERAL (E, FLAT),
- PITCH_CLASS_LITERAL (A, FLAT),
- PITCH_CLASS_LITERAL (D, FLAT),
- PITCH_CLASS_LITERAL (G, FLAT),
- PITCH_CLASS_LITERAL (C, FLAT)
- };
+ if (staff->clef == SCORE_CLEF_BASS)
+ pitch = pitch_lower_by_octaves (pitch, 2);
- for (i = 0; i < ARRAY_SIZE (sharp_keys); i++) {
- if (sharp_keys[i] == key) {
- _draw_sharps_key_signature (score, cr, staff, i);
- return;
- }
- }
+ width = _draw_accidental (score, cr, staff, pitch);
- for (i = 0; i < ARRAY_SIZE (flat_keys); i++) {
- if (flat_keys[i] == key) {
- _draw_flats_key_signature (score, cr, staff, i);
- return;
- }
+ cairo_translate (cr, ceil (width + KEY_SIGNATURE_ACCIDENTAL_SPACING), 0);
}
-
- fprintf (stderr, "Internal error: Not a key: %s\n", pitch_string (key));
- exit (1);
}
static void
CLEF_KEY_SIGNATURE_SPACING), 0);
/* Draw the key signature */
- _draw_key_signature (score, cr, staff, score->key);
+ _draw_key_signature (score, cr, staff);
/* Draw chord symbols */
cairo_save (cr);