From c77ae40852aabb1698da9e8d488f75bae2f4e734 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 25 Aug 2018 22:36:36 -0700 Subject: [PATCH] Rename hb-*private.hh to hb-*.hh Sorry for the noise, downstream custom builders. Please adjust. --- src/Makefile.sources | 75 +++++++++---------- src/check-includes.sh | 8 +- src/dump-indic-data.cc | 2 +- src/dump-khmer-data.cc | 2 +- src/dump-myanmar-data.cc | 2 +- src/dump-use-data.cc | 2 +- src/gen-indic-table.py | 2 +- src/gen-use-table.py | 2 +- src/hb-aat-layout-ankr-table.hh | 2 +- src/hb-aat-layout-bsln-table.hh | 2 +- ...mon-private.hh => hb-aat-layout-common.hh} | 8 +- src/hb-aat-layout-feat-table.hh | 2 +- src/hb-aat-layout-kerx-table.hh | 4 +- src/hb-aat-layout-morx-table.hh | 6 +- src/hb-aat-layout-trak-table.hh | 6 +- src/hb-aat-layout.cc | 8 +- ...aat-layout-private.hh => hb-aat-layout.hh} | 14 ++-- src/hb-aat-ltag-table.hh | 2 +- src/{hb-atomic-private.hh => hb-atomic.hh} | 8 +- src/hb-blob.cc | 4 +- src/{hb-blob-private.hh => hb-blob.hh} | 8 +- src/hb-buffer-deserialize-json.hh | 2 +- src/hb-buffer-deserialize-json.rl | 2 +- src/hb-buffer-deserialize-text.hh | 2 +- src/hb-buffer-deserialize-text.rl | 2 +- src/hb-buffer-serialize.cc | 2 +- src/hb-buffer.cc | 4 +- src/{hb-buffer-private.hh => hb-buffer.hh} | 10 +-- src/hb-common.cc | 4 +- src/hb-coretext.cc | 4 +- src/hb-debug.hh | 4 +- src/hb-directwrite.cc | 4 +- src/hb-dsalgs.hh | 2 +- src/hb-face.cc | 8 +- src/{hb-face-private.hh => hb-face.hh} | 12 +-- src/hb-fallback-shape.cc | 2 +- src/hb-font.cc | 6 +- src/{hb-font-private.hh => hb-font.hh} | 12 +-- src/hb-ft.cc | 6 +- src/hb-glib.cc | 6 +- src/hb-gobject-enums.cc.tmpl | 2 +- src/hb-gobject-structs.cc | 2 +- src/hb-graphite2.cc | 2 +- src/hb-icu.cc | 6 +- src/{hb-iter-private.hh => hb-iter.hh} | 8 +- ...b-machinery-private.hh => hb-machinery.hh} | 12 +-- src/hb-map.cc | 2 +- src/{hb-map-private.hh => hb-map.hh} | 8 +- src/{hb-mutex-private.hh => hb-mutex.hh} | 8 +- src/hb-null.hh | 2 +- src/{hb-object-private.hh => hb-object.hh} | 14 ++-- ...b-open-file-private.hh => hb-open-file.hh} | 8 +- ...b-open-type-private.hh => hb-open-type.hh} | 14 ++-- src/hb-ot-cmap-table.hh | 4 +- src/hb-ot-color-cbdt-table.hh | 2 +- src/hb-ot-color-colr-table.hh | 2 +- src/hb-ot-color-cpal-table.hh | 2 +- src/hb-ot-color-sbix-table.hh | 2 +- src/hb-ot-color-svg-table.hh | 2 +- src/hb-ot-color.cc | 6 +- src/hb-ot-font.cc | 6 +- src/hb-ot-glyf-table.hh | 4 +- src/hb-ot-hdmx-table.hh | 2 +- src/hb-ot-head-table.hh | 2 +- src/hb-ot-hhea-table.hh | 2 +- src/hb-ot-hmtx-table.hh | 2 +- src/hb-ot-kern-table.hh | 2 +- src/hb-ot-layout-base-table.hh | 4 +- ...mmon-private.hh => hb-ot-layout-common.hh} | 14 ++-- src/hb-ot-layout-gdef-table.hh | 4 +- src/hb-ot-layout-gpos-table.hh | 2 +- src/hb-ot-layout-gsub-table.hh | 2 +- ...os-private.hh => hb-ot-layout-gsubgpos.hh} | 14 ++-- src/hb-ot-layout-jstf-table.hh | 2 +- src/hb-ot-layout.cc | 8 +- ...b-ot-layout-private.hh => hb-ot-layout.hh} | 16 ++-- src/hb-ot-map.cc | 4 +- src/{hb-ot-map-private.hh => hb-ot-map.hh} | 8 +- src/hb-ot-math-table.hh | 4 +- src/hb-ot-math.cc | 4 +- src/hb-ot-maxp-table.hh | 2 +- src/hb-ot-name-table.hh | 2 +- src/hb-ot-os2-table.hh | 2 +- src/hb-ot-os2-unicode-ranges.hh | 2 +- src/hb-ot-post-macroman.hh | 2 +- src/hb-ot-post-table.hh | 2 +- src/hb-ot-shape-complex-arabic-fallback.hh | 4 +- src/hb-ot-shape-complex-arabic-win1256.hh | 2 +- src/hb-ot-shape-complex-arabic.cc | 6 +- ...ivate.hh => hb-ot-shape-complex-arabic.hh} | 10 +-- src/hb-ot-shape-complex-default.cc | 2 +- src/hb-ot-shape-complex-hangul.cc | 2 +- src/hb-ot-shape-complex-hebrew.cc | 2 +- src/hb-ot-shape-complex-indic-machine.hh | 2 +- src/hb-ot-shape-complex-indic-machine.rl | 2 +- src/hb-ot-shape-complex-indic-table.cc | 2 +- src/hb-ot-shape-complex-indic.cc | 4 +- ...rivate.hh => hb-ot-shape-complex-indic.hh} | 12 +-- src/hb-ot-shape-complex-khmer-machine.hh | 2 +- src/hb-ot-shape-complex-khmer-machine.rl | 2 +- src/hb-ot-shape-complex-khmer.cc | 4 +- ...rivate.hh => hb-ot-shape-complex-khmer.hh} | 10 +-- src/hb-ot-shape-complex-myanmar-machine.hh | 2 +- src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- src/hb-ot-shape-complex-myanmar.cc | 2 +- ...vate.hh => hb-ot-shape-complex-myanmar.hh} | 10 +-- src/hb-ot-shape-complex-thai.cc | 2 +- src/hb-ot-shape-complex-tibetan.cc | 2 +- src/hb-ot-shape-complex-use-machine.hh | 2 +- src/hb-ot-shape-complex-use-machine.rl | 2 +- src/hb-ot-shape-complex-use-table.cc | 2 +- src/hb-ot-shape-complex-use.cc | 4 +- ...-private.hh => hb-ot-shape-complex-use.hh} | 10 +-- ...plex-private.hh => hb-ot-shape-complex.hh} | 12 +-- src/hb-ot-shape-fallback.cc | 4 +- ...ack-private.hh => hb-ot-shape-fallback.hh} | 10 +-- src/hb-ot-shape-normalize.cc | 6 +- ...ze-private.hh => hb-ot-shape-normalize.hh} | 8 +- src/hb-ot-shape.cc | 20 ++--- ...{hb-ot-shape-private.hh => hb-ot-shape.hh} | 12 +-- src/hb-ot-tag.cc | 2 +- src/hb-ot-var-avar-table.hh | 2 +- src/hb-ot-var-fvar-table.hh | 2 +- src/hb-ot-var-hvar-table.hh | 2 +- src/hb-ot-var-mvar-table.hh | 2 +- src/hb-ot-var.cc | 4 +- ...set-digest-private.hh => hb-set-digest.hh} | 8 +- src/hb-set.cc | 2 +- src/{hb-set-private.hh => hb-set.hh} | 8 +- src/hb-shape-plan.cc | 10 +-- ...shape-plan-private.hh => hb-shape-plan.hh} | 10 +-- src/hb-shape.cc | 12 +-- ...aper-impl-private.hh => hb-shaper-impl.hh} | 16 ++-- src/hb-shaper.cc | 6 +- src/{hb-shaper-private.hh => hb-shaper.hh} | 8 +- src/hb-static.cc | 8 +- src/hb-string-array.hh | 2 +- src/hb-subset-glyf.cc | 2 +- src/hb-subset-glyf.hh | 2 +- src/hb-subset-input.cc | 4 +- src/hb-subset-plan.cc | 6 +- src/hb-subset-plan.hh | 6 +- src/hb-subset.cc | 8 +- src/{hb-subset-private.hh => hb-subset.hh} | 10 +-- src/hb-ucdn.cc | 6 +- src/hb-unicode.cc | 6 +- src/{hb-unicode-private.hh => hb-unicode.hh} | 8 +- src/hb-uniscribe.cc | 6 +- src/{hb-utf-private.hh => hb-utf.hh} | 8 +- src/{hb-vector-private.hh => hb-vector.hh} | 8 +- src/hb-warning.cc | 6 +- src/{hb-private.hh => hb.hh} | 12 +-- src/main.cc | 4 +- src/test-buffer-serialize.cc | 2 +- src/test-size-params.cc | 2 +- src/test-unicode-ranges.cc | 2 +- src/test-would-substitute.cc | 2 +- src/test.cc | 2 +- test/api/test-common.c | 1 - util/Makefile.am | 4 +- util/ansi-print.hh | 3 +- util/hb-subset.cc | 2 +- util/helper-cairo-ansi.hh | 2 +- util/helper-cairo.hh | 2 +- util/main-font-text.hh | 2 +- util/options.hh | 2 +- util/shape-consumer.hh | 2 +- util/view-cairo.hh | 2 +- 168 files changed, 452 insertions(+), 455 deletions(-) rename src/{hb-aat-layout-common-private.hh => hb-aat-layout-common.hh} (99%) rename src/{hb-aat-layout-private.hh => hb-aat-layout.hh} (84%) rename src/{hb-atomic-private.hh => hb-atomic.hh} (98%) rename src/{hb-blob-private.hh => hb-blob.hh} (94%) rename src/{hb-buffer-private.hh => hb-buffer.hh} (98%) rename src/{hb-face-private.hh => hb-face.hh} (94%) rename src/{hb-font-private.hh => hb-font.hh} (99%) rename src/{hb-iter-private.hh => hb-iter.hh} (97%) rename src/{hb-machinery-private.hh => hb-machinery.hh} (99%) rename src/{hb-map-private.hh => hb-map.hh} (98%) rename src/{hb-mutex-private.hh => hb-mutex.hh} (97%) rename src/{hb-object-private.hh => hb-object.hh} (97%) rename src/{hb-open-file-private.hh => hb-open-file.hh} (99%) rename src/{hb-open-type-private.hh => hb-open-type.hh} (98%) rename src/{hb-ot-layout-common-private.hh => hb-ot-layout-common.hh} (99%) rename src/{hb-ot-layout-gsubgpos-private.hh => hb-ot-layout-gsubgpos.hh} (99%) rename src/{hb-ot-layout-private.hh => hb-ot-layout.hh} (98%) rename src/{hb-ot-map-private.hh => hb-ot-map.hh} (98%) rename src/{hb-ot-shape-complex-arabic-private.hh => hb-ot-shape-complex-arabic.hh} (87%) rename src/{hb-ot-shape-complex-indic-private.hh => hb-ot-shape-complex-indic.hh} (98%) rename src/{hb-ot-shape-complex-khmer-private.hh => hb-ot-shape-complex-khmer.hh} (93%) rename src/{hb-ot-shape-complex-myanmar-private.hh => hb-ot-shape-complex-myanmar.hh} (95%) rename src/{hb-ot-shape-complex-use-private.hh => hb-ot-shape-complex-use.hh} (94%) rename src/{hb-ot-shape-complex-private.hh => hb-ot-shape-complex.hh} (98%) rename src/{hb-ot-shape-fallback-private.hh => hb-ot-shape-fallback.hh} (90%) rename src/{hb-ot-shape-normalize-private.hh => hb-ot-shape-normalize.hh} (93%) rename src/{hb-ot-shape-private.hh => hb-ot-shape.hh} (94%) rename src/{hb-set-digest-private.hh => hb-set-digest.hh} (97%) rename src/{hb-set-private.hh => hb-set.hh} (99%) rename src/{hb-shape-plan-private.hh => hb-shape-plan.hh} (92%) rename src/{hb-shaper-impl-private.hh => hb-shaper-impl.hh} (82%) rename src/{hb-shaper-private.hh => hb-shaper.hh} (97%) rename src/{hb-subset-private.hh => hb-subset.hh} (90%) rename src/{hb-unicode-private.hh => hb-unicode.hh} (99%) rename src/{hb-utf-private.hh => hb-utf.hh} (98%) rename src/{hb-vector-private.hh => hb-vector.hh} (97%) rename src/{hb-private.hh => hb.hh} (98%) diff --git a/src/Makefile.sources b/src/Makefile.sources index b981b0e26..32b49c952 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -1,28 +1,28 @@ # Base and default-included sources and headers HB_BASE_sources = \ - hb-atomic-private.hh \ - hb-blob-private.hh \ + hb-atomic.hh \ + hb-blob.hh \ hb-blob.cc \ - hb-buffer-private.hh \ + hb-buffer.hh \ hb-buffer-serialize.cc \ hb-buffer.cc \ hb-common.cc \ hb-debug.hh \ hb-dsalgs.hh \ - hb-face-private.hh \ + hb-face.hh \ hb-face.cc \ - hb-font-private.hh \ + hb-font.hh \ hb-font.cc \ - hb-iter-private.hh \ - hb-map-private.hh \ + hb-iter.hh \ + hb-map.hh \ hb-map.cc \ - hb-machinery-private.hh \ - hb-mutex-private.hh \ + hb-machinery.hh \ + hb-mutex.hh \ hb-null.hh \ - hb-object-private.hh \ - hb-open-file-private.hh \ - hb-open-type-private.hh \ + hb-object.hh \ + hb-open-file.hh \ + hb-open-type.hh \ hb-ot-color-cbdt-table.hh \ hb-ot-cmap-table.hh \ hb-ot-glyf-table.hh \ @@ -38,23 +38,23 @@ HB_BASE_sources = \ hb-ot-post-macroman.hh \ hb-ot-post-table.hh \ hb-ot-tag.cc \ - hb-private.hh \ - hb-set-digest-private.hh \ - hb-set-private.hh \ + hb.hh \ + hb-set-digest.hh \ + hb-set.hh \ hb-set.cc \ hb-shape.cc \ - hb-shape-plan-private.hh \ + hb-shape-plan.hh \ hb-shape-plan.cc \ hb-shaper-list.hh \ - hb-shaper-impl-private.hh \ - hb-shaper-private.hh \ + hb-shaper-impl.hh \ + hb-shaper.hh \ hb-shaper.cc \ hb-static.cc \ hb-string-array.hh \ - hb-unicode-private.hh \ + hb-unicode.hh \ hb-unicode.cc \ - hb-vector-private.hh \ - hb-utf-private.hh \ + hb-vector.hh \ + hb-utf.hh \ hb-warning.cc \ $(NULL) @@ -89,61 +89,61 @@ HB_FALLBACK_sources = \ HB_OT_sources = \ hb-aat-layout.cc \ - hb-aat-layout-common-private.hh \ + hb-aat-layout-common.hh \ hb-aat-layout-ankr-table.hh \ hb-aat-layout-bsln-table.hh \ hb-aat-layout-feat-table.hh \ hb-aat-layout-kerx-table.hh \ hb-aat-layout-morx-table.hh \ hb-aat-layout-trak-table.hh \ - hb-aat-layout-private.hh \ + hb-aat-layout.hh \ hb-aat-ltag-table.hh \ hb-ot-font.cc \ hb-ot-layout.cc \ 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-gpos-table.hh \ - hb-ot-layout-gsubgpos-private.hh \ + hb-ot-layout-gsubgpos.hh \ hb-ot-layout-gsub-table.hh \ hb-ot-layout-jstf-table.hh \ - hb-ot-layout-private.hh \ + hb-ot-layout.hh \ hb-ot-color.cc \ hb-ot-color-colr-table.hh \ hb-ot-color-cpal-table.hh \ hb-ot-color-sbix-table.hh \ hb-ot-color-svg-table.hh \ hb-ot-map.cc \ - hb-ot-map-private.hh \ + hb-ot-map.hh \ hb-ot-math.cc \ hb-ot-math-table.hh \ hb-ot-shape.cc \ hb-ot-shape-complex-arabic.cc \ 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-win1256.hh \ hb-ot-shape-complex-default.cc \ hb-ot-shape-complex-hangul.cc \ hb-ot-shape-complex-hebrew.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-khmer-private.hh \ + hb-ot-shape-complex-khmer.hh \ 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-thai.cc \ hb-ot-shape-complex-tibetan.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-private.hh \ - hb-ot-shape-normalize-private.hh \ + hb-ot-shape-complex.hh \ + hb-ot-shape-normalize.hh \ hb-ot-shape-normalize.cc \ - hb-ot-shape-fallback-private.hh \ + hb-ot-shape-fallback.hh \ hb-ot-shape-fallback.cc \ - hb-ot-shape-private.hh \ + hb-ot-shape.hh \ hb-ot-var.cc \ hb-ot-var-avar-table.hh \ hb-ot-var-fvar-table.hh \ @@ -214,9 +214,6 @@ HB_SUBSET_sources = \ HB_SUBSET_headers = \ hb-subset.h \ - hb-subset-glyf.hh \ - hb-subset-plan.hh \ - hb-subset-private.hh \ $(NULL) HB_GOBJECT_DIST_sources = hb-gobject-structs.cc diff --git a/src/check-includes.sh b/src/check-includes.sh index fd565da53..f938f706c 100755 --- a/src/check-includes.sh +++ b/src/check-includes.sh @@ -23,14 +23,14 @@ grep -v 'hb[.]h:' | 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 test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x" - grep '#.*\' "$x" /dev/null | grep -v 'include _' | head -n 1 + grep '#.*\' "$x" /dev/null | head -n 1 done | -grep -v '"hb-.*private[.]hh"' | -grep -v 'hb-private[.]hh:' | +grep -v '"hb-.*[.]hh"' | +grep -v 'hb[.]hh' | grep . >&2 && stat=1 diff --git a/src/dump-indic-data.cc b/src/dump-indic-data.cc index d57413884..a50688981 100644 --- a/src/dump-indic-data.cc +++ b/src/dump-indic-data.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-indic-private.hh" +#include "hb-ot-shape-complex-indic.hh" int main (void) diff --git a/src/dump-khmer-data.cc b/src/dump-khmer-data.cc index 7dd09b2b5..12871fa85 100644 --- a/src/dump-khmer-data.cc +++ b/src/dump-khmer-data.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-khmer-private.hh" +#include "hb-ot-shape-complex-khmer.hh" int main (void) diff --git a/src/dump-myanmar-data.cc b/src/dump-myanmar-data.cc index 2df9cd987..9f8b12ed2 100644 --- a/src/dump-myanmar-data.cc +++ b/src/dump-myanmar-data.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-myanmar-private.hh" +#include "hb-ot-shape-complex-myanmar.hh" int main (void) diff --git a/src/dump-use-data.cc b/src/dump-use-data.cc index 0e64688f1..4a8b25842 100644 --- a/src/dump-use-data.cc +++ b/src/dump-use-data.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-use-private.hh" +#include "hb-ot-shape-complex-use.hh" int main (void) diff --git a/src/gen-indic-table.py b/src/gen-indic-table.py index 6252664ca..e65b9814a 100755 --- a/src/gen-indic-table.py +++ b/src/gen-indic-table.py @@ -102,7 +102,7 @@ for h in headers: print (" * %s" % (l.strip())) print (" */") print () -print ('#include "hb-ot-shape-complex-indic-private.hh"') +print ('#include "hb-ot-shape-complex-indic.hh"') print () # Shorten values diff --git a/src/gen-use-table.py b/src/gen-use-table.py index c742ebaca..a8724619a 100755 --- a/src/gen-use-table.py +++ b/src/gen-use-table.py @@ -394,7 +394,7 @@ for h in headers: print (" * %s" % (l.strip())) print (" */") print () -print ('#include "hb-ot-shape-complex-use-private.hh"') +print ('#include "hb-ot-shape-complex-use.hh"') print () total = 0 diff --git a/src/hb-aat-layout-ankr-table.hh b/src/hb-aat-layout-ankr-table.hh index 3b7912b9d..a197cec81 100644 --- a/src/hb-aat-layout-ankr-table.hh +++ b/src/hb-aat-layout-ankr-table.hh @@ -25,7 +25,7 @@ #ifndef 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 diff --git a/src/hb-aat-layout-bsln-table.hh b/src/hb-aat-layout-bsln-table.hh index df2bf5b43..b86408626 100644 --- a/src/hb-aat-layout-bsln-table.hh +++ b/src/hb-aat-layout-bsln-table.hh @@ -25,7 +25,7 @@ #ifndef 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 diff --git a/src/hb-aat-layout-common-private.hh b/src/hb-aat-layout-common.hh similarity index 99% rename from src/hb-aat-layout-common-private.hh rename to src/hb-aat-layout-common.hh index d7f35052d..25f4fe14a 100644 --- a/src/hb-aat-layout-common-private.hh +++ b/src/hb-aat-layout-common.hh @@ -24,10 +24,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_AAT_LAYOUT_COMMON_PRIVATE_HH -#define HB_AAT_LAYOUT_COMMON_PRIVATE_HH +#ifndef HB_AAT_LAYOUT_COMMON_HH +#define HB_AAT_LAYOUT_COMMON_HH -#include "hb-aat-layout-private.hh" +#include "hb-aat-layout.hh" namespace AAT { @@ -641,4 +641,4 @@ struct hb_aat_apply_context_t : } /* namespace AAT */ -#endif /* HB_AAT_LAYOUT_COMMON_PRIVATE_HH */ +#endif /* HB_AAT_LAYOUT_COMMON_HH */ diff --git a/src/hb-aat-layout-feat-table.hh b/src/hb-aat-layout-feat-table.hh index 3e070d795..b70076316 100644 --- a/src/hb-aat-layout-feat-table.hh +++ b/src/hb-aat-layout-feat-table.hh @@ -25,7 +25,7 @@ #ifndef 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 diff --git a/src/hb-aat-layout-kerx-table.hh b/src/hb-aat-layout-kerx-table.hh index cc03d6278..615a8f8d4 100644 --- a/src/hb-aat-layout-kerx-table.hh +++ b/src/hb-aat-layout-kerx-table.hh @@ -28,8 +28,8 @@ #ifndef HB_AAT_LAYOUT_KERX_TABLE_HH #define HB_AAT_LAYOUT_KERX_TABLE_HH -#include "hb-open-type-private.hh" -#include "hb-aat-layout-common-private.hh" +#include "hb-open-type.hh" +#include "hb-aat-layout-common.hh" #include "hb-aat-layout-ankr-table.hh" /* diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index f25842457..ef452e22b 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -27,9 +27,9 @@ #ifndef HB_AAT_LAYOUT_MORX_TABLE_HH #define HB_AAT_LAYOUT_MORX_TABLE_HH -#include "hb-open-type-private.hh" -#include "hb-aat-layout-common-private.hh" -#include "hb-ot-layout-common-private.hh" +#include "hb-open-type.hh" +#include "hb-aat-layout-common.hh" +#include "hb-ot-layout-common.hh" /* * morx -- Extended Glyph Metamorphosis diff --git a/src/hb-aat-layout-trak-table.hh b/src/hb-aat-layout-trak-table.hh index f5dc558c3..c4bec2cab 100644 --- a/src/hb-aat-layout-trak-table.hh +++ b/src/hb-aat-layout-trak-table.hh @@ -28,9 +28,9 @@ #ifndef HB_AAT_LAYOUT_TRAK_TABLE_HH #define HB_AAT_LAYOUT_TRAK_TABLE_HH -#include "hb-aat-layout-common-private.hh" -#include "hb-ot-layout-private.hh" -#include "hb-open-type-private.hh" +#include "hb-aat-layout-common.hh" +#include "hb-ot-layout.hh" +#include "hb-open-type.hh" /* * trak -- Tracking diff --git a/src/hb-aat-layout.cc b/src/hb-aat-layout.cc index fc706d6bd..24ec53bc8 100644 --- a/src/hb-aat-layout.cc +++ b/src/hb-aat-layout.cc @@ -24,12 +24,12 @@ * 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-gsubgpos-private.hh" +#include "hb-ot-layout.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-bsln-table.hh" // Just so we compile it; unused otherwise. #include "hb-aat-layout-feat-table.hh" // Just so we compile it; unused otherwise. diff --git a/src/hb-aat-layout-private.hh b/src/hb-aat-layout.hh similarity index 84% rename from src/hb-aat-layout-private.hh rename to src/hb-aat-layout.hh index ce75c8e71..ac9c53539 100644 --- a/src/hb-aat-layout-private.hh +++ b/src/hb-aat-layout.hh @@ -24,14 +24,14 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_AAT_LAYOUT_PRIVATE_HH -#define HB_AAT_LAYOUT_PRIVATE_HH +#ifndef HB_AAT_LAYOUT_HH +#define HB_AAT_LAYOUT_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-font-private.hh" -#include "hb-buffer-private.hh" -#include "hb-open-type-private.hh" +#include "hb-font.hh" +#include "hb-buffer.hh" +#include "hb-open-type.hh" HB_INTERNAL void @@ -40,4 +40,4 @@ hb_aat_layout_substitute (hb_font_t *font, hb_buffer_t *buffer); HB_INTERNAL void hb_aat_layout_position (hb_font_t *font, hb_buffer_t *buffer); -#endif /* HB_AAT_LAYOUT_PRIVATE_HH */ +#endif /* HB_AAT_LAYOUT_HH */ diff --git a/src/hb-aat-ltag-table.hh b/src/hb-aat-ltag-table.hh index 15c4e89cb..e308ab28c 100644 --- a/src/hb-aat-ltag-table.hh +++ b/src/hb-aat-ltag-table.hh @@ -25,7 +25,7 @@ #ifndef 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 diff --git a/src/hb-atomic-private.hh b/src/hb-atomic.hh similarity index 98% rename from src/hb-atomic-private.hh rename to src/hb-atomic.hh index 297c64698..d494c8955 100644 --- a/src/hb-atomic-private.hh +++ b/src/hb-atomic.hh @@ -29,10 +29,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_ATOMIC_PRIVATE_HH -#define HB_ATOMIC_PRIVATE_HH +#ifndef HB_ATOMIC_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 */ diff --git a/src/hb-blob.cc b/src/hb-blob.cc index 25c3e05aa..a335df308 100644 --- a/src/hb-blob.cc +++ b/src/hb-blob.cc @@ -30,8 +30,8 @@ #define _POSIX_C_SOURCE 200809L #endif -#include "hb-private.hh" -#include "hb-blob-private.hh" +#include "hb.hh" +#include "hb-blob.hh" #ifdef HAVE_SYS_MMAN_H #ifdef HAVE_UNISTD_H diff --git a/src/hb-blob-private.hh b/src/hb-blob.hh similarity index 94% rename from src/hb-blob-private.hh rename to src/hb-blob.hh index 0d3fad574..bee8c9794 100644 --- a/src/hb-blob-private.hh +++ b/src/hb-blob.hh @@ -26,10 +26,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_BLOB_PRIVATE_HH -#define HB_BLOB_PRIVATE_HH +#ifndef HB_BLOB_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); -#endif /* HB_BLOB_PRIVATE_HH */ +#endif /* HB_BLOB_HH */ diff --git a/src/hb-buffer-deserialize-json.hh b/src/hb-buffer-deserialize-json.hh index 380f3c5fc..1f9e2e91d 100644 --- a/src/hb-buffer-deserialize-json.hh +++ b/src/hb-buffer-deserialize-json.hh @@ -29,7 +29,7 @@ #ifndef 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" diff --git a/src/hb-buffer-deserialize-json.rl b/src/hb-buffer-deserialize-json.rl index ec9bc7c9a..f3abb027b 100644 --- a/src/hb-buffer-deserialize-json.rl +++ b/src/hb-buffer-deserialize-json.rl @@ -27,7 +27,7 @@ #ifndef HB_BUFFER_DESERIALIZE_JSON_HH #define HB_BUFFER_DESERIALIZE_JSON_HH -#include "hb-private.hh" +#include "hb.hh" %%{ diff --git a/src/hb-buffer-deserialize-text.hh b/src/hb-buffer-deserialize-text.hh index 5bca369f8..67f0a1252 100644 --- a/src/hb-buffer-deserialize-text.hh +++ b/src/hb-buffer-deserialize-text.hh @@ -29,7 +29,7 @@ #ifndef 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" diff --git a/src/hb-buffer-deserialize-text.rl b/src/hb-buffer-deserialize-text.rl index 1d90979a9..6268a6c50 100644 --- a/src/hb-buffer-deserialize-text.rl +++ b/src/hb-buffer-deserialize-text.rl @@ -27,7 +27,7 @@ #ifndef HB_BUFFER_DESERIALIZE_TEXT_HH #define HB_BUFFER_DESERIALIZE_TEXT_HH -#include "hb-private.hh" +#include "hb.hh" %%{ diff --git a/src/hb-buffer-serialize.cc b/src/hb-buffer-serialize.cc index 11471941d..1b6d14731 100644 --- a/src/hb-buffer-serialize.cc +++ b/src/hb-buffer-serialize.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-buffer-private.hh" +#include "hb-buffer.hh" static const char *serialize_formats[] = { diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc index eb7b01caa..536ab5d53 100644 --- a/src/hb-buffer.cc +++ b/src/hb-buffer.cc @@ -27,8 +27,8 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-buffer-private.hh" -#include "hb-utf-private.hh" +#include "hb-buffer.hh" +#include "hb-utf.hh" /** diff --git a/src/hb-buffer-private.hh b/src/hb-buffer.hh similarity index 98% rename from src/hb-buffer-private.hh rename to src/hb-buffer.hh index a6c4b6963..3e38fe1de 100644 --- a/src/hb-buffer-private.hh +++ b/src/hb-buffer.hh @@ -27,11 +27,11 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_BUFFER_PRIVATE_HH -#define HB_BUFFER_PRIVATE_HH +#ifndef HB_BUFFER_HH +#define HB_BUFFER_HH -#include "hb-private.hh" -#include "hb-unicode-private.hh" +#include "hb.hh" +#include "hb-unicode.hh" #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 ()) -#endif /* HB_BUFFER_PRIVATE_HH */ +#endif /* HB_BUFFER_HH */ diff --git a/src/hb-common.cc b/src/hb-common.cc index 614b71b7f..ed3fed2a3 100644 --- a/src/hb-common.cc +++ b/src/hb-common.cc @@ -26,9 +26,9 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" -#include "hb-machinery-private.hh" +#include "hb-machinery.hh" #include #ifdef HAVE_XLOCALE_H diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 1b916a53d..a7ba85f83 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -28,8 +28,8 @@ #define HB_SHAPER coretext -#include "hb-private.hh" -#include "hb-shaper-impl-private.hh" +#include "hb.hh" +#include "hb-shaper-impl.hh" #include "hb-coretext.h" #include diff --git a/src/hb-debug.hh b/src/hb-debug.hh index 9056ffca2..49663d215 100644 --- a/src/hb-debug.hh +++ b/src/hb-debug.hh @@ -27,8 +27,8 @@ #ifndef HB_DEBUG_HH #define HB_DEBUG_HH -#include "hb-private.hh" -#include "hb-atomic-private.hh" +#include "hb.hh" +#include "hb-atomic.hh" #include "hb-dsalgs.hh" diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc index baad81884..35197c238 100644 --- a/src/hb-directwrite.cc +++ b/src/hb-directwrite.cc @@ -22,9 +22,9 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -#include "hb-private.hh" +#include "hb.hh" #define HB_SHAPER directwrite -#include "hb-shaper-impl-private.hh" +#include "hb-shaper-impl.hh" #include diff --git a/src/hb-dsalgs.hh b/src/hb-dsalgs.hh index c7aa611e4..ec5708eb7 100644 --- a/src/hb-dsalgs.hh +++ b/src/hb-dsalgs.hh @@ -27,7 +27,7 @@ #ifndef HB_DSALGS_HH #define HB_DSALGS_HH -#include "hb-private.hh" +#include "hb.hh" /* Void! For when we need a expression-type of void. */ diff --git a/src/hb-face.cc b/src/hb-face.cc index 9cb0f2654..b3956c456 100644 --- a/src/hb-face.cc +++ b/src/hb-face.cc @@ -26,11 +26,11 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" -#include "hb-face-private.hh" -#include "hb-blob-private.hh" -#include "hb-open-file-private.hh" +#include "hb-face.hh" +#include "hb-blob.hh" +#include "hb-open-file.hh" /** diff --git a/src/hb-face-private.hh b/src/hb-face.hh similarity index 94% rename from src/hb-face-private.hh rename to src/hb-face.hh index 086ce6e96..f90453dbd 100644 --- a/src/hb-face-private.hh +++ b/src/hb-face.hh @@ -26,13 +26,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_FACE_PRIVATE_HH -#define HB_FACE_PRIVATE_HH +#ifndef HB_FACE_HH +#define HB_FACE_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-shaper-private.hh" -#include "hb-shape-plan-private.hh" +#include "hb-shaper.hh" +#include "hb-shape-plan.hh" /* @@ -105,4 +105,4 @@ DECLARE_NULL_INSTANCE (hb_face_t); #undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS -#endif /* HB_FACE_PRIVATE_HH */ +#endif /* HB_FACE_HH */ diff --git a/src/hb-fallback-shape.cc b/src/hb-fallback-shape.cc index eff20f70c..dc8536c82 100644 --- a/src/hb-fallback-shape.cc +++ b/src/hb-fallback-shape.cc @@ -25,7 +25,7 @@ */ #define HB_SHAPER fallback -#include "hb-shaper-impl-private.hh" +#include "hb-shaper-impl.hh" HB_SHAPER_DATA_ENSURE_DEFINE(fallback, face) diff --git a/src/hb-font.cc b/src/hb-font.cc index 857b8f577..bc831dd53 100644 --- a/src/hb-font.cc +++ b/src/hb-font.cc @@ -26,10 +26,10 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" -#include "hb-font-private.hh" -#include "hb-machinery-private.hh" +#include "hb-font.hh" +#include "hb-machinery.hh" /* diff --git a/src/hb-font-private.hh b/src/hb-font.hh similarity index 99% rename from src/hb-font-private.hh rename to src/hb-font.hh index d3a413802..4c8d0aeec 100644 --- a/src/hb-font-private.hh +++ b/src/hb-font.hh @@ -26,13 +26,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_FONT_PRIVATE_HH -#define HB_FONT_PRIVATE_HH +#ifndef HB_FONT_HH +#define HB_FONT_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-face-private.hh" -#include "hb-shaper-private.hh" +#include "hb-face.hh" +#include "hb-shaper.hh" /* @@ -601,4 +601,4 @@ DECLARE_NULL_INSTANCE (hb_font_t); #undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS -#endif /* HB_FONT_PRIVATE_HH */ +#endif /* HB_FONT_HH */ diff --git a/src/hb-ft.cc b/src/hb-ft.cc index c8740d15c..5d6abb29d 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -27,12 +27,12 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #include "hb-ft.h" -#include "hb-font-private.hh" -#include "hb-machinery-private.hh" +#include "hb-font.hh" +#include "hb-machinery.hh" #include FT_ADVANCES_H #include FT_MULTIPLE_MASTERS_H diff --git a/src/hb-glib.cc b/src/hb-glib.cc index 81ec612d7..18f3a81db 100644 --- a/src/hb-glib.cc +++ b/src/hb-glib.cc @@ -26,12 +26,12 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #include "hb-glib.h" -#include "hb-unicode-private.hh" -#include "hb-machinery-private.hh" +#include "hb-unicode.hh" +#include "hb-machinery.hh" #if !GLIB_CHECK_VERSION(2,29,14) diff --git a/src/hb-gobject-enums.cc.tmpl b/src/hb-gobject-enums.cc.tmpl index ca458a384..e056df478 100644 --- a/src/hb-gobject-enums.cc.tmpl +++ b/src/hb-gobject-enums.cc.tmpl @@ -25,7 +25,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" /* g++ didn't like older gtype.h gcc-only code path. */ #include diff --git a/src/hb-gobject-structs.cc b/src/hb-gobject-structs.cc index 0c8e55733..1b8758583 100644 --- a/src/hb-gobject-structs.cc +++ b/src/hb-gobject-structs.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" /* g++ didn't like older gtype.h gcc-only code path. */ #include diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc index 1f42a36f3..817278f30 100644 --- a/src/hb-graphite2.cc +++ b/src/hb-graphite2.cc @@ -27,7 +27,7 @@ */ #define HB_SHAPER graphite2 -#include "hb-shaper-impl-private.hh" +#include "hb-shaper-impl.hh" #include "hb-graphite2.h" diff --git a/src/hb-icu.cc b/src/hb-icu.cc index bffae0714..564f71fe2 100644 --- a/src/hb-icu.cc +++ b/src/hb-icu.cc @@ -27,12 +27,12 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #include "hb-icu.h" -#include "hb-unicode-private.hh" -#include "hb-machinery-private.hh" +#include "hb-unicode.hh" +#include "hb-machinery.hh" #include #include diff --git a/src/hb-iter-private.hh b/src/hb-iter.hh similarity index 97% rename from src/hb-iter-private.hh rename to src/hb-iter.hh index 314133ade..6fd6aed79 100644 --- a/src/hb-iter-private.hh +++ b/src/hb-iter.hh @@ -24,10 +24,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_ITER_PRIVATE_HH -#define HB_ITER_PRIVATE_HH +#ifndef HB_ITER_HH +#define HB_ITER_HH -#include "hb-private.hh" +#include "hb.hh" /* Unified iterator object. @@ -146,4 +146,4 @@ m (void) } } -#endif /* HB_ITER_PRIVATE_HH */ +#endif /* HB_ITER_HH */ diff --git a/src/hb-machinery-private.hh b/src/hb-machinery.hh similarity index 99% rename from src/hb-machinery-private.hh rename to src/hb-machinery.hh index b33dd996d..56ecff851 100644 --- a/src/hb-machinery-private.hh +++ b/src/hb-machinery.hh @@ -26,13 +26,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_MACHINERY_PRIVATE_HH -#define HB_MACHINERY_PRIVATE_HH +#ifndef HB_MACHINERY_HH +#define HB_MACHINERY_HH -#include "hb-private.hh" -#include "hb-blob-private.hh" +#include "hb.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 @@ -251,4 +251,4 @@ struct hb_map_t }; -#endif /* HB_MAP_PRIVATE_HH */ +#endif /* HB_MAP_HH */ diff --git a/src/hb-mutex-private.hh b/src/hb-mutex.hh similarity index 97% rename from src/hb-mutex-private.hh rename to src/hb-mutex.hh index 14bde3103..d8cdf4b64 100644 --- a/src/hb-mutex-private.hh +++ b/src/hb-mutex.hh @@ -29,10 +29,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_MUTEX_PRIVATE_HH -#define HB_MUTEX_PRIVATE_HH +#ifndef HB_MUTEX_HH +#define HB_MUTEX_HH -#include "hb-private.hh" +#include "hb.hh" /* mutex */ @@ -138,4 +138,4 @@ struct hb_mutex_t }; -#endif /* HB_MUTEX_PRIVATE_HH */ +#endif /* HB_MUTEX_HH */ diff --git a/src/hb-null.hh b/src/hb-null.hh index 91efee644..19886a5c6 100644 --- a/src/hb-null.hh +++ b/src/hb-null.hh @@ -27,7 +27,7 @@ #ifndef HB_NULL_HH #define HB_NULL_HH -#include "hb-private.hh" +#include "hb.hh" /* diff --git a/src/hb-object-private.hh b/src/hb-object.hh similarity index 97% rename from src/hb-object-private.hh rename to src/hb-object.hh index 4955a68dc..ca85af691 100644 --- a/src/hb-object-private.hh +++ b/src/hb-object.hh @@ -29,13 +29,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OBJECT_PRIVATE_HH -#define HB_OBJECT_PRIVATE_HH +#ifndef HB_OBJECT_HH +#define HB_OBJECT_HH -#include "hb-private.hh" -#include "hb-atomic-private.hh" -#include "hb-mutex-private.hh" -#include "hb-vector-private.hh" +#include "hb.hh" +#include "hb-atomic.hh" +#include "hb-mutex.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 */ diff --git a/src/hb-open-file-private.hh b/src/hb-open-file.hh similarity index 99% rename from src/hb-open-file-private.hh rename to src/hb-open-file.hh index d47bff66e..97e736eeb 100644 --- a/src/hb-open-file-private.hh +++ b/src/hb-open-file.hh @@ -26,10 +26,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OPEN_FILE_PRIVATE_HH -#define HB_OPEN_FILE_PRIVATE_HH +#ifndef HB_OPEN_FILE_HH +#define HB_OPEN_FILE_HH -#include "hb-open-type-private.hh" +#include "hb-open-type.hh" #include "hb-ot-head-table.hh" @@ -565,4 +565,4 @@ struct OpenTypeFontFile } /* namespace OT */ -#endif /* HB_OPEN_FILE_PRIVATE_HH */ +#endif /* HB_OPEN_FILE_HH */ diff --git a/src/hb-open-type-private.hh b/src/hb-open-type.hh similarity index 98% rename from src/hb-open-type-private.hh rename to src/hb-open-type.hh index 5580565f1..48a8eaa76 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type.hh @@ -26,13 +26,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OPEN_TYPE_PRIVATE_HH -#define HB_OPEN_TYPE_PRIVATE_HH +#ifndef HB_OPEN_TYPE_HH +#define HB_OPEN_TYPE_HH -#include "hb-private.hh" -#include "hb-blob-private.hh" -#include "hb-face-private.hh" -#include "hb-machinery-private.hh" +#include "hb.hh" +#include "hb-blob.hh" +#include "hb-face.hh" +#include "hb-machinery.hh" namespace OT { @@ -646,4 +646,4 @@ struct BinSearchArrayOf : SortedArrayOf {}; } /* namespace OT */ -#endif /* HB_OPEN_TYPE_PRIVATE_HH */ +#endif /* HB_OPEN_TYPE_HH */ diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index 6ab578c25..dce298138 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -27,8 +27,8 @@ #ifndef HB_OT_CMAP_TABLE_HH #define HB_OT_CMAP_TABLE_HH -#include "hb-open-type-private.hh" -#include "hb-set-private.hh" +#include "hb-open-type.hh" +#include "hb-set.hh" #include "hb-subset-plan.hh" /* diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh index 21c2f4773..8533b0365 100644 --- a/src/hb-ot-color-cbdt-table.hh +++ b/src/hb-ot-color-cbdt-table.hh @@ -27,7 +27,7 @@ #ifndef 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 diff --git a/src/hb-ot-color-colr-table.hh b/src/hb-ot-color-colr-table.hh index ce6702d2a..070226f18 100644 --- a/src/hb-ot-color-colr-table.hh +++ b/src/hb-ot-color-colr-table.hh @@ -25,7 +25,7 @@ #ifndef 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 diff --git a/src/hb-ot-color-cpal-table.hh b/src/hb-ot-color-cpal-table.hh index 2c312748d..2c9fced09 100644 --- a/src/hb-ot-color-cpal-table.hh +++ b/src/hb-ot-color-cpal-table.hh @@ -28,7 +28,7 @@ #ifndef HB_OT_COLOR_CPAL_TABLE_HH #define HB_OT_COLOR_CPAL_TABLE_HH -#include "hb-open-type-private.hh" +#include "hb-open-type.hh" /* diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh index 0461afa32..1b643c77a 100644 --- a/src/hb-ot-color-sbix-table.hh +++ b/src/hb-ot-color-sbix-table.hh @@ -25,7 +25,7 @@ #ifndef 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 diff --git a/src/hb-ot-color-svg-table.hh b/src/hb-ot-color-svg-table.hh index 3976694f8..ad9162f7c 100644 --- a/src/hb-ot-color-svg-table.hh +++ b/src/hb-ot-color-svg-table.hh @@ -25,7 +25,7 @@ #ifndef 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) diff --git a/src/hb-ot-color.cc b/src/hb-ot-color.cc index 44550d78b..7cdff380e 100644 --- a/src/hb-ot-color.cc +++ b/src/hb-ot-color.cc @@ -25,7 +25,7 @@ * 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-cpal-table.hh" #include "hb-ot.h" @@ -33,8 +33,8 @@ #include #include -#include "hb-ot-layout-private.hh" -#include "hb-shaper-private.hh" +#include "hb-ot-layout.hh" +#include "hb-shaper.hh" #if 0 HB_MARK_AS_FLAG_T (hb_ot_color_palette_flags_t) diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index c559d8754..f6e69d9e2 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -24,12 +24,12 @@ * Google Author(s): Behdad Esfahbod, Roozbeh Pournader */ -#include "hb-private.hh" +#include "hb.hh" #include "hb-ot.h" -#include "hb-font-private.hh" -#include "hb-machinery-private.hh" +#include "hb-font.hh" +#include "hb-machinery.hh" #include "hb-ot-cmap-table.hh" #include "hb-ot-glyf-table.hh" diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh index bcf89e462..a23269e56 100644 --- a/src/hb-ot-glyf-table.hh +++ b/src/hb-ot-glyf-table.hh @@ -27,11 +27,11 @@ #ifndef 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-subset-glyf.hh" #include "hb-subset-plan.hh" -#include "hb-subset-private.hh" +#include "hb-subset.hh" namespace OT { diff --git a/src/hb-ot-hdmx-table.hh b/src/hb-ot-hdmx-table.hh index 0951871ce..5ce5fe4ab 100644 --- a/src/hb-ot-hdmx-table.hh +++ b/src/hb-ot-hdmx-table.hh @@ -27,7 +27,7 @@ #ifndef 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" /* diff --git a/src/hb-ot-head-table.hh b/src/hb-ot-head-table.hh index fded120be..602e365ce 100644 --- a/src/hb-ot-head-table.hh +++ b/src/hb-ot-head-table.hh @@ -29,7 +29,7 @@ #ifndef 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 diff --git a/src/hb-ot-hhea-table.hh b/src/hb-ot-hhea-table.hh index efb42b616..3336cadd4 100644 --- a/src/hb-ot-hhea-table.hh +++ b/src/hb-ot-hhea-table.hh @@ -27,7 +27,7 @@ #ifndef 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 diff --git a/src/hb-ot-hmtx-table.hh b/src/hb-ot-hmtx-table.hh index 13fa9d6e0..6849172b9 100644 --- a/src/hb-ot-hmtx-table.hh +++ b/src/hb-ot-hmtx-table.hh @@ -27,7 +27,7 @@ #ifndef 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-os2-table.hh" #include "hb-ot-var-hvar-table.hh" diff --git a/src/hb-ot-kern-table.hh b/src/hb-ot-kern-table.hh index b4d810952..ac6e9e459 100644 --- a/src/hb-ot-kern-table.hh +++ b/src/hb-ot-kern-table.hh @@ -27,7 +27,7 @@ #ifndef HB_OT_KERN_TABLE_HH #define HB_OT_KERN_TABLE_HH -#include "hb-open-type-private.hh" +#include "hb-open-type.hh" /* * kern -- Kerning diff --git a/src/hb-ot-layout-base-table.hh b/src/hb-ot-layout-base-table.hh index 96da07fb5..449e74550 100644 --- a/src/hb-ot-layout-base-table.hh +++ b/src/hb-ot-layout-base-table.hh @@ -28,8 +28,8 @@ #ifndef HB_OT_LAYOUT_BASE_TABLE_HH #define HB_OT_LAYOUT_BASE_TABLE_HH -#include "hb-open-type-private.hh" -#include "hb-ot-layout-common-private.hh" +#include "hb-open-type.hh" +#include "hb-ot-layout-common.hh" namespace OT { diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common.hh similarity index 99% rename from src/hb-ot-layout-common-private.hh rename to src/hb-ot-layout-common.hh index fa41241c0..887f27e9e 100644 --- a/src/hb-ot-layout-common-private.hh +++ b/src/hb-ot-layout-common.hh @@ -26,13 +26,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_LAYOUT_COMMON_PRIVATE_HH -#define HB_OT_LAYOUT_COMMON_PRIVATE_HH +#ifndef HB_OT_LAYOUT_COMMON_HH +#define HB_OT_LAYOUT_COMMON_HH -#include "hb-private.hh" -#include "hb-ot-layout-private.hh" -#include "hb-open-type-private.hh" -#include "hb-set-private.hh" +#include "hb.hh" +#include "hb-ot-layout.hh" +#include "hb-open-type.hh" +#include "hb-set.hh" #ifndef HB_MAX_NESTING_LEVEL @@ -1822,4 +1822,4 @@ struct Device } /* namespace OT */ -#endif /* HB_OT_LAYOUT_COMMON_PRIVATE_HH */ +#endif /* HB_OT_LAYOUT_COMMON_HH */ diff --git a/src/hb-ot-layout-gdef-table.hh b/src/hb-ot-layout-gdef-table.hh index d2b41a8ef..637f7f5c4 100644 --- a/src/hb-ot-layout-gdef-table.hh +++ b/src/hb-ot-layout-gdef-table.hh @@ -29,9 +29,9 @@ #ifndef 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 { diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh index 95bc588be..66767dfda 100644 --- a/src/hb-ot-layout-gpos-table.hh +++ b/src/hb-ot-layout-gpos-table.hh @@ -29,7 +29,7 @@ #ifndef 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 { diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh index eaee7daa9..d2c1fb9a1 100644 --- a/src/hb-ot-layout-gsub-table.hh +++ b/src/hb-ot-layout-gsub-table.hh @@ -29,7 +29,7 @@ #ifndef 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 { diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos.hh similarity index 99% rename from src/hb-ot-layout-gsubgpos-private.hh rename to src/hb-ot-layout-gsubgpos.hh index 9b1a19f0e..76a7e2532 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos.hh @@ -26,14 +26,14 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH -#define HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH +#ifndef HB_OT_LAYOUT_GSUBGPOS_HH +#define HB_OT_LAYOUT_GSUBGPOS_HH -#include "hb-private.hh" -#include "hb-buffer-private.hh" -#include "hb-map-private.hh" +#include "hb.hh" +#include "hb-buffer.hh" +#include "hb-map.hh" #include "hb-ot-layout-gdef-table.hh" -#include "hb-set-private.hh" +#include "hb-set.hh" namespace OT { @@ -2403,4 +2403,4 @@ struct GSUBGPOS } /* namespace OT */ -#endif /* HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH */ +#endif /* HB_OT_LAYOUT_GSUBGPOS_HH */ diff --git a/src/hb-ot-layout-jstf-table.hh b/src/hb-ot-layout-jstf-table.hh index 7fabdebb2..e718c319f 100644 --- a/src/hb-ot-layout-jstf-table.hh +++ b/src/hb-ot-layout-jstf-table.hh @@ -27,7 +27,7 @@ #ifndef 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" diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index 09f034336..1fe45438c 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -28,10 +28,10 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-open-type-private.hh" -#include "hb-ot-layout-private.hh" -#include "hb-ot-map-private.hh" -#include "hb-map-private.hh" +#include "hb-open-type.hh" +#include "hb-ot-layout.hh" +#include "hb-ot-map.hh" +#include "hb-map.hh" #include "hb-ot-layout-gdef-table.hh" #include "hb-ot-layout-gsub-table.hh" diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout.hh similarity index 98% rename from src/hb-ot-layout-private.hh rename to src/hb-ot-layout.hh index 8f1e2c9c3..9c705b7d2 100644 --- a/src/hb-ot-layout-private.hh +++ b/src/hb-ot-layout.hh @@ -26,15 +26,15 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_LAYOUT_PRIVATE_HH -#define HB_OT_LAYOUT_PRIVATE_HH +#ifndef HB_OT_LAYOUT_HH +#define HB_OT_LAYOUT_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-font-private.hh" -#include "hb-buffer-private.hh" -#include "hb-set-digest-private.hh" -#include "hb-open-type-private.hh" +#include "hb-font.hh" +#include "hb-buffer.hh" +#include "hb-set-digest.hh" +#include "hb-open-type.hh" /* 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 glyph_props -#endif /* HB_OT_LAYOUT_PRIVATE_HH */ +#endif /* HB_OT_LAYOUT_HH */ diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc index f26cac9b1..29f52dcc2 100644 --- a/src/hb-ot-map.cc +++ b/src/hb-ot-map.cc @@ -26,9 +26,9 @@ * 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 diff --git a/src/hb-ot-map-private.hh b/src/hb-ot-map.hh similarity index 98% rename from src/hb-ot-map-private.hh rename to src/hb-ot-map.hh index 4aaf32831..32a9e7e00 100644 --- a/src/hb-ot-map-private.hh +++ b/src/hb-ot-map.hh @@ -26,10 +26,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_MAP_PRIVATE_HH -#define HB_OT_MAP_PRIVATE_HH +#ifndef HB_OT_MAP_HH +#define HB_OT_MAP_HH -#include "hb-buffer-private.hh" +#include "hb-buffer.hh" 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 */ diff --git a/src/hb-ot-math-table.hh b/src/hb-ot-math-table.hh index 2dd714580..b7ca167b1 100644 --- a/src/hb-ot-math-table.hh +++ b/src/hb-ot-math-table.hh @@ -27,8 +27,8 @@ #ifndef HB_OT_MATH_TABLE_HH #define HB_OT_MATH_TABLE_HH -#include "hb-open-type-private.hh" -#include "hb-ot-layout-common-private.hh" +#include "hb-open-type.hh" +#include "hb-ot-layout-common.hh" #include "hb-ot-math.h" namespace OT { diff --git a/src/hb-ot-math.cc b/src/hb-ot-math.cc index ead6259d4..48adf8acc 100644 --- a/src/hb-ot-math.cc +++ b/src/hb-ot-math.cc @@ -24,9 +24,9 @@ * 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" static inline const OT::MATH& diff --git a/src/hb-ot-maxp-table.hh b/src/hb-ot-maxp-table.hh index 75aac4f44..cd2a85ebc 100644 --- a/src/hb-ot-maxp-table.hh +++ b/src/hb-ot-maxp-table.hh @@ -27,7 +27,7 @@ #ifndef 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" namespace OT { diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh index bff85df27..a1de1193f 100644 --- a/src/hb-ot-name-table.hh +++ b/src/hb-ot-name-table.hh @@ -27,7 +27,7 @@ #ifndef HB_OT_NAME_TABLE_HH #define HB_OT_NAME_TABLE_HH -#include "hb-open-type-private.hh" +#include "hb-open-type.hh" namespace OT { diff --git a/src/hb-ot-os2-table.hh b/src/hb-ot-os2-table.hh index 56bbab741..c5ad803a2 100644 --- a/src/hb-ot-os2-table.hh +++ b/src/hb-ot-os2-table.hh @@ -27,7 +27,7 @@ #ifndef 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-subset-plan.hh" diff --git a/src/hb-ot-os2-unicode-ranges.hh b/src/hb-ot-os2-unicode-ranges.hh index cb1260784..42dfa4906 100644 --- a/src/hb-ot-os2-unicode-ranges.hh +++ b/src/hb-ot-os2-unicode-ranges.hh @@ -27,7 +27,7 @@ #ifndef HB_OT_OS2_UNICODE_RANGES_HH #define HB_OT_OS2_UNICODE_RANGES_HH -#include "hb-private.hh" +#include "hb.hh" namespace OT { diff --git a/src/hb-ot-post-macroman.hh b/src/hb-ot-post-macroman.hh index dbbb97e5a..b4df8aaee 100644 --- a/src/hb-ot-post-macroman.hh +++ b/src/hb-ot-post-macroman.hh @@ -27,7 +27,7 @@ #ifndef HB_OT_POST_MACROMAN_HH #if 0 /* Make checks happy. */ #define HB_OT_POST_MACROMAN_HH -#include "hb-private.hh" +#include "hb.hh" #endif diff --git a/src/hb-ot-post-table.hh b/src/hb-ot-post-table.hh index 4f08a51a2..44918b1d6 100644 --- a/src/hb-ot-post-table.hh +++ b/src/hb-ot-post-table.hh @@ -27,7 +27,7 @@ #ifndef 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" #define HB_STRING_ARRAY_NAME format1_names diff --git a/src/hb-ot-shape-complex-arabic-fallback.hh b/src/hb-ot-shape-complex-arabic-fallback.hh index a55511aa0..03f46d848 100644 --- a/src/hb-ot-shape-complex-arabic-fallback.hh +++ b/src/hb-ot-shape-complex-arabic-fallback.hh @@ -27,9 +27,9 @@ #ifndef 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" diff --git a/src/hb-ot-shape-complex-arabic-win1256.hh b/src/hb-ot-shape-complex-arabic-win1256.hh index 54c6cdc24..b15e145f2 100644 --- a/src/hb-ot-shape-complex-arabic-win1256.hh +++ b/src/hb-ot-shape-complex-arabic-win1256.hh @@ -313,7 +313,7 @@ OT_TABLE_END * Include a second time to get the table data... */ #if 0 -#include "hb-private.hh" /* Make check-includes.sh happy. */ +#include "hb.hh" /* Make check-includes.sh happy. */ #endif #ifdef OT_MEASURE #include "hb-ot-shape-complex-arabic-win1256.hh" diff --git a/src/hb-ot-shape-complex-arabic.cc b/src/hb-ot-shape-complex-arabic.cc index f4b397b93..ebc1d3d5f 100644 --- a/src/hb-ot-shape-complex-arabic.cc +++ b/src/hb-ot-shape-complex-arabic.cc @@ -24,9 +24,9 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" -#include "hb-ot-shape-complex-arabic-private.hh" -#include "hb-ot-shape-private.hh" +#include "hb.hh" +#include "hb-ot-shape-complex-arabic.hh" +#include "hb-ot-shape.hh" /* buffer var allocations */ diff --git a/src/hb-ot-shape-complex-arabic-private.hh b/src/hb-ot-shape-complex-arabic.hh similarity index 87% rename from src/hb-ot-shape-complex-arabic-private.hh rename to src/hb-ot-shape-complex-arabic.hh index fcedc7d74..5bf6ff633 100644 --- a/src/hb-ot-shape-complex-arabic-private.hh +++ b/src/hb-ot-shape-complex-arabic.hh @@ -26,12 +26,12 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_PRIVATE_HH -#define HB_OT_SHAPE_COMPLEX_ARABIC_PRIVATE_HH +#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_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; @@ -47,4 +47,4 @@ setup_masks_arabic_plan (const arabic_shape_plan_t *arabic_plan, hb_buffer_t *buffer, hb_script_t script); -#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_PRIVATE_HH */ +#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_HH */ diff --git a/src/hb-ot-shape-complex-default.cc b/src/hb-ot-shape-complex-default.cc index 68a62a10d..45d5f4346 100644 --- a/src/hb-ot-shape-complex-default.cc +++ b/src/hb-ot-shape-complex-default.cc @@ -24,7 +24,7 @@ * 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 = diff --git a/src/hb-ot-shape-complex-hangul.cc b/src/hb-ot-shape-complex-hangul.cc index 7420c5d18..ea731114a 100644 --- a/src/hb-ot-shape-complex-hangul.cc +++ b/src/hb-ot-shape-complex-hangul.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-private.hh" +#include "hb-ot-shape-complex.hh" /* Hangul shaper */ diff --git a/src/hb-ot-shape-complex-hebrew.cc b/src/hb-ot-shape-complex-hebrew.cc index 34cf28b8e..ba25258a3 100644 --- a/src/hb-ot-shape-complex-hebrew.cc +++ b/src/hb-ot-shape-complex-hebrew.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-private.hh" +#include "hb-ot-shape-complex.hh" static bool diff --git a/src/hb-ot-shape-complex-indic-machine.hh b/src/hb-ot-shape-complex-indic-machine.hh index 73f9d5871..f67a525c5 100644 --- a/src/hb-ot-shape-complex-indic-machine.hh +++ b/src/hb-ot-shape-complex-indic-machine.hh @@ -29,7 +29,7 @@ #ifndef 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" diff --git a/src/hb-ot-shape-complex-indic-machine.rl b/src/hb-ot-shape-complex-indic-machine.rl index 35e7ce906..d384a68c3 100644 --- a/src/hb-ot-shape-complex-indic-machine.rl +++ b/src/hb-ot-shape-complex-indic-machine.rl @@ -27,7 +27,7 @@ #ifndef 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; diff --git a/src/hb-ot-shape-complex-indic-table.cc b/src/hb-ot-shape-complex-indic-table.cc index 54291bc22..b7e4e7c7c 100644 --- a/src/hb-ot-shape-complex-indic-table.cc +++ b/src/hb-ot-shape-complex-indic-table.cc @@ -14,7 +14,7 @@ * # 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 */ diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index b52656f44..d4541bb18 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -24,8 +24,8 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-indic-private.hh" -#include "hb-ot-layout-private.hh" +#include "hb-ot-shape-complex-indic.hh" +#include "hb-ot-layout.hh" /* diff --git a/src/hb-ot-shape-complex-indic-private.hh b/src/hb-ot-shape-complex-indic.hh similarity index 98% rename from src/hb-ot-shape-complex-indic-private.hh rename to src/hb-ot-shape-complex-indic.hh index bb7fff384..9e597797c 100644 --- a/src/hb-ot-shape-complex-indic-private.hh +++ b/src/hb-ot-shape-complex-indic.hh @@ -24,14 +24,14 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH -#define HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH +#ifndef HB_OT_SHAPE_COMPLEX_INDIC_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-private.hh" /* XXX Remove */ +#include "hb-ot-shape-complex.hh" +#include "hb-ot-shape.hh" /* XXX Remove */ /* 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 */ diff --git a/src/hb-ot-shape-complex-khmer-machine.hh b/src/hb-ot-shape-complex-khmer-machine.hh index d00102156..a7e1711eb 100644 --- a/src/hb-ot-shape-complex-khmer-machine.hh +++ b/src/hb-ot-shape-complex-khmer-machine.hh @@ -29,7 +29,7 @@ #ifndef 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" diff --git a/src/hb-ot-shape-complex-khmer-machine.rl b/src/hb-ot-shape-complex-khmer-machine.rl index 54644d8aa..7c7951629 100644 --- a/src/hb-ot-shape-complex-khmer-machine.rl +++ b/src/hb-ot-shape-complex-khmer-machine.rl @@ -27,7 +27,7 @@ #ifndef 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; diff --git a/src/hb-ot-shape-complex-khmer.cc b/src/hb-ot-shape-complex-khmer.cc index 264515e86..0b5b50a97 100644 --- a/src/hb-ot-shape-complex-khmer.cc +++ b/src/hb-ot-shape-complex-khmer.cc @@ -24,8 +24,8 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-khmer-private.hh" -#include "hb-ot-layout-private.hh" +#include "hb-ot-shape-complex-khmer.hh" +#include "hb-ot-layout.hh" /* diff --git a/src/hb-ot-shape-complex-khmer-private.hh b/src/hb-ot-shape-complex-khmer.hh similarity index 93% rename from src/hb-ot-shape-complex-khmer-private.hh rename to src/hb-ot-shape-complex-khmer.hh index f90ef9674..3371c1302 100644 --- a/src/hb-ot-shape-complex-khmer-private.hh +++ b/src/hb-ot-shape-complex-khmer.hh @@ -24,12 +24,12 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_COMPLEX_KHMER_PRIVATE_HH -#define HB_OT_SHAPE_COMPLEX_KHMER_PRIVATE_HH +#ifndef HB_OT_SHAPE_COMPLEX_KHMER_HH +#define HB_OT_SHAPE_COMPLEX_KHMER_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-ot-shape-complex-indic-private.hh" +#include "hb-ot-shape-complex-indic.hh" /* buffer var allocations */ @@ -121,4 +121,4 @@ set_khmer_properties (hb_glyph_info_t &info) } -#endif /* HB_OT_SHAPE_COMPLEX_KHMER_PRIVATE_HH */ +#endif /* HB_OT_SHAPE_COMPLEX_KHMER_HH */ diff --git a/src/hb-ot-shape-complex-myanmar-machine.hh b/src/hb-ot-shape-complex-myanmar-machine.hh index fb67dd42e..7fa235178 100644 --- a/src/hb-ot-shape-complex-myanmar-machine.hh +++ b/src/hb-ot-shape-complex-myanmar-machine.hh @@ -29,7 +29,7 @@ #ifndef HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH #define HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH -#include "hb-private.hh" +#include "hb.hh" #line 36 "hb-ot-shape-complex-myanmar-machine.hh" diff --git a/src/hb-ot-shape-complex-myanmar-machine.rl b/src/hb-ot-shape-complex-myanmar-machine.rl index 0cd84fa1b..62f51d1e9 100644 --- a/src/hb-ot-shape-complex-myanmar-machine.rl +++ b/src/hb-ot-shape-complex-myanmar-machine.rl @@ -27,7 +27,7 @@ #ifndef HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH #define HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH -#include "hb-private.hh" +#include "hb.hh" %%{ machine myanmar_syllable_machine; diff --git a/src/hb-ot-shape-complex-myanmar.cc b/src/hb-ot-shape-complex-myanmar.cc index e4214b87e..8466f8129 100644 --- a/src/hb-ot-shape-complex-myanmar.cc +++ b/src/hb-ot-shape-complex-myanmar.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-myanmar-private.hh" +#include "hb-ot-shape-complex-myanmar.hh" /* diff --git a/src/hb-ot-shape-complex-myanmar-private.hh b/src/hb-ot-shape-complex-myanmar.hh similarity index 95% rename from src/hb-ot-shape-complex-myanmar-private.hh rename to src/hb-ot-shape-complex-myanmar.hh index 14d011d67..7b6fd4837 100644 --- a/src/hb-ot-shape-complex-myanmar-private.hh +++ b/src/hb-ot-shape-complex-myanmar.hh @@ -24,12 +24,12 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_COMPLEX_MYANMAR_PRIVATE_HH -#define HB_OT_SHAPE_COMPLEX_MYANMAR_PRIVATE_HH +#ifndef HB_OT_SHAPE_COMPLEX_MYANMAR_HH +#define HB_OT_SHAPE_COMPLEX_MYANMAR_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-ot-shape-complex-indic-private.hh" +#include "hb-ot-shape-complex-indic.hh" /* buffer var allocations */ @@ -168,4 +168,4 @@ set_myanmar_properties (hb_glyph_info_t &info) } -#endif /* HB_OT_SHAPE_COMPLEX_MYANMAR_PRIVATE_HH */ +#endif /* HB_OT_SHAPE_COMPLEX_MYANMAR_HH */ diff --git a/src/hb-ot-shape-complex-thai.cc b/src/hb-ot-shape-complex-thai.cc index 02d78ac04..1d18760e4 100644 --- a/src/hb-ot-shape-complex-thai.cc +++ b/src/hb-ot-shape-complex-thai.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-private.hh" +#include "hb-ot-shape-complex.hh" /* Thai / Lao shaper */ diff --git a/src/hb-ot-shape-complex-tibetan.cc b/src/hb-ot-shape-complex-tibetan.cc index eaac0bf68..9982ebc29 100644 --- a/src/hb-ot-shape-complex-tibetan.cc +++ b/src/hb-ot-shape-complex-tibetan.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-private.hh" +#include "hb-ot-shape-complex.hh" static const hb_tag_t tibetan_features[] = diff --git a/src/hb-ot-shape-complex-use-machine.hh b/src/hb-ot-shape-complex-use-machine.hh index 0ec805afc..77ca3aeb5 100644 --- a/src/hb-ot-shape-complex-use-machine.hh +++ b/src/hb-ot-shape-complex-use-machine.hh @@ -31,7 +31,7 @@ #ifndef HB_OT_SHAPE_COMPLEX_USE_MACHINE_HH #define HB_OT_SHAPE_COMPLEX_USE_MACHINE_HH -#include "hb-private.hh" +#include "hb.hh" #line 38 "hb-ot-shape-complex-use-machine.hh" diff --git a/src/hb-ot-shape-complex-use-machine.rl b/src/hb-ot-shape-complex-use-machine.rl index 7ec8a7fd1..a233b1200 100644 --- a/src/hb-ot-shape-complex-use-machine.rl +++ b/src/hb-ot-shape-complex-use-machine.rl @@ -29,7 +29,7 @@ #ifndef HB_OT_SHAPE_COMPLEX_USE_MACHINE_HH #define HB_OT_SHAPE_COMPLEX_USE_MACHINE_HH -#include "hb-private.hh" +#include "hb.hh" %%{ machine use_syllable_machine; diff --git a/src/hb-ot-shape-complex-use-table.cc b/src/hb-ot-shape-complex-use-table.cc index 9c796f051..4862b7fe9 100644 --- a/src/hb-ot-shape-complex-use-table.cc +++ b/src/hb-ot-shape-complex-use-table.cc @@ -15,7 +15,7 @@ * UnicodeData.txt does not have a header. */ -#include "hb-ot-shape-complex-use-private.hh" +#include "hb-ot-shape-complex-use.hh" #define B USE_B /* BASE */ #define CGJ USE_CGJ /* CGJ */ diff --git a/src/hb-ot-shape-complex-use.cc b/src/hb-ot-shape-complex-use.cc index f8e86c9d6..676b15b6e 100644 --- a/src/hb-ot-shape-complex-use.cc +++ b/src/hb-ot-shape-complex-use.cc @@ -26,8 +26,8 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-complex-use-private.hh" -#include "hb-ot-shape-complex-arabic-private.hh" +#include "hb-ot-shape-complex-use.hh" +#include "hb-ot-shape-complex-arabic.hh" /* buffer var allocations */ #define use_category() complex_var_u8_0() diff --git a/src/hb-ot-shape-complex-use-private.hh b/src/hb-ot-shape-complex-use.hh similarity index 94% rename from src/hb-ot-shape-complex-use-private.hh rename to src/hb-ot-shape-complex-use.hh index b4bda8bb7..b8123e791 100644 --- a/src/hb-ot-shape-complex-use-private.hh +++ b/src/hb-ot-shape-complex-use.hh @@ -26,13 +26,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_COMPLEX_USE_PRIVATE_HH -#define HB_OT_SHAPE_COMPLEX_USE_PRIVATE_HH +#ifndef HB_OT_SHAPE_COMPLEX_USE_HH +#define HB_OT_SHAPE_COMPLEX_USE_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-ot-shape-complex-private.hh" +#include "hb-ot-shape-complex.hh" #define USE_TABLE_ELEMENT_TYPE uint8_t @@ -94,4 +94,4 @@ enum use_category_t { HB_INTERNAL USE_TABLE_ELEMENT_TYPE hb_use_get_category (hb_codepoint_t u); -#endif /* HB_OT_SHAPE_COMPLEX_USE_PRIVATE_HH */ +#endif /* HB_OT_SHAPE_COMPLEX_USE_HH */ diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex.hh similarity index 98% rename from src/hb-ot-shape-complex-private.hh rename to src/hb-ot-shape-complex.hh index 37a4d918b..a48a38a20 100644 --- a/src/hb-ot-shape-complex-private.hh +++ b/src/hb-ot-shape-complex.hh @@ -24,13 +24,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_COMPLEX_PRIVATE_HH -#define HB_OT_SHAPE_COMPLEX_PRIVATE_HH +#ifndef HB_OT_SHAPE_COMPLEX_HH +#define HB_OT_SHAPE_COMPLEX_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-ot-shape-private.hh" -#include "hb-ot-shape-normalize-private.hh" +#include "hb-ot-shape.hh" +#include "hb-ot-shape-normalize.hh" @@ -390,4 +390,4 @@ hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner) } -#endif /* HB_OT_SHAPE_COMPLEX_PRIVATE_HH */ +#endif /* HB_OT_SHAPE_COMPLEX_HH */ diff --git a/src/hb-ot-shape-fallback.cc b/src/hb-ot-shape-fallback.cc index fbf31ab24..5f43023be 100644 --- a/src/hb-ot-shape-fallback.cc +++ b/src/hb-ot-shape-fallback.cc @@ -24,8 +24,8 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-fallback-private.hh" -#include "hb-ot-layout-gsubgpos-private.hh" +#include "hb-ot-shape-fallback.hh" +#include "hb-ot-layout-gsubgpos.hh" static unsigned int recategorize_combining_class (hb_codepoint_t u, diff --git a/src/hb-ot-shape-fallback-private.hh b/src/hb-ot-shape-fallback.hh similarity index 90% rename from src/hb-ot-shape-fallback-private.hh rename to src/hb-ot-shape-fallback.hh index e134224df..730e7f280 100644 --- a/src/hb-ot-shape-fallback-private.hh +++ b/src/hb-ot-shape-fallback.hh @@ -24,12 +24,12 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_FALLBACK_PRIVATE_HH -#define HB_OT_SHAPE_FALLBACK_PRIVATE_HH +#ifndef HB_OT_SHAPE_FALLBACK_HH +#define HB_OT_SHAPE_FALLBACK_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-ot-shape-private.hh" +#include "hb-ot-shape.hh" HB_INTERNAL void _hb_ot_shape_fallback_position (const hb_ot_shape_plan_t *plan, @@ -50,4 +50,4 @@ HB_INTERNAL void _hb_ot_shape_fallback_spaces (const hb_ot_shape_plan_t *plan, hb_buffer_t *buffer); -#endif /* HB_OT_SHAPE_FALLBACK_PRIVATE_HH */ +#endif /* HB_OT_SHAPE_FALLBACK_HH */ diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc index 358450ee7..fd0b63aec 100644 --- a/src/hb-ot-shape-normalize.cc +++ b/src/hb-ot-shape-normalize.cc @@ -24,9 +24,9 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-ot-shape-normalize-private.hh" -#include "hb-ot-shape-complex-private.hh" -#include "hb-ot-shape-private.hh" +#include "hb-ot-shape-normalize.hh" +#include "hb-ot-shape-complex.hh" +#include "hb-ot-shape.hh" /* diff --git a/src/hb-ot-shape-normalize-private.hh b/src/hb-ot-shape-normalize.hh similarity index 93% rename from src/hb-ot-shape-normalize-private.hh rename to src/hb-ot-shape-normalize.hh index c744e2645..4aea640b1 100644 --- a/src/hb-ot-shape-normalize-private.hh +++ b/src/hb-ot-shape-normalize.hh @@ -24,10 +24,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_NORMALIZE_PRIVATE_HH -#define HB_OT_SHAPE_NORMALIZE_PRIVATE_HH +#ifndef HB_OT_SHAPE_NORMALIZE_HH +#define HB_OT_SHAPE_NORMALIZE_HH -#include "hb-private.hh" +#include "hb.hh" /* buffer var allocations, used during the normalization process */ @@ -66,4 +66,4 @@ struct hb_ot_shape_normalize_context_t }; -#endif /* HB_OT_SHAPE_NORMALIZE_PRIVATE_HH */ +#endif /* HB_OT_SHAPE_NORMALIZE_HH */ diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc index 91ac28fd6..e571bd8a3 100644 --- a/src/hb-ot-shape.cc +++ b/src/hb-ot-shape.cc @@ -28,19 +28,19 @@ #define HB_SHAPER ot #define hb_ot_shape_plan_data_t hb_ot_shape_plan_t -#include "hb-shaper-impl-private.hh" +#include "hb-shaper-impl.hh" -#include "hb-ot-shape-private.hh" -#include "hb-ot-shape-complex-private.hh" -#include "hb-ot-shape-fallback-private.hh" -#include "hb-ot-shape-normalize-private.hh" +#include "hb-ot-shape.hh" +#include "hb-ot-shape-complex.hh" +#include "hb-ot-shape-fallback.hh" +#include "hb-ot-shape-normalize.hh" -#include "hb-ot-layout-private.hh" -#include "hb-unicode-private.hh" -#include "hb-set-private.hh" +#include "hb-ot-layout.hh" +#include "hb-unicode.hh" +#include "hb-set.hh" -#include "hb-ot-layout-gsubgpos-private.hh" -#include "hb-aat-layout-private.hh" +#include "hb-ot-layout-gsubgpos.hh" +#include "hb-aat-layout.hh" static hb_tag_t common_features[] = { HB_TAG('c','c','m','p'), diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape.hh similarity index 94% rename from src/hb-ot-shape-private.hh rename to src/hb-ot-shape.hh index d6898263f..b3a490a37 100644 --- a/src/hb-ot-shape-private.hh +++ b/src/hb-ot-shape.hh @@ -24,13 +24,13 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_OT_SHAPE_PRIVATE_HH -#define HB_OT_SHAPE_PRIVATE_HH +#ifndef HB_OT_SHAPE_HH +#define HB_OT_SHAPE_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-ot-map-private.hh" -#include "hb-ot-layout-private.hh" +#include "hb-ot-map.hh" +#include "hb-ot-layout.hh" @@ -109,4 +109,4 @@ struct hb_ot_shape_planner_t }; -#endif /* HB_OT_SHAPE_PRIVATE_HH */ +#endif /* HB_OT_SHAPE_HH */ diff --git a/src/hb-ot-tag.cc b/src/hb-ot-tag.cc index 991d8e77a..283723e27 100644 --- a/src/hb-ot-tag.cc +++ b/src/hb-ot-tag.cc @@ -26,7 +26,7 @@ * Google Author(s): Behdad Esfahbod, Roozbeh Pournader */ -#include "hb-private.hh" +#include "hb.hh" /* hb_script_t */ diff --git a/src/hb-ot-var-avar-table.hh b/src/hb-ot-var-avar-table.hh index ad063d32d..8343018b3 100644 --- a/src/hb-ot-var-avar-table.hh +++ b/src/hb-ot-var-avar-table.hh @@ -27,7 +27,7 @@ #ifndef HB_OT_VAR_AVAR_TABLE_HH #define HB_OT_VAR_AVAR_TABLE_HH -#include "hb-open-type-private.hh" +#include "hb-open-type.hh" /* * avar -- Axis Variations diff --git a/src/hb-ot-var-fvar-table.hh b/src/hb-ot-var-fvar-table.hh index 101476ed3..afd29046e 100644 --- a/src/hb-ot-var-fvar-table.hh +++ b/src/hb-ot-var-fvar-table.hh @@ -27,7 +27,7 @@ #ifndef HB_OT_VAR_FVAR_TABLE_HH #define HB_OT_VAR_FVAR_TABLE_HH -#include "hb-open-type-private.hh" +#include "hb-open-type.hh" /* * fvar -- Font Variations diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh index 2b384db71..086e922fd 100644 --- a/src/hb-ot-var-hvar-table.hh +++ b/src/hb-ot-var-hvar-table.hh @@ -27,7 +27,7 @@ #ifndef HB_OT_VAR_HVAR_TABLE_HH #define HB_OT_VAR_HVAR_TABLE_HH -#include "hb-ot-layout-common-private.hh" +#include "hb-ot-layout-common.hh" namespace OT { diff --git a/src/hb-ot-var-mvar-table.hh b/src/hb-ot-var-mvar-table.hh index dfde782f6..20dd2200c 100644 --- a/src/hb-ot-var-mvar-table.hh +++ b/src/hb-ot-var-mvar-table.hh @@ -27,7 +27,7 @@ #ifndef HB_OT_VAR_MVAR_TABLE_HH #define HB_OT_VAR_MVAR_TABLE_HH -#include "hb-ot-layout-common-private.hh" +#include "hb-ot-layout-common.hh" namespace OT { diff --git a/src/hb-ot-var.cc b/src/hb-ot-var.cc index 5b890a3b9..5d49ac149 100644 --- a/src/hb-ot-var.cc +++ b/src/hb-ot-var.cc @@ -24,9 +24,9 @@ * 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-var-avar-table.hh" #include "hb-ot-var-fvar-table.hh" #include "hb-ot-var-mvar-table.hh" diff --git a/src/hb-set-digest-private.hh b/src/hb-set-digest.hh similarity index 97% rename from src/hb-set-digest-private.hh rename to src/hb-set-digest.hh index e099a8264..4cd7c3ff8 100644 --- a/src/hb-set-digest-private.hh +++ b/src/hb-set-digest.hh @@ -24,10 +24,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_SET_DIGEST_PRIVATE_HH -#define HB_SET_DIGEST_PRIVATE_HH +#ifndef HB_SET_DIGEST_HH +#define HB_SET_DIGEST_HH -#include "hb-private.hh" +#include "hb.hh" /* * The set digests here implement various "filters" that support @@ -176,4 +176,4 @@ typedef hb_set_digest_combiner_t > hb_set_digest_t; -#endif /* HB_SET_DIGEST_PRIVATE_HH */ +#endif /* HB_SET_DIGEST_HH */ diff --git a/src/hb-set.cc b/src/hb-set.cc index 25027e6c2..09dc4b483 100644 --- a/src/hb-set.cc +++ b/src/hb-set.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-set-private.hh" +#include "hb-set.hh" /* Public API */ diff --git a/src/hb-set-private.hh b/src/hb-set.hh similarity index 99% rename from src/hb-set-private.hh rename to src/hb-set.hh index 032ddb1ee..a179ad13d 100644 --- a/src/hb-set-private.hh +++ b/src/hb-set.hh @@ -24,10 +24,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_SET_PRIVATE_HH -#define HB_SET_PRIVATE_HH +#ifndef HB_SET_HH +#define HB_SET_HH -#include "hb-private.hh" +#include "hb.hh" /* @@ -697,4 +697,4 @@ struct hb_set_t }; -#endif /* HB_SET_PRIVATE_HH */ +#endif /* HB_SET_HH */ diff --git a/src/hb-shape-plan.cc b/src/hb-shape-plan.cc index 0d61d9e1f..b0cf1e92d 100644 --- a/src/hb-shape-plan.cc +++ b/src/hb-shape-plan.cc @@ -24,11 +24,11 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" -#include "hb-shape-plan-private.hh" -#include "hb-shaper-private.hh" -#include "hb-font-private.hh" -#include "hb-buffer-private.hh" +#include "hb.hh" +#include "hb-shape-plan.hh" +#include "hb-shaper.hh" +#include "hb-font.hh" +#include "hb-buffer.hh" static void diff --git a/src/hb-shape-plan-private.hh b/src/hb-shape-plan.hh similarity index 92% rename from src/hb-shape-plan-private.hh rename to src/hb-shape-plan.hh index 7d020ff16..bf82b912b 100644 --- a/src/hb-shape-plan-private.hh +++ b/src/hb-shape-plan.hh @@ -24,11 +24,11 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_SHAPE_PLAN_PRIVATE_HH -#define HB_SHAPE_PLAN_PRIVATE_HH +#ifndef HB_SHAPE_PLAN_HH +#define HB_SHAPE_PLAN_HH -#include "hb-private.hh" -#include "hb-shaper-private.hh" +#include "hb.hh" +#include "hb-shaper.hh" struct hb_shape_plan_t @@ -64,4 +64,4 @@ DECLARE_NULL_INSTANCE (hb_shape_plan_t); #undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS -#endif /* HB_SHAPE_PLAN_PRIVATE_HH */ +#endif /* HB_SHAPE_PLAN_HH */ diff --git a/src/hb-shape.cc b/src/hb-shape.cc index d3e2692fe..e8eeff5b3 100644 --- a/src/hb-shape.cc +++ b/src/hb-shape.cc @@ -26,13 +26,13 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" -#include "hb-shaper-private.hh" -#include "hb-shape-plan-private.hh" -#include "hb-buffer-private.hh" -#include "hb-font-private.hh" -#include "hb-machinery-private.hh" +#include "hb-shaper.hh" +#include "hb-shape-plan.hh" +#include "hb-buffer.hh" +#include "hb-font.hh" +#include "hb-machinery.hh" /** * SECTION:hb-shape diff --git a/src/hb-shaper-impl-private.hh b/src/hb-shaper-impl.hh similarity index 82% rename from src/hb-shaper-impl-private.hh rename to src/hb-shaper-impl.hh index 4a10279c7..d40cb085a 100644 --- a/src/hb-shaper-impl-private.hh +++ b/src/hb-shaper-impl.hh @@ -24,15 +24,15 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_SHAPER_IMPL_PRIVATE_HH -#define HB_SHAPER_IMPL_PRIVATE_HH +#ifndef HB_SHAPER_IMPL_HH +#define HB_SHAPER_IMPL_HH -#include "hb-private.hh" +#include "hb.hh" -#include "hb-shaper-private.hh" -#include "hb-shape-plan-private.hh" -#include "hb-font-private.hh" -#include "hb-buffer-private.hh" +#include "hb-shaper.hh" +#include "hb-shape-plan.hh" +#include "hb-font.hh" +#include "hb-buffer.hh" #ifdef HB_SHAPER @@ -40,4 +40,4 @@ #endif -#endif /* HB_SHAPER_IMPL_PRIVATE_HH */ +#endif /* HB_SHAPER_IMPL_HH */ diff --git a/src/hb-shaper.cc b/src/hb-shaper.cc index 660dfb2bd..52418c082 100644 --- a/src/hb-shaper.cc +++ b/src/hb-shaper.cc @@ -24,9 +24,9 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" -#include "hb-shaper-private.hh" -#include "hb-machinery-private.hh" +#include "hb.hh" +#include "hb-shaper.hh" +#include "hb-machinery.hh" static const hb_shaper_pair_t all_shapers[] = { diff --git a/src/hb-shaper-private.hh b/src/hb-shaper.hh similarity index 97% rename from src/hb-shaper-private.hh rename to src/hb-shaper.hh index fb04bbc3c..361165e4f 100644 --- a/src/hb-shaper-private.hh +++ b/src/hb-shaper.hh @@ -24,10 +24,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_SHAPER_PRIVATE_HH -#define HB_SHAPER_PRIVATE_HH +#ifndef HB_SHAPER_HH +#define HB_SHAPER_HH -#include "hb-private.hh" +#include "hb.hh" typedef hb_bool_t hb_shape_func_t (hb_shape_plan_t *shape_plan, hb_font_t *font, @@ -131,4 +131,4 @@ struct hb_shaper_data_t { #define HB_SHAPERS_COUNT (sizeof (hb_shaper_data_t) / sizeof (void *)) -#endif /* HB_SHAPER_PRIVATE_HH */ +#endif /* HB_SHAPER_HH */ diff --git a/src/hb-static.cc b/src/hb-static.cc index ddecbba11..5112d77be 100644 --- a/src/hb-static.cc +++ b/src/hb-static.cc @@ -24,12 +24,12 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" -#include "hb-open-type-private.hh" -#include "hb-ot-layout-common-private.hh" +#include "hb-open-type.hh" +#include "hb-ot-layout-common.hh" -#include "hb-face-private.hh" +#include "hb-face.hh" #include "hb-ot-head-table.hh" #include "hb-ot-maxp-table.hh" diff --git a/src/hb-string-array.hh b/src/hb-string-array.hh index 679841c87..c4cf666d7 100644 --- a/src/hb-string-array.hh +++ b/src/hb-string-array.hh @@ -29,7 +29,7 @@ #define HB_STRING_ARRAY_HH #endif -#include "hb-private.hh" +#include "hb.hh" /* Based on Bruno Haible's code in Appendix B of Ulrich Drepper's dsohowto.pdf: * https://software.intel.com/sites/default/files/m/a/1/e/dsohowto.pdf */ diff --git a/src/hb-subset-glyf.cc b/src/hb-subset-glyf.cc index 36af3beae..e335912f6 100644 --- a/src/hb-subset-glyf.cc +++ b/src/hb-subset-glyf.cc @@ -24,7 +24,7 @@ * Google Author(s): Garret Rieger, Roderick Sheeter */ -#include "hb-open-type-private.hh" +#include "hb-open-type.hh" #include "hb-ot-glyf-table.hh" #include "hb-set.h" #include "hb-subset-glyf.hh" diff --git a/src/hb-subset-glyf.hh b/src/hb-subset-glyf.hh index 99b76db9b..c564206bd 100644 --- a/src/hb-subset-glyf.hh +++ b/src/hb-subset-glyf.hh @@ -27,7 +27,7 @@ #ifndef HB_SUBSET_GLYF_HH #define HB_SUBSET_GLYF_HH -#include "hb-private.hh" +#include "hb.hh" #include "hb-subset-plan.hh" diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index 74470fd1f..d68550d70 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -24,8 +24,8 @@ * Google Author(s): Garret Rieger, Rod Sheeter, Behdad Esfahbod */ -#include "hb-subset-private.hh" -#include "hb-set-private.hh" +#include "hb-subset.hh" +#include "hb-set.hh" /** * hb_subset_input_create_or_fail: diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index 6e556c20b..1f643dc08 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -24,9 +24,9 @@ * Google Author(s): Garret Rieger, Roderick Sheeter */ -#include "hb-map-private.hh" -#include "hb-subset-private.hh" -#include "hb-set-private.hh" +#include "hb-map.hh" +#include "hb-subset.hh" +#include "hb-set.hh" #include "hb-subset-plan.hh" #include "hb-ot-cmap-table.hh" diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh index b7f14d2ef..0f44f4b23 100644 --- a/src/hb-subset-plan.hh +++ b/src/hb-subset-plan.hh @@ -27,12 +27,12 @@ #ifndef HB_SUBSET_PLAN_HH #define HB_SUBSET_PLAN_HH -#include "hb-private.hh" +#include "hb.hh" #include "hb-subset.h" -#include "hb-subset-private.hh" +#include "hb-subset.hh" -#include "hb-map-private.hh" +#include "hb-map.hh" struct hb_subset_plan_t { diff --git a/src/hb-subset.cc b/src/hb-subset.cc index 319987ce0..ad8a1106e 100644 --- a/src/hb-subset.cc +++ b/src/hb-subset.cc @@ -24,14 +24,14 @@ * Google Author(s): Garret Rieger, Rod Sheeter, Behdad Esfahbod */ -#include "hb-private.hh" -#include "hb-open-type-private.hh" +#include "hb.hh" +#include "hb-open-type.hh" #include "hb-subset-glyf.hh" -#include "hb-subset-private.hh" +#include "hb-subset.hh" #include "hb-subset-plan.hh" -#include "hb-open-file-private.hh" +#include "hb-open-file.hh" #include "hb-ot-cmap-table.hh" #include "hb-ot-glyf-table.hh" #include "hb-ot-hdmx-table.hh" diff --git a/src/hb-subset-private.hh b/src/hb-subset.hh similarity index 90% rename from src/hb-subset-private.hh rename to src/hb-subset.hh index 42c93d7d3..e2993cda4 100644 --- a/src/hb-subset-private.hh +++ b/src/hb-subset.hh @@ -24,15 +24,15 @@ * Google Author(s): Garret Rieger, Roderick Sheeter */ -#ifndef HB_SUBSET_PRIVATE_HH -#define HB_SUBSET_PRIVATE_HH +#ifndef HB_SUBSET_HH +#define HB_SUBSET_HH -#include "hb-private.hh" +#include "hb.hh" #include "hb-subset.h" -#include "hb-font-private.hh" +#include "hb-font.hh" struct hb_subset_input_t { hb_object_header_t header; @@ -53,4 +53,4 @@ struct hb_subset_input_t { }; -#endif /* HB_SUBSET_PRIVATE_HH */ +#endif /* HB_SUBSET_HH */ diff --git a/src/hb-ucdn.cc b/src/hb-ucdn.cc index 56d13e7cd..624c1eb41 100644 --- a/src/hb-ucdn.cc +++ b/src/hb-ucdn.cc @@ -14,10 +14,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "hb-private.hh" +#include "hb.hh" -#include "hb-unicode-private.hh" -#include "hb-machinery-private.hh" +#include "hb-unicode.hh" +#include "hb-machinery.hh" #include "ucdn.h" diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc index 8cb417233..bb1cd6821 100644 --- a/src/hb-unicode.cc +++ b/src/hb-unicode.cc @@ -28,9 +28,9 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" -#include "hb-unicode-private.hh" +#include "hb-unicode.hh" @@ -450,7 +450,7 @@ hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs, } -/* See hb-unicode-private.hh for details. */ +/* See hb-unicode.hh for details. */ const uint8_t _hb_modified_combining_class[256] = { diff --git a/src/hb-unicode-private.hh b/src/hb-unicode.hh similarity index 99% rename from src/hb-unicode-private.hh rename to src/hb-unicode.hh index fb16ba437..e6bca5f08 100644 --- a/src/hb-unicode-private.hh +++ b/src/hb-unicode.hh @@ -28,10 +28,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_UNICODE_PRIVATE_HH -#define HB_UNICODE_PRIVATE_HH +#ifndef HB_UNICODE_HH +#define HB_UNICODE_HH -#include "hb-private.hh" +#include "hb.hh" extern HB_INTERNAL const uint8_t _hb_modified_combining_class[256]; @@ -366,4 +366,4 @@ DECLARE_NULL_INSTANCE (hb_unicode_funcs_t); FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) | \ FLAG (HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL))) -#endif /* HB_UNICODE_PRIVATE_HH */ +#endif /* HB_UNICODE_HH */ diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc index 11b7384fa..4a77c8c1f 100644 --- a/src/hb-uniscribe.cc +++ b/src/hb-uniscribe.cc @@ -24,9 +24,9 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #define HB_SHAPER uniscribe -#include "hb-shaper-impl-private.hh" +#include "hb-shaper-impl.hh" #include #include @@ -34,7 +34,7 @@ #include "hb-uniscribe.h" -#include "hb-open-file-private.hh" +#include "hb-open-file.hh" #include "hb-ot-name-table.hh" #include "hb-ot-tag.h" diff --git a/src/hb-utf-private.hh b/src/hb-utf.hh similarity index 98% rename from src/hb-utf-private.hh rename to src/hb-utf.hh index 211eb4dc0..eccb632e4 100644 --- a/src/hb-utf-private.hh +++ b/src/hb-utf.hh @@ -24,10 +24,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_UTF_PRIVATE_HH -#define HB_UTF_PRIVATE_HH +#ifndef HB_UTF_HH +#define HB_UTF_HH -#include "hb-private.hh" +#include "hb.hh" struct hb_utf8_t @@ -279,4 +279,4 @@ struct hb_latin1_t } }; -#endif /* HB_UTF_PRIVATE_HH */ +#endif /* HB_UTF_HH */ diff --git a/src/hb-vector-private.hh b/src/hb-vector.hh similarity index 97% rename from src/hb-vector-private.hh rename to src/hb-vector.hh index 1ef20d438..31341747c 100644 --- a/src/hb-vector-private.hh +++ b/src/hb-vector.hh @@ -25,10 +25,10 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_VECTOR_PRIVATE_HH -#define HB_VECTOR_PRIVATE_HH +#ifndef HB_VECTOR_HH +#define HB_VECTOR_HH -#include "hb-private.hh" +#include "hb.hh" template @@ -235,4 +235,4 @@ struct hb_vector_t }; -#endif /* HB_VECTOR_PRIVATE_HH */ +#endif /* HB_VECTOR_HH */ diff --git a/src/hb-warning.cc b/src/hb-warning.cc index f7a87b5ab..9fb410038 100644 --- a/src/hb-warning.cc +++ b/src/hb-warning.cc @@ -24,14 +24,14 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #if defined(HB_ATOMIC_INT_NIL) #error "Could not find any system to define atomic_int macros, library WILL NOT be thread-safe" -#error "Check hb-atomic-private.hh for possible resolutions." +#error "Check hb-atomic.hh for possible resolutions." #endif #if defined(HB_MUTEX_IMPL_NIL) #error "Could not find any system to define mutex macros, library WILL NOT be thread-safe" -#error "Check hb-mutex-private.hh for possible resolutions." +#error "Check hb-mutex.hh for possible resolutions." #endif diff --git a/src/hb-private.hh b/src/hb.hh similarity index 98% rename from src/hb-private.hh rename to src/hb.hh index efe7bda9e..557ae6b35 100644 --- a/src/hb-private.hh +++ b/src/hb.hh @@ -26,8 +26,8 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_PRIVATE_HH -#define HB_PRIVATE_HH +#ifndef HB_HH +#define HB_HH #define _GNU_SOURCE 1 @@ -470,11 +470,11 @@ _hb_memalign(void **memptr, size_t alignment, size_t size) /* Headers we include for everyone. Keep sorted. They express dependency amongst * themselves, but no other file should include them.*/ -#include "hb-atomic-private.hh" +#include "hb-atomic.hh" #include "hb-debug.hh" #include "hb-dsalgs.hh" -#include "hb-mutex-private.hh" +#include "hb-mutex.hh" #include "hb-null.hh" -#include "hb-object-private.hh" +#include "hb-object.hh" -#endif /* HB_PRIVATE_HH */ +#endif /* HB_HH */ diff --git a/src/main.cc b/src/main.cc index 98a1320bf..490b76e5b 100644 --- a/src/main.cc +++ b/src/main.cc @@ -25,9 +25,9 @@ */ #include "hb-static.cc" -#include "hb-open-file-private.hh" +#include "hb-open-file.hh" #include "hb-ot-layout-gdef-table.hh" -#include "hb-ot-layout-gsubgpos-private.hh" +#include "hb-ot-layout-gsubgpos.hh" #ifdef HAVE_GLIB #include diff --git a/src/test-buffer-serialize.cc b/src/test-buffer-serialize.cc index 39eb13da7..a91f4f7e9 100644 --- a/src/test-buffer-serialize.cc +++ b/src/test-buffer-serialize.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #include "hb.h" #include "hb-ot.h" diff --git a/src/test-size-params.cc b/src/test-size-params.cc index 3c43852b3..e53a47d8d 100644 --- a/src/test-size-params.cc +++ b/src/test-size-params.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #include "hb.h" #include "hb-ot.h" diff --git a/src/test-unicode-ranges.cc b/src/test-unicode-ranges.cc index dbc5fa426..1334ea030 100644 --- a/src/test-unicode-ranges.cc +++ b/src/test-unicode-ranges.cc @@ -24,7 +24,7 @@ * Google Author(s): Garret Rieger */ -#include "hb-private.hh" +#include "hb.hh" #include "hb-ot-os2-unicode-ranges.hh" diff --git a/src/test-would-substitute.cc b/src/test-would-substitute.cc index 1836d720c..268f7db98 100644 --- a/src/test-would-substitute.cc +++ b/src/test-would-substitute.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #include "hb.h" #include "hb-ot.h" diff --git a/src/test.cc b/src/test.cc index cf59e00ac..f0eace8c4 100644 --- a/src/test.cc +++ b/src/test.cc @@ -24,7 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-private.hh" +#include "hb.hh" #include "hb.h" diff --git a/test/api/test-common.c b/test/api/test-common.c index f6f0d4851..e9fae1351 100644 --- a/test/api/test-common.c +++ b/test/api/test-common.c @@ -32,7 +32,6 @@ static void test_types_int (void) { - /* We already ASSERT_STATIC these in hb-private.h, but anyway */ g_assert_cmpint (sizeof (int8_t), ==, 1); g_assert_cmpint (sizeof (uint8_t), ==, 1); g_assert_cmpint (sizeof (int16_t), ==, 2); diff --git a/util/Makefile.am b/util/Makefile.am index d4ab9cdc5..b8bf88418 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -47,7 +47,9 @@ hb_shape_SOURCES = $(HB_SHAPE_sources) bin_PROGRAMS += hb-shape hb_subset_SOURCES = $(HB_SUBSET_CLI_sources) -hb_subset_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la +hb_subset_LDADD = \ + $(LDADD) \ + $(top_builddir)/src/libharfbuzz-subset.la bin_PROGRAMS += hb-subset if HAVE_OT diff --git a/util/ansi-print.hh b/util/ansi-print.hh index 1ea5b3742..9640d892d 100644 --- a/util/ansi-print.hh +++ b/util/ansi-print.hh @@ -27,8 +27,7 @@ #ifndef ANSI_PRINT_HH #define ANSI_PRINT_HH -#include "hb-private.hh" -#include /* for int types */ +#include "hb.hh" void ansi_print_image_rgb24 (const uint32_t *data, diff --git a/util/hb-subset.cc b/util/hb-subset.cc index 20617554c..a15495fa2 100644 --- a/util/hb-subset.cc +++ b/util/hb-subset.cc @@ -29,7 +29,7 @@ #include "main-font-text.hh" #include "hb-subset.h" -#include "hb-subset-private.hh" +#include "hb-subset.hh" /* XXX */ /* * Command line interface to the harfbuzz font subsetter. diff --git a/util/helper-cairo-ansi.hh b/util/helper-cairo-ansi.hh index cf18ea495..bc2313219 100644 --- a/util/helper-cairo-ansi.hh +++ b/util/helper-cairo-ansi.hh @@ -27,7 +27,7 @@ #ifndef HELPER_CAIRO_ANSI_HH #define HELPER_CAIRO_ANSI_HH -#include "hb-private.hh" +#include "hb.hh" #include diff --git a/util/helper-cairo.hh b/util/helper-cairo.hh index 50bc0af09..1613ce427 100644 --- a/util/helper-cairo.hh +++ b/util/helper-cairo.hh @@ -27,7 +27,7 @@ #ifndef HELPER_CAIRO_HH #define HELPER_CAIRO_HH -#include "hb-private.hh" +#include "hb.hh" #include "options.hh" #include diff --git a/util/main-font-text.hh b/util/main-font-text.hh index 3390371c5..01bd2d4d9 100644 --- a/util/main-font-text.hh +++ b/util/main-font-text.hh @@ -27,7 +27,7 @@ #ifndef HB_MAIN_FONT_TEXT_HH #define HB_MAIN_FONT_TEXT_HH -#include "hb-private.hh" +#include "hb.hh" #include "options.hh" /* main() body for utilities taking font and processing text.*/ diff --git a/util/options.hh b/util/options.hh index 2160d5ec3..345790943 100644 --- a/util/options.hh +++ b/util/options.hh @@ -27,7 +27,7 @@ #ifndef OPTIONS_HH #define OPTIONS_HH -#include "hb-private.hh" +#include "hb.hh" #include #include diff --git a/util/shape-consumer.hh b/util/shape-consumer.hh index fa419f185..da0d88033 100644 --- a/util/shape-consumer.hh +++ b/util/shape-consumer.hh @@ -27,7 +27,7 @@ #ifndef HB_SHAPE_CONSUMER_HH #define HB_SHAPE_CONSUMER_HH -#include "hb-private.hh" +#include "hb.hh" #include "options.hh" diff --git a/util/view-cairo.hh b/util/view-cairo.hh index 00df68c29..677f74b38 100644 --- a/util/view-cairo.hh +++ b/util/view-cairo.hh @@ -27,7 +27,7 @@ #ifndef VIEW_CAIRO_HH #define VIEW_CAIRO_HH -#include "hb-private.hh" +#include "hb.hh" #include "options.hh" #include "helper-cairo.hh"