Versions changed to 0.9.12.

[m17n/libotf.git] / src / otfdrive.c

diff --git a/src/otfdrive.c b/src/otfdrive.c
index 0139011..97e1974 100644 (file)
--- a/src/otfdrive.c
+++ b/src/otfdrive.c
@@ -1,6 +1,6 @@
 /* otfdrive.c -- OpenType font driver.
 
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H15PRO167
 
@@ -112,14 +112,17 @@ gstring_subst (OTF *otf, OTF_GlyphString *gstring, int from, int to, int flag,
       if (gstring->glyphs[from + i].glyph_id != ids[i])
        {
          gstring->glyphs[from + i].c = 0;
-         if (otf->gdef)
+         if (otf->gdef && otf->gdef->glyph_class_def.offset)
            gstring->glyphs[from + i].GlyphClass
              = get_class_def (&otf->gdef->glyph_class_def, ids[i]);
          else
            gstring->glyphs[from + i].GlyphClass = 0;
+         if (otf->gdef && otf->gdef->mark_attach_class_def.offset)
+           gstring->glyphs[from + i].MarkAttachClass
+             = get_class_def (&otf->gdef->mark_attach_class_def, ids[i]);
        }
       gstring->glyphs[from + i].glyph_id = ids[i];
-      gstring->glyphs[from + i].positioning_type = 0;
+      gstring->glyphs[from + i].positioning_type = 1;
       gstring->glyphs[from + i].f.index.from = from_idx;
       gstring->glyphs[from + i].f.index.to = to_idx;
     }
@@ -241,7 +244,7 @@ setup_lookup_flags (OTF_LookupList *LookupList, OTF_FeatureList *FeatureList,
                {
                  feature = FeatureList->Feature + index;
                  for (j = 0; j < feature->LookupCount; j++)
-                   lookup_flags[feature->LookupListIndex[j]] = i + 1;
+                   lookup_flags[feature->LookupListIndex[j]] = index + 1;
                }
            }
          break;
@@ -259,14 +262,16 @@ setup_lookup_flags (OTF_LookupList *LookupList, OTF_FeatureList *FeatureList,
       tag = OTF_tag (tagname);
       for (i = 0; i < LangSys->FeatureCount; i++)
        {
-         feature = FeatureList->Feature + LangSys->FeatureIndex[i];
+         int index = LangSys->FeatureIndex[i];
+
+         feature = FeatureList->Feature + index;
          if (tag == feature->FeatureTag)
            {
              if (feature_table[i])
                break;
              if (use_it > 0)
                for (j = 0; j < feature->LookupCount; j++)
-                 lookup_flags[feature->LookupListIndex[j]] = j + 1;
+                 lookup_flags[feature->LookupListIndex[j]] = index + 1;
              feature_table[i] = use_it;
              break;
            }
@@ -435,7 +440,8 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
        }
 
       if (alternate_subst
-         ? (lookup_type != 3 && lookup_type != 5 && lookup_type != 6)
+         ? (alternate_subst == 1
+            && lookup_type != 3 && lookup_type != 5 && lookup_type != 6)
          : (lookup_type == 3))
        continue;
 
@@ -454,6 +460,15 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
            g->glyph_id += subtable->u.single1.DeltaGlyphID;
          else
            g->glyph_id = subtable->u.single2.Substitute[coverage_idx];
+         if (otf->gdef && otf->gdef->glyph_class_def.offset)
+           g->GlyphClass
+             = get_class_def (&otf->gdef->glyph_class_def, g->glyph_id);
+         else
+           g->GlyphClass = 0;
+         if (otf->gdef && otf->gdef->mark_attach_class_def.offset)
+           g->MarkAttachClass
+             = get_class_def (&otf->gdef->mark_attach_class_def, g->glyph_id);
+         g->positioning_type = 1;
          gidx++;
          break;
 
@@ -477,8 +492,12 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
              OTF_GSUB_Alternate1 *alt1 = &subtable->u.alternate1;
              OTF_AlternateSet *altset = alt1->AlternateSet + coverage_idx;
 
-             gstring_subst (otf, gstring, gidx, gidx + 1, flag,
-                            altset->Alternate, altset->GlyphCount);
+             if (alternate_subst == 1)
+               gstring_subst (otf, gstring, gidx, gidx + 1, flag,
+                              altset->Alternate, altset->GlyphCount);
+             else
+               gstring_subst (otf, gstring, gidx, gidx + 1, flag,
+                              altset->Alternate, 1);
              gidx += altset->GlyphCount;;
            }
          else
@@ -533,7 +552,7 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
                                 rule->LookupRecord[k].LookupListIndex,
                                 gstring,
                                 gidx + rule->LookupRecord[k].SequenceIndex,
-                                alternate_subst);
+                                alternate_subst ? alternate_subst : 2);
                  gidx += rule->GlyphCount + (gstring->used - orig_used);
                  break;
                }
@@ -564,7 +583,7 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
                                   rule->LookupRecord[k].LookupListIndex,
                                   gstring,
                                   gidx + rule->LookupRecord[k].SequenceIndex,
-                                  alternate_subst);
+                                  alternate_subst ? alternate_subst : 2);
                    gidx += rule->GlyphCount + (gstring->used - orig_used);
                    break;
                  }
@@ -585,7 +604,7 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
                             context3->LookupRecord[j].LookupListIndex,
                             gstring,
                             gidx + context3->LookupRecord[j].SequenceIndex,
-                            alternate_subst);
+                            alternate_subst ? alternate_subst : 2);
              gidx += context3->GlyphCount + (gstring->used - orig_used);
            }
          break;
@@ -614,7 +633,7 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
                                 rule->LookupRecord[k].LookupListIndex,
                                 gstring,
                                 gidx + rule->LookupRecord[k].SequenceIndex,
-                                alternate_subst);
+                                alternate_subst ? alternate_subst : 2);
                  gidx += rule->InputGlyphCount + (gstring->used - orig_used);
                  break;
                }
@@ -650,7 +669,7 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
                                 rule->LookupRecord[k].LookupListIndex,
                                 gstring,
                                 gidx + rule->LookupRecord[k].SequenceIndex,
-                                alternate_subst);
+                                alternate_subst ? alternate_subst : 2);
                  gidx += rule->InputGlyphCount + (gstring->used - orig_used);
                  break;
                }
@@ -673,7 +692,7 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
                             context3->LookupRecord[j].LookupListIndex,
                             gstring,
                             gidx + context3->LookupRecord[j].SequenceIndex,
-                            alternate_subst);
+                            alternate_subst ? alternate_subst : 2);
              gidx += context3->InputGlyphCount + (gstring->used - orig_used);
            }
          break;
@@ -703,6 +722,7 @@ lookup_gsub (OTF *otf, OTF_LookupList *lookup_list, unsigned lookup_list_index,
            if (j < reverse->LookaheadGlyphCount)
              continue;
            g->glyph_id = reverse->Substitute[coverage_idx];
+           g->positioning_type = 1;
            gidx--;
          }
 
@@ -849,7 +869,6 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
       switch (lookup_type)
        {
        case 1:
-         positioning_type = lookup_type;
          if (subtable->Format == 1)
            {
              OTF_GPOS_Single1 *single1 = &subtable->u.single1;
@@ -864,13 +883,13 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
              format = single2->ValueFormat;
              value = single2->Value + coverage_idx;
            }
-         if (accumulate && g->positioning_type)
+         if (accumulate && (g->positioning_type & 0xF))
            {
              gidx = gstring_insert_for_gpos (gstring, gidx);
              g = gstring->glyphs + gidx;
            }
          g->positioning_type
-           = (g->positioning_type & 0xFFFFFFF0) | positioning_type;
+           = (g->positioning_type & 0xFFFFFFF0) | lookup_type;
          g->f.f1.format = format;
          g->f.f1.value = value;
          if (debug_flag)
@@ -983,7 +1002,7 @@ lookup_gpos (OTF_LookupList *lookup_list, unsigned lookup_list_index,
            OTF_GPOS_Cursive1 *cursive1 = &subtable->u.cursive1;
 
            g->positioning_type
-           = (g->positioning_type & 0xFFFFFFF0) | lookup_type;
+             = (g->positioning_type & 0xFFFFFFF0) | lookup_type;
            g->f.f3.entry_anchor
              = &cursive1->EntryExitRecord[coverage_idx].EntryAnchor;
            g->f.f3.exit_anchor
@@ -1689,19 +1708,17 @@ OTF_get_variation_glyphs (OTF *otf, int c, OTF_GlyphID code[256])
   return n;
 }
 
-
 int
 OTF_drive_gdef (OTF *otf, OTF_GlyphString *gstring)
 {
   OTF_GDEF *gdef;
   int i;
 
-  if (! otf->gdef
-      && OTF_get_table (otf, "GDEF") < 0)
-    return -1;
+  if (! otf->gdef)
+    OTF_get_table (otf, "GDEF");
   gdef = otf->gdef;
 
-  if (gdef->glyph_class_def.offset)
+  if (gdef && gdef->glyph_class_def.offset)
     for (i = 0; i < gstring->used; i++)
       gstring->glyphs[i].GlyphClass
        = get_class_def (&gdef->glyph_class_def,
@@ -1760,7 +1777,6 @@ OTF_drive_gsub_internal (OTF *otf, OTF_GlyphString *gstring,
   for (i = 0; i < gsub->LookupList.LookupCount; i++)
     {
       int gidx;
-      int j;
 
       if (! lookup_flags[i]) continue;
 
@@ -1774,14 +1790,10 @@ OTF_drive_gsub_internal (OTF *otf, OTF_GlyphString *gstring,
              if (result < 0)
                return errret;
              if (gidx < result)
-               {
-                 if (with_log)
-                   for (j = gidx; j < result; j++)
-                     gstring->glyphs[j].positioning_type
-                       = ((gstring->glyphs[j].positioning_type & 0xF)
-                          | (lookup_flags[i] << 4));
-                 gidx = result;
-               }
+               for (; gidx < result; gidx++)
+                 gstring->glyphs[gidx].positioning_type
+                   = ((with_log && gstring->glyphs[gidx].positioning_type)
+                      ? (lookup_flags[i] << 4) : 0);
              else
                gidx++;
            }
@@ -1796,14 +1808,10 @@ OTF_drive_gsub_internal (OTF *otf, OTF_GlyphString *gstring,
              if (result < 0)
                return errret;
              if (gidx > result)
-               {
-                 if (with_log)
-                   for (j = gidx; j > result; j--)
-                     gstring->glyphs[j].positioning_type
-                       = ((gstring->glyphs[j].positioning_type & 0xF)
-                          | (lookup_flags[i] << 4));
-                 gidx = result;
-               }
+               for (; gidx > result; gidx--)
+                 gstring->glyphs[gidx].positioning_type
+                   = ((with_log && gstring->glyphs[gidx].positioning_type)
+                      ? (lookup_flags[i] << 4) : 0);
              else
                gidx--;
            }
@@ -1870,7 +1878,6 @@ OTF_drive_gpos_internal (OTF *otf, OTF_GlyphString *gstring,
   for (i = 0; i < gpos->LookupList.LookupCount; i++)
     {
       int gidx = 0;
-      int j;
 
       if (! lookup_flags[i]) continue;
 
@@ -1881,14 +1888,15 @@ OTF_drive_gpos_internal (OTF *otf, OTF_GlyphString *gstring,
          if (result < 0)
            return errret;
          if (gidx < result)
-           {
-             if (with_log)
-               for (j = gidx; j < result; j++)
-                 gstring->glyphs[j].positioning_type
-                   = ((gstring->glyphs[j].positioning_type & 0xF)
-                      | (lookup_flags[i] << 4));
-             gidx = result;
-           }
+           for (; gidx < result; gidx++)
+             {
+               int positioning_type
+                 = gstring->glyphs[gidx].positioning_type & 0xF;
+
+               if (with_log && positioning_type)
+                 gstring->glyphs[gidx].positioning_type
+                   = positioning_type | (lookup_flags[i] << 4);
+             }
          else
            gidx++;
        }