Add Unicode 5.1 based Myanmar.
[m17n/m17n-lib.git] / src / font-ft.c
index e21bed9..47fe1fa 100644 (file)
@@ -1,5 +1,5 @@
 /* font-ft.c -- FreeType interface sub-module.
-   Copyright (C) 2003, 2004
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H15PRO112
 
@@ -37,6 +37,7 @@
 #include "plist.h"
 #include "symbol.h"
 #include "language.h"
+#include "internal-flt.h"
 #include "internal-gui.h"
 #include "font.h"
 #include "face.h"
@@ -47,7 +48,7 @@
 #include FT_BDF_H
 #endif
 
-static int mdebug_mask = MDEBUG_FONT;
+static int mdebug_flag = MDEBUG_FONT;
 
 #ifdef HAVE_FONTCONFIG
 #include <fontconfig/fcfreetype.h>
@@ -137,12 +138,11 @@ static int all_fonts_scaned;
       (s1) = alloca (len), (size) = len;                       \
     for (p1 = (s1), p2 = (s2); *p2; p1++, p2++)                        \
       *p1 = (*p2 >= 'A' && *p2 <= 'Z' ? *p2 + 'a' - 'A' : *p2);        \
-    while (p1 > (s1) && p1[-1] == ' ') p1--;                   \
     *p1 = '\0';                                                        \
   } while (0)
 
 
-static MPlist *ft_list_family (MSymbol, int);
+static MPlist *ft_list_family (MSymbol, int, int);
 
 static void
 free_ft_rfont (void *object)
@@ -556,7 +556,7 @@ fc_list_pattern (FcPattern *pattern)
       file = msymbol (filename);
       if (family != last_family)
        {
-         pl = MPLIST_PLIST (ft_list_family (family, 0));
+         pl = MPLIST_PLIST (ft_list_family (family, 0, 1));
          last_family = family;
        }
       ft_info = mplist_get (pl, file);
@@ -723,7 +723,7 @@ ft_list_char_list (MPlist *char_list, MText *mt)
   MPlist *plist = NULL, *pl, *p;
 
   if (! ft_font_list)
-    ft_list_family (Mnil, 0);
+    ft_list_family (Mnil, 0, 1);
 
   if (mt)
     {
@@ -770,7 +770,7 @@ ft_list_char_list (MPlist *char_list, MText *mt)
    scan all fonts and return ft_font_list.  */
 
 static MPlist *
-ft_list_family (MSymbol family, int check_generic)
+ft_list_family (MSymbol family, int check_generic, int check_alias)
 {
   MPlist *plist;
 #ifdef HAVE_FONTCONFIG
@@ -814,7 +814,7 @@ ft_list_family (MSymbol family, int check_generic)
          MPLIST_DO (plist, ft_font_list)
            {
              if (! MPLIST_VAL (plist))
-               ft_list_family (MPLIST_KEY (plist), 0);
+               ft_list_family (MPLIST_KEY (plist), 0, 1);
            }
          all_fonts_scaned = 1;
        }
@@ -852,7 +852,7 @@ ft_list_family (MSymbol family, int check_generic)
       FcChar8 *fam8;
       
       if (family != generic)
-       plist = ft_list_family (generic, 1);
+       plist = ft_list_family (generic, 1, 1);
       else
        {
          fam = MSYMBOL_NAME (family);
@@ -869,7 +869,7 @@ ft_list_family (MSymbol family, int check_generic)
              family = msymbol (buf);
              if (msymbol_get (family, Mgeneric_family))
                break;
-             pl = ft_list_family (family, 0);
+             pl = ft_list_family (family, 0, 1);
              if (! pl)
                continue;
              MPLIST_DO (pl, MPLIST_PLIST (pl))
@@ -878,7 +878,7 @@ ft_list_family (MSymbol family, int check_generic)
          plist = ft_font_list;
        }
     }
-  else
+  else if (check_alias)
     {
       /* Check if there exist an alias.  */
       pl = mplist ();
@@ -914,13 +914,18 @@ ft_list_family (MSymbol family, int check_generic)
              FcPatternGetString (pattern, FC_FAMILY, i, (FcChar8 **) &fam);
              STRDUP_LOWER (buf, bufsize, fam);
              sym = msymbol (buf);
-             p = MPLIST_PLIST (ft_list_family (sym, 0));
+             p = MPLIST_PLIST (ft_list_family (sym, 0, 0));
              if (! MPLIST_TAIL_P (p))
                MPLIST_DO (p, p)
                  mplist_push (pl, Mt, MPLIST_VAL (p));
            }
        }
     }
+  else
+    {
+      pl = mplist ();
+      plist = mplist_add (ft_font_list, family, pl);
+    }
 
 #else  /* not HAVE_FONTCONFIG */
 
@@ -1033,7 +1038,7 @@ ft_list_script (MSymbol script)
 }
 
 static int
-ft_check_otf (MFontFT *ft_info, MFontCapability *cap, FT_Face ft_face)
+ft_check_cap_otf (MFontFT *ft_info, MFontCapability *cap, FT_Face ft_face)
 {
 #ifdef HAVE_OTF
   if (ft_info->otf == invalid_otf)
@@ -1053,7 +1058,6 @@ ft_check_otf (MFontFT *ft_info, MFontCapability *cap, FT_Face ft_face)
        }
     }
   if (cap->features[MFONT_OTT_GSUB].nfeatures
-      && cap->features[MFONT_OTT_GSUB].tags[0]
       && (OTF_check_features
          (ft_info->otf, 1,
           cap->script_tag, cap->langsys_tag,
@@ -1061,7 +1065,6 @@ ft_check_otf (MFontFT *ft_info, MFontCapability *cap, FT_Face ft_face)
           cap->features[MFONT_OTT_GSUB].nfeatures) != 1))
     return -1;
   if (cap->features[MFONT_OTT_GPOS].nfeatures
-      && cap->features[MFONT_OTT_GPOS].tags[0]
       && (OTF_check_features
          (ft_info->otf, 0,
           cap->script_tag, cap->langsys_tag,
@@ -1195,7 +1198,7 @@ ft_list_default ()
        family = msymbol (buf);
        if (msymbol_get (family, Mgeneric_family))
          continue;
-       plist = MPLIST_PLIST (ft_list_family (family, 0));
+       plist = MPLIST_PLIST (ft_list_family (family, 0, 1));
        MPLIST_DO (plist, plist)
          mplist_add (ft_default_list, family, MPLIST_VAL (plist));
       }
@@ -1204,7 +1207,7 @@ ft_list_default ()
   {
     MPlist *plist, *pl;
 
-    MPLIST_DO (plist, ft_list_family (Mnil, 0))
+    MPLIST_DO (plist, ft_list_family (Mnil, 0, 1))
       {
        pl = MPLIST_PLIST (plist);
        if (! MPLIST_TAIL_P (pl))
@@ -1263,7 +1266,7 @@ ft_list_capability (MSymbol capability)
        {
          for (pl = plist; ! MPLIST_TAIL_P (pl);)
            {
-             if (ft_check_otf (MPLIST_VAL (pl), cap, NULL) < 0)
+             if (ft_check_cap_otf (MPLIST_VAL (pl), cap, NULL) < 0)
                mplist_pop (pl);
              else
                pl = MPLIST_NEXT (pl);
@@ -1315,7 +1318,7 @@ ft_list_file (MSymbol filename)
 
            STRDUP_LOWER (buf, bufsize, fam);
            family = msymbol (buf);
-           pl = ft_list_family (family, 0);
+           pl = ft_list_family (family, 0, 1);
            MPLIST_DO (pl, MPLIST_PLIST (pl))
              {
                MFontFT *ft_info = MPLIST_VAL (pl);
@@ -1334,7 +1337,7 @@ ft_list_file (MSymbol filename)
   {
     MPlist *pl, *p;
 
-    MPLIST_DO (pl, ft_list_family (Mnil, 0))
+    MPLIST_DO (pl, ft_list_family (Mnil, 0, 1))
       {
        MPLIST_DO (p, MPLIST_PLIST (pl))
          {
@@ -1380,7 +1383,7 @@ ft_select (MFrame *frame, MFont *font, int limited_size)
       MSymbol family = FONT_PROPERTY (font, MFONT_FAMILY);
 
       if (family)
-       plist = MPLIST_PLIST (ft_list_family (family, 1));
+       plist = MPLIST_PLIST (ft_list_family (family, 1, 1));
       else
        plist = ft_list_default ();
       if (MPLIST_TAIL_P (plist))
@@ -1395,7 +1398,7 @@ ft_select (MFrame *frame, MFont *font, int limited_size)
 
       for (pl = plist; ! MPLIST_TAIL_P (pl);)
        {
-         if (cap->script_tag && ft_check_otf (MPLIST_VAL (pl), cap, NULL) < 0)
+         if (cap->script_tag && ft_check_cap_otf (MPLIST_VAL (pl), cap, NULL) < 0)
            {
              mplist_pop (pl);
              continue;
@@ -1532,6 +1535,7 @@ ft_open (MFrame *frame, MFont *font, MFont *spec, MRealizedFont *rfont)
   ft_rfont->ft_face = ft_face;
   ft_rfont->charmap_list = charmap_list;
   MSTRUCT_CALLOC (rfont, MERROR_FONT_FT);
+  rfont->id = ft_info->font.file;
   rfont->spec = *font;
   rfont->spec.type = MFONT_TYPE_REALIZED;
   rfont->spec.property[MFONT_REGISTRY] = reg;
@@ -1541,10 +1545,12 @@ ft_open (MFrame *frame, MFont *font, MFont *spec, MRealizedFont *rfont)
   rfont->driver = &mfont__ft_driver;
   rfont->info = ft_rfont;
   rfont->fontp = ft_face;
-  rfont->ascent = ft_face->size->metrics.ascender >> 6;
-  rfont->descent = - ft_face->size->metrics.descender >> 6;
-  rfont->max_advance = ft_face->size->metrics.max_advance >> 6;
+  rfont->ascent = ft_face->size->metrics.ascender;
+  rfont->descent = - ft_face->size->metrics.descender;
+  rfont->max_advance = ft_face->size->metrics.max_advance;
   rfont->baseline_offset = 0;
+  rfont->x_ppem = ft_face->size->metrics.x_ppem;
+  rfont->y_ppem = ft_face->size->metrics.y_ppem;
 #ifdef HAVE_FTBDF_H
   {
     BDF_PropertyRec prop;
@@ -1552,16 +1558,16 @@ ft_open (MFrame *frame, MFont *font, MFont *spec, MRealizedFont *rfont)
     if (! FT_IS_SCALABLE (ft_face)
        && FT_Get_BDF_Property (ft_face, "_MULE_BASELINE_OFFSET", &prop) == 0)
       {
-       rfont->baseline_offset = prop.u.integer;
-       rfont->ascent += prop.u.integer;
-       rfont->descent -= prop.u.integer;
+       rfont->baseline_offset = prop.u.integer << 6;
+       rfont->ascent += prop.u.integer << 6;
+       rfont->descent -= prop.u.integer << 6;
       }
   }
 #endif /* HAVE_FTBDF_H */
   if (FT_IS_SCALABLE (ft_face))
     rfont->average_width = 0;
   else
-    rfont->average_width = ft_face->available_sizes->width;
+    rfont->average_width = ft_face->available_sizes->width << 6;
   rfont->next = MPLIST_VAL (frame->realized_font_list);
   MPLIST_VAL (frame->realized_font_list) = rfont;
   MDEBUG_PRINT ("  ok\n");
@@ -1579,18 +1585,17 @@ ft_find_metric (MRealizedFont *rfont, MGlyphString *gstring,
 
   for (; g != gend; g++)
     {
-      if (g->code == MCHAR_INVALID_CODE)
+      if (g->g.measured)
+       continue;
+      if (g->g.code == MCHAR_INVALID_CODE)
        {
          if (FT_IS_SCALABLE (ft_face))
            {
-             unsigned unitsPerEm10 = ft_face->units_per_EM * 10;
-             int size = rfont->spec.size;
-
-             g->lbearing = 0;
-             g->rbearing = ft_face->max_advance_width * size / unitsPerEm10;
-             g->width = g->rbearing;
-             g->ascent = ft_face->ascender * size / unitsPerEm10;
-             g->descent = (- ft_face->descender) * size / unitsPerEm10;
+             g->g.lbearing = 0;
+             g->g.rbearing = ft_face->size->metrics.max_advance;
+             g->g.xadv = g->g.rbearing;
+             g->g.ascent = ft_face->size->metrics.ascender;
+             g->g.descent = - ft_face->size->metrics.descender;
            }
          else
            {
@@ -1598,26 +1603,26 @@ ft_find_metric (MRealizedFont *rfont, MGlyphString *gstring,
              BDF_PropertyRec prop;
 #endif /* HAVE_FTBDF_H */
 
-             g->lbearing = 0;
-             g->rbearing = g->width = ft_face->available_sizes->width;
+             g->g.lbearing = 0;
+             g->g.rbearing = g->g.xadv = ft_face->available_sizes->width << 6;
 #ifdef HAVE_FTBDF_H
              if (FT_Get_BDF_Property (ft_face, "ASCENT", &prop) == 0)
                {
-                 g->ascent = prop.u.integer;
+                 g->g.ascent = prop.u.integer << 6;
                  FT_Get_BDF_Property (ft_face, "DESCENT", &prop);
-                 g->descent = prop.u.integer;
+                 g->g.descent = prop.u.integer << 6;
                  if (FT_Get_BDF_Property (ft_face, "_MULE_BASELINE_OFFSET",
                                           & prop) == 0)
                    {
-                     g->ascent += prop.u.integer;
-                     g->descent -= prop.u.integer;
+                     g->g.ascent += prop.u.integer << 6;
+                     g->g.descent -= prop.u.integer << 6;
                    }
                }
              else
 #endif /* HAVE_FTBDF_H */
                {
-                 g->ascent = ft_face->available_sizes->height;
-                 g->descent = 0;
+                 g->g.ascent = ft_face->available_sizes->height << 6;
+                 g->g.descent = 0;
                }
            }
        }
@@ -1625,16 +1630,18 @@ ft_find_metric (MRealizedFont *rfont, MGlyphString *gstring,
        {
          FT_Glyph_Metrics *metrics;
 
-         FT_Load_Glyph (ft_face, (FT_UInt) g->code, FT_LOAD_DEFAULT);
+         FT_Load_Glyph (ft_face, (FT_UInt) g->g.code, FT_LOAD_DEFAULT);
          metrics = &ft_face->glyph->metrics;
-         g->lbearing = (metrics->horiBearingX >> 6);
-         g->rbearing = (metrics->horiBearingX + metrics->width) >> 6;
-         g->width = metrics->horiAdvance >> 6;
-         g->ascent = metrics->horiBearingY >> 6;
-         g->descent = (metrics->height - metrics->horiBearingY) >> 6;
+         g->g.lbearing = metrics->horiBearingX;
+         g->g.rbearing = metrics->horiBearingX + metrics->width;
+         g->g.xadv = metrics->horiAdvance;
+         g->g.ascent = metrics->horiBearingY;
+         g->g.descent = metrics->height - metrics->horiBearingY;
        }
-      g->ascent += rfont->baseline_offset;
-      g->descent -= rfont->baseline_offset;
+      g->g.yadv = 0;
+      g->g.ascent += rfont->baseline_offset;
+      g->g.descent -= rfont->baseline_offset;
+      g->g.measured = 1;
     }
 }
 
@@ -1746,6 +1753,7 @@ ft_render (MDrawWindow win, int x, int y,
   int i, j;
   MPointTable point_table[8];
   int baseline_offset;
+  int pixel_mode = -1;
 
   if (from == to)
     return;
@@ -1753,7 +1761,7 @@ ft_render (MDrawWindow win, int x, int y,
   /* It is assured that the all glyphs in the current range use the
      same realized face.  */
   ft_face = rface->rfont->fontp;
-  baseline_offset = rface->rfont->baseline_offset;
+  baseline_offset = rface->rfont->baseline_offset >> 6;
 
   if (! gstring->anti_alias)
     {
@@ -1767,7 +1775,7 @@ ft_render (MDrawWindow win, int x, int y,
   for (i = 0; i < 8; i++)
     point_table[i].p = point_table[i].points;
 
-  for (g = from; g < to; x += g++->width)
+  for (g = from; g < to; x += g++->g.xadv)
     {
       unsigned char *bmp;
       int intensity;
@@ -1775,21 +1783,19 @@ ft_render (MDrawWindow win, int x, int y,
       int xoff, yoff;
       int width, pitch;
 
-      FT_Load_Glyph (ft_face, (FT_UInt) g->code, load_flags);
-      yoff = y - ft_face->glyph->bitmap_top + g->yoff;
+      FT_Load_Glyph (ft_face, (FT_UInt) g->g.code, load_flags);
+      if (pixel_mode < 0)
+       pixel_mode = ft_face->glyph->bitmap.pixel_mode;
+      yoff = y - ft_face->glyph->bitmap_top + g->g.yoff;
       bmp = ft_face->glyph->bitmap.buffer;
       width = ft_face->glyph->bitmap.width;
       pitch = ft_face->glyph->bitmap.pitch;
-      if (! gstring->anti_alias)
-       pitch *= 8;
-      if (width > pitch)
-       width = pitch;
 
-      if (gstring->anti_alias)
+      if (pixel_mode != FT_PIXEL_MODE_MONO)
        for (i = 0; i < ft_face->glyph->bitmap.rows;
             i++, bmp += ft_face->glyph->bitmap.pitch, yoff++)
          {
-           xoff = x + ft_face->glyph->bitmap_left + g->xoff;
+           xoff = x + ft_face->glyph->bitmap_left + g->g.xoff;
            for (j = 0; j < width; j++, xoff++)
              {
                intensity = bmp[j] >> 5;
@@ -1814,7 +1820,7 @@ ft_render (MDrawWindow win, int x, int y,
        for (i = 0; i < ft_face->glyph->bitmap.rows;
             i++, bmp += ft_face->glyph->bitmap.pitch, yoff++)
          {
-           xoff = x + ft_face->glyph->bitmap_left + g->xoff;
+           xoff = x + ft_face->glyph->bitmap_left + g->g.xoff;
            for (j = 0; j < width; j++, xoff++)
              {
                intensity = bmp[j / 8] & (1 << (7 - (j % 8)));
@@ -1836,7 +1842,7 @@ ft_render (MDrawWindow win, int x, int y,
        }
     }
 
-  if (gstring->anti_alias)
+  if (pixel_mode != FT_PIXEL_MODE_MONO)
     {
       for (i = 1; i < 8; i++)
        if (point_table[i].p != point_table[i].points)
@@ -1884,7 +1890,7 @@ ft_list (MFrame *frame, MPlist *plist, MFont *font, int maxnum)
        goto done;
       family = FONT_PROPERTY (font, MFONT_FAMILY);
       if (family != Mnil
-         && (family_list = MPLIST_PLIST (ft_list_family (family, 1)))
+         && (family_list = MPLIST_PLIST (ft_list_family (family, 1, 1)))
          && MPLIST_TAIL_P (family_list))
        goto done;
       if (font->capability != Mnil)
@@ -1899,7 +1905,7 @@ ft_list (MFrame *frame, MPlist *plist, MFont *font, int maxnum)
     {
       /* No restriction.  Get all fonts.  */
       pl = mplist ();
-      MPLIST_DO (family_list, ft_list_family (Mnil, 0))
+      MPLIST_DO (family_list, ft_list_family (Mnil, 0, 1))
        {
          MPLIST_DO (p, MPLIST_PLIST (family_list))
            mplist_push (pl, MPLIST_KEY (p), MPLIST_VAL (p));
@@ -2038,14 +2044,17 @@ ft_check_capability (MRealizedFont *rfont, MSymbol capability)
   MRealizedFontFT *ft_rfont = rfont->info;
   MFontCapability *cap = mfont__get_capability (capability);
 
-  if (cap->script != Mnil
-      && ft_check_script (ft_info, cap->script, ft_rfont->ft_face) < 0)
+  if (cap->script_tag)
+    {
+      if (ft_check_cap_otf (ft_info, cap, ft_rfont->ft_face) < 0)
+       return -1;
+    }
+  else if (cap->script != Mnil
+          && ft_check_script (ft_info, cap->script, ft_rfont->ft_face) < 0)
     return -1;
   if (cap->language != Mnil
       && ft_check_language (ft_info, cap->language, ft_rfont->ft_face) < 0)
     return -1;
-  if (cap->script_tag && ft_check_otf (ft_info, cap, ft_rfont->ft_face) < 0)
-    return -1;
   return 0;
 }
 
@@ -2085,6 +2094,7 @@ ft_encapsulate (MFrame *frame, MSymbol data_type, void *data)
   MDEBUG_DUMP (" [FONT-FT] encapsulating ", (char *) ft_face->family_name,);
 
   MSTRUCT_CALLOC (rfont, MERROR_FONT_FT);
+  rfont->id = ft_info->font.file;
   rfont->font = (MFont *) ft_info;
   rfont->info = ft_rfont;
   rfont->fontp = ft_face;
@@ -2096,6 +2106,8 @@ ft_encapsulate (MFrame *frame, MSymbol data_type, void *data)
   rfont->descent = - ft_face->size->metrics.descender >> 6;
   rfont->max_advance = ft_face->size->metrics.max_advance >> 6;
   rfont->baseline_offset = 0;
+  rfont->x_ppem = ft_face->size->metrics.x_ppem;
+  rfont->y_ppem = ft_face->size->metrics.y_ppem;
 #ifdef HAVE_FTBDF_H
   {
     BDF_PropertyRec prop;
@@ -2103,16 +2115,16 @@ ft_encapsulate (MFrame *frame, MSymbol data_type, void *data)
     if (! FT_IS_SCALABLE (ft_face)
        && FT_Get_BDF_Property (ft_face, "_MULE_BASELINE_OFFSET", &prop) == 0)
       {
-       rfont->baseline_offset = prop.u.integer;
-       rfont->ascent += prop.u.integer;
-       rfont->descent -= prop.u.integer;
+       rfont->baseline_offset = prop.u.integer << 6;
+       rfont->ascent += prop.u.integer << 6;
+       rfont->descent -= prop.u.integer << 6;
       }
   }
 #endif /* HAVE_FTBDF_H */
   if (FT_IS_SCALABLE (ft_face))
     rfont->average_width = 0;
   else
-    rfont->average_width = ft_face->available_sizes->width;
+    rfont->average_width = ft_face->available_sizes->width << 6;
   rfont->next = MPLIST_VAL (frame->realized_font_list);
   MPLIST_VAL (frame->realized_font_list) = rfont;
 
@@ -2129,6 +2141,511 @@ ft_close (MRealizedFont *rfont)
   free (rfont);
 }
 
+static OTF *
+get_otf (MFLTFont *font, FT_Face *ft_face)
+{
+  MRealizedFont *rfont = ((MFLTFontForRealized *) font)->rfont;
+  MFontFT *ft_info = (MFontFT *) rfont->font;
+  MRealizedFontFT *ft_rfont = rfont->info;
+  OTF *otf = ft_info->otf;
+
+  if (! otf)
+    {
+#if (LIBOTF_MAJOR_VERSION > 0 || LIBOTF_MINOR_VERSION > 9 || LIBOTF_RELEASE_NUMBER > 4)
+      otf = OTF_open_ft_face (ft_rfont->ft_face);
+#else
+      otf = OTF_open (MSYMBOL_NAME (ft_info->font.file));
+#endif
+      if (! otf || OTF_get_table (otf, "head") < 0)
+       otf = invalid_otf;
+      ft_info->otf = otf;
+    }
+  if (ft_face)
+    *ft_face = ft_rfont->ft_face;
+  return (otf == invalid_otf ? NULL : otf);
+}
+
+static int 
+ft_check_otf (MFLTFont *font, MFLTOtfSpec *spec)
+{
+#ifdef HAVE_OTF
+  OTF_Tag *tags;
+  int i, n, negative;
+  OTF *otf = get_otf (font, NULL);
+
+  if (! otf)
+    goto not_otf;
+  for (i = 0; i < 2; i++)
+    {
+      if (! spec->features[i])
+       continue;
+      for (n = 0; spec->features[i][n]; n++);
+      tags = alloca (sizeof (OTF_Tag) * n);
+      for (n = 0, negative = 0; spec->features[i][n]; n++)
+       {
+         if (spec->features[i][n] == 0xFFFFFFFF)
+           negative = 1;
+         else if (negative)
+           tags[n - 1] = spec->features[i][n] | 0x80000000;
+         else
+           tags[n] = spec->features[i][n];
+       }
+      if (n - negative > 0
+         && OTF_check_features (otf, i == 0, spec->script, spec->langsys,
+                                tags, n - negative) != 1)
+       return 0;
+    }
+  return 1;
+#endif /* HAVE_OTF */
+ not_otf:
+  return ((! spec->features[0] || spec->features[0][0] == 0xFFFFFFFF)
+         && (! spec->features[1] || spec->features[1][0] == 0xFFFFFFFF));
+}
+
+#ifdef HAVE_OTF
+
+#define DEVICE_DELTA(table, size)                              \
+  (((size) >= (table).StartSize && (size) <= (table).EndSize)  \
+   ? (table).DeltaValue[(size) - (table).StartSize] << 6       \
+   : 0)
+
+void
+adjust_anchor (OTF_Anchor *anchor, FT_Face ft_face,
+              unsigned code, int x_ppem, int y_ppem, int *x, int *y)
+{
+  if (anchor->AnchorFormat == 2)
+    {
+      FT_Outline *outline;
+      int ap = anchor->f.f1.AnchorPoint;
+
+      FT_Load_Glyph (ft_face, (FT_UInt) code, FT_LOAD_MONOCHROME);
+      outline = &ft_face->glyph->outline;
+      if (ap < outline->n_points)
+       {
+         *x = outline->points[ap].x << 6;
+         *y = outline->points[ap].y << 6;
+       }
+    }
+  else if (anchor->AnchorFormat == 3)
+    {
+      if (anchor->f.f2.XDeviceTable.offset)
+       *x += DEVICE_DELTA (anchor->f.f2.XDeviceTable, x_ppem);
+      if (anchor->f.f2.YDeviceTable.offset)
+       *y += DEVICE_DELTA (anchor->f.f2.YDeviceTable, y_ppem);
+    }
+}
+#endif /* HAVE_OTF */
+
+static int 
+ft_drive_otf (MFLTFont *font, MFLTOtfSpec *spec,
+             MFLTGlyphString *in, int from, int to,
+             MFLTGlyphString *out, MFLTGlyphAdjustment *adjustment)
+{
+  int len = to - from;
+  int i, j, gidx;
+#ifdef HAVE_OTF
+  MGlyph *in_glyphs = (MGlyph *) (in->glyphs);
+  MGlyph *out_glyphs = out ? (MGlyph *) (out->glyphs) : NULL;
+  OTF *otf;
+  FT_Face face;
+  OTF_GlyphString otf_gstring;
+  OTF_Glyph *otfg;
+  char script[5], *langsys = NULL;
+  char *gsub_features = NULL, *gpos_features = NULL;
+  unsigned int tag;
+
+  if (len == 0)
+    return from;
+  otf = get_otf (font, &face);
+  if (! otf)
+    goto simple_copy;
+  OTF_tag_name (spec->script, script);
+  if (spec->langsys)
+    {
+      langsys = alloca (5);
+      OTF_tag_name (spec->langsys, langsys);
+    }
+  for (i = 0; i < 2; i++)
+    {
+      char *p;
+
+      if (spec->features[i])
+       {
+         for (j = 0; spec->features[i][j]; j++);
+         if (i == 0)
+           p = gsub_features = alloca (6 * j);
+         else
+           p = gpos_features = alloca (6 * j);
+         for (j = 0; spec->features[i][j]; j++)
+           {
+             if (spec->features[i][j] == 0xFFFFFFFF)
+               *p++ = '*', *p++ = ',';
+             else
+               {
+                 OTF_tag_name (spec->features[i][j], p);
+                 p[4] = ',';
+                 p += 5;
+               }
+           }
+         *--p = '\0';
+       }
+    }
+
+  otf_gstring.size = otf_gstring.used = len;
+  otf_gstring.glyphs = (OTF_Glyph *) malloc (sizeof (OTF_Glyph) * len);
+  memset (otf_gstring.glyphs, 0, sizeof (OTF_Glyph) * len);
+  for (i = 0; i < len; i++)
+    {
+      otf_gstring.glyphs[i].c = ((MGlyph *)in->glyphs)[from + i].g.c & 0x11FFFF;
+      otf_gstring.glyphs[i].glyph_id = ((MGlyph *)in->glyphs)[from + i].g.code;
+    }
+
+  OTF_drive_gdef (otf, &otf_gstring);
+  gidx = out ? out->used : from;
+
+  if (gsub_features)
+    {
+      OTF_Feature *features;
+      MGlyph *g;
+
+      if (OTF_drive_gsub_with_log (otf, &otf_gstring, script, langsys,
+                                  gsub_features) < 0)
+       goto simple_copy;
+      features = otf->gsub->FeatureList.Feature;
+      if (out)
+       {
+         if (out->allocated < gidx + otf_gstring.used)
+           return -2;
+         for (i = 0, otfg = otf_gstring.glyphs, g = out_glyphs + gidx;
+              i < otf_gstring.used; i++, otfg++, g++, out->used++)
+           {
+             int feature_idx = otfg->positioning_type >> 4;
+             int j;
+             int min_from, max_to;
+
+             *g = in_glyphs[from + otfg->f.index.from];
+             min_from = g->g.from, max_to = g->g.to;
+             g->g.c = 0;
+             for (j = otfg->f.index.from; j <= otfg->f.index.to; j++)
+               if (in_glyphs[from + j].g.code == otfg->glyph_id)
+                 {
+                   g->g.c = in_glyphs[from + j].g.c;
+                   break;
+                 }
+             if (feature_idx)
+               {
+                 tag = features[feature_idx - 1].FeatureTag;
+                 tag = PACK_OTF_TAG (tag);
+                 g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag;
+               }
+             for (j = otfg->f.index.from + 1; j <= otfg->f.index.to; j++)
+               {
+                 if (min_from > in_glyphs[from + j].g.from)
+                   min_from = in_glyphs[from + j].g.from;
+                 if (max_to < in_glyphs[from + j].g.to)
+                   max_to = in_glyphs[from + j].g.to;
+               }
+             if (g->g.code != otfg->glyph_id)
+               {
+                 g->g.code = otfg->glyph_id;
+                 g->g.measured = 0;
+               }
+             g->g.from = min_from, g->g.to = max_to;
+           }
+       }
+      else
+       {
+         for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used;
+              i++, otfg++)
+           {
+             int feature_idx = otfg->positioning_type >> 4;
+
+             if (feature_idx)
+               {
+                 tag = features[feature_idx - 1].FeatureTag;
+                 tag = PACK_OTF_TAG (tag);
+                 for (j = otfg->f.index.from; j <= otfg->f.index.to; j++)
+                   {
+                     g = in_glyphs + (from + j);
+                     g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag;
+                   }
+               }
+           }
+       }
+    }
+  else if (out)
+    {
+      if (out->allocated < gidx + len)
+       return -2;
+      for (i = 0; i < len; i++)
+       out_glyphs[out->used++] = in_glyphs[from + i];
+    }
+
+  if (gpos_features)
+    {
+      OTF_Feature *features;
+      MGlyph *g;
+
+      if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys,
+                                  gpos_features) < 0)
+       return to;
+      features = otf->gpos->FeatureList.Feature;
+      if (out)
+       {
+         MGlyph *base = NULL, *mark = NULL;
+         int x_ppem = face->size->metrics.x_ppem;
+         int y_ppem = face->size->metrics.y_ppem;
+         int x_scale = face->size->metrics.x_scale;
+         int y_scale = face->size->metrics.y_scale;
+
+         for (i = j = 0, otfg = otf_gstring.glyphs, g = out_glyphs + gidx;
+              i < otf_gstring.used; i++, otfg++)
+           {
+             MGlyph *prev;
+             int adjust_idx = otfg->glyph_id ? j : j - 1;
+             int feature_idx = otfg->positioning_type >> 4;
+
+             if (feature_idx)
+               {
+                 tag = features[feature_idx - 1].FeatureTag;
+                 tag = PACK_OTF_TAG (tag);
+                 g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag;
+               }
+             switch (otfg->positioning_type & 0xF)
+               {
+               case 0:
+                 break;
+               case 1:                 /* Single */
+               case 2:                 /* Pair */
+                 {
+                   int format = otfg->f.f1.format;
+
+                   if (format & OTF_XPlacement)
+                     adjustment[adjust_idx].xoff
+                       += otfg->f.f1.value->XPlacement * x_scale / 0x10000;
+                   if (format & OTF_XPlaDevice)
+                     adjustment[adjust_idx].xoff
+                       += DEVICE_DELTA (otfg->f.f1.value->XPlaDevice, x_ppem);
+                   if (format & OTF_YPlacement)
+                     adjustment[adjust_idx].yoff
+                       -= otfg->f.f1.value->YPlacement * y_scale / 0x10000;
+                   if (format & OTF_YPlaDevice)
+                     adjustment[adjust_idx].yoff
+                       -= DEVICE_DELTA (otfg->f.f1.value->YPlaDevice, y_ppem);
+                   if (format & OTF_XAdvance)
+                     adjustment[adjust_idx].xadv
+                       += otfg->f.f1.value->XAdvance * x_scale / 0x10000;
+                   if (format & OTF_XAdvDevice)
+                     adjustment[adjust_idx].xadv
+                       += DEVICE_DELTA (otfg->f.f1.value->XAdvDevice, x_ppem);
+                   if (format & OTF_YAdvance)
+                     adjustment[adjust_idx].yadv
+                       += otfg->f.f1.value->YAdvance * y_scale / 0x10000;
+                   if (format & OTF_YAdvDevice)
+                     adjustment[adjust_idx].yadv
+                       += DEVICE_DELTA (otfg->f.f1.value->YAdvDevice, y_ppem);
+                   adjustment[adjust_idx].set = 1;
+                 }
+                 break;
+               case 3:         /* Cursive */
+                 /* Not yet supported.  */
+                 break;
+               case 4:         /* Mark-to-Base */
+               case 5:         /* Mark-to-Ligature */
+                 if (! base)
+                   break;
+                 prev = base;
+                 goto label_adjust_anchor;
+               default:                /* i.e. case 6 Mark-to-Mark */
+                 if (! mark)
+                   break;
+                 prev = mark;
+
+               label_adjust_anchor:
+                 {
+                   int base_x, base_y, mark_x, mark_y;
+                   int this_from, this_to;
+                   int k;
+
+                   base_x = otfg->f.f4.base_anchor->XCoordinate * x_scale / 0x10000;
+                   base_y = otfg->f.f4.base_anchor->YCoordinate * y_scale / 0x10000;
+                   mark_x = otfg->f.f4.mark_anchor->XCoordinate * x_scale / 0x10000;
+                   mark_y = otfg->f.f4.mark_anchor->YCoordinate * y_scale / 0x10000;;
+
+                   if (otfg->f.f4.base_anchor->AnchorFormat != 1)
+                     adjust_anchor (otfg->f.f4.base_anchor, face, prev->g.code,
+                                    x_ppem, y_ppem, &base_x, &base_y);
+                   if (otfg->f.f4.mark_anchor->AnchorFormat != 1)
+                     adjust_anchor (otfg->f.f4.mark_anchor, face, g->g.code,
+                                    x_ppem, y_ppem, &mark_x, &mark_y);
+                   adjustment[adjust_idx].xoff = base_x - mark_x;
+                   adjustment[adjust_idx].yoff = - (base_y - mark_y);
+                   adjustment[adjust_idx].back = (g - prev);
+                   adjustment[adjust_idx].xadv = 0;
+                   adjustment[adjust_idx].advance_is_absolute = 1;
+                   adjustment[adjust_idx].set = 1;
+                   this_from = g->g.from;
+                   this_to = g->g.to;
+                   for (k = 0; prev + k < g; k++)
+                     {
+                       if (this_from > prev[k].g.from)
+                         this_from = prev[k].g.from;
+                       if (this_to < prev[k].g.to)
+                         this_to = prev[k].g.to;
+                     }
+                   for (; prev <= g; prev++)
+                     {
+                       prev->g.from = this_from;
+                       prev->g.to = this_to;
+                     }
+                 }
+               }
+             if (otfg->glyph_id)
+               {
+                 if (otfg->GlyphClass == OTF_GlyphClass0)
+                   base = mark = g;
+                 else if (otfg->GlyphClass == OTF_GlyphClassMark)
+                   mark = g;
+                 else
+                   base = g;
+                 j++, g++;
+               }
+           }
+       }
+      else
+       {
+         for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used;
+              i++, otfg++)
+           if (otfg->positioning_type & 0xF)
+             {
+               int feature_idx = otfg->positioning_type >> 4;
+
+               if (feature_idx)
+                 {
+                   tag = features[feature_idx - 1].FeatureTag;
+                   tag = PACK_OTF_TAG (tag);
+                   for (j = otfg->f.index.from; j <= otfg->f.index.to; j++)
+                     {
+                       g = in_glyphs + (from + j);
+                       g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag;
+                     }
+                 }
+             }
+       }
+    }
+
+  free (otf_gstring.glyphs);
+  return to;
+
+ simple_copy:
+  if (otf_gstring.glyphs)
+    free (otf_gstring.glyphs);
+#endif /* HAVE_OTF */
+  if (out)
+    {
+      if (out->allocated < out->used + len)
+       return -2;
+      font->get_metrics (font, in, from, to);
+      memcpy ((MGlyph *)out->glyphs + out->used, (MGlyph *) in->glyphs + from,
+             sizeof (MGlyph) * len);
+      out->used += len;
+    }
+  return to;
+}
+
+static int 
+ft_try_otf (MFLTFont *font, MFLTOtfSpec *spec,
+           MFLTGlyphString *in, int from, int to)
+{
+  return ft_drive_otf (font, spec, in, from, to, NULL, NULL);
+}
+
+
+#ifdef HAVE_OTF
+static unsigned char *iterate_bitmap;
+
+static int
+iterate_callback (OTF *otf, const char *feature, unsigned glyph_id)
+{
+  if (glyph_id <= otf->cmap->max_glyph_id)
+    iterate_bitmap[glyph_id / 8] |= 1 << (glyph_id % 8);
+  return 0;
+}
+
+static int
+ft_iterate_otf_feature (MFLTFont *font, MFLTOtfSpec *spec,
+                       int from, int to, unsigned char *table)
+{
+  OTF *otf = get_otf (font, NULL);
+  char id[13];
+  int bmp_size;
+  unsigned char *bitmap = NULL;
+  int i, j;
+  char script[5], *langsys = NULL;
+
+  if (! otf)
+    return -1;
+  if (OTF_get_table (otf, "cmap") < 0)
+    return -1;
+  if (! spec->features[0])
+    return -1;
+  strcpy (id, "feature-");
+  id[12] = '\0';
+  OTF_tag_name (spec->script, script);
+  if (spec->langsys)
+    {
+      langsys = alloca (5);
+      OTF_tag_name (spec->langsys, langsys);
+    }
+  bmp_size = (otf->cmap->max_glyph_id / 8) + 1;
+  for (i = 0; spec->features[0][i]; i++)
+    {
+      unsigned char *bmp;
+
+      OTF_tag_name (spec->features[0][i], id + 8);
+      bmp = OTF_get_data (otf, id);
+      if (! bmp)
+       {
+         iterate_bitmap = bmp = calloc (bmp_size, 1);
+         OTF_iterate_gsub_feature (otf, iterate_callback,
+                                   script, langsys, id + 8);
+         OTF_put_data (otf, id, bmp, free);
+       }
+      if (i == 0 && ! spec->features[0][1])
+       /* Single feature */
+       bitmap = bmp;
+      else
+       {
+         if (! bitmap)
+           {
+             bitmap = alloca (bmp_size);
+             memcpy (bitmap, bmp, bmp_size);
+           }
+         else
+           {
+             int j;
+
+             for (j = 0; j < bmp_size; j++)
+               bitmap[j] &= bmp[j];
+           }
+       }
+    }
+  for (i = 0; i < bmp_size; i++)
+    if (bitmap[i])
+      {
+       for (j = 0; j < 8; j++)
+         if (bitmap[i] & (1 << j))
+           {
+             int c = OTF_get_unicode (otf, (i * 8) + j);
+
+             if (c >= from && c <= to)
+               table[c - from] = 1;
+           }
+      }
+  return 0;
+}
+#endif
+
 
 \f
 /* Internal API */
@@ -2136,7 +2653,11 @@ ft_close (MRealizedFont *rfont)
 MFontDriver mfont__ft_driver =
   { ft_select, ft_open, ft_find_metric, ft_has_char, ft_encode_char,
     ft_render, ft_list, ft_list_family_names, ft_check_capability,
-    ft_encapsulate, ft_close };
+    ft_encapsulate, ft_close, ft_check_otf, ft_drive_otf, ft_try_otf,
+#ifdef HAVE_OTF
+    ft_iterate_otf_feature
+#endif /* HAVE_OTF */
+  };
 
 int
 mfont__ft_init ()
@@ -2208,7 +2729,7 @@ mfont__ft_init ()
     msymbol_put (monospace, Mgeneric_family, monospace);
     msymbol_put (msymbol ("mono"), Mgeneric_family, monospace);
   }
-#endif
+#endif /* HAVE_FONTCONFIG */
 
   return 0;
 }
@@ -2340,297 +2861,4 @@ mfont__ft_unparse_name (MFont *font)
 }
 #endif /* HAVE_FONTCONFIG */
 
-\f
-#ifdef HAVE_OTF
-
-#define DEVICE_DELTA(table, size)                              \
-  (((size) >= (table).StartSize && (size) <= (table).EndSize)  \
-   ? (table).DeltaValue[(size) - (table).StartSize]            \
-   : 0)
-
-void
-adjust_anchor (OTF_Anchor *anchor, FT_Face ft_face,
-              unsigned code, int size, int *x, int *y)
-{
-  if (anchor->AnchorFormat == 2)
-    {
-      FT_Outline *outline;
-      int ap = anchor->f.f1.AnchorPoint;
-
-      FT_Load_Glyph (ft_face, (FT_UInt) code, FT_LOAD_MONOCHROME);
-      outline = &ft_face->glyph->outline;
-      if (ap < outline->n_points)
-       {
-         *x = outline->points[ap].x;
-         *y = outline->points[ap].y;
-       }
-    }
-  else if (anchor->AnchorFormat == 3)
-    {
-      if (anchor->f.f2.XDeviceTable.offset)
-       *x += DEVICE_DELTA (anchor->f.f2.XDeviceTable, size);
-      if (anchor->f.f2.YDeviceTable.offset)
-      *y += DEVICE_DELTA (anchor->f.f2.YDeviceTable, size);
-    }
-}
-
-int
-mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
-                    MFontCapability *cap)
-{
-  int len = to - from;
-  MGlyph *g = MGLYPH (from);
-  int i, gidx;
-  MRealizedFont *rfont;
-  MFontFT *ft_info;
-  OTF *otf;
-  OTF_GlyphString otf_gstring;
-  OTF_Glyph *otfg;
-  char *script, *langsys;
-  char *gsub_features, *gpos_features;
-  int need_cmap;
-
-  if (len == 0)
-    return from;
-
-  otf_gstring.glyphs = NULL;
-  rfont = g->rface->rfont;
-  ft_info = (MFontFT *) rfont->font;
-  if (ft_info->otf == invalid_otf)
-    goto simple_copy;
-  otf = ft_info->otf;
-  if (! otf)
-    {
-      MRealizedFontFT *ft_rfont = rfont->info;
-
-#if (LIBOTF_MAJOR_VERSION > 0 || LIBOTF_MINOR_VERSION > 9 || LIBOTF_RELEASE_NUMBER > 4)
-      otf = OTF_open_ft_face (ft_rfont->ft_face);
-#else
-      otf = OTF_open (MSYMBOL_NAME (ft_info->font.file));
-#endif
-      if (! otf)
-       {
-         ft_info->otf = invalid_otf;
-         goto simple_copy;
-       }
-      ft_info->otf = otf;
-    }
-  if (OTF_get_table (otf, "head") < 0)
-    {
-      OTF_close (otf);
-      ft_info->otf = invalid_otf;
-      goto simple_copy;
-    }
-
-  if (cap->script_tag)
-    {
-      script = alloca (5);
-      OTF_tag_name (cap->script_tag, script);
-    }
-  else
-    script = NULL;
-  if (cap->langsys_tag)
-    {
-      langsys = alloca (5);
-      OTF_tag_name (cap->langsys_tag, langsys);
-    }
-  else
-    langsys = NULL;
-  gsub_features = cap->features[MFONT_OTT_GSUB].str;
-  if (gsub_features && OTF_check_table (otf, "GSUB") < 0)
-    gsub_features = NULL;
-  gpos_features = cap->features[MFONT_OTT_GPOS].str;
-  if (gpos_features && OTF_check_table (otf, "GPOS") < 0)
-    gpos_features = NULL;
-
-  otf_gstring.size = otf_gstring.used = len;
-  otf_gstring.glyphs = (OTF_Glyph *) malloc (sizeof (OTF_Glyph) * len);
-  memset (otf_gstring.glyphs, 0, sizeof (OTF_Glyph) * len);
-  for (i = 0, need_cmap = 0; i < len; i++)
-    {
-      if (gstring->glyphs[from + i].otf_encoded)
-       {
-         otf_gstring.glyphs[i].c = gstring->glyphs[from + i].c;
-         otf_gstring.glyphs[i].glyph_id = gstring->glyphs[from + i].code;
-       }
-      else
-       {
-         otf_gstring.glyphs[i].c = gstring->glyphs[from + i].code;
-         need_cmap++;
-       }
-    }
-  if (need_cmap
-      && OTF_drive_cmap (otf, &otf_gstring) < 0)
-    goto simple_copy;
-
-  OTF_drive_gdef (otf, &otf_gstring);
-  gidx = gstring->used;
-
-  if (gsub_features)
-    {
-      if (OTF_drive_gsub (otf, &otf_gstring, script, langsys, gsub_features)
-         < 0)
-       goto simple_copy;
-      for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; i++, otfg++)
-       {
-         MGlyph temp = *(MGLYPH (from + otfg->f.index.from));
-
-         temp.c = otfg->c;
-         temp.combining_code = 0;
-         if (otfg->glyph_id)
-           {
-             temp.code = otfg->glyph_id;
-             temp.otf_encoded = 1;
-           }
-         else
-           {
-             temp.code = temp.c;
-             temp.otf_encoded = 0;
-           }
-         temp.to = MGLYPH (from + otfg->f.index.to)->to;
-         MLIST_APPEND1 (gstring, glyphs, temp, MERROR_FONT_OTF);
-       }
-    }
-  else
-    for (i = 0; i < len; i++)
-      {
-       MGlyph temp = gstring->glyphs[from + i];
-
-       if (otf_gstring.glyphs[i].glyph_id)
-         {
-           temp.code = otf_gstring.glyphs[i].glyph_id;
-           temp.otf_encoded = 1;
-         }
-       MLIST_APPEND1 (gstring, glyphs, temp, MERROR_FONT_OTF);
-      }
-
-  (rfont->driver->find_metric) (rfont, gstring, gidx, gstring->used);
-
-  if (gpos_features)
-    {
-      int u;
-      int size10, size;
-      MGlyph *base = NULL, *mark = NULL;
-
-      if (OTF_check_features (otf, 1,
-                             cap->script_tag, cap->langsys_tag,
-                             cap->features[MFONT_OTT_GPOS].tags,
-                             cap->features[MFONT_OTT_GPOS].nfeatures) != 1
-         || (OTF_drive_gpos (otf, &otf_gstring, script, langsys,
-                             gpos_features) < 0))
-       return to;
-
-      u = otf->head->unitsPerEm;
-      size10 = rfont->spec.size;
-      size = size10 / 10;
-
-      for (i = 0, otfg = otf_gstring.glyphs, g = MGLYPH (gidx);
-          i < otf_gstring.used; i++, otfg++, g++)
-       {
-         MGlyph *prev;
-
-         if (! otfg->glyph_id)
-           continue;
-         switch (otfg->positioning_type)
-           {
-           case 0:
-             break;
-           case 1: case 2:
-             {
-               int format = otfg->f.f1.format;
-
-               if (format & OTF_XPlacement)
-                 g->xoff = otfg->f.f1.value->XPlacement * size10 / u / 10;
-               if (format & OTF_XPlaDevice)
-                 g->xoff += DEVICE_DELTA (otfg->f.f1.value->XPlaDevice, size);
-               if (format & OTF_YPlacement)
-                 g->yoff = - (otfg->f.f1.value->YPlacement * size10 / u / 10);
-               if (format & OTF_YPlaDevice)
-                 g->yoff -= DEVICE_DELTA (otfg->f.f1.value->YPlaDevice, size);
-               if (format & OTF_XAdvance)
-                 g->width += otfg->f.f1.value->XAdvance * size10 / u / 10;
-               if (format & OTF_XAdvDevice)
-                 g->width += DEVICE_DELTA (otfg->f.f1.value->XAdvDevice, size);
-             }
-             break;
-           case 3:
-             /* Not yet supported.  */
-             break;
-           case 4: case 5:
-             if (! base)
-               break;
-             prev = base;
-             goto label_adjust_anchor;
-           default:            /* i.e. case 6 */
-             if (! mark)
-               break;
-             prev = mark;
-
-           label_adjust_anchor:
-             {
-               int base_x, base_y, mark_x, mark_y;
-
-               base_x = otfg->f.f4.base_anchor->XCoordinate * size10 / u / 10;
-               base_y = otfg->f.f4.base_anchor->YCoordinate * size10 / u / 10;
-               mark_x = otfg->f.f4.mark_anchor->XCoordinate * size10 / u / 10;
-               mark_y = otfg->f.f4.mark_anchor->YCoordinate * size10 / u / 10;
-
-               if (otfg->f.f4.base_anchor->AnchorFormat != 1)
-                 adjust_anchor (otfg->f.f4.base_anchor, rfont->fontp,
-                                prev->code, size, &base_x, &base_y);
-               if (otfg->f.f4.mark_anchor->AnchorFormat != 1)
-                 adjust_anchor (otfg->f.f4.mark_anchor, rfont->fontp,
-                                g->code, size, &mark_x, &mark_y);
-               g->xoff = prev->xoff + (base_x - prev->width) - mark_x;
-               g->yoff = prev->yoff + mark_y - base_y;
-               g->combining_code = MAKE_PRECOMPUTED_COMBINDING_CODE ();
-             }
-           }
-         if (otfg->GlyphClass == OTF_GlyphClass0)
-           base = mark = g;
-         else if (otfg->GlyphClass == OTF_GlyphClassMark)
-           mark = g;
-         else
-           base = g;
-       }
-    }
-  free (otf_gstring.glyphs);
-  return to;
-
- simple_copy:
-  for (i = 0; i < len; i++)
-    {
-      MGlyph *g = MGLYPH (from + i);
-
-      if (! g->otf_encoded)
-       {
-         g->code = rfont->driver->encode_char (gstring->frame, (MFont *) rfont,
-                                               NULL, g->code);
-         g->otf_encoded = 1;
-       }
-    }
-
-  rfont->driver->find_metric (rfont, gstring, from, to);
-  for (i = 0; i < len; i++)
-    {
-      MGlyph temp = gstring->glyphs[from + i];
-      MLIST_APPEND1 (gstring, glyphs, temp, MERROR_FONT_OTF);
-    }
-  if (otf_gstring.glyphs)
-    free (otf_gstring.glyphs);
-  return to;
-}
-
-
-int
-mfont__ft_decode_otf (MGlyph *g)
-{
-  MFontFT *ft_info = (MFontFT *) g->rface->rfont->font;
-  int c = OTF_get_unicode (ft_info->otf, (OTF_GlyphID) g->code);
-
-  return (c ? c : -1);
-}
-
-#endif /* HAVE_OTF */
-
 #endif /* HAVE_FREETYPE */