[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/Makefile.am    |    1 
 src/hb-ot-layout.h |    5 ----
 src/hb-ot-shape.h  |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/hb-ot.h        |    9 --------
 4 files changed, 56 insertions(+), 13 deletions(-)

New commits:
commit beeb12c9af4e0e66378cd36cf3dbb1560763a8e3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Dec 22 22:53:27 2013 -0500

    Add TODO item

diff --git a/src/hb-ot-shape.h b/src/hb-ot-shape.h
index 52f8371..afe6fe9 100644
--- a/src/hb-ot-shape.h
+++ b/src/hb-ot-shape.h
@@ -35,6 +35,7 @@
 
 HB_BEGIN_DECLS
 
+/* TODO port to shape-plan / set. */
 void
 hb_ot_shape_glyphs_closure (hb_font_t          *font,
                 hb_buffer_t        *buffer,
commit fbd4acc58a4bb501625b482bd318be9764ff8e02
Author: Luis de Bethencourt <luis at debethencourt.com>
Date:   Sun Dec 22 08:02:11 2013 -0500

    Clean ht-ob headers

diff --git a/src/Makefile.am b/src/Makefile.am
index 8180225..67a328c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,6 +111,7 @@ HBSOURCES += \
 HBHEADERS += \
 	hb-ot.h \
 	hb-ot-layout.h \
+	hb-ot-shape.h \
 	hb-ot-tag.h \
 	$(NULL)
 endif
diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h
index dfc7f24..d90eff3 100644
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -194,11 +194,6 @@ hb_ot_layout_collect_lookups (hb_face_t      *face,
 			      hb_set_t       *lookup_indexes /* OUT */);
 
 void
-hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
-				  hb_tag_t         table_tag,
-				  hb_set_t        *lookup_indexes /* OUT */);
-
-void
 hb_ot_layout_lookup_collect_glyphs (hb_face_t    *face,
 				    hb_tag_t      table_tag,
 				    unsigned int  lookup_index,
diff --git a/src/hb-ot-shape.h b/src/hb-ot-shape.h
new file mode 100644
index 0000000..52f8371
--- /dev/null
+++ b/src/hb-ot-shape.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2013  Red Hat, Inc.
+ *
+ *  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
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Red Hat Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_SHAPE_H
+#define HB_OT_SHAPE_H
+#define HB_OT_SHAPE_H_IN
+
+#include "hb.h"
+
+#include "hb-ot-layout.h"
+#include "hb-ot-tag.h"
+
+HB_BEGIN_DECLS
+
+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);
+
+void
+hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
+                hb_tag_t         table_tag,
+                hb_set_t        *lookup_indexes /* OUT */);
+
+HB_END_DECLS
+
+#undef HB_OT_SHAPE_H_IN
+#endif /* HB_OT_SHAPE_H */
diff --git a/src/hb-ot.h b/src/hb-ot.h
index 8073906..e9a280b 100644
--- a/src/hb-ot.h
+++ b/src/hb-ot.h
@@ -32,17 +32,10 @@
 
 #include "hb-ot-layout.h"
 #include "hb-ot-tag.h"
+#include "hb-ot-shape.h"
 
 HB_BEGIN_DECLS
 
-/* TODO remove */
-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_END_DECLS
 
 #undef HB_OT_H_IN