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

Rename hb-*private.hh to hb-*.hh 

Sorry for the noise, downstream custom builders.  Please adjust.
This commit is contained in:
Behdad Esfahbod 2018-08-25 22:36:36 -07:00
parent 82b12bcadd
commit c77ae40852
168 changed files with 452 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/Makefile.sources
View File

@ -1,28 +1,28 @@
# Base and default-included sources and headers # Base and default-included sources and headers
HB_BASE_sources = \ HB_BASE_sources = \
hb-atomic-private.hh \ hb-atomic.hh \
hb-blob-private.hh \ hb-blob.hh \
hb-blob.cc \ hb-blob.cc \
hb-buffer-private.hh \ hb-buffer.hh \
hb-buffer-serialize.cc \ hb-buffer-serialize.cc \
hb-buffer.cc \ hb-buffer.cc \
hb-common.cc \ hb-common.cc \
hb-debug.hh \ hb-debug.hh \
hb-dsalgs.hh \ hb-dsalgs.hh \
hb-face-private.hh \ hb-face.hh \
hb-face.cc \ hb-face.cc \
hb-font-private.hh \ hb-font.hh \
hb-font.cc \ hb-font.cc \
hb-iter-private.hh \ hb-iter.hh \
hb-map-private.hh \ hb-map.hh \
hb-map.cc \ hb-map.cc \
hb-machinery-private.hh \ hb-machinery.hh \
hb-mutex-private.hh \ hb-mutex.hh \
hb-null.hh \ hb-null.hh \
hb-object-private.hh \ hb-object.hh \
hb-open-file-private.hh \ hb-open-file.hh \
hb-open-type-private.hh \ hb-open-type.hh \
hb-ot-color-cbdt-table.hh \ hb-ot-color-cbdt-table.hh \
hb-ot-cmap-table.hh \ hb-ot-cmap-table.hh \
hb-ot-glyf-table.hh \ hb-ot-glyf-table.hh \
@ -38,23 +38,23 @@ HB_BASE_sources = \
hb-ot-post-macroman.hh \ hb-ot-post-macroman.hh \
hb-ot-post-table.hh \ hb-ot-post-table.hh \
hb-ot-tag.cc \ hb-ot-tag.cc \
hb-private.hh \ hb.hh \
hb-set-digest-private.hh \ hb-set-digest.hh \
hb-set-private.hh \ hb-set.hh \
hb-set.cc \ hb-set.cc \
hb-shape.cc \ hb-shape.cc \
hb-shape-plan-private.hh \ hb-shape-plan.hh \
hb-shape-plan.cc \ hb-shape-plan.cc \
hb-shaper-list.hh \ hb-shaper-list.hh \
hb-shaper-impl-private.hh \ hb-shaper-impl.hh \
hb-shaper-private.hh \ hb-shaper.hh \
hb-shaper.cc \ hb-shaper.cc \
hb-static.cc \ hb-static.cc \
hb-string-array.hh \ hb-string-array.hh \
hb-unicode-private.hh \ hb-unicode.hh \
hb-unicode.cc \ hb-unicode.cc \
hb-vector-private.hh \ hb-vector.hh \
hb-utf-private.hh \ hb-utf.hh \
hb-warning.cc \ hb-warning.cc \
$(NULL) $(NULL)
@ -89,61 +89,61 @@ HB_FALLBACK_sources = \
HB_OT_sources = \ HB_OT_sources = \
hb-aat-layout.cc \ hb-aat-layout.cc \
hb-aat-layout-common-private.hh \ hb-aat-layout-common.hh \
hb-aat-layout-ankr-table.hh \ hb-aat-layout-ankr-table.hh \
hb-aat-layout-bsln-table.hh \ hb-aat-layout-bsln-table.hh \
hb-aat-layout-feat-table.hh \ hb-aat-layout-feat-table.hh \
hb-aat-layout-kerx-table.hh \ hb-aat-layout-kerx-table.hh \
hb-aat-layout-morx-table.hh \ hb-aat-layout-morx-table.hh \
hb-aat-layout-trak-table.hh \ hb-aat-layout-trak-table.hh \
hb-aat-layout-private.hh \ hb-aat-layout.hh \
hb-aat-ltag-table.hh \ hb-aat-ltag-table.hh \
hb-ot-font.cc \ hb-ot-font.cc \
hb-ot-layout.cc \ hb-ot-layout.cc \
hb-ot-layout-base-table.hh \ hb-ot-layout-base-table.hh \
hb-ot-layout-common-private.hh \ hb-ot-layout-common.hh \
hb-ot-layout-gdef-table.hh \ hb-ot-layout-gdef-table.hh \
hb-ot-layout-gpos-table.hh \ hb-ot-layout-gpos-table.hh \
hb-ot-layout-gsubgpos-private.hh \ hb-ot-layout-gsubgpos.hh \
hb-ot-layout-gsub-table.hh \ hb-ot-layout-gsub-table.hh \
hb-ot-layout-jstf-table.hh \ hb-ot-layout-jstf-table.hh \
hb-ot-layout-private.hh \ hb-ot-layout.hh \
hb-ot-color.cc \ hb-ot-color.cc \
hb-ot-color-colr-table.hh \ hb-ot-color-colr-table.hh \
hb-ot-color-cpal-table.hh \ hb-ot-color-cpal-table.hh \
hb-ot-color-sbix-table.hh \ hb-ot-color-sbix-table.hh \
hb-ot-color-svg-table.hh \ hb-ot-color-svg-table.hh \
hb-ot-map.cc \ hb-ot-map.cc \
hb-ot-map-private.hh \ hb-ot-map.hh \
hb-ot-math.cc \ hb-ot-math.cc \
hb-ot-math-table.hh \ hb-ot-math-table.hh \
hb-ot-shape.cc \ hb-ot-shape.cc \
hb-ot-shape-complex-arabic.cc \ hb-ot-shape-complex-arabic.cc \
hb-ot-shape-complex-arabic-fallback.hh \ hb-ot-shape-complex-arabic-fallback.hh \
hb-ot-shape-complex-arabic-private.hh \ hb-ot-shape-complex-arabic.hh \
hb-ot-shape-complex-arabic-table.hh \ hb-ot-shape-complex-arabic-table.hh \
hb-ot-shape-complex-arabic-win1256.hh \ hb-ot-shape-complex-arabic-win1256.hh \
hb-ot-shape-complex-default.cc \ hb-ot-shape-complex-default.cc \
hb-ot-shape-complex-hangul.cc \ hb-ot-shape-complex-hangul.cc \
hb-ot-shape-complex-hebrew.cc \ hb-ot-shape-complex-hebrew.cc \
hb-ot-shape-complex-indic.cc \ hb-ot-shape-complex-indic.cc \
hb-ot-shape-complex-indic-private.hh \ hb-ot-shape-complex-indic.hh \
hb-ot-shape-complex-indic-table.cc \ hb-ot-shape-complex-indic-table.cc \
hb-ot-shape-complex-khmer-private.hh \ hb-ot-shape-complex-khmer.hh \
hb-ot-shape-complex-khmer.cc \ hb-ot-shape-complex-khmer.cc \
hb-ot-shape-complex-myanmar-private.hh \ hb-ot-shape-complex-myanmar.hh \
hb-ot-shape-complex-myanmar.cc \ hb-ot-shape-complex-myanmar.cc \
hb-ot-shape-complex-thai.cc \ hb-ot-shape-complex-thai.cc \
hb-ot-shape-complex-tibetan.cc \ hb-ot-shape-complex-tibetan.cc \
hb-ot-shape-complex-use.cc \ hb-ot-shape-complex-use.cc \
hb-ot-shape-complex-use-private.hh \ hb-ot-shape-complex-use.hh \
hb-ot-shape-complex-use-table.cc \ hb-ot-shape-complex-use-table.cc \
hb-ot-shape-complex-private.hh \ hb-ot-shape-complex.hh \
hb-ot-shape-normalize-private.hh \ hb-ot-shape-normalize.hh \
hb-ot-shape-normalize.cc \ hb-ot-shape-normalize.cc \
hb-ot-shape-fallback-private.hh \ hb-ot-shape-fallback.hh \
hb-ot-shape-fallback.cc \ hb-ot-shape-fallback.cc \
hb-ot-shape-private.hh \ hb-ot-shape.hh \
hb-ot-var.cc \ hb-ot-var.cc \
hb-ot-var-avar-table.hh \ hb-ot-var-avar-table.hh \
hb-ot-var-fvar-table.hh \ hb-ot-var-fvar-table.hh \
@ -214,9 +214,6 @@ HB_SUBSET_sources = \
HB_SUBSET_headers = \ HB_SUBSET_headers = \
hb-subset.h \ hb-subset.h \
hb-subset-glyf.hh \
hb-subset-plan.hh \
hb-subset-private.hh \
$(NULL) $(NULL)
HB_GOBJECT_DIST_sources = hb-gobject-structs.cc HB_GOBJECT_DIST_sources = hb-gobject-structs.cc

8
src/check-includes.sh
View File

@ -23,14 +23,14 @@ grep -v 'hb[.]h:' |
grep . >&2 && stat=1 grep . >&2 && stat=1
echo 'Checking that source files #include "hb-*private.hh" first (or none)' echo 'Checking that source files #include a private header first (or none)'
for x in $HBSOURCES; do for x in $HBSOURCES; do
test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x" test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x"
grep '#.*\<include\>' "$x" /dev/null | grep -v 'include _' | head -n 1 grep '#.*\<include\>' "$x" /dev/null | head -n 1
done | done |
grep -v '"hb-.*private[.]hh"' | grep -v '"hb-.*[.]hh"' |
grep -v 'hb-private[.]hh:' | grep -v 'hb[.]hh' |
grep . >&2 && stat=1 grep . >&2 && stat=1

2
src/dump-indic-data.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-shape-complex-indic-private.hh" #include "hb-ot-shape-complex-indic.hh"
int int
main (void) main (void)

2
src/dump-khmer-data.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-shape-complex-khmer-private.hh" #include "hb-ot-shape-complex-khmer.hh"
int int
main (void) main (void)

2
src/dump-myanmar-data.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-shape-complex-myanmar-private.hh" #include "hb-ot-shape-complex-myanmar.hh"
int int
main (void) main (void)

2
src/dump-use-data.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-shape-complex-use-private.hh" #include "hb-ot-shape-complex-use.hh"
int int
main (void) main (void)

2
src/gen-indic-table.py
View File

@ -102,7 +102,7 @@ for h in headers:
print (" * %s" % (l.strip())) print (" * %s" % (l.strip()))
print (" */") print (" */")
print () print ()
print ('#include "hb-ot-shape-complex-indic-private.hh"') print ('#include "hb-ot-shape-complex-indic.hh"')
print () print ()
# Shorten values # Shorten values

2
src/gen-use-table.py
View File

@ -394,7 +394,7 @@ for h in headers:
print (" * %s" % (l.strip())) print (" * %s" % (l.strip()))
print (" */") print (" */")
print () print ()
print ('#include "hb-ot-shape-complex-use-private.hh"') print ('#include "hb-ot-shape-complex-use.hh"')
print () print ()
total = 0 total = 0

2
src/hb-aat-layout-ankr-table.hh
View File

@ -25,7 +25,7 @@
#ifndef HB_AAT_LAYOUT_ANKR_TABLE_HH #ifndef HB_AAT_LAYOUT_ANKR_TABLE_HH
#define HB_AAT_LAYOUT_ANKR_TABLE_HH #define HB_AAT_LAYOUT_ANKR_TABLE_HH
#include "hb-aat-layout-common-private.hh" #include "hb-aat-layout-common.hh"
/* /*
* ankr -- Anchor Point * ankr -- Anchor Point

2
src/hb-aat-layout-bsln-table.hh
View File

@ -25,7 +25,7 @@
#ifndef HB_AAT_LAYOUT_BSLN_TABLE_HH #ifndef HB_AAT_LAYOUT_BSLN_TABLE_HH
#define HB_AAT_LAYOUT_BSLN_TABLE_HH #define HB_AAT_LAYOUT_BSLN_TABLE_HH
#include "hb-aat-layout-common-private.hh" #include "hb-aat-layout-common.hh"
/* /*
* bsln -- Baseline * bsln -- Baseline

8
src/hb-aat-layout-common-private.hh → src/hb-aat-layout-common.hh
View File

@ -24,10 +24,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_AAT_LAYOUT_COMMON_PRIVATE_HH #ifndef HB_AAT_LAYOUT_COMMON_HH
#define HB_AAT_LAYOUT_COMMON_PRIVATE_HH #define HB_AAT_LAYOUT_COMMON_HH
#include "hb-aat-layout-private.hh" #include "hb-aat-layout.hh"
namespace AAT { namespace AAT {
@ -641,4 +641,4 @@ struct hb_aat_apply_context_t :
} /* namespace AAT */ } /* namespace AAT */
#endif /* HB_AAT_LAYOUT_COMMON_PRIVATE_HH */ #endif /* HB_AAT_LAYOUT_COMMON_HH */

2
src/hb-aat-layout-feat-table.hh
View File

@ -25,7 +25,7 @@
#ifndef HB_AAT_LAYOUT_FEAT_TABLE_HH #ifndef HB_AAT_LAYOUT_FEAT_TABLE_HH
#define HB_AAT_LAYOUT_FEAT_TABLE_HH #define HB_AAT_LAYOUT_FEAT_TABLE_HH
#include "hb-aat-layout-common-private.hh" #include "hb-aat-layout-common.hh"
/* /*
* feat -- Feature Name * feat -- Feature Name

4
src/hb-aat-layout-kerx-table.hh
View File

@ -28,8 +28,8 @@
#ifndef HB_AAT_LAYOUT_KERX_TABLE_HH #ifndef HB_AAT_LAYOUT_KERX_TABLE_HH
#define HB_AAT_LAYOUT_KERX_TABLE_HH #define HB_AAT_LAYOUT_KERX_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-aat-layout-common-private.hh" #include "hb-aat-layout-common.hh"
#include "hb-aat-layout-ankr-table.hh" #include "hb-aat-layout-ankr-table.hh"
/* /*

6
src/hb-aat-layout-morx-table.hh
View File

@ -27,9 +27,9 @@
#ifndef HB_AAT_LAYOUT_MORX_TABLE_HH #ifndef HB_AAT_LAYOUT_MORX_TABLE_HH
#define HB_AAT_LAYOUT_MORX_TABLE_HH #define HB_AAT_LAYOUT_MORX_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-aat-layout-common-private.hh" #include "hb-aat-layout-common.hh"
#include "hb-ot-layout-common-private.hh" #include "hb-ot-layout-common.hh"
/* /*
* morx -- Extended Glyph Metamorphosis * morx -- Extended Glyph Metamorphosis

6
src/hb-aat-layout-trak-table.hh
View File

@ -28,9 +28,9 @@
#ifndef HB_AAT_LAYOUT_TRAK_TABLE_HH #ifndef HB_AAT_LAYOUT_TRAK_TABLE_HH
#define HB_AAT_LAYOUT_TRAK_TABLE_HH #define HB_AAT_LAYOUT_TRAK_TABLE_HH
#include "hb-aat-layout-common-private.hh" #include "hb-aat-layout-common.hh"
#include "hb-ot-layout-private.hh" #include "hb-ot-layout.hh"
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*
* trak -- Tracking * trak -- Tracking

8
src/hb-aat-layout.cc
View File

@ -24,12 +24,12 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-layout-private.hh" #include "hb-ot-layout.hh"
#include "hb-ot-layout-gsubgpos-private.hh" #include "hb-ot-layout-gsubgpos.hh"
#include "hb-aat-layout-private.hh" #include "hb-aat-layout.hh"
#include "hb-aat-layout-ankr-table.hh" #include "hb-aat-layout-ankr-table.hh"
#include "hb-aat-layout-bsln-table.hh" // Just so we compile it; unused otherwise. #include "hb-aat-layout-bsln-table.hh" // Just so we compile it; unused otherwise.
#include "hb-aat-layout-feat-table.hh" // Just so we compile it; unused otherwise. #include "hb-aat-layout-feat-table.hh" // Just so we compile it; unused otherwise.

14
src/hb-aat-layout-private.hh → src/hb-aat-layout.hh
View File

@ -24,14 +24,14 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_AAT_LAYOUT_PRIVATE_HH #ifndef HB_AAT_LAYOUT_HH
#define HB_AAT_LAYOUT_PRIVATE_HH #define HB_AAT_LAYOUT_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-font-private.hh" #include "hb-font.hh"
#include "hb-buffer-private.hh" #include "hb-buffer.hh"
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
HB_INTERNAL void HB_INTERNAL void
@ -40,4 +40,4 @@ hb_aat_layout_substitute (hb_font_t *font, hb_buffer_t *buffer);
HB_INTERNAL void HB_INTERNAL void
hb_aat_layout_position (hb_font_t *font, hb_buffer_t *buffer); hb_aat_layout_position (hb_font_t *font, hb_buffer_t *buffer);
#endif /* HB_AAT_LAYOUT_PRIVATE_HH */ #endif /* HB_AAT_LAYOUT_HH */

2
src/hb-aat-ltag-table.hh
View File

@ -25,7 +25,7 @@
#ifndef HB_AAT_LTAG_TABLE_HH #ifndef HB_AAT_LTAG_TABLE_HH
#define HB_AAT_LTAG_TABLE_HH #define HB_AAT_LTAG_TABLE_HH
#include "hb-aat-layout-common-private.hh" #include "hb-aat-layout-common.hh"
/* /*
* ltag -- Language Tag * ltag -- Language Tag

8
src/hb-atomic-private.hh → src/hb-atomic.hh
View File

@ -29,10 +29,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_ATOMIC_PRIVATE_HH #ifndef HB_ATOMIC_HH
#define HB_ATOMIC_PRIVATE_HH #define HB_ATOMIC_HH
#include "hb-private.hh" #include "hb.hh"
/* /*
@ -278,4 +278,4 @@ struct hb_atomic_ptr_t
}; };
#endif /* HB_ATOMIC_PRIVATE_HH */ #endif /* HB_ATOMIC_HH */

4
src/hb-blob.cc
View File

@ -30,8 +30,8 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#endif #endif
#include "hb-private.hh" #include "hb.hh"
#include "hb-blob-private.hh" #include "hb-blob.hh"
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H

8
src/hb-blob-private.hh → src/hb-blob.hh
View File

@ -26,10 +26,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_BLOB_PRIVATE_HH #ifndef HB_BLOB_HH
#define HB_BLOB_PRIVATE_HH #define HB_BLOB_HH
#include "hb-private.hh" #include "hb.hh"
/* /*
@ -83,4 +83,4 @@ struct hb_blob_t
DECLARE_NULL_INSTANCE (hb_blob_t); DECLARE_NULL_INSTANCE (hb_blob_t);
#endif /* HB_BLOB_PRIVATE_HH */ #endif /* HB_BLOB_HH */

2
src/hb-buffer-deserialize-json.hh
View File

@ -29,7 +29,7 @@
#ifndef HB_BUFFER_DESERIALIZE_JSON_HH #ifndef HB_BUFFER_DESERIALIZE_JSON_HH
#define HB_BUFFER_DESERIALIZE_JSON_HH #define HB_BUFFER_DESERIALIZE_JSON_HH
#include "hb-private.hh" #include "hb.hh"
#line 36 "hb-buffer-deserialize-json.hh" #line 36 "hb-buffer-deserialize-json.hh"

2
src/hb-buffer-deserialize-json.rl
View File

@ -27,7 +27,7 @@
#ifndef HB_BUFFER_DESERIALIZE_JSON_HH #ifndef HB_BUFFER_DESERIALIZE_JSON_HH
#define HB_BUFFER_DESERIALIZE_JSON_HH #define HB_BUFFER_DESERIALIZE_JSON_HH
#include "hb-private.hh" #include "hb.hh"
%%{ %%{

2
src/hb-buffer-deserialize-text.hh
View File

@ -29,7 +29,7 @@
#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH #ifndef HB_BUFFER_DESERIALIZE_TEXT_HH
#define HB_BUFFER_DESERIALIZE_TEXT_HH #define HB_BUFFER_DESERIALIZE_TEXT_HH
#include "hb-private.hh" #include "hb.hh"
#line 36 "hb-buffer-deserialize-text.hh" #line 36 "hb-buffer-deserialize-text.hh"

2
src/hb-buffer-deserialize-text.rl
View File

@ -27,7 +27,7 @@
#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH #ifndef HB_BUFFER_DESERIALIZE_TEXT_HH
#define HB_BUFFER_DESERIALIZE_TEXT_HH #define HB_BUFFER_DESERIALIZE_TEXT_HH
#include "hb-private.hh" #include "hb.hh"
%%{ %%{

2
src/hb-buffer-serialize.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-buffer-private.hh" #include "hb-buffer.hh"
static const char *serialize_formats[] = { static const char *serialize_formats[] = {

4
src/hb-buffer.cc
View File

@ -27,8 +27,8 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-buffer-private.hh" #include "hb-buffer.hh"
#include "hb-utf-private.hh" #include "hb-utf.hh"
/** /**

10
src/hb-buffer-private.hh → src/hb-buffer.hh
View File

@ -27,11 +27,11 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_BUFFER_PRIVATE_HH #ifndef HB_BUFFER_HH
#define HB_BUFFER_PRIVATE_HH #define HB_BUFFER_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-unicode-private.hh" #include "hb-unicode.hh"
#ifndef HB_BUFFER_MAX_LEN_FACTOR #ifndef HB_BUFFER_MAX_LEN_FACTOR
@ -386,4 +386,4 @@ _next_cluster (hb_buffer_t *buffer, unsigned int start)
#define HB_BUFFER_ASSERT_VAR(b, var) HB_BUFFER_XALLOCATE_VAR (b, assert_var, var ()) #define HB_BUFFER_ASSERT_VAR(b, var) HB_BUFFER_XALLOCATE_VAR (b, assert_var, var ())
#endif /* HB_BUFFER_PRIVATE_HH */ #endif /* HB_BUFFER_HH */

4
src/hb-common.cc
View File

@ -26,9 +26,9 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
#include "hb-machinery-private.hh" #include "hb-machinery.hh"
#include <locale.h> #include <locale.h>
#ifdef HAVE_XLOCALE_H #ifdef HAVE_XLOCALE_H

4
src/hb-coretext.cc
View File

@ -28,8 +28,8 @@
#define HB_SHAPER coretext #define HB_SHAPER coretext
#include "hb-private.hh" #include "hb.hh"
#include "hb-shaper-impl-private.hh" #include "hb-shaper-impl.hh"
#include "hb-coretext.h" #include "hb-coretext.h"
#include <math.h> #include <math.h>

4
src/hb-debug.hh
View File

@ -27,8 +27,8 @@
#ifndef HB_DEBUG_HH #ifndef HB_DEBUG_HH
#define HB_DEBUG_HH #define HB_DEBUG_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-atomic-private.hh" #include "hb-atomic.hh"
#include "hb-dsalgs.hh" #include "hb-dsalgs.hh"

4
src/hb-directwrite.cc
View File

@ -22,9 +22,9 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/ */
#include "hb-private.hh" #include "hb.hh"
#define HB_SHAPER directwrite #define HB_SHAPER directwrite
#include "hb-shaper-impl-private.hh" #include "hb-shaper-impl.hh"
#include <DWrite_1.h> #include <DWrite_1.h>

2
src/hb-dsalgs.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_DSALGS_HH #ifndef HB_DSALGS_HH
#define HB_DSALGS_HH #define HB_DSALGS_HH
#include "hb-private.hh" #include "hb.hh"
/* Void! For when we need a expression-type of void. */ /* Void! For when we need a expression-type of void. */

8
src/hb-face.cc
View File

@ -26,11 +26,11 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
#include "hb-face-private.hh" #include "hb-face.hh"
#include "hb-blob-private.hh" #include "hb-blob.hh"
#include "hb-open-file-private.hh" #include "hb-open-file.hh"
/** /**

12
src/hb-face-private.hh → src/hb-face.hh
View File

@ -26,13 +26,13 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_FACE_PRIVATE_HH #ifndef HB_FACE_HH
#define HB_FACE_PRIVATE_HH #define HB_FACE_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-shaper-private.hh" #include "hb-shaper.hh"
#include "hb-shape-plan-private.hh" #include "hb-shape-plan.hh"
/* /*
@ -105,4 +105,4 @@ DECLARE_NULL_INSTANCE (hb_face_t);
#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS #undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
#endif /* HB_FACE_PRIVATE_HH */ #endif /* HB_FACE_HH */

2
src/hb-fallback-shape.cc
View File

@ -25,7 +25,7 @@
*/ */
#define HB_SHAPER fallback #define HB_SHAPER fallback
#include "hb-shaper-impl-private.hh" #include "hb-shaper-impl.hh"
HB_SHAPER_DATA_ENSURE_DEFINE(fallback, face) HB_SHAPER_DATA_ENSURE_DEFINE(fallback, face)

6
src/hb-font.cc
View File

@ -26,10 +26,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
#include "hb-font-private.hh" #include "hb-font.hh"
#include "hb-machinery-private.hh" #include "hb-machinery.hh"
/* /*

12
src/hb-font-private.hh → src/hb-font.hh
View File

@ -26,13 +26,13 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_FONT_PRIVATE_HH #ifndef HB_FONT_HH
#define HB_FONT_PRIVATE_HH #define HB_FONT_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-face-private.hh" #include "hb-face.hh"
#include "hb-shaper-private.hh" #include "hb-shaper.hh"
/* /*
@ -601,4 +601,4 @@ DECLARE_NULL_INSTANCE (hb_font_t);
#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS #undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
#endif /* HB_FONT_PRIVATE_HH */ #endif /* HB_FONT_HH */

6
src/hb-ft.cc
View File

@ -27,12 +27,12 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
#include "hb-ft.h" #include "hb-ft.h"
#include "hb-font-private.hh" #include "hb-font.hh"
#include "hb-machinery-private.hh" #include "hb-machinery.hh"
#include FT_ADVANCES_H #include FT_ADVANCES_H
#include FT_MULTIPLE_MASTERS_H #include FT_MULTIPLE_MASTERS_H

6
src/hb-glib.cc
View File

@ -26,12 +26,12 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
#include "hb-glib.h" #include "hb-glib.h"
#include "hb-unicode-private.hh" #include "hb-unicode.hh"
#include "hb-machinery-private.hh" #include "hb-machinery.hh"
#if !GLIB_CHECK_VERSION(2,29,14) #if !GLIB_CHECK_VERSION(2,29,14)

2
src/hb-gobject-enums.cc.tmpl
View File

@ -25,7 +25,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
/* g++ didn't like older gtype.h gcc-only code path. */ /* g++ didn't like older gtype.h gcc-only code path. */
#include <glib.h> #include <glib.h>

2
src/hb-gobject-structs.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
/* g++ didn't like older gtype.h gcc-only code path. */ /* g++ didn't like older gtype.h gcc-only code path. */
#include <glib.h> #include <glib.h>

2
src/hb-graphite2.cc
View File

@ -27,7 +27,7 @@
*/ */
#define HB_SHAPER graphite2 #define HB_SHAPER graphite2
#include "hb-shaper-impl-private.hh" #include "hb-shaper-impl.hh"
#include "hb-graphite2.h" #include "hb-graphite2.h"

6
src/hb-icu.cc
View File

@ -27,12 +27,12 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
#include "hb-icu.h" #include "hb-icu.h"
#include "hb-unicode-private.hh" #include "hb-unicode.hh"
#include "hb-machinery-private.hh" #include "hb-machinery.hh"
#include <unicode/uchar.h> #include <unicode/uchar.h>
#include <unicode/unorm2.h> #include <unicode/unorm2.h>

8
src/hb-iter-private.hh → src/hb-iter.hh
View File

@ -24,10 +24,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_ITER_PRIVATE_HH #ifndef HB_ITER_HH
#define HB_ITER_PRIVATE_HH #define HB_ITER_HH
#include "hb-private.hh" #include "hb.hh"
/* Unified iterator object. /* Unified iterator object.
@ -146,4 +146,4 @@ m (void)
} }
} }
#endif /* HB_ITER_PRIVATE_HH */ #endif /* HB_ITER_HH */

12
src/hb-machinery-private.hh → src/hb-machinery.hh
View File

@ -26,13 +26,13 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_MACHINERY_PRIVATE_HH #ifndef HB_MACHINERY_HH
#define HB_MACHINERY_PRIVATE_HH #define HB_MACHINERY_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-blob-private.hh" #include "hb-blob.hh"
#include "hb-iter-private.hh" #include "hb-iter.hh"
/* /*
@ -870,4 +870,4 @@ struct hb_unicode_funcs_lazy_loader_t : hb_lazy_loader_t<hb_unicode_funcs_t, Sub
}; };
#endif /* HB_MACHINERY_PRIVATE_HH */ #endif /* HB_MACHINERY_HH */

2
src/hb-map.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-map-private.hh" #include "hb-map.hh"
/* Public API */ /* Public API */

8
src/hb-map-private.hh → src/hb-map.hh
View File

@ -24,10 +24,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_MAP_PRIVATE_HH #ifndef HB_MAP_HH
#define HB_MAP_PRIVATE_HH #define HB_MAP_HH
#include "hb-private.hh" #include "hb.hh"
template <typename T> template <typename T>
@ -251,4 +251,4 @@ struct hb_map_t
}; };
#endif /* HB_MAP_PRIVATE_HH */ #endif /* HB_MAP_HH */

8
src/hb-mutex-private.hh → src/hb-mutex.hh
View File

@ -29,10 +29,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_MUTEX_PRIVATE_HH #ifndef HB_MUTEX_HH
#define HB_MUTEX_PRIVATE_HH #define HB_MUTEX_HH
#include "hb-private.hh" #include "hb.hh"
/* mutex */ /* mutex */
@ -138,4 +138,4 @@ struct hb_mutex_t
}; };
#endif /* HB_MUTEX_PRIVATE_HH */ #endif /* HB_MUTEX_HH */

2
src/hb-null.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_NULL_HH #ifndef HB_NULL_HH
#define HB_NULL_HH #define HB_NULL_HH
#include "hb-private.hh" #include "hb.hh"
/* /*

14
src/hb-object-private.hh → src/hb-object.hh
View File

@ -29,13 +29,13 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OBJECT_PRIVATE_HH #ifndef HB_OBJECT_HH
#define HB_OBJECT_PRIVATE_HH #define HB_OBJECT_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-atomic-private.hh" #include "hb-atomic.hh"
#include "hb-mutex-private.hh" #include "hb-mutex.hh"
#include "hb-vector-private.hh" #include "hb-vector.hh"
/* /*
@ -322,4 +322,4 @@ static inline void *hb_object_get_user_data (Type *obj,
} }
#endif /* HB_OBJECT_PRIVATE_HH */ #endif /* HB_OBJECT_HH */

8
src/hb-open-file-private.hh → src/hb-open-file.hh
View File

@ -26,10 +26,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OPEN_FILE_PRIVATE_HH #ifndef HB_OPEN_FILE_HH
#define HB_OPEN_FILE_PRIVATE_HH #define HB_OPEN_FILE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-head-table.hh" #include "hb-ot-head-table.hh"
@ -565,4 +565,4 @@ struct OpenTypeFontFile
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OPEN_FILE_PRIVATE_HH */ #endif /* HB_OPEN_FILE_HH */

14
src/hb-open-type-private.hh → src/hb-open-type.hh
View File

@ -26,13 +26,13 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OPEN_TYPE_PRIVATE_HH #ifndef HB_OPEN_TYPE_HH
#define HB_OPEN_TYPE_PRIVATE_HH #define HB_OPEN_TYPE_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-blob-private.hh" #include "hb-blob.hh"
#include "hb-face-private.hh" #include "hb-face.hh"
#include "hb-machinery-private.hh" #include "hb-machinery.hh"
namespace OT { namespace OT {
@ -646,4 +646,4 @@ struct BinSearchArrayOf : SortedArrayOf<Type, BinSearchHeader> {};
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OPEN_TYPE_PRIVATE_HH */ #endif /* HB_OPEN_TYPE_HH */

4
src/hb-ot-cmap-table.hh
View File

@ -27,8 +27,8 @@
#ifndef HB_OT_CMAP_TABLE_HH #ifndef HB_OT_CMAP_TABLE_HH
#define HB_OT_CMAP_TABLE_HH #define HB_OT_CMAP_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-set-private.hh" #include "hb-set.hh"
#include "hb-subset-plan.hh" #include "hb-subset-plan.hh"
/* /*

2
src/hb-ot-color-cbdt-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_COLOR_CBDT_TABLE_HH #ifndef HB_OT_COLOR_CBDT_TABLE_HH
#define HB_OT_COLOR_CBDT_TABLE_HH #define HB_OT_COLOR_CBDT_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*
* CBLC -- Color Bitmap Location * CBLC -- Color Bitmap Location

2
src/hb-ot-color-colr-table.hh
View File

@ -25,7 +25,7 @@
#ifndef HB_OT_COLOR_COLR_TABLE_HH #ifndef HB_OT_COLOR_COLR_TABLE_HH
#define HB_OT_COLOR_COLR_TABLE_HH #define HB_OT_COLOR_COLR_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*
* COLR -- Color * COLR -- Color

2
src/hb-ot-color-cpal-table.hh
View File

@ -28,7 +28,7 @@
#ifndef HB_OT_COLOR_CPAL_TABLE_HH #ifndef HB_OT_COLOR_CPAL_TABLE_HH
#define HB_OT_COLOR_CPAL_TABLE_HH #define HB_OT_COLOR_CPAL_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*

2
src/hb-ot-color-sbix-table.hh
View File

@ -25,7 +25,7 @@
#ifndef HB_OT_COLOR_SBIX_TABLE_HH #ifndef HB_OT_COLOR_SBIX_TABLE_HH
#define HB_OT_COLOR_SBIX_TABLE_HH #define HB_OT_COLOR_SBIX_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*
* sbix -- Standard Bitmap Graphics * sbix -- Standard Bitmap Graphics

2
src/hb-ot-color-svg-table.hh
View File

@ -25,7 +25,7 @@
#ifndef HB_OT_COLOR_SVG_TABLE_HH #ifndef HB_OT_COLOR_SVG_TABLE_HH
#define HB_OT_COLOR_SVG_TABLE_HH #define HB_OT_COLOR_SVG_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*
* SVG -- SVG (Scalable Vector Graphics) * SVG -- SVG (Scalable Vector Graphics)

6
src/hb-ot-color.cc
View File

@ -25,7 +25,7 @@
* Google Author(s): Sascha Brawer * Google Author(s): Sascha Brawer
*/ */
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-color-colr-table.hh" #include "hb-ot-color-colr-table.hh"
#include "hb-ot-color-cpal-table.hh" #include "hb-ot-color-cpal-table.hh"
#include "hb-ot.h" #include "hb-ot.h"
@ -33,8 +33,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "hb-ot-layout-private.hh" #include "hb-ot-layout.hh"
#include "hb-shaper-private.hh" #include "hb-shaper.hh"
#if 0 #if 0
HB_MARK_AS_FLAG_T (hb_ot_color_palette_flags_t) HB_MARK_AS_FLAG_T (hb_ot_color_palette_flags_t)

6
src/hb-ot-font.cc
View File

@ -24,12 +24,12 @@
* Google Author(s): Behdad Esfahbod, Roozbeh Pournader * Google Author(s): Behdad Esfahbod, Roozbeh Pournader
*/ */
#include "hb-private.hh" #include "hb.hh"
#include "hb-ot.h" #include "hb-ot.h"
#include "hb-font-private.hh" #include "hb-font.hh"
#include "hb-machinery-private.hh" #include "hb-machinery.hh"
#include "hb-ot-cmap-table.hh" #include "hb-ot-cmap-table.hh"
#include "hb-ot-glyf-table.hh" #include "hb-ot-glyf-table.hh"

4
src/hb-ot-glyf-table.hh
View File

@ -27,11 +27,11 @@
#ifndef HB_OT_GLYF_TABLE_HH #ifndef HB_OT_GLYF_TABLE_HH
#define HB_OT_GLYF_TABLE_HH #define HB_OT_GLYF_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-head-table.hh" #include "hb-ot-head-table.hh"
#include "hb-subset-glyf.hh" #include "hb-subset-glyf.hh"
#include "hb-subset-plan.hh" #include "hb-subset-plan.hh"
#include "hb-subset-private.hh" #include "hb-subset.hh"
namespace OT { namespace OT {

2
src/hb-ot-hdmx-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_HDMX_TABLE_HH #ifndef HB_OT_HDMX_TABLE_HH
#define HB_OT_HDMX_TABLE_HH #define HB_OT_HDMX_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-subset-plan.hh" #include "hb-subset-plan.hh"
/* /*

2
src/hb-ot-head-table.hh
View File

@ -29,7 +29,7 @@
#ifndef HB_OT_HEAD_TABLE_HH #ifndef HB_OT_HEAD_TABLE_HH
#define HB_OT_HEAD_TABLE_HH #define HB_OT_HEAD_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*
* head -- Font Header * head -- Font Header

2
src/hb-ot-hhea-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_HHEA_TABLE_HH #ifndef HB_OT_HHEA_TABLE_HH
#define HB_OT_HHEA_TABLE_HH #define HB_OT_HHEA_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*
* hhea -- Horizontal Header * hhea -- Horizontal Header

2
src/hb-ot-hmtx-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_HMTX_TABLE_HH #ifndef HB_OT_HMTX_TABLE_HH
#define HB_OT_HMTX_TABLE_HH #define HB_OT_HMTX_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-hhea-table.hh" #include "hb-ot-hhea-table.hh"
#include "hb-ot-os2-table.hh" #include "hb-ot-os2-table.hh"
#include "hb-ot-var-hvar-table.hh" #include "hb-ot-var-hvar-table.hh"

2
src/hb-ot-kern-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_KERN_TABLE_HH #ifndef HB_OT_KERN_TABLE_HH
#define HB_OT_KERN_TABLE_HH #define HB_OT_KERN_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* /*
* kern -- Kerning * kern -- Kerning

4
src/hb-ot-layout-base-table.hh
View File

@ -28,8 +28,8 @@
#ifndef HB_OT_LAYOUT_BASE_TABLE_HH #ifndef HB_OT_LAYOUT_BASE_TABLE_HH
#define HB_OT_LAYOUT_BASE_TABLE_HH #define HB_OT_LAYOUT_BASE_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-layout-common-private.hh" #include "hb-ot-layout-common.hh"
namespace OT { namespace OT {

14
src/hb-ot-layout-common-private.hh → src/hb-ot-layout-common.hh
View File

@ -26,13 +26,13 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OT_LAYOUT_COMMON_PRIVATE_HH #ifndef HB_OT_LAYOUT_COMMON_HH
#define HB_OT_LAYOUT_COMMON_PRIVATE_HH #define HB_OT_LAYOUT_COMMON_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-ot-layout-private.hh" #include "hb-ot-layout.hh"
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-set-private.hh" #include "hb-set.hh"
#ifndef HB_MAX_NESTING_LEVEL #ifndef HB_MAX_NESTING_LEVEL
@ -1822,4 +1822,4 @@ struct Device
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_LAYOUT_COMMON_PRIVATE_HH */ #endif /* HB_OT_LAYOUT_COMMON_HH */

4
src/hb-ot-layout-gdef-table.hh
View File

@ -29,9 +29,9 @@
#ifndef HB_OT_LAYOUT_GDEF_TABLE_HH #ifndef HB_OT_LAYOUT_GDEF_TABLE_HH
#define HB_OT_LAYOUT_GDEF_TABLE_HH #define HB_OT_LAYOUT_GDEF_TABLE_HH
#include "hb-ot-layout-common-private.hh" #include "hb-ot-layout-common.hh"
#include "hb-font-private.hh" #include "hb-font.hh"
namespace OT { namespace OT {

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

@ -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 "hb-ot-layout-gsubgpos-private.hh" #include "hb-ot-layout-gsubgpos.hh"
namespace OT { namespace OT {

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

@ -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 "hb-ot-layout-gsubgpos-private.hh" #include "hb-ot-layout-gsubgpos.hh"
namespace OT { namespace OT {

14
src/hb-ot-layout-gsubgpos-private.hh → src/hb-ot-layout-gsubgpos.hh
View File

@ -26,14 +26,14 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH #ifndef HB_OT_LAYOUT_GSUBGPOS_HH
#define HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH #define HB_OT_LAYOUT_GSUBGPOS_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-buffer-private.hh" #include "hb-buffer.hh"
#include "hb-map-private.hh" #include "hb-map.hh"
#include "hb-ot-layout-gdef-table.hh" #include "hb-ot-layout-gdef-table.hh"
#include "hb-set-private.hh" #include "hb-set.hh"
namespace OT { namespace OT {
@ -2403,4 +2403,4 @@ struct GSUBGPOS
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH */ #endif /* HB_OT_LAYOUT_GSUBGPOS_HH */

2
src/hb-ot-layout-jstf-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_LAYOUT_JSTF_TABLE_HH #ifndef HB_OT_LAYOUT_JSTF_TABLE_HH
#define HB_OT_LAYOUT_JSTF_TABLE_HH #define HB_OT_LAYOUT_JSTF_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-layout-gpos-table.hh" #include "hb-ot-layout-gpos-table.hh"

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

@ -28,10 +28,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-layout-private.hh" #include "hb-ot-layout.hh"
#include "hb-ot-map-private.hh" #include "hb-ot-map.hh"
#include "hb-map-private.hh" #include "hb-map.hh"
#include "hb-ot-layout-gdef-table.hh" #include "hb-ot-layout-gdef-table.hh"
#include "hb-ot-layout-gsub-table.hh" #include "hb-ot-layout-gsub-table.hh"

16
src/hb-ot-layout-private.hh → src/hb-ot-layout.hh
View File

@ -26,15 +26,15 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OT_LAYOUT_PRIVATE_HH #ifndef HB_OT_LAYOUT_HH
#define HB_OT_LAYOUT_PRIVATE_HH #define HB_OT_LAYOUT_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-font-private.hh" #include "hb-font.hh"
#include "hb-buffer-private.hh" #include "hb-buffer.hh"
#include "hb-set-digest-private.hh" #include "hb-set-digest.hh"
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
/* Private API corresponding to hb-ot-layout.h: */ /* Private API corresponding to hb-ot-layout.h: */
@ -701,4 +701,4 @@ _hb_buffer_assert_gsubgpos_vars (hb_buffer_t *buffer)
#undef lig_props #undef lig_props
#undef glyph_props #undef glyph_props
#endif /* HB_OT_LAYOUT_PRIVATE_HH */ #endif /* HB_OT_LAYOUT_HH */

4
src/hb-ot-map.cc
View File

@ -26,9 +26,9 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-map-private.hh" #include "hb-ot-map.hh"
#include "hb-ot-layout-private.hh" #include "hb-ot-layout.hh"
void hb_ot_map_t::collect_lookups (unsigned int table_index, hb_set_t *lookups_out) const void hb_ot_map_t::collect_lookups (unsigned int table_index, hb_set_t *lookups_out) const

8
src/hb-ot-map-private.hh → src/hb-ot-map.hh
View File

@ -26,10 +26,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OT_MAP_PRIVATE_HH #ifndef HB_OT_MAP_HH
#define HB_OT_MAP_PRIVATE_HH #define HB_OT_MAP_HH
#include "hb-buffer-private.hh" #include "hb-buffer.hh"
struct hb_ot_shape_plan_t; struct hb_ot_shape_plan_t;
@ -250,4 +250,4 @@ struct hb_ot_map_builder_t
#endif /* HB_OT_MAP_PRIVATE_HH */ #endif /* HB_OT_MAP_HH */

4
src/hb-ot-math-table.hh
View File

@ -27,8 +27,8 @@
#ifndef HB_OT_MATH_TABLE_HH #ifndef HB_OT_MATH_TABLE_HH
#define HB_OT_MATH_TABLE_HH #define HB_OT_MATH_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-layout-common-private.hh" #include "hb-ot-layout-common.hh"
#include "hb-ot-math.h" #include "hb-ot-math.h"
namespace OT { namespace OT {

4
src/hb-ot-math.cc
View File

@ -24,9 +24,9 @@
* Igalia Author(s): Frédéric Wang * Igalia Author(s): Frédéric Wang
*/ */
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-layout-private.hh" #include "hb-ot-layout.hh"
#include "hb-ot-math-table.hh" #include "hb-ot-math-table.hh"
static inline const OT::MATH& static inline const OT::MATH&

2
src/hb-ot-maxp-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_MAXP_TABLE_HH #ifndef HB_OT_MAXP_TABLE_HH
#define HB_OT_MAXP_TABLE_HH #define HB_OT_MAXP_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-subset-plan.hh" #include "hb-subset-plan.hh"
namespace OT { namespace OT {

2
src/hb-ot-name-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_NAME_TABLE_HH #ifndef HB_OT_NAME_TABLE_HH
#define HB_OT_NAME_TABLE_HH #define HB_OT_NAME_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
namespace OT { namespace OT {

2
src/hb-ot-os2-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_OS2_TABLE_HH #ifndef HB_OT_OS2_TABLE_HH
#define HB_OT_OS2_TABLE_HH #define HB_OT_OS2_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-ot-os2-unicode-ranges.hh" #include "hb-ot-os2-unicode-ranges.hh"
#include "hb-subset-plan.hh" #include "hb-subset-plan.hh"

2
src/hb-ot-os2-unicode-ranges.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_OS2_UNICODE_RANGES_HH #ifndef HB_OT_OS2_UNICODE_RANGES_HH
#define HB_OT_OS2_UNICODE_RANGES_HH #define HB_OT_OS2_UNICODE_RANGES_HH
#include "hb-private.hh" #include "hb.hh"
namespace OT { namespace OT {

2
src/hb-ot-post-macroman.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_POST_MACROMAN_HH #ifndef HB_OT_POST_MACROMAN_HH
#if 0 /* Make checks happy. */ #if 0 /* Make checks happy. */
#define HB_OT_POST_MACROMAN_HH #define HB_OT_POST_MACROMAN_HH
#include "hb-private.hh" #include "hb.hh"
#endif #endif

2
src/hb-ot-post-table.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_POST_TABLE_HH #ifndef HB_OT_POST_TABLE_HH
#define HB_OT_POST_TABLE_HH #define HB_OT_POST_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type.hh"
#include "hb-subset-plan.hh" #include "hb-subset-plan.hh"
#define HB_STRING_ARRAY_NAME format1_names #define HB_STRING_ARRAY_NAME format1_names

4
src/hb-ot-shape-complex-arabic-fallback.hh
View File

@ -27,9 +27,9 @@
#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_FALLBACK_HH #ifndef HB_OT_SHAPE_COMPLEX_ARABIC_FALLBACK_HH
#define HB_OT_SHAPE_COMPLEX_ARABIC_FALLBACK_HH #define HB_OT_SHAPE_COMPLEX_ARABIC_FALLBACK_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-ot-shape-private.hh" #include "hb-ot-shape.hh"
#include "hb-ot-layout-gsub-table.hh" #include "hb-ot-layout-gsub-table.hh"

2
src/hb-ot-shape-complex-arabic-win1256.hh
View File

@ -313,7 +313,7 @@ OT_TABLE_END
* Include a second time to get the table data... * Include a second time to get the table data...
*/ */
#if 0 #if 0
#include "hb-private.hh" /* Make check-includes.sh happy. */ #include "hb.hh" /* Make check-includes.sh happy. */
#endif #endif
#ifdef OT_MEASURE #ifdef OT_MEASURE
#include "hb-ot-shape-complex-arabic-win1256.hh" #include "hb-ot-shape-complex-arabic-win1256.hh"

6
src/hb-ot-shape-complex-arabic.cc
View File

@ -24,9 +24,9 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-private.hh" #include "hb.hh"
#include "hb-ot-shape-complex-arabic-private.hh" #include "hb-ot-shape-complex-arabic.hh"
#include "hb-ot-shape-private.hh" #include "hb-ot-shape.hh"
/* buffer var allocations */ /* buffer var allocations */

10
src/hb-ot-shape-complex-arabic-private.hh → src/hb-ot-shape-complex-arabic.hh
View File

@ -26,12 +26,12 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_PRIVATE_HH #ifndef HB_OT_SHAPE_COMPLEX_ARABIC_HH
#define HB_OT_SHAPE_COMPLEX_ARABIC_PRIVATE_HH #define HB_OT_SHAPE_COMPLEX_ARABIC_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-ot-shape-complex-private.hh" #include "hb-ot-shape-complex.hh"
struct arabic_shape_plan_t; struct arabic_shape_plan_t;
@ -47,4 +47,4 @@ setup_masks_arabic_plan (const arabic_shape_plan_t *arabic_plan,
hb_buffer_t *buffer, hb_buffer_t *buffer,
hb_script_t script); hb_script_t script);
#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_PRIVATE_HH */ #endif /* HB_OT_SHAPE_COMPLEX_ARABIC_HH */

2
src/hb-ot-shape-complex-default.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-shape-complex-private.hh" #include "hb-ot-shape-complex.hh"
const hb_ot_complex_shaper_t _hb_ot_complex_shaper_default = const hb_ot_complex_shaper_t _hb_ot_complex_shaper_default =

2
src/hb-ot-shape-complex-hangul.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-shape-complex-private.hh" #include "hb-ot-shape-complex.hh"
/* Hangul shaper */ /* Hangul shaper */

2
src/hb-ot-shape-complex-hebrew.cc
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-shape-complex-private.hh" #include "hb-ot-shape-complex.hh"
static bool static bool

2
src/hb-ot-shape-complex-indic-machine.hh
View File

@ -29,7 +29,7 @@
#ifndef HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH #ifndef HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH
#define HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH #define HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH
#include "hb-private.hh" #include "hb.hh"
#line 36 "hb-ot-shape-complex-indic-machine.hh" #line 36 "hb-ot-shape-complex-indic-machine.hh"

2
src/hb-ot-shape-complex-indic-machine.rl
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH #ifndef HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH
#define HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH #define HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH
#include "hb-private.hh" #include "hb.hh"
%%{ %%{
machine indic_syllable_machine; machine indic_syllable_machine;

2
src/hb-ot-shape-complex-indic-table.cc
View File

@ -14,7 +14,7 @@
* # Date: 2017-10-16, 24:39:00 GMT [KW] * # Date: 2017-10-16, 24:39:00 GMT [KW]
*/ */
#include "hb-ot-shape-complex-indic-private.hh" #include "hb-ot-shape-complex-indic.hh"
#define ISC_A INDIC_SYLLABIC_CATEGORY_AVAGRAHA /* 16 chars; Avagraha */ #define ISC_A INDIC_SYLLABIC_CATEGORY_AVAGRAHA /* 16 chars; Avagraha */

4
src/hb-ot-shape-complex-indic.cc
View File

@ -24,8 +24,8 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb-ot-shape-complex-indic-private.hh" #include "hb-ot-shape-complex-indic.hh"
#include "hb-ot-layout-private.hh" #include "hb-ot-layout.hh"
/* /*

12
src/hb-ot-shape-complex-indic-private.hh → src/hb-ot-shape-complex-indic.hh
View File

@ -24,14 +24,14 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH #ifndef HB_OT_SHAPE_COMPLEX_INDIC_HH
#define HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH #define HB_OT_SHAPE_COMPLEX_INDIC_HH
#include "hb-private.hh" #include "hb.hh"
#include "hb-ot-shape-complex-private.hh" #include "hb-ot-shape-complex.hh"
#include "hb-ot-shape-private.hh" /* XXX Remove */ #include "hb-ot-shape.hh" /* XXX Remove */
/* buffer var allocations */ /* buffer var allocations */
@ -400,4 +400,4 @@ set_indic_properties (hb_glyph_info_t &info)
} }
#endif /* HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH */ #endif /* HB_OT_SHAPE_COMPLEX_INDIC_HH */

2
src/hb-ot-shape-complex-khmer-machine.hh
View File

@ -29,7 +29,7 @@
#ifndef HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH #ifndef HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH
#define HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH #define HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH
#include "hb-private.hh" #include "hb.hh"
#line 36 "hb-ot-shape-complex-khmer-machine.hh" #line 36 "hb-ot-shape-complex-khmer-machine.hh"

2
src/hb-ot-shape-complex-khmer-machine.rl
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH #ifndef HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH
#define HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH #define HB_OT_SHAPE_COMPLEX_KHMER_MACHINE_HH
#include "hb-private.hh" #include "hb.hh"
%%{ %%{
machine khmer_syllable_machine; machine khmer_syllable_machine;

Some files were not shown because too many files have changed in this diff Show More