(lookup_encoding_0, lookup_encoding_2)
[m17n/libotf.git] / src / otfdrive.c
index 3dc6eda..bb65f7e 100644 (file)
@@ -203,15 +203,19 @@ get_langsys (OTF_ScriptList *script_list,
 }
 
 static int
-setup_lookup_indices (OTF_LookupList *LookupList, OTF_FeatureList *FeatureList,
-                     const char *features, int *lookup_indices)
+setup_lookup_flags (OTF_LookupList *LookupList, OTF_FeatureList *FeatureList,
+                   OTF_LangSys *LangSys,
+                   const char *features, char *lookup_flags)
 {
   int i, j, n = 0;
   OTF_Feature *feature;
   int *feature_table = alloca (sizeof (int) * FeatureList->FeatureCount);
 
+  if (! feature_table)
+    return -1;
   for (i = 0; i < FeatureList->FeatureCount; i++)
     feature_table[i] = 0;
+  memset (lookup_flags, 0, LookupList->LookupCount);
 
   while (*features)
     {
@@ -222,13 +226,17 @@ setup_lookup_indices (OTF_LookupList *LookupList, OTF_FeatureList *FeatureList,
       if (*features == '*')
        {
          /* Consume all remaining features.  */
-         for (i = 0; i < FeatureList->FeatureCount; i++)
-           if (! feature_table[i])
-             {
-               feature = FeatureList->Feature + i;
-               for (j = 0; j < feature->LookupCount; j++)
-                 lookup_indices[n++] = feature->LookupListIndex[j];
-             }
+         for (i = 0; i < LangSys->FeatureCount; i++) 
+           {
+             int index = LangSys->FeatureIndex[i];
+
+             if (! feature_table[index])
+               {
+                 feature = FeatureList->Feature + index;
+                 for (j = 0; j < feature->LookupCount; j++)
+                   lookup_flags[feature->LookupListIndex[j]] = 1;
+               }
+           }
          break;
        }
 
@@ -242,23 +250,22 @@ setup_lookup_indices (OTF_LookupList *LookupList, OTF_FeatureList *FeatureList,
       for (; i < 4; i++)
        tagname[i] = '\0';
       tag = OTF_tag (tagname);
-      for (i = 0; i < FeatureList->FeatureCount; i++)
+      for (i = 0; i < LangSys->FeatureCount; i++)
        {
-         feature = FeatureList->Feature + i;
+         feature = FeatureList->Feature + LangSys->FeatureIndex[i];
          if (tag == feature->FeatureTag)
            {
              if (feature_table[i])
                break;
              if (use_it > 0)
                for (j = 0; j < feature->LookupCount; j++)
-                 lookup_indices[n++] = feature->LookupListIndex[j];
+                 lookup_flags[feature->LookupListIndex[j]] = 1;
              feature_table[i] = use_it;
              break;
            }
        }
     }
-
-  return n;
+  return 0;
 }
 
 static int
@@ -748,10 +755,25 @@ get_anchor (OTF_Anchor *anchor, OTF_ValueRecord *rec)
   return value_format;
 }
 
+static int
+gstring_insert_for_gpos (OTF_GlyphString *gstring, int gidx)
+{
+  int errret = -1;
+  int orig_gidx = gidx++;
+
+  while (gidx < gstring->used
+        && ! gstring->glyphs[gidx].glyph_id
+        && gstring->glyphs[gidx].positioning_type)
+    gidx++;
+  GSTRING_INSERT (gstring, gidx, 1);
+  gstring->glyphs[gidx] = gstring->glyphs[orig_gidx];
+  gstring->glyphs[gidx].glyph_id = 0;
+  return gidx;
+}
 
 static int
 lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
-            OTF_GlyphString *gstring, int gidx)
+            OTF_GlyphString *gstring, int gidx, int accumulate)
 {
   char *errfmt = "GPOS Looking up%s";
   int errret = -1;
@@ -762,8 +784,7 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
   OTF_Glyph *g = gstring->glyphs + gidx;
   int i;
 
-  if (IGNORED_GLYPH (g, flag)
-      || (0 & g->positioning_type))
+  if (IGNORED_GLYPH (g, flag))
     return (gidx + 1);
 
   /* Try all subtables until one of them handles the current glyph.  */
@@ -772,6 +793,10 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
       unsigned lookup_type = lookup->LookupType;
       OTF_LookupSubTableGPOS *subtable = lookup->SubTable.gpos + i;
       int coverage_idx;
+      int positioning_type;
+      enum OTF_ValueFormat format;
+      OTF_ValueRecord *value;
+      OTF_Anchor *anchor1, *anchor2;
 
       if (lookup_type == 9)
        {
@@ -792,21 +817,30 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
       switch (lookup_type)
        {
        case 1:
-         g->positioning_type = lookup_type;
+         positioning_type = lookup_type;
          if (subtable->Format == 1)
            {
              OTF_GPOS_Single1 *single1 = &subtable->u.single1;
 
-             g->f.f1.format = single1->ValueFormat;
-             g->f.f1.value = &single1->Value;
+             format = single1->ValueFormat;
+             value = &single1->Value;
            }
          else if (subtable->Format == 2)
            {
              OTF_GPOS_Single2 *single2 = &subtable->u.single2;
 
-             g->f.f1.format = single2->ValueFormat;
-             g->f.f1.value = single2->Value + coverage_idx;
+             format = single2->ValueFormat;
+             value = single2->Value + coverage_idx;
+           }
+         if (accumulate && g->positioning_type)
+           {
+             gidx = gstring_insert_for_gpos (gstring, gidx);         
+             g = gstring->glyphs + gidx;
            }
+         g->positioning_type = positioning_type;
+         g->f.f1.format = format;
+         g->f.f1.value = value;
+         gidx++;
          break;
 
        case 2:
@@ -832,16 +866,29 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                    {
                      if (pair1->ValueFormat1)
                        {
+                         if (accumulate && g->positioning_type)
+                           {
+                             gidx = gstring_insert_for_gpos (gstring, gidx);
+                             g = gstring->glyphs + gidx;
+                             next_gidx += gidx - orig_gidx;
+                             nextg = gstring->glyphs + next_gidx;
+                           }
                          g->positioning_type = lookup_type;
                          g->f.f2.format = pair1->ValueFormat1;
                          g->f.f2.value = &set->PairValueRecord[j].Value1;
                        }
                      gidx = next_gidx;
+                     g = nextg;
                      if (pair1->ValueFormat2)
                        {
-                         nextg->positioning_type = lookup_type;
-                         nextg->f.f2.format = pair1->ValueFormat2;
-                         nextg->f.f2.value = &set->PairValueRecord[j].Value2;
+                         if (accumulate && g->positioning_type)
+                           {
+                             gidx = gstring_insert_for_gpos (gstring, gidx);
+                             g = gstring->glyphs + gidx;
+                           }
+                         g->positioning_type = lookup_type;
+                         g->f.f2.format = pair1->ValueFormat2;
+                         g->f.f2.value = &set->PairValueRecord[j].Value2;
                          gidx++;
                        }
                      break;
@@ -856,17 +903,30 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                class2 = get_class_def (&pair2->ClassDef2, nextg->glyph_id);
                if (pair2->ValueFormat1)
                  {
+                   if (accumulate && g->positioning_type)
+                     {
+                       gidx = gstring_insert_for_gpos (gstring, gidx);
+                       g = gstring->glyphs + gidx;
+                       next_gidx += gidx - orig_gidx;
+                       nextg = gstring->glyphs + next_gidx;
+                     }
                    g->positioning_type = lookup_type;
                    g->f.f2.format = pair2->ValueFormat1;
                    g->f.f2.value
                      = &pair2->Class1Record[class1].Class2Record[class2].Value1;
                  }
                gidx = next_gidx;
+               g = nextg;
                if (pair2->ValueFormat2)
                  {
-                   nextg->positioning_type = lookup_type;
-                   nextg->f.f2.format = pair2->ValueFormat2;
-                   nextg->f.f2.value
+                   if (accumulate && g->positioning_type)
+                     {
+                       gidx = gstring_insert_for_gpos (gstring, gidx);
+                       g = gstring->glyphs + gidx;
+                     }
+                   g->positioning_type = lookup_type;
+                   g->f.f2.format = pair2->ValueFormat2;
+                   g->f.f2.value
                      = &pair2->Class1Record[class1].Class2Record[class2].Value2;
                    gidx++;
                  }
@@ -878,6 +938,11 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
          {
            OTF_GPOS_Cursive1 *cursive1 = &subtable->u.cursive1;
          
+           if (accumulate && g->positioning_type)
+             {
+               gidx = gstring_insert_for_gpos (gstring, gidx);
+               g = gstring->glyphs + gidx;
+             }
            g->positioning_type = lookup_type;
            g->f.f3.entry_anchor
              = &cursive1->EntryExitRecord[coverage_idx].EntryAnchor;
@@ -911,6 +976,11 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
              mark_record = mark_base1->MarkArray.MarkRecord + coverage_idx;
              base_record
                = mark_base1->BaseArray.AnchorRecord + coverage_idx_base;
+             if (accumulate && g->positioning_type)
+               {
+                 gidx = gstring_insert_for_gpos (gstring, gidx);
+                 g = gstring->glyphs + gidx;
+               }
              g->f.f4.mark_anchor = &mark_record->MarkAnchor;
              g->f.f4.base_anchor
                = &base_record->Anchor[mark_record->Class];
@@ -961,6 +1031,11 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                  if (lig_anchor[mark_record->Class].AnchorFormat
                      && num_class[mark_record->Class]-- == 0)
                    {
+                     if (accumulate && g->positioning_type)
+                       {
+                         gidx = gstring_insert_for_gpos (gstring, gidx);
+                         g = gstring->glyphs + gidx;
+                       }
                      g->positioning_type = lookup_type;
                      g->f.f5.mark_anchor = &mark_record->MarkAnchor;
                      g->f.f5.ligature_anchor = lig_anchor + mark_record->Class;
@@ -994,6 +1069,11 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
              mark1_record = mark_mark1->Mark1Array.MarkRecord + coverage_idx;
              mark2_record
                = mark_mark1->Mark2Array.AnchorRecord + coverage_idx_base;
+             if (accumulate && g->positioning_type)
+               {
+                 gidx = gstring_insert_for_gpos (gstring, gidx);
+                 g = gstring->glyphs + gidx;
+               }
              g->f.f6.mark1_anchor = &mark1_record->MarkAnchor;
              g->f.f6.mark2_anchor
                = &mark2_record->Anchor[mark1_record->Class];
@@ -1022,7 +1102,8 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                    lookup_gpos (lookup_list,
                                 rule->LookupRecord[k].LookupListIndex,
                                 gstring,
-                                gidx + rule->LookupRecord[k].SequenceIndex);
+                                gidx + rule->LookupRecord[k].SequenceIndex,
+                                accumulate);
                  gidx += rule->GlyphCount + (gstring->used - orig_used);
                  break;
                }
@@ -1052,7 +1133,8 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                      lookup_gpos (lookup_list,
                                   rule->LookupRecord[k].LookupListIndex,
                                   gstring,
-                                  gidx + rule->LookupRecord[k].SequenceIndex);
+                                  gidx + rule->LookupRecord[k].SequenceIndex,
+                                  accumulate);
                    gidx += rule->GlyphCount + (gstring->used - orig_used);
                    break;
                  }
@@ -1072,7 +1154,8 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                lookup_gpos (lookup_list,
                             context3->LookupRecord[j].LookupListIndex,
                             gstring,
-                            gidx + context3->LookupRecord[j].SequenceIndex);
+                            gidx + context3->LookupRecord[j].SequenceIndex,
+                            accumulate);
              gidx += context3->GlyphCount + (gstring->used - orig_used);
            }
          break;
@@ -1100,7 +1183,8 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                    lookup_gpos (lookup_list,
                                 rule->LookupRecord[k].LookupListIndex,
                                 gstring,
-                                gidx + rule->LookupRecord[k].SequenceIndex);
+                                gidx + rule->LookupRecord[k].SequenceIndex,
+                                accumulate);
                  gidx += rule->InputGlyphCount + (gstring->used - orig_used);
                  break;
                }
@@ -1135,7 +1219,8 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                    lookup_gpos (lookup_list,
                                 rule->LookupRecord[k].LookupListIndex,
                                 gstring,
-                                gidx + rule->LookupRecord[k].SequenceIndex);
+                                gidx + rule->LookupRecord[k].SequenceIndex,
+                                accumulate);
                  gidx += rule->InputGlyphCount + (gstring->used - orig_used);
                  break;
                }
@@ -1157,7 +1242,8 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
                lookup_gpos (lookup_list,
                             context3->LookupRecord[j].LookupListIndex,
                             gstring,
-                            gidx + context3->LookupRecord[j].SequenceIndex);
+                            gidx + context3->LookupRecord[j].SequenceIndex,
+                            accumulate);
              gidx += context3->InputGlyphCount + (gstring->used - orig_used);
            }
          else
@@ -1173,106 +1259,302 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
   return gidx;
 }
 
-static int
-lookup_encoding_0 (OTF_EncodingSubtable0 *sub0, OTF_GlyphString *gstring)
+static unsigned
+lookup_encoding_0 (int c, OTF_EncodingSubtable *sub)
 {
-  int i, c;
-
-  for (i = 0; i < gstring->used; i++)
-    {
-      c = gstring->glyphs[i].c;
-      if (c < 0 || c >= 256)
-       gstring->glyphs[i].glyph_id = 0;
-      else
-       gstring->glyphs[i].glyph_id = sub0->glyphIdArray[c];
-    }
-  return 0;
+  return ((c < 0 || c >= 256)
+         ? 0
+         : sub->f.f0->glyphIdArray[c]);
 }
 
-static int
-lookup_encoding_2 (OTF_EncodingSubtable2 *sub2, OTF_GlyphString *gstring)
+static unsigned
+lookup_encoding_2 (int c, OTF_EncodingSubtable *sub)
 {
   return 0;
 }
 
-static int
-lookup_encoding_4 (OTF_EncodingSubtable4 *sub4, OTF_GlyphString *gstring)
+static unsigned
+lookup_encoding_4 (int c, OTF_EncodingSubtable *sub)
 {
-  int i, j, c;
-  int segCount = sub4->segCountX2 / 2;
+  int segCount, i;
+  OTF_EncodingSubtable4 *sub4;
 
-  for (i = 0; i < gstring->used; i++)
+  if (c < 0)
+    return 0;
+  sub4 = sub->f.f4;
+  segCount = sub4->segCountX2 / 2;
+  for (i = 0; i < segCount; i++)
     {
-      c = gstring->glyphs[i].c;
-      if (c < 0)
-       gstring->glyphs[i].glyph_id = 0;
-      for (j = 0; j < segCount; j++)
-       {
-         OTF_cmapSegument *seg = sub4->segments + i;
+      OTF_cmapSegment *seg = sub4->segments + i;
 
-         if (c >= seg->startCount && c <= seg->endCount)
-           {
-             if (seg->idRangeOffset == 0xFFFF)
-               gstring->glyphs[i].glyph_id = c + seg->idDelta;
-             else
-               gstring->glyphs[i].glyph_id
-                 = sub4->glyphIdArray[seg->idRangeOffset
-                                      + (c - seg->startCount)];
-             break;
-           }
+      if (c >= seg->startCount && c <= seg->endCount)
+       {
+         if (seg->idRangeOffset == 0xFFFF)
+           return c + seg->idDelta;
+         else
+           return sub4->glyphIdArray[seg->idRangeOffset
+                                     + (c - seg->startCount)];
        }
     }
+  return 0;
+}
 
+static unsigned
+lookup_encoding_6 (int c, OTF_EncodingSubtable *sub)
+{
   return 0;
 }
 
-static int
-lookup_encoding_6 (OTF_EncodingSubtable6 *sub6, OTF_GlyphString *gstring)
+static unsigned
+lookup_encoding_8 (int c, OTF_EncodingSubtable *sub)
 {
   return 0;
 }
 
-static int
-lookup_encoding_8 (OTF_EncodingSubtable8 *sub8, OTF_GlyphString *gstring)
+static unsigned
+lookup_encoding_10 (int c, OTF_EncodingSubtable *sub)
 {
   return 0;
 }
 
-static int
-lookup_encoding_10 (OTF_EncodingSubtable10 *sub10, OTF_GlyphString *gstring)
+static unsigned
+lookup_encoding_12 (int c, OTF_EncodingSubtable *sub)
 {
+  OTF_EncodingSubtable12 *sub12;
+  OTF_cmapGroup *g, *gend;
+
+  if (c < 0)
+    return 0;
+  sub12 = sub->f.f12;
+  g = sub12->Groups;
+  gend = sub12->Groups + sub12->nGroups;
+  while (g < gend)
+    {
+      if (g->startCharCode <= c && c <= g->endCharCode)
+       return (g->startGlyphID + (c - g->startCharCode));
+      g++;
+    }
   return 0;
 }
 
-static int
-lookup_encoding_12 (OTF_EncodingSubtable12 *sub12, OTF_GlyphString *gstring)
+typedef unsigned (*lookup_cmap_func) (int, OTF_EncodingSubtable *);
+
+static lookup_cmap_func lookup_cmap_func_table[] =
+  {
+    lookup_encoding_0, lookup_encoding_2, lookup_encoding_4, lookup_encoding_6,
+    lookup_encoding_8, lookup_encoding_10, lookup_encoding_12
+  };
+
+static unsigned
+get_GlyphID (OTF_cmap *cmap, int c)
 {
+  OTF_EncodingSubtable *sub;
+  lookup_cmap_func lookupper;
+
+  if (c < 0x10000 && cmap->unicode_table)
+    return cmap->unicode_table[c];
+  if (cmap->table_index < 0)
+    return 0;
+  sub = &cmap->EncodingRecord[cmap->table_index].subtable;
+  lookupper = lookup_cmap_func_table[sub->format / 2];
+  return lookupper (c, sub);
+}
+
+static OTF_GlyphID
+get_uvs_glyph (OTF_cmap *cmap, OTF_EncodingSubtable14 *sub14, int c1, int c2)
+{
+  unsigned nRecords = sub14->nRecords;
+  OTF_VariationSelectorRecord *record;
+  unsigned i;
+
+  for (i = 0; i < nRecords; i++)
+    {
+      record = &sub14->Records[i];
+      if (record->varSelector == c2)
+       {
+         if (record->defaultUVSOffset)
+           {
+             OTF_UnicodeValueRange *uVRs = record->unicodeValueRanges;
+             unsigned numUVRs = record->numUnicodeValueRanges;
+             unsigned top = numUVRs, bottom = 0, middle;
+
+             if (uVRs[0].startUnicodeValue <= c1)
+               {
+                 unsigned additionalCount, startUnicodeValue;
+
+                 for (;;)
+                   {
+                     middle = (top + bottom) / 2;
+                     if (c1 < uVRs[middle].startUnicodeValue)
+                       top = middle;
+                     else if (bottom == middle)
+                       break;
+                     else
+                       bottom = middle;
+                   }
+                 startUnicodeValue = uVRs[bottom].startUnicodeValue;
+                 additionalCount = uVRs[bottom].additionalCount;
+                 if (c1 <= startUnicodeValue + additionalCount)
+                   return get_GlyphID (cmap, c1);
+               }
+           }
+         if (record->nonDefaultUVSOffset)
+           {
+             OTF_UVSMapping *uvsMappings = record->uvsMappings;
+             unsigned numUVSMs = record->numUVSMappings;
+             unsigned top = numUVSMs, bottom = 0, middle;
+
+             if (uvsMappings[0].unicodeValue <= c1)
+               {
+                 for (;;)
+                   {
+                     middle = (top + bottom) / 2;
+                     if (c1 < uvsMappings[middle].unicodeValue)
+                       top = middle;
+                     else if (bottom == middle)
+                       break;
+                     else
+                       bottom = middle;
+                   }
+                 if (uvsMappings[bottom].unicodeValue == c1)
+                   return uvsMappings[bottom].glyphID;
+               }
+           }
+         return 0;
+       }
+    }
   return 0;
 }
 
+static void
+check_cmap_uvs (OTF_cmap *cmap, OTF_GlyphString *gstring, int idx)
+{  
+  OTF_EncodingSubtable14 *sub14;
+  int c1 = gstring->glyphs[idx - 1].c;
+  int c2 = gstring->glyphs[idx].c;
+  OTF_GlyphID code;
+  int i;
+
+  gstring->glyphs[idx].glyph_id = 0;
+  for (i = 0; i < cmap->numTables; i++)
+    if (cmap->EncodingRecord[i].subtable.format == 14)
+      break;
+  if (i == cmap->numTables)
+    return;
+  code = get_uvs_glyph (cmap, cmap->EncodingRecord[i].subtable.f.f14, c1, c2);
+  if (code == 0)
+    return;
+  gstring->glyphs[idx - 1].glyph_id = code;
+  gstring->glyphs[idx - 1].f.index.to = gstring->glyphs[idx].f.index.to;
+  gstring->used--;
+  memmove (gstring->glyphs + idx, gstring->glyphs + idx + 1,
+          sizeof (OTF_Glyph) * (gstring->used - idx));
+}
+
+\f
+
+/* GDEF */
+/* Table of GlyphClass and MarkAttackClass.
+
+   For the Nth element CHAR, CHAR and the succeeding characters
+   (before CHAR of the next element) has GlyphClass C (= (N % 2) ? 3 : 1).
+
+   This table is generated from the General Category (GC) property of
+   characters defined in the Unicode Character Database.  */
+
+static int glyph_class_table[] =
+  { 0x00000, 0x00300, 0x00370, 0x00483, 0x00487, 0x00488, 0x0048A, 0x00591,
+    0x005BE, 0x005BF, 0x005C0, 0x005C1, 0x005C3, 0x005C4, 0x005C6, 0x005C7,
+    0x005C8, 0x00610, 0x00616, 0x0064B, 0x0065F, 0x00670, 0x00671, 0x006D6,
+    0x006DD, 0x006DE, 0x006E5, 0x006E7, 0x006E9, 0x006EA, 0x006EE, 0x00711,
+    0x00712, 0x00730, 0x0074B, 0x007A6, 0x007B1, 0x007EB, 0x007F4, 0x00901,
+    0x00904, 0x0093C, 0x0093D, 0x0093E, 0x0094E, 0x00951, 0x00955, 0x00962,
+    0x00964, 0x00981, 0x00984, 0x009BC, 0x009BD, 0x009BE, 0x009C5, 0x009C7,
+    0x009CE, 0x009D7, 0x009D8, 0x009E2, 0x009E4, 0x00A01, 0x00A04, 0x00A3C,
+    0x00A3D, 0x00A3E, 0x00A4E, 0x00A70, 0x00A72, 0x00A81, 0x00A84, 0x00ABC,
+    0x00ABD, 0x00ABE, 0x00ACE, 0x00AE2, 0x00AE4, 0x00B01, 0x00B04, 0x00B3C,
+    0x00B3D, 0x00B3E, 0x00B44, 0x00B47, 0x00B58, 0x00B82, 0x00B83, 0x00BBE,
+    0x00BCE, 0x00BD7, 0x00BD8, 0x00C01, 0x00C04, 0x00C3E, 0x00C45, 0x00C46,
+    0x00C57, 0x00C82, 0x00C84, 0x00CBC, 0x00CBD, 0x00CBE, 0x00CC5, 0x00CC6,
+    0x00CCE, 0x00CD5, 0x00CD7, 0x00CE2, 0x00CE4, 0x00D02, 0x00D04, 0x00D3E,
+    0x00D44, 0x00D46, 0x00D4E, 0x00D57, 0x00D58, 0x00D82, 0x00D84, 0x00DCA,
+    0x00DCB, 0x00DCF, 0x00DD7, 0x00DD8, 0x00DF4, 0x00E31, 0x00E32, 0x00E34,
+    0x00E3B, 0x00E47, 0x00E4F, 0x00EB1, 0x00EB2, 0x00EB4, 0x00EBD, 0x00EC8,
+    0x00ECE, 0x00F18, 0x00F1A, 0x00F35, 0x00F36, 0x00F37, 0x00F38, 0x00F39,
+    0x00F3A, 0x00F3E, 0x00F40, 0x00F71, 0x00F85, 0x00F86, 0x00F88, 0x00F90,
+    0x00FBD, 0x00FC6, 0x00FC7, 0x0102C, 0x0103A, 0x01056, 0x0105A, 0x0135F,
+    0x01360, 0x01712, 0x01715, 0x01732, 0x01735, 0x01752, 0x01754, 0x01772,
+    0x01774, 0x017B6, 0x017D4, 0x017DD, 0x017DE, 0x0180B, 0x0180E, 0x018A9,
+    0x018AA, 0x01920, 0x0193C, 0x019B0, 0x019C1, 0x019C8, 0x019CA, 0x01A17,
+    0x01A1C, 0x01B00, 0x01B05, 0x01B34, 0x01B45, 0x01B6B, 0x01B74, 0x01DC0,
+    0x01E00, 0x020D0, 0x020F0, 0x0302A, 0x03030, 0x03099, 0x0309B, 0x0A802,
+    0x0A803, 0x0A806, 0x0A807, 0x0A80B, 0x0A80C, 0x0A823, 0x0A828, 0x0FB1E,
+    0x0FB1F, 0x0FE00, 0x0FE10, 0x0FE20, 0x0FE24, 0x10A01, 0x10A10, 0x10A38,
+    0x10A40, 0x1D165, 0x1D16A, 0x1D16D, 0x1D173, 0x1D17B, 0x1D183, 0x1D185,
+    0x1D18C, 0x1D1AA, 0x1D1AE, 0x1D242, 0x1D245, 0xE0100, 0xE01F0 };
+
+int get_class_def_auto (int c)
+{
+  static int table_size
+    = sizeof glyph_class_table / sizeof glyph_class_table[0];
+  int low, high, mid;
+
+  if (c >= glyph_class_table[table_size - 1])
+    return 0;
+  low = 0;
+  high = table_size - 1;
+  while (1)
+    {
+      mid = (low + high) / 2;
+      if (c < glyph_class_table[mid])
+       high = mid - 1;
+      else if (c >= glyph_class_table[mid + 1])
+       low = mid + 1;
+      else
+       break;
+    }
+  return ((mid % 2) ? 3 : 1);
+}
+
 \f
 
 /* API */
 
+#define UVS_P(C)       \
+  (((C) >= 0xFE00 && (C) <= 0xFE0F) || ((C) >= 0xE0100 && (C) <= 0xE01EF))
+
 int
 OTF_drive_cmap (OTF *otf, OTF_GlyphString *gstring)
 {
   OTF_cmap *cmap;
   int i;
+  OTF_EncodingSubtable *sub;
+  lookup_cmap_func lookupper;
 
   if (! otf->cmap
       && OTF_get_table (otf, "cmap") < 0)
     return -1;
 
   cmap = otf->cmap;
+  if (cmap->table_index < 0)
+    lookupper = NULL;
+  else
+    {
+      sub = &cmap->EncodingRecord[cmap->table_index].subtable;
+      lookupper = lookup_cmap_func_table[sub->format / 2];
+    }
   for (i = 0; i < gstring->used; i++)
     if (! gstring->glyphs[i].glyph_id)
       {
        int c = gstring->glyphs[i].c;
        if (c < 32 || ! cmap->unicode_table)
          gstring->glyphs[i].glyph_id = 0;
-       else
+       else if (UVS_P (c) && i > 0)
+         check_cmap_uvs (cmap, gstring, i);
+       else if (c < 0x10000)
          gstring->glyphs[i].glyph_id = cmap->unicode_table[c];
+       else if (lookupper)
+         gstring->glyphs[i].glyph_id = lookupper (c, sub);
       }
   return 0;
 }
@@ -1287,6 +1569,7 @@ OTF_drive_cmap2 (OTF *otf, OTF_GlyphString *gstring,
   char *errfmt = "CMAP Looking up%s";
   int errret = -1;
   OTF_EncodingRecord *enc;
+  lookup_cmap_func lookupper;
 
   if (! otf->cmap
       && OTF_get_table (otf, "cmap") < 0)
@@ -1300,17 +1583,23 @@ OTF_drive_cmap2 (OTF *otf, OTF_GlyphString *gstring,
   if (i == cmap->numTables)
     OTF_ERROR (OTF_ERROR_CMAP_DRIVE, " (unknown platformID/encodingID)");
   enc = cmap->EncodingRecord + i;
-  switch (enc->subtable.format)
-    {
-    case 0: return lookup_encoding_0 (enc->subtable.f.f0, gstring);
-    case 2: return lookup_encoding_2 (enc->subtable.f.f2, gstring);
-    case 4: return lookup_encoding_4 (enc->subtable.f.f4, gstring);
-    case 6: return lookup_encoding_6 (enc->subtable.f.f6, gstring);
-    case 8: return lookup_encoding_8 (enc->subtable.f.f8, gstring);
-    case 10: return lookup_encoding_10 (enc->subtable.f.f10, gstring);
-    case 12: return lookup_encoding_12 (enc->subtable.f.f12, gstring);
-    }
-  OTF_ERROR (OTF_ERROR_CMAP_DRIVE, " (invalid format)");
+  if (enc->subtable.format > 12)
+    OTF_ERROR (OTF_ERROR_CMAP_DRIVE, " (invalid format)");
+  lookupper = lookup_cmap_func_table[enc->subtable.format / 2];
+
+  for (i = 0; i < gstring->used; i++)
+    if (! gstring->glyphs[i].glyph_id)
+      {
+       int c = gstring->glyphs[i].c;
+       if (c < 32 || ! cmap->unicode_table)
+         gstring->glyphs[i].glyph_id = 0;
+       else if (UVS_P (c) && i > 0)
+         check_cmap_uvs (cmap, gstring, i);
+       else if (c < 0x10000)
+         gstring->glyphs[i].glyph_id = cmap->unicode_table[c];
+       else
+         gstring->glyphs[i].glyph_id = lookupper (c, &enc->subtable);
+      }
 }
 
 
@@ -1328,6 +1617,35 @@ OTF_get_unicode (OTF *otf, OTF_GlyphID code)
 }
 
 int
+OTF_get_variation_glyphs (OTF *otf, int c, OTF_GlyphID code[256])
+{
+  int i, n;
+  OTF_cmap *cmap;
+  OTF_EncodingSubtable14 *sub14;
+
+  memset (code, 0, sizeof (OTF_GlyphID) * 256);
+  if (! otf->cmap
+      && OTF_get_table (otf, "cmap") < 0)
+    return 0;
+  cmap = otf->cmap;
+  for (i = 0; i < cmap->numTables; i++)
+    if (cmap->EncodingRecord[i].subtable.format == 14)
+      break;
+  if (i == cmap->numTables)
+    return 0;
+  sub14 = cmap->EncodingRecord[i].subtable.f.f14;
+  for (i = 0, n = 0; i < 256; i++)
+    {
+      int uvs = (i < 16 ? 0xFE00 + i : 0xE0100 + (i - 16));
+
+      if ((code[i] = get_uvs_glyph (cmap, sub14, c, uvs)))
+       n++;
+    }
+  return n;
+}
+
+
+int
 OTF_drive_gdef (OTF *otf, OTF_GlyphString *gstring)
 {
   OTF_GDEF *gdef;
@@ -1343,6 +1661,10 @@ OTF_drive_gdef (OTF *otf, OTF_GlyphString *gstring)
       gstring->glyphs[i].GlyphClass
        = get_class_def (&gdef->glyph_class_def,
                         gstring->glyphs[i].glyph_id);
+  else
+    for (i = 0; i < gstring->used; i++)
+      gstring->glyphs[i].GlyphClass
+       = get_class_def_auto (gstring->glyphs[i].c);
 
   if (gdef->mark_attach_class_def.offset)
     for (i = 0; i < gstring->used; i++)
@@ -1363,8 +1685,8 @@ OTF_drive_gsub_internal (OTF *otf, OTF_GlyphString *gstring,
   int errret = -1;
   OTF_GSUB *gsub;
   OTF_LangSys *LangSys;
-  int *lookup_indices;
-  int i, n;
+  char *lookup_flags;
+  int i;
 
   for (i = 0; i < gstring->used; i++)
     {
@@ -1383,28 +1705,24 @@ OTF_drive_gsub_internal (OTF *otf, OTF_GlyphString *gstring,
   if (! LangSys)
     return errret;
 
-  /* One lookup may be used by multiple features.  */
-  lookup_indices = alloca (sizeof (int)
-                          * gsub->LookupList.LookupCount
-                          * (gsub->FeatureList.FeatureCount + 1));
-  if (! lookup_indices)
+  lookup_flags = alloca (gsub->LookupList.LookupCount);
+  if (! lookup_flags
+      || setup_lookup_flags (&gsub->LookupList, &gsub->FeatureList, LangSys,
+                            features, lookup_flags) < 0)
     OTF_ERROR (OTF_ERROR_MEMORY, " feature list");
-  n = setup_lookup_indices (&gsub->LookupList, &gsub->FeatureList,
-                           features, lookup_indices);
-  if (n < 0)
-    return errret;
 
-  for (i = 0; i < n; i++)
+  for (i = 0; i < gsub->LookupList.LookupCount; i++)
     {
-      int index = lookup_indices[i];
       int gidx;
 
-      if (gsub->LookupList.Lookup[index].LookupType != 8)
+      if (! lookup_flags[i]) continue;
+
+      if (gsub->LookupList.Lookup[i].LookupType != 8)
        {
          gidx = 0;
          while (gidx < gstring->used)
            {
-             gidx = lookup_gsub (otf, &gsub->LookupList, index, gstring, gidx,
+             gidx = lookup_gsub (otf, &gsub->LookupList, i, gstring, gidx,
                                  alternate_subst);
              if (gidx < 0)
                return errret;
@@ -1415,7 +1733,7 @@ OTF_drive_gsub_internal (OTF *otf, OTF_GlyphString *gstring,
          gidx = gstring->used - 1;
          while (gidx >= 0)
            {
-             gidx = lookup_gsub (otf, &gsub->LookupList, index, gstring, gidx,
+             gidx = lookup_gsub (otf, &gsub->LookupList, i, gstring, gidx,
                                  alternate_subst);
              if (gidx < 0)
                return errret;
@@ -1436,14 +1754,16 @@ OTF_drive_gsub (OTF *otf, OTF_GlyphString *gstring,
 }
 
 int
-OTF_drive_gpos (OTF *otf, OTF_GlyphString *gstring,
-               const char *script, const char *language, const char *features)
+OTF_drive_gpos_internal (OTF *otf, OTF_GlyphString *gstring,
+                        const char *script, const char *language,
+                        const char *features,
+                        int accumulate)
 {
   char *errfmt = "GPOS driving%s";
   int errret = -1;
   OTF_GPOS *gpos;
   OTF_LangSys *LangSys;
-  int *lookup_indices;
+  char *lookup_flags;
   int i, n;
 
   for (i = 0; i < gstring->used; i++)
@@ -1460,25 +1780,21 @@ OTF_drive_gpos (OTF *otf, OTF_GlyphString *gstring,
   if (! LangSys)
     return errret;
 
-  /* One lookup may be used by multiple features.  */
-  lookup_indices = alloca (sizeof (int)
-                          * gpos->LookupList.LookupCount
-                          * (gpos->FeatureList.FeatureCount + 1));
-  if (! lookup_indices)
+  lookup_flags = alloca (gpos->LookupList.LookupCount);
+  if (! lookup_flags
+      || setup_lookup_flags (&gpos->LookupList, &gpos->FeatureList, LangSys,
+                            features, lookup_flags) < 0)
     OTF_ERROR (OTF_ERROR_MEMORY, " feature list");
-  n = setup_lookup_indices (&gpos->LookupList, &gpos->FeatureList,
-                           features, lookup_indices);
-  if (n < 0)
-    return errret;
 
-  for (i = 0; i < n; i++)
+  for (i = 0; i < gpos->LookupList.LookupCount; i++)
     {
-      int index = lookup_indices[i];
       int gidx = 0;
 
+      if (! lookup_flags[i]) continue;
+
       while (gidx < gstring->used)
        {
-         gidx = lookup_gpos (&gpos->LookupList, index, gstring, gidx);
+         gidx = lookup_gpos (&gpos->LookupList, i, gstring, gidx, accumulate);
          if (gidx < 0)
            return errret;
        }
@@ -1488,6 +1804,24 @@ OTF_drive_gpos (OTF *otf, OTF_GlyphString *gstring,
 }
 
 int
+OTF_drive_gpos (OTF *otf, OTF_GlyphString *gstring,
+               const char *script, const char *language, const char *features)
+{
+  if (! otf->cmap)
+    OTF_get_table (otf, "cmap");
+  return OTF_drive_gpos_internal (otf, gstring, script, language, features, 0);
+}
+
+int
+OTF_drive_gpos2 (OTF *otf, OTF_GlyphString *gstring,
+               const char *script, const char *language, const char *features)
+{
+  if (! otf->cmap)
+    OTF_get_table (otf, "cmap");
+  return OTF_drive_gpos_internal (otf, gstring, script, language, features, 1);
+}
+
+int
 OTF_drive_tables (OTF *otf, OTF_GlyphString *gstring,
                  const char *script, const char *language,
                  const char *gsub_features, const char *gpos_features)