Shrink space used for ligature ids
[framework/uifw/harfbuzz.git] / src / hb-ot-layout.cc
index 367cb59..a49f339 100644 (file)
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1998-2004  David Turner and Werner Lemberg
- * Copyright (C) 2006  Behdad Esfahbod
- * Copyright (C) 2007,2008,2009  Red Hat, Inc.
+ * Copyright © 1998-2004  David Turner and Werner Lemberg
+ * Copyright © 2006  Behdad Esfahbod
+ * Copyright © 2007,2008,2009  Red Hat, Inc.
  *
- *  This is part of HarfBuzz, an OpenType Layout engine library.
+ *  This is part of HarfBuzz, a text shaping library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
 
 #define HB_OT_LAYOUT_CC
 
-#include "hb-ot-layout.h"
-#include "hb-ot-layout-private.h"
+#include "hb-ot-layout-private.hh"
 
-#include "hb-ot-layout-open-private.h"
-#include "hb-ot-layout-gdef-private.h"
-#include "hb-ot-layout-gsub-private.h"
+#include "hb-ot-layout-gdef-private.hh"
+#include "hb-ot-layout-gsub-private.hh"
+#include "hb-ot-layout-gpos-private.hh"
+#include "hb-ot-head-private.hh"
+#include "hb-ot-maxp-private.hh"
 
-/* XXX */
-#include "harfbuzz-buffer-private.h"
 
 #include <stdlib.h>
 #include <string.h>
 
+HB_BEGIN_DECLS
 
-hb_ot_layout_t *
-hb_ot_layout_create (void)
-{
-  hb_ot_layout_t *layout = (hb_ot_layout_t *) calloc (1, sizeof (hb_ot_layout_t));
-
-  layout->gdef = &Null(GDEF);
-  layout->gsub = &Null(GSUB);
-  layout->gpos = &/*XXX*/Null(GSUBGPOS);
-
-  return layout;
-}
 
 hb_ot_layout_t *
-hb_ot_layout_create_for_data (const char *font_data,
-                             int         face_index)
+_hb_ot_layout_create (hb_face_t *face)
 {
-  hb_ot_layout_t *layout;
+  /* TODO Remove this object altogether */
+  hb_ot_layout_t *layout = (hb_ot_layout_t *) calloc (1, sizeof (hb_ot_layout_t));
 
-  if (HB_UNLIKELY (font_data == NULL))
-    return hb_ot_layout_create ();
+  layout->gdef_blob = Sanitizer<GDEF>::sanitize (hb_face_reference_table (face, HB_OT_TAG_GDEF));
+  layout->gdef = Sanitizer<GDEF>::lock_instance (layout->gdef_blob);
 
-  layout = (hb_ot_layout_t *) calloc (1, sizeof (hb_ot_layout_t));
+  layout->gsub_blob = Sanitizer<GSUB>::sanitize (hb_face_reference_table (face, HB_OT_TAG_GSUB));
+  layout->gsub = Sanitizer<GSUB>::lock_instance (layout->gsub_blob);
 
-  const OpenTypeFontFile &font = OpenTypeFontFile::get_for_data (font_data);
-  const OpenTypeFontFace &face = font.get_face (face_index);
+  layout->gpos_blob = Sanitizer<GPOS>::sanitize (hb_face_reference_table (face, HB_OT_TAG_GPOS));
+  layout->gpos = Sanitizer<GPOS>::lock_instance (layout->gpos_blob);
 
-  layout->gdef = &GDEF::get_for_data (font.get_table_data (face.get_table_by_tag (GDEF::Tag)));
-  layout->gsub = &GSUB::get_for_data (font.get_table_data (face.get_table_by_tag (GSUB::Tag)));
-  layout->gpos = &/*XXX*/GSUBGPOS::get_for_data (font.get_table_data (face.get_table_by_tag (/*XXX*/GSUBGPOS::GPOSTag)));
+  layout->head_blob = Sanitizer<head>::sanitize (hb_face_reference_table (face, HB_OT_TAG_head));
+  layout->head = Sanitizer<head>::lock_instance (layout->head_blob);
 
   return layout;
 }
 
 void
-hb_ot_layout_destroy (hb_ot_layout_t *layout)
+_hb_ot_layout_destroy (hb_ot_layout_t *layout)
 {
+  hb_blob_destroy (layout->gdef_blob);
+  hb_blob_destroy (layout->gsub_blob);
+  hb_blob_destroy (layout->gpos_blob);
+  hb_blob_destroy (layout->head_blob);
+
   free (layout);
 }
 
-/*
- * GDEF
- */
-
-/* XXX the public class_t is a mess */
-
-hb_bool_t
-hb_ot_layout_has_font_glyph_classes (hb_ot_layout_t *layout)
+static inline const GDEF&
+_get_gdef (hb_face_t *face)
 {
-  return layout->gdef->has_glyph_classes ();
+  return likely (face->ot_layout && face->ot_layout->gdef) ? *face->ot_layout->gdef : Null(GDEF);
 }
-
-HB_OT_LAYOUT_INTERNAL hb_bool_t
-_hb_ot_layout_has_new_glyph_classes (hb_ot_layout_t *layout)
+static inline const GSUB&
+_get_gsub (hb_face_t *face)
 {
-  return layout->new_gdef.len > 0;
+  return likely (face->ot_layout && face->ot_layout->gsub) ? *face->ot_layout->gsub : Null(GSUB);
 }
-
-HB_OT_LAYOUT_INTERNAL unsigned int
-_hb_ot_layout_get_glyph_property (hb_ot_layout_t *layout,
-                                 hb_codepoint_t  glyph)
+static inline const GPOS&
+_get_gpos (hb_face_t *face)
 {
-  hb_ot_layout_class_t klass;
-
-  /* TODO old harfbuzz doesn't always parse mark attachments as it says it was
-   * introduced without a version bump, so it may not be safe */
-  klass = layout->gdef->get_mark_attachment_type (glyph);
-  if (klass)
-    return klass << 8;
+  return likely (face->ot_layout && face->ot_layout->gpos) ? *face->ot_layout->gpos : Null(GPOS);
+}
+static inline const head&
+_get_head (hb_face_t *face)
+{
+  return likely (face->ot_layout && face->ot_layout->head) ? *face->ot_layout->head : Null(head);
+}
 
-  klass = layout->gdef->get_glyph_class (glyph);
 
-  if (!klass && glyph < layout->new_gdef.len)
-    klass = layout->new_gdef.klasses[glyph];
+/*
+ * GDEF
+ */
 
-  switch (klass) {
-  default:
-  case GDEF::UnclassifiedGlyph:        return HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED;
-  case GDEF::BaseGlyph:                return HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH;
-  case GDEF::LigatureGlyph:    return HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE;
-  case GDEF::MarkGlyph:                return HB_OT_LAYOUT_GLYPH_CLASS_MARK;
-  case GDEF::ComponentGlyph:   return HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT;
-  }
+hb_bool_t
+hb_ot_layout_has_glyph_classes (hb_face_t *face)
+{
+  return _get_gdef (face).has_glyph_classes ();
 }
 
-HB_OT_LAYOUT_INTERNAL hb_bool_t
-_hb_ot_layout_check_glyph_property (hb_ot_layout_t *layout,
-                                   HB_GlyphItem    gitem,
-                                   unsigned int    lookup_flags,
-                                   unsigned int   *property)
+unsigned int
+_hb_ot_layout_get_glyph_property (hb_face_t       *face,
+                                 hb_glyph_info_t *info)
 {
-  hb_ot_layout_glyph_class_t basic_glyph_class;
-  unsigned int desired_attachment_class;
-
-  if (gitem->gproperty == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN)
+  if (!info->props_cache())
   {
-    gitem->gproperty = *property = _hb_ot_layout_get_glyph_property (layout, gitem->gindex);
-    if (gitem->gproperty == HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED)
-      return false;
+    const GDEF &gdef = _get_gdef (face);
+    info->props_cache() = gdef.get_glyph_props (info->codepoint);
   }
 
-  *property = gitem->gproperty;
-
-  /* If the glyph was found in the MarkAttachmentClass table,
-   * then that class value is the high byte of the result,
-   * otherwise the low byte contains the basic type of the glyph
-   * as defined by the GlyphClassDef table.
-   */
-  if (*property & LookupFlag::MarkAttachmentType)
-    basic_glyph_class = HB_OT_LAYOUT_GLYPH_CLASS_MARK;
-  else
-    basic_glyph_class = (hb_ot_layout_glyph_class_t) *property;
+  return info->props_cache();
+}
 
-  /* Not covered, if, for example, basic_glyph_class
-   * is HB_GDEF_LIGATURE and lookup_flags includes LookupFlags::IgnoreLigatures
+static hb_bool_t
+_hb_ot_layout_match_properties (hb_face_t      *face,
+                               hb_codepoint_t  codepoint,
+                               unsigned int    glyph_props,
+                               unsigned int    lookup_props)
+{
+  /* Not covered, if, for example, glyph class is ligature and
+   * lookup_props includes LookupFlags::IgnoreLigatures
    */
-  if (lookup_flags & basic_glyph_class)
+  if (glyph_props & lookup_props & LookupFlag::IgnoreFlags)
     return false;
 
-  /* The high byte of lookup_flags has the meaning
-   * "ignore marks of attachment type different than
-   * the attachment type specified."
-   */
-  desired_attachment_class = lookup_flags & LookupFlag::MarkAttachmentType;
-  if (desired_attachment_class)
+  if (glyph_props & HB_OT_LAYOUT_GLYPH_CLASS_MARK)
   {
-    if (basic_glyph_class == HB_OT_LAYOUT_GLYPH_CLASS_MARK &&
-        *property != desired_attachment_class)
-      return false;
+    /* If using mark filtering sets, the high short of
+     * lookup_props has the set index.
+     */
+    if (lookup_props & LookupFlag::UseMarkFilteringSet)
+      return _get_gdef (face).mark_set_covers (lookup_props >> 16, codepoint);
+
+    /* The second byte of lookup_props has the meaning
+     * "ignore marks of attachment type different than
+     * the attachment type specified."
+     */
+    if (lookup_props & LookupFlag::MarkAttachmentType && glyph_props & LookupFlag::MarkAttachmentType)
+      return (lookup_props & LookupFlag::MarkAttachmentType) == (glyph_props & LookupFlag::MarkAttachmentType);
   }
 
   return true;
 }
 
-HB_OT_LAYOUT_INTERNAL void
-_hb_ot_layout_set_glyph_property (hb_ot_layout_t *layout,
-                                 hb_codepoint_t  glyph,
-                                 unsigned int    property)
+hb_bool_t
+_hb_ot_layout_check_glyph_property (hb_face_t    *face,
+                                   hb_glyph_info_t *ginfo,
+                                   unsigned int  lookup_props,
+                                   unsigned int *property_out)
 {
-  hb_ot_layout_glyph_class_t klass;
+  unsigned int property;
 
-  if (property & LookupFlag::MarkAttachmentType)
-    klass = HB_OT_LAYOUT_GLYPH_CLASS_MARK;
-  else
-    klass = (hb_ot_layout_glyph_class_t) property;
+  property = _hb_ot_layout_get_glyph_property (face, ginfo);
+  (void) (property_out && (*property_out = property));
 
-  hb_ot_layout_set_glyph_class (layout, glyph, klass);
+  return _hb_ot_layout_match_properties (face, ginfo->codepoint, property, lookup_props);
 }
 
-
-hb_ot_layout_glyph_class_t
-hb_ot_layout_get_glyph_class (hb_ot_layout_t *layout,
-                             hb_codepoint_t  glyph)
+hb_bool_t
+_hb_ot_layout_skip_mark (hb_face_t    *face,
+                        hb_glyph_info_t *ginfo,
+                        unsigned int  lookup_props,
+                        unsigned int *property_out)
 {
   unsigned int property;
-  hb_ot_layout_class_t klass;
 
-  property = _hb_ot_layout_get_glyph_property (layout, glyph);
+  property = _hb_ot_layout_get_glyph_property (face, ginfo);
+  (void) (property_out && (*property_out = property));
 
-  if (property & LookupFlag::MarkAttachmentType)
-    return HB_OT_LAYOUT_GLYPH_CLASS_MARK;
+  /* If it's a mark, skip it we don't accept it. */
+  if (unlikely (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK))
+    return !_hb_ot_layout_match_properties (face, ginfo->codepoint, property, lookup_props);
 
-  return (hb_ot_layout_glyph_class_t) property;
+  /* If not a mark, don't skip. */
+  return false;
 }
 
-void
-hb_ot_layout_set_glyph_class (hb_ot_layout_t             *layout,
-                             hb_codepoint_t              glyph,
-                             hb_ot_layout_glyph_class_t  klass)
-{
-  /* TODO optimize this, similar to old harfbuzz code for example */
-
-  hb_ot_layout_class_t gdef_klass;
-  int len = layout->new_gdef.len;
-
-  if (G_UNLIKELY (glyph > 65535))
-    return;
 
-  if (glyph >= len) {
-    int new_len;
-    unsigned char *new_klasses;
 
-    new_len = len == 0 ? 120 : 2 * len;
-    if (new_len > 65535)
-      new_len = 65535;
-    new_klasses = (unsigned char *) realloc (layout->new_gdef.klasses, new_len * sizeof (unsigned char));
-
-    if (G_UNLIKELY (!new_klasses))
-      return;
-
-    memset (new_klasses + len, 0, new_len - len);
-
-    layout->new_gdef.klasses = new_klasses;
-    layout->new_gdef.len = new_len;
-  }
-
-  switch (klass) {
-  default:
-  case HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED:  gdef_klass = GDEF::UnclassifiedGlyph;   break;
-  case HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH:    gdef_klass = GDEF::BaseGlyph;           break;
-  case HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE:      gdef_klass = GDEF::LigatureGlyph;       break;
-  case HB_OT_LAYOUT_GLYPH_CLASS_MARK:          gdef_klass = GDEF::MarkGlyph;           break;
-  case HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT:     gdef_klass = GDEF::ComponentGlyph;      break;
-  }
-
-  layout->new_gdef.klasses[glyph] = gdef_klass;
-  return;
+unsigned int
+hb_ot_layout_get_attach_points (hb_face_t      *face,
+                               hb_codepoint_t  glyph,
+                               unsigned int    start_offset,
+                               unsigned int   *point_count /* IN/OUT */,
+                               unsigned int   *point_array /* OUT */)
+{
+  return _get_gdef (face).get_attach_points (glyph, start_offset, point_count, point_array);
 }
 
-void
-hb_ot_layout_build_glyph_classes (hb_ot_layout_t *layout,
-                                 uint16_t        num_total_glyphs,
-                                 hb_codepoint_t *glyphs,
-                                 unsigned char  *klasses,
-                                 uint16_t        count)
-{
-  if (G_UNLIKELY (!count || !glyphs || !klasses))
-    return;
-
-  if (layout->new_gdef.len == 0) {
-    layout->new_gdef.klasses = (unsigned char *) calloc (num_total_glyphs, sizeof (unsigned char));
-    layout->new_gdef.len = count;
-  }
-
-  for (unsigned int i = 0; i < count; i++)
-    hb_ot_layout_set_glyph_class (layout, glyphs[i], (hb_ot_layout_glyph_class_t) klasses[i]);
+unsigned int
+hb_ot_layout_get_ligature_carets (hb_font_t      *font,
+                                 hb_direction_t  direction,
+                                 hb_codepoint_t  glyph,
+                                 unsigned int    start_offset,
+                                 unsigned int   *caret_count /* IN/OUT */,
+                                 int            *caret_array /* OUT */)
+{
+  return _get_gdef (font->face).get_lig_carets (font, direction, glyph, start_offset, caret_count, caret_array);
 }
 
 /*
@@ -274,141 +212,123 @@ hb_ot_layout_build_glyph_classes (hb_ot_layout_t *layout,
  */
 
 static const GSUBGPOS&
-get_gsubgpos_table (hb_ot_layout_t            *layout,
-                   hb_ot_layout_table_type_t  table_type)
+get_gsubgpos_table (hb_face_t *face,
+                   hb_tag_t   table_tag)
 {
-  switch (table_type) {
-    case HB_OT_LAYOUT_TABLE_TYPE_GSUB: return *(layout->gsub);
-    case HB_OT_LAYOUT_TABLE_TYPE_GPOS: return *(layout->gpos);
-    default:                           return Null(GSUBGPOS);
+  switch (table_tag) {
+    case HB_OT_TAG_GSUB: return _get_gsub (face);
+    case HB_OT_TAG_GPOS: return _get_gpos (face);
+    default:             return Null(GSUBGPOS);
   }
 }
 
 
 unsigned int
-hb_ot_layout_table_get_script_count (hb_ot_layout_t            *layout,
-                                    hb_ot_layout_table_type_t  table_type)
+hb_ot_layout_table_get_script_tags (hb_face_t    *face,
+                                   hb_tag_t      table_tag,
+                                   unsigned int  start_offset,
+                                   unsigned int *script_count /* IN/OUT */,
+                                   hb_tag_t     *script_tags /* OUT */)
 {
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
+  const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
 
-  return g.get_script_count ();
-}
-
-hb_tag_t
-hb_ot_layout_table_get_script_tag (hb_ot_layout_t            *layout,
-                                  hb_ot_layout_table_type_t  table_type,
-                                  unsigned int               script_index)
-{
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
-
-  return g.get_script_tag (script_index);
+  return g.get_script_tags (start_offset, script_count, script_tags);
 }
 
 hb_bool_t
-hb_ot_layout_table_find_script (hb_ot_layout_t            *layout,
-                               hb_ot_layout_table_type_t  table_type,
-                               hb_tag_t                   script_tag,
-                               unsigned int              *script_index)
+hb_ot_layout_table_find_script (hb_face_t    *face,
+                               hb_tag_t      table_tag,
+                               hb_tag_t      script_tag,
+                               unsigned int *script_index)
 {
-  ASSERT_STATIC (NO_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX);
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
+  ASSERT_STATIC (Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX);
+  const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
 
   if (g.find_script_index (script_tag, script_index))
     return TRUE;
 
   /* try finding 'DFLT' */
-  if (g.find_script_index (HB_OT_LAYOUT_TAG_DEFAULT_SCRIPT, script_index))
+  if (g.find_script_index (HB_OT_TAG_DEFAULT_SCRIPT, script_index))
     return FALSE;
 
-  /* try with 'dflt'; MS site has had typos and many fonts use it now :( */
-  if (g.find_script_index (HB_OT_LAYOUT_TAG_DEFAULT_LANGUAGE, script_index))
+  /* try with 'dflt'; MS site has had typos and many fonts use it now :(.
+   * including many versions of DejaVu Sans Mono! */
+  if (g.find_script_index (HB_OT_TAG_DEFAULT_LANGUAGE, script_index))
     return FALSE;
 
   if (script_index) *script_index = HB_OT_LAYOUT_NO_SCRIPT_INDEX;
   return FALSE;
 }
 
-unsigned int
-hb_ot_layout_table_get_feature_count (hb_ot_layout_t            *layout,
-                                     hb_ot_layout_table_type_t  table_type)
-{
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
-
-  return g.get_feature_count ();
-}
-
-hb_tag_t
-hb_ot_layout_table_get_feature_tag (hb_ot_layout_t            *layout,
-                                   hb_ot_layout_table_type_t  table_type,
-                                   unsigned int               feature_index)
+hb_bool_t
+hb_ot_layout_table_choose_script (hb_face_t      *face,
+                                 hb_tag_t        table_tag,
+                                 const hb_tag_t *script_tags,
+                                 unsigned int   *script_index)
 {
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
+  ASSERT_STATIC (Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX);
+  const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
 
-  return g.get_feature_tag (feature_index);
-}
+  while (*script_tags)
+  {
+    if (g.find_script_index (*script_tags, script_index))
+      return TRUE;
+    script_tags++;
+  }
 
-hb_bool_t
-hb_ot_layout_table_find_feature (hb_ot_layout_t            *layout,
-                                hb_ot_layout_table_type_t  table_type,
-                                hb_tag_t                   feature_tag,
-                                unsigned int              *feature_index)
-{
-  ASSERT_STATIC (NO_INDEX == HB_OT_LAYOUT_NO_FEATURE_INDEX);
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
+  /* try finding 'DFLT' */
+  if (g.find_script_index (HB_OT_TAG_DEFAULT_SCRIPT, script_index))
+    return FALSE;
 
-  if (g.find_feature_index (feature_tag, feature_index))
-    return TRUE;
+  /* try with 'dflt'; MS site has had typos and many fonts use it now :( */
+  if (g.find_script_index (HB_OT_TAG_DEFAULT_LANGUAGE, script_index))
+    return FALSE;
 
-  if (feature_index) *feature_index = HB_OT_LAYOUT_NO_FEATURE_INDEX;
+  if (script_index) *script_index = HB_OT_LAYOUT_NO_SCRIPT_INDEX;
   return FALSE;
 }
 
 unsigned int
-hb_ot_layout_table_get_lookup_count (hb_ot_layout_t            *layout,
-                                    hb_ot_layout_table_type_t  table_type)
+hb_ot_layout_table_get_feature_tags (hb_face_t    *face,
+                                    hb_tag_t      table_tag,
+                                    unsigned int  start_offset,
+                                    unsigned int *feature_count /* IN/OUT */,
+                                    hb_tag_t     *feature_tags /* OUT */)
 {
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
+  const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
 
-  return g.get_lookup_count ();
+  return g.get_feature_tags (start_offset, feature_count, feature_tags);
 }
 
 
 unsigned int
-hb_ot_layout_script_get_language_count (hb_ot_layout_t            *layout,
-                                       hb_ot_layout_table_type_t  table_type,
-                                       unsigned int               script_index)
-{
-  const Script &s = get_gsubgpos_table (layout, table_type).get_script (script_index);
-
-  return s.get_lang_sys_count ();
-}
-
-hb_tag_t
-hb_ot_layout_script_get_language_tag (hb_ot_layout_t            *layout,
-                                     hb_ot_layout_table_type_t  table_type,
-                                     unsigned int               script_index,
-                                     unsigned int               language_index)
+hb_ot_layout_script_get_language_tags (hb_face_t    *face,
+                                      hb_tag_t      table_tag,
+                                      unsigned int  script_index,
+                                      unsigned int  start_offset,
+                                      unsigned int *language_count /* IN/OUT */,
+                                      hb_tag_t     *language_tags /* OUT */)
 {
-  const Script &s = get_gsubgpos_table (layout, table_type).get_script (script_index);
+  const Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index);
 
-  return s.get_lang_sys_tag (language_index);
+  return s.get_lang_sys_tags (start_offset, language_count, language_tags);
 }
 
 hb_bool_t
-hb_ot_layout_script_find_language (hb_ot_layout_t            *layout,
-                                  hb_ot_layout_table_type_t  table_type,
-                                  unsigned int               script_index,
-                                  hb_tag_t                   language_tag,
-                                  unsigned int              *language_index)
+hb_ot_layout_script_find_language (hb_face_t    *face,
+                                  hb_tag_t      table_tag,
+                                  unsigned int  script_index,
+                                  hb_tag_t      language_tag,
+                                  unsigned int *language_index)
 {
-  ASSERT_STATIC (NO_INDEX == HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX);
-  const Script &s = get_gsubgpos_table (layout, table_type).get_script (script_index);
+  ASSERT_STATIC (Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX);
+  const Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index);
 
   if (s.find_lang_sys_index (language_tag, language_index))
     return TRUE;
 
   /* try with 'dflt'; MS site has had typos and many fonts use it now :( */
-  if (s.find_lang_sys_index (HB_OT_LAYOUT_TAG_DEFAULT_LANGUAGE, language_index))
+  if (s.find_lang_sys_index (HB_OT_TAG_DEFAULT_LANGUAGE, language_index))
     return FALSE;
 
   if (language_index) *language_index = HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX;
@@ -416,13 +336,13 @@ hb_ot_layout_script_find_language (hb_ot_layout_t            *layout,
 }
 
 hb_bool_t
-hb_ot_layout_language_get_required_feature_index (hb_ot_layout_t            *layout,
-                                                 hb_ot_layout_table_type_t  table_type,
-                                                 unsigned int               script_index,
-                                                 unsigned int               language_index,
-                                                 unsigned int              *feature_index)
+hb_ot_layout_language_get_required_feature_index (hb_face_t    *face,
+                                                 hb_tag_t      table_tag,
+                                                 unsigned int  script_index,
+                                                 unsigned int  language_index,
+                                                 unsigned int *feature_index)
 {
-  const LangSys &l = get_gsubgpos_table (layout, table_type).get_script (script_index).get_lang_sys (language_index);
+  const LangSys &l = get_gsubgpos_table (face, table_tag).get_script (script_index).get_lang_sys (language_index);
 
   if (feature_index) *feature_index = l.get_required_feature_index ();
 
@@ -430,54 +350,55 @@ hb_ot_layout_language_get_required_feature_index (hb_ot_layout_t            *lay
 }
 
 unsigned int
-hb_ot_layout_language_get_feature_count (hb_ot_layout_t            *layout,
-                                        hb_ot_layout_table_type_t  table_type,
-                                        unsigned int               script_index,
-                                        unsigned int               language_index)
-{
-  const LangSys &l = get_gsubgpos_table (layout, table_type).get_script (script_index).get_lang_sys (language_index);
+hb_ot_layout_language_get_feature_indexes (hb_face_t    *face,
+                                          hb_tag_t      table_tag,
+                                          unsigned int  script_index,
+                                          unsigned int  language_index,
+                                          unsigned int  start_offset,
+                                          unsigned int *feature_count /* IN/OUT */,
+                                          unsigned int *feature_indexes /* OUT */)
+{
+  const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
+  const LangSys &l = g.get_script (script_index).get_lang_sys (language_index);
 
-  return l.get_feature_count ();
+  return l.get_feature_indexes (start_offset, feature_count, feature_indexes);
 }
 
 unsigned int
-hb_ot_layout_language_get_feature_index (hb_ot_layout_t            *layout,
-                                        hb_ot_layout_table_type_t  table_type,
-                                        unsigned int               script_index,
-                                        unsigned int               language_index,
-                                        unsigned int               num_feature)
-{
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
+hb_ot_layout_language_get_feature_tags (hb_face_t    *face,
+                                       hb_tag_t      table_tag,
+                                       unsigned int  script_index,
+                                       unsigned int  language_index,
+                                       unsigned int  start_offset,
+                                       unsigned int *feature_count /* IN/OUT */,
+                                       hb_tag_t     *feature_tags /* OUT */)
+{
+  const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
   const LangSys &l = g.get_script (script_index).get_lang_sys (language_index);
 
-  return l.get_feature_index (num_feature);
-}
+  ASSERT_STATIC (sizeof (unsigned int) == sizeof (hb_tag_t));
+  unsigned int ret = l.get_feature_indexes (start_offset, feature_count, (unsigned int *) feature_tags);
 
-hb_tag_t
-hb_ot_layout_language_get_feature_tag (hb_ot_layout_t            *layout,
-                                      hb_ot_layout_table_type_t  table_type,
-                                      unsigned int               script_index,
-                                      unsigned int               language_index,
-                                      unsigned int               num_feature)
-{
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
-  const LangSys &l = g.get_script (script_index).get_lang_sys (language_index);
-  unsigned int feature_index = l.get_feature_index (num_feature);
+  if (feature_tags) {
+    unsigned int count = *feature_count;
+    for (unsigned int i = 0; i < count; i++)
+      feature_tags[i] = g.get_feature_tag ((unsigned int) feature_tags[i]);
+  }
 
-  return g.get_feature_tag (feature_index);
+  return ret;
 }
 
 
 hb_bool_t
-hb_ot_layout_language_find_feature (hb_ot_layout_t            *layout,
-                                   hb_ot_layout_table_type_t  table_type,
-                                   unsigned int               script_index,
-                                   unsigned int               language_index,
-                                   hb_tag_t                   feature_tag,
-                                   unsigned int              *feature_index)
-{
-  ASSERT_STATIC (NO_INDEX == HB_OT_LAYOUT_NO_FEATURE_INDEX);
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
+hb_ot_layout_language_find_feature (hb_face_t    *face,
+                                   hb_tag_t      table_tag,
+                                   unsigned int  script_index,
+                                   unsigned int  language_index,
+                                   hb_tag_t      feature_tag,
+                                   unsigned int *feature_index)
+{
+  ASSERT_STATIC (Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_FEATURE_INDEX);
+  const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
   const LangSys &l = g.get_script (script_index).get_lang_sys (language_index);
 
   unsigned int num_features = l.get_feature_count ();
@@ -495,113 +416,94 @@ hb_ot_layout_language_find_feature (hb_ot_layout_t            *layout,
 }
 
 unsigned int
-hb_ot_layout_feature_get_lookup_count (hb_ot_layout_t            *layout,
-                                      hb_ot_layout_table_type_t  table_type,
-                                      unsigned int               feature_index)
-{
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
+hb_ot_layout_feature_get_lookup_indexes (hb_face_t    *face,
+                                        hb_tag_t      table_tag,
+                                        unsigned int  feature_index,
+                                        unsigned int  start_offset,
+                                        unsigned int *lookup_count /* IN/OUT */,
+                                        unsigned int *lookup_indexes /* OUT */)
+{
+  const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
   const Feature &f = g.get_feature (feature_index);
 
-  return f.get_lookup_count ();
+  return f.get_lookup_indexes (start_offset, lookup_count, lookup_indexes);
 }
 
-unsigned int
-hb_ot_layout_feature_get_lookup_index (hb_ot_layout_t            *layout,
-                                      hb_ot_layout_table_type_t  table_type,
-                                      unsigned int               feature_index,
-                                      unsigned int               num_lookup)
-{
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
-  const Feature &f = g.get_feature (feature_index);
-
-  return f.get_lookup_index (num_lookup);
-}
 
 /*
  * GSUB
  */
 
 hb_bool_t
-hb_ot_layout_substitute_lookup (hb_ot_layout_t              *layout,
-                               hb_buffer_t                 *buffer,
-                               unsigned int                 lookup_index,
-                               hb_ot_layout_feature_mask_t  mask)
+hb_ot_layout_has_substitution (hb_face_t *face)
 {
-  return layout->gsub->substitute_lookup (layout, buffer, lookup_index, mask);
+  return &_get_gsub (face) != &Null(GSUB);
 }
 
-
-
-/* XXX dupped, until he old code can be removed */
-
-static HB_Error
-hb_buffer_duplicate_out_buffer( HB_Buffer buffer )
+void
+hb_ot_layout_substitute_start (hb_buffer_t  *buffer)
 {
-  if ( !buffer->alt_string )
-    {
-      HB_Error error;
-
-      if ( ALLOC_ARRAY( buffer->alt_string, buffer->allocated, HB_GlyphItemRec ) )
-       return error;
-    }
+  unsigned int count = buffer->len;
+  for (unsigned int i = 0; i < count; i++)
+    buffer->info[i].var1.u32 = buffer->info[i].var2.u32 = 0;
+}
 
-  buffer->out_string = buffer->alt_string;
-  memcpy( buffer->out_string, buffer->in_string, buffer->out_length * sizeof (buffer->out_string[0]) );
-  buffer->separate_out = TRUE;
+hb_bool_t
+hb_ot_layout_substitute_lookup (hb_face_t    *face,
+                               hb_buffer_t  *buffer,
+                               unsigned int  lookup_index,
+                               hb_mask_t     mask)
+{
+  return _get_gsub (face).substitute_lookup (face, buffer, lookup_index, mask);
+}
 
-  return HB_Err_Ok;
+void
+hb_ot_layout_substitute_finish (hb_buffer_t  *buffer HB_UNUSED)
+{
 }
 
 
+/*
+ * GPOS
+ */
 
-HB_INTERNAL HB_Error
-_hb_buffer_add_output_glyph_ids( HB_Buffer  buffer,
-                             HB_UShort  num_in,
-                             HB_UShort  num_out,
-                             const GlyphID *glyph_data,
-                             HB_UShort  component,
-                             HB_UShort  ligID )
+hb_bool_t
+hb_ot_layout_has_positioning (hb_face_t *face)
 {
-  HB_Error  error;
-  HB_UShort i;
-  HB_UInt properties;
-  HB_UInt cluster;
-
-  error = hb_buffer_ensure( buffer, buffer->out_pos + num_out );
-  if ( error )
-    return error;
+  return &_get_gpos (face) != &Null(GPOS);
+}
 
-  if ( !buffer->separate_out )
-    {
-      error = hb_buffer_duplicate_out_buffer( buffer );
-      if ( error )
-       return error;
-    }
+void
+hb_ot_layout_position_start (hb_buffer_t  *buffer)
+{
+  buffer->clear_positions ();
+}
 
-  properties = buffer->in_string[buffer->in_pos].properties;
-  cluster = buffer->in_string[buffer->in_pos].cluster;
-  if ( component == 0xFFFF )
-    component = buffer->in_string[buffer->in_pos].component;
-  if ( ligID == 0xFFFF )
-    ligID = buffer->in_string[buffer->in_pos].ligID;
+hb_bool_t
+hb_ot_layout_position_lookup   (hb_font_t    *font,
+                               hb_buffer_t  *buffer,
+                               unsigned int  lookup_index,
+                               hb_mask_t     mask)
+{
+  return _get_gpos (font->face).position_lookup (font, buffer, lookup_index, mask);
+}
 
-  for ( i = 0; i < num_out; i++ )
-  {
-    HB_GlyphItem item = &buffer->out_string[buffer->out_pos + i];
-
-    item->gindex = glyph_data[i];
-    item->properties = properties;
-    item->cluster = cluster;
-    item->component = component;
-    item->ligID = ligID;
-    item->gproperty = HB_GLYPH_PROPERTY_UNKNOWN;
-  }
+void
+hb_ot_layout_position_finish (hb_buffer_t  *buffer)
+{
+  GPOS::position_finish (buffer);
+}
 
-  buffer->in_pos  += num_in;
-  buffer->out_pos += num_out;
 
-  buffer->out_length = buffer->out_pos;
+/*
+ * head
+ */
 
-  return HB_Err_Ok;
+unsigned int
+_hb_ot_layout_get_upem (hb_face_t *face)
+{
+  return _get_head (face).get_upem ();
 }
 
+
+HB_END_DECLS