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

This commit is contained in:
Garret Rieger 2022-06-29 23:52:08 +00:00 committed by Behdad Esfahbod
parent 13c499cb26
commit 5fdae68481
29 changed files with 40 additions and 43 deletions

View File

@ -118,7 +118,7 @@ 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/GSUB.hh \ OT/Layout/GSUB.hh \
OT/Layout/GPOS.hh \ OT/Layout/GPOS.hh \
OT/Layout/GPOS/CursivePosFormat1.hh \ OT/Layout/GPOS/CursivePosFormat1.hh \
OT/Layout/GPOS/MarkLigPos.hh \ OT/Layout/GPOS/MarkLigPos.hh \

View File

@ -1,16 +1,14 @@
#ifndef OT_LAYOUT_GSUB_GSUB_HH #ifndef OT_LAYOUT_GSUB_HH
#define OT_LAYOUT_GSUB_GSUB_HH #define OT_LAYOUT_GSUB_HH
// TODO(garretrieger): move to new layout. #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::SubstLookup; using OT::Layout::GSUB_impl::SubstLookup;
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB {
/* /*
* GSUB -- Glyph Substitution * GSUB -- Glyph Substitution
@ -47,14 +45,13 @@ struct GSUB : GSUBGPOS
}; };
}
} }
struct GSUB_accelerator_t : Layout::GSUB::GSUB::accelerator_t { struct GSUB_accelerator_t : Layout::GSUB::accelerator_t {
GSUB_accelerator_t (hb_face_t *face) : Layout::GSUB::GSUB::accelerator_t (face) {} GSUB_accelerator_t (hb_face_t *face) : Layout::GSUB::accelerator_t (face) {}
}; };
} }
#endif /* OT_LAYOUT_GSUB_GSUB_HH */ #endif /* OT_LAYOUT_GSUB_HH */

View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct AlternateSet struct AlternateSet
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct AlternateSubst struct AlternateSubst
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct AlternateSubstFormat1 struct AlternateSubstFormat1
{ {

View File

@ -7,7 +7,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct ChainContextSubst : ChainContext {}; struct ChainContextSubst : ChainContext {};

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
typedef hb_pair_t<hb_codepoint_t, hb_codepoint_t> hb_codepoint_pair_t; typedef hb_pair_t<hb_codepoint_t, hb_codepoint_t> hb_codepoint_pair_t;

View File

@ -7,7 +7,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct ContextSubst : Context {}; struct ContextSubst : Context {};

View File

@ -7,7 +7,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct ExtensionSubst : Extension<ExtensionSubst> struct ExtensionSubst : Extension<ExtensionSubst>
{ {

View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct Ligature struct Ligature
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct LigatureSet struct LigatureSet
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct LigatureSubst struct LigatureSubst
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct LigatureSubstFormat1 struct LigatureSubstFormat1
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct MultipleSubst struct MultipleSubst
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct MultipleSubstFormat1 struct MultipleSubstFormat1
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct ReverseChainSingleSubst struct ReverseChainSingleSubst
{ {

View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct ReverseChainSingleSubstFormat1 struct ReverseChainSingleSubstFormat1
{ {

View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct Sequence struct Sequence
{ {

View File

@ -7,7 +7,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct SingleSubst struct SingleSubst
{ {

View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct SingleSubstFormat1 struct SingleSubstFormat1
{ {

View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct SingleSubstFormat2 struct SingleSubstFormat2
{ {

View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct SubstLookup : Lookup struct SubstLookup : Lookup
{ {

View File

@ -13,7 +13,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct SubstLookupSubTable struct SubstLookupSubTable
{ {

View File

@ -29,12 +29,12 @@
#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/GSUB.hh" #include "OT/Layout/GSUB.hh"
namespace OT { namespace OT {
using Layout::GSUB::SubstLookup; using Layout::GSUB_impl::SubstLookup;
using Layout::GSUB::ExtensionSubst; using Layout::GSUB_impl::ExtensionSubst;
// TODO(garretrieger): Move into the new layout directory. // TODO(garretrieger): Move into the new layout directory.
/* Out-of-class implementation for methods recursing */ /* Out-of-class implementation for methods recursing */

View File

@ -54,7 +54,7 @@
#include "hb-aat-layout-morx-table.hh" #include "hb-aat-layout-morx-table.hh"
#include "hb-aat-layout-opbd-table.hh" // Just so we compile it; unused otherwise. #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; using OT::Layout::GPOS;
/** /**

View File

@ -110,7 +110,7 @@ namespace OT {
struct hb_ot_apply_context_t; struct hb_ot_apply_context_t;
struct hb_ot_layout_lookup_accelerator_t; struct hb_ot_layout_lookup_accelerator_t;
namespace Layout { namespace Layout {
namespace GSUB { namespace GSUB_impl {
struct SubstLookup; struct SubstLookup;
} }
} }
@ -118,7 +118,7 @@ namespace GSUB {
HB_INTERNAL void HB_INTERNAL void
hb_ot_layout_substitute_lookup (OT::hb_ot_apply_context_t *c, 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); const OT::hb_ot_layout_lookup_accelerator_t &accel);

View File

@ -40,7 +40,7 @@
#include "hb-ot-stat-table.hh" #include "hb-ot-stat-table.hh"
#include "hb-ot-math-table.hh" #include "hb-ot-math-table.hh"
using OT::Layout::GSUB::GSUB; using OT::Layout::GSUB;
using OT::Layout::GPOS; using OT::Layout::GPOS;
typedef hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> script_langsys_map; typedef hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> script_langsys_map;

View File

@ -55,7 +55,7 @@
#include "hb-ot-math-table.hh" #include "hb-ot-math-table.hh"
#include "hb-repacker.hh" #include "hb-repacker.hh"
using OT::Layout::GSUB::GSUB; using OT::Layout::GSUB;
using OT::Layout::GPOS; using OT::Layout::GPOS;
/** /**

View File

@ -122,7 +122,7 @@ 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/GSUB.hh', 'OT/Layout/GSUB.hh',
'OT/Layout/GPOS.hh', 'OT/Layout/GPOS.hh',
'OT/Layout/GPOS/CursivePosFormat1.hh', 'OT/Layout/GPOS/CursivePosFormat1.hh',
'OT/Layout/GPOS/MarkLigPos.hh', 'OT/Layout/GPOS/MarkLigPos.hh',