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

[ot-font] Implement Unicode variation selectors

This commit is contained in:
Behdad Esfahbod 2014-06-27 17:22:36 -04:00
parent a5a4736916
commit 23afcff1d1
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hb-ot-font.cc
View File

@ -44,6 +44,7 @@ struct hb_ot_font_t
hb_blob_t *hmtx_blob; hb_blob_t *hmtx_blob;
const OT::CmapSubtable *cmap; const OT::CmapSubtable *cmap;
const OT::CmapSubtable *cmap_uvs;
hb_blob_t *cmap_blob; hb_blob_t *cmap_blob;
}; };
@ -77,8 +78,10 @@ _hb_ot_font_create (hb_font_t *font)
ot_font->cmap_blob = OT::Sanitizer<OT::cmap>::sanitize (font->face->reference_table (HB_OT_TAG_cmap)); ot_font->cmap_blob = OT::Sanitizer<OT::cmap>::sanitize (font->face->reference_table (HB_OT_TAG_cmap));
const OT::cmap *cmap = OT::Sanitizer<OT::cmap>::lock_instance (ot_font->cmap_blob); const OT::cmap *cmap = OT::Sanitizer<OT::cmap>::lock_instance (ot_font->cmap_blob);
const OT::CmapSubtable *subtable = NULL; const OT::CmapSubtable *subtable = NULL;
const OT::CmapSubtable *subtable_uvs = NULL;
/* 32-bit subtables. */ /* 32-bit subtables. */
if (!subtable) subtable = cmap->find_subtable (0, 6);
if (!subtable) subtable = cmap->find_subtable (0, 4); if (!subtable) subtable = cmap->find_subtable (0, 4);
if (!subtable) subtable = cmap->find_subtable (3, 10); if (!subtable) subtable = cmap->find_subtable (3, 10);
/* 16-bit subtables. */ /* 16-bit subtables. */
@ -87,7 +90,13 @@ _hb_ot_font_create (hb_font_t *font)
/* Meh. */ /* Meh. */
if (!subtable) subtable = &OT::Null(OT::CmapSubtable); if (!subtable) subtable = &OT::Null(OT::CmapSubtable);
/* UVS subtable. */
if (!subtable_uvs) subtable_uvs = cmap->find_subtable (0, 5);
/* Meh. */
if (!subtable_uvs) subtable_uvs = &OT::Null(OT::CmapSubtable);
ot_font->cmap = subtable; ot_font->cmap = subtable;
ot_font->cmap_uvs = subtable_uvs;
return ot_font; return ot_font;
} }
@ -114,7 +123,16 @@ hb_ot_get_glyph (hb_font_t *font HB_UNUSED,
const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
if (unlikely (variation_selector)) if (unlikely (variation_selector))
return false; {
switch (ot_font->cmap_uvs->get_glyph_variant (unicode,
variation_selector,
glyph))
{
case OT::GLYPH_VARIANT_NOT_FOUND: return false;
case OT::GLYPH_VARIANT_FOUND: return true;
case OT::GLYPH_VARIANT_USE_DEFAULT: break;
}
}
return ot_font->cmap->get_glyph (unicode, glyph); return ot_font->cmap->get_glyph (unicode, glyph);
} }