walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[graphite] Fix shaping with varying font sizes 

Shape using design units and scale the output.

See https://bugs.documentfoundation.org/show_bug.cgi?id=103403#c7
This commit is contained in:
Khaled Hosny 2016-10-30 20:16:41 +02:00
parent af596a5655
commit 1b00a3b048
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hb-graphite2.cc
View File

@ -164,9 +164,10 @@ _hb_graphite2_shaper_font_data_create (hb_font_t *font)
if (unlikely (!hb_graphite2_shaper_face_data_ensure (font->face))) return NULL; if (unlikely (!hb_graphite2_shaper_face_data_ensure (font->face))) return NULL;
hb_face_t *face = font->face; hb_face_t *face = font->face;
unsigned int upem = hb_face_get_upem (face);
hb_graphite2_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); hb_graphite2_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face);
return gr_make_font_with_advance_fn (font->x_scale, font, &hb_graphite2_get_advance, face_data->grface); return gr_make_font_with_advance_fn (upem, font, &hb_graphite2_get_advance, face_data->grface);
} }
void void
@ -230,7 +231,6 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan,
{ {
hb_face_t *face = font->face; hb_face_t *face = font->face;
gr_face *grface = HB_SHAPER_DATA_GET (face)->grface; gr_face *grface = HB_SHAPER_DATA_GET (face)->grface;
gr_font *grfont = HB_SHAPER_DATA_GET (font);
const char *lang = hb_language_to_string (hb_buffer_get_language (buffer)); const char *lang = hb_language_to_string (hb_buffer_get_language (buffer));
const char *lang_end = lang ? strchr (lang, '-') : NULL; const char *lang_end = lang ? strchr (lang, '-') : NULL;
@ -262,7 +262,7 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan,
hb_tag_t script_tag[2]; hb_tag_t script_tag[2];
hb_ot_tags_from_script (hb_buffer_get_script (buffer), &script_tag[0], &script_tag[1]); hb_ot_tags_from_script (hb_buffer_get_script (buffer), &script_tag[0], &script_tag[1]);
seg = gr_make_seg (grfont, grface, seg = gr_make_seg (NULL, grface,
script_tag[1] == HB_TAG_NONE ? script_tag[0] : script_tag[1], script_tag[1] == HB_TAG_NONE ? script_tag[0] : script_tag[1],
feats, feats,
gr_utf32, chars, buffer->len, gr_utf32, chars, buffer->len,
@ -373,7 +373,10 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan,
} }
buffer->len = glyph_count; buffer->len = glyph_count;
float yscale = font->y_scale / font->x_scale; unsigned int upem = hb_face_get_upem (face);
float xscale = (float) font->x_scale / upem;
float yscale = (float) font->y_scale / upem;
yscale *= yscale / xscale;
/* Positioning. */ /* Positioning. */
if (!HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) if (!HB_DIRECTION_IS_BACKWARD(buffer->props.direction))
{ {
@ -383,16 +386,16 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan,
curradvx = 0; curradvx = 0;
for (is = gr_seg_first_slot (seg); is; pPos++, ++info, is = gr_slot_next_in_segment (is)) for (is = gr_seg_first_slot (seg); is; pPos++, ++info, is = gr_slot_next_in_segment (is))
{ {
pPos->x_offset = gr_slot_origin_X (is) - curradvx; pPos->x_offset = gr_slot_origin_X (is) * xscale - curradvx;
pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy; pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy;
if (info->cluster != currclus) { if (info->cluster != currclus) {
pPos->x_advance = info->var1.i32; pPos->x_advance = info->var1.i32 * xscale;
curradvx += pPos->x_advance; curradvx += pPos->x_advance;
currclus = info->cluster; currclus = info->cluster;
} else } else
pPos->x_advance = 0.; pPos->x_advance = 0.;
pPos->y_advance = gr_slot_advance_Y (is, grface, grfont) * yscale; pPos->y_advance = gr_slot_advance_Y (is, grface, NULL) * yscale;
curradvy += pPos->y_advance; curradvy += pPos->y_advance;
} }
} }
@ -401,20 +404,20 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan,
int currclus = -1; int currclus = -1;
const hb_glyph_info_t *info = buffer->info; const hb_glyph_info_t *info = buffer->info;
hb_glyph_position_t *pPos = hb_buffer_get_glyph_positions (buffer, NULL); hb_glyph_position_t *pPos = hb_buffer_get_glyph_positions (buffer, NULL);
curradvx = gr_seg_advance_X(seg); curradvx = gr_seg_advance_X(seg) * xscale;
for (is = gr_seg_first_slot (seg); is; pPos++, info++, is = gr_slot_next_in_segment (is)) for (is = gr_seg_first_slot (seg); is; pPos++, info++, is = gr_slot_next_in_segment (is))
{ {
if (info->cluster != currclus) if (info->cluster != currclus)
{ {
pPos->x_advance = info->var1.i32; pPos->x_advance = info->var1.i32 * xscale;
if (currclus != -1) curradvx -= info[-1].var1.i32; if (currclus != -1) curradvx -= info[-1].var1.i32 * xscale;
currclus = info->cluster; currclus = info->cluster;
} else } else
pPos->x_advance = 0.; pPos->x_advance = 0.;
pPos->y_advance = gr_slot_advance_Y (is, grface, grfont) * yscale; pPos->y_advance = gr_slot_advance_Y (is, grface, NULL) * yscale;
curradvy -= pPos->y_advance; curradvy -= pPos->y_advance;
pPos->x_offset = gr_slot_origin_X (is) - curradvx + pPos->x_advance; pPos->x_offset = gr_slot_origin_X (is) * xscale - curradvx + pPos->x_advance;
pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy; pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy;
} }
hb_buffer_reverse_clusters (buffer); hb_buffer_reverse_clusters (buffer);