Rename HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK to HB_UNICODE_GENERAL_CATEGORY_SPAC...

[profile/ivi/org.tizen.video-player.git] / src / hb-ot-shape-private.hh

diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape-private.hh
index 3f47fa2..307784d 100644 (file)
--- a/src/hb-ot-shape-private.hh
+++ b/src/hb-ot-shape-private.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Google, Inc.
+ * Copyright © 2010  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -27,20 +27,57 @@
 #ifndef HB_OT_SHAPE_PRIVATE_HH
 #define HB_OT_SHAPE_PRIVATE_HH
 
-#include "hb-private.h"
+#include "hb-private.hh"
 
 #include "hb-ot-shape.h"
 
 #include "hb-ot-map-private.hh"
+#include "hb-ot-shape-complex-private.hh"
 
 HB_BEGIN_DECLS
 
-struct hb_ot_map_t;
+
+enum hb_ot_complex_shaper_t;
+
+struct hb_ot_shape_plan_t
+{
+  friend struct hb_ot_shape_planner_t;
+
+  hb_ot_map_t map;
+  hb_ot_complex_shaper_t shaper;
+
+  hb_ot_shape_plan_t (void) : map () {}
+  ~hb_ot_shape_plan_t (void) { map.finish (); }
+
+  private:
+  NO_COPY (hb_ot_shape_plan_t);
+};
+
+struct hb_ot_shape_planner_t
+{
+  hb_ot_map_builder_t map;
+  hb_ot_complex_shaper_t shaper;
+
+  hb_ot_shape_planner_t (void) : map () {}
+  ~hb_ot_shape_planner_t (void) { map.finish (); }
+
+  inline void compile (hb_face_t *face,
+                      const hb_segment_properties_t *props,
+                      struct hb_ot_shape_plan_t &plan)
+  {
+    plan.shaper = shaper;
+    map.compile (face, props, plan.map);
+  }
+
+  private:
+  NO_COPY (hb_ot_shape_planner_t);
+};
 
 
 struct hb_ot_shape_context_t
 {
-  /* Input to hb_ot_shape() */
+  /* Input to hb_ot_shape_execute() */
+  hb_ot_shape_plan_t *plan;
   hb_font_t *font;
   hb_face_t *face;
   hb_buffer_t  *buffer;
@@ -48,11 +85,9 @@ struct hb_ot_shape_context_t
   unsigned int        num_user_features;
 
   /* Transient stuff */
-  hb_direction_t original_direction;
+  hb_direction_t target_direction;
   hb_bool_t applied_substitute_complex;
   hb_bool_t applied_position_complex;
-
-  struct hb_ot_map_t *map;
 };