walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[reorg] Change OT::Layout::GPOS to OT::Layout::GPOS_impl.

This commit is contained in:
Garret Rieger 2022-06-28 23:26:49 +00:00 committed by Behdad Esfahbod
parent 49ddf069e0
commit 88ef3c5a9a
33 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OT/Layout/GPOS/Anchor.hh
View File

@ -7,7 +7,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct Anchor struct Anchor
{ {

2
src/OT/Layout/GPOS/AnchorFormat1.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct AnchorFormat1 struct AnchorFormat1
{ {

2
src/OT/Layout/GPOS/AnchorFormat2.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct AnchorFormat2 struct AnchorFormat2
{ {

2
src/OT/Layout/GPOS/AnchorFormat3.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct AnchorFormat3 struct AnchorFormat3
{ {

2
src/OT/Layout/GPOS/AnchorMatrix.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct AnchorMatrix struct AnchorMatrix
{ {

2
src/OT/Layout/GPOS/ChainContextPos.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct ChainContextPos : ChainContext {}; struct ChainContextPos : ChainContext {};

2
src/OT/Layout/GPOS/Common.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
enum attach_type_t { enum attach_type_t {
ATTACH_TYPE_NONE = 0X00, ATTACH_TYPE_NONE = 0X00,

2
src/OT/Layout/GPOS/ContextPos.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct ContextPos : Context {}; struct ContextPos : Context {};

2
src/OT/Layout/GPOS/CursivePos.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct CursivePos struct CursivePos
{ {

4
src/OT/Layout/GPOS/CursivePosFormat1.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct EntryExitRecord struct EntryExitRecord
{ {
@ -52,7 +52,7 @@ struct EntryExitRecord
static void static void
reverse_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction, unsigned int new_parent) { reverse_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction, unsigned int new_parent) {
int chain = pos[i].attach_chain(), type = pos[i].attach_type(); int chain = pos[i].attach_chain(), type = pos[i].attach_type();
if (likely (!chain || 0 == (type & OT::Layout::GPOS::ATTACH_TYPE_CURSIVE))) if (likely (!chain || 0 == (type & ATTACH_TYPE_CURSIVE)))
return; return;
pos[i].attach_chain() = 0; pos[i].attach_chain() = 0;

2
src/OT/Layout/GPOS/ExtensionPos.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct ExtensionPos : Extension<ExtensionPos> struct ExtensionPos : Extension<ExtensionPos>
{ {

6
src/OT/Layout/GPOS/GPOS.hh
View File

@ -8,7 +8,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
static void static void
propagate_attachment_offsets (hb_glyph_position_t *pos, propagate_attachment_offsets (hb_glyph_position_t *pos,
@ -157,8 +157,8 @@ GPOS::position_finish_offsets (hb_font_t *font, hb_buffer_t *buffer)
} }
} }
struct GPOS_accelerator_t : Layout::GPOS::GPOS::accelerator_t { struct GPOS_accelerator_t : Layout::GPOS_impl::GPOS::accelerator_t {
GPOS_accelerator_t (hb_face_t *face) : Layout::GPOS::GPOS::accelerator_t (face) {} GPOS_accelerator_t (hb_face_t *face) : Layout::GPOS_impl::GPOS::accelerator_t (face) {}
}; };
} }

2
src/OT/Layout/GPOS/MarkArray.hh
View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct MarkArray : Array16Of<MarkRecord> /* Array of MarkRecords--in Coverage order */ struct MarkArray : Array16Of<MarkRecord> /* Array of MarkRecords--in Coverage order */
{ {

2
src/OT/Layout/GPOS/MarkBasePos.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct MarkBasePos struct MarkBasePos
{ {

2
src/OT/Layout/GPOS/MarkBasePosFormat1.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
typedef AnchorMatrix BaseArray; /* base-major-- typedef AnchorMatrix BaseArray; /* base-major--
* in order of BaseCoverage Index--, * in order of BaseCoverage Index--,

2
src/OT/Layout/GPOS/MarkLigPos.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct MarkLigPos struct MarkLigPos
{ {

2
src/OT/Layout/GPOS/MarkLigPosFormat1.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
typedef AnchorMatrix LigatureAttach; /* component-major-- typedef AnchorMatrix LigatureAttach; /* component-major--
* in order of writing direction--, * in order of writing direction--,

2
src/OT/Layout/GPOS/MarkMarkPos.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct MarkMarkPos struct MarkMarkPos
{ {

2
src/OT/Layout/GPOS/MarkMarkPosFormat1.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
typedef AnchorMatrix Mark2Array; /* mark2-major-- typedef AnchorMatrix Mark2Array; /* mark2-major--
* in order of Mark2Coverage Index--, * in order of Mark2Coverage Index--,

2
src/OT/Layout/GPOS/MarkRecord.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct MarkRecord struct MarkRecord
{ {

2
src/OT/Layout/GPOS/PairPos.hh
View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct PairPos struct PairPos
{ {

2
src/OT/Layout/GPOS/PairPosFormat1.hh
View File

@ -3,7 +3,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct PairValueRecord struct PairValueRecord
{ {

2
src/OT/Layout/GPOS/PairPosFormat2.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct PairPosFormat2 struct PairPosFormat2
{ {

2
src/OT/Layout/GPOS/PosLookup.hh
View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct PosLookup : Lookup struct PosLookup : Lookup
{ {

2
src/OT/Layout/GPOS/PosLookupSubTable.hh
View File

@ -13,7 +13,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct PosLookupSubTable struct PosLookupSubTable
{ {

2
src/OT/Layout/GPOS/SinglePos.hh
View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct SinglePos struct SinglePos
{ {

2
src/OT/Layout/GPOS/SinglePosFormat1.hh
View File

@ -6,7 +6,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct SinglePosFormat1 struct SinglePosFormat1
{ {

2
src/OT/Layout/GPOS/SinglePosFormat2.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
struct SinglePosFormat2 struct SinglePosFormat2
{ {

2
src/OT/Layout/GPOS/ValueFormat.hh
View File

@ -5,7 +5,7 @@
namespace OT { namespace OT {
namespace Layout { namespace Layout {
namespace GPOS { namespace GPOS_impl {
typedef HBUINT16 Value; typedef HBUINT16 Value;

20
src/hb-ot-layout-gpos-table.hh
View File

@ -33,33 +33,33 @@
namespace OT { namespace OT {
using Layout::GPOS::ATTACH_TYPE_MARK; using Layout::GPOS_impl::ATTACH_TYPE_MARK;
using Layout::GPOS::ATTACH_TYPE_NONE; using Layout::GPOS_impl::ATTACH_TYPE_NONE;
using Layout::GPOS::ATTACH_TYPE_CURSIVE; using Layout::GPOS_impl::ATTACH_TYPE_CURSIVE;
using Layout::GPOS::PosLookup; using Layout::GPOS_impl::PosLookup;
// TODO(garretrieger): Move into new layout directory. // TODO(garretrieger): Move into new layout directory.
/* Out-of-class implementation for methods recursing */ /* Out-of-class implementation for methods recursing */
#ifndef HB_NO_OT_LAYOUT #ifndef HB_NO_OT_LAYOUT
template <typename context_t> template <typename context_t>
/*static*/ typename context_t::return_t Layout::GPOS::PosLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index) /*static*/ typename context_t::return_t PosLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index)
{ {
const Layout::GPOS::PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index); const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index);
return l.dispatch (c); return l.dispatch (c);
} }
template <> template <>
inline hb_closure_lookups_context_t::return_t inline hb_closure_lookups_context_t::return_t
Layout::GPOS::PosLookup::dispatch_recurse_func<hb_closure_lookups_context_t> (hb_closure_lookups_context_t *c, unsigned this_index) PosLookup::dispatch_recurse_func<hb_closure_lookups_context_t> (hb_closure_lookups_context_t *c, unsigned this_index)
{ {
const Layout::GPOS::PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (this_index); const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (this_index);
return l.closure_lookups (c, this_index); return l.closure_lookups (c, this_index);
} }
template <> template <>
inline bool Layout::GPOS::PosLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_apply_context_t *c, unsigned int lookup_index) inline bool PosLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_apply_context_t *c, unsigned int lookup_index)
{ {
const Layout::GPOS::PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index); const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index);
unsigned int saved_lookup_props = c->lookup_props; unsigned int saved_lookup_props = c->lookup_props;
unsigned int saved_lookup_index = c->lookup_index; unsigned int saved_lookup_index = c->lookup_index;
c->set_lookup_index (lookup_index); c->set_lookup_index (lookup_index);

2
src/hb-ot-layout.cc
View File

@ -55,7 +55,7 @@
#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::GSUB;
using OT::Layout::GPOS::GPOS; using OT::Layout::GPOS_impl::GPOS;
/** /**
* SECTION:hb-ot-layout * SECTION:hb-ot-layout

2
src/hb-subset-plan.cc
View File

@ -41,7 +41,7 @@
#include "hb-ot-math-table.hh" #include "hb-ot-math-table.hh"
using OT::Layout::GSUB::GSUB; using OT::Layout::GSUB::GSUB;
using OT::Layout::GPOS::GPOS; using OT::Layout::GPOS_impl::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;
#ifndef HB_NO_SUBSET_CFF #ifndef HB_NO_SUBSET_CFF

2
src/hb-subset.cc
View File

@ -56,7 +56,7 @@
#include "hb-repacker.hh" #include "hb-repacker.hh"
using OT::Layout::GSUB::GSUB; using OT::Layout::GSUB::GSUB;
using OT::Layout::GPOS::GPOS; using OT::Layout::GPOS_impl::GPOS;
/** /**
* SECTION:hb-subset * SECTION:hb-subset