X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=e047f979b6f77d2ba36f2146cbe74cf8f38fcc06;hb=659f6814cb925cfcd1db6dd1cfd92944f76991e5;hp=25187ba06e19a7ead61a27aae5fc77b6c351828e;hpb=5a43b0324c6353c1541a3c1fad52e2f040ab389d;p=scherzo diff --git a/score.c b/score.c index 25187ba..e047f97 100644 --- a/score.c +++ b/score.c @@ -18,6 +18,8 @@ * along with this program. If not, see http://www.gnu.org/licenses/ . */ +#include + #include #include "score.h" @@ -186,8 +188,11 @@ static void _draw_chord (score_t *score, cairo_t *cr, score_staff_t *staff, score_chord_t *chord) { - cairo_text_extents_t chord_extents; + PangoRectangle ink_extents; + PangoRectangle logical_extents; double total_staff_height; + PangoLayout *layout; + PangoFontDescription *font_description; /* XXX: The staff should manage this height itself. */ total_staff_height = (staff->upper_ledger_lines * score->space_height + @@ -196,19 +201,30 @@ _draw_chord (score_t *score, cairo_t *cr, cairo_save (cr); - cairo_text_extents (cr, chord->name, &chord_extents); + font_description = pango_font_description_new (); + pango_font_description_set_family (font_description, "serif"); + pango_font_description_set_absolute_size (font_description, + score->space_height * 3 * PANGO_SCALE); + + layout = pango_cairo_create_layout (cr); + pango_layout_set_font_description (layout, font_description); + pango_layout_set_markup (layout, chord->name, -1); - cairo_select_font_face (cr, "serif", 0, 0); - cairo_set_font_size (cr, score->space_height * 3); + pango_layout_line_get_pixel_extents (pango_layout_get_line (layout, 0), + &ink_extents, &logical_extents); if (staff->clef == SCORE_CLEF_G) cairo_move_to (cr, 0, - score->space_height * 0.5); else - cairo_move_to (cr, 0, score->space_height * 0.5 + total_staff_height + chord_extents.y_bearing); + cairo_move_to (cr, 0, score->space_height * 0.5 + total_staff_height + + logical_extents.height); - cairo_show_text (cr, chord->name); + pango_cairo_show_layout_line (cr, pango_layout_get_line (layout, 0)); - chord->width = chord_extents.x_advance; + g_object_unref (layout); + pango_font_description_free (font_description); + + chord->width = logical_extents.width; cairo_restore (cr); } @@ -425,7 +441,8 @@ score_draw (score_t *score, cairo_t *cr) if (score->num_braces) { - int brace_width; + /* Initialize to keep the compiler quiet. */ + int brace_width = 0; for (i = 0; i < score->num_braces; i++) _draw_brace (score, cr, score->braces[i], &brace_width); @@ -528,6 +545,8 @@ score_add_chord (score_staff_t *staff, if (chord == NULL) return NULL; + talloc_steal (chord, name); + chord->staff = staff; chord->name = talloc_strdup (chord, name);