Rename table files from eg maxp-private.hh to maxp-table.hh

src/Makefile.am

@@ -26,9 +26,9 @@ HBSOURCES =  \
 	hb-object-private.hh \
 	hb-open-file-private.hh \
 	hb-open-type-private.hh \
-	hb-ot-head-private.hh \
-	hb-ot-maxp-private.hh \
-	hb-ot-name-private.hh \
+	hb-ot-head-table.hh \
+	hb-ot-maxp-table.hh \
+	hb-ot-name-table.hh \
 	hb-ot-tag.cc \
 	hb-private.hh \
 	hb-shape.cc \
@@ -54,10 +54,10 @@ if HAVE_OT
 HBSOURCES += \
 	hb-ot-layout.cc \
 	hb-ot-layout-common-private.hh \
-	hb-ot-layout-gdef-private.hh \
-	hb-ot-layout-gpos-private.hh \
+	hb-ot-layout-gdef-table.hh \
+	hb-ot-layout-gpos-table.hh \
 	hb-ot-layout-gsubgpos-private.hh \
-	hb-ot-layout-gsub-private.hh \
+	hb-ot-layout-gsub-table.hh \
 	hb-ot-layout-private.hh \
 	hb-ot-map.cc \
 	hb-ot-map-private.hh \

src/hb-font.cc

@@ -31,7 +31,7 @@
 #include "hb-font-private.hh"
 #include "hb-blob.h"
 #include "hb-open-file-private.hh"
-#include "hb-ot-head-private.hh"
+#include "hb-ot-head-table.hh"
 
 #include <string.h>
 

src/hb-ot-head-private.hh → src/hb-ot-head-table.hh

@@ -24,8 +24,8 @@
  * Red Hat Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_OT_HEAD_PRIVATE_HH
-#define HB_OT_HEAD_PRIVATE_HH
+#ifndef HB_OT_HEAD_TABLE_HH
+#define HB_OT_HEAD_TABLE_HH
 
 #include "hb-open-type-private.hh"
 
@@ -140,4 +140,4 @@ struct head
 
 
 
-#endif /* HB_OT_HEAD_PRIVATE_HH */
+#endif /* HB_OT_HEAD_TABLE_HH */

src/hb-ot-layout-gdef-private.hh → src/hb-ot-layout-gdef-table.hh

@@ -26,8 +26,8 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_OT_LAYOUT_GDEF_PRIVATE_HH
-#define HB_OT_LAYOUT_GDEF_PRIVATE_HH
+#ifndef HB_OT_LAYOUT_GDEF_TABLE_HH
+#define HB_OT_LAYOUT_GDEF_TABLE_HH
 
 #include "hb-ot-layout-common-private.hh"
 
@@ -424,4 +424,4 @@ struct GDEF
 
 
 
-#endif /* HB_OT_LAYOUT_GDEF_PRIVATE_HH */
+#endif /* HB_OT_LAYOUT_GDEF_TABLE_HH */

src/hb-ot-layout-gpos-private.hh → src/hb-ot-layout-gpos-table.hh

@@ -26,8 +26,8 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_OT_LAYOUT_GPOS_PRIVATE_HH
-#define HB_OT_LAYOUT_GPOS_PRIVATE_HH
+#ifndef HB_OT_LAYOUT_GPOS_TABLE_HH
+#define HB_OT_LAYOUT_GPOS_TABLE_HH
 
 #include "hb-ot-layout-gsubgpos-private.hh"
 
@@ -1630,4 +1630,4 @@ static inline bool position_lookup (hb_apply_context_t *c, unsigned int lookup_i
 
 
 
-#endif /* HB_OT_LAYOUT_GPOS_PRIVATE_HH */
+#endif /* HB_OT_LAYOUT_GPOS_TABLE_HH */

src/hb-ot-layout-gsub-private.hh → src/hb-ot-layout-gsub-table.hh

@@ -26,8 +26,8 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_OT_LAYOUT_GSUB_PRIVATE_HH
-#define HB_OT_LAYOUT_GSUB_PRIVATE_HH
+#ifndef HB_OT_LAYOUT_GSUB_TABLE_HH
+#define HB_OT_LAYOUT_GSUB_TABLE_HH
 
 #include "hb-ot-layout-gsubgpos-private.hh"
 
@@ -940,4 +940,4 @@ static inline bool substitute_lookup (hb_apply_context_t *c, unsigned int lookup
 
 
 
-#endif /* HB_OT_LAYOUT_GSUB_PRIVATE_HH */
+#endif /* HB_OT_LAYOUT_GSUB_TABLE_HH */

src/hb-ot-layout-gsubgpos-private.hh

@@ -30,7 +30,7 @@
 #define HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH
 
 #include "hb-buffer-private.hh"
-#include "hb-ot-layout-gdef-private.hh"
+#include "hb-ot-layout-gdef-table.hh"
 
 
 /* buffer var allocations */

src/hb-ot-layout.cc

@@ -28,10 +28,10 @@
 
 #include "hb-ot-layout-private.hh"
 
-#include "hb-ot-layout-gdef-private.hh"
-#include "hb-ot-layout-gsub-private.hh"
-#include "hb-ot-layout-gpos-private.hh"
-#include "hb-ot-maxp-private.hh"
+#include "hb-ot-layout-gdef-table.hh"
+#include "hb-ot-layout-gsub-table.hh"
+#include "hb-ot-layout-gpos-table.hh"
+#include "hb-ot-maxp-table.hh"
 
 
 #include <stdlib.h>

src/hb-ot-maxp-private.hh → src/hb-ot-maxp-table.hh

@@ -24,8 +24,8 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_OT_MAXP_PRIVATE_HH
-#define HB_OT_MAXP_PRIVATE_HH
+#ifndef HB_OT_MAXP_TABLE_HH
+#define HB_OT_MAXP_TABLE_HH
 
 #include "hb-open-type-private.hh"
 
@@ -63,4 +63,4 @@ struct maxp
 
 
 
-#endif /* HB_OT_MAXP_PRIVATE_HH */
+#endif /* HB_OT_MAXP_TABLE_HH */

src/hb-ot-name-private.hh → src/hb-ot-name-table.hh

@@ -24,8 +24,8 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_OT_NAME_PRIVATE_HH
-#define HB_OT_NAME_PRIVATE_HH
+#ifndef HB_OT_NAME_TABLE_HH
+#define HB_OT_NAME_TABLE_HH
 
 #include "hb-open-type-private.hh"
 
@@ -125,4 +125,4 @@ struct name
 
 
 
-#endif /* HB_OT_NAME_PRIVATE_HH */
+#endif /* HB_OT_NAME_TABLE_HH */

src/hb-uniscribe-shape.cc

@@ -35,7 +35,7 @@ typedef ULONG WIN_ULONG;
 
 #include "hb-uniscribe.h"
 
-#include "hb-ot-name-private.hh"
+#include "hb-ot-name-table.hh"
 #include "hb-ot-tag.h"
 
 #include "hb-font-private.hh"

src/main.cc

@@ -26,7 +26,7 @@
 
 #include "hb-mutex-private.hh"
 #include "hb-open-file-private.hh"
-#include "hb-ot-layout-gdef-private.hh"
+#include "hb-ot-layout-gdef-table.hh"
 #include "hb-ot-layout-gsubgpos-private.hh"
 
 #ifdef HAVE_GLIB