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

Separate fallback kern vs mark positioning

This commit is contained in:
Behdad Esfahbod 2018-10-08 23:30:24 -04:00
parent 3c23ff9b7c
commit 09ad2613c8
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,9 +162,9 @@ recategorize_combining_class (hb_codepoint_t u,
} }
void void
_hb_ot_shape_fallback_position_recategorize_marks (const hb_ot_shape_plan_t *plan HB_UNUSED, _hb_ot_shape_fallback_mark_position_recategorize_marks (const hb_ot_shape_plan_t *plan HB_UNUSED,
hb_font_t *font HB_UNUSED, hb_font_t *font HB_UNUSED,
hb_buffer_t *buffer) hb_buffer_t *buffer)
{ {
unsigned int count = buffer->len; unsigned int count = buffer->len;
hb_glyph_info_t *info = buffer->info; hb_glyph_info_t *info = buffer->info;
@ -417,9 +417,9 @@ position_cluster (const hb_ot_shape_plan_t *plan,
} }
void void
_hb_ot_shape_fallback_position (const hb_ot_shape_plan_t *plan, _hb_ot_shape_fallback_mark_position (const hb_ot_shape_plan_t *plan,
hb_font_t *font, hb_font_t *font,
hb_buffer_t *buffer) hb_buffer_t *buffer)
{ {
_hb_buffer_assert_gsubgpos_vars (buffer); _hb_buffer_assert_gsubgpos_vars (buffer);

12
src/hb-ot-shape-fallback.hh
View File

@ -32,13 +32,13 @@
#include "hb-ot-shape.hh" #include "hb-ot-shape.hh"
HB_INTERNAL void _hb_ot_shape_fallback_position (const hb_ot_shape_plan_t *plan, HB_INTERNAL void _hb_ot_shape_fallback_mark_position (const hb_ot_shape_plan_t *plan,
hb_font_t *font, hb_font_t *font,
hb_buffer_t *buffer); hb_buffer_t *buffer);
HB_INTERNAL void _hb_ot_shape_fallback_position_recategorize_marks (const hb_ot_shape_plan_t *plan, HB_INTERNAL void _hb_ot_shape_fallback_mark_position_recategorize_marks (const hb_ot_shape_plan_t *plan,
hb_font_t *font, hb_font_t *font,
hb_buffer_t *buffer); hb_buffer_t *buffer);
HB_INTERNAL void _hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan, HB_INTERNAL void _hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan,

15
src/hb-ot-shape.cc
View File

@ -70,7 +70,8 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan,
plan.shaper->gpos_tag != plan.map.chosen_script[1]; plan.shaper->gpos_tag != plan.map.chosen_script[1];
plan.apply_gpos = !disable_gpos && hb_ot_layout_has_positioning (face); plan.apply_gpos = !disable_gpos && hb_ot_layout_has_positioning (face);
plan.fallback_positioning = !plan.apply_gpos; plan.fallback_kerning = !plan.apply_gpos;
plan.fallback_mark_positioning = !plan.apply_gpos;
plan.fallback_glyph_classes = !hb_ot_layout_has_glyph_classes (face); plan.fallback_glyph_classes = !hb_ot_layout_has_glyph_classes (face);
} }
@ -648,8 +649,8 @@ hb_ot_substitute_default (const hb_ot_shape_context_t *c)
hb_ot_shape_setup_masks (c); hb_ot_shape_setup_masks (c);
/* This is unfortunate to go here, but necessary... */ /* This is unfortunate to go here, but necessary... */
if (c->plan->fallback_positioning) if (c->plan->fallback_mark_positioning)
_hb_ot_shape_fallback_position_recategorize_marks (c->plan, c->font, buffer); _hb_ot_shape_fallback_mark_position_recategorize_marks (c->plan, c->font, buffer);
hb_ot_map_glyphs_fast (buffer); hb_ot_map_glyphs_fast (buffer);
@ -762,7 +763,7 @@ hb_ot_position_complex (const hb_ot_shape_context_t *c)
* If fallback positinoing happens or GPOS is present, we don't * If fallback positinoing happens or GPOS is present, we don't
* care. * care.
*/ */
bool adjust_offsets_when_zeroing = c->plan->fallback_positioning && bool adjust_offsets_when_zeroing = c->plan->fallback_mark_positioning &&
!c->plan->shaper->fallback_position && !c->plan->shaper->fallback_position &&
HB_DIRECTION_IS_FORWARD (c->buffer->props.direction); HB_DIRECTION_IS_FORWARD (c->buffer->props.direction);
@ -826,15 +827,15 @@ hb_ot_position (const hb_ot_shape_context_t *c)
hb_ot_position_complex (c); hb_ot_position_complex (c);
if (c->plan->fallback_positioning && c->plan->shaper->fallback_position) if (c->plan->fallback_mark_positioning && c->plan->shaper->fallback_position)
_hb_ot_shape_fallback_position (c->plan, c->font, c->buffer); _hb_ot_shape_fallback_mark_position (c->plan, c->font, c->buffer);
if (HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction)) if (HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction))
hb_buffer_reverse (c->buffer); hb_buffer_reverse (c->buffer);
/* Visual fallback goes here. */ /* Visual fallback goes here. */
if (c->plan->fallback_positioning) if (c->plan->fallback_kerning)
_hb_ot_shape_fallback_kern (c->plan, c->font, c->buffer); _hb_ot_shape_fallback_kern (c->plan, c->font, c->buffer);
_hb_buffer_deallocate_gsubgpos_vars (c->buffer); _hb_buffer_deallocate_gsubgpos_vars (c->buffer);

4
src/hb-ot-shape.hh
View File

@ -46,11 +46,11 @@ struct hb_ot_shape_plan_t
bool has_frac : 1; bool has_frac : 1;
bool kerning_requested : 1; bool kerning_requested : 1;
bool has_gpos_mark : 1; bool has_gpos_mark : 1;
bool fallback_positioning : 1;
bool fallback_glyph_classes : 1; bool fallback_glyph_classes : 1;
bool fallback_kerning : 1;
bool fallback_mark_positioning : 1;
bool apply_morx : 1; bool apply_morx : 1;
bool apply_gpos : 1; bool apply_gpos : 1;