* along with this program. If not, see http://www.gnu.org/licenses/ .
*/
+#include <pango/pangocairo.h>
+
#include <string.h>
#include "score.h"
static double
_score_note_to_line (score_staff_t *staff, score_note_t *note)
{
- score_pitch_name_t name = SCORE_PITCH_NAME (note->pitch);
+ pitch_name_t name = PITCH_NAME (note->pitch);
int c_line = _score_clef_c_line (staff->clef);
- return c_line - (name - SCORE_PITCH_NAME_C) / 2.0 - 3.5 * (note->octave - 4);
+ return c_line - (name - PITCH_NAME_C) / 2.0 - 3.5 * (note->octave - 4);
}
/* chord->width is updated as a side effect */
_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 +
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);
+
+ pango_cairo_show_layout_line (cr, pango_layout_get_line (layout, 0));
- cairo_show_text (cr, chord->name);
+ g_object_unref (layout);
+ pango_font_description_free (font_description);
- chord->width = chord_extents.x_advance;
+ chord->width = logical_extents.width;
cairo_restore (cr);
}
/* XXX: The hard-coded glyph indices here are very ugly. We should
* figure out how to lookup glyphs by name from this font. */
- switch (SCORE_PITCH_ACCIDENTAL (note->pitch)) {
- case SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT:
+ switch (PITCH_ACCIDENTAL (note->pitch)) {
+ case PITCH_ACCIDENTAL_DOUBLE_FLAT:
note_glyph[num_glyphs].index = 77;
break;
- case SCORE_PITCH_ACCIDENTAL_FLAT:
+ case PITCH_ACCIDENTAL_FLAT:
note_glyph[num_glyphs].index = 68;
break;
- case SCORE_PITCH_ACCIDENTAL_NATURAL:
+ case PITCH_ACCIDENTAL_NATURAL:
note_glyph[num_glyphs].index = 101;
break;
- case SCORE_PITCH_ACCIDENTAL_SHARP:
+ case PITCH_ACCIDENTAL_SHARP:
note_glyph[num_glyphs].index = 134;
break;
- case SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP:
+ case PITCH_ACCIDENTAL_DOUBLE_SHARP:
note_glyph[num_glyphs].index = 142;
break;
}
- if (SCORE_PITCH_ACCIDENTAL (note->pitch) != SCORE_PITCH_ACCIDENTAL_NATURAL)
+ if (PITCH_ACCIDENTAL (note->pitch) != PITCH_ACCIDENTAL_NATURAL)
{
note_glyph[num_glyphs].x = 0;
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);
if (chord == NULL)
return NULL;
+ talloc_steal (chord, name);
+
chord->staff = staff;
chord->name = talloc_strdup (chord, name);
score_note_t *
score_add_note (score_staff_t *staff,
- score_pitch_t pitch,
+ pitch_t pitch,
int octave,
score_duration_t duration)
{
score_note_t *
score_staff_find_note (score_staff_t *staff,
- score_pitch_t pitch,
+ pitch_t pitch,
int octave,
score_duration_t duration)
{
return NULL;
}
-