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

diff --git a/src/Makefile.am b/src/Makefile.am
index 0e21466..4ce5665 100644 (file)
--- a/src/Makefile.am
+++ b/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 \

diff --git a/src/hb-font.cc b/src/hb-font.cc
index d3fbcbe..6657c63 100644 (file)
--- a/src/hb-font.cc
+++ b/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>
 

diff --git a/src/hb-ot-head-private.hh b/src/hb-ot-head-table.hh
similarity index 98%
rename from src/hb-ot-head-private.hh
rename to src/hb-ot-head-table.hh
index 5255b6a..a0624c1 100644 (file)
--- a/src/hb-ot-head-private.hh
+++ b/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 */

diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-table.hh
similarity index 99%
rename from src/hb-ot-layout-gdef-private.hh
rename to src/hb-ot-layout-gdef-table.hh
index 10d40a6..a5b1e87 100644 (file)
--- a/src/hb-ot-layout-gdef-private.hh
+++ b/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 */

diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-table.hh
similarity index 99%
rename from src/hb-ot-layout-gpos-private.hh
rename to src/hb-ot-layout-gpos-table.hh
index b0ffe93..987524c 100644 (file)
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/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 */

diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-table.hh
similarity index 99%
rename from src/hb-ot-layout-gsub-private.hh
rename to src/hb-ot-layout-gsub-table.hh
index 91805ed..852f5f4 100644 (file)
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/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 */

diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index abe020c..14979e1 100644 (file)
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/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 */

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index b05e494..adf103f 100644 (file)
--- a/src/hb-ot-layout.cc
+++ b/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>

diff --git a/src/hb-ot-maxp-private.hh b/src/hb-ot-maxp-table.hh
similarity index 95%
rename from src/hb-ot-maxp-private.hh
rename to src/hb-ot-maxp-table.hh
index 92a07bd..6a9f8a4 100644 (file)
--- a/src/hb-ot-maxp-private.hh
+++ b/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 */

diff --git a/src/hb-ot-name-private.hh b/src/hb-ot-name-table.hh
similarity index 97%
rename from src/hb-ot-name-private.hh
rename to src/hb-ot-name-table.hh
index d2acba1..3fd2a17 100644 (file)
--- a/src/hb-ot-name-private.hh
+++ b/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 */

diff --git a/src/hb-uniscribe-shape.cc b/src/hb-uniscribe-shape.cc
index a222fdf..77b0f00 100644 (file)
--- a/src/hb-uniscribe-shape.cc
+++ b/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"

diff --git a/src/main.cc b/src/main.cc
index e13a40d..442b1b9 100644 (file)
--- a/src/main.cc
+++ b/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