Minor renaming

diff --git a/src/hb-ot-layout-gdef-private.h b/src/hb-ot-layout-gdef-private.h
index ce8b32e..8b20fd5 100644 (file)
--- a/src/hb-ot-layout-gdef-private.h
+++ b/src/hb-ot-layout-gdef-private.h
@@ -201,14 +201,14 @@ struct LigCaretList {
 DEFINE_NULL_ASSERT_SIZE (LigCaretList, 4);
 
 /*
- * GDEF Header
+ * GDEF
  */
 
-struct GDEFHeader {
+struct GDEF {
   static const hb_tag_t GDEFTag                = HB_TAG ('G','D','E','F');
 
-  STATIC_DEFINE_GET_FOR_DATA (GDEFHeader);
-  /* XXX check version here */
+  STATIC_DEFINE_GET_FOR_DATA (GDEF);
+  /* XXX check version here? */
 
   DEFINE_ACCESSOR (ClassDef, get_glyph_class_def, glyphClassDef);
   DEFINE_ACCESSOR (AttachList, get_attach_list, attachList);
@@ -247,6 +247,6 @@ struct GDEFHeader {
                                         * mark attachment type--from beginning
                                         * of GDEF header (may be Null) */
 };
-DEFINE_NULL_ASSERT_SIZE (GDEFHeader, 12);
+DEFINE_NULL_ASSERT_SIZE (GDEF, 12);
 
 #endif /* HB_OT_LAYOUT_GDEF_PRIVATE_H */

diff --git a/src/hb-ot-layout-open-private.h b/src/hb-ot-layout-open-private.h
index 9cdb6e2..a88808e 100644 (file)
--- a/src/hb-ot-layout-open-private.h
+++ b/src/hb-ot-layout-open-private.h
@@ -336,7 +336,7 @@ DEFINE_NULL_ALIAS (OpenTypeFontFace, OffsetTable);
 struct TTCHeader {
   /* OpenTypeFontFaces, in no particular order */
   DEFINE_OFFSET_ARRAY_TYPE (OffsetTable, offsetTable, numFonts);
-  /* XXX check version here */
+  /* XXX check version here? */
 
   private:
   Tag  ttcTag;         /* TrueType Collection ID string: 'ttcf' */
@@ -788,15 +788,15 @@ struct Device {
 DEFINE_NULL_ASSERT_SIZE (Device, 6);
 
 /*
- * GSUB/GPOS Header
+ * GSUB/GPOS Common
  */
 
-typedef struct GSUBGPOSHeader {
+typedef struct GSUBGPOS {
   static const hb_tag_t GSUBTag                = HB_TAG ('G','S','U','B');
   static const hb_tag_t GPOSTag                = HB_TAG ('G','P','O','S');
 
-  STATIC_DEFINE_GET_FOR_DATA (GSUBGPOSHeader);
-  /* XXX check version here */
+  STATIC_DEFINE_GET_FOR_DATA (GSUBGPOS);
+  /* XXX check version here? */
 
   DEFINE_LIST_ACCESSOR(Script, script);         /* get_script_list, get_script(i) */
   DEFINE_LIST_ACCESSOR(Feature, feature);/* get_feature_list, get_feature(i) */
@@ -813,9 +813,7 @@ typedef struct GSUBGPOSHeader {
                                 * GSUB/GPOS table */
   Offset       lookupList;     /* Offset to LookupList table--from beginning of
                                 * GSUB/GPOS table */
-} GSUBHeader, GPOSHeader;
-DEFINE_NULL_ASSERT_SIZE (GSUBGPOSHeader, 10);
-DEFINE_NULL_ALIAS (GSUBHeader, GSUBGPOSHeader);
-DEFINE_NULL_ALIAS (GPOSHeader, GSUBGPOSHeader);
+};
+DEFINE_NULL_ASSERT_SIZE (GSUBGPOS, 10);
 
 #endif /* HB_OT_LAYOUT_OPEN_PRIVATE_H */

diff --git a/src/main.cc b/src/main.cc
index a670959..edb805a 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -76,7 +76,7 @@ main (int argc, char **argv)
              (const char *)table.get_tag(), table.get_offset(), table.get_length());
 
       if (table.get_tag() == "GSUB" || table.get_tag() == "GPOS") {
-        const GSUBGPOSHeader &g = GSUBGPOSHeader::get_for_data (ot[table]);
+        const GSUBGPOS &g = GSUBGPOS::get_for_data (ot[table]);
 
        const ScriptList &scripts = g.get_script_list();
        int num_scripts = scripts.get_len ();
@@ -119,7 +119,7 @@ main (int argc, char **argv)
                  lookup.get_type(), lookup.get_flag());
        }
       } else if (table.get_tag() == "GDEF") {
-        const GDEFHeader &gdef = GDEFHeader::get_for_data (ot[table]);
+        const GDEF &gdef = GDEF::get_for_data (ot[table]);
 
        for (int glyph = 0; glyph < 1; glyph++)
          printf ("    glyph %d has class %d and mark attachment type %d\n",