Refactor to keep hb-object-private.h and hb-open-type.h separate
Needed to be able to include <Windows.h> from hb-object-private.h.
diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout-private.hh
index 7b72515..5870248 100644
--- a/src/hb-ot-layout-private.hh
+++ b/src/hb-ot-layout-private.hh
@@ -30,7 +30,6 @@
#include "hb-private.hh"
#include "hb-ot-layout.h"
-#include "hb-ot-head-private.hh"
#include "hb-font-private.hh"
#include "hb-buffer-private.hh"
@@ -38,10 +37,13 @@
HB_BEGIN_DECLS
+/*
+ * GDEF
+ */
+
/* buffer var allocations */
#define props_cache() var1.u16[1] /* glyph_props cache */
-
/* XXX cleanup */
typedef enum {
HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED = 0x0001,
@@ -52,46 +54,6 @@
} hb_ot_layout_glyph_class_t;
-/*
- * hb_ot_layout_t
- */
-
-struct hb_ot_layout_t
-{
- hb_blob_t *gdef_blob;
- hb_blob_t *gsub_blob;
- hb_blob_t *gpos_blob;
-
- const struct GDEF *gdef;
- const struct GSUB *gsub;
- const struct GPOS *gpos;
-};
-
-struct hb_ot_layout_context_t
-{
- hb_face_t *face;
- hb_font_t *font;
-
- /* Convert from font-space to user-space */
- inline hb_position_t scale_x (int16_t v) { return scale (v, this->font->x_scale); }
- inline hb_position_t scale_y (int16_t v) { return scale (v, this->font->y_scale); }
-
- private:
- inline hb_position_t scale (int16_t v, int scale) { return v * (int64_t) scale / this->face->head_table->get_upem (); }
-};
-
-
-HB_INTERNAL hb_ot_layout_t *
-_hb_ot_layout_new (hb_face_t *face);
-
-HB_INTERNAL void
-_hb_ot_layout_free (hb_ot_layout_t *layout);
-
-
-/*
- * GDEF
- */
-
HB_INTERNAL unsigned int
_hb_ot_layout_get_glyph_property (hb_face_t *face,
hb_glyph_info_t *info);
@@ -109,6 +71,52 @@
unsigned int *property_out);
+/*
+ * head
+ */
+
+HB_INTERNAL unsigned int
+_hb_ot_layout_get_upem (hb_face_t *face);
+
+
+/*
+ * hb_ot_layout_t
+ */
+
+struct hb_ot_layout_t
+{
+ hb_blob_t *gdef_blob;
+ hb_blob_t *gsub_blob;
+ hb_blob_t *gpos_blob;
+ hb_blob_t *head_blob;
+
+ const struct GDEF *gdef;
+ const struct GSUB *gsub;
+ const struct GPOS *gpos;
+ const struct head *head;
+};
+
+struct hb_ot_layout_context_t
+{
+ hb_face_t *face;
+ hb_font_t *font;
+
+ /* Convert from font-space to user-space */
+ inline hb_position_t scale_x (int16_t v) { return scale (v, this->font->x_scale); }
+ inline hb_position_t scale_y (int16_t v) { return scale (v, this->font->y_scale); }
+
+ private:
+ inline hb_position_t scale (int16_t v, int scale) { return v * (int64_t) scale / _hb_ot_layout_get_upem (this->face); }
+};
+
+
+HB_INTERNAL hb_ot_layout_t *
+_hb_ot_layout_create (hb_face_t *face);
+
+HB_INTERNAL void
+_hb_ot_layout_destroy (hb_ot_layout_t *layout);
+
+
HB_END_DECLS
#endif /* HB_OT_LAYOUT_PRIVATE_HH */
