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

[OTLayout] Add fine-grained control over ZWJ matching 

Not used yet.  Next commit...
This commit is contained in:
Behdad Esfahbod 2013-02-14 10:46:52 -05:00
parent 607feb7cff
commit 0b45479198
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,6 +293,7 @@ struct hb_apply_context_t
inline matcher_t (void) : inline matcher_t (void) :
lookup_props (0), lookup_props (0),
ignore_zwnj (true), ignore_zwnj (true),
ignore_zwj (true),
mask (-1), mask (-1),
#define arg1(arg) (arg) /* Remove the macro to see why it's needed! */ #define arg1(arg) (arg) /* Remove the macro to see why it's needed! */
syllable arg1(0), syllable arg1(0),
@ -303,6 +304,7 @@ struct hb_apply_context_t
typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const void *data); typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const void *data);
inline void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; } inline void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; }
inline void set_ignore_zwj (bool ignore_zwj_) { ignore_zwj = ignore_zwj_; }
inline void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; } inline void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; }
inline void set_mask (hb_mask_t mask_) { mask = mask_; } inline void set_mask (hb_mask_t mask_) { mask = mask_; }
inline void set_syllable (uint8_t syllable_) { syllable = syllable_; } inline void set_syllable (uint8_t syllable_) { syllable = syllable_; }
@ -335,8 +337,9 @@ struct hb_apply_context_t
if (!c->match_properties (info.codepoint, property, lookup_props)) if (!c->match_properties (info.codepoint, property, lookup_props))
return SKIP_YES; return SKIP_YES;
if (unlikely ((_hb_glyph_info_is_default_ignorable (&info) && if (unlikely (_hb_glyph_info_is_default_ignorable (&info) &&
(ignore_zwnj || !_hb_glyph_info_is_zwnj (&info))) && (ignore_zwnj || !_hb_glyph_info_is_zwnj (&info)) &&
(ignore_zwj || !_hb_glyph_info_is_zwj (&info)) &&
!is_a_ligature (info))) !is_a_ligature (info)))
return SKIP_MAYBE; return SKIP_MAYBE;
@ -346,6 +349,7 @@ struct hb_apply_context_t
protected: protected:
unsigned int lookup_props; unsigned int lookup_props;
bool ignore_zwnj; bool ignore_zwnj;
bool ignore_zwj;
hb_mask_t mask; hb_mask_t mask;
uint8_t syllable; uint8_t syllable;
match_func_t match_func; match_func_t match_func;
@ -367,6 +371,7 @@ struct hb_apply_context_t
matcher.set_lookup_props (c->lookup_props); matcher.set_lookup_props (c->lookup_props);
/* Ignore ZWNJ if we are matching GSUB context, or matching GPOS. */ /* Ignore ZWNJ if we are matching GSUB context, or matching GPOS. */
matcher.set_ignore_zwnj (context_match || c->table_index == 1); matcher.set_ignore_zwnj (context_match || c->table_index == 1);
matcher.set_ignore_zwj (true);
if (!context_match) if (!context_match)
{ {
matcher.set_mask (c->lookup_mask); matcher.set_mask (c->lookup_mask);
@ -436,6 +441,7 @@ struct hb_apply_context_t
matcher.set_lookup_props (c->lookup_props); matcher.set_lookup_props (c->lookup_props);
/* Ignore ZWNJ if we are matching GSUB context, or matching GPOS. */ /* Ignore ZWNJ if we are matching GSUB context, or matching GPOS. */
matcher.set_ignore_zwnj (context_match || c->table_index == 1); matcher.set_ignore_zwnj (context_match || c->table_index == 1);
matcher.set_ignore_zwj (true);
if (!context_match) if (!context_match)
{ {
matcher.set_mask (c->lookup_mask); matcher.set_mask (c->lookup_mask);

11
src/hb-ot-layout-private.hh
View File

@ -53,14 +53,15 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *uni
{ {
info->unicode_props0() = ((unsigned int) unicode->general_category (info->codepoint)) | info->unicode_props0() = ((unsigned int) unicode->general_category (info->codepoint)) |
(unicode->is_default_ignorable (info->codepoint) ? 0x80 : 0) | (unicode->is_default_ignorable (info->codepoint) ? 0x80 : 0) |
(info->codepoint == 0x200C ? 0x40 : 0); (info->codepoint == 0x200C ? 0x40 : 0) |
(info->codepoint == 0x200D ? 0x20 : 0);
info->unicode_props1() = unicode->modified_combining_class (info->codepoint); info->unicode_props1() = unicode->modified_combining_class (info->codepoint);
} }
inline hb_unicode_general_category_t inline hb_unicode_general_category_t
_hb_glyph_info_get_general_category (const hb_glyph_info_t *info) _hb_glyph_info_get_general_category (const hb_glyph_info_t *info)
{ {
return (hb_unicode_general_category_t) (info->unicode_props0() & 0x3F); return (hb_unicode_general_category_t) (info->unicode_props0() & 0x1F);
} }
inline void inline void
@ -87,6 +88,12 @@ _hb_glyph_info_is_zwnj (const hb_glyph_info_t *info)
return !!(info->unicode_props0() & 0x40); return !!(info->unicode_props0() & 0x40);
} }
inline hb_bool_t
_hb_glyph_info_is_zwj (const hb_glyph_info_t *info)
{
return !!(info->unicode_props0() & 0x20);
}
#define hb_ot_layout_from_face(face) ((hb_ot_layout_t *) face->shaper_data.ot) #define hb_ot_layout_from_face(face) ((hb_ot_layout_t *) face->shaper_data.ot)