[reorg] Move GSUB.hh up one level and change GSUB namespace to GSUB_impl.

2022-06-29 23:52:08 +00:00 · 2022-06-29 23:52:08 +00:00 · 5fdae68481
parent 13c499cb26
commit 5fdae68481
29 changed files with 40 additions and 43 deletions
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@ -118,7 +118,7 @@ HB_BASE_sources = \
 	OT/Layout/GSUB/ExtensionSubst.hh \
 	OT/Layout/GSUB/SubstLookupSubTable.hh \
 	OT/Layout/GSUB/SubstLookup.hh \
-	OT/Layout/GSUB/GSUB.hh \
+	OT/Layout/GSUB.hh \
 	OT/Layout/GPOS.hh \
 	OT/Layout/GPOS/CursivePosFormat1.hh \
 	OT/Layout/GPOS/MarkLigPos.hh \
--- a/src/OT/Layout/GSUB/GSUB.hh
+++ b/src/OT/Layout/GSUB/GSUB.hh
@ -1,16 +1,14 @@
-#ifndef OT_LAYOUT_GSUB_GSUB_HH
-#define OT_LAYOUT_GSUB_GSUB_HH
+#ifndef OT_LAYOUT_GSUB_HH
+#define OT_LAYOUT_GSUB_HH

-// TODO(garretrieger): move to new layout.
-#include "../../../hb-ot-layout-gsubgpos.hh"
-#include "Common.hh"
-#include "SubstLookup.hh"
+#include "../../hb-ot-layout-gsubgpos.hh"
+#include "GSUB/Common.hh"
+#include "GSUB/SubstLookup.hh"

-using OT::Layout::GSUB::SubstLookup;
+using OT::Layout::GSUB_impl::SubstLookup;

 namespace OT {
 namespace Layout {
-namespace GSUB {

 /*
 * GSUB -- Glyph Substitution
@ -47,14 +45,13 @@ struct GSUB : GSUBGPOS
 };


-}
 }

-struct GSUB_accelerator_t : Layout::GSUB::GSUB::accelerator_t {
-  GSUB_accelerator_t (hb_face_t *face) : Layout::GSUB::GSUB::accelerator_t (face) {}
+struct GSUB_accelerator_t : Layout::GSUB::accelerator_t {
+  GSUB_accelerator_t (hb_face_t *face) : Layout::GSUB::accelerator_t (face) {}
 };


 }

-#endif  /* OT_LAYOUT_GSUB_GSUB_HH */
+#endif  /* OT_LAYOUT_GSUB_HH */
--- a/src/OT/Layout/GSUB/AlternateSet.hh
+++ b/src/OT/Layout/GSUB/AlternateSet.hh
@ -5,7 +5,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct AlternateSet
 {
--- a/src/OT/Layout/GSUB/AlternateSubst.hh
+++ b/src/OT/Layout/GSUB/AlternateSubst.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct AlternateSubst
 {
--- a/src/OT/Layout/GSUB/AlternateSubstFormat1.hh
+++ b/src/OT/Layout/GSUB/AlternateSubstFormat1.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct AlternateSubstFormat1
 {
--- a/src/OT/Layout/GSUB/ChainContextSubst.hh
+++ b/src/OT/Layout/GSUB/ChainContextSubst.hh
@ -7,7 +7,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct ChainContextSubst : ChainContext {};

--- a/src/OT/Layout/GSUB/Common.hh
+++ b/src/OT/Layout/GSUB/Common.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 typedef hb_pair_t<hb_codepoint_t, hb_codepoint_t> hb_codepoint_pair_t;

--- a/src/OT/Layout/GSUB/ContextSubst.hh
+++ b/src/OT/Layout/GSUB/ContextSubst.hh
@ -7,7 +7,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct ContextSubst : Context {};

--- a/src/OT/Layout/GSUB/ExtensionSubst.hh
+++ b/src/OT/Layout/GSUB/ExtensionSubst.hh
@ -7,7 +7,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct ExtensionSubst : Extension<ExtensionSubst>
 {
--- a/src/OT/Layout/GSUB/Ligature.hh
+++ b/src/OT/Layout/GSUB/Ligature.hh
@ -5,7 +5,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct Ligature
 {
--- a/src/OT/Layout/GSUB/LigatureSet.hh
+++ b/src/OT/Layout/GSUB/LigatureSet.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct LigatureSet
 {
--- a/src/OT/Layout/GSUB/LigatureSubst.hh
+++ b/src/OT/Layout/GSUB/LigatureSubst.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct LigatureSubst
 {
--- a/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
+++ b/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct LigatureSubstFormat1
 {
--- a/src/OT/Layout/GSUB/MultipleSubst.hh
+++ b/src/OT/Layout/GSUB/MultipleSubst.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct MultipleSubst
 {
--- a/src/OT/Layout/GSUB/MultipleSubstFormat1.hh
+++ b/src/OT/Layout/GSUB/MultipleSubstFormat1.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct MultipleSubstFormat1
 {
--- a/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh
+++ b/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct ReverseChainSingleSubst
 {
--- a/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
+++ b/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
@ -5,7 +5,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct ReverseChainSingleSubstFormat1
 {
--- a/src/OT/Layout/GSUB/Sequence.hh
+++ b/src/OT/Layout/GSUB/Sequence.hh
@ -5,7 +5,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct Sequence
 {
--- a/src/OT/Layout/GSUB/SingleSubst.hh
+++ b/src/OT/Layout/GSUB/SingleSubst.hh
@ -7,7 +7,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct SingleSubst
 {
--- a/src/OT/Layout/GSUB/SingleSubstFormat1.hh
+++ b/src/OT/Layout/GSUB/SingleSubstFormat1.hh
@ -5,7 +5,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct SingleSubstFormat1
 {
--- a/src/OT/Layout/GSUB/SingleSubstFormat2.hh
+++ b/src/OT/Layout/GSUB/SingleSubstFormat2.hh
@ -5,7 +5,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct SingleSubstFormat2
 {
--- a/src/OT/Layout/GSUB/SubstLookup.hh
+++ b/src/OT/Layout/GSUB/SubstLookup.hh
@ -6,7 +6,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct SubstLookup : Lookup
 {
--- a/src/OT/Layout/GSUB/SubstLookupSubTable.hh
+++ b/src/OT/Layout/GSUB/SubstLookupSubTable.hh
@ -13,7 +13,7 @@

 namespace OT {
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {

 struct SubstLookupSubTable
 {
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
@ -29,12 +29,12 @@
 #ifndef HB_OT_LAYOUT_GSUB_TABLE_HH
 #define HB_OT_LAYOUT_GSUB_TABLE_HH

-#include "OT/Layout/GSUB/GSUB.hh"
+#include "OT/Layout/GSUB.hh"

 namespace OT {

-using Layout::GSUB::SubstLookup;
-using Layout::GSUB::ExtensionSubst;
+using Layout::GSUB_impl::SubstLookup;
+using Layout::GSUB_impl::ExtensionSubst;

 // TODO(garretrieger): Move into the new layout directory.
 /* Out-of-class implementation for methods recursing */
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@ -54,7 +54,7 @@
 #include "hb-aat-layout-morx-table.hh"
 #include "hb-aat-layout-opbd-table.hh" // Just so we compile it; unused otherwise.

-using OT::Layout::GSUB::GSUB;
+using OT::Layout::GSUB;
 using OT::Layout::GPOS;

 /**
--- a/src/hb-ot-layout.hh
+++ b/src/hb-ot-layout.hh
@ -110,7 +110,7 @@ namespace OT {
  struct hb_ot_apply_context_t;
  struct hb_ot_layout_lookup_accelerator_t;
 namespace Layout {
-namespace GSUB {
+namespace GSUB_impl {
  struct SubstLookup;
 }
 }
@ -118,7 +118,7 @@ namespace GSUB {

 HB_INTERNAL void
 hb_ot_layout_substitute_lookup (OT::hb_ot_apply_context_t *c,
-				const OT::Layout::GSUB::SubstLookup &lookup,
+				const OT::Layout::GSUB_impl::SubstLookup &lookup,
 				const OT::hb_ot_layout_lookup_accelerator_t &accel);


--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@ -40,7 +40,7 @@
 #include "hb-ot-stat-table.hh"
 #include "hb-ot-math-table.hh"

-using OT::Layout::GSUB::GSUB;
+using OT::Layout::GSUB;
 using OT::Layout::GPOS;

 typedef hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> script_langsys_map;
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@ -55,7 +55,7 @@
 #include "hb-ot-math-table.hh"
 #include "hb-repacker.hh"

-using OT::Layout::GSUB::GSUB;
+using OT::Layout::GSUB;
 using OT::Layout::GPOS;

 /**
--- a/src/meson.build
+++ b/src/meson.build
@ -122,7 +122,7 @@ hb_base_sources = files(
  'OT/Layout/GSUB/ExtensionSubst.hh',
  'OT/Layout/GSUB/SubstLookupSubTable.hh',
  'OT/Layout/GSUB/SubstLookup.hh',
-  'OT/Layout/GSUB/GSUB.hh',
+  'OT/Layout/GSUB.hh',
  'OT/Layout/GPOS.hh',
  'OT/Layout/GPOS/CursivePosFormat1.hh',
  'OT/Layout/GPOS/MarkLigPos.hh',