Move GSUB.hh GPOS.hh back into the GPOS/GSUB sub directories.

pull/3701/head
Garret Rieger 2 years ago committed by Behdad Esfahbod
parent 5fdae68481
commit 900476c635
  1. 4
      src/Makefile.sources
  2. 14
      src/OT/Layout/GPOS/GPOS.hh
  3. 12
      src/OT/Layout/GSUB/GSUB.hh
  4. 2
      src/hb-ot-layout-gpos-table.hh
  5. 2
      src/hb-ot-layout-gsub-table.hh
  6. 4
      src/meson.build

@ -118,8 +118,8 @@ HB_BASE_sources = \
OT/Layout/GSUB/ExtensionSubst.hh \ OT/Layout/GSUB/ExtensionSubst.hh \
OT/Layout/GSUB/SubstLookupSubTable.hh \ OT/Layout/GSUB/SubstLookupSubTable.hh \
OT/Layout/GSUB/SubstLookup.hh \ OT/Layout/GSUB/SubstLookup.hh \
OT/Layout/GSUB.hh \ OT/Layout/GSUB/GSUB.hh \
OT/Layout/GPOS.hh \ OT/Layout/GPOS/GPOS.hh \
OT/Layout/GPOS/CursivePosFormat1.hh \ OT/Layout/GPOS/CursivePosFormat1.hh \
OT/Layout/GPOS/MarkLigPos.hh \ OT/Layout/GPOS/MarkLigPos.hh \
OT/Layout/GPOS/PairPos.hh \ OT/Layout/GPOS/PairPos.hh \

@ -1,10 +1,10 @@
#ifndef OT_LAYOUT_GPOS_HH #ifndef OT_LAYOUT_GPOS_GPOS_HH
#define OT_LAYOUT_GPOS_HH #define OT_LAYOUT_GPOS_GPOS_HH
#include "../../hb-ot-layout-common.hh" #include "../../../hb-ot-layout-common.hh"
#include "../../hb-ot-layout-gsubgpos.hh" #include "../../../hb-ot-layout-gsubgpos.hh"
#include "GPOS/Common.hh" #include "Common.hh"
#include "GPOS/PosLookup.hh" #include "PosLookup.hh"
namespace OT { namespace OT {
namespace Layout { namespace Layout {
@ -162,4 +162,4 @@ struct GPOS_accelerator_t : Layout::GPOS::accelerator_t {
} }
#endif /* OT_LAYOUT_GPOS_HH */ #endif /* OT_LAYOUT_GPOS_GPOS_HH */

@ -1,9 +1,9 @@
#ifndef OT_LAYOUT_GSUB_HH #ifndef OT_LAYOUT_GSUB_GSUB_HH
#define OT_LAYOUT_GSUB_HH #define OT_LAYOUT_GSUB_GSUB_HH
#include "../../hb-ot-layout-gsubgpos.hh" #include "../../../hb-ot-layout-gsubgpos.hh"
#include "GSUB/Common.hh" #include "Common.hh"
#include "GSUB/SubstLookup.hh" #include "SubstLookup.hh"
using OT::Layout::GSUB_impl::SubstLookup; using OT::Layout::GSUB_impl::SubstLookup;
@ -54,4 +54,4 @@ struct GSUB_accelerator_t : Layout::GSUB::accelerator_t {
} }
#endif /* OT_LAYOUT_GSUB_HH */ #endif /* OT_LAYOUT_GSUB_GSUB_HH */

@ -29,7 +29,7 @@
#ifndef HB_OT_LAYOUT_GPOS_TABLE_HH #ifndef HB_OT_LAYOUT_GPOS_TABLE_HH
#define HB_OT_LAYOUT_GPOS_TABLE_HH #define HB_OT_LAYOUT_GPOS_TABLE_HH
#include "OT/Layout/GPOS.hh" #include "OT/Layout/GPOS/GPOS.hh"
namespace OT { namespace OT {

@ -29,7 +29,7 @@
#ifndef HB_OT_LAYOUT_GSUB_TABLE_HH #ifndef HB_OT_LAYOUT_GSUB_TABLE_HH
#define HB_OT_LAYOUT_GSUB_TABLE_HH #define HB_OT_LAYOUT_GSUB_TABLE_HH
#include "OT/Layout/GSUB.hh" #include "OT/Layout/GSUB/GSUB.hh"
namespace OT { namespace OT {

@ -122,8 +122,8 @@ hb_base_sources = files(
'OT/Layout/GSUB/ExtensionSubst.hh', 'OT/Layout/GSUB/ExtensionSubst.hh',
'OT/Layout/GSUB/SubstLookupSubTable.hh', 'OT/Layout/GSUB/SubstLookupSubTable.hh',
'OT/Layout/GSUB/SubstLookup.hh', 'OT/Layout/GSUB/SubstLookup.hh',
'OT/Layout/GSUB.hh', 'OT/Layout/GSUB/GSUB.hh',
'OT/Layout/GPOS.hh', 'OT/Layout/GPOS/GPOS.hh',
'OT/Layout/GPOS/CursivePosFormat1.hh', 'OT/Layout/GPOS/CursivePosFormat1.hh',
'OT/Layout/GPOS/MarkLigPos.hh', 'OT/Layout/GPOS/MarkLigPos.hh',
'OT/Layout/GPOS/PairPos.hh', 'OT/Layout/GPOS/PairPos.hh',

Loading…
Cancel
Save