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

[>64k:layout] Support HBUINT24 in skippy_iter

This commit is contained in:
Behdad Esfahbod 2022-07-06 17:37:11 -06:00
parent 1ef67a6d66
commit 429b387a6f
1 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/hb-ot-layout-gsubgpos.hh
View File

@ -476,7 +476,10 @@ struct hb_ot_apply_context_t :
void init (hb_ot_apply_context_t *c_, bool context_match = false) void init (hb_ot_apply_context_t *c_, bool context_match = false)
{ {
c = c_; c = c_;
match_glyph_data = nullptr; match_glyph_data16 = nullptr;
#ifndef HB_NO_BORING_EXPANSION
match_glyph_data24 = nullptr;
#endif
matcher.set_match_func (nullptr, nullptr); matcher.set_match_func (nullptr, nullptr);
matcher.set_lookup_props (c->lookup_props); matcher.set_lookup_props (c->lookup_props);
/* Ignore ZWNJ if we are matching GPOS, or matching GSUB context and asked to. */ /* Ignore ZWNJ if we are matching GPOS, or matching GSUB context and asked to. */
@ -497,8 +500,18 @@ struct hb_ot_apply_context_t :
} }
void set_glyph_data (const HBUINT16 glyph_data[]) void set_glyph_data (const HBUINT16 glyph_data[])
{ {
match_glyph_data = glyph_data; match_glyph_data16 = glyph_data;
#ifndef HB_NO_BORING_EXPANSION
match_glyph_data24 = nullptr;
#endif
} }
#ifndef HB_NO_BORING_EXPANSION
void set_glyph_data (const HBUINT24 glyph_data[])
{
match_glyph_data16 = nullptr;
match_glyph_data24 = glyph_data;
}
#endif
void reset (unsigned int start_index_, void reset (unsigned int start_index_,
unsigned int num_items_) unsigned int num_items_)
@ -512,7 +525,7 @@ struct hb_ot_apply_context_t :
void reject () void reject ()
{ {
num_items++; num_items++;
if (match_glyph_data) match_glyph_data--; backup_glyph_data ();
} }
matcher_t::may_skip_t matcher_t::may_skip_t
@ -531,13 +544,13 @@ struct hb_ot_apply_context_t :
if (unlikely (skip == matcher_t::SKIP_YES)) if (unlikely (skip == matcher_t::SKIP_YES))
continue; continue;
matcher_t::may_match_t match = matcher.may_match (info, match_glyph_data ? *match_glyph_data : 0); matcher_t::may_match_t match = matcher.may_match (info, get_glyph_data ());
if (match == matcher_t::MATCH_YES || if (match == matcher_t::MATCH_YES ||
(match == matcher_t::MATCH_MAYBE && (match == matcher_t::MATCH_MAYBE &&
skip == matcher_t::SKIP_NO)) skip == matcher_t::SKIP_NO))
{ {
num_items--; num_items--;
if (match_glyph_data) match_glyph_data++; advance_glyph_data ();
return true; return true;
} }
@ -564,13 +577,13 @@ struct hb_ot_apply_context_t :
if (unlikely (skip == matcher_t::SKIP_YES)) if (unlikely (skip == matcher_t::SKIP_YES))
continue; continue;
matcher_t::may_match_t match = matcher.may_match (info, match_glyph_data ? *match_glyph_data : 0); matcher_t::may_match_t match = matcher.may_match (info, get_glyph_data ());
if (match == matcher_t::MATCH_YES || if (match == matcher_t::MATCH_YES ||
(match == matcher_t::MATCH_MAYBE && (match == matcher_t::MATCH_MAYBE &&
skip == matcher_t::SKIP_NO)) skip == matcher_t::SKIP_NO))
{ {
num_items--; num_items--;
if (match_glyph_data) match_glyph_data++; advance_glyph_data ();
return true; return true;
} }
@ -586,11 +599,43 @@ struct hb_ot_apply_context_t :
return false; return false;
} }
hb_codepoint_t
get_glyph_data ()
{
if (match_glyph_data16) return *match_glyph_data16;
#ifndef HB_NO_BORING_EXPANSION
else
if (match_glyph_data24) return *match_glyph_data24;
#endif
return 0;
}
void
advance_glyph_data ()
{
if (match_glyph_data16) match_glyph_data16++;
#ifndef HB_NO_BORING_EXPANSION
else
if (match_glyph_data24) match_glyph_data24++;
#endif
}
void
backup_glyph_data ()
{
if (match_glyph_data16) match_glyph_data16--;
#ifndef HB_NO_BORING_EXPANSION
else
if (match_glyph_data24) match_glyph_data24--;
#endif
}
unsigned int idx; unsigned int idx;
protected: protected:
hb_ot_apply_context_t *c; hb_ot_apply_context_t *c;
matcher_t matcher; matcher_t matcher;
const HBUINT16 *match_glyph_data; const HBUINT16 *match_glyph_data16;
#ifndef HB_NO_BORING_EXPANSION
const HBUINT24 *match_glyph_data24;
#endif
unsigned int num_items; unsigned int num_items;
unsigned int end; unsigned int end;