From 0d91a08ddeea3e07edb853e01f3b3dfde18ea7d7 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 26 Sep 2011 21:45:43 -0700 Subject: [PATCH] Add correct sizing/spacing of staves and braces for ledger lines. At this point, we're ready to run quizzes for any white key on the piano. --- scherzo.c | 2 +- score.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/scherzo.c b/scherzo.c index 0ff68d1..98f70bd 100644 --- a/scherzo.c +++ b/scherzo.c @@ -92,7 +92,7 @@ on_expose_event_draw (GtkWidget *widget, cairo_paint (cr); /* Add some padding on the sides and top */ - cairo_translate (cr, pad, 2 * scherzo->staff_height); + cairo_translate (cr, pad, scherzo->staff_height); score_set_staff_height (score, scherzo->staff_height); score_set_width (score, widget_width - 2 * pad); diff --git a/score.c b/score.c index 0228b6e..6530a50 100644 --- a/score.c +++ b/score.c @@ -28,6 +28,13 @@ struct score_staff score_note_t **notes; int num_notes; + + /* How many ledger lines are needed for current notes */ + int upper_ledger_lines; + int lower_ledger_lines; + + /* Y position of top full line of staff */ + int y_pos; }; typedef struct score_brace @@ -38,7 +45,7 @@ typedef struct score_brace struct score { - /* Height of a single staff */ + /* Nominal height of a single staff (ledger lines may make it larger) */ int staff_height; /* Height of one space within a staff */ @@ -108,9 +115,16 @@ _draw_brace (score_t *score, cairo_t *cr, { cairo_glyph_t brace_glyph; cairo_text_extents_t brace_extents; + double top, bottom; + + if (brace->num_staves == 0) + return; cairo_save (cr); + top = score->staves[brace->first_staff]->y_pos; + bottom = score->staves[brace->first_staff + brace->num_staves - 1]->y_pos + score->staff_height; + cairo_select_font_face (cr, "Gonville-Brace", 0, 0); /* XXX: This hard-coded glyph index is pretty ugly. We should @@ -120,13 +134,13 @@ _draw_brace (score_t *score, cairo_t *cr, * than just the bare index here). */ brace_glyph.index = 300; brace_glyph.x = 0; - brace_glyph.y = score->staff_height * (brace->first_staff + (2 * brace->num_staves - 1) / 2.0) + 1; + brace_glyph.y = top + (bottom - top) / 2.0 + score->line_width / 2.0; /* XXX: This font size (in conjunction with the glyph selection) * is a rough guess at best. We should figure out how the brace * font is intended to be used and actually measure to find the * correctly-sized glyph. */ - cairo_set_font_size (cr, (score->staff_height * 3) / 3.85); + cairo_set_font_size (cr, (bottom - top) / 3.85); cairo_glyph_extents (cr, &brace_glyph, 1, &brace_extents); @@ -244,6 +258,8 @@ _draw_staff (score_t *score, cairo_t *cr, cairo_save (cr); + cairo_translate (cr, 0, staff->y_pos); + cairo_select_font_face (cr, "Gonville-26", 0, 0); cairo_set_font_size (cr, score->staff_height); @@ -262,7 +278,7 @@ _draw_staff (score_t *score, cairo_t *cr, break; } clef_glyph.x = 3 * score->line_width; - clef_glyph.y += 1; + clef_glyph.y += score->line_width / 2.0; cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ cairo_show_glyphs (cr, &clef_glyph, 1); @@ -297,9 +313,25 @@ score_draw (score_t *score, cairo_t *cr) { int i; int staff_width = score->width; + int staff_y_pos; + + if (score->num_staves == 0) + return; cairo_save (cr); + /* Before drawing anything, position each staff based on the size + * of each (including ledger lines) */ + staff_y_pos = 0; + for (i = 0; i < score->num_staves; i++) { + score_staff_t *staff = score->staves[i]; + staff_y_pos += staff->upper_ledger_lines * score->space_height; + staff->y_pos = staff_y_pos; + staff_y_pos += (score->staff_height + + staff->lower_ledger_lines * score->space_height + + score->staff_height); + } + if (score->num_braces) { int brace_width; @@ -319,16 +351,16 @@ score_draw (score_t *score, cairo_t *cr) /* Vertical lines at each end */ cairo_rectangle (cr, score->line_width / 2.0, - score->line_width / 2.0, + score->staves[0]->y_pos + score->line_width / 2.0, staff_width - score->line_width, - score->staff_height * 3); + score->staves[score->num_staves-1]->y_pos + score->staff_height - score->staves[0]->y_pos); cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ cairo_set_line_width (cr, score->line_width); cairo_stroke (cr); for (i = 0; i < score->num_staves; i++) { - _draw_staff (score, cr, score->staves[i], staff_width); - cairo_translate (cr, 0, 2 * score->staff_height); + score_staff_t *staff = score->staves[i]; + _draw_staff (score, cr, staff, staff_width); } cairo_restore (cr); @@ -374,6 +406,9 @@ score_add_staff (score_t *score, score_clef_t clef) staff->notes = NULL; staff->num_notes = 0; + staff->upper_ledger_lines = 0; + staff->lower_ledger_lines = 0; + score->num_staves++; score->staves = talloc_realloc (score, score->staves, @@ -396,6 +431,7 @@ score_add_note (score_staff_t *staff, score_duration_t duration) { score_note_t *note; + double line; note = talloc (staff, score_note_t); if (note == NULL) @@ -406,6 +442,17 @@ score_add_note (score_staff_t *staff, note->octave = octave; note->duration = duration; + line = _score_note_to_line (staff, note); + if (line < 0) { + int lines = (int) (- line); + if (lines > staff->upper_ledger_lines) + staff->upper_ledger_lines = lines; + } else { + int lines = (int) (line - 4); + if (lines > staff->lower_ledger_lines) + staff->lower_ledger_lines = lines; + } + staff->num_notes++; staff->notes = talloc_realloc (staff, staff->notes, -- 2.43.0