[name] Move around

src/hb-ot-name.h

@@ -34,6 +34,26 @@
 HB_BEGIN_DECLS
 
 
+/**
+ * hb_name_id_t:
+ *
+ * An integral type representing an OpenType 'name' table name identifier.
+ * There are predefined name IDs, as well as name IDs return from other
+ * API.  These can be used to fetch name strings from a font face.
+ *
+ * Since: 2.0.0
+ */
+typedef unsigned int hb_name_id_t;
+
+/**
+ * HB_NAME_ID_INVALID
+ *
+ * Value to represent a nonexistent name ID.
+ *
+ * Since: 2.0.0
+ **/
+#define HB_NAME_ID_INVALID 0xFFFF
+
 enum {
   HB_NAME_ID_COPYRIGHT			= 0,
   HB_NAME_ID_FONT_FAMILY		= 1,
@@ -63,25 +83,28 @@ enum {
   HB_NAME_ID_VARIATIONS_PS_PREFIX	= 25
 };
 
-/**
- * hb_name_id_t:
- *
- * An integral type representing an OpenType 'name' table name identifier.
- * There are predefined name IDs, as well as name IDs return from other
- * API.  These can be used to fetch name strings from a font face.
- *
- * Since: 2.0.0
- */
-typedef unsigned int hb_name_id_t;
 
 /**
- * HB_NAME_ID_INVALID
+ * hb_ot_name_entry_t:
+ * @name_id: name ID
+ * @language: language
  *
- * Value to represent a nonexistent name ID.
+ * Structure representing a name ID in a particular language.
  *
- * Since: 2.0.0
+ * Since: 2.1.0
  **/
-#define HB_NAME_ID_INVALID 0xFFFF
+typedef struct hb_ot_name_entry_t
+{
+  hb_name_id_t  name_id;
+  /*< private >*/
+  hb_var_int_t  var;
+  /*< public >*/
+  hb_language_t language;
+} hb_ot_name_entry_t;
+
+HB_EXTERN const hb_ot_name_entry_t *
+hb_ot_name_list_names (hb_face_t    *face,
+		       unsigned int *num_entries /* OUT */);
 
 
 HB_EXTERN unsigned int
@@ -106,29 +129,6 @@ hb_ot_name_get_utf32 (hb_face_t     *face,
 		      uint32_t      *text      /* OUT */);
 
 
-/**
- * hb_ot_name_entry_t:
- * @name_id: name ID
- * @language: language
- *
- * Structure representing a name ID in a particular language.
- *
- * Since: 2.1.0
- **/
-typedef struct hb_ot_name_entry_t
-{
-  hb_name_id_t  name_id;
-  /*< private >*/
-  hb_var_int_t  var;
-  /*< public >*/
-  hb_language_t language;
-} hb_ot_name_entry_t;
-
-HB_EXTERN const hb_ot_name_entry_t *
-hb_ot_name_list_names (hb_face_t    *face,
-		       unsigned int *num_entries /* OUT */);
-
-
 HB_END_DECLS
 
 #endif /* HB_OT_NAME_H */