[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-font.cc |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8a9319502141c09695461c386e54f998250420e9
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 22 12:06:57 2014 -0400

    [ot] Prefer Windows platform cmap tables / accept all Unicode encodingIDs
    
    Some fonts on the Mac ship with (0,1).

diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index c9890c5..3514fcc 100644
--- a/src/hb-ot-font.cc
+++ b/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);