add OpenHarmony 1.0 baseline

6c3f0350 · wenjun · 4dbdf05b · 6c3f0350 · 6c3f0350 · 6c3f0350
1000 changed file
--- a/.ci/build-freetype.sh
+++ b/.ci/build-freetype.sh
--- a/.ci/trigger-coverity.sh
+++ b/.ci/trigger-coverity.sh
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
--- a/.clang-format
+++ b/.clang-format
--- a/.codecov.yml
+++ b/.codecov.yml
--- a/.editorconfig
+++ b/.editorconfig
--- a/.travis.yml
+++ b/.travis.yml
--- a/AUTHORS
+++ b/AUTHORS
--- a/BUILD.md
+++ b/BUILD.md
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CONFIG.md
+++ b/CONFIG.md
--- a/COPYING
+++ b/COPYING
--- a/COPYRIGHT.OpenSource
+++ b/COPYRIGHT.OpenSource
-Copyright © 2018  Google, Inc.
-Copyright © 2011  Google, Inc.
-Copyright © 2018  Ebrahim Byagowi
-Copyright © 2016  Google, Inc.
-Copyright © 2018 Adobe Inc.
-Copyright © 2016  Igalia S.L.
-Copyright © 2019  Ebrahim Byagowi
-Copyright © 2013  Google, Inc.
-Copyright © 2019  Google, Inc.
-Copyright © 2011  Codethink Limited
-Copyright 2000-2016 Adobe Systems Incorporated. All Rights Reserved.
-Copyright (c) 2010 Red Hat Inc.
-copyright statement(s).
-Copyright © 2010,2011,2012,2013,2014,2015,2016,2017,2018,2019  Google, Inc.
-Copyright © 2019  Facebook, Inc.
-Copyright © 2012  Mozilla Foundation
-Copyright © 2008,2010  Nokia Corporation and/or its subsidiary(-ies)
-Copyright © 2009  Keith Stribley
-Copyright © 2009  Martin Hosken and SIL International
-Copyright © 2007  Chris Wilson
-Copyright © 2006  Behdad Esfahbod
-Copyright © 2005  David Turner
-Copyright © 2004,2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 1998-2004  David Turner and Werner Lemberg
-Copyright © 2017  Google, Inc.
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2010,2011,2013  Google, Inc.
-Copyright © 2011,2012  Google, Inc.
-Copyright © 2019 Adobe Inc.
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2012,2013  Google, Inc.
-Copyright © 2004,2007,2009,2010  Red Hat, Inc.
-Copyright © 2004,2007,2009  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012,2013  Mozilla Foundation.
-Copyright © 2012  Mozilla Foundation.
-Copyright © 2015-2019  Ebrahim Byagowi
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2012,2018  Google, Inc.
-Copyright © 2015  Google, Inc.
-Copyright © 2011  Martin Hosken
-Copyright © 2011  SIL International
-Copyright © 2014  Google, Inc.
-Copyright © 2018  Khaled Hosny
-Copyright © 2019, Facebook Inc.
-Copyright © 2011,2014  Google, Inc.
-Copyright © 2010  Red Hat, Inc.
-Copyright © 2016  Elie Roux <elie.roux@telecom-bretagne.eu>
-Copyright © 2018-2019  Ebrahim Byagowi
-Copyright © 2010,2012  Google, Inc.
-Copyright © 2010,2011,2012  Google, Inc.
-Copyright © 2010,2012,2013  Google, Inc.
-Copyright © 2010,2011,2012,2013  Google, Inc.
-Copyright © 2018  Ebrahim Byagowi.
-Copyright © 2015  Mozilla Foundation.
-Copyright © 2011,2012,2013  Google, Inc.
-Copyright © 2013  Red Hat, Inc.
-Copyright © 2010  Google, Inc.
-Copyright © 2012,2017  Google, Inc.
-Copyright (C) 2012 Grigori Goronzy <greg@kinoho.net>
-# © 2019 Unicode®, Inc.
-Copyright © 2011,2012,2014  Google, Inc.
-Copyright © 2017,2018  Google, Inc.
-Copyright © 2019  Adobe, Inc.
-Copyright © 2010,2011  Google, Inc.
-Copyright 2016 Unicode Inc. All rights reserved.
-Copyright © 2002 Keith Packard
-Copyright © 2010  Behdad Esfahbod
\ No newline at end of file
--- a/Makefile.am
+++ b/Makefile.am
--- a/NEWS
+++ b/NEWS
--- a/README
+++ b/README
-README.md
\ No newline at end of file
--- a/README
+++ b/README
+[![Travis Build Status](https://travis-ci.org/harfbuzz/harfbuzz.svg?branch=master)](https://travis-ci.org/harfbuzz/harfbuzz)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/0t0flrxpstj9lb9w?svg=true&branch=master)](https://ci.appveyor.com/project/harfbuzz/harfbuzz)
+[![CircleCI Build Status](https://circleci.com/gh/harfbuzz/harfbuzz/tree/master.svg?style=svg)](https://circleci.com/gh/harfbuzz/harfbuzz/tree/master)
+[![OSS-Fuzz Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/harfbuzz.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html)
+[![Coverity Code Health](https://img.shields.io/coverity/scan/5450.svg)](https://scan.coverity.com/projects/behdad-harfbuzz)
+[![Codacy Code Health](https://api.codacy.com/project/badge/Grade/f17f1708783c447488bc8dd317150eaa)](https://app.codacy.com/app/behdad/harfbuzz)
+[![Codecov Code Coverage](https://codecov.io/gh/harfbuzz/harfbuzz/branch/master/graph/badge.svg)](https://codecov.io/gh/harfbuzz/harfbuzz)
+[![Coverals Code Coverage](https://img.shields.io/coveralls/harfbuzz/harfbuzz.svg)](https://coveralls.io/r/harfbuzz/harfbuzz)
+[ABI Tracker](http://abi-laboratory.pro/tracker/timeline/harfbuzz/)
+
+This is HarfBuzz, a text shaping library.
+
+For bug reports, mailing list, and other information please visit:
+
+  http://harfbuzz.org/
+
+For license information, see [COPYING](COPYING).
+
+For build information, see [BUILD.md](BUILD.md).
+
+For custom configurations, see [CONFIG.md](CONFIG.md).
+
+For test execution, see [TESTING.md](TESTING.md).
+
+Documentation: https://harfbuzz.github.io
--- a/README.OpenSource
+++ b/README.OpenSource
-[
-    {
-        "Name"                  : "harfbuzz",
-        "License"               : "MIT License",
-        "License File"          : "COPYING",
-        "Version Number"        : "2.6.1",
-        "Owner"                 : "liyujia 00401360",
-        "PDM Number"            : "05810PST",
-        "Upstream URL"          : "https://github.com/harfbuzz/harfbuzz/releases/tag/2.6.1",
-        "Use Application URL"   : "https://harfbuzz.github.io/",
-        "Description"           : "HarfBuzz is a text shaping engine. It primarily supports OpenType, but also Apple Advanced Typography. HarfBuzz is used in Android, Chrome, ChromeOS, Firefox, GNOME, GTK+, KDE, LibreOffice, OpenJDK, PlayStation, Qt, XeTeX, and other places."
-    }
-]
\ No newline at end of file
--- a/README.md
+++ b/README.md
--- a/README.mingw.md
+++ b/README.mingw.md
--- a/README.python.md
+++ b/README.python.md
--- a/RELEASING.md
+++ b/RELEASING.md
--- a/TESTING.md
+++ b/TESTING.md
--- a/THANKS
+++ b/THANKS
--- a/TODO
+++ b/TODO
--- a/appveyor.yml
+++ b/appveyor.yml
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
--- a/configure.ac
+++ b/configure.ac
--- a/docs/HarfBuzz.png
+++ b/docs/HarfBuzz.png
--- a/docs/HarfBuzz.svg
+++ b/docs/HarfBuzz.svg
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
--- a/docs/harfbuzz-docs.xml
+++ b/docs/harfbuzz-docs.xml
--- a/docs/harfbuzz-overrides.txt
+++ b/docs/harfbuzz-overrides.txt
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
--- a/docs/usermanual-buffers-language-script-and-direction.xml
+++ b/docs/usermanual-buffers-language-script-and-direction.xml
--- a/docs/usermanual-clusters.xml
+++ b/docs/usermanual-clusters.xml
--- a/docs/usermanual-fonts-and-faces.xml
+++ b/docs/usermanual-fonts-and-faces.xml
--- a/docs/usermanual-getting-started.xml
+++ b/docs/usermanual-getting-started.xml
--- a/docs/usermanual-glyph-information.xml
+++ b/docs/usermanual-glyph-information.xml
--- a/docs/usermanual-install-harfbuzz.xml
+++ b/docs/usermanual-install-harfbuzz.xml
--- a/docs/usermanual-object-model.xml
+++ b/docs/usermanual-object-model.xml
--- a/docs/usermanual-opentype-features.xml
+++ b/docs/usermanual-opentype-features.xml
--- a/docs/usermanual-shaping-concepts.xml
+++ b/docs/usermanual-shaping-concepts.xml
--- a/docs/usermanual-utilities.xml
+++ b/docs/usermanual-utilities.xml
--- a/docs/usermanual-what-is-harfbuzz.xml
+++ b/docs/usermanual-what-is-harfbuzz.xml
--- a/docs/version.xml.in
+++ b/docs/version.xml.in
--- a/git.mk
+++ b/git.mk
--- a/harfbuzz.doap
+++ b/harfbuzz.doap
--- a/m4/ax_check_link_flag.m4
+++ b/m4/ax_check_link_flag.m4
--- a/m4/ax_code_coverage.m4
+++ b/m4/ax_code_coverage.m4
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
--- a/m4/ax_pthread.m4
+++ b/m4/ax_pthread.m4
--- a/replace-enum-strings.cmake
+++ b/replace-enum-strings.cmake
--- a/src/HBIndicVowelConstraints.txt
+++ b/src/HBIndicVowelConstraints.txt
--- a/src/Makefile.am
+++ b/src/Makefile.am
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
--- a/src/dump-indic-data.cc
+++ b/src/dump-indic-data.cc
--- a/src/dump-khmer-data.cc
+++ b/src/dump-khmer-data.cc
--- a/src/dump-myanmar-data.cc
+++ b/src/dump-myanmar-data.cc
--- a/src/dump-use-data.cc
+++ b/src/dump-use-data.cc
--- a/src/harfbuzz-config.cmake.in
+++ b/src/harfbuzz-config.cmake.in
--- a/src/harfbuzz-gobject.pc.in
+++ b/src/harfbuzz-gobject.pc.in
--- a/src/harfbuzz-icu.pc.in
+++ b/src/harfbuzz-icu.pc.in
--- a/src/harfbuzz-subset.pc.in
+++ b/src/harfbuzz-subset.pc.in
--- a/src/harfbuzz.cc
+++ b/src/harfbuzz.cc
--- a/src/harfbuzz.pc.in
+++ b/src/harfbuzz.pc.in
--- a/src/hb-aat-fdsc-table.hh
+++ b/src/hb-aat-fdsc-table.hh
--- a/src/hb-aat-layout-ankr-table.hh
+++ b/src/hb-aat-layout-ankr-table.hh
--- a/src/hb-aat-layout-bsln-table.hh
+++ b/src/hb-aat-layout-bsln-table.hh
--- a/src/hb-aat-layout-common.hh
+++ b/src/hb-aat-layout-common.hh
--- a/src/hb-aat-layout-feat-table.hh
+++ b/src/hb-aat-layout-feat-table.hh
--- a/src/hb-aat-layout-just-table.hh
+++ b/src/hb-aat-layout-just-table.hh
--- a/src/hb-aat-layout-kerx-table.hh
+++ b/src/hb-aat-layout-kerx-table.hh
--- a/src/hb-aat-layout-lcar-table.hh
+++ b/src/hb-aat-layout-lcar-table.hh
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
--- a/src/hb-aat-layout-opbd-table.hh
+++ b/src/hb-aat-layout-opbd-table.hh
--- a/src/hb-aat-layout-trak-table.hh
+++ b/src/hb-aat-layout-trak-table.hh
--- a/src/hb-aat-layout.cc
+++ b/src/hb-aat-layout.cc
--- a/src/hb-aat-layout.h
+++ b/src/hb-aat-layout.h
--- a/src/hb-aat-layout.hh
+++ b/src/hb-aat-layout.hh
--- a/src/hb-aat-ltag-table.hh
+++ b/src/hb-aat-ltag-table.hh
--- a/src/hb-aat-map.cc
+++ b/src/hb-aat-map.cc
--- a/src/hb-aat-map.hh
+++ b/src/hb-aat-map.hh
--- a/src/hb-aat.h
+++ b/src/hb-aat.h
--- a/src/hb-algs.hh
+++ b/src/hb-algs.hh
--- a/src/hb-array.hh
+++ b/src/hb-array.hh
--- a/src/hb-atomic.hh
+++ b/src/hb-atomic.hh
--- a/src/hb-bimap.hh
+++ b/src/hb-bimap.hh
--- a/src/hb-blob.cc
+++ b/src/hb-blob.cc
--- a/src/hb-blob.h
+++ b/src/hb-blob.h
--- a/src/hb-blob.hh
+++ b/src/hb-blob.hh
--- a/src/hb-buffer-deserialize-json.hh
+++ b/src/hb-buffer-deserialize-json.hh
--- a/src/hb-buffer-deserialize-json.rl
+++ b/src/hb-buffer-deserialize-json.rl
--- a/src/hb-buffer-deserialize-text.hh
+++ b/src/hb-buffer-deserialize-text.hh
--- a/src/hb-buffer-deserialize-text.rl
+++ b/src/hb-buffer-deserialize-text.rl
--- a/src/hb-buffer-serialize.cc
+++ b/src/hb-buffer-serialize.cc
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
--- a/src/hb-buffer.h
+++ b/src/hb-buffer.h
--- a/src/hb-buffer.hh
+++ b/src/hb-buffer.hh
--- a/src/hb-cache.hh
+++ b/src/hb-cache.hh
--- a/src/hb-cff-interp-common.hh
+++ b/src/hb-cff-interp-common.hh
--- a/src/hb-cff-interp-cs-common.hh
+++ b/src/hb-cff-interp-cs-common.hh
--- a/src/hb-cff-interp-dict-common.hh
+++ b/src/hb-cff-interp-dict-common.hh
--- a/src/hb-cff1-interp-cs.hh
+++ b/src/hb-cff1-interp-cs.hh
--- a/src/hb-cff2-interp-cs.hh
+++ b/src/hb-cff2-interp-cs.hh
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
--- a/src/hb-common.h
+++ b/src/hb-common.h
--- a/src/hb-config.hh
+++ b/src/hb-config.hh
--- a/src/hb-coretext.cc
+++ b/src/hb-coretext.cc
--- a/src/hb-coretext.h
+++ b/src/hb-coretext.h
--- a/src/hb-debug.hh
+++ b/src/hb-debug.hh
--- a/src/hb-deprecated.h
+++ b/src/hb-deprecated.h
--- a/src/hb-directwrite.cc
+++ b/src/hb-directwrite.cc
--- a/src/hb-directwrite.h
+++ b/src/hb-directwrite.h
--- a/src/hb-dispatch.hh
+++ b/src/hb-dispatch.hh
--- a/src/hb-face.cc
+++ b/src/hb-face.cc
--- a/src/hb-face.h
+++ b/src/hb-face.h
--- a/src/hb-face.hh
+++ b/src/hb-face.hh
--- a/src/hb-fallback-shape.cc
+++ b/src/hb-fallback-shape.cc
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
--- a/src/hb-font.h
+++ b/src/hb-font.h
--- a/src/hb-font.hh
+++ b/src/hb-font.hh
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
--- a/src/hb-ft.h
+++ b/src/hb-ft.h
--- a/src/hb-gdi.cc
+++ b/src/hb-gdi.cc
--- a/src/hb-gdi.h
+++ b/src/hb-gdi.h
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
--- a/src/hb-glib.h
+++ b/src/hb-glib.h
--- a/src/hb-gobject-enums.cc.tmpl
+++ b/src/hb-gobject-enums.cc.tmpl
--- a/src/hb-gobject-enums.h.tmpl
+++ b/src/hb-gobject-enums.h.tmpl
--- a/src/hb-gobject-structs.cc
+++ b/src/hb-gobject-structs.cc
--- a/src/hb-gobject-structs.h
+++ b/src/hb-gobject-structs.h
--- a/src/hb-gobject.h
+++ b/src/hb-gobject.h
--- a/src/hb-graphite2.cc
+++ b/src/hb-graphite2.cc
--- a/src/hb-graphite2.h
+++ b/src/hb-graphite2.h
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
--- a/src/hb-icu.h
+++ b/src/hb-icu.h
--- a/src/hb-iter.hh
+++ b/src/hb-iter.hh
--- a/src/hb-kern.hh
+++ b/src/hb-kern.hh
--- a/src/hb-machinery.hh
+++ b/src/hb-machinery.hh
--- a/src/hb-map.cc
+++ b/src/hb-map.cc
--- a/src/hb-map.h
+++ b/src/hb-map.h
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
--- a/src/hb-meta.hh
+++ b/src/hb-meta.hh
--- a/src/hb-mutex.hh
+++ b/src/hb-mutex.hh
--- a/src/hb-null.hh
+++ b/src/hb-null.hh
--- a/src/hb-object.hh
+++ b/src/hb-object.hh
--- a/src/hb-open-file.hh
+++ b/src/hb-open-file.hh
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
--- a/src/hb-ot-cff-common.hh
+++ b/src/hb-ot-cff-common.hh
--- a/src/hb-ot-cff1-table.cc
+++ b/src/hb-ot-cff1-table.cc
--- a/src/hb-ot-cff1-table.hh
+++ b/src/hb-ot-cff1-table.hh
--- a/src/hb-ot-cff2-table.cc
+++ b/src/hb-ot-cff2-table.cc
--- a/src/hb-ot-cff2-table.hh
+++ b/src/hb-ot-cff2-table.hh
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
--- a/src/hb-ot-color-cbdt-table.hh
+++ b/src/hb-ot-color-cbdt-table.hh
--- a/src/hb-ot-color-colr-table.hh
+++ b/src/hb-ot-color-colr-table.hh
--- a/src/hb-ot-color-cpal-table.hh
+++ b/src/hb-ot-color-cpal-table.hh
--- a/src/hb-ot-color-sbix-table.hh
+++ b/src/hb-ot-color-sbix-table.hh
--- a/src/hb-ot-color-svg-table.hh
+++ b/src/hb-ot-color-svg-table.hh
--- a/src/hb-ot-color.cc
+++ b/src/hb-ot-color.cc
--- a/src/hb-ot-color.h
+++ b/src/hb-ot-color.h
--- a/src/hb-ot-deprecated.h
+++ b/src/hb-ot-deprecated.h
--- a/src/hb-ot-face-table-list.hh
+++ b/src/hb-ot-face-table-list.hh
--- a/src/hb-ot-face.cc
+++ b/src/hb-ot-face.cc
--- a/src/hb-ot-face.hh
+++ b/src/hb-ot-face.hh
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
--- a/src/hb-ot-font.h
+++ b/src/hb-ot-font.h
--- a/src/hb-ot-gasp-table.hh
+++ b/src/hb-ot-gasp-table.hh
--- a/src/hb-ot-glyf-table.hh
+++ b/src/hb-ot-glyf-table.hh
--- a/src/hb-ot-hdmx-table.hh
+++ b/src/hb-ot-hdmx-table.hh
--- a/src/hb-ot-head-table.hh
+++ b/src/hb-ot-head-table.hh
--- a/src/hb-ot-hhea-table.hh
+++ b/src/hb-ot-hhea-table.hh
--- a/src/hb-ot-hmtx-table.hh
+++ b/src/hb-ot-hmtx-table.hh
--- a/src/hb-ot-kern-table.hh
+++ b/src/hb-ot-kern-table.hh
--- a/src/hb-ot-layout-base-table.hh
+++ b/src/hb-ot-layout-base-table.hh
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
--- a/src/hb-ot-layout-gdef-table.hh
+++ b/src/hb-ot-layout-gdef-table.hh
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
--- a/src/hb-ot-layout-jstf-table.hh
+++ b/src/hb-ot-layout-jstf-table.hh
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
--- a/src/hb-ot-layout.hh
+++ b/src/hb-ot-layout.hh
--- a/src/hb-ot-map.cc
+++ b/src/hb-ot-map.cc
--- a/src/hb-ot-map.hh
+++ b/src/hb-ot-map.hh
--- a/src/hb-ot-math-table.hh
+++ b/src/hb-ot-math-table.hh
--- a/src/hb-ot-math.cc
+++ b/src/hb-ot-math.cc
--- a/src/hb-ot-math.h
+++ b/src/hb-ot-math.h
--- a/src/hb-ot-maxp-table.hh
+++ b/src/hb-ot-maxp-table.hh
--- a/src/hb-ot-meta-table.hh
+++ b/src/hb-ot-meta-table.hh
--- a/src/hb-ot-meta.cc
+++ b/src/hb-ot-meta.cc
--- a/src/hb-ot-meta.h
+++ b/src/hb-ot-meta.h
--- a/src/hb-ot-metrics.cc
+++ b/src/hb-ot-metrics.cc
--- a/src/hb-ot-metrics.h
+++ b/src/hb-ot-metrics.h
--- a/src/hb-ot-metrics.hh
+++ b/src/hb-ot-metrics.hh
--- a/src/hb-ot-name-language-static.hh
+++ b/src/hb-ot-name-language-static.hh
--- a/src/hb-ot-name-language.hh
+++ b/src/hb-ot-name-language.hh
--- a/src/hb-ot-name-table.hh
+++ b/src/hb-ot-name-table.hh
--- a/src/hb-ot-name.cc
+++ b/src/hb-ot-name.cc
--- a/src/hb-ot-name.h
+++ b/src/hb-ot-name.h
--- a/src/hb-ot-os2-table.hh
+++ b/src/hb-ot-os2-table.hh
--- a/src/hb-ot-os2-unicode-ranges.hh
+++ b/src/hb-ot-os2-unicode-ranges.hh
--- a/src/hb-ot-post-macroman.hh
+++ b/src/hb-ot-post-macroman.hh
--- a/src/hb-ot-post-table.hh
+++ b/src/hb-ot-post-table.hh
--- a/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/src/hb-ot-shape-complex-arabic-fallback.hh
--- a/src/hb-ot-shape-complex-arabic-table.hh
+++ b/src/hb-ot-shape-complex-arabic-table.hh
--- a/src/hb-ot-shape-complex-arabic-win1256.hh
+++ b/src/hb-ot-shape-complex-arabic-win1256.hh
--- a/src/hb-ot-shape-complex-arabic.cc
+++ b/src/hb-ot-shape-complex-arabic.cc
--- a/src/hb-ot-shape-complex-arabic.hh
+++ b/src/hb-ot-shape-complex-arabic.hh
--- a/src/hb-ot-shape-complex-default.cc
+++ b/src/hb-ot-shape-complex-default.cc
--- a/src/hb-ot-shape-complex-hangul.cc
+++ b/src/hb-ot-shape-complex-hangul.cc
--- a/src/hb-ot-shape-complex-hebrew.cc
+++ b/src/hb-ot-shape-complex-hebrew.cc
--- a/src/hb-ot-shape-complex-indic-machine.hh
+++ b/src/hb-ot-shape-complex-indic-machine.hh
--- a/src/hb-ot-shape-complex-indic-machine.rl
+++ b/src/hb-ot-shape-complex-indic-machine.rl
--- a/src/hb-ot-shape-complex-indic-table.cc
+++ b/src/hb-ot-shape-complex-indic-table.cc
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
--- a/src/hb-ot-shape-complex-indic.hh
+++ b/src/hb-ot-shape-complex-indic.hh
--- a/src/hb-ot-shape-complex-khmer-machine.hh
+++ b/src/hb-ot-shape-complex-khmer-machine.hh
--- a/src/hb-ot-shape-complex-khmer-machine.rl
+++ b/src/hb-ot-shape-complex-khmer-machine.rl
--- a/src/hb-ot-shape-complex-khmer.cc
+++ b/src/hb-ot-shape-complex-khmer.cc
--- a/src/hb-ot-shape-complex-khmer.hh
+++ b/src/hb-ot-shape-complex-khmer.hh
--- a/src/hb-ot-shape-complex-myanmar-machine.hh
+++ b/src/hb-ot-shape-complex-myanmar-machine.hh
--- a/src/hb-ot-shape-complex-myanmar-machine.rl
+++ b/src/hb-ot-shape-complex-myanmar-machine.rl
--- a/src/hb-ot-shape-complex-myanmar.cc
+++ b/src/hb-ot-shape-complex-myanmar.cc
--- a/src/hb-ot-shape-complex-myanmar.hh
+++ b/src/hb-ot-shape-complex-myanmar.hh
--- a/src/hb-ot-shape-complex-thai.cc
+++ b/src/hb-ot-shape-complex-thai.cc
--- a/src/hb-ot-shape-complex-use-machine.hh
+++ b/src/hb-ot-shape-complex-use-machine.hh
--- a/src/hb-ot-shape-complex-use-machine.rl
+++ b/src/hb-ot-shape-complex-use-machine.rl
--- a/src/hb-ot-shape-complex-use-table.cc
+++ b/src/hb-ot-shape-complex-use-table.cc
--- a/src/hb-ot-shape-complex-use.cc
+++ b/src/hb-ot-shape-complex-use.cc
--- a/src/hb-ot-shape-complex-use.hh
+++ b/src/hb-ot-shape-complex-use.hh
--- a/src/hb-ot-shape-complex-vowel-constraints.cc
+++ b/src/hb-ot-shape-complex-vowel-constraints.cc
--- a/src/hb-ot-shape-complex-vowel-constraints.hh
+++ b/src/hb-ot-shape-complex-vowel-constraints.hh
--- a/src/hb-ot-shape-complex.hh
+++ b/src/hb-ot-shape-complex.hh
--- a/src/hb-ot-shape-fallback.cc
+++ b/src/hb-ot-shape-fallback.cc
--- a/src/hb-ot-shape-fallback.hh
+++ b/src/hb-ot-shape-fallback.hh
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
--- a/src/hb-ot-shape-normalize.hh
+++ b/src/hb-ot-shape-normalize.hh
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
--- a/src/hb-ot-shape.h
+++ b/src/hb-ot-shape.h
--- a/src/hb-ot-shape.hh
+++ b/src/hb-ot-shape.hh
--- a/src/hb-ot-stat-table.hh
+++ b/src/hb-ot-stat-table.hh
--- a/src/hb-ot-tag-table.hh
+++ b/src/hb-ot-tag-table.hh
--- a/src/hb-ot-tag.cc
+++ b/src/hb-ot-tag.cc
--- a/src/hb-ot-var-avar-table.hh
+++ b/src/hb-ot-var-avar-table.hh
--- a/src/hb-ot-var-fvar-table.hh
+++ b/src/hb-ot-var-fvar-table.hh
--- a/src/hb-ot-var-hvar-table.hh
+++ b/src/hb-ot-var-hvar-table.hh
--- a/src/hb-ot-var-mvar-table.hh
+++ b/src/hb-ot-var-mvar-table.hh
--- a/src/hb-ot-var.cc
+++ b/src/hb-ot-var.cc
--- a/src/hb-ot-var.h
+++ b/src/hb-ot-var.h
--- a/src/hb-ot-vorg-table.hh
+++ b/src/hb-ot-vorg-table.hh
--- a/src/hb-ot.h
+++ b/src/hb-ot.h
--- a/src/hb-pool.hh
+++ b/src/hb-pool.hh
--- a/src/hb-sanitize.hh
+++ b/src/hb-sanitize.hh
--- a/src/hb-serialize.hh
+++ b/src/hb-serialize.hh
--- a/src/hb-set-digest.hh
+++ b/src/hb-set-digest.hh
--- a/src/hb-set.cc
+++ b/src/hb-set.cc
--- a/src/hb-set.h
+++ b/src/hb-set.h
--- a/src/hb-set.hh
+++ b/src/hb-set.hh
--- a/src/hb-shape-plan.cc
+++ b/src/hb-shape-plan.cc
--- a/src/hb-shape-plan.h
+++ b/src/hb-shape-plan.h
--- a/src/hb-shape-plan.hh
+++ b/src/hb-shape-plan.hh
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
--- a/src/hb-shape.h
+++ b/src/hb-shape.h
--- a/src/hb-shaper-impl.hh
+++ b/src/hb-shaper-impl.hh
--- a/src/hb-shaper-list.hh
+++ b/src/hb-shaper-list.hh
--- a/src/hb-shaper.cc
+++ b/src/hb-shaper.cc
--- a/src/hb-shaper.hh
+++ b/src/hb-shaper.hh
--- a/src/hb-static.cc
+++ b/src/hb-static.cc
--- a/src/hb-string-array.hh
+++ b/src/hb-string-array.hh
--- a/src/hb-subset-cff-common.cc
+++ b/src/hb-subset-cff-common.cc
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
--- a/src/hb-subset-cff1.hh
+++ b/src/hb-subset-cff1.hh
--- a/src/hb-subset-cff2.cc
+++ b/src/hb-subset-cff2.cc
--- a/src/hb-subset-cff2.hh
+++ b/src/hb-subset-cff2.hh
--- a/src/hb-subset-input.cc
+++ b/src/hb-subset-input.cc
--- a/src/hb-subset-input.hh
+++ b/src/hb-subset-input.hh
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
--- a/src/hb-subset-plan.hh
+++ b/src/hb-subset-plan.hh
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
--- a/src/hb-subset.h
+++ b/src/hb-subset.h
--- a/src/hb-subset.hh
+++ b/src/hb-subset.hh
--- a/src/hb-ucd-table.hh
+++ b/src/hb-ucd-table.hh
--- a/src/hb-ucd.cc
+++ b/src/hb-ucd.cc
--- a/src/hb-unicode-emoji-table.hh
+++ b/src/hb-unicode-emoji-table.hh
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
--- a/src/hb-unicode.h
+++ b/src/hb-unicode.h
--- a/src/hb-unicode.hh
+++ b/src/hb-unicode.hh
--- a/src/hb-uniscribe.cc
+++ b/src/hb-uniscribe.cc
--- a/src/hb-uniscribe.h
+++ b/src/hb-uniscribe.h
--- a/src/hb-utf.hh
+++ b/src/hb-utf.hh
--- a/src/hb-vector.hh
+++ b/src/hb-vector.hh
--- a/src/hb-version.h
+++ b/src/hb-version.h
--- a/src/hb-version.h.in
+++ b/src/hb-version.h.in
--- a/src/hb-warning.cc
+++ b/src/hb-warning.cc
--- a/src/hb.h
+++ b/src/hb.h
--- a/src/hb.hh
+++ b/src/hb.hh
--- a/src/main.cc
+++ b/src/main.cc
--- a/src/test-algs.cc
+++ b/src/test-algs.cc
--- a/src/test-bimap.cc
+++ b/src/test-bimap.cc
--- a/src/test-buffer-serialize.cc
+++ b/src/test-buffer-serialize.cc
--- a/src/test-gpos-size-params.cc
+++ b/src/test-gpos-size-params.cc
--- a/src/test-gsub-would-substitute.cc
+++ b/src/test-gsub-would-substitute.cc
--- a/src/test-iter.cc
+++ b/src/test-iter.cc
--- a/src/test-meta.cc
+++ b/src/test-meta.cc
--- a/src/test-ot-color.cc
+++ b/src/test-ot-color.cc
--- a/src/test-ot-meta.cc
+++ b/src/test-ot-meta.cc
--- a/src/test-ot-name.cc
+++ b/src/test-ot-name.cc
--- a/src/test-unicode-ranges.cc
+++ b/src/test-unicode-ranges.cc
--- a/src/test.cc
+++ b/src/test.cc
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
--- a/test/Makefile.am
+++ b/test/Makefile.am
--- a/test/api/CMakeLists.txt
+++ b/test/api/CMakeLists.txt
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
--- a/test/api/fonts/AdobeVFPrototype.abc.otf
+++ b/test/api/fonts/AdobeVFPrototype.abc.otf
--- a/test/api/fonts/AdobeVFPrototype.ac.nohints.otf
+++ b/test/api/fonts/AdobeVFPrototype.ac.nohints.otf
--- a/test/api/fonts/AdobeVFPrototype.ac.nosubrs.nohints.otf
+++ b/test/api/fonts/AdobeVFPrototype.ac.nosubrs.nohints.otf
--- a/test/api/fonts/AdobeVFPrototype.ac.nosubrs.otf
+++ b/test/api/fonts/AdobeVFPrototype.ac.nosubrs.otf
--- a/test/api/fonts/AdobeVFPrototype.ac.otf
+++ b/test/api/fonts/AdobeVFPrototype.ac.otf
--- a/test/api/fonts/AdobeVFPrototype.ac.retaingids.otf
+++ b/test/api/fonts/AdobeVFPrototype.ac.retaingids.otf
--- a/test/api/fonts/AdobeVFPrototype_vsindex.otf
+++ b/test/api/fonts/AdobeVFPrototype_vsindex.otf
--- a/test/api/fonts/Inconsolata-Regular.ab.ttf
+++ b/test/api/fonts/Inconsolata-Regular.ab.ttf
--- a/test/api/fonts/Inconsolata-Regular.abc.ttf
+++ b/test/api/fonts/Inconsolata-Regular.abc.ttf
--- a/test/api/fonts/Inconsolata-Regular.abc.widerc.ttf
+++ b/test/api/fonts/Inconsolata-Regular.abc.widerc.ttf
--- a/test/api/fonts/Inconsolata-Regular.ac.ttf
+++ b/test/api/fonts/Inconsolata-Regular.ac.ttf
--- a/test/api/fonts/Inconsolata-Regular.ac.widerc.ttf
+++ b/test/api/fonts/Inconsolata-Regular.ac.widerc.ttf
--- a/test/api/fonts/MathTestFontEmpty.otf
+++ b/test/api/fonts/MathTestFontEmpty.otf
--- a/test/api/fonts/MathTestFontFull.otf
+++ b/test/api/fonts/MathTestFontFull.otf
--- a/test/api/fonts/MathTestFontNone.otf
+++ b/test/api/fonts/MathTestFontNone.otf
--- a/test/api/fonts/MathTestFontPartial1.otf
+++ b/test/api/fonts/MathTestFontPartial1.otf
--- a/test/api/fonts/MathTestFontPartial2.otf
+++ b/test/api/fonts/MathTestFontPartial2.otf
--- a/test/api/fonts/MathTestFontPartial3.otf
+++ b/test/api/fonts/MathTestFontPartial3.otf
--- a/test/api/fonts/MathTestFontPartial4.otf
+++ b/test/api/fonts/MathTestFontPartial4.otf
--- a/test/api/fonts/Mplus1p-Regular.660E,6975,73E0,5EA6,8F38,6E05.ttf
+++ b/test/api/fonts/Mplus1p-Regular.660E,6975,73E0,5EA6,8F38,6E05.ttf
--- a/test/api/fonts/Mplus1p-Regular.660E.ttf
+++ b/test/api/fonts/Mplus1p-Regular.660E.ttf
--- a/test/api/fonts/README
+++ b/test/api/fonts/README
--- a/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf
+++ b/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf
--- a/test/api/fonts/Roboto-Regular.a.retaingids.ttf
+++ b/test/api/fonts/Roboto-Regular.a.retaingids.ttf
--- a/test/api/fonts/Roboto-Regular.abc.cmap-format12-only.ttf
+++ b/test/api/fonts/Roboto-Regular.abc.cmap-format12-only.ttf
--- a/test/api/fonts/Roboto-Regular.abc.format12.ttf
+++ b/test/api/fonts/Roboto-Regular.abc.format12.ttf
--- a/test/api/fonts/Roboto-Regular.abc.format4.ttf
+++ b/test/api/fonts/Roboto-Regular.abc.format4.ttf
--- a/test/api/fonts/Roboto-Regular.abc.ttf
+++ b/test/api/fonts/Roboto-Regular.abc.ttf
--- a/test/api/fonts/Roboto-Regular.ac.cmap-format12-only.ttf
+++ b/test/api/fonts/Roboto-Regular.ac.cmap-format12-only.ttf
--- a/test/api/fonts/Roboto-Regular.ac.nohints.ttf
+++ b/test/api/fonts/Roboto-Regular.ac.nohints.ttf
--- a/test/api/fonts/Roboto-Regular.ac.retaingids.ttf
+++ b/test/api/fonts/Roboto-Regular.ac.retaingids.ttf
--- a/test/api/fonts/Roboto-Regular.ac.ttf
+++ b/test/api/fonts/Roboto-Regular.ac.ttf
--- a/test/api/fonts/Roboto-Regular.b.ttf
+++ b/test/api/fonts/Roboto-Regular.b.ttf
--- a/test/api/fonts/Roboto-Regular.components.1fc.nohints.ttf
+++ b/test/api/fonts/Roboto-Regular.components.1fc.nohints.ttf
--- a/test/api/fonts/Roboto-Regular.components.subset.ttf
+++ b/test/api/fonts/Roboto-Regular.components.subset.ttf
--- a/test/api/fonts/Roboto-Regular.components.ttf
+++ b/test/api/fonts/Roboto-Regular.components.ttf
--- a/test/api/fonts/Roboto-Regular.gsub.fi.ttf
+++ b/test/api/fonts/Roboto-Regular.gsub.fi.ttf
--- a/test/api/fonts/Roboto-Regular.gsub.fil.ttf
+++ b/test/api/fonts/Roboto-Regular.gsub.fil.ttf
--- a/test/api/fonts/Roboto-Regular.multihdmx.a.ttf
+++ b/test/api/fonts/Roboto-Regular.multihdmx.a.ttf
--- a/test/api/fonts/Roboto-Regular.multihdmx.abc.ttf
+++ b/test/api/fonts/Roboto-Regular.multihdmx.abc.ttf
--- a/test/api/fonts/Roboto-Regular.nogsub.fi.ttf
+++ b/test/api/fonts/Roboto-Regular.nogsub.fi.ttf
--- a/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf
+++ b/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf
--- a/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf
+++ b/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf
--- a/test/api/fonts/SourceHanSans-Regular.41,4C2E.nosubrs.nohints.otf
+++ b/test/api/fonts/SourceHanSans-Regular.41,4C2E.nosubrs.nohints.otf
--- a/test/api/fonts/SourceHanSans-Regular.41,4C2E.nosubrs.otf
+++ b/test/api/fonts/SourceHanSans-Regular.41,4C2E.nosubrs.otf
--- a/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf
+++ b/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf
--- a/test/api/fonts/SourceHanSans-Regular.41,4C2E.retaingids.otf
+++ b/test/api/fonts/SourceHanSans-Regular.41,4C2E.retaingids.otf
--- a/test/api/fonts/SourceSansPro-Regular.abc.otf
+++ b/test/api/fonts/SourceSansPro-Regular.abc.otf
--- a/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf
+++ b/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf
--- a/test/api/fonts/SourceSansPro-Regular.ac.nosubrs.nohints.otf
+++ b/test/api/fonts/SourceSansPro-Regular.ac.nosubrs.nohints.otf
--- a/test/api/fonts/SourceSansPro-Regular.ac.nosubrs.otf
+++ b/test/api/fonts/SourceSansPro-Regular.ac.nosubrs.otf
--- a/test/api/fonts/SourceSansPro-Regular.ac.otf
+++ b/test/api/fonts/SourceSansPro-Regular.ac.otf
--- a/test/api/fonts/SourceSansPro-Regular.ac.retaingids.otf
+++ b/test/api/fonts/SourceSansPro-Regular.ac.retaingids.otf
--- a/test/api/fonts/TestCFF2VF.otf
+++ b/test/api/fonts/TestCFF2VF.otf
--- a/test/api/fonts/Zycon.ttf
+++ b/test/api/fonts/Zycon.ttf
--- a/test/api/fonts/aat-feat.ttf
+++ b/test/api/fonts/aat-feat.ttf
--- a/test/api/fonts/aat-morx.ttf
+++ b/test/api/fonts/aat-morx.ttf
--- a/test/api/fonts/aat-trak.ttf
+++ b/test/api/fonts/aat-trak.ttf
--- a/test/api/fonts/base.ttf
+++ b/test/api/fonts/base.ttf
--- a/test/api/fonts/cff1_dotsect.nohints.otf
+++ b/test/api/fonts/cff1_dotsect.nohints.otf
--- a/test/api/fonts/cff1_dotsect.otf
+++ b/test/api/fonts/cff1_dotsect.otf
--- a/test/api/fonts/cff1_expert.2D,F6E9,FB00.otf
+++ b/test/api/fonts/cff1_expert.2D,F6E9,FB00.otf
--- a/test/api/fonts/cff1_expert.otf
+++ b/test/api/fonts/cff1_expert.otf
--- a/test/api/fonts/cff1_flex.otf
+++ b/test/api/fonts/cff1_flex.otf
--- a/test/api/fonts/cff1_seac.C0.otf
+++ b/test/api/fonts/cff1_seac.C0.otf
--- a/test/api/fonts/cff1_seac.otf
+++ b/test/api/fonts/cff1_seac.otf
--- a/test/api/fonts/chromacheck-cbdt.ttf
+++ b/test/api/fonts/chromacheck-cbdt.ttf
--- a/test/api/fonts/chromacheck-colr.ttf
+++ b/test/api/fonts/chromacheck-colr.ttf
--- a/test/api/fonts/chromacheck-sbix.ttf
+++ b/test/api/fonts/chromacheck-sbix.ttf
--- a/test/api/fonts/chromacheck-svg.ttf
+++ b/test/api/fonts/chromacheck-svg.ttf
--- a/test/api/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5658272078495744
+++ b/test/api/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5658272078495744
--- a/test/api/fonts/cpal-v0.ttf
+++ b/test/api/fonts/cpal-v0.ttf
--- a/test/api/fonts/cpal-v1.ttf
+++ b/test/api/fonts/cpal-v1.ttf
--- a/test/api/fonts/cv01.otf
+++ b/test/api/fonts/cv01.otf
--- a/test/api/fonts/lcar.ttf
+++ b/test/api/fonts/lcar.ttf
--- a/test/api/fonts/meta.ttf
+++ b/test/api/fonts/meta.ttf
--- a/test/api/fonts/nameID.dup.expected.ttf
+++ b/test/api/fonts/nameID.dup.expected.ttf
--- a/test/api/fonts/nameID.dup.origin.ttf
+++ b/test/api/fonts/nameID.dup.origin.ttf
--- a/test/api/fonts/nameID.expected.ttf
+++ b/test/api/fonts/nameID.expected.ttf
--- a/test/api/fonts/nameID.origin.ttf
+++ b/test/api/fonts/nameID.origin.ttf
--- a/test/api/hb-subset-test.h
+++ b/test/api/hb-subset-test.h
--- a/test/api/hb-test.h
+++ b/test/api/hb-test.h
--- a/test/api/test-aat-layout.c
+++ b/test/api/test-aat-layout.c
--- a/test/api/test-baseline.c
+++ b/test/api/test-baseline.c
--- a/test/api/test-blob.c
+++ b/test/api/test-blob.c
--- a/test/api/test-buffer.c
+++ b/test/api/test-buffer.c
--- a/test/api/test-c.c
+++ b/test/api/test-c.c
--- a/test/api/test-collect-unicodes.c
+++ b/test/api/test-collect-unicodes.c
--- a/test/api/test-common.c
+++ b/test/api/test-common.c
--- a/test/api/test-cplusplus.cc
+++ b/test/api/test-cplusplus.cc
--- a/test/api/test-font.c
+++ b/test/api/test-font.c
--- a/test/api/test-map.c
+++ b/test/api/test-map.c
--- a/test/api/test-multithread.c
+++ b/test/api/test-multithread.c
--- a/test/api/test-object.c
+++ b/test/api/test-object.c
--- a/test/api/test-ot-color.c
+++ b/test/api/test-ot-color.c
--- a/test/api/test-ot-extents-cff.c
+++ b/test/api/test-ot-extents-cff.c
--- a/test/api/test-ot-face.c
+++ b/test/api/test-ot-face.c
--- a/test/api/test-ot-ligature-carets.c
+++ b/test/api/test-ot-ligature-carets.c
--- a/test/api/test-ot-math.c
+++ b/test/api/test-ot-math.c
--- a/test/api/test-ot-meta.c
+++ b/test/api/test-ot-meta.c
--- a/test/api/test-ot-metrics.c
+++ b/test/api/test-ot-metrics.c
--- a/test/api/test-ot-name.c
+++ b/test/api/test-ot-name.c
--- a/test/api/test-ot-tag.c
+++ b/test/api/test-ot-tag.c
--- a/test/api/test-set.c
+++ b/test/api/test-set.c
--- a/test/api/test-shape.c
+++ b/test/api/test-shape.c
--- a/test/api/test-subset-cff1.c
+++ b/test/api/test-subset-cff1.c
--- a/test/api/test-subset-cff2.c
+++ b/test/api/test-subset-cff2.c
--- a/test/api/test-subset-cmap.c
+++ b/test/api/test-subset-cmap.c
--- a/test/api/test-subset-drop-tables.c
+++ b/test/api/test-subset-drop-tables.c
--- a/test/api/test-subset-glyf.c
+++ b/test/api/test-subset-glyf.c
--- a/test/api/test-subset-hdmx.c
+++ b/test/api/test-subset-hdmx.c
--- a/test/api/test-subset-hmtx.c
+++ b/test/api/test-subset-hmtx.c
--- a/test/api/test-subset-nameids.c
+++ b/test/api/test-subset-nameids.c
--- a/test/api/test-subset-os2.c
+++ b/test/api/test-subset-os2.c
--- a/test/api/test-subset-post.c
+++ b/test/api/test-subset-post.c
--- a/test/api/test-subset-vmtx.c
+++ b/test/api/test-subset-vmtx.c
--- a/test/api/test-subset.c
+++ b/test/api/test-subset.c
--- a/test/api/test-unicode.c
+++ b/test/api/test-unicode.c
--- a/test/api/test-version.c
+++ b/test/api/test-version.c
--- a/test/fuzzing/CMakeLists.txt
+++ b/test/fuzzing/CMakeLists.txt
--- a/test/fuzzing/Makefile.am
+++ b/test/fuzzing/Makefile.am
--- a/test/fuzzing/README
+++ b/test/fuzzing/README
--- a/test/fuzzing/fonts/0509e80afb379d16560e9e47bdd7d888bebdebc6
+++ b/test/fuzzing/fonts/0509e80afb379d16560e9e47bdd7d888bebdebc6
--- a/test/fuzzing/fonts/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf
+++ b/test/fuzzing/fonts/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf
--- a/test/fuzzing/fonts/205edd09bd3d141cc9580f650109556cc28b22cb
+++ b/test/fuzzing/fonts/205edd09bd3d141cc9580f650109556cc28b22cb
--- a/test/fuzzing/fonts/217a934cfe15c548b572c203dceb2befdf026462
+++ b/test/fuzzing/fonts/217a934cfe15c548b572c203dceb2befdf026462
--- a/test/fuzzing/fonts/3511ff5c1647150595846ac414c595cccac34f18
+++ b/test/fuzzing/fonts/3511ff5c1647150595846ac414c595cccac34f18
--- a/test/fuzzing/fonts/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3
+++ b/test/fuzzing/fonts/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3
--- a/test/fuzzing/fonts/43979b90b2dd929723cf4fe1715990bcb9c9a56b
+++ b/test/fuzzing/fonts/43979b90b2dd929723cf4fe1715990bcb9c9a56b
--- a/test/fuzzing/fonts/558661aa659912f4d30ecd27bd09835171a8e2b0
+++ b/test/fuzzing/fonts/558661aa659912f4d30ecd27bd09835171a8e2b0
--- a/test/fuzzing/fonts/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8
+++ b/test/fuzzing/fonts/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8
--- a/test/fuzzing/fonts/641bd9db850193064d17575053ae2bf8ec149ddc
+++ b/test/fuzzing/fonts/641bd9db850193064d17575053ae2bf8ec149ddc
--- a/test/fuzzing/fonts/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f
+++ b/test/fuzzing/fonts/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f
--- a/test/fuzzing/fonts/a34a9191d9376bda419836effeef7e75c1386016
+++ b/test/fuzzing/fonts/a34a9191d9376bda419836effeef7e75c1386016
--- a/test/fuzzing/fonts/a69118c2c2ada48ff803d9149daa54c9ebdae30e
+++ b/test/fuzzing/fonts/a69118c2c2ada48ff803d9149daa54c9ebdae30e
--- a/test/fuzzing/fonts/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2
+++ b/test/fuzzing/fonts/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2
--- a/test/fuzzing/fonts/clusterfuzz-testcase-5517117891805184
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-5517117891805184
--- a/test/fuzzing/fonts/clusterfuzz-testcase-6107935408390144
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-6107935408390144
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-4666056377368576
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-4666056377368576
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-5662671558934528
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-5662671558934528
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-6243458541944832
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-6243458541944832
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-6303297511096320
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-6303297511096320
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-6696647723581440
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-fuzzer-6696647723581440
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5097734906839040
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5097734906839040
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5634395566768128
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5634395566768128
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5688420752424960
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5688420752424960
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5728971283496960
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5728971283496960
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5746142327865344
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5746142327865344
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5750379279548416
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5750379279548416
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5643036478930944
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5643036478930944
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5686186874503168
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5686186874503168
--- a/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5762137968869376
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5762137968869376
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-4884742786777088
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-4884742786777088
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-5255344882188288
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-5255344882188288
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-5720051798769664
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-5720051798769664
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-5924299061854208
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-5924299061854208
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-6460279560863744
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-6460279560863744
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5093685255077888
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5093685255077888
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5126525414014976
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5126525414014976
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5166320261529600
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5166320261529600
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5659690013556736
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5659690013556736
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5662548265009152
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5662548265009152
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5702671124791296
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5702671124791296
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5748102301614080
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5748102301614080
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5973566991106048
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5973566991106048
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-6252118652092416
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-6252118652092416
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4523479581851648
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4523479581851648
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4535496598355968
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4535496598355968
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4548492505645056
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4548492505645056
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4595692015190016
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4595692015190016
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4687441845813248
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4687441845813248
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4706238090706944
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4706238090706944
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4769173588672512
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4769173588672512
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4827735151083520
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4827735151083520
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4841745322868736
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4841745322868736
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4884742786777088
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-4884742786777088
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5216838347653120
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5216838347653120
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5255344882188288
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5255344882188288
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5294584596791296
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5294584596791296
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5303930168803328
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5303930168803328
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5331901587914752
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5331901587914752
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5388906574905344
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5388906574905344
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5517117891805184
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5517117891805184
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5617496443846656
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5617496443846656
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5672141338968064
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5672141338968064
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5700697074958336
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5700697074958336
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5713868010553344
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5713868010553344
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5720051798769664
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5720051798769664
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5924299061854208
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-5924299061854208
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6023178755244032
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6023178755244032
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6111685556305920
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6111685556305920
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6160439919509504
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6160439919509504
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6210176798425088
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6210176798425088
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6260579246276608
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6260579246276608
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6264625609834496
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6264625609834496
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6278851874258944
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6278851874258944
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6424351550210048
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6424351550210048
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6460279560863744
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6460279560863744
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6576177596596224
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6576177596596224
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6595199411159040
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6595199411159040
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6624904746106880
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6624904746106880
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6723367514144768
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-fuzzer-6723367514144768
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5175735354916864
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5175735354916864
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5629524117553152
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5629524117553152
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5630246225707008
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5630246225707008
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5631444412530688
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5631444412530688
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5633985665826816
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5633985665826816
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5634443633491968
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5634443633491968
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5634620935110656
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5634620935110656
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5635082459545600
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5635082459545600
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5647267827023872
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5647267827023872
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5649959857160192
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5649959857160192
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5650286710882304
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5650286710882304
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5652019562414080
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5652019562414080
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5656511058018304
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5656511058018304
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5659641787187200
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5659641787187200
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5664873493561344
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5664873493561344
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5667182741028864
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5667182741028864
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5668791174823936
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5668791174823936
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5672261407735808
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5672261407735808
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5674361600606208
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5674361600606208
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5677421274071040
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5677421274071040
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5679244475105280
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5679244475105280
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5685596677210112
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5685596677210112
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5686369209286656
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5686369209286656
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5688420752424960
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5688420752424960
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5691469793329152
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5691469793329152
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5695615258853376
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5695615258853376
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5696686572175360
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5696686572175360
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5700264032468992
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5700264032468992
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5706010589659136
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5706010589659136
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5716208469409792
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5716208469409792
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5718464350650368
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5718464350650368
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5718889451749376
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5718889451749376
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5719982789361664
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5719982789361664
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5722888989048832
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5722888989048832
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5725129603022848
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5725129603022848
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5725855502827520
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5725855502827520
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5726089628876800
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5726089628876800
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5729361857085440
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5729361857085440
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5733166795456512
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5733166795456512
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5734736291430400
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5734736291430400
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5735679418433536
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5735679418433536
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5736657639178240
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5736657639178240
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5738888765636608
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5738888765636608
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5740171484463104
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5740171484463104
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5750379279548416
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5750379279548416
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5754863779053568
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5754863779053568
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5762490181353472
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5762490181353472
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5762953198960640
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5762953198960640
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5764636557705216
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5764636557705216
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5768046065483776
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5768046065483776
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5768601332613120
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5768601332613120
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5067936541179904
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5067936541179904
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5077547978588160
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5077547978588160
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5359635656605696
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5359635656605696
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5629878397829120
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5629878397829120
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5634197349203968
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5634197349203968
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5651059347816448
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5651059347816448
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5660711141769216
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5660711141769216
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5669437462544384
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5669437462544384
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5670861909524480
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5670861909524480
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5672006905757696
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5672006905757696
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5672913680728064
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5672913680728064
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5676773460672512
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5676773460672512
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5680398559870976
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5680398559870976
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5690658895953920
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5690658895953920
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695279609675776
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695279609675776
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696607199166464
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696607199166464
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696825891225600
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696825891225600
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5710107829075968
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5710107829075968
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5711951464759296
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5711951464759296
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5716947896893440
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5716947896893440
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5718215406125056
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5718215406125056
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5725847365877760
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5725847365877760
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5738978499624960
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5738978499624960
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5739000398086144
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5739000398086144
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5743250149736448
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5743250149736448
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747265633779712
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747265633779712
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750092395970560
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750092395970560
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750420593442816
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750420593442816
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5758598970343424
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5758598970343424
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5760768497156096
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5760768497156096
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5761434614497280
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5761434614497280
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5764268627066880
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5764268627066880
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5765071062958080
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5765071062958080
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5768186323009536
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5768186323009536
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5923632099885056
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5923632099885056
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6543700493598720
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6543700493598720
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6651660668502016
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6651660668502016
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5203067375976448
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5203067375976448
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5630904853069824
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5630904853069824
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5687638085337088
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5687638085337088
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5736539338833920
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5736539338833920
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5930139383758848
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5930139383758848
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5973295416475648
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5973295416475648
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6136125075750912
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6136125075750912
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6394290358976512
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6394290358976512
--- a/test/fuzzing/fonts/crash-4b60576767ee4d9fe1cc10959d89baf73d4e8249
+++ b/test/fuzzing/fonts/crash-4b60576767ee4d9fe1cc10959d89baf73d4e8249
--- a/test/fuzzing/fonts/crash-b577db318b30f2851828a4c9ef97cb30678b1b54
+++ b/test/fuzzing/fonts/crash-b577db318b30f2851828a4c9ef97cb30678b1b54
--- a/test/fuzzing/fonts/crash-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
+++ b/test/fuzzing/fonts/crash-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
--- a/test/fuzzing/fonts/crash-e4e0bb1458a91b692eba492c907ae1f94e635480
+++ b/test/fuzzing/fonts/crash-e4e0bb1458a91b692eba492c907ae1f94e635480
--- a/test/fuzzing/fonts/e88c339237f52d21e01c55f01b9c1b4cc14a0467
+++ b/test/fuzzing/fonts/e88c339237f52d21e01c55f01b9c1b4cc14a0467
--- a/test/fuzzing/fonts/fab39d60d758cb586db5a504f218442cd1395725
+++ b/test/fuzzing/fonts/fab39d60d758cb586db5a504f218442cd1395725
--- a/test/fuzzing/fonts/oom-6ef8c96d3710262511bcc730dce9c00e722cb653
+++ b/test/fuzzing/fonts/oom-6ef8c96d3710262511bcc730dce9c00e722cb653
--- a/test/fuzzing/fonts/oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
+++ b/test/fuzzing/fonts/oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
--- a/test/fuzzing/hb-fuzzer.hh
+++ b/test/fuzzing/hb-fuzzer.hh
--- a/test/fuzzing/hb-shape-fuzzer.cc
+++ b/test/fuzzing/hb-shape-fuzzer.cc
--- a/test/fuzzing/hb-subset-fuzzer.cc
+++ b/test/fuzzing/hb-subset-fuzzer.cc
--- a/test/fuzzing/main.cc
+++ b/test/fuzzing/main.cc
--- a/test/shaping/CMakeLists.txt
+++ b/test/shaping/CMakeLists.txt
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
--- a/test/shaping/README.md
+++ b/test/shaping/README.md
--- a/test/shaping/data/Makefile.am
+++ b/test/shaping/data/Makefile.am
--- a/test/shaping/data/aots/COPYING
+++ b/test/shaping/data/aots/COPYING
--- a/test/shaping/data/aots/Makefile.am
+++ b/test/shaping/data/aots/Makefile.am
--- a/test/shaping/data/aots/Makefile.sources
+++ b/test/shaping/data/aots/Makefile.sources
--- a/test/shaping/data/aots/fonts/classdef1_font1.otf
+++ b/test/shaping/data/aots/fonts/classdef1_font1.otf
--- a/test/shaping/data/aots/fonts/classdef1_font2.otf
+++ b/test/shaping/data/aots/fonts/classdef1_font2.otf
--- a/test/shaping/data/aots/fonts/classdef1_font3.otf
+++ b/test/shaping/data/aots/fonts/classdef1_font3.otf
--- a/test/shaping/data/aots/fonts/classdef1_font4.otf
+++ b/test/shaping/data/aots/fonts/classdef1_font4.otf
--- a/test/shaping/data/aots/fonts/classdef2_font1.otf
+++ b/test/shaping/data/aots/fonts/classdef2_font1.otf
--- a/test/shaping/data/aots/fonts/classdef2_font2.otf
+++ b/test/shaping/data/aots/fonts/classdef2_font2.otf
--- a/test/shaping/data/aots/fonts/classdef2_font3.otf
+++ b/test/shaping/data/aots/fonts/classdef2_font3.otf
--- a/test/shaping/data/aots/fonts/classdef2_font4.otf
+++ b/test/shaping/data/aots/fonts/classdef2_font4.otf
--- a/test/shaping/data/aots/fonts/cmap0_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap0_font1.otf
--- a/test/shaping/data/aots/fonts/cmap10_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap10_font1.otf
--- a/test/shaping/data/aots/fonts/cmap10_font2.otf
+++ b/test/shaping/data/aots/fonts/cmap10_font2.otf
--- a/test/shaping/data/aots/fonts/cmap12_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap12_font1.otf
--- a/test/shaping/data/aots/fonts/cmap14_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap14_font1.otf
--- a/test/shaping/data/aots/fonts/cmap2_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap2_font1.otf
--- a/test/shaping/data/aots/fonts/cmap4_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap4_font1.otf
--- a/test/shaping/data/aots/fonts/cmap4_font2.otf
+++ b/test/shaping/data/aots/fonts/cmap4_font2.otf
--- a/test/shaping/data/aots/fonts/cmap4_font3.otf
+++ b/test/shaping/data/aots/fonts/cmap4_font3.otf
--- a/test/shaping/data/aots/fonts/cmap4_font4.otf
+++ b/test/shaping/data/aots/fonts/cmap4_font4.otf
--- a/test/shaping/data/aots/fonts/cmap6_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap6_font1.otf
--- a/test/shaping/data/aots/fonts/cmap6_font2.otf
+++ b/test/shaping/data/aots/fonts/cmap6_font2.otf
--- a/test/shaping/data/aots/fonts/cmap8_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap8_font1.otf
--- a/test/shaping/data/aots/fonts/cmap_composition_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap_composition_font1.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font1.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font2.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font2.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font3.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font3.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font4.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font4.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font5.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font5.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_simple_f3.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_simple_f3.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_simple_f4.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_simple_f4.otf
--- a/test/shaping/data/aots/fonts/gpos1_2_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos1_2_font1.otf
--- a/test/shaping/data/aots/fonts/gpos1_2_font2.otf
+++ b/test/shaping/data/aots/fonts/gpos1_2_font2.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_font6.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_font6.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_font7.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_font7.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f2.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font1.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font2.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font2.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font3.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font3.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font4.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font4.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font5.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font5.otf
--- a/test/shaping/data/aots/fonts/gpos3_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos3_font1.otf
--- a/test/shaping/data/aots/fonts/gpos3_font2.otf
+++ b/test/shaping/data/aots/fonts/gpos3_font2.otf
--- a/test/shaping/data/aots/fonts/gpos3_font3.otf
+++ b/test/shaping/data/aots/fonts/gpos3_font3.otf
--- a/test/shaping/data/aots/fonts/gpos4_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos4_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos4_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos4_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gpos4_multiple_anchors_1.otf
+++ b/test/shaping/data/aots/fonts/gpos4_multiple_anchors_1.otf
--- a/test/shaping/data/aots/fonts/gpos4_simple_1.otf
+++ b/test/shaping/data/aots/fonts/gpos4_simple_1.otf
--- a/test/shaping/data/aots/fonts/gpos5_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos5_font1.otf
--- a/test/shaping/data/aots/fonts/gpos6_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos6_font1.otf
--- a/test/shaping/data/aots/fonts/gpos7_1_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos7_1_font1.otf
--- a/test/shaping/data/aots/fonts/gpos9_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos9_font1.otf
--- a/test/shaping/data/aots/fonts/gpos9_font2.otf
+++ b/test/shaping/data/aots/fonts/gpos9_font2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_expansion_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_expansion_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_classes_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_classes_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_classes_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_classes_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_expansion_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_expansion_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context2_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context2_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context3_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context3_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context3_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context3_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context3_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context3_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context3_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context3_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_context3_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context3_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context3_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context3_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context3_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context3_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gsub1_1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub1_1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub1_1_modulo_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub1_1_modulo_f1.otf
--- a/test/shaping/data/aots/fonts/gsub1_1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub1_1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub1_2_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub1_2_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub1_2_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub1_2_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub2_1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub2_1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub2_1_multiple_sequences_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub2_1_multiple_sequences_f1.otf
--- a/test/shaping/data/aots/fonts/gsub2_1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub2_1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub3_1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub3_1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub3_1_multiple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub3_1_multiple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub3_1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub3_1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub4_1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub4_1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub4_1_multiple_ligatures_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub4_1_multiple_ligatures_f1.otf
--- a/test/shaping/data/aots/fonts/gsub4_1_multiple_ligatures_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub4_1_multiple_ligatures_f2.otf
--- a/test/shaping/data/aots/fonts/gsub4_1_multiple_ligsets_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub4_1_multiple_ligsets_f1.otf
--- a/test/shaping/data/aots/fonts/gsub4_1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub4_1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub7_font1.otf
+++ b/test/shaping/data/aots/fonts/gsub7_font1.otf
--- a/test/shaping/data/aots/fonts/gsub7_font2.otf
+++ b/test/shaping/data/aots/fonts/gsub7_font2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining1_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining1_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining2_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining2_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_chaining3_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_chaining3_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_expansion_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_expansion_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context1_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context1_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_classes_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_classes_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_classes_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_classes_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_expansion_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_expansion_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context2_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context2_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context3_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context3_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context3_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context3_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context3_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context3_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context3_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gsub_context3_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gsub_context3_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context3_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context3_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context3_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gsub_context3_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gsub_context3_successive_f1.otf
--- a/test/shaping/data/aots/fonts/lookupflag_ignore_attach_f1.otf
+++ b/test/shaping/data/aots/fonts/lookupflag_ignore_attach_f1.otf
--- a/test/shaping/data/aots/fonts/lookupflag_ignore_base_f1.otf
+++ b/test/shaping/data/aots/fonts/lookupflag_ignore_base_f1.otf
--- a/test/shaping/data/aots/fonts/lookupflag_ignore_combination_f1.otf
+++ b/test/shaping/data/aots/fonts/lookupflag_ignore_combination_f1.otf
--- a/test/shaping/data/aots/fonts/lookupflag_ignore_ligatures_f1.otf
+++ b/test/shaping/data/aots/fonts/lookupflag_ignore_ligatures_f1.otf
--- a/test/shaping/data/aots/fonts/lookupflag_ignore_marks_f1.otf
+++ b/test/shaping/data/aots/fonts/lookupflag_ignore_marks_f1.otf
--- a/test/shaping/data/aots/hb-aots-tester.cpp
+++ b/test/shaping/data/aots/hb-aots-tester.cpp
--- a/test/shaping/data/aots/tests/classdef1.tests
+++ b/test/shaping/data/aots/tests/classdef1.tests
--- a/test/shaping/data/aots/tests/classdef1_empty.tests
+++ b/test/shaping/data/aots/tests/classdef1_empty.tests
--- a/test/shaping/data/aots/tests/classdef1_multiple.tests
+++ b/test/shaping/data/aots/tests/classdef1_multiple.tests
--- a/test/shaping/data/aots/tests/classdef1_single.tests
+++ b/test/shaping/data/aots/tests/classdef1_single.tests
--- a/test/shaping/data/aots/tests/classdef2.tests
+++ b/test/shaping/data/aots/tests/classdef2.tests
--- a/test/shaping/data/aots/tests/classdef2_empty.tests
+++ b/test/shaping/data/aots/tests/classdef2_empty.tests
--- a/test/shaping/data/aots/tests/classdef2_multiple.tests
+++ b/test/shaping/data/aots/tests/classdef2_multiple.tests
--- a/test/shaping/data/aots/tests/classdef2_single.tests
+++ b/test/shaping/data/aots/tests/classdef2_single.tests
--- a/test/shaping/data/aots/tests/gpos1_1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos1_1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos1_1_simple.tests
+++ b/test/shaping/data/aots/tests/gpos1_1_simple.tests
--- a/test/shaping/data/aots/tests/gpos1_2.tests
+++ b/test/shaping/data/aots/tests/gpos1_2.tests
--- a/test/shaping/data/aots/tests/gpos1_2_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos1_2_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos2_1.tests
+++ b/test/shaping/data/aots/tests/gpos2_1.tests
--- a/test/shaping/data/aots/tests/gpos2_1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos2_1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos2_1_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gpos2_1_next_glyph.tests
--- a/test/shaping/data/aots/tests/gpos2_1_simple.tests
+++ b/test/shaping/data/aots/tests/gpos2_1_simple.tests
--- a/test/shaping/data/aots/tests/gpos2_2.tests
+++ b/test/shaping/data/aots/tests/gpos2_2.tests
--- a/test/shaping/data/aots/tests/gpos3.tests
+++ b/test/shaping/data/aots/tests/gpos3.tests
--- a/test/shaping/data/aots/tests/gpos3_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos3_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos4_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos4_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos4_multiple_anchors.tests
+++ b/test/shaping/data/aots/tests/gpos4_multiple_anchors.tests
--- a/test/shaping/data/aots/tests/gpos4_simple.tests
+++ b/test/shaping/data/aots/tests/gpos4_simple.tests
--- a/test/shaping/data/aots/tests/gpos5.tests
+++ b/test/shaping/data/aots/tests/gpos5.tests
--- a/test/shaping/data/aots/tests/gpos6.tests
+++ b/test/shaping/data/aots/tests/gpos6.tests
--- a/test/shaping/data/aots/tests/gpos7_1.tests
+++ b/test/shaping/data/aots/tests/gpos7_1.tests
--- a/test/shaping/data/aots/tests/gpos9.tests
+++ b/test/shaping/data/aots/tests/gpos9.tests
--- a/test/shaping/data/aots/tests/gpos_chaining1_boundary.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining1_boundary.tests
--- a/test/shaping/data/aots/tests/gpos_chaining1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos_chaining1_multiple_subrules.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining1_multiple_subrules.tests
--- a/test/shaping/data/aots/tests/gpos_chaining1_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining1_next_glyph.tests
--- a/test/shaping/data/aots/tests/gpos_chaining1_simple.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining1_simple.tests
--- a/test/shaping/data/aots/tests/gpos_chaining1_successive.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining1_successive.tests
--- a/test/shaping/data/aots/tests/gpos_chaining2_boundary.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining2_boundary.tests
--- a/test/shaping/data/aots/tests/gpos_chaining2_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining2_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos_chaining2_multiple_subrules.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining2_multiple_subrules.tests
--- a/test/shaping/data/aots/tests/gpos_chaining2_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining2_next_glyph.tests
--- a/test/shaping/data/aots/tests/gpos_chaining2_simple.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining2_simple.tests
--- a/test/shaping/data/aots/tests/gpos_chaining2_successive.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining2_successive.tests
--- a/test/shaping/data/aots/tests/gpos_chaining3_boundary.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining3_boundary.tests
--- a/test/shaping/data/aots/tests/gpos_chaining3_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining3_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos_chaining3_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining3_next_glyph.tests
--- a/test/shaping/data/aots/tests/gpos_chaining3_simple.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining3_simple.tests
--- a/test/shaping/data/aots/tests/gpos_chaining3_successive.tests
+++ b/test/shaping/data/aots/tests/gpos_chaining3_successive.tests
--- a/test/shaping/data/aots/tests/gpos_context1_boundary.tests
+++ b/test/shaping/data/aots/tests/gpos_context1_boundary.tests
--- a/test/shaping/data/aots/tests/gpos_context1_expansion.tests
+++ b/test/shaping/data/aots/tests/gpos_context1_expansion.tests
--- a/test/shaping/data/aots/tests/gpos_context1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos_context1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos_context1_multiple_subrules.tests
+++ b/test/shaping/data/aots/tests/gpos_context1_multiple_subrules.tests
--- a/test/shaping/data/aots/tests/gpos_context1_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gpos_context1_next_glyph.tests
--- a/test/shaping/data/aots/tests/gpos_context1_simple.tests
+++ b/test/shaping/data/aots/tests/gpos_context1_simple.tests
--- a/test/shaping/data/aots/tests/gpos_context1_successive.tests
+++ b/test/shaping/data/aots/tests/gpos_context1_successive.tests
--- a/test/shaping/data/aots/tests/gpos_context2_boundary.tests
+++ b/test/shaping/data/aots/tests/gpos_context2_boundary.tests
--- a/test/shaping/data/aots/tests/gpos_context2_classes.tests
+++ b/test/shaping/data/aots/tests/gpos_context2_classes.tests
--- a/test/shaping/data/aots/tests/gpos_context2_expansion.tests
+++ b/test/shaping/data/aots/tests/gpos_context2_expansion.tests
--- a/test/shaping/data/aots/tests/gpos_context2_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos_context2_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos_context2_multiple_subrules.tests
+++ b/test/shaping/data/aots/tests/gpos_context2_multiple_subrules.tests
--- a/test/shaping/data/aots/tests/gpos_context2_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gpos_context2_next_glyph.tests
--- a/test/shaping/data/aots/tests/gpos_context2_simple.tests
+++ b/test/shaping/data/aots/tests/gpos_context2_simple.tests
--- a/test/shaping/data/aots/tests/gpos_context2_successive.tests
+++ b/test/shaping/data/aots/tests/gpos_context2_successive.tests
--- a/test/shaping/data/aots/tests/gpos_context3_boundary.tests
+++ b/test/shaping/data/aots/tests/gpos_context3_boundary.tests
--- a/test/shaping/data/aots/tests/gpos_context3_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gpos_context3_lookupflag.tests
--- a/test/shaping/data/aots/tests/gpos_context3_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gpos_context3_next_glyph.tests
--- a/test/shaping/data/aots/tests/gpos_context3_simple.tests
+++ b/test/shaping/data/aots/tests/gpos_context3_simple.tests
--- a/test/shaping/data/aots/tests/gpos_context3_successive.tests
+++ b/test/shaping/data/aots/tests/gpos_context3_successive.tests
--- a/test/shaping/data/aots/tests/gsub1_1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub1_1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub1_1_modulo.tests
+++ b/test/shaping/data/aots/tests/gsub1_1_modulo.tests
--- a/test/shaping/data/aots/tests/gsub1_1_simple.tests
+++ b/test/shaping/data/aots/tests/gsub1_1_simple.tests
--- a/test/shaping/data/aots/tests/gsub1_2_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub1_2_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub1_2_simple.tests
+++ b/test/shaping/data/aots/tests/gsub1_2_simple.tests
--- a/test/shaping/data/aots/tests/gsub2_1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub2_1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub2_1_multiple_sequences.tests
+++ b/test/shaping/data/aots/tests/gsub2_1_multiple_sequences.tests
--- a/test/shaping/data/aots/tests/gsub2_1_simple.tests
+++ b/test/shaping/data/aots/tests/gsub2_1_simple.tests
--- a/test/shaping/data/aots/tests/gsub3_1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub3_1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub3_1_multiple.tests
+++ b/test/shaping/data/aots/tests/gsub3_1_multiple.tests
--- a/test/shaping/data/aots/tests/gsub3_1_simple.tests
+++ b/test/shaping/data/aots/tests/gsub3_1_simple.tests
--- a/test/shaping/data/aots/tests/gsub4_1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub4_1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub4_1_multiple_ligatures.tests
+++ b/test/shaping/data/aots/tests/gsub4_1_multiple_ligatures.tests
--- a/test/shaping/data/aots/tests/gsub4_1_multiple_ligsets.tests
+++ b/test/shaping/data/aots/tests/gsub4_1_multiple_ligsets.tests
--- a/test/shaping/data/aots/tests/gsub4_1_simple.tests
+++ b/test/shaping/data/aots/tests/gsub4_1_simple.tests
--- a/test/shaping/data/aots/tests/gsub7.tests
+++ b/test/shaping/data/aots/tests/gsub7.tests
--- a/test/shaping/data/aots/tests/gsub_chaining1_boundary.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining1_boundary.tests
--- a/test/shaping/data/aots/tests/gsub_chaining1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub_chaining1_multiple_subrules.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining1_multiple_subrules.tests
--- a/test/shaping/data/aots/tests/gsub_chaining1_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining1_next_glyph.tests
--- a/test/shaping/data/aots/tests/gsub_chaining1_simple.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining1_simple.tests
--- a/test/shaping/data/aots/tests/gsub_chaining1_successive.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining1_successive.tests
--- a/test/shaping/data/aots/tests/gsub_chaining2_boundary.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining2_boundary.tests
--- a/test/shaping/data/aots/tests/gsub_chaining2_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining2_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub_chaining2_multiple_subrules.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining2_multiple_subrules.tests
--- a/test/shaping/data/aots/tests/gsub_chaining2_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining2_next_glyph.tests
--- a/test/shaping/data/aots/tests/gsub_chaining2_simple.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining2_simple.tests
--- a/test/shaping/data/aots/tests/gsub_chaining2_successive.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining2_successive.tests
--- a/test/shaping/data/aots/tests/gsub_chaining3_boundary.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining3_boundary.tests
--- a/test/shaping/data/aots/tests/gsub_chaining3_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining3_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub_chaining3_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining3_next_glyph.tests
--- a/test/shaping/data/aots/tests/gsub_chaining3_simple.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining3_simple.tests
--- a/test/shaping/data/aots/tests/gsub_chaining3_successive.tests
+++ b/test/shaping/data/aots/tests/gsub_chaining3_successive.tests
--- a/test/shaping/data/aots/tests/gsub_context1_boundary.tests
+++ b/test/shaping/data/aots/tests/gsub_context1_boundary.tests
--- a/test/shaping/data/aots/tests/gsub_context1_expansion.tests
+++ b/test/shaping/data/aots/tests/gsub_context1_expansion.tests
--- a/test/shaping/data/aots/tests/gsub_context1_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub_context1_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub_context1_multiple_subrules.tests
+++ b/test/shaping/data/aots/tests/gsub_context1_multiple_subrules.tests
--- a/test/shaping/data/aots/tests/gsub_context1_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gsub_context1_next_glyph.tests
--- a/test/shaping/data/aots/tests/gsub_context1_simple.tests
+++ b/test/shaping/data/aots/tests/gsub_context1_simple.tests
--- a/test/shaping/data/aots/tests/gsub_context1_successive.tests
+++ b/test/shaping/data/aots/tests/gsub_context1_successive.tests
--- a/test/shaping/data/aots/tests/gsub_context2_boundary.tests
+++ b/test/shaping/data/aots/tests/gsub_context2_boundary.tests
--- a/test/shaping/data/aots/tests/gsub_context2_classes.tests
+++ b/test/shaping/data/aots/tests/gsub_context2_classes.tests
--- a/test/shaping/data/aots/tests/gsub_context2_expansion.tests
+++ b/test/shaping/data/aots/tests/gsub_context2_expansion.tests
--- a/test/shaping/data/aots/tests/gsub_context2_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub_context2_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub_context2_multiple_subrules.tests
+++ b/test/shaping/data/aots/tests/gsub_context2_multiple_subrules.tests
--- a/test/shaping/data/aots/tests/gsub_context2_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gsub_context2_next_glyph.tests
--- a/test/shaping/data/aots/tests/gsub_context2_simple.tests
+++ b/test/shaping/data/aots/tests/gsub_context2_simple.tests
--- a/test/shaping/data/aots/tests/gsub_context2_successive.tests
+++ b/test/shaping/data/aots/tests/gsub_context2_successive.tests
--- a/test/shaping/data/aots/tests/gsub_context3_boundary.tests
+++ b/test/shaping/data/aots/tests/gsub_context3_boundary.tests
--- a/test/shaping/data/aots/tests/gsub_context3_lookupflag.tests
+++ b/test/shaping/data/aots/tests/gsub_context3_lookupflag.tests
--- a/test/shaping/data/aots/tests/gsub_context3_next_glyph.tests
+++ b/test/shaping/data/aots/tests/gsub_context3_next_glyph.tests
--- a/test/shaping/data/aots/tests/gsub_context3_simple.tests
+++ b/test/shaping/data/aots/tests/gsub_context3_simple.tests
--- a/test/shaping/data/aots/tests/gsub_context3_successive.tests
+++ b/test/shaping/data/aots/tests/gsub_context3_successive.tests
--- a/test/shaping/data/aots/tests/lookupflag_ignore_attach.tests
+++ b/test/shaping/data/aots/tests/lookupflag_ignore_attach.tests
--- a/test/shaping/data/aots/tests/lookupflag_ignore_base.tests
+++ b/test/shaping/data/aots/tests/lookupflag_ignore_base.tests
--- a/test/shaping/data/aots/tests/lookupflag_ignore_combination.tests
+++ b/test/shaping/data/aots/tests/lookupflag_ignore_combination.tests
--- a/test/shaping/data/aots/tests/lookupflag_ignore_ligatures.tests
+++ b/test/shaping/data/aots/tests/lookupflag_ignore_ligatures.tests
--- a/test/shaping/data/aots/tests/lookupflag_ignore_marks.tests
+++ b/test/shaping/data/aots/tests/lookupflag_ignore_marks.tests
--- a/test/shaping/data/in-house/COPYING
+++ b/test/shaping/data/in-house/COPYING
--- a/test/shaping/data/in-house/Makefile.am
+++ b/test/shaping/data/in-house/Makefile.am
--- a/test/shaping/data/in-house/Makefile.sources
+++ b/test/shaping/data/in-house/Makefile.sources
--- a/test/shaping/data/in-house/fonts/03e3f463c3a985bc42096620cc415342818454fb.ttf
+++ b/test/shaping/data/in-house/fonts/03e3f463c3a985bc42096620cc415342818454fb.ttf
--- a/test/shaping/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf
+++ b/test/shaping/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf
--- a/test/shaping/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf
+++ b/test/shaping/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf
--- a/test/shaping/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf
+++ b/test/shaping/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf
--- a/test/shaping/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf
+++ b/test/shaping/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf
--- a/test/shaping/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf
+++ b/test/shaping/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf
--- a/test/shaping/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf
+++ b/test/shaping/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf
--- a/test/shaping/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf
+++ b/test/shaping/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf
--- a/test/shaping/data/in-house/fonts/1a5face3fcbd929d228235c2f72bbd6f8eb37424.ttf
+++ b/test/shaping/data/in-house/fonts/1a5face3fcbd929d228235c2f72bbd6f8eb37424.ttf
--- a/test/shaping/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf
+++ b/test/shaping/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf
--- a/test/shaping/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf
+++ b/test/shaping/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf
--- a/test/shaping/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf
+++ b/test/shaping/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf
--- a/test/shaping/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf
+++ b/test/shaping/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf
--- a/test/shaping/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf
+++ b/test/shaping/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf
--- a/test/shaping/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf
+++ b/test/shaping/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf
--- a/test/shaping/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf
+++ b/test/shaping/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf
--- a/test/shaping/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf
+++ b/test/shaping/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf
--- a/test/shaping/data/in-house/fonts/28f497629c04ceb15546c9a70e0730125ed6698d.ttf
+++ b/test/shaping/data/in-house/fonts/28f497629c04ceb15546c9a70e0730125ed6698d.ttf
--- a/test/shaping/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf
+++ b/test/shaping/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf
--- a/test/shaping/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf
+++ b/test/shaping/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf
--- a/test/shaping/data/in-house/fonts/2c25beb56d9c556622d56b0b5d02b4670c034f89.ttf
+++ b/test/shaping/data/in-house/fonts/2c25beb56d9c556622d56b0b5d02b4670c034f89.ttf
--- a/test/shaping/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf
+++ b/test/shaping/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf
--- a/test/shaping/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf
+++ b/test/shaping/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf
--- a/test/shaping/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf
+++ b/test/shaping/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf
--- a/test/shaping/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf
+++ b/test/shaping/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf
--- a/test/shaping/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf
+++ b/test/shaping/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf
--- a/test/shaping/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf
+++ b/test/shaping/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf
--- a/test/shaping/data/in-house/fonts/3c96e7a303c58475a8c750bf4289bbe73784f37d.ttf
+++ b/test/shaping/data/in-house/fonts/3c96e7a303c58475a8c750bf4289bbe73784f37d.ttf
--- a/test/shaping/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf
+++ b/test/shaping/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf
--- a/test/shaping/data/in-house/fonts/3cc01fede4debd4b7794ccb1b16cdb9987ea7571.ttf
+++ b/test/shaping/data/in-house/fonts/3cc01fede4debd4b7794ccb1b16cdb9987ea7571.ttf
--- a/test/shaping/data/in-house/fonts/3cf6f8ac6d647473a43a3100e7494b202b2cfafe.ttf
+++ b/test/shaping/data/in-house/fonts/3cf6f8ac6d647473a43a3100e7494b202b2cfafe.ttf
--- a/test/shaping/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf
+++ b/test/shaping/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf
--- a/test/shaping/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf
+++ b/test/shaping/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf