[aat] Unprefix not essentially layout tables (#921)

diff --git a/src/Makefile.sources b/src/Makefile.sources
index abf1bf4..ec5eb65 100644 (file)
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -82,11 +82,11 @@ HB_OT_sources = \
        hb-aat-layout.cc \
        hb-aat-layout-common-private.hh \
        hb-aat-layout-ankr-table.hh \
-       hb-aat-layout-fmtx-table.hh \
        hb-aat-layout-kerx-table.hh \
-       hb-aat-layout-ltag-table.hh \
        hb-aat-layout-morx-table.hh \
        hb-aat-layout-trak-table.hh \
+       hb-aat-fmtx-table.hh \
+       hb-aat-ltag-table.hh \
        hb-aat-layout-private.hh \
        hb-ot-font.cc \
        hb-ot-layout.cc \

diff --git a/src/hb-aat-layout-fmtx-table.hh b/src/hb-aat-fmtx-table.hh
similarity index 92%
rename from src/hb-aat-layout-fmtx-table.hh
rename to src/hb-aat-fmtx-table.hh
index 4ce81d3..6fabf3c 100644 (file)
--- a/src/hb-aat-layout-fmtx-table.hh
+++ b/src/hb-aat-fmtx-table.hh
@@ -22,8 +22,8 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#ifndef HB_AAT_LAYOUT_FMTX_TABLE_HH
-#define HB_AAT_LAYOUT_FMTX_TABLE_HH
+#ifndef HB_AAT_FMTX_TABLE_HH
+#define HB_AAT_FMTX_TABLE_HH
 
 #include "hb-aat-layout-common-private.hh"
 
@@ -35,6 +35,7 @@ namespace AAT {
 
 /*
  * fmtx -- Font metrics
+ * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6fmtx.html
  */
 
 struct fmtx
@@ -64,4 +65,4 @@ struct fmtx
 } /* namespace AAT */
 
 
-#endif /* HB_AAT_LAYOUT_FMTX_TABLE_HH */
+#endif /* HB_AAT_FMTX_TABLE_HH */

diff --git a/src/hb-aat-layout.cc b/src/hb-aat-layout.cc
index 61792f9..a9b4328 100644 (file)
--- a/src/hb-aat-layout.cc
+++ b/src/hb-aat-layout.cc
@@ -31,11 +31,11 @@
 
 #include "hb-aat-layout-private.hh"
 #include "hb-aat-layout-ankr-table.hh"
-#include "hb-aat-layout-fmtx-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-aat-layout-kerx-table.hh"
-#include "hb-aat-layout-ltag-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-aat-layout-morx-table.hh"
 #include "hb-aat-layout-trak-table.hh"
+#include "hb-aat-fmtx-table.hh" // Just so we compile it; unused otherwise
+#include "hb-aat-ltag-table.hh" // Just so we compile it; unused otherwise.
 
 /*
  * morx/kerx/trak

diff --git a/src/hb-aat-layout-ltag-table.hh b/src/hb-aat-ltag-table.hh
similarity index 92%
rename from src/hb-aat-layout-ltag-table.hh
rename to src/hb-aat-ltag-table.hh
index 81ada38..61f69bc 100644 (file)
--- a/src/hb-aat-layout-ltag-table.hh
+++ b/src/hb-aat-ltag-table.hh
@@ -22,8 +22,8 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#ifndef HB_AAT_LAYOUT_LTAG_TABLE_HH
-#define HB_AAT_LAYOUT_LTAG_TABLE_HH
+#ifndef HB_AAT_LTAG_TABLE_HH
+#define HB_AAT_LTAG_TABLE_HH
 
 #include "hb-aat-layout-common-private.hh"
 
@@ -51,6 +51,7 @@ struct FTStringRange
 
 /*
  * ltag -- Language tags
+ * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6ltag.html
  */
 
 struct ltag
@@ -75,4 +76,4 @@ struct ltag
 } /* namespace AAT */
 
 
-#endif /* HB_AAT_LAYOUT_LTAG_TABLE_HH */
+#endif /* HB_AAT_LTAG_TABLE_HH */