* along with this program. If not, see http://www.gnu.org/licenses/ .
*/
+#include <pango/pangocairo.h>
+
#include <string.h>
#include "score.h"
_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);
}
score_staff_t *staff, score_note_t *note)
{
double line;
- cairo_glyph_t note_glyph;
+ cairo_glyph_t note_glyph[2];
static double extend_factor = 0.25;
+ cairo_text_extents_t extents;
+ int num_glyphs = 0;
- void _draw_ledger_line (double line, double width) {
- cairo_move_to (cr,
- - width * extend_factor / 2.0,
+ void _draw_ledger_line (double line, double offset, double width) {
+ cairo_move_to (cr, offset - extend_factor * width / 2.0,
score->space_height * line + score->line_width / 2.0);
cairo_rel_line_to (cr, (1 + extend_factor) * width, 0);
cairo_stroke (cr);
cairo_save (cr);
+ /* Move right so that X==0 is natural position for non-displaced
+ * noteheads.
+ */
+ cairo_translate (cr, score->space_height, 0);
+
/* Which line should the note appear on? Line 0 is the top line of
* the staff and increasing downwards. (Negative values indicate a
* note on a ledger line above the staff). Values half way between
/* 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:
+ note_glyph[num_glyphs].index = 77;
+ break;
+ case SCORE_PITCH_ACCIDENTAL_FLAT:
+ note_glyph[num_glyphs].index = 68;
+ break;
+ case SCORE_PITCH_ACCIDENTAL_NATURAL:
+ note_glyph[num_glyphs].index = 101;
+ break;
+ case SCORE_PITCH_ACCIDENTAL_SHARP:
+ note_glyph[num_glyphs].index = 134;
+ break;
+ case SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP:
+ note_glyph[num_glyphs].index = 142;
+ break;
+ }
+
+ if (SCORE_PITCH_ACCIDENTAL (note->pitch) != SCORE_PITCH_ACCIDENTAL_NATURAL)
+ {
+ note_glyph[num_glyphs].x = 0;
+
+ note_glyph[num_glyphs].y = score->space_height * line;
+
+ num_glyphs++;
+
+ cairo_glyph_extents (cr, note_glyph, num_glyphs, &extents);
+
+#define ACCIDENTAL_NOTE_SPACING (score->space_height * .15)
+
+ note_glyph[0].x = - (extents.width + ACCIDENTAL_NOTE_SPACING);
+ }
+
switch (note->duration) {
case SCORE_DURATION_1:
- note_glyph.index = 127;
+ note_glyph[num_glyphs].index = 127;
break;
case SCORE_DURATION_2:
- note_glyph.index = 85;
+ note_glyph[num_glyphs].index = 85;
break;
case SCORE_DURATION_4:
case SCORE_DURATION_8:
case SCORE_DURATION_64:
case SCORE_DURATION_128:
default:
- note_glyph.index = 84;
+ note_glyph[num_glyphs].index = 84;
}
- note_glyph.x = 0;
- note_glyph.y = score->space_height * line;
+ note_glyph[num_glyphs].x = 0;
+ note_glyph[num_glyphs].y = score->space_height * line;
+
+ num_glyphs++;
if (line < 0 || line > 4) {
+ double offset, width;
int i;
- cairo_text_extents_t note_extents;
- cairo_glyph_extents (cr, ¬e_glyph, 1, ¬e_extents);
+ cairo_glyph_extents (cr, note_glyph, num_glyphs, &extents);
+ offset = note_glyph[0].x + extents.x_bearing;
+ width = extents.width;
if (line < 0) {
for (i = -1; i >= line; i--)
- _draw_ledger_line (i, note_extents.width);
+ _draw_ledger_line (i, offset, width);
} else {
for (i = 5; i <= line; i++)
- _draw_ledger_line (i, note_extents.width);
+ _draw_ledger_line (i, offset, width);
}
}
note->color.r,
note->color.g,
note->color.b);
- cairo_show_glyphs (cr, ¬e_glyph, 1);
+ cairo_show_glyphs (cr, note_glyph, num_glyphs);
cairo_restore (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);
if (chord == NULL)
return NULL;
+ talloc_steal (chord, name);
+
chord->staff = staff;
chord->name = talloc_strdup (chord, name);
projects / scherzo / blobdiff