organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-05 13:35:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

[matcher] Make per-syllable explicit

Browse source 
The logic here was made to enable per-syllable matching for input,
and not for backtrack/lookahead. However, if input-length is 1,
this was setting per-syllable for lookahead, which caused the following:

https://github.com/harfbuzz/harfbuzz/discussions/4509

I have no idea why the tests are failing. Needs investigation.

I also have no idea why this was not discovered before.
This commit is contained in:
Behdad Esfahbod 2023-12-02 07:01:24 -05:00
parent bf84135edd
commit 0edab286ee
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/hb-ot-layout-gsubgpos.hh
View file

@ -518,11 +518,14 @@ struct hb_ot_apply_context_t :
#ifndef HB_OPTIMIZE_SIZE
HB_ALWAYS_INLINE
#endif
void reset (unsigned int start_index_)
void reset (unsigned int start_index_, bool per_syllable = true)
{
idx = start_index_;
end = c->buffer->len;
matcher.set_syllable (start_index_ == c->buffer->idx ? c->buffer->cur().syllable () : 0);
if (per_syllable)
matcher.set_syllable (start_index_ == c->buffer->idx ? c->buffer->cur().syllable () : 0);
else
matcher.set_syllable (0);
}
#ifndef HB_OPTIMIZE_SIZE
@ -1505,7 +1508,7 @@ static bool match_backtrack (hb_ot_apply_context_t *c,
TRACE_APPLY (nullptr);
hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
skippy_iter.reset (c->buffer->backtrack_len ());
skippy_iter.reset (c->buffer->backtrack_len (), false);
skippy_iter.set_match_func (match_func, match_data);
skippy_iter.set_glyph_data (backtrack);
@ -1538,7 +1541,7 @@ static bool match_lookahead (hb_ot_apply_context_t *c,
TRACE_APPLY (nullptr);
hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
skippy_iter.reset (start_index - 1);
skippy_iter.reset (start_index - 1, false);
skippy_iter.set_match_func (match_func, match_data);
skippy_iter.set_glyph_data (lookahead);