Chiebot-Mirror
/
harfbuzz
mirror of https://github.com/harfbuzz/harfbuzz.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
pull/3701/head
Garret Rieger 2 years ago committed by Behdad Esfahbod
parent 13c499cb26
commit 5fdae68481
29 changed files with 40 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Makefile.sources
  2. 21
      src/OT/Layout/GSUB.hh
  3. 2
      src/OT/Layout/GSUB/AlternateSet.hh
  4. 2
      src/OT/Layout/GSUB/AlternateSubst.hh
  5. 2
      src/OT/Layout/GSUB/AlternateSubstFormat1.hh
  6. 2
      src/OT/Layout/GSUB/ChainContextSubst.hh
  7. 2
      src/OT/Layout/GSUB/Common.hh
  8. 2
      src/OT/Layout/GSUB/ContextSubst.hh
  9. 2
      src/OT/Layout/GSUB/ExtensionSubst.hh
  10. 2
      src/OT/Layout/GSUB/Ligature.hh
  11. 2
      src/OT/Layout/GSUB/LigatureSet.hh
  12. 2
      src/OT/Layout/GSUB/LigatureSubst.hh
  13. 2
      src/OT/Layout/GSUB/LigatureSubstFormat1.hh
  14. 2
      src/OT/Layout/GSUB/MultipleSubst.hh
  15. 2
      src/OT/Layout/GSUB/MultipleSubstFormat1.hh
  16. 2
      src/OT/Layout/GSUB/ReverseChainSingleSubst.hh
  17. 2
      src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
  18. 2
      src/OT/Layout/GSUB/Sequence.hh
  19. 2
      src/OT/Layout/GSUB/SingleSubst.hh
  20. 2
      src/OT/Layout/GSUB/SingleSubstFormat1.hh
  21. 2
      src/OT/Layout/GSUB/SingleSubstFormat2.hh
  22. 2
      src/OT/Layout/GSUB/SubstLookup.hh
  23. 2
      src/OT/Layout/GSUB/SubstLookupSubTable.hh
  24. 6
      src/hb-ot-layout-gsub-table.hh
  25. 2
      src/hb-ot-layout.cc
  26. 4
      src/hb-ot-layout.hh
  27. 2
      src/hb-subset-plan.cc
  28. 2
      src/hb-subset.cc
  29. 2
      src/meson.build

2
src/Makefile.sources
Unescape View File

@ -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 \

21
src/OT/Layout/GSUB/GSUB.hh → src/OT/Layout/GSUB.hh
Unescape View File

@ -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 */

2
src/OT/Layout/GSUB/AlternateSet.hh
Unescape View File

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

2
src/OT/Layout/GSUB/AlternateSubst.hh
Unescape View File

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

2
src/OT/Layout/GSUB/AlternateSubstFormat1.hh
Unescape View File

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

2
src/OT/Layout/GSUB/ChainContextSubst.hh
Unescape View File

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

2
src/OT/Layout/GSUB/Common.hh
Unescape View File

@ -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;

2
src/OT/Layout/GSUB/ContextSubst.hh
Unescape View File

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

2
src/OT/Layout/GSUB/ExtensionSubst.hh
Unescape View File

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

2
src/OT/Layout/GSUB/Ligature.hh
Unescape View File

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

2
src/OT/Layout/GSUB/LigatureSet.hh
Unescape View File

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

2
src/OT/Layout/GSUB/LigatureSubst.hh
Unescape View File

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

2
src/OT/Layout/GSUB/LigatureSubstFormat1.hh
Unescape View File

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

2
src/OT/Layout/GSUB/MultipleSubst.hh
Unescape View File

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

2
src/OT/Layout/GSUB/MultipleSubstFormat1.hh
Unescape View File

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

2
src/OT/Layout/GSUB/ReverseChainSingleSubst.hh
Unescape View File

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

2
src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
Unescape View File

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

2
src/OT/Layout/GSUB/Sequence.hh
Unescape View File

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

2
src/OT/Layout/GSUB/SingleSubst.hh
Unescape View File

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

2
src/OT/Layout/GSUB/SingleSubstFormat1.hh
Unescape View File

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

2
src/OT/Layout/GSUB/SingleSubstFormat2.hh
Unescape View File

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

2
src/OT/Layout/GSUB/SubstLookup.hh
Unescape View File

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

2
src/OT/Layout/GSUB/SubstLookupSubTable.hh
Unescape View File

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

6
src/hb-ot-layout-gsub-table.hh
Unescape View File

@ -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 */

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

@ -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;
/**

4
src/hb-ot-layout.hh
Unescape View File

@ -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);

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

@ -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;

2
src/hb-subset.cc
Unescape View File

@ -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;
/**

2
src/meson.build
Unescape View File

@ -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',

Write Preview
Loading…
Cancel
Save