Index: third_party/harfbuzz-ng/src/hb-ot-font.cc |
diff --git a/third_party/harfbuzz-ng/src/hb-ot-font.cc b/third_party/harfbuzz-ng/src/hb-ot-font.cc |
index c9890c592281a67feedfdad5c04011e59149274f..3514fcc27be88f246fb8687c6d651e98031f7425 100644 |
--- a/third_party/harfbuzz-ng/src/hb-ot-font.cc |
+++ b/third_party/harfbuzz-ng/src/hb-ot-font.cc |
@@ -81,12 +81,15 @@ _hb_ot_font_create (hb_font_t *font) |
const OT::CmapSubtable *subtable_uvs = NULL; |
/* 32-bit subtables. */ |
+ if (!subtable) subtable = cmap->find_subtable (3, 10); |
if (!subtable) subtable = cmap->find_subtable (0, 6); |
if (!subtable) subtable = cmap->find_subtable (0, 4); |
- if (!subtable) subtable = cmap->find_subtable (3, 10); |
/* 16-bit subtables. */ |
- if (!subtable) subtable = cmap->find_subtable (0, 3); |
if (!subtable) subtable = cmap->find_subtable (3, 1); |
+ if (!subtable) subtable = cmap->find_subtable (0, 3); |
+ if (!subtable) subtable = cmap->find_subtable (0, 2); |
+ if (!subtable) subtable = cmap->find_subtable (0, 1); |
+ if (!subtable) subtable = cmap->find_subtable (0, 0); |
/* Meh. */ |
if (!subtable) subtable = &OT::Null(OT::CmapSubtable); |