Upgrade to latest harfbuzz
[framework/uifw/harfbuzz.git] / src / hb-ot-shape.cc
index 34ac89b..19cf680 100644 (file)
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2009,2010  Red Hat, Inc.
+ * Copyright © 2009,2010  Red Hat, Inc.
+ * Copyright © 2010,2011  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * Red Hat Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod
  */
 
-#include "hb-ot-shape.h"
+#include "hb-ot-shape-private.hh"
+#include "hb-ot-shape-normalize-private.hh"
 
-#include "hb-buffer-private.hh"
+#include "hb-font-private.hh"
+#include "hb-set-private.hh"
 
-#include "hb-open-type-private.hh"
 
-#include "hb-ot-layout.h"
 
-HB_BEGIN_DECLS
-
-
-/* XXX vertical */
-hb_tag_t default_features[] = {
-  HB_TAG('c','a','l','t'),
+hb_tag_t common_features[] = {
   HB_TAG('c','c','m','p'),
-  HB_TAG('c','l','i','g'),
-  HB_TAG('c','s','w','h'),
-  HB_TAG('c','u','r','s'),
-  HB_TAG('k','e','r','n'),
   HB_TAG('l','i','g','a'),
   HB_TAG('l','o','c','l'),
   HB_TAG('m','a','r','k'),
   HB_TAG('m','k','m','k'),
-  HB_TAG('r','l','i','g')
+  HB_TAG('r','l','i','g'),
 };
 
-struct lookup_map {
-  unsigned int index;
-  hb_mask_t mask;
-};
-
-
-static void
-add_feature (hb_face_t    *face,
-            hb_tag_t      table_tag,
-            unsigned int  feature_index,
-            hb_mask_t     mask,
-            lookup_map   *lookups,
-            unsigned int *num_lookups,
-            unsigned int  room_lookups)
-{
-  unsigned int i = room_lookups - *num_lookups;
-  lookups += *num_lookups;
 
-  unsigned int *lookup_indices = (unsigned int *) lookups;
+hb_tag_t horizontal_features[] = {
+  HB_TAG('c','a','l','t'),
+  HB_TAG('c','l','i','g'),
+  HB_TAG('c','u','r','s'),
+  HB_TAG('k','e','r','n'),
+};
 
-  hb_ot_layout_feature_get_lookup_indexes (face, table_tag, feature_index, 0,
-                                          &i,
-                                          lookup_indices);
+/* Note:
+ * Technically speaking, vrt2 and vert are mutually exclusive.
+ * According to the spec, valt and vpal are also mutually exclusive.
+ * But we apply them all for now.
+ */
+hb_tag_t vertical_features[] = {
+  HB_TAG('v','a','l','t'),
+  HB_TAG('v','e','r','t'),
+  HB_TAG('v','k','r','n'),
+  HB_TAG('v','p','a','l'),
+  HB_TAG('v','r','t','2'),
+};
 
-  *num_lookups += i;
 
-  while (i--) {
-    lookups[i].mask = mask;
-    lookups[i].index = lookup_indices[i];
-  }
-}
 
-static int
-cmp_lookups (const void *p1, const void *p2)
+struct hb_ot_shape_planner_t
 {
-  const lookup_map *a = (const lookup_map *) p1;
-  const lookup_map *b = (const lookup_map *) p2;
-
-  return a->index - b->index;
-}
-
-
-#define MAX_FEATURES 100 /* FIXME */
-
-struct hb_mask_allocator_t {
-
-  struct feature_info_t {
-    hb_tag_t tag;
-    unsigned int value;
-    unsigned int seq;
-    bool global;
-
-    static int
-    cmp (const void *p1, const void *p2)
-    {
-      const feature_info_t *a = (const feature_info_t *) p1;
-      const feature_info_t *b = (const feature_info_t *) p2;
+  hb_ot_map_builder_t map;
+  hb_ot_complex_shaper_t shaper;
 
-      if (a->tag != b->tag)
-        return a->tag < b->tag ? -1 : 1;
+  hb_ot_shape_planner_t (void) : map () {}
+  ~hb_ot_shape_planner_t (void) { map.finish (); }
 
-      return a->seq < b->seq ? -1 : 1;
-    }
-  };
-
-  struct feature_map_t {
-    hb_tag_t tag; /* should be first */
-    unsigned int index;
-    unsigned int shift;
-    hb_mask_t mask;
-
-    static int
-    cmp (const void *p1, const void *p2)
-    {
-      const feature_map_t *a = (const feature_map_t *) p1;
-      const feature_map_t *b = (const feature_map_t *) p2;
-
-      return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0;
-    }
-  };
-
-  hb_mask_allocator_t (void) : count (0) {}
-
-  void add_feature (hb_tag_t tag,
-                   unsigned int value,
-                   bool global)
-  {
-    feature_info_t *info = &infos[count++];
-    info->tag = tag;
-    info->value = value;
-    info->seq = count;
-    info->global = global;
-  }
-
-  void compile (hb_face_t *face,
-               hb_tag_t table_tag,
-               unsigned int script_index,
-               unsigned int language_index)
+  inline void compile (hb_face_t *face,
+                      const hb_segment_properties_t *props,
+                      struct hb_ot_shape_plan_t &plan)
   {
-    global_mask = 0;
-    unsigned int next_bit = 1;
-
-    if (!count)
-      return;
-
-    qsort (infos, count, sizeof (infos[0]), feature_info_t::cmp);
-
-    unsigned int j = 0;
-    for (unsigned int i = 1; i < count; i++)
-      if (infos[i].tag != infos[j].tag)
-       infos[++j] = infos[i];
-      else {
-       if (infos[i].global)
-         infos[j] = infos[i];
-       else {
-         infos[j].global = infos[j].global && (infos[j].value == infos[i].value);
-         infos[j].value = MAX (infos[j].value, infos[i].value);
-       }
-      }
-    count = j + 1;
-
-    /* Allocate bits now */
-    j = 0;
-    for (unsigned int i = 0; i < count; i++) {
-      const feature_info_t *info = &infos[i];
-
-      unsigned int bits_needed;
-
-      if (info->global && info->value == 1)
-        /* Uses the global bit */
-        bits_needed = 0;
-      else
-        bits_needed = _hb_bit_storage (info->value);
-
-      if (!info->value || next_bit + bits_needed > 8 * sizeof (hb_mask_t))
-        continue; /* Feature disabled, or not enough bits. */
-
-      unsigned int feature_index;
-      if (!hb_ot_layout_language_find_feature (face, table_tag, script_index, language_index,
-                                              info->tag, &feature_index))
-        continue;
-
-      feature_map_t *map = &maps[j++];
-
-      map->tag = info->tag;
-      map->index = feature_index;
-      if (info->global && info->value == 1) {
-        /* Use the global bit */
-        map->shift = 0;
-       map->mask = 1;
-      } else {
-       map->shift = next_bit;
-       map->mask = (1 << (next_bit + bits_needed)) - (1 << next_bit);
-       next_bit += bits_needed;
-      }
-
-      if (info->global && map->mask != 1)
-        global_mask |= map->mask;
-    }
-    count = j;
+    plan.shaper = shaper;
+    map.compile (face, props, plan.map);
   }
 
-  hb_mask_t get_global_mask (void) { return global_mask; }
-  const feature_map_t *find_feature (hb_tag_t tag) const {
-    static const feature_map_t off_map = { HB_TAG_NONE, Index::NOT_FOUND_INDEX, 0, 0 };
-    const feature_map_t *map = (const feature_map_t *) bsearch (&tag, maps, count, sizeof (maps[0]), feature_map_t::cmp);
-    return map ? map : &off_map;
-  }
-
-
   private:
-
-  unsigned int count;
-  feature_info_t infos[MAX_FEATURES];
-
-  feature_map_t maps[MAX_FEATURES];
-  hb_mask_t global_mask;
+  NO_COPY (hb_ot_shape_planner_t);
 };
 
 static void
-setup_lookups (hb_face_t    *face,
-              hb_buffer_t  *buffer,
-              hb_feature_t *features,
-              unsigned int  num_features,
-              hb_tag_t      table_tag,
-              lookup_map   *lookups,
-              unsigned int *num_lookups,
-              hb_direction_t original_direction)
+hb_ot_shape_collect_features (hb_ot_shape_planner_t          *planner,
+                             const hb_segment_properties_t  *props,
+                             const hb_feature_t             *user_features,
+                             unsigned int                    num_user_features)
 {
-  unsigned int i, j, script_index, language_index, feature_index, room_lookups;
-
-  room_lookups = *num_lookups;
-  *num_lookups = 0;
-
-  hb_ot_layout_table_choose_script (face, table_tag,
-                                   hb_ot_tags_from_script (buffer->props.script),
-                                   &script_index);
-  hb_ot_layout_script_find_language (face, table_tag, script_index,
-                                    hb_ot_tag_from_language (buffer->props.language),
-                                    &language_index);
-
-
-  hb_mask_allocator_t allocator;
-
-  switch (original_direction) {
+  switch (props->direction) {
     case HB_DIRECTION_LTR:
-      allocator.add_feature (HB_TAG ('l','t','r','a'), 1, true);
-      allocator.add_feature (HB_TAG ('l','t','r','m'), 1, true);
+      planner->map.add_bool_feature (HB_TAG ('l','t','r','a'));
+      planner->map.add_bool_feature (HB_TAG ('l','t','r','m'));
       break;
     case HB_DIRECTION_RTL:
-      allocator.add_feature (HB_TAG ('r','t','l','a'), 1, true);
-      allocator.add_feature (HB_TAG ('r','t','l','m'), 1, false);
+      planner->map.add_bool_feature (HB_TAG ('r','t','l','a'));
+      planner->map.add_bool_feature (HB_TAG ('r','t','l','m'), false);
       break;
     case HB_DIRECTION_TTB:
     case HB_DIRECTION_BTT:
+    case HB_DIRECTION_INVALID:
     default:
       break;
   }
 
-  for (i = 0; i < ARRAY_LENGTH (default_features); i++)
-    allocator.add_feature (default_features[i], 1, true);
-
-  /* XXX complex-shaper features go here */
-
-  for (unsigned int i = 0; i < num_features; i++) {
-    const hb_feature_t *feature = &features[i];
-    allocator.add_feature (feature->tag, feature->value, (feature->start == 0 && feature->end == (unsigned int) -1));
-  }
-
+#define ADD_FEATURES(array) \
+  HB_STMT_START { \
+    for (unsigned int i = 0; i < ARRAY_LENGTH (array); i++) \
+      planner->map.add_bool_feature (array[i]); \
+  } HB_STMT_END
 
-  /* Compile features */
-  allocator.compile (face, table_tag, script_index, language_index);
+  hb_ot_shape_complex_collect_features (planner->shaper, &planner->map, props);
 
+  ADD_FEATURES (common_features);
 
-  /* Gather lookup indices for features and set buffer masks at the same time */
+  if (HB_DIRECTION_IS_HORIZONTAL (props->direction))
+    ADD_FEATURES (horizontal_features);
+  else
+    ADD_FEATURES (vertical_features);
 
-  if (hb_ot_layout_language_get_required_feature_index (face, table_tag, script_index, language_index,
-                                                       &feature_index))
-    add_feature (face, table_tag, feature_index, 1, lookups, num_lookups, room_lookups);
+#undef ADD_FEATURES
 
-  const hb_mask_allocator_t::feature_map_t *map;
-
-  hb_mask_t global_mask = allocator.get_global_mask ();
-  if (global_mask)
-    buffer->set_masks (global_mask, global_mask, 0, (unsigned int) -1);
-
-  switch (original_direction) {
-    case HB_DIRECTION_LTR:
-      map = allocator.find_feature (HB_TAG ('l','t','r','a'));
-      add_feature (face, table_tag, map->index, map->mask, lookups, num_lookups, room_lookups);
-      map = allocator.find_feature (HB_TAG ('l','t','r','m'));
-      add_feature (face, table_tag, map->index, map->mask, lookups, num_lookups, room_lookups);
-      break;
-    case HB_DIRECTION_RTL:
-      map = allocator.find_feature (HB_TAG ('r','t','l','a'));
-      add_feature (face, table_tag, map->index, map->mask, lookups, num_lookups, room_lookups);
-      map = allocator.find_feature (HB_TAG ('r','t','l','m'));
-      add_feature (face, table_tag, map->index, map->mask, lookups, num_lookups, room_lookups);
-      break;
-    case HB_DIRECTION_TTB:
-    case HB_DIRECTION_BTT:
-    default:
-      break;
-  }
-
-  for (i = 0; i < ARRAY_LENGTH (default_features); i++)
-  {
-    map = allocator.find_feature (default_features[i]);
-    add_feature (face, table_tag, map->index, map->mask, lookups, num_lookups, room_lookups);
-  }
-
-  for (i = 0; i < num_features; i++)
-  {
-    hb_feature_t *feature = &features[i];
-    map = allocator.find_feature (feature->tag);
-    add_feature (face, table_tag, map->index, map->mask, lookups, num_lookups, room_lookups);
-    if (!(feature->start == 0 && feature->end == (unsigned int)-1))
-      buffer->set_masks (features[i].value << map->shift, map->mask, feature->start, feature->end);
-  }
-
-
-  /* Sort lookups and merge duplicates */
-
-  qsort (lookups, *num_lookups, sizeof (lookups[0]), cmp_lookups);
-
-  if (*num_lookups)
-  {
-    for (i = 1, j = 0; i < *num_lookups; i++)
-      if (lookups[i].index != lookups[j].index)
-       lookups[++j] = lookups[i];
-      else
-        lookups[j].mask |= lookups[i].mask;
-    j++;
-    *num_lookups = j;
+  for (unsigned int i = 0; i < num_user_features; i++) {
+    const hb_feature_t *feature = &user_features[i];
+    planner->map.add_feature (feature->tag, feature->value, (feature->start == 0 && feature->end == (unsigned int) -1));
   }
 }
 
 
-static hb_bool_t
-hb_ot_substitute_complex (hb_font_t    *font HB_UNUSED,
-                         hb_face_t    *face,
-                         hb_buffer_t  *buffer,
-                         hb_feature_t *features,
-                         unsigned int  num_features,
-                         hb_direction_t original_direction)
+struct hb_ot_shape_context_t
 {
-  lookup_map lookups[1000]; /* FIXME */
-  unsigned int num_lookups = ARRAY_LENGTH (lookups);
-  unsigned int i;
-
-  if (!hb_ot_layout_has_substitution (face))
-    return FALSE;
-
-  setup_lookups (face, buffer, features, num_features,
-                HB_OT_TAG_GSUB,
-                lookups, &num_lookups,
-                original_direction);
-
-  for (i = 0; i < num_lookups; i++)
-    hb_ot_layout_substitute_lookup (face, buffer, lookups[i].index, lookups[i].mask);
-
-  return TRUE;
-}
+  /* Input to hb_ot_shape_execute() */
+  hb_ot_shape_plan_t *plan;
+  hb_font_t *font;
+  hb_face_t *face;
+  hb_buffer_t  *buffer;
+  const hb_feature_t *user_features;
+  unsigned int        num_user_features;
+
+  /* Transient stuff */
+  hb_direction_t target_direction;
+  hb_bool_t applied_position_complex;
+};
 
-static hb_bool_t
-hb_ot_position_complex (hb_font_t    *font,
-                       hb_face_t    *face,
-                       hb_buffer_t  *buffer,
-                       hb_feature_t *features,
-                       unsigned int  num_features,
-                       hb_direction_t original_direction)
+static void
+hb_ot_shape_setup_masks (hb_ot_shape_context_t *c)
 {
-  lookup_map lookups[1000];
-  unsigned int num_lookups = ARRAY_LENGTH (lookups);
-  unsigned int i;
-
-  if (!hb_ot_layout_has_positioning (face))
-    return FALSE;
+  hb_mask_t global_mask = c->plan->map.get_global_mask ();
+  c->buffer->reset_masks (global_mask);
 
-  setup_lookups (face, buffer, features, num_features,
-                HB_OT_TAG_GPOS,
-                lookups, &num_lookups,
-                original_direction);
+  hb_ot_shape_complex_setup_masks (c->plan->shaper, &c->plan->map, c->buffer, c->font);
 
-  for (i = 0; i < num_lookups; i++)
-    hb_ot_layout_position_lookup (font, face, buffer, lookups[i].index, lookups[i].mask);
-
-  hb_ot_layout_position_finish (font, face, buffer);
-
-  return TRUE;
+  for (unsigned int i = 0; i < c->num_user_features; i++)
+  {
+    const hb_feature_t *feature = &c->user_features[i];
+    if (!(feature->start == 0 && feature->end == (unsigned int)-1)) {
+      unsigned int shift;
+      hb_mask_t mask = c->plan->map.get_mask (feature->tag, &shift);
+      c->buffer->set_masks (feature->value << shift, mask, feature->start, feature->end);
+    }
+  }
 }
 
 
@@ -407,12 +171,12 @@ hb_ot_position_complex (hb_font_t    *font,
 
 /* Prepare */
 
-static inline hb_bool_t
-is_variation_selector (hb_codepoint_t unicode)
+static void
+hb_set_unicode_props (hb_buffer_t *buffer)
 {
-  return unlikely ((unicode >=  0x180B && unicode <=  0x180D) || /* MONGOLIAN FREE VARIATION SELECTOR ONE..THREE */
-                  (unicode >=  0xFE00 && unicode <=  0xFE0F) || /* VARIATION SELECTOR-1..16 */
-                  (unicode >= 0xE0100 && unicode <= 0xE01EF));  /* VARIATION SELECTOR-17..256 */
+  unsigned int count = buffer->len;
+  for (unsigned int i = 0; i < count; i++)
+    _hb_glyph_info_set_unicode_props (&buffer->info[i], buffer->unicode);
 }
 
 static void
@@ -420,205 +184,345 @@ hb_form_clusters (hb_buffer_t *buffer)
 {
   unsigned int count = buffer->len;
   for (unsigned int i = 1; i < count; i++)
-    if (buffer->unicode->v.get_general_category (buffer->info[i].codepoint) == HB_CATEGORY_NON_SPACING_MARK)
-      buffer->info[i].cluster = buffer->info[i - 1].cluster;
+    if (FLAG (_hb_glyph_info_get_general_category (&buffer->info[i])) &
+       (FLAG (HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK) |
+        FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) |
+        FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)))
+      buffer->info[i].cluster = buffer->info[i - 1].cluster; /* XXX do the min() here */
 }
 
-static hb_direction_t
+static void
 hb_ensure_native_direction (hb_buffer_t *buffer)
 {
-  hb_direction_t original_direction = buffer->props.direction;
-
-  /* TODO vertical */
-  if (HB_DIRECTION_IS_HORIZONTAL (original_direction) &&
-      original_direction != _hb_script_get_horizontal_direction (buffer->props.script))
+  hb_direction_t direction = buffer->props.direction;
+
+  /* TODO vertical:
+   * The only BTT vertical script is Ogham, but it's not clear to me whether OpenType
+   * Ogham fonts are supposed to be implemented BTT or not.  Need to research that
+   * first. */
+  if ((HB_DIRECTION_IS_HORIZONTAL (direction) && direction != hb_script_get_horizontal_direction (buffer->props.script)) ||
+      (HB_DIRECTION_IS_VERTICAL   (direction) && direction != HB_DIRECTION_TTB))
   {
     hb_buffer_reverse_clusters (buffer);
     buffer->props.direction = HB_DIRECTION_REVERSE (buffer->props.direction);
   }
-
-  return original_direction;
 }
 
 
 /* Substitute */
 
 static void
-hb_mirror_chars (hb_buffer_t *buffer)
+hb_mirror_chars (hb_ot_shape_context_t *c)
 {
-  hb_unicode_get_mirroring_func_t get_mirroring = buffer->unicode->v.get_mirroring;
+  hb_unicode_funcs_t *unicode = c->buffer->unicode;
 
-  if (HB_DIRECTION_IS_FORWARD (buffer->props.direction))
+  if (HB_DIRECTION_IS_FORWARD (c->target_direction))
     return;
 
-//  map = allocator.find_feature (HB_TAG ('r','t','l','m'));
+  hb_mask_t rtlm_mask = c->plan->map.get_1_mask (HB_TAG ('r','t','l','m'));
 
-  unsigned int count = buffer->len;
+  unsigned int count = c->buffer->len;
   for (unsigned int i = 0; i < count; i++) {
-    hb_codepoint_t codepoint = get_mirroring (buffer->info[i].codepoint);
-    if (likely (codepoint == buffer->info[i].codepoint))
-;//      buffer->info[i].mask |= map->mask;
+    hb_codepoint_t codepoint = hb_unicode_mirroring (unicode, c->buffer->info[i].codepoint);
+    if (likely (codepoint == c->buffer->info[i].codepoint))
+      c->buffer->info[i].mask |= rtlm_mask; /* XXX this should be moved to before setting user-feature masks */
     else
-      buffer->info[i].codepoint = codepoint;
+      c->buffer->info[i].codepoint = codepoint;
   }
 }
 
 static void
 hb_map_glyphs (hb_font_t    *font,
-              hb_face_t    *face,
               hb_buffer_t  *buffer)
 {
+  hb_codepoint_t glyph;
+
   if (unlikely (!buffer->len))
     return;
 
   buffer->clear_output ();
+
   unsigned int count = buffer->len - 1;
-  for (buffer->i = 0; buffer->i < count;) {
-    if (unlikely (is_variation_selector (buffer->info[buffer->i + 1].codepoint))) {
-      buffer->add_output_glyph (hb_font_get_glyph (font, face, buffer->info[buffer->i].codepoint, buffer->info[buffer->i + 1].codepoint));
-      buffer->i++;
+  for (buffer->idx = 0; buffer->idx < count;) {
+    if (unlikely (_hb_unicode_is_variation_selector (buffer->cur(+1).codepoint))) {
+      hb_font_get_glyph (font, buffer->cur().codepoint, buffer->cur(+1).codepoint, &glyph);
+      buffer->replace_glyphs (2, 1, &glyph);
     } else {
-      buffer->add_output_glyph (hb_font_get_glyph (font, face, buffer->info[buffer->i].codepoint, 0));
+      hb_font_get_glyph (font, buffer->cur().codepoint, 0, &glyph);
+      buffer->replace_glyph (glyph);
     }
   }
-  if (likely (buffer->i < buffer->len))
-    buffer->add_output_glyph (hb_font_get_glyph (font, face, buffer->info[buffer->i].codepoint, 0));
-  buffer->swap ();
+  if (likely (buffer->idx < buffer->len)) {
+    hb_font_get_glyph (font, buffer->cur().codepoint, 0, &glyph);
+    buffer->replace_glyph (glyph);
+  }
+  buffer->swap_buffers ();
 }
 
 static void
-hb_substitute_default (hb_font_t    *font,
-                      hb_face_t    *face,
-                      hb_buffer_t  *buffer,
-                      hb_feature_t *features HB_UNUSED,
-                      unsigned int  num_features HB_UNUSED)
+hb_substitute_default (hb_ot_shape_context_t *c)
 {
-  hb_map_glyphs (font, face, buffer);
+  hb_ot_layout_substitute_start (c->buffer);
+
+  hb_mirror_chars (c);
+
+  hb_map_glyphs (c->font, c->buffer);
 }
 
 static void
-hb_substitute_complex_fallback (hb_font_t    *font HB_UNUSED,
-                               hb_face_t    *face HB_UNUSED,
-                               hb_buffer_t  *buffer HB_UNUSED,
-                               hb_feature_t *features HB_UNUSED,
-                               unsigned int  num_features HB_UNUSED)
+hb_ot_substitute_complex (hb_ot_shape_context_t *c)
 {
-  /* TODO Arabic */
+  if (hb_ot_layout_has_substitution (c->face)) {
+    c->plan->map.substitute (c->face, c->buffer);
+  }
+
+  hb_ot_layout_substitute_finish (c->buffer);
+
+  return;
 }
 
 
 /* Position */
 
 static void
-hb_position_default (hb_font_t    *font,
-                    hb_face_t    *face,
-                    hb_buffer_t  *buffer,
-                    hb_feature_t *features HB_UNUSED,
-                    unsigned int  num_features HB_UNUSED)
+hb_position_default (hb_ot_shape_context_t *c)
 {
-  hb_buffer_clear_positions (buffer);
+  hb_ot_layout_position_start (c->buffer);
 
-  unsigned int count = buffer->len;
+  unsigned int count = c->buffer->len;
   for (unsigned int i = 0; i < count; i++) {
-    hb_glyph_metrics_t metrics;
-    hb_font_get_glyph_metrics (font, face, buffer->info[i].codepoint, &metrics);
-    buffer->pos[i].x_advance = metrics.x_advance;
-    buffer->pos[i].y_advance = metrics.y_advance;
+    hb_font_get_glyph_advance_for_direction (c->font, c->buffer->info[i].codepoint,
+                                            c->buffer->props.direction,
+                                            &c->buffer->pos[i].x_advance,
+                                            &c->buffer->pos[i].y_advance);
+    hb_font_subtract_glyph_origin_for_direction (c->font, c->buffer->info[i].codepoint,
+                                                c->buffer->props.direction,
+                                                &c->buffer->pos[i].x_offset,
+                                                &c->buffer->pos[i].y_offset);
+  }
+}
+
+static void
+hb_ot_position_complex (hb_ot_shape_context_t *c)
+{
+
+  if (hb_ot_layout_has_positioning (c->face))
+  {
+    /* Change glyph origin to what GPOS expects, apply GPOS, change it back. */
+
+    unsigned int count = c->buffer->len;
+    for (unsigned int i = 0; i < count; i++) {
+      hb_font_add_glyph_origin_for_direction (c->font, c->buffer->info[i].codepoint,
+                                             HB_DIRECTION_LTR,
+                                             &c->buffer->pos[i].x_offset,
+                                             &c->buffer->pos[i].y_offset);
+    }
+
+    c->plan->map.position (c->font, c->buffer);
+
+    for (unsigned int i = 0; i < count; i++) {
+      hb_font_subtract_glyph_origin_for_direction (c->font, c->buffer->info[i].codepoint,
+                                                  HB_DIRECTION_LTR,
+                                                  &c->buffer->pos[i].x_offset,
+                                                  &c->buffer->pos[i].y_offset);
+    }
+
+    c->applied_position_complex = true;
   }
+
+  hb_ot_layout_position_finish (c->buffer);
+
+  return;
 }
 
 static void
-hb_position_complex_fallback (hb_font_t    *font HB_UNUSED,
-                             hb_face_t    *face HB_UNUSED,
-                             hb_buffer_t  *buffer HB_UNUSED,
-                             hb_feature_t *features HB_UNUSED,
-                             unsigned int  num_features HB_UNUSED)
+hb_position_complex_fallback (hb_ot_shape_context_t *c HB_UNUSED)
 {
   /* TODO Mark pos */
 }
 
 static void
-hb_truetype_kern (hb_font_t    *font,
-                 hb_face_t    *face,
-                 hb_buffer_t  *buffer,
-                 hb_feature_t *features HB_UNUSED,
-                 unsigned int  num_features HB_UNUSED)
+hb_truetype_kern (hb_ot_shape_context_t *c)
 {
   /* TODO Check for kern=0 */
-  unsigned int count = buffer->len;
+  unsigned int count = c->buffer->len;
   for (unsigned int i = 1; i < count; i++) {
-    hb_position_t kern, kern1, kern2;
-    kern = hb_font_get_kerning (font, face, buffer->info[i - 1].codepoint, buffer->info[i].codepoint);
-    kern1 = kern >> 1;
-    kern2 = kern - kern1;
-    buffer->pos[i - 1].x_advance += kern1;
-    buffer->pos[i].x_advance += kern2;
-    buffer->pos[i].x_offset += kern2;
+    hb_position_t x_kern, y_kern, kern1, kern2;
+    hb_font_get_glyph_kerning_for_direction (c->font,
+                                            c->buffer->info[i - 1].codepoint, c->buffer->info[i].codepoint,
+                                            c->buffer->props.direction,
+                                            &x_kern, &y_kern);
+
+    kern1 = x_kern >> 1;
+    kern2 = x_kern - kern1;
+    c->buffer->pos[i - 1].x_advance += kern1;
+    c->buffer->pos[i].x_advance += kern2;
+    c->buffer->pos[i].x_offset += kern2;
+
+    kern1 = y_kern >> 1;
+    kern2 = y_kern - kern1;
+    c->buffer->pos[i - 1].y_advance += kern1;
+    c->buffer->pos[i].y_advance += kern2;
+    c->buffer->pos[i].y_offset += kern2;
   }
 }
 
 static void
-hb_position_complex_fallback_visual (hb_font_t    *font,
-                                    hb_face_t    *face,
-                                    hb_buffer_t  *buffer,
-                                    hb_feature_t *features,
-                                    unsigned int  num_features)
+hb_position_complex_fallback_visual (hb_ot_shape_context_t *c)
 {
-  hb_truetype_kern (font, face, buffer, features, num_features);
+  hb_truetype_kern (c);
+}
+
+static void
+hb_hide_zerowidth (hb_ot_shape_context_t *c)
+{
+  /* TODO Save the space character in the font? */
+  hb_codepoint_t space;
+  if (!hb_font_get_glyph (c->font, ' ', 0, &space))
+    return; /* No point! */
+
+  unsigned int count = c->buffer->len;
+  for (unsigned int i = 0; i < count; i++)
+    if (unlikely (_hb_glyph_info_is_zero_width (&c->buffer->info[i]))) {
+      c->buffer->info[i].codepoint = space;
+      c->buffer->pos[i].x_advance = 0;
+      c->buffer->pos[i].y_advance = 0;
+    }
 }
 
 
 /* Do it! */
 
-void
-hb_ot_shape (hb_font_t    *font,
-            hb_face_t    *face,
-            hb_buffer_t  *buffer,
-            hb_feature_t *features,
-            unsigned int  num_features)
+static void
+hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
 {
-  hb_direction_t original_direction;
-  hb_bool_t substitute_fallback, position_fallback;
+  c->buffer->deallocate_var_all ();
 
-  hb_form_clusters (buffer);
+  /* Save the original direction, we use it later. */
+  c->target_direction = c->buffer->props.direction;
 
-  /* SUBSTITUTE */
-  {
-    buffer->clear_masks ();
+  HB_BUFFER_ALLOCATE_VAR (c->buffer, unicode_props0);
+  HB_BUFFER_ALLOCATE_VAR (c->buffer, unicode_props1);
+
+  hb_set_unicode_props (c->buffer);
 
-    /* Mirroring needs to see the original direction */
-    hb_mirror_chars (buffer);
+  hb_form_clusters (c->buffer);
 
-    original_direction = hb_ensure_native_direction (buffer);
+  hb_ensure_native_direction (c->buffer);
 
-    hb_substitute_default (font, face, buffer, features, num_features);
+  _hb_ot_shape_normalize (c->font, c->buffer, hb_ot_shape_complex_normalization_preference (c->plan->shaper));
 
-    substitute_fallback = !hb_ot_substitute_complex (font, face, buffer, features, num_features, original_direction);
+  hb_ot_shape_setup_masks (c);
 
-    if (substitute_fallback)
-      hb_substitute_complex_fallback (font, face, buffer, features, num_features);
+  /* SUBSTITUTE */
+  {
+    hb_substitute_default (c);
+
+    hb_ot_substitute_complex (c);
   }
 
   /* POSITION */
   {
-    buffer->clear_masks ();
+    hb_position_default (c);
 
-    hb_position_default (font, face, buffer, features, num_features);
-
-    position_fallback = !hb_ot_position_complex (font, face, buffer, features, num_features, original_direction);
+    hb_ot_position_complex (c);
 
+    hb_bool_t position_fallback = !c->applied_position_complex;
     if (position_fallback)
-      hb_position_complex_fallback (font, face, buffer, features, num_features);
+      hb_position_complex_fallback (c);
 
-    if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction))
-      hb_buffer_reverse (buffer);
+    if (HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction))
+      hb_buffer_reverse (c->buffer);
 
     if (position_fallback)
-      hb_position_complex_fallback_visual (font, face, buffer, features, num_features);
+      hb_position_complex_fallback_visual (c);
   }
 
-  buffer->props.direction = original_direction;
+  hb_hide_zerowidth (c);
+
+  HB_BUFFER_DEALLOCATE_VAR (c->buffer, unicode_props1);
+  HB_BUFFER_DEALLOCATE_VAR (c->buffer, unicode_props0);
+
+  c->buffer->props.direction = c->target_direction;
+
+  c->buffer->deallocate_var_all ();
 }
 
+static void
+hb_ot_shape_plan_internal (hb_ot_shape_plan_t       *plan,
+                          hb_face_t                *face,
+                          const hb_segment_properties_t  *props,
+                          const hb_feature_t       *user_features,
+                          unsigned int              num_user_features)
+{
+  hb_ot_shape_planner_t planner;
+
+  assert (HB_DIRECTION_IS_VALID (props->direction));
 
-HB_END_DECLS
+  planner.shaper = hb_ot_shape_complex_categorize (props);
+
+  hb_ot_shape_collect_features (&planner, props, user_features, num_user_features);
+
+  planner.compile (face, props, *plan);
+}
+
+static void
+hb_ot_shape_execute (hb_ot_shape_plan_t *plan,
+                    hb_font_t          *font,
+                    hb_buffer_t        *buffer,
+                    const hb_feature_t *user_features,
+                    unsigned int        num_user_features)
+{
+  hb_ot_shape_context_t c = {plan, font, font->face, buffer, user_features, num_user_features};
+  hb_ot_shape_execute_internal (&c);
+}
+
+hb_bool_t
+_hb_ot_shape (hb_font_t          *font,
+             hb_buffer_t        *buffer,
+             const hb_feature_t *features,
+             unsigned int        num_features)
+{
+  hb_ot_shape_plan_t plan;
+
+  buffer->guess_properties ();
+
+  hb_ot_shape_plan_internal (&plan, font->face, &buffer->props, features, num_features);
+  hb_ot_shape_execute (&plan, font, buffer, features, num_features);
+
+  return true;
+}
+
+
+void
+hb_ot_shape_glyphs_closure (hb_font_t          *font,
+                           hb_buffer_t        *buffer,
+                           const hb_feature_t *features,
+                           unsigned int        num_features,
+                           hb_set_t           *glyphs)
+{
+  hb_ot_shape_plan_t plan;
+
+  buffer->guess_properties ();
+
+  hb_ot_shape_plan_internal (&plan, font->face, &buffer->props, features, num_features);
+
+  /* TODO: normalization? have shapers do closure()? */
+  /* TODO: Deal with mirrored chars? */
+  hb_map_glyphs (font, buffer);
+
+  /* Seed it.  It's user's responsibility to have cleard glyphs
+   * if that's what they desire. */
+  unsigned int count = buffer->len;
+  for (unsigned int i = 0; i < count; i++)
+    hb_set_add (glyphs, buffer->info[i].codepoint);
+
+  /* And find transitive closure. */
+  hb_set_t copy;
+  copy.init ();
+
+  do {
+    copy.set (glyphs);
+    plan.map.substitute_closure (font->face, glyphs);
+  } while (!copy.equal (glyphs));
+}