Change order of font and face for API consistency

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 0c2f602e42106235a9a3ccbbd2489c5459357878..5e51800ceae50672c3c5af4fe6dcf292ebe2ca09 100644 (file)
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -96,7 +96,7 @@ _get_gpos (hb_face_t *face)
 /* TODO the public class_t is a mess */
 
 hb_bool_t
-hb_ot_layout_has_font_glyph_classes (hb_face_t *face)
+hb_ot_layout_has_glyph_classes (hb_face_t *face)
 {
   return _get_gdef (face).has_glyph_classes ();
 }
@@ -312,8 +312,8 @@ hb_ot_layout_get_attach_points (hb_face_t      *face,
 }
 
 unsigned int
-hb_ot_layout_get_lig_carets (hb_face_t      *face,
-                            hb_font_t      *font,
+hb_ot_layout_get_lig_carets (hb_font_t      *font,
+                            hb_face_t      *face,
                             hb_codepoint_t  glyph,
                             unsigned int    start_offset,
                             unsigned int   *caret_count /* IN/OUT */,
@@ -553,8 +553,8 @@ hb_ot_layout_has_positioning (hb_face_t *face)
 }
 
 hb_bool_t
-hb_ot_layout_position_lookup   (hb_face_t    *face,
-                               hb_font_t    *font,
+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)
@@ -566,8 +566,8 @@ hb_ot_layout_position_lookup   (hb_face_t    *face,
 }
 
 void
-hb_ot_layout_position_finish (hb_face_t    *face,
-                             hb_font_t    *font,
+hb_ot_layout_position_finish (hb_font_t    *font,
+                             hb_face_t    *face,
                              hb_buffer_t  *buffer)
 {
   unsigned int i, j;

diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h
index 40ead82905f1e039f0945a568368f38f8dd7e5db..ee7bc85151ce43211d31fbef38041d7879095511 100644 (file)
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -55,7 +55,7 @@ typedef enum {
  * classes in harfbuzz. */
 
 hb_bool_t
-hb_ot_layout_has_font_glyph_classes (hb_face_t *face);
+hb_ot_layout_glyph_classes (hb_face_t *face);
 
 hb_ot_layout_glyph_class_t
 hb_ot_layout_get_glyph_class (hb_face_t      *face,
@@ -84,8 +84,8 @@ hb_ot_layout_get_attach_points (hb_face_t      *face,
 
 /* Ligature caret positions */
 unsigned int
-hb_ot_layout_get_lig_carets (hb_face_t      *face,
-                            hb_font_t      *font,
+hb_ot_layout_get_lig_carets (hb_font_t      *font,
+                            hb_face_t      *face,
                             hb_codepoint_t  glyph,
                             unsigned int    start_offset,
                             unsigned int   *caret_count /* IN/OUT */,
@@ -198,16 +198,16 @@ hb_bool_t
 hb_ot_layout_has_positioning (hb_face_t *face);
 
 hb_bool_t
-hb_ot_layout_position_lookup (hb_face_t    *face,
-                             hb_font_t    *font,
+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);
 
 /* Should be called after all the position_lookup's are done */
 void
-hb_ot_layout_position_finish (hb_face_t    *face,
-                             hb_font_t    *font,
+hb_ot_layout_position_finish (hb_font_t    *font,
+                             hb_face_t    *face,
                              hb_buffer_t  *buffer);