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

[GSUB/GPOS/Indic] Apply GSUB/GPOS within syllables only 

This does not apply to the context matchings.

This regresses tests right now.  And we are not sure whether this is
the right thing to do for GPOS.  But we'll figure out.
This commit is contained in:
Behdad Esfahbod 2012-05-11 17:29:40 +02:00
parent 8fd83aaf6e
commit 5f131d3226
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-ot-layout-gsubgpos-private.hh
View File

@ -135,12 +135,14 @@ struct hb_apply_context_t
inline mark_skipping_forward_iterator_t (hb_apply_context_t *c_, inline mark_skipping_forward_iterator_t (hb_apply_context_t *c_,
unsigned int start_index_, unsigned int start_index_,
unsigned int num_items_, unsigned int num_items_,
hb_mask_t mask_ = 0) hb_mask_t mask_ = 0,
bool match_syllable_ = true)
{ {
c = c_; c = c_;
idx = start_index_; idx = start_index_;
num_items = num_items_; num_items = num_items_;
mask = mask_ ? mask_ : c->lookup_mask; mask = mask_ ? mask_ : c->lookup_mask;
syllable = match_syllable_ ? c->buffer->info[c->buffer->idx].syllable () : 0;
end = MIN (c->buffer->len, c->buffer->idx + c->context_length); end = MIN (c->buffer->len, c->buffer->idx + c->context_length);
} }
inline bool has_no_chance (void) const inline bool has_no_chance (void) const
@ -158,7 +160,7 @@ struct hb_apply_context_t
idx++; idx++;
} while (_hb_ot_layout_skip_mark (c->face, &c->buffer->info[idx], lookup_props, property_out)); } while (_hb_ot_layout_skip_mark (c->face, &c->buffer->info[idx], lookup_props, property_out));
num_items--; num_items--;
return !!(c->buffer->info[idx].mask & mask); return (c->buffer->info[idx].mask & mask) && (!syllable || syllable == c->buffer->info[idx].syllable ());
} }
inline bool next (unsigned int *property_out = NULL) inline bool next (unsigned int *property_out = NULL)
{ {
@ -170,6 +172,7 @@ struct hb_apply_context_t
hb_apply_context_t *c; hb_apply_context_t *c;
unsigned int num_items; unsigned int num_items;
hb_mask_t mask; hb_mask_t mask;
uint8_t syllable;
unsigned int end; unsigned int end;
}; };
@ -178,12 +181,14 @@ struct hb_apply_context_t
inline mark_skipping_backward_iterator_t (hb_apply_context_t *c_, inline mark_skipping_backward_iterator_t (hb_apply_context_t *c_,
unsigned int start_index_, unsigned int start_index_,
unsigned int num_items_, unsigned int num_items_,
hb_mask_t mask_ = 0) hb_mask_t mask_ = 0,
bool match_syllable_ = true)
{ {
c = c_; c = c_;
idx = start_index_; idx = start_index_;
num_items = num_items_; num_items = num_items_;
mask = mask_ ? mask_ : c->lookup_mask; mask = mask_ ? mask_ : c->lookup_mask;
syllable = match_syllable_ ? c->buffer->info[c->buffer->idx].syllable () : 0;
} }
inline bool has_no_chance (void) const inline bool has_no_chance (void) const
{ {
@ -200,7 +205,7 @@ struct hb_apply_context_t
idx--; idx--;
} while (_hb_ot_layout_skip_mark (c->face, &c->buffer->out_info[idx], lookup_props, property_out)); } while (_hb_ot_layout_skip_mark (c->face, &c->buffer->out_info[idx], lookup_props, property_out));
num_items--; num_items--;
return !!(c->buffer->out_info[idx].mask & mask); return (c->buffer->out_info[idx].mask & mask) && (!syllable || syllable == c->buffer->out_info[idx].syllable ());
} }
inline bool prev (unsigned int *property_out = NULL) inline bool prev (unsigned int *property_out = NULL)
{ {
@ -212,6 +217,7 @@ struct hb_apply_context_t
hb_apply_context_t *c; hb_apply_context_t *c;
unsigned int num_items; unsigned int num_items;
hb_mask_t mask; hb_mask_t mask;
uint8_t syllable;
}; };
inline bool should_mark_skip_current_glyph (void) const inline bool should_mark_skip_current_glyph (void) const
@ -341,7 +347,7 @@ static inline bool match_backtrack (hb_apply_context_t *c,
match_func_t match_func, match_func_t match_func,
const void *match_data) const void *match_data)
{ {
hb_apply_context_t::mark_skipping_backward_iterator_t skippy_iter (c, c->buffer->backtrack_len (), count, (hb_mask_t) -1); hb_apply_context_t::mark_skipping_backward_iterator_t skippy_iter (c, c->buffer->backtrack_len (), count, (hb_mask_t) -1, false);
if (skippy_iter.has_no_chance ()) if (skippy_iter.has_no_chance ())
return false; return false;
@ -364,7 +370,7 @@ static inline bool match_lookahead (hb_apply_context_t *c,
const void *match_data, const void *match_data,
unsigned int offset) unsigned int offset)
{ {
hb_apply_context_t::mark_skipping_forward_iterator_t skippy_iter (c, c->buffer->idx + offset - 1, count, (hb_mask_t) -1); hb_apply_context_t::mark_skipping_forward_iterator_t skippy_iter (c, c->buffer->idx + offset - 1, count, (hb_mask_t) -1, false);
if (skippy_iter.has_no_chance ()) if (skippy_iter.has_no_chance ())
return false; return false;