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

Port TrueType-kerning to use skippy iterator 

It skips joiners and default ignorables now.  Skips marks too, but only
if there is proper GDEF classes for marks.
This commit is contained in:
Behdad Esfahbod 2013-02-21 15:39:57 -05:00
parent 722e8b857e
commit d46606e119
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/hb-ot-shape-fallback.cc
View File

@ -25,6 +25,7 @@
*/ */
#include "hb-ot-shape-fallback-private.hh" #include "hb-ot-shape-fallback-private.hh"
#include "hb-ot-layout-gsubgpos-private.hh"
static unsigned int static unsigned int
recategorize_combining_class (hb_codepoint_t u, recategorize_combining_class (hb_codepoint_t u,
@ -419,31 +420,36 @@ _hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan,
hb_mask_t kern_mask = plan->map.get_1_mask (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction) ? hb_mask_t kern_mask = plan->map.get_1_mask (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction) ?
HB_TAG ('k','e','r','n') : HB_TAG ('v','k','r','n')); HB_TAG ('k','e','r','n') : HB_TAG ('v','k','r','n'));
if (unlikely (!count)) return; OT::hb_apply_context_t c (1, font, buffer, kern_mask, true/*auto_joiners*/);
c.set_lookup_props (OT::LookupFlag::IgnoreMarks);
bool enabled = buffer->info[0].mask & kern_mask; for (buffer->idx = 0; buffer->idx < count;)
for (unsigned int i = 1; i < count; i++)
{ {
bool next = buffer->info[i].mask & kern_mask; OT::hb_apply_context_t::skipping_forward_iterator_t skippy_iter (&c, buffer->idx, 1);
if (enabled && next) if (!skippy_iter.next ())
{ {
hb_position_t x_kern, y_kern, kern1, kern2; buffer->idx++;
font->get_glyph_kerning_for_direction (buffer->info[i - 1].codepoint, buffer->info[i].codepoint, continue;
buffer->props.direction,
&x_kern, &y_kern);
kern1 = x_kern >> 1;
kern2 = x_kern - kern1;
buffer->pos[i - 1].x_advance += kern1;
buffer->pos[i].x_advance += kern2;
buffer->pos[i].x_offset += kern2;
kern1 = y_kern >> 1;
kern2 = y_kern - kern1;
buffer->pos[i - 1].y_advance += kern1;
buffer->pos[i].y_advance += kern2;
buffer->pos[i].y_offset += kern2;
} }
enabled = next;
hb_position_t x_kern, y_kern, kern1, kern2;
font->get_glyph_kerning_for_direction (buffer->info[buffer->idx].codepoint,
buffer->info[skippy_iter.idx].codepoint,
buffer->props.direction,
&x_kern, &y_kern);
kern1 = x_kern >> 1;
kern2 = x_kern - kern1;
buffer->pos[buffer->idx].x_advance += kern1;
buffer->pos[skippy_iter.idx].x_advance += kern2;
buffer->pos[skippy_iter.idx].x_offset += kern2;
kern1 = y_kern >> 1;
kern2 = y_kern - kern1;
buffer->pos[buffer->idx].y_advance += kern1;
buffer->pos[skippy_iter.idx].y_advance += kern2;
buffer->pos[skippy_iter.idx].y_offset += kern2;
buffer->idx = skippy_iter.idx;
} }
} }