WIP removing external synthesized GDEF support and implementing it internally
[profile/ivi/org.tizen.video-player.git] / src / hb-ot-layout.cc
index ea055fe..d128fdb 100644 (file)
@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1998-2004  David Turner and Werner Lemberg
  * Copyright (C) 2006  Behdad Esfahbod
- * Copyright (C) 2007,2008  Red Hat, Inc.
+ * Copyright (C) 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"
 
-/* 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_new (hb_face_t *face)
 {
+  /* Remove this object altogether */
   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);
+  layout->gdef_blob = Sanitizer<GDEF>::sanitize (hb_face_get_table (face, HB_OT_TAG_GDEF));
+  layout->gdef = Sanitizer<GDEF>::lock_instance (layout->gdef_blob);
+
+  layout->gsub_blob = Sanitizer<GSUB>::sanitize (hb_face_get_table (face, HB_OT_TAG_GSUB));
+  layout->gsub = Sanitizer<GSUB>::lock_instance (layout->gsub_blob);
+
+  layout->gpos_blob = Sanitizer<GPOS>::sanitize (hb_face_get_table (face, HB_OT_TAG_GPOS));
+  layout->gpos = Sanitizer<GPOS>::lock_instance (layout->gpos_blob);
 
   return layout;
 }
 
-hb_ot_layout_t *
-hb_ot_layout_create_for_data (const char *font_data,
-                             int         face_index)
+void
+_hb_ot_layout_free (hb_ot_layout_t *layout)
 {
-  hb_ot_layout_t *layout;
+  hb_blob_unlock (layout->gdef_blob);
+  hb_blob_unlock (layout->gsub_blob);
+  hb_blob_unlock (layout->gpos_blob);
 
-  if (HB_UNLIKELY (font_data == NULL))
-    return hb_ot_layout_create ();
+  hb_blob_destroy (layout->gdef_blob);
+  hb_blob_destroy (layout->gsub_blob);
+  hb_blob_destroy (layout->gpos_blob);
 
-  layout = (hb_ot_layout_t *) calloc (1, sizeof (hb_ot_layout_t));
-
-  const OpenTypeFontFile &font = OpenTypeFontFile::get_for_data (font_data);
-  const OpenTypeFontFace &face = font.get_face (face_index);
+  free (layout);
+}
 
-  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)));
+static const GDEF&
+_get_gdef (hb_face_t *face)
+{
+  return likely (face->ot_layout && face->ot_layout->gdef) ? *face->ot_layout->gdef : Null(GDEF);
+}
 
-  return layout;
+static const GSUB&
+_get_gsub (hb_face_t *face)
+{
+  return likely (face->ot_layout && face->ot_layout->gsub) ? *face->ot_layout->gsub : Null(GSUB);
 }
 
-void
-hb_ot_layout_destroy (hb_ot_layout_t *layout)
+static const GPOS&
+_get_gpos (hb_face_t *face)
 {
-  free (layout);
+  return likely (face->ot_layout && face->ot_layout->gpos) ? *face->ot_layout->gpos : Null(GPOS);
 }
 
+
 /*
  * GDEF
  */
 
-/* XXX the public class_t is a mess */
-
 hb_bool_t
-hb_ot_layout_has_font_glyph_classes (hb_ot_layout_t *layout)
+hb_ot_layout_has_glyph_classes (hb_face_t *face)
 {
-  return layout->gdef->has_glyph_classes ();
+  return _get_gdef (face).has_glyph_classes ();
 }
 
-HB_OT_LAYOUT_INTERNAL hb_bool_t
-_hb_ot_layout_has_new_glyph_classes (hb_ot_layout_t *layout)
+static unsigned int
+_hb_ot_layout_get_glyph_property_from_gdef (hb_face_t       *face,
+                                           hb_glyph_info_t *info)
 {
-  return layout->new_gdef.len > 0;
-}
+  hb_codepoint_t glyph = info->codepoint;
 
-HB_OT_LAYOUT_INTERNAL unsigned int
-_hb_ot_layout_get_glyph_property (hb_ot_layout_t *layout,
-                                 hb_codepoint_t  glyph)
-{
-  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;
+  unsigned int klass;
+  const GDEF &gdef = _get_gdef (face);
 
-  klass = layout->gdef->get_glyph_class (glyph);
-
-  if (!klass && glyph < layout->new_gdef.len)
-    klass = layout->new_gdef.klasses[glyph];
+  klass = gdef.get_glyph_class (glyph);
 
   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;
+  case GDEF::MarkGlyph:
+       klass = gdef.get_mark_attachment_type (glyph);
+       return HB_OT_LAYOUT_GLYPH_CLASS_MARK | (klass << 8);
   }
 }
 
-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)
+static inline 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 (!info->gproperty())
+    info->gproperty() = _hb_ot_layout_get_glyph_property_from_gdef (face, info);
 
-  if (gitem->gproperty == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN)
-  {
-    gitem->gproperty = *property = _hb_ot_layout_get_glyph_property (layout, gitem->gindex);
-    if (gitem->gproperty == HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED)
-      return false;
-  }
+  return info->gproperty();
+}
 
-  *property = gitem->gproperty;
+hb_bool_t
+_hb_ot_layout_check_glyph_property (hb_face_t    *face,
+                                   hb_glyph_info_t *ginfo,
+                                   unsigned int  lookup_flags,
+                                   unsigned int *property_out)
+{
+  unsigned int property;
 
-  /* 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;
+  property = _hb_ot_layout_get_glyph_property (face, ginfo);
+  if (property_out)
+    *property_out = property;
 
-  /* Not covered, if, for example, basic_glyph_class
-   * is HB_GDEF_LIGATURE and lookup_flags includes LookupFlags::IgnoreLigatures
+  /* Not covered, if, for example, glyph class is ligature and
+   * lookup_flags includes LookupFlags::IgnoreLigatures
    */
-  if (lookup_flags & basic_glyph_class)
+  if (property & lookup_flags & 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 (property & 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_flags has the set index.
+     */
+    if (lookup_flags & LookupFlag::UseMarkFilteringSet)
+      return _get_gdef (face).mark_set_covers (lookup_flags >> 16, ginfo->codepoint);
+
+    /* The second byte of lookup_flags has the meaning
+     * "ignore marks of attachment type different than
+     * the attachment type specified."
+     */
+    if (lookup_flags & LookupFlag::MarkAttachmentType && property & LookupFlag::MarkAttachmentType)
+      return (lookup_flags & LookupFlag::MarkAttachmentType) == (property & 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_ot_layout_glyph_class_t klass;
-
-  if (property & LookupFlag::MarkAttachmentType)
-    klass = HB_OT_LAYOUT_GLYPH_CLASS_MARK;
-  else
-    klass = (hb_ot_layout_glyph_class_t) property;
-
-  hb_ot_layout_set_glyph_class (layout, glyph, klass);
-}
-
-
-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_flags,
+                        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);
+  if (property_out)
+    *property_out = property;
 
-  if (property & LookupFlag::MarkAttachmentType)
-    return HB_OT_LAYOUT_GLYPH_CLASS_MARK;
+  if (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK)
+  {
+    /* Skip mark if lookup_flags includes LookupFlags::IgnoreMarks */
+    if (lookup_flags & LookupFlag::IgnoreMarks)
+      return true;
+
+    /* If using mark filtering sets, the high short of lookup_flags has the set index. */
+    if (lookup_flags & LookupFlag::UseMarkFilteringSet)
+      return !_get_gdef (face).mark_set_covers (lookup_flags >> 16, ginfo->codepoint);
+
+    /* The second byte of lookup_flags has the meaning "ignore marks of attachment type
+     * different than the attachment type specified." */
+    if (lookup_flags & LookupFlag::MarkAttachmentType && property & LookupFlag::MarkAttachmentType)
+      return (lookup_flags & LookupFlag::MarkAttachmentType) != (property & LookupFlag::MarkAttachmentType);
+  }
 
-  return (hb_ot_layout_glyph_class_t) property;
+  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)
+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 */)
 {
-  /* 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;
+  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)
+unsigned int
+hb_ot_layout_get_ligature_carets (hb_font_t      *font,
+                                 hb_face_t      *face,
+                                 hb_direction_t  direction,
+                                 hb_codepoint_t  glyph,
+                                 unsigned int    start_offset,
+                                 unsigned int   *caret_count /* IN/OUT */,
+                                 int            *caret_array /* OUT */)
 {
-  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]);
+  hb_ot_layout_context_t c;
+  c.font = font;
+  c.face = face;
+  return _get_gdef (face).get_lig_carets (&c, direction, glyph, start_offset, caret_count, caret_array);
 }
 
 /*
@@ -274,141 +233,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)
-{
-  const GSUBGPOS &g = get_gsubgpos_table (layout, table_type);
-
-  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)
+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_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 +357,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 +371,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 +437,126 @@ 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 )
+hb_bool_t
+hb_ot_layout_substitute_lookup (hb_face_t    *face,
+                               hb_buffer_t  *buffer,
+                               unsigned int  lookup_index,
+                               hb_mask_t     mask)
 {
-  if ( !buffer->alt_string )
-    {
-      HB_Error error;
+  hb_ot_layout_context_t c;
+  c.font = NULL;
+  c.face = face;
+  return _get_gsub (face).substitute_lookup (&c, buffer, lookup_index, mask);
+}
 
-      if ( ALLOC_ARRAY( buffer->alt_string, buffer->allocated, HB_GlyphItemRec ) )
-       return error;
-    }
 
-  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;
+/*
+ * GPOS
+ */
 
-  return HB_Err_Ok;
+hb_bool_t
+hb_ot_layout_has_positioning (hb_face_t *face)
+{
+  return &_get_gpos (face) != &Null(GPOS);
 }
 
+hb_bool_t
+hb_ot_layout_position_lookup   (hb_font_t    *font,
+                               hb_face_t    *face,
+                               hb_buffer_t  *buffer,
+                               unsigned int  lookup_index,
+                               hb_mask_t     mask)
+{
+  hb_ot_layout_context_t c;
+  c.font = font;
+  c.face = face;
+  return _get_gpos (face).position_lookup (&c, buffer, lookup_index, mask);
+}
 
-
-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 )
+void
+hb_ot_layout_position_finish (hb_font_t    *font HB_UNUSED,
+                             hb_face_t    *face HB_UNUSED,
+                             hb_buffer_t  *buffer)
 {
-  HB_Error  error;
-  HB_UShort i;
-  HB_UInt properties;
-  HB_UInt cluster;
+  unsigned int i, j;
+  unsigned int len = hb_buffer_get_length (buffer);
+  hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer);
+  hb_direction_t direction = buffer->props.direction;
 
-  error = hb_buffer_ensure( buffer, buffer->out_pos + num_out );
-  if ( error )
-    return error;
+  /* TODO: Vertical */
 
-  if ( !buffer->separate_out )
-    {
-      error = hb_buffer_duplicate_out_buffer( buffer );
-      if ( error )
-       return error;
+  /* Handle cursive connections:
+   * First handle all chain-back connections, then handle all chain-forward connections. */
+  if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
+  {
+    for (j = 0; j < len; j++) {
+      if (pos[j].cursive_chain() < 0)
+       pos[j].y_offset += pos[j + pos[j].cursive_chain()].y_offset;
     }
-
-  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;
-
-  for ( i = 0; i < num_out; i++ )
+    for (i = len; i > 0; i--) {
+      j = i - 1;
+      if (pos[j].cursive_chain() > 0)
+       pos[j].y_offset += pos[j + pos[j].cursive_chain()].y_offset;
+    }
+  }
+  else
   {
-    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;
+    for (j = 0; j < len; j++) {
+      if (pos[j].cursive_chain() < 0)
+       pos[j].x_offset += pos[j + pos[j].cursive_chain()].x_offset;
+    }
+    for (i = len; i > 0; i--) {
+      j = i - 1;
+      if (pos[j].cursive_chain() > 0)
+       pos[j].x_offset += pos[j + pos[j].cursive_chain()].x_offset;
+    }
   }
 
-  buffer->in_pos  += num_in;
-  buffer->out_pos += num_out;
 
-  buffer->out_length = buffer->out_pos;
-
-  return HB_Err_Ok;
+  /* Handle attachments */
+  for (i = 0; i < len; i++)
+    if (pos[i].back())
+    {
+      unsigned int back = i - pos[i].back();
+      pos[i].x_offset += pos[back].x_offset;
+      pos[i].y_offset += pos[back].y_offset;
+
+      if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction))
+       for (j = back + 1; j < i + 1; j++) {
+         pos[i].x_offset += pos[j].x_advance;
+         pos[i].y_offset += pos[j].y_advance;
+       }
+      else
+       for (j = back; j < i; j++) {
+         pos[i].x_offset -= pos[j].x_advance;
+         pos[i].y_offset -= pos[j].y_advance;
+       }
+    }
 }
 
+
+HB_END_DECLS