diff -Nru harfbuzz-1.7.1/aclocal.m4 harfbuzz-1.7.2/aclocal.m4 --- harfbuzz-1.7.1/aclocal.m4 2017-11-14 19:13:32.000000000 +0000 +++ harfbuzz-1.7.2/aclocal.m4 2017-12-04 16:52:58.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html # =========================================================================== # # SYNOPSIS @@ -52,7 +52,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 1 +#serial 2 AC_DEFUN([AX_REQUIRE_DEFINED], [dnl m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) @@ -155,7 +155,7 @@ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,7 +170,7 @@ [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -186,12 +186,12 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -253,7 +253,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -305,7 +305,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -336,7 +336,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -527,7 +527,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -603,7 +603,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -800,7 +800,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -821,7 +821,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -842,7 +842,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -892,7 +892,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -931,7 +931,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -960,7 +960,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1007,7 +1007,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1026,7 +1026,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1107,7 +1107,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1167,7 +1167,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1195,7 +1195,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1214,7 +1214,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru harfbuzz-1.7.1/BUILD.md harfbuzz-1.7.2/BUILD.md --- harfbuzz-1.7.1/BUILD.md 2017-10-13 10:58:06.000000000 +0000 +++ harfbuzz-1.7.2/BUILD.md 2017-11-20 21:10:35.000000000 +0000 @@ -9,7 +9,7 @@ provided by Microsoft, for building HarfBuzz and other open-source libraries but if you need to build harfbuzz from source, put ragel binary on your PATH and follow appveyor CI's cmake -[build steps](https://github.com/behdad/harfbuzz/blob/master/appveyor.yml). +[build steps](https://github.com/harfbuzz/harfbuzz/blob/master/appveyor.yml). on macOS, using MacPorts: * sudo port install freetype glib2 cairo diff -Nru harfbuzz-1.7.1/ChangeLog harfbuzz-1.7.2/ChangeLog --- harfbuzz-1.7.1/ChangeLog 2017-11-14 19:13:44.000000000 +0000 +++ harfbuzz-1.7.2/ChangeLog 2017-12-04 17:01:54.000000000 +0000 @@ -1,3 +1,569 @@ +commit 843f7f70355f62511a5d8be3b905c853bf362629 +Author: Behdad Esfahbod +Date: Mon Dec 4 08:52:39 2017 -0800 + + 1.7.2 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit eeb26d21d493183f54704487754d53a127b017ae +Author: Behdad Esfahbod +Date: Sat Dec 2 15:22:04 2017 -0800 + + [set] Actually commit fixes mentioned in previous commit! + + src/hb-set-private.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 20b4672754baf9751642bb37344a6ff4e224dc37 +Author: Behdad Esfahbod +Date: Sat Dec 2 15:14:26 2017 -0800 + + [set] Fix recent changes + + Ouch! + + Add tests. + + test/api/test-set.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 0744149cdabd85d632822ff810d3994787bca4b7 +Author: Behdad Esfahbod +Date: Sat Dec 2 15:06:15 2017 -0800 + + [set] Protect against bad input in hb_set_add_range() + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d5e29303db47a1868fa9b044ca61e146f882179c +Author: Behdad Esfahbod +Date: Tue Nov 28 23:11:34 2017 -0800 + + [coretext] Add hb_coretext_font_create() + + Fixes https://github.com/harfbuzz/harfbuzz/issues/628 + + New API: + hb_coretext_font_create() + + src/hb-coretext.cc | 55 + ++++++++++++++++++++++++++++++++++-------------------- + src/hb-coretext.h | 3 +++ + 2 files changed, 38 insertions(+), 20 deletions(-) + +commit 9d0194b3a8e0c562249337fa0cf4d72e89334263 +Author: Behdad Esfahbod +Date: Fri Dec 1 13:56:06 2017 -0800 + + [set] Optimize add_range() some more + + It's as good as it gets, and seems to be on par with previous set + implementation + in my benchmark. + + Would be great if someone can double-check my bitops. + + src/hb-set-private.hh | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 438c325a256f040c6be840924ed42dcbcd8a049a +Author: Behdad Esfahbod +Date: Fri Dec 1 13:34:14 2017 -0800 + + [set] Optimize add_range() + + With new set implementation, this became really costy. Optimize it. + There's more to be done, but this shaves off most of the fat. + + Part of fixing + https://bugs.chromium.org/p/chromium/issues/detail?id=782220 + + src/hb-set-private.hh | 56 + +++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 41 insertions(+), 15 deletions(-) + +commit be9e307a889e04d198042ad39949d3971232ab26 +Author: Behdad Esfahbod +Date: Fri Dec 1 12:36:26 2017 -0800 + + [ot] Ensure layout in hb_ot_layout_table_get_lookup_count() + + src/hb-ot-layout.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d9066afd6bc260d2f2ad5cd5b3e8b196e944d3d8 +Author: Behdad Esfahbod +Date: Wed Nov 29 16:18:18 2017 -0800 + + Add another test for previous commit + + From https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4273 + + .../sha1sum/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf | Bin 0 -> + 204 bytes + test/shaping/tests/fuzzed.tests | 1 + + 2 files changed, 1 insertion(+) + +commit 16fba5b2158a0e093e6df32637eba5058942e299 +Author: Behdad Esfahbod +Date: Wed Nov 29 16:08:11 2017 -0800 + + [ot] Fix Extension type recurse to disallow recursing to another + Extension + + Particularly hazardous if the second layer mixes forward and backward + lookups. + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4336 + + src/hb-ot-layout-gsub-table.hh | 6 ++++-- + .../sha1sum/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf | Bin 0 -> + 4545 bytes + .../sha1sum/ef2511f215aa3ca847cbfffbf861793b42170875.ttf | Bin 0 -> + 1152 bytes + test/shaping/tests/fuzzed.tests | 2 ++ + 4 files changed, 6 insertions(+), 2 deletions(-) + +commit 7ab49de987b856312d7ad1d02639f7306aa0ad2f +Author: Behdad Esfahbod +Date: Wed Nov 29 14:20:09 2017 -0800 + + Try fixing Mac build with 10.12 + + Related + https://github.com/harfbuzz/harfbuzz/issues/345 + https://github.com/harfbuzz/harfbuzz/pull/629 + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit d672bcf9d72bb473f5f53089c8af595c4047bc99 +Author: Behdad Esfahbod +Date: Tue Nov 28 22:20:57 2017 -0800 + + Minor + + docs/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 23ade70783a17ed6822d13e7a910544de2ef181f +Author: Behdad Esfahbod +Date: Tue Nov 21 16:36:07 2017 -0800 + + [doc] Optimize HarfBuzz.png; add HarfBuzz.svg + + SVG is unused. Just keeping it here. + + docs/HarfBuzz.png | Bin 14203 -> 8814 bytes + docs/HarfBuzz.svg | 277 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 277 insertions(+) + +commit 77efdecadddbd68bbbc0ff85ac84e24976ad4d4f +Author: Khaled Hosny +Date: Wed Nov 22 00:14:29 2017 +0200 + + Improve the docs commit message a bit + + .ci/deploy-docs.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a13c0748c59a92812469ada762d57bce3b02fe34 +Author: Ebrahim Byagowi +Date: Tue Nov 21 09:52:18 2017 +0330 + + Move gh-pages docs to harfbuzz.github.io + + .ci/deploy-docs.sh | 10 +++++----- + README | 2 ++ + docs/HarfBuzz.png | Bin 12710 -> 14203 bytes + docs/circle.yml | 3 --- + 4 files changed, 7 insertions(+), 8 deletions(-) + +commit 9f259769a61f17b47701bbad79e1865571338417 +Author: David Corbett +Date: Tue Nov 21 14:16:10 2017 -0500 + + Categorize U+A8B4 as Consonant_Medial + + src/gen-use-table.py | 3 +++ + src/hb-ot-shape-complex-use-table.cc | 2 +- + .../sha1sum/373e67bf41ca264e260a9716162b71a23549e885.ttf | Bin 0 -> + 1164 bytes + test/shaping/tests/use-syllable.tests | 1 + + 4 files changed, 5 insertions(+), 1 deletion(-) + +commit cd8c62fd41ca824c5db3c55fd1faa20318ca0bf9 +Author: ebraminio +Date: Tue Nov 21 01:07:26 2017 -0500 + + [ci] Add Oracle Developer Studio (former Sun Studio) based compiler + (#621) + + .circleci/config.yml | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 8d55340593ce32e55cfbd86a17c0be8750e8fb72 +Author: Behdad Esfahbod +Date: Mon Nov 20 19:43:22 2017 -0800 + + Fix fallback positioning of double diacritic marks + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=787284 + + src/hb-ot-shape-fallback.cc | 4 ++-- + .../sha1sum/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf | Bin 0 -> + 892 bytes + test/shaping/tests/fallback-positioning.tests | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) + +commit bb7cc4eada06839a3892cea5919f0c310cbaf7c3 +Author: Behdad Esfahbod +Date: Mon Nov 20 19:39:47 2017 -0800 + + Minor + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0ad0d5bb8260cb297ff114adca7c8d05b6128bb +Author: Behdad Esfahbod +Date: Mon Nov 20 15:07:48 2017 -0800 + + [docs] s/Harfbuzz/HarfBuzz/g + + docs/harfbuzz-docs.xml | 2 +- + ...anual-buffers-language-script-and-direction.xml | 10 +++---- + docs/usermanual-fonts-and-faces.xml | 2 +- + docs/usermanual-hello-harfbuzz.xml | 34 + +++++++++++----------- + docs/usermanual-install-harfbuzz.xml | 2 +- + docs/usermanual-what-is-harfbuzz.xml | 20 ++++++------- + 6 files changed, 35 insertions(+), 35 deletions(-) + +commit 87d74605f5f9db685bef7329f498437b4d868e6f +Author: David Corbett +Date: Mon Nov 20 13:19:34 2017 -0500 + + Categorize U+0C80 as Consonant_Placeholder + + src/hb-ot-shape-complex-indic.cc | 1 + + .../sha1sum/81c368a33816fb20e9f647e8f24e2180f4720263.ttf | Bin 0 -> + 1152 bytes + test/shaping/tests/indic-syllable.tests | 1 + + 3 files changed, 2 insertions(+) + +commit 7c6937e7c7b62602fef10ac4b2e164d0c67c932b +Author: ebraminio +Date: Mon Nov 20 14:49:22 2017 -0500 + + Move all references of old url to the new address (#622) + + .travis.yml | 2 +- + BUILD.md | 2 +- + CMakeLists.txt | 2 +- + NEWS | 20 ++++++++++---------- + README | 8 ++++---- + RELEASING.md | 2 +- + configure.ac | 2 +- + docs/HarfBuzz.png | Bin 3419 -> 12710 bytes + docs/harfbuzz-docs.xml | 2 +- + docs/usermanual-install-harfbuzz.xml | 2 +- + harfbuzz.doap | 2 +- + src/gen-use-table.py | 4 ++-- + src/hb-coretext.cc | 2 +- + src/hb-debug.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 22 +++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 8 ++++---- + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape-complex-use-machine.rl | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-private.hh | 2 +- + src/hb-unicode-private.hh | 2 +- + src/sample.py | 2 +- + test/api/test-set.c | 2 +- + test/fuzzing/README | 2 +- + 28 files changed, 57 insertions(+), 57 deletions(-) + +commit baf7779d2d6e4810168a8f036bbf8f9e6493dd1a +Author: Behdad Esfahbod +Date: Tue Nov 14 21:53:48 2017 -0800 + + Limit how much recursion GSUB/GPOS does + + This only counts recursions right now. Good start. + + Hopefully... + Fixes https://github.com/behdad/harfbuzz/issues/429 + + src/Makefile.am | 5 ++++- + src/hb-buffer-private.hh | 15 +++++++++++++-- + src/hb-buffer.cc | 2 ++ + src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- + src/hb-ot-shape.cc | 10 ++++++++-- + test/shaping/tests/fuzzed.tests | 2 +- + 6 files changed, 32 insertions(+), 7 deletions(-) + +commit 173dab6300d9b492f2d1c68f9e8f7817211a3462 +Author: Behdad Esfahbod +Date: Tue Nov 14 21:27:24 2017 -0800 + + Minor move + + src/hb-buffer-private.hh | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +commit c6173a392cfaa3d339c768836e8cddf3ae4adc53 +Author: Behdad Esfahbod +Date: Tue Nov 14 21:09:03 2017 -0800 + + Add Offset16 and Offset32 + + src/hb-open-type-private.hh | 5 ++++- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 2 +- + 4 files changed, 8 insertions(+), 5 deletions(-) + +commit 6f335ed1e52c6161fa0b0295776856fc07f7f46f +Author: Behdad Esfahbod +Date: Tue Nov 14 21:06:07 2017 -0800 + + Replace USHORT/SHORT/ULONG/etc with UINT16/INT16/UINT32/etc + + src/hb-open-file-private.hh | 6 +- + src/hb-open-type-private.hh | 67 ++++++------ + src/hb-ot-cbdt-table.hh | 78 +++++++------- + src/hb-ot-cmap-table.hh | 90 ++++++++-------- + src/hb-ot-glyf-table.hh | 10 +- + src/hb-ot-head-table.hh | 28 ++--- + src/hb-ot-hhea-table.hh | 18 ++-- + src/hb-ot-kern-table.hh | 36 +++---- + src/hb-ot-layout-common-private.hh | 118 ++++++++++---------- + src/hb-ot-layout-gdef-table.hh | 22 ++-- + src/hb-ot-layout-gpos-table.hh | 94 ++++++++-------- + src/hb-ot-layout-gsub-table.hh | 30 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 172 + +++++++++++++++--------------- + src/hb-ot-math-table.hh | 26 ++--- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 16 +-- + src/hb-ot-os2-table.hh | 70 ++++++------ + src/hb-ot-post-table.hh | 16 +-- + src/hb-ot-shape-complex-arabic-win1256.hh | 32 +++--- + src/hb-ot-var-avar-table.hh | 4 +- + src/hb-ot-var-fvar-table.hh | 20 ++-- + src/hb-ot-var-hvar-table.hh | 8 +- + src/hb-ot-var-mvar-table.hh | 10 +- + 23 files changed, 486 insertions(+), 487 deletions(-) + +commit a130ee6df50a50f541d0e8018deea9cee8c6738a +Author: Behdad Esfahbod +Date: Tue Nov 14 20:30:03 2017 -0800 + + Remove a couple of unused consts + + src/hb-ot-hhea-table.hh | 5 ----- + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + src/main.cc | 4 ++-- + 3 files changed, 2 insertions(+), 10 deletions(-) + +commit e20e47eaa1b7dd33ac63ab0eaa8f5ea1bf7775c2 +Author: Behdad Esfahbod +Date: Tue Nov 14 20:25:29 2017 -0800 + + [glyf] Try fixing undefined-behavior + + Might fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1463 + + src/hb-ot-glyf-table.hh | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit 7b40876a58d331200e1d7cda1dec72578139ff9c +Author: Behdad Esfahbod +Date: Tue Nov 14 20:22:05 2017 -0800 + + [ot] Remove unneeded TODO item + + Looks like hb-ot-font is complete after all! + + CFF font names and CFF glyph metrics don't work though... + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eab4feb5e221b8219c071ea882de79405aca4e84 +Author: Behdad Esfahbod +Date: Tue Nov 14 20:16:45 2017 -0800 + + [hmtx] Use curiously recurring template pattern + + https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern + + src/hb-ot-font.cc | 11 ++++------- + src/hb-ot-hmtx-table.hh | 29 +++++++++++++++-------------- + 2 files changed, 19 insertions(+), 21 deletions(-) + +commit 977ddff1f1e0f0f71a46c60ba713d160b96f5a3c +Author: Behdad Esfahbod +Date: Tue Nov 14 20:06:19 2017 -0800 + + [ot] Move hb_ot_face_cmap_accelerator_t + + src/hb-ot-cmap-table.hh | 149 + +++++++++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-font.cc | 130 +----------------------------------------- + 2 files changed, 142 insertions(+), 137 deletions(-) + +commit a7f15959b5e6e14e5241a3155c413ff70e7d1eb3 +Author: Behdad Esfahbod +Date: Tue Nov 14 20:02:24 2017 -0800 + + Shuffle + + src/hb-ot-hmtx-table.hh | 76 + ++++++++++++++++++++++++------------------------- + 1 file changed, 38 insertions(+), 38 deletions(-) + +commit a85d7ead04aff81d2f9df9110316892dbbefe1c2 +Author: Behdad Esfahbod +Date: Tue Nov 14 20:00:34 2017 -0800 + + [ot] Move hb_ot_face_metrics_accelerator_t + + src/hb-ot-font.cc | 108 + +----------------------------------------------- + src/hb-ot-hmtx-table.hh | 108 + +++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 109 insertions(+), 107 deletions(-) + +commit f00a94e1ec73c08d4bde1f50bff57d2dc9583ca8 +Author: Behdad Esfahbod +Date: Tue Nov 14 19:54:48 2017 -0800 + + Adjust privacy for recent changes + + src/hb-ot-cbdt-table.hh | 6 ++++-- + src/hb-ot-glyf-table.hh | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 7e2839c438beea216c7c8a3881e88961940e67be +Author: Behdad Esfahbod +Date: Tue Nov 14 19:52:09 2017 -0800 + + [ot] Move hb_ot_face_glyf_accelerator_t + + src/hb-ot-font.cc | 75 +---------------------------------- + src/hb-ot-glyf-table.hh | 103 + +++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 90 insertions(+), 88 deletions(-) + +commit c4e18e54dc5ffecac7b327bde9f52dd0927d6a08 +Author: Behdad Esfahbod +Date: Tue Nov 14 19:47:31 2017 -0800 + + [ot] Move hb_ot_face_cbdt_accelerator_t + + src/hb-ot-cbdt-table.hh | 85 + +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 87 + +------------------------------------------------ + src/hb-ot-post-table.hh | 1 + + 3 files changed, 87 insertions(+), 86 deletions(-) + +commit 9b04b0384fe746bdb1885c57e1ce73c4c6cae9e5 +Author: Behdad Esfahbod +Date: Tue Nov 14 19:31:50 2017 -0800 + + [ot] Fold hb_ot_face_post_accelerator_t + + src/hb-ot-font.cc | 35 +---------------------------------- + src/hb-ot-post-table.hh | 9 +++++++-- + 2 files changed, 8 insertions(+), 36 deletions(-) + +commit 702d86ba6b4a2e41cbee46fea18b3f8eb8986dc9 +Author: Behdad Esfahbod +Date: Tue Nov 14 19:25:38 2017 -0800 + + [ot] Fold hb_ot_face_kern_accelerator_t + + src/hb-ot-font.cc | 23 +---------------------- + src/hb-ot-kern-table.hh | 13 +++++++++---- + 2 files changed, 10 insertions(+), 26 deletions(-) + +commit 909de95a112ffe4d05ddcfed97a235763e8af068 +Author: Behdad Esfahbod +Date: Tue Nov 14 16:22:52 2017 -0800 + + Minor build fix + + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit b9c96b5d7cce80ef75cbdf0f0c47d1db62797c55 +Author: Behdad Esfahbod +Date: Tue Nov 14 15:56:21 2017 -0800 + + Add test for previous commit + + At some point we should run tests under valgrind... + + .../sha1sum/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf | Bin 0 -> + 2786 bytes + test/shaping/tests/fuzzed.tests | 3 ++- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit e5930722d485207ca158612a2b08816337fed7e8 +Author: Behdad Esfahbod +Date: Tue Nov 14 15:47:55 2017 -0800 + + Fix invalid buffer access in OOM times + + Hopefully fully fixes + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1856 + + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fcd6c338ff4968a0d7fc297da1c6d8058823aaa1 +Author: Behdad Esfahbod +Date: Tue Nov 14 14:40:21 2017 -0800 + + Fix more compiler warnings + + src/hb-debug.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 7fdf16b2ceb709b78654f99e6513fa878cd4d575 +Author: Behdad Esfahbod +Date: Tue Nov 14 14:40:11 2017 -0800 + + Fix compiler warning + + src/hb-string-array.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87f0ad183c489ef3208cf454d43c448638316092 +Author: David Corbett +Date: Thu Nov 2 10:59:25 2017 -0400 + + Allow U+20F0 in USE clusters + + src/gen-use-table.py | 4 +++ + src/hb-ot-shape-complex-use-table.cc | 34 + +++++++++++++-------- + .../074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf | Bin 0 -> 2296 bytes + test/shaping/tests/use-syllable.tests | 1 + + 4 files changed, 26 insertions(+), 13 deletions(-) + commit f93c6f8bfa228e95311d8d6d02dcc64b603c6e36 Author: Behdad Esfahbod Date: Tue Nov 14 11:09:19 2017 -0800 diff -Nru harfbuzz-1.7.1/CMakeLists.txt harfbuzz-1.7.2/CMakeLists.txt --- harfbuzz-1.7.1/CMakeLists.txt 2017-10-22 21:04:15.000000000 +0000 +++ harfbuzz-1.7.2/CMakeLists.txt 2017-11-20 21:10:35.000000000 +0000 @@ -146,7 +146,7 @@ if (RAGEL) message(STATUS "ragel found at: ${RAGEL}") else () - message(FATAL_ERROR "ragel not found, get it here -- http://www.complang.org/ragel/ or, use harfbuzz releases https://github.com/behdad/harfbuzz/releases") + message(FATAL_ERROR "ragel not found, get it here -- http://www.complang.org/ragel/ or, use harfbuzz releases https://github.com/harfbuzz/harfbuzz/releases") endif () foreach (ragel_output IN ITEMS ${HB_BASE_RAGEL_GENERATED_sources} ${HB_OT_RAGEL_GENERATED_sources}) diff -Nru harfbuzz-1.7.1/configure harfbuzz-1.7.2/configure --- harfbuzz-1.7.1/configure 2017-11-14 19:13:32.000000000 +0000 +++ harfbuzz-1.7.2/configure 2017-12-04 16:52:59.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for HarfBuzz 1.7.1. +# Generated by GNU Autoconf 2.69 for HarfBuzz 1.7.2. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://github.com/behdad/harfbuzz/issues/new about +$0: https://github.com/harfbuzz/harfbuzz/issues/new about $0: your system, including any error possibly output before $0: this message. Then install a modern shell, or manually $0: run the script under such a shell if you do have one." @@ -590,9 +590,9 @@ # Identity of this package. PACKAGE_NAME='HarfBuzz' PACKAGE_TARNAME='harfbuzz' -PACKAGE_VERSION='1.7.1' -PACKAGE_STRING='HarfBuzz 1.7.1' -PACKAGE_BUGREPORT='https://github.com/behdad/harfbuzz/issues/new' +PACKAGE_VERSION='1.7.2' +PACKAGE_STRING='HarfBuzz 1.7.2' +PACKAGE_BUGREPORT='https://github.com/harfbuzz/harfbuzz/issues/new' PACKAGE_URL='http://harfbuzz.org/' ac_unique_file="src/harfbuzz.pc.in" @@ -1478,7 +1478,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HarfBuzz 1.7.1 to adapt to many kinds of systems. +\`configure' configures HarfBuzz 1.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1549,7 +1549,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HarfBuzz 1.7.1:";; + short | recursive ) echo "Configuration of HarfBuzz 1.7.2:";; esac cat <<\_ACEOF @@ -1660,7 +1660,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . HarfBuzz home page: . _ACEOF ac_status=$? @@ -1724,7 +1724,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HarfBuzz configure 1.7.1 +HarfBuzz configure 1.7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2069,9 +2069,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------------------------ ## -## Report this to https://github.com/behdad/harfbuzz/issues/new ## -## ------------------------------------------------------------ ##" +( $as_echo "## -------------------------------------------------------------- ## +## Report this to https://github.com/harfbuzz/harfbuzz/issues/new ## +## -------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2464,9 +2464,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------------------------ ## -## Report this to https://github.com/behdad/harfbuzz/issues/new ## -## ------------------------------------------------------------ ##" +( $as_echo "## -------------------------------------------------------------- ## +## Report this to https://github.com/harfbuzz/harfbuzz/issues/new ## +## -------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2542,7 +2542,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HarfBuzz $as_me 1.7.1, which was +It was created by HarfBuzz $as_me 1.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3411,7 +3411,7 @@ # Define the identity of the package. PACKAGE='harfbuzz' - VERSION='1.7.1' + VERSION='1.7.2' # Some tools Automake needs. @@ -18455,8 +18455,8 @@ HB_VERSION_MAJOR=1 HB_VERSION_MINOR=7 -HB_VERSION_MICRO=1 -HB_VERSION=1.7.1 +HB_VERSION_MICRO=2 +HB_VERSION=1.7.2 @@ -18467,7 +18467,7 @@ -HB_LIBTOOL_VERSION_INFO=10701:0:10701 +HB_LIBTOOL_VERSION_INFO=10702:0:10702 # Documentation @@ -21723,7 +21723,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HarfBuzz $as_me 1.7.1, which was +This file was extended by HarfBuzz $as_me 1.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21783,14 +21783,14 @@ Configuration commands: $config_commands -Report bugs to . +Report bugs to . HarfBuzz home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HarfBuzz config.status 1.7.1 +HarfBuzz config.status 1.7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru harfbuzz-1.7.1/configure.ac harfbuzz-1.7.2/configure.ac --- harfbuzz-1.7.1/configure.ac 2017-11-14 19:13:04.000000000 +0000 +++ harfbuzz-1.7.2/configure.ac 2017-12-04 16:50:12.000000000 +0000 @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) AC_INIT([HarfBuzz], - [1.7.1], - [https://github.com/behdad/harfbuzz/issues/new], + [1.7.2], + [https://github.com/harfbuzz/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) diff -Nru harfbuzz-1.7.1/debian/changelog harfbuzz-1.7.2/debian/changelog --- harfbuzz-1.7.1/debian/changelog 2017-11-27 08:58:39.000000000 +0000 +++ harfbuzz-1.7.2/debian/changelog 2017-12-08 10:21:10.000000000 +0000 @@ -1,8 +1,17 @@ -harfbuzz (1.7.1-1~16.04.york1) xenial; urgency=medium +harfbuzz (1.7.2-1~16.04.york0.1) xenial; urgency=medium * debian/control: lower debhelper BD - -- Jonathon Fernyhough Mon, 20 Nov 2017 14:15:09 +0000 + -- Jonathon Fernyhough Fri, 08 Dec 2017 10:19:45 +0000 + +harfbuzz (1.7.2-1) unstable; urgency=medium + + * New upstream release + * Bump standards version to 4.1.2 + * Set gir1.2-harfbuzz-0.0 to multiarch same + * Install typelib file in multiarch dir + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Thu, 07 Dec 2017 04:44:42 +0100 harfbuzz (1.7.1-1) unstable; urgency=medium diff -Nru harfbuzz-1.7.1/debian/control harfbuzz-1.7.2/debian/control --- harfbuzz-1.7.1/debian/control 2017-11-20 14:15:05.000000000 +0000 +++ harfbuzz-1.7.2/debian/control 2017-12-08 10:19:44.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: أحمد المحمودي (Ahmed El-Mahmoudy) Uploaders: Emilio Pozuelo Monfort -Standards-Version: 4.1.1 +Standards-Version: 4.1.2 Build-Depends: debhelper (>= 9), pkg-config, @@ -47,6 +47,7 @@ Package: gir1.2-harfbuzz-0.0 Section: introspection Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends} Description: OpenType text shaping engine (GObject introspection data) HarfBuzz is an implementation of the OpenType Layout engine (aka layout diff -Nru harfbuzz-1.7.1/debian/gir1.2-harfbuzz-0.0.install harfbuzz-1.7.2/debian/gir1.2-harfbuzz-0.0.install --- harfbuzz-1.7.1/debian/gir1.2-harfbuzz-0.0.install 2017-11-19 00:15:04.000000000 +0000 +++ harfbuzz-1.7.2/debian/gir1.2-harfbuzz-0.0.install 2017-12-07 03:45:06.000000000 +0000 @@ -1 +1 @@ -usr/lib/*/girepository-1.0/*.typelib usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/*.typelib diff -Nru harfbuzz-1.7.1/docs/harfbuzz-docs.xml harfbuzz-1.7.2/docs/harfbuzz-docs.xml --- harfbuzz-1.7.1/docs/harfbuzz-docs.xml 2017-10-15 08:49:01.000000000 +0000 +++ harfbuzz-1.7.2/docs/harfbuzz-docs.xml 2017-11-20 21:10:35.000000000 +0000 @@ -22,7 +22,7 @@ source tree is available here. Also available on - github. + github. See for release tarballs. Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/docs/HarfBuzz.png and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/docs/HarfBuzz.png differ diff -Nru harfbuzz-1.7.1/docs/harfbuzz-sections.txt harfbuzz-1.7.2/docs/harfbuzz-sections.txt --- harfbuzz-1.7.1/docs/harfbuzz-sections.txt 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/harfbuzz-sections.txt 2017-12-04 17:01:56.000000000 +0000 @@ -151,6 +151,7 @@ HB_SCRIPT_CANADIAN_ABORIGINAL hb_font_funcs_set_glyph_func hb_font_get_glyph_func_t +hb_set_invert
@@ -518,7 +519,6 @@ hb_set_get_user_data hb_set_has hb_set_intersect -hb_set_invert hb_set_is_empty hb_set_is_equal hb_set_next diff -Nru harfbuzz-1.7.1/docs/HarfBuzz.svg harfbuzz-1.7.2/docs/HarfBuzz.svg --- harfbuzz-1.7.1/docs/HarfBuzz.svg 1970-01-01 00:00:00.000000000 +0000 +++ harfbuzz-1.7.2/docs/HarfBuzz.svg 2017-11-22 00:37:04.000000000 +0000 @@ -0,0 +1,277 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru harfbuzz-1.7.1/docs/harfbuzz.types harfbuzz-1.7.2/docs/harfbuzz.types --- harfbuzz-1.7.1/docs/harfbuzz.types 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/harfbuzz.types 2017-12-04 17:01:56.000000000 +0000 @@ -0,0 +1,29 @@ +hb_gobject_blob_get_type +hb_gobject_buffer_cluster_level_get_type +hb_gobject_buffer_content_type_get_type +hb_gobject_buffer_diff_flags_get_type +hb_gobject_buffer_flags_get_type +hb_gobject_buffer_get_type +hb_gobject_buffer_serialize_flags_get_type +hb_gobject_buffer_serialize_format_get_type +hb_gobject_direction_get_type +hb_gobject_face_get_type +hb_gobject_feature_get_type +hb_gobject_font_funcs_get_type +hb_gobject_font_get_type +hb_gobject_glyph_flags_get_type +hb_gobject_glyph_info_get_type +hb_gobject_glyph_position_get_type +hb_gobject_memory_mode_get_type +hb_gobject_ot_layout_glyph_class_get_type +hb_gobject_ot_math_constant_get_type +hb_gobject_ot_math_glyph_part_flags_get_type +hb_gobject_ot_math_kern_get_type +hb_gobject_script_get_type +hb_gobject_segment_properties_get_type +hb_gobject_set_get_type +hb_gobject_shape_plan_get_type +hb_gobject_unicode_combining_class_get_type +hb_gobject_unicode_funcs_get_type +hb_gobject_unicode_general_category_get_type +hb_gobject_user_data_key_get_type diff -Nru harfbuzz-1.7.1/docs/html/api-index-0-9-10.html harfbuzz-1.7.2/docs/html/api-index-0-9-10.html --- harfbuzz-1.7.1/docs/html/api-index-0-9-10.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/api-index-0-9-10.html 2017-12-04 17:01:56.000000000 +0000 @@ -31,7 +31,7 @@

S

-hb_set_invert, function in hb-set +hb_set_invert, function in hb-deprecated
diff -Nru harfbuzz-1.7.1/docs/html/api-index-0-9-2.html harfbuzz-1.7.2/docs/html/api-index-0-9-2.html --- harfbuzz-1.7.1/docs/html/api-index-0-9-2.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/api-index-0-9-2.html 2017-12-04 17:01:56.000000000 +0000 @@ -19,6 +19,8 @@  |  F  |  + G +  |  L  |  O @@ -509,6 +511,31 @@ hb_ft_font_create, function in hb-ft
+

G

+
+hb_gobject_blob_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_get_type, function in hb-gobject +
+
+
+hb_gobject_face_get_type, function in hb-gobject +
+
+
+hb_gobject_font_funcs_get_type, function in hb-gobject +
+
+
+hb_gobject_font_get_type, function in hb-gobject +
+
+
+hb_gobject_unicode_funcs_get_type, function in hb-gobject +
+

L

hb_language_from_string, function in hb-common diff -Nru harfbuzz-1.7.1/docs/html/api-index-full.html harfbuzz-1.7.2/docs/html/api-index-full.html --- harfbuzz-1.7.1/docs/html/api-index-full.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/api-index-full.html 2017-12-04 17:01:56.000000000 +0000 @@ -100,7 +100,7 @@
-hb_blob_t, typedef in hb-blob +hb_blob_t, typedef in hb-blob
@@ -352,7 +352,7 @@
-hb_buffer_t, typedef in Buffers +hb_buffer_t, typedef in Buffers

C

@@ -499,7 +499,7 @@
-hb_face_t, typedef in hb-face +hb_face_t, typedef in hb-face
@@ -507,7 +507,7 @@
-hb_feature_t, struct in Shaping +hb_feature_t, struct in Shaping
@@ -623,7 +623,7 @@
-hb_font_funcs_t, typedef in hb-font +hb_font_funcs_t, typedef in hb-font
@@ -887,7 +887,7 @@
-hb_font_t, typedef in hb-font +hb_font_t, typedef in hb-font
@@ -956,11 +956,243 @@
-hb_glyph_info_t, struct in Buffers +hb_glyph_info_t, struct in Buffers
-hb_glyph_position_t, struct in Buffers +hb_glyph_position_t, struct in Buffers +
+
+
+hb_gobject_blob_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_cluster_level_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_content_type_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_diff_flags_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_flags_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_serialize_flags_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_serialize_format_get_type, function in hb-gobject +
+
+
+hb_gobject_direction_get_type, function in hb-gobject +
+
+
+hb_gobject_face_get_type, function in hb-gobject +
+
+
+hb_gobject_feature_get_type, function in hb-gobject +
+
+
+hb_gobject_font_funcs_get_type, function in hb-gobject +
+
+
+hb_gobject_font_get_type, function in hb-gobject +
+
+
+hb_gobject_glyph_flags_get_type, function in hb-gobject +
+
+
+hb_gobject_glyph_info_get_type, function in hb-gobject +
+
+
+hb_gobject_glyph_position_get_type, function in hb-gobject +
+
+
+hb_gobject_memory_mode_get_type, function in hb-gobject +
+
+
+hb_gobject_ot_layout_glyph_class_get_type, function in hb-gobject +
+
+
+hb_gobject_ot_math_constant_get_type, function in hb-gobject +
+
+
+hb_gobject_ot_math_glyph_part_flags_get_type, function in hb-gobject +
+
+
+hb_gobject_ot_math_kern_get_type, function in hb-gobject +
+
+
+hb_gobject_script_get_type, function in hb-gobject +
+
+
+hb_gobject_segment_properties_get_type, function in hb-gobject +
+
+
+hb_gobject_set_get_type, function in hb-gobject +
+
+
+hb_gobject_shape_plan_get_type, function in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BLOB, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_DIFF_FLAGS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_FLAGS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_DIRECTION, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_FACE, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_FEATURE, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_FONT, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_FONT_FUNCS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_GLYPH_FLAGS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_GLYPH_INFO, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_GLYPH_POSITION, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_MEMORY_MODE, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_OT_MATH_CONSTANT, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_OT_MATH_KERN, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_SCRIPT, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_SEGMENT_PROPERTIES, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_SET, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_SHAPE_PLAN, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_UNICODE_FUNCS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_USER_DATA_KEY, macro in hb-gobject +
+
+
+hb_gobject_unicode_combining_class_get_type, function in hb-gobject +
+
+
+hb_gobject_unicode_funcs_get_type, function in hb-gobject +
+
+
+hb_gobject_unicode_general_category_get_type, function in hb-gobject +
+
+
+hb_gobject_user_data_key_get_type, function in hb-gobject
@@ -1367,7 +1599,7 @@
-hb_segment_properties_t, struct in Buffers +hb_segment_properties_t, struct in Buffers
@@ -1431,7 +1663,7 @@
-hb_set_invert, function in hb-set +hb_set_invert, function in hb-deprecated
@@ -1471,7 +1703,7 @@
-hb_set_t, typedef in hb-set +hb_set_t, typedef in hb-set
@@ -1539,7 +1771,7 @@
-hb_shape_plan_t, typedef in hb-shape-plan +hb_shape_plan_t, typedef in hb-shape-plan

T

@@ -1681,7 +1913,7 @@
-hb_unicode_funcs_t, typedef in hb-unicode +hb_unicode_funcs_t, typedef in hb-unicode
@@ -1729,7 +1961,7 @@
-hb_user_data_key_t, struct in hb-common +hb_user_data_key_t, struct in hb-common

V

diff -Nru harfbuzz-1.7.1/docs/html/deprecated-api-index.html harfbuzz-1.7.2/docs/html/deprecated-api-index.html --- harfbuzz-1.7.1/docs/html/deprecated-api-index.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/deprecated-api-index.html 2017-12-04 17:01:56.000000000 +0000 @@ -57,7 +57,7 @@
-hb_set_invert, function in hb-set +hb_set_invert, function in hb-deprecated
diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-Buffers.html harfbuzz-1.7.2/docs/html/harfbuzz-Buffers.html --- harfbuzz-1.7.1/docs/html/harfbuzz-Buffers.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/harfbuzz-Buffers.html 2017-12-04 17:01:56.000000000 +0000 @@ -15,7 +15,8 @@ @@ -41,7 +42,7 @@ -
+

Types and Values

@@ -495,11 +496,11 @@ - + - + @@ -507,7 +508,7 @@ - + @@ -523,7 +524,7 @@ - + @@ -541,6 +542,24 @@
typedefhb_buffer_thb_buffer_t
 hb_glyph_info_thb_glyph_info_t
enum
 hb_glyph_position_thb_glyph_position_t
enum
 hb_segment_properties_thb_segment_properties_t
enum
+

Object Hierarchy

+
    GBoxed
+    ├── hb_buffer_t
+    ├── hb_glyph_info_t
+    ├── hb_glyph_position_t
+    ╰── hb_segment_properties_t
+    GEnum
+    ├── hb_buffer_cluster_level_t
+    ├── hb_buffer_content_type_t
+    ╰── hb_buffer_serialize_format_t
+    GFlags
+    ├── hb_buffer_diff_flags_t
+    ├── hb_buffer_flags_t
+    ├── hb_buffer_serialize_flags_t
+    ╰── hb_glyph_flags_t
+
+
+

Includes

#include <hb.h>
@@ -554,16 +573,16 @@

Functions

hb_buffer_create ()

-
hb_buffer_t *
+
hb_buffer_t *
 hb_buffer_create (void);

-
Creates a new hb_buffer_t with all properties to defaults.

+
Creates a new hb_buffer_t with all properties to defaults.

 
[Xconstructor]

 

 
Returns

-
A newly allocated hb_buffer_t with a reference count of 1. The initial
+
A newly allocated hb_buffer_t with a reference count of 1. The initial
 reference count should be released with hb_buffer_destroy() when you are done
-using the hb_buffer_t. This function never returns NULL. If memory cannot
-be allocated, a special hb_buffer_t object will be returned on which
+using the hb_buffer_t. This function never returns NULL. If memory cannot
+be allocated, a special hb_buffer_t object will be returned on which
 hb_buffer_allocation_successful() returns false. 

 
[transfer full]

 

@@ -572,8 +591,8 @@
 

 

 
hb_buffer_reference ()

-
hb_buffer_t *
-hb_buffer_reference (hb_buffer_t *buffer);

+
hb_buffer_t *
+hb_buffer_reference (hb_buffer_t *buffer);

 
Increases the reference count on buffer
  by one. This prevents buffer
  from
@@ -589,14 +608,14 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  

Returns

-

The referenced hb_buffer_t.

+

The referenced hb_buffer_t.

[transfer full]

Since: 0.9.2

@@ -604,7 +623,7 @@

hb_buffer_get_empty ()

-
hb_buffer_t *
+
hb_buffer_t *
 hb_buffer_get_empty (void);

 

 
Returns

@@ -617,7 +636,7 @@
 

 
hb_buffer_destroy ()

 
void
-hb_buffer_destroy (hb_buffer_t *buffer);

+hb_buffer_destroy (hb_buffer_t *buffer);

Deallocate the buffer . Decreases the reference count on buffer @@ -635,7 +654,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -646,7 +665,7 @@

hb_buffer_reset ()

void
-hb_buffer_reset (hb_buffer_t *buffer);
+hb_buffer_reset (hb_buffer_t *buffer);

Resets the buffer to its initial status, as if it was just newly created with hb_buffer_create().

@@ -659,7 +678,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -670,7 +689,7 @@

hb_buffer_clear_contents ()

void
-hb_buffer_clear_contents (hb_buffer_t *buffer);
+hb_buffer_clear_contents (hb_buffer_t *buffer);

Similar to hb_buffer_reset(), but does not clear the Unicode functions and the replacement code point.

@@ -683,7 +702,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -694,7 +713,7 @@

hb_buffer_pre_allocate ()

hb_bool_t
-hb_buffer_pre_allocate (hb_buffer_t *buffer,
+hb_buffer_pre_allocate (hb_buffer_t *buffer,
                         unsigned int size);

Pre allocates memory for buffer to fit at least size @@ -710,7 +729,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

  @@ -732,7 +751,7 @@

hb_buffer_allocation_successful ()

hb_bool_t
-hb_buffer_allocation_successful (hb_buffer_t *buffer);
+hb_buffer_allocation_successful (hb_buffer_t *buffer);

Check if allocating memory for the buffer succeeded.

Parameters

@@ -744,7 +763,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -760,7 +779,7 @@

hb_buffer_add ()

void
-hb_buffer_add (hb_buffer_t *buffer,
+hb_buffer_add (hb_buffer_t *buffer,
                hb_codepoint_t codepoint,
                unsigned int cluster);

Appends a character with the Unicode value of codepoint @@ -770,7 +789,7 @@ . Clusters can be any thing the client wants, they are usually used to refer to the index of the character in the input text stream and are output in -hb_glyph_info_t.cluster field.

+hb_glyph_info_t.cluster field.

This function does not check the validity of codepoint , it is up to the caller to ensure it is a valid Unicode code point.

@@ -785,7 +804,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

  @@ -808,7 +827,7 @@

hb_buffer_add_codepoints ()

void
-hb_buffer_add_codepoints (hb_buffer_t *buffer,
+hb_buffer_add_codepoints (hb_buffer_t *buffer,
                           const hb_codepoint_t *text,
                           int text_length,
                           unsigned int item_offset,
@@ -843,7 +862,7 @@
 
 
 
buffer

-
a hb_buffer_t to append characters to.

+
a hb_buffer_t to append characters to.

  
 
 
@@ -880,7 +899,7 @@
 

 
hb_buffer_add_utf32 ()

 
void
-hb_buffer_add_utf32 (hb_buffer_t *buffer,
+hb_buffer_add_utf32 (hb_buffer_t *buffer,
                      const uint32_t *text,
                      int text_length,
                      unsigned int item_offset,
@@ -900,7 +919,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -937,7 +956,7 @@
 

 
hb_buffer_add_utf16 ()

 
void
-hb_buffer_add_utf16 (hb_buffer_t *buffer,
+hb_buffer_add_utf16 (hb_buffer_t *buffer,
                      const uint16_t *text,
                      int text_length,
                      unsigned int item_offset,
@@ -957,7 +976,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -994,7 +1013,7 @@
 

 
hb_buffer_add_utf8 ()

 
void
-hb_buffer_add_utf8 (hb_buffer_t *buffer,
+hb_buffer_add_utf8 (hb_buffer_t *buffer,
                     const char *text,
                     int text_length,
                     unsigned int item_offset,
@@ -1014,7 +1033,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1052,7 +1071,7 @@
 

 
hb_buffer_add_latin1 ()

 
void
-hb_buffer_add_latin1 (hb_buffer_t *buffer,
+hb_buffer_add_latin1 (hb_buffer_t *buffer,
                       const uint8_t *text,
                       int text_length,
                       unsigned int item_offset,
@@ -1071,7 +1090,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1109,8 +1128,8 @@
 

 
hb_buffer_append ()

 
void
-hb_buffer_append (hb_buffer_t *buffer,
-                  hb_buffer_t *source,
+hb_buffer_append (hb_buffer_t *buffer,
+                  hb_buffer_t *source,
                   unsigned int start,
                   unsigned int end);

 
Append (part of) contents of another buffer to this buffer.

@@ -1125,12 +1144,12 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
 
source

-
source hb_buffer_t.

+
source hb_buffer_t.

  
 
 
@@ -1152,7 +1171,7 @@
 

 
hb_buffer_set_content_type ()

 
void
-hb_buffer_set_content_type (hb_buffer_t *buffer,
+hb_buffer_set_content_type (hb_buffer_t *buffer,
                             hb_buffer_content_type_t content_type);

 
Sets the type of buffer
  contents, buffers are either empty, contain
@@ -1168,7 +1187,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1185,7 +1204,7 @@
 

 
hb_buffer_get_content_type ()

 
hb_buffer_content_type_t
-hb_buffer_get_content_type (hb_buffer_t *buffer);

+hb_buffer_get_content_type (hb_buffer_t *buffer);

 
see hb_buffer_set_content_type().

 

 
Parameters

@@ -1197,7 +1216,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 

@@ -1213,7 +1232,7 @@
 

 
hb_buffer_set_direction ()

 
void
-hb_buffer_set_direction (hb_buffer_t *buffer,
+hb_buffer_set_direction (hb_buffer_t *buffer,
                          hb_direction_t direction);

 
Set the text flow direction of the buffer. No shaping can happen without
 setting buffer
@@ -1234,7 +1253,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1252,7 +1271,7 @@
 

 
hb_buffer_get_direction ()

 
hb_direction_t
-hb_buffer_get_direction (hb_buffer_t *buffer);

+hb_buffer_get_direction (hb_buffer_t *buffer);

 
See hb_buffer_set_direction()

 

 
Parameters

@@ -1264,7 +1283,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 

@@ -1280,7 +1299,7 @@
 

 
hb_buffer_set_script ()

 
void
-hb_buffer_set_script (hb_buffer_t *buffer,
+hb_buffer_set_script (hb_buffer_t *buffer,
                       hb_script_t script);

 
Sets the script of buffer
  to script
@@ -1302,7 +1321,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1319,7 +1338,7 @@
 

 
hb_buffer_get_script ()

 
hb_script_t
-hb_buffer_get_script (hb_buffer_t *buffer);

+hb_buffer_get_script (hb_buffer_t *buffer);

 
See hb_buffer_set_script().

 

 
Parameters

@@ -1331,7 +1350,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 

@@ -1347,7 +1366,7 @@
 

 
hb_buffer_set_language ()

 
void
-hb_buffer_set_language (hb_buffer_t *buffer,
+hb_buffer_set_language (hb_buffer_t *buffer,
                         hb_language_t language);

 
Sets the language of buffer
  to language
@@ -1369,7 +1388,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1386,7 +1405,7 @@
 

 
hb_buffer_get_language ()

 
hb_language_t
-hb_buffer_get_language (hb_buffer_t *buffer);

+hb_buffer_get_language (hb_buffer_t *buffer);

 
See hb_buffer_set_language().

 

 
Parameters

@@ -1398,7 +1417,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 

@@ -1414,7 +1433,7 @@
 

 
hb_buffer_set_flags ()

 
void
-hb_buffer_set_flags (hb_buffer_t *buffer,
+hb_buffer_set_flags (hb_buffer_t *buffer,
                      hb_buffer_flags_t flags);

 
Sets buffer
  flags to flags
@@ -1430,7 +1449,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1447,7 +1466,7 @@
 

 
hb_buffer_get_flags ()

 
hb_buffer_flags_t
-hb_buffer_get_flags (hb_buffer_t *buffer);

+hb_buffer_get_flags (hb_buffer_t *buffer);

See hb_buffer_set_flags().

Parameters

@@ -1459,7 +1478,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -1475,7 +1494,7 @@

hb_buffer_set_cluster_level ()

void
-hb_buffer_set_cluster_level (hb_buffer_t *buffer,
+hb_buffer_set_cluster_level (hb_buffer_t *buffer,
                              hb_buffer_cluster_level_t cluster_level);

Parameters

@@ -1487,7 +1506,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -1498,7 +1517,7 @@

hb_buffer_get_cluster_level ()

hb_buffer_cluster_level_t
-hb_buffer_get_cluster_level (hb_buffer_t *buffer);
+hb_buffer_get_cluster_level (hb_buffer_t *buffer);

Parameters

@@ -1509,7 +1528,7 @@ - +

buffer

an hb_buffer_t.

an hb_buffer_t.

  
@@ -1520,7 +1539,7 @@

hb_buffer_set_length ()

hb_bool_t
-hb_buffer_set_length (hb_buffer_t *buffer,
+hb_buffer_set_length (hb_buffer_t *buffer,
                       unsigned int length);

Similar to hb_buffer_pre_allocate(), but clears any new items added at the end.

@@ -1535,7 +1554,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

  @@ -1558,7 +1577,7 @@

hb_buffer_get_length ()

unsigned int
-hb_buffer_get_length (hb_buffer_t *buffer);
+hb_buffer_get_length (hb_buffer_t *buffer);

Returns the number of items in the buffer.

Parameters

@@ -1570,7 +1589,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -1587,8 +1606,8 @@

hb_buffer_set_segment_properties ()

void
-hb_buffer_set_segment_properties (hb_buffer_t *buffer,
-                                  const hb_segment_properties_t *props);
+hb_buffer_set_segment_properties (hb_buffer_t *buffer, + const hb_segment_properties_t *props);

Sets the segment properties of the buffer, a shortcut for calling hb_buffer_set_direction(), hb_buffer_set_script() and hb_buffer_set_language() individually.

@@ -1603,12 +1622,12 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 

props

-

an hb_segment_properties_t to use.

+

an hb_segment_properties_t to use.

  @@ -1620,10 +1639,10 @@

hb_buffer_get_segment_properties ()

void
-hb_buffer_get_segment_properties (hb_buffer_t *buffer,
-                                  hb_segment_properties_t *props);
+hb_buffer_get_segment_properties (hb_buffer_t *buffer, + hb_segment_properties_t *props);

Sets props - to the hb_segment_properties_t of buffer + to the hb_segment_properties_t of buffer .

Parameters

@@ -1636,12 +1655,12 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 

props

-

the output hb_segment_properties_t.

+

the output hb_segment_properties_t.

[out] @@ -1653,7 +1672,7 @@

hb_buffer_guess_segment_properties ()

void
-hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
+hb_buffer_guess_segment_properties (hb_buffer_t *buffer);

Sets unset buffer segment properties based on buffer Unicode contents. If buffer is not empty, it must have content type HB_BUFFER_CONTENT_TYPE_UNICODE.

@@ -1678,7 +1697,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -1689,8 +1708,8 @@

hb_buffer_set_unicode_funcs ()

void
-hb_buffer_set_unicode_funcs (hb_buffer_t *buffer,
-                             hb_unicode_funcs_t *unicode_funcs);
+hb_buffer_set_unicode_funcs (hb_buffer_t *buffer, + hb_unicode_funcs_t *unicode_funcs);

Parameters

@@ -1701,7 +1720,7 @@ - +

buffer

an hb_buffer_t.

an hb_buffer_t.

  
@@ -1711,8 +1730,8 @@

hb_buffer_get_unicode_funcs ()

-
hb_unicode_funcs_t *
-hb_buffer_get_unicode_funcs (hb_buffer_t *buffer);
+
hb_unicode_funcs_t *
+hb_buffer_get_unicode_funcs (hb_buffer_t *buffer);

Parameters

@@ -1723,7 +1742,7 @@ - +

buffer

an hb_buffer_t.

an hb_buffer_t.

  
@@ -1734,8 +1753,8 @@

hb_buffer_set_user_data ()

hb_bool_t
-hb_buffer_set_user_data (hb_buffer_t *buffer,
-                         hb_user_data_key_t *key,
+hb_buffer_set_user_data (hb_buffer_t *buffer,
+                         hb_user_data_key_t *key,
                          void *data,
                          hb_destroy_func_t destroy,
                          hb_bool_t replace);
@@ -1750,7 +1769,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -1761,8 +1780,8 @@

hb_buffer_get_user_data ()

void *
-hb_buffer_get_user_data (hb_buffer_t *buffer,
-                         hb_user_data_key_t *key);
+hb_buffer_get_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key);

[skip]

Parameters

@@ -1774,7 +1793,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -1784,8 +1803,8 @@

hb_buffer_get_glyph_infos ()

-
hb_glyph_info_t *
-hb_buffer_get_glyph_infos (hb_buffer_t *buffer,
+
hb_glyph_info_t *
+hb_buffer_get_glyph_infos (hb_buffer_t *buffer,
                            unsigned int *length);

 
Returns buffer
  glyph information array.  Returned pointer
@@ -1802,7 +1821,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1825,8 +1844,8 @@
 

 

 
hb_buffer_get_glyph_positions ()

-
hb_glyph_position_t *
-hb_buffer_get_glyph_positions (hb_buffer_t *buffer,
+
hb_glyph_position_t *
+hb_buffer_get_glyph_positions (hb_buffer_t *buffer,
                                unsigned int *length);

 
Returns buffer
  glyph position array.  Returned pointer
@@ -1843,7 +1862,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1867,7 +1886,7 @@
 

 
hb_buffer_set_replacement_codepoint ()

 
void
-hb_buffer_set_replacement_codepoint (hb_buffer_t *buffer,
+hb_buffer_set_replacement_codepoint (hb_buffer_t *buffer,
                                      hb_codepoint_t replacement);

 
Sets the hb_codepoint_t that replaces invalid entries for a given encoding
 when adding text to buffer
@@ -1884,7 +1903,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 
@@ -1901,7 +1920,7 @@
 

 
hb_buffer_get_replacement_codepoint ()

 
hb_codepoint_t
-hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer);

+hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer);

 
See hb_buffer_set_replacement_codepoint().

 

 
Parameters

@@ -1913,7 +1932,7 @@
 
 
 
buffer

-
an hb_buffer_t.

+
an hb_buffer_t.

  
 
 

@@ -1929,7 +1948,7 @@
 

 
hb_buffer_normalize_glyphs ()

 
void
-hb_buffer_normalize_glyphs (hb_buffer_t *buffer);

+hb_buffer_normalize_glyphs (hb_buffer_t *buffer);

Reorders a glyph buffer to have canonical in-cluster glyph order / position. The resulting clusters should behave identical to pre-reordering clusters.

This has nothing to do with Unicode normalization.
@@ -1943,7 +1962,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -1954,7 +1973,7 @@

hb_buffer_reverse ()

void
-hb_buffer_reverse (hb_buffer_t *buffer);
+hb_buffer_reverse (hb_buffer_t *buffer);

Reverses buffer contents.

Parameters

@@ -1966,7 +1985,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -1977,7 +1996,7 @@

hb_buffer_reverse_range ()

void
-hb_buffer_reverse_range (hb_buffer_t *buffer,
+hb_buffer_reverse_range (hb_buffer_t *buffer,
                          unsigned int start,
                          unsigned int end);

Reverses buffer contents between start to end.

@@ -1992,7 +2011,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

  @@ -2014,7 +2033,7 @@

hb_buffer_reverse_clusters ()

void
-hb_buffer_reverse_clusters (hb_buffer_t *buffer);
+hb_buffer_reverse_clusters (hb_buffer_t *buffer);

Reverses buffer clusters. That is, the buffer contents are reversed, then each cluster (consecutive items having the same cluster number) are reversed again.

@@ -2028,7 +2047,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

 
@@ -2039,13 +2058,13 @@

hb_buffer_serialize_glyphs ()

unsigned int
-hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
+hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
                             unsigned int start,
                             unsigned int end,
                             char *buf,
                             unsigned int buf_size,
                             unsigned int *buf_consumed,
-                            hb_font_t *font,
+                            hb_font_t *font,
                             hb_buffer_serialize_format_t format,
                             hb_buffer_serialize_flags_t flags);

Serializes buffer @@ -2053,7 +2072,7 @@ useful for showing the contents of the buffer, for example during debugging. There are currently two supported serialization formats:

-

text

+

text

A human-readable, plain text format. The serialized glyphs will look something like:

@@ -2066,12 +2085,12 @@

Each glyph starts with glyph name, or glyph index if HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES flag is set. Then,

-

json

+

json

TODO.

@@ -2096,7 +2115,7 @@

buffer

-

an hb_buffer_t buffer.

+

an hb_buffer_t buffer.

  @@ -2131,7 +2150,7 @@

font

-

the hb_font_t used to shape this buffer, needed to +

the hb_font_t used to shape this buffer, needed to read glyph names and extents. If NULL, and empty font will be used.

[allow-none] @@ -2159,11 +2178,11 @@

hb_buffer_deserialize_glyphs ()

hb_bool_t
-hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
+hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
                               const char *buf,
                               int buf_len,
                               const char **end_ptr,
-                              hb_font_t *font,
+                              hb_font_t *font,
                               hb_buffer_serialize_format_t format);

Parameters

@@ -2176,7 +2195,7 @@

buffer

-

an hb_buffer_t buffer.

+

an hb_buffer_t buffer.

  @@ -2282,9 +2301,9 @@

hb_segment_properties_equal ()

hb_bool_t
-hb_segment_properties_equal (const hb_segment_properties_t *a,
-                             const hb_segment_properties_t *b);
-

Checks the equality of two hb_segment_properties_t's.

+hb_segment_properties_equal (const hb_segment_properties_t *a, + const hb_segment_properties_t *b); +

Checks the equality of two hb_segment_properties_t's.

Parameters

@@ -2296,12 +2315,12 @@ - + - + @@ -2319,7 +2338,7 @@

hb_segment_properties_hash ()

unsigned int
-hb_segment_properties_hash (const hb_segment_properties_t *p);
+hb_segment_properties_hash (const hb_segment_properties_t *p);

Creates a hash representing p .

@@ -2332,7 +2351,7 @@
- +

a

first hb_segment_properties_t to compare.

first hb_segment_properties_t to compare.

  

b

second hb_segment_properties_t to compare.

second hb_segment_properties_t to compare.

  

p

hb_segment_properties_t to hash.

hb_segment_properties_t to hash.

  
@@ -2348,8 +2367,8 @@

hb_buffer_diff ()

hb_buffer_diff_flags_t
-hb_buffer_diff (hb_buffer_t *buffer,
-                hb_buffer_t *reference,
+hb_buffer_diff (hb_buffer_t *buffer,
+                hb_buffer_t *reference,
                 hb_codepoint_t dottedcircle_glyph,
                 unsigned int position_fuzz);

If dottedcircle_glyph is (hb_codepoint_t) -1 then HB_BUFFER_DIFF_FLAG_DOTTED_CIRCLE_PRESENT @@ -2361,7 +2380,7 @@

hb_buffer_set_message_func ()

void
-hb_buffer_set_message_func (hb_buffer_t *buffer,
+hb_buffer_set_message_func (hb_buffer_t *buffer,
                             hb_buffer_message_func_t func,
                             void *user_data,
                             hb_destroy_func_t destroy);
@@ -2376,7 +2395,7 @@

buffer

-

an hb_buffer_t.

+

an hb_buffer_t.

  @@ -2393,8 +2412,8 @@

hb_glyph_info_get_glyph_flags ()

hb_glyph_flags_t
-hb_glyph_info_get_glyph_flags (const hb_glyph_info_t *info);
-

Returns glyph flags encoded within a hb_glyph_info_t.

+hb_glyph_info_get_glyph_flags (const hb_glyph_info_t *info); +

Returns glyph flags encoded within a hb_glyph_info_t.

Parameters

@@ -2405,7 +2424,7 @@ - +

info

a hb_glyph_info_t.

a hb_glyph_info_t.

  
@@ -2421,8 +2440,8 @@

hb_buffer_message_func_t ()

hb_bool_t
-(*hb_buffer_message_func_t) (hb_buffer_t *buffer,
-                             hb_font_t *font,
+(*hb_buffer_message_func_t) (hb_buffer_t *buffer,
+                             hb_font_t *font,
                              const char *message,
                              void *user_data);
@@ -2452,14 +2471,14 @@
-

hb_glyph_info_t

+

hb_glyph_info_t

typedef struct {
   hb_codepoint_t codepoint;
   hb_mask_t      mask; /* Holds hb_glyph_flags_t after hb_shape(), plus other things. */
   uint32_t       cluster;
 } hb_glyph_info_t;
-

The hb_glyph_info_t is the structure that holds information about the +

The hb_glyph_info_t is the structure that holds information about the glyphs and their relation to input text.

Members

@@ -2471,26 +2490,26 @@ -

hb_codepoint_t codepoint;

+

hb_codepoint_t codepoint;

either a Unicode code point (before shaping) or a glyph index (after shaping).

  -

hb_mask_t mask;

+

hb_mask_t mask;

    -

uint32_t cluster;

+

uint32_t cluster;

the index of the character in the original text that corresponds -to this hb_glyph_info_t, or whatever the client passes to -hb_buffer_add(). More than one hb_glyph_info_t can have the same +to this hb_glyph_info_t, or whatever the client passes to +hb_buffer_add(). More than one hb_glyph_info_t can have the same cluster value, if they resulted from the same character (e.g. one to many glyph substitution), and when more than one character gets merged in the same glyph (e.g. many to one glyph substitution) the -hb_glyph_info_t will have the smallest cluster value of them. +hb_glyph_info_t will have the smallest cluster value of them. By default some characters are merged into the same cluster (e.g. combining marks have the same cluster as their bases) even if they are separate glyphs, hb_buffer_set_cluster_level() @@ -2529,7 +2548,7 @@

-

hb_glyph_position_t

+

hb_glyph_position_t

typedef struct {
   hb_position_t  x_advance;
   hb_position_t  y_advance;
@@ -2537,9 +2556,9 @@
   hb_position_t  y_offset;
 } hb_glyph_position_t;
-

The hb_glyph_position_t is the structure that holds the positions of the +

The hb_glyph_position_t is the structure that holds the positions of the glyph in both horizontal and vertical directions. All positions in -hb_glyph_position_t are relative to the current point.

+hb_glyph_position_t are relative to the current point.

Members

@@ -2550,25 +2569,25 @@ - + - + - + - + @@ -2707,14 +2726,14 @@
-

hb_segment_properties_t

+

hb_segment_properties_t

typedef struct {
   hb_direction_t  direction;
   hb_script_t     script;
   hb_language_t   language;
 } hb_segment_properties_t;
-

The structure that holds various text properties of an hb_buffer_t. Can be +

The structure that holds various text properties of an hb_buffer_t. Can be set and retrieved using hb_buffer_set_segment_properties() and hb_buffer_get_segment_properties(), respectively.

@@ -2727,17 +2746,17 @@
- + - + - + diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz.devhelp2 harfbuzz-1.7.2/docs/html/harfbuzz.devhelp2 --- harfbuzz-1.7.1/docs/html/harfbuzz.devhelp2 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/harfbuzz.devhelp2 2017-12-04 17:01:56.000000000 +0000 @@ -125,7 +125,7 @@ - + @@ -225,13 +225,13 @@ - + - + - + @@ -369,7 +369,7 @@ - + @@ -380,6 +380,7 @@ + @@ -398,7 +399,6 @@ - @@ -513,6 +513,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -851,15 +909,15 @@ - - - - - - - - - - + + + + + + + + + + diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-blob.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-blob.html --- harfbuzz-1.7.1/docs/html/harfbuzz-hb-blob.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-blob.html 2017-12-04 17:01:56.000000000 +0000 @@ -15,7 +15,8 @@

hb_position_t x_advance;

hb_position_t x_advance;

how much the line advances after drawing this glyph when setting text in horizontal direction.

  

hb_position_t y_advance;

hb_position_t y_advance;

how much the line advances after drawing this glyph when setting text in vertical direction.

  

hb_position_t x_offset;

hb_position_t x_offset;

how much the glyph moves on the X-axis before drawing it, this should not affect how much the line advances.

  

hb_position_t y_offset;

hb_position_t y_offset;

how much the glyph moves on the Y-axis before drawing it, this should not affect how much the line advances.

  

hb_direction_t direction;

hb_direction_t direction;

the hb_direction_t of the buffer, see hb_buffer_set_direction().

  

hb_script_t script;

hb_script_t script;

the hb_script_t of the buffer, see hb_buffer_set_script().

  

hb_language_t language;

hb_language_t language;

the hb_language_t of the buffer, see hb_buffer_set_language().

  
@@ -41,7 +42,7 @@
-
+

Types and Values

@@ -146,7 +147,7 @@ - + @@ -156,13 +157,21 @@
typedefhb_blob_thb_blob_t
enum
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_blob_t
+    GEnum
+    ╰── hb_memory_mode_t
+
+
+

Description

Functions

hb_blob_create ()

-
hb_blob_t *
+
hb_blob_t *
 hb_blob_create (const char *data,
                 unsigned int length,
                 hb_memory_mode_t mode,
@@ -226,8 +235,8 @@
 

 

 
hb_blob_create_sub_blob ()

-
hb_blob_t *
-hb_blob_create_sub_blob (hb_blob_t *parent,
+
hb_blob_t *
+hb_blob_create_sub_blob (hb_blob_t *parent,
                          unsigned int offset,
                          unsigned int length);

 
Returns a blob that represents a range of bytes in parent
@@ -281,7 +290,7 @@
 

 
hb_blob_destroy ()

 
void
-hb_blob_destroy (hb_blob_t *blob);

+hb_blob_destroy (hb_blob_t *blob);

 
Descreases the reference count on blob
 , and if it reaches zero, destroys
 blob
@@ -310,7 +319,7 @@
 

 
hb_blob_get_data ()

 
const char *
-hb_blob_get_data (hb_blob_t *blob,
+hb_blob_get_data (hb_blob_t *blob,
                   unsigned int *length);

 

 
Parameters

@@ -345,7 +354,7 @@
 

 
hb_blob_get_data_writable ()

 
char *
-hb_blob_get_data_writable (hb_blob_t *blob,
+hb_blob_get_data_writable (hb_blob_t *blob,
                            unsigned int *length);

 
Tries to make blob data writable (possibly copying it) and
 return pointer to data.

@@ -384,7 +393,7 @@
 

 

 
hb_blob_get_empty ()

-
hb_blob_t *
+
hb_blob_t *
 hb_blob_get_empty (void);

 
Returns the singleton empty blob.

 
See TODO:link object types for more information.

@@ -399,7 +408,7 @@
 

 
hb_blob_get_length ()

 
unsigned int
-hb_blob_get_length (hb_blob_t *blob);

+hb_blob_get_length (hb_blob_t *blob);

 

 
Parameters

 

@@ -425,8 +434,8 @@
 

 
hb_blob_get_user_data ()

 
void *
-hb_blob_get_user_data (hb_blob_t *blob,
-                       hb_user_data_key_t *key);

+hb_blob_get_user_data (hb_blob_t *blob,
+                       hb_user_data_key_t *key);
 
[skip]

 

 
Parameters

@@ -461,7 +470,7 @@
 

 
hb_blob_is_immutable ()

 
hb_bool_t
-hb_blob_is_immutable (hb_blob_t *blob);

+hb_blob_is_immutable (hb_blob_t *blob);
 

 
Parameters

 

@@ -487,7 +496,7 @@
 

 
hb_blob_make_immutable ()

 
void
-hb_blob_make_immutable (hb_blob_t *blob);

+hb_blob_make_immutable (hb_blob_t *blob);
 

 
Parameters

 

@@ -508,8 +517,8 @@
 

 
hb_blob_reference ()

-
hb_blob_t *
-hb_blob_reference (hb_blob_t *blob);

+
hb_blob_t *
+hb_blob_reference (hb_blob_t *blob);

 
Increases the reference count on blob
 .

 
See TODO:link object types for more information.

@@ -540,8 +549,8 @@
 

 
hb_blob_set_user_data ()

 
hb_bool_t
-hb_blob_set_user_data (hb_blob_t *blob,
-                       hb_user_data_key_t *key,
+hb_blob_set_user_data (hb_blob_t *blob,
+                       hb_user_data_key_t *key,
                        void *data,
                        hb_destroy_func_t destroy,
                        hb_bool_t replace);

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-common.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-common.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-common.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-common.html	2017-12-04 17:01:56.000000000 +0000
@@ -15,7 +15,8 @@
 

 

@@ -184,7 +185,7 @@
 

 

-

+

 
Types and Values

 
@@ -226,7 +227,7 @@
 
-
+
@@ -252,6 +253,15 @@
 

 

 

  hb_user_data_key_thb_user_data_key_t
 

 

  

 

 

+
Object Hierarchy

+
    GBoxed
+    ╰── hb_user_data_key_t
+    GEnum
+    ├── hb_direction_t
+    ╰── hb_script_t
+

+

+

 
Description

 

 

@@ -1405,7 +1415,7 @@
 

 

 

-
hb_user_data_key_t

+
hb_user_data_key_t

 
typedef struct {
 } hb_user_data_key_t;
 

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-coretext.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-coretext.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-coretext.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-coretext.html	2017-12-04 17:01:56.000000000 +0000
@@ -41,7 +41,7 @@
 
 
 
-hb_face_t *
+hb_face_t *
 
 
 hb_coretext_face_create ()
@@ -96,20 +96,20 @@
 
Functions

 

 
hb_coretext_face_create ()

-
hb_face_t *
+
hb_face_t *
 hb_coretext_face_create (CGFontRef cg_font);

 

 

 

 
hb_coretext_face_get_cg_font ()

 
CGFontRef
-hb_coretext_face_get_cg_font (hb_face_t *face);

+hb_coretext_face_get_cg_font (hb_face_t *face);

hb_coretext_font_get_ct_font ()

CTFontRef
-hb_coretext_font_get_ct_font (hb_font_t *font);
+hb_coretext_font_get_ct_font (hb_font_t *font);
diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-deprecated.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-deprecated.html --- harfbuzz-1.7.1/docs/html/harfbuzz-hb-deprecated.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-deprecated.html 2017-12-04 17:01:56.000000000 +0000 @@ -55,6 +55,14 @@ (*hb_font_get_glyph_func_t) () + + +void + + +hb_set_invert () + +
@@ -89,7 +97,7 @@

hb_font_funcs_set_glyph_func ()

void
-hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
+hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
                               hb_font_get_glyph_func_t func,
                               void *user_data,
                               hb_destroy_func_t destroy);
@@ -124,7 +132,7 @@

hb_font_get_glyph_func_t ()

hb_bool_t
-(*hb_font_get_glyph_func_t) (hb_font_t *font,
+(*hb_font_get_glyph_func_t) (hb_font_t *font,
                              void *font_data,
                              hb_codepoint_t unicode,
                              hb_codepoint_t variation_selector,
@@ -132,6 +140,29 @@
                              void *user_data);

hb_font_get_glyph_func_t is deprecated and should not be used in newly-written code.

+
+
+

hb_set_invert ()

+
void
+hb_set_invert (hb_set_t *set);
+

hb_set_invert has been deprecated since version 1.6.1 and should not be used in newly-written code.

+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since: 0.9.10

+

Types and Values

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-face.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-face.html --- harfbuzz-1.7.1/docs/html/harfbuzz-hb-face.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-face.html 2017-12-04 17:01:56.000000000 +0000 @@ -15,7 +15,8 @@ @@ -41,7 +42,7 @@
-
+

Types and Values

@@ -191,19 +192,25 @@ - +
typedefhb_face_thb_face_t
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_face_t
+
+
+

Description

Functions

hb_face_create ()

-
hb_face_t *
-hb_face_create (hb_blob_t *blob,
+
hb_face_t *
+hb_face_create (hb_blob_t *blob,
                 unsigned int index);

 
[Xconstructor]

 

@@ -216,7 +223,7 @@
 

 

 
hb_face_create_for_tables ()

-
hb_face_t *
+
hb_face_t *
 hb_face_create_for_tables (hb_reference_table_func_t reference_table_func,
                            void *user_data,
                            hb_destroy_func_t destroy);

@@ -245,7 +252,7 @@
 

 
hb_face_destroy ()

 
void
-hb_face_destroy (hb_face_t *face);

+hb_face_destroy (hb_face_t *face);

 
[skip]

 

 
Parameters

@@ -267,7 +274,7 @@
 

 

 
hb_face_get_empty ()

-
hb_face_t *
+
hb_face_t *
 hb_face_get_empty (void);

 

 
Returns

@@ -279,7 +286,7 @@
 

 
hb_face_get_table_tags ()

 
unsigned int
-hb_face_get_table_tags (hb_face_t *face,
+hb_face_get_table_tags (hb_face_t *face,
                         unsigned int start_offset,
                         unsigned int *table_count,
                         hb_tag_t *table_tags);

@@ -309,7 +316,7 @@
 

 
hb_face_get_glyph_count ()

 
unsigned int
-hb_face_get_glyph_count (hb_face_t *face);

+hb_face_get_glyph_count (hb_face_t *face);

 

 
Parameters

 

@@ -331,7 +338,7 @@
 

 
hb_face_get_index ()

 
unsigned int
-hb_face_get_index (hb_face_t *face);

+hb_face_get_index (hb_face_t *face);
 

 
Parameters

 

@@ -353,7 +360,7 @@
 

 
hb_face_get_upem ()

 
unsigned int
-hb_face_get_upem (hb_face_t *face);

+hb_face_get_upem (hb_face_t *face);
 

 
Parameters

 

@@ -375,8 +382,8 @@
 

 
hb_face_get_user_data ()

 
void *
-hb_face_get_user_data (hb_face_t *face,
-                       hb_user_data_key_t *key);

+hb_face_get_user_data (hb_face_t *face,
+                       hb_user_data_key_t *key);
 
[skip]

 

 
Parameters

@@ -404,7 +411,7 @@
 

 
hb_face_is_immutable ()

 
hb_bool_t
-hb_face_is_immutable (hb_face_t *face);

+hb_face_is_immutable (hb_face_t *face);
 

 
Parameters

 

@@ -426,7 +433,7 @@
 

 
hb_face_make_immutable ()

 
void
-hb_face_make_immutable (hb_face_t *face);

+hb_face_make_immutable (hb_face_t *face);
 

 
Parameters

 

@@ -447,8 +454,8 @@
 

 
hb_face_reference ()

-
hb_face_t *
-hb_face_reference (hb_face_t *face);

+
hb_face_t *
+hb_face_reference (hb_face_t *face);

 
[skip]

 

 
Parameters

@@ -470,8 +477,8 @@
 

 

 
hb_face_reference_blob ()

-
hb_blob_t *
-hb_face_reference_blob (hb_face_t *face);

+
hb_blob_t *
+hb_face_reference_blob (hb_face_t *face);

 

 
Parameters

 

 

@@ -497,8 +504,8 @@
 

 
hb_face_reference_table ()

-
hb_blob_t *
-hb_face_reference_table (hb_face_t *face,
+
hb_blob_t *
+hb_face_reference_table (hb_face_t *face,
                          hb_tag_t tag);

 

 
Parameters

@@ -526,7 +533,7 @@
 

 
hb_face_set_glyph_count ()

 
void
-hb_face_set_glyph_count (hb_face_t *face,
+hb_face_set_glyph_count (hb_face_t *face,
                          unsigned int glyph_count);

 

 
Parameters

@@ -549,7 +556,7 @@
 

 
hb_face_set_index ()

 
void
-hb_face_set_index (hb_face_t *face,
+hb_face_set_index (hb_face_t *face,
                    unsigned int index);

 

 
Parameters

@@ -572,7 +579,7 @@
 

 
hb_face_set_upem ()

 
void
-hb_face_set_upem (hb_face_t *face,
+hb_face_set_upem (hb_face_t *face,
                   unsigned int upem);

 

 
Parameters

@@ -595,8 +602,8 @@
 

 
hb_face_set_user_data ()

 
hb_bool_t
-hb_face_set_user_data (hb_face_t *face,
-                       hb_user_data_key_t *key,
+hb_face_set_user_data (hb_face_t *face,
+                       hb_user_data_key_t *key,
                        void *data,
                        hb_destroy_func_t destroy,
                        hb_bool_t replace);

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-font.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-font.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-font.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-font.html	2017-12-04 17:01:56.000000000 +0000
@@ -15,7 +15,8 @@
 

 

@@ -49,7 +50,7 @@
 

 

-

+

 
Types and Values

 
@@ -731,7 +732,7 @@
 
-
+
@@ -763,7 +764,7 @@
 
-
+
@@ -777,6 +778,13 @@
 

 

 

 typedefhb_font_funcs_thb_font_funcs_t
 

 

 typedef

 

 typedefhb_font_thb_font_t
 

 

 typedef

 

 

+
Object Hierarchy

+
    GBoxed
+    ├── hb_font_funcs_t
+    ╰── hb_font_t
+

+

+

 
Description

 

 

@@ -785,7 +793,7 @@
 
hb_font_add_glyph_origin_for_direction ()

 
void
 hb_font_add_glyph_origin_for_direction
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 hb_codepoint_t glyph,
                                 hb_direction_t direction,
                                 hb_position_t *x,
@@ -822,8 +830,8 @@
 

 

 
hb_font_create ()

-
hb_font_t *
-hb_font_create (hb_face_t *face);

+
hb_font_t *
+hb_font_create (hb_face_t *face);

 
[Xconstructor]

 

 
Parameters

@@ -850,8 +858,8 @@
 

 

 
hb_font_create_sub_font ()

-
hb_font_t *
-hb_font_create_sub_font (hb_font_t *parent);

+
hb_font_t *
+hb_font_create_sub_font (hb_font_t *parent);

 

 
Parameters

 

@@ -878,7 +886,7 @@
 

 
hb_font_destroy ()

 
void
-hb_font_destroy (hb_font_t *font);

+hb_font_destroy (hb_font_t *font);
 
[skip]

 

 
Parameters

@@ -900,7 +908,7 @@
 

 

 
hb_font_funcs_create ()

-
hb_font_funcs_t *
+
hb_font_funcs_t *
 hb_font_funcs_create (void);

 
[Xconstructor]

 

@@ -914,7 +922,7 @@
 

 
hb_font_funcs_destroy ()

 
void
-hb_font_funcs_destroy (hb_font_funcs_t *ffuncs);

+hb_font_funcs_destroy (hb_font_funcs_t *ffuncs);

 
[skip]

 

 
Parameters

@@ -936,7 +944,7 @@
 

 

 
hb_font_funcs_get_empty ()

-
hb_font_funcs_t *
+
hb_font_funcs_t *
 hb_font_funcs_get_empty (void);

 

 
Returns

@@ -949,8 +957,8 @@
 

 
hb_font_funcs_get_user_data ()

 
void *
-hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs,
-                             hb_user_data_key_t *key);

+hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs,
+                             hb_user_data_key_t *key);

 
[skip]

 

 
Parameters

@@ -978,7 +986,7 @@
 

 
hb_font_funcs_is_immutable ()

 
hb_bool_t
-hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs);

+hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs);
 

 
Parameters

 

@@ -1000,7 +1008,7 @@
 

 
hb_font_funcs_make_immutable ()

 
void
-hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs);

+hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs);
 

 
Parameters

 

@@ -1021,8 +1029,8 @@
 

 
hb_font_funcs_reference ()

-
hb_font_funcs_t *
-hb_font_funcs_reference (hb_font_funcs_t *ffuncs);

+
hb_font_funcs_t *
+hb_font_funcs_reference (hb_font_funcs_t *ffuncs);

 
[skip]

 

 
Parameters

@@ -1046,7 +1054,7 @@
 
hb_font_funcs_set_glyph_contour_point_func ()

 
void
 hb_font_funcs_set_glyph_contour_point_func
-                               (hb_font_funcs_t *ffuncs,
+                               (hb_font_funcs_t *ffuncs,
                                 hb_font_get_glyph_contour_point_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -1078,7 +1086,7 @@
 

 
hb_font_funcs_set_glyph_extents_func ()

 
void
-hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs,
+hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs,
                                       hb_font_get_glyph_extents_func_t func,
                                       void *user_data,
                                       hb_destroy_func_t destroy);

@@ -1111,7 +1119,7 @@
 
hb_font_funcs_set_glyph_from_name_func ()

 
void
 hb_font_funcs_set_glyph_from_name_func
-                               (hb_font_funcs_t *ffuncs,
+                               (hb_font_funcs_t *ffuncs,
                                 hb_font_get_glyph_from_name_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -1144,7 +1152,7 @@
 
hb_font_funcs_set_glyph_h_advance_func ()

 
void
 hb_font_funcs_set_glyph_h_advance_func
-                               (hb_font_funcs_t *ffuncs,
+                               (hb_font_funcs_t *ffuncs,
                                 hb_font_get_glyph_h_advance_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -1177,7 +1185,7 @@
 
hb_font_funcs_set_glyph_h_kerning_func ()

 
void
 hb_font_funcs_set_glyph_h_kerning_func
-                               (hb_font_funcs_t *ffuncs,
+                               (hb_font_funcs_t *ffuncs,
                                 hb_font_get_glyph_h_kerning_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -1209,7 +1217,7 @@
 

 
hb_font_funcs_set_glyph_h_origin_func ()

 
void
-hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs,
+hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs,
                                        hb_font_get_glyph_h_origin_func_t func,
                                        void *user_data,
                                        hb_destroy_func_t destroy);

@@ -1241,7 +1249,7 @@
 

 
hb_font_funcs_set_glyph_name_func ()

 
void
-hb_font_funcs_set_glyph_name_func (hb_font_funcs_t *ffuncs,
+hb_font_funcs_set_glyph_name_func (hb_font_funcs_t *ffuncs,
                                    hb_font_get_glyph_name_func_t func,
                                    void *user_data,
                                    hb_destroy_func_t destroy);

@@ -1274,7 +1282,7 @@
 
hb_font_funcs_set_glyph_v_advance_func ()

 
void
 hb_font_funcs_set_glyph_v_advance_func
-                               (hb_font_funcs_t *ffuncs,
+                               (hb_font_funcs_t *ffuncs,
                                 hb_font_get_glyph_v_advance_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -1307,7 +1315,7 @@
 
hb_font_funcs_set_glyph_v_kerning_func ()

 
void
 hb_font_funcs_set_glyph_v_kerning_func
-                               (hb_font_funcs_t *ffuncs,
+                               (hb_font_funcs_t *ffuncs,
                                 hb_font_get_glyph_v_kerning_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -1339,7 +1347,7 @@
 

 
hb_font_funcs_set_glyph_v_origin_func ()

 
void
-hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs,
+hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs,
                                        hb_font_get_glyph_v_origin_func_t func,
                                        void *user_data,
                                        hb_destroy_func_t destroy);

@@ -1371,7 +1379,7 @@
 

 
hb_font_funcs_set_nominal_glyph_func ()

 
void
-hb_font_funcs_set_nominal_glyph_func (hb_font_funcs_t *ffuncs,
+hb_font_funcs_set_nominal_glyph_func (hb_font_funcs_t *ffuncs,
                                       hb_font_get_nominal_glyph_func_t func,
                                       void *user_data,
                                       hb_destroy_func_t destroy);

@@ -1403,8 +1411,8 @@
 

 
hb_font_funcs_set_user_data ()

 
hb_bool_t
-hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs,
-                             hb_user_data_key_t *key,
+hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs,
+                             hb_user_data_key_t *key,
                              void *data,
                              hb_destroy_func_t destroy,
                              hb_bool_t replace);

@@ -1431,7 +1439,7 @@
 
hb_font_funcs_set_variation_glyph_func ()

 
void
 hb_font_funcs_set_variation_glyph_func
-                               (hb_font_funcs_t *ffuncs,
+                               (hb_font_funcs_t *ffuncs,
                                 hb_font_get_variation_glyph_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -1462,7 +1470,7 @@
 

 

 
hb_font_get_empty ()

-
hb_font_t *
+
hb_font_t *
 hb_font_get_empty (void);

 

 
Returns

@@ -1473,8 +1481,8 @@
 

 

 
hb_font_get_face ()

-
hb_face_t *
-hb_font_get_face (hb_font_t *font);

+
hb_face_t *
+hb_font_get_face (hb_font_t *font);

 

 
Parameters

 

 

@@ -1501,7 +1509,7 @@
 

 
hb_font_get_glyph ()

 
hb_bool_t
-hb_font_get_glyph (hb_font_t *font,
+hb_font_get_glyph (hb_font_t *font,
                    hb_codepoint_t unicode,
                    hb_codepoint_t variation_selector,
                    hb_codepoint_t *glyph);

@@ -1534,7 +1542,7 @@
 
hb_font_get_glyph_advance_for_direction ()

 
void
 hb_font_get_glyph_advance_for_direction
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 hb_codepoint_t glyph,
                                 hb_direction_t direction,
                                 hb_position_t *x,
@@ -1572,7 +1580,7 @@
 

 
hb_font_get_glyph_advance_func_t ()

 
hb_position_t
-(*hb_font_get_glyph_advance_func_t) (hb_font_t *font,
+(*hb_font_get_glyph_advance_func_t) (hb_font_t *font,
                                      void *font_data,
                                      hb_codepoint_t glyph,
                                      void *user_data);

@@ -1581,7 +1589,7 @@
 

 
hb_font_get_glyph_contour_point ()

 
hb_bool_t
-hb_font_get_glyph_contour_point (hb_font_t *font,
+hb_font_get_glyph_contour_point (hb_font_t *font,
                                  hb_codepoint_t glyph,
                                  unsigned int point_index,
                                  hb_position_t *x,
@@ -1620,7 +1628,7 @@
 
hb_font_get_glyph_contour_point_for_origin ()

 
hb_bool_t
 hb_font_get_glyph_contour_point_for_origin
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 hb_codepoint_t glyph,
                                 unsigned int point_index,
                                 hb_direction_t direction,
@@ -1660,7 +1668,7 @@
 
hb_font_get_glyph_contour_point_func_t ()

 
hb_bool_t
 (*hb_font_get_glyph_contour_point_func_t)
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 void *font_data,
                                 hb_codepoint_t glyph,
                                 unsigned int point_index,
@@ -1672,7 +1680,7 @@
 

 
hb_font_get_glyph_extents ()

 
hb_bool_t
-hb_font_get_glyph_extents (hb_font_t *font,
+hb_font_get_glyph_extents (hb_font_t *font,
                            hb_codepoint_t glyph,
                            hb_glyph_extents_t *extents);

 

@@ -1703,7 +1711,7 @@
 

 
hb_font_get_glyph_extents_for_origin ()

 
hb_bool_t
-hb_font_get_glyph_extents_for_origin (hb_font_t *font,
+hb_font_get_glyph_extents_for_origin (hb_font_t *font,
                                       hb_codepoint_t glyph,
                                       hb_direction_t direction,
                                       hb_glyph_extents_t *extents);

@@ -1735,7 +1743,7 @@
 

 
hb_font_get_glyph_extents_func_t ()

 
hb_bool_t
-(*hb_font_get_glyph_extents_func_t) (hb_font_t *font,
+(*hb_font_get_glyph_extents_func_t) (hb_font_t *font,
                                      void *font_data,
                                      hb_codepoint_t glyph,
                                      hb_glyph_extents_t *extents,
@@ -1745,7 +1753,7 @@
 

 
hb_font_get_glyph_from_name ()

 
hb_bool_t
-hb_font_get_glyph_from_name (hb_font_t *font,
+hb_font_get_glyph_from_name (hb_font_t *font,
                              const char *name,
                              int len,
                              hb_codepoint_t *glyph);

@@ -1782,7 +1790,7 @@
 

 
hb_font_get_glyph_from_name_func_t ()

 
hb_bool_t
-(*hb_font_get_glyph_from_name_func_t) (hb_font_t *font,
+(*hb_font_get_glyph_from_name_func_t) (hb_font_t *font,
                                        void *font_data,
                                        const char *name,
                                        int len);

@@ -1791,7 +1799,7 @@
 

 
hb_font_get_glyph_h_advance ()

 
hb_position_t
-hb_font_get_glyph_h_advance (hb_font_t *font,
+hb_font_get_glyph_h_advance (hb_font_t *font,
                              hb_codepoint_t glyph);

 

 
Parameters

@@ -1814,7 +1822,7 @@
 

 
hb_font_get_glyph_h_kerning ()

 
hb_position_t
-hb_font_get_glyph_h_kerning (hb_font_t *font,
+hb_font_get_glyph_h_kerning (hb_font_t *font,
                              hb_codepoint_t left_glyph,
                              hb_codepoint_t right_glyph);

 

@@ -1838,7 +1846,7 @@
 

 
hb_font_get_glyph_h_origin ()

 
hb_bool_t
-hb_font_get_glyph_h_origin (hb_font_t *font,
+hb_font_get_glyph_h_origin (hb_font_t *font,
                             hb_codepoint_t glyph,
                             hb_position_t *x,
                             hb_position_t *y);

@@ -1876,7 +1884,7 @@
 
hb_font_get_glyph_kerning_for_direction ()

 
void
 hb_font_get_glyph_kerning_for_direction
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 hb_codepoint_t first_glyph,
                                 hb_codepoint_t second_glyph,
                                 hb_direction_t direction,
@@ -1915,7 +1923,7 @@
 

 
hb_font_get_glyph_kerning_func_t ()

 
hb_position_t
-(*hb_font_get_glyph_kerning_func_t) (hb_font_t *font,
+(*hb_font_get_glyph_kerning_func_t) (hb_font_t *font,
                                      void *font_data,
                                      hb_codepoint_t first_glyph,
                                      hb_codepoint_t second_glyph,
@@ -1925,7 +1933,7 @@
 

 
hb_font_get_glyph_name ()

 
hb_bool_t
-hb_font_get_glyph_name (hb_font_t *font,
+hb_font_get_glyph_name (hb_font_t *font,
                         hb_codepoint_t glyph,
                         char *name,
                         unsigned int size);

@@ -1957,7 +1965,7 @@
 

 
hb_font_get_glyph_name_func_t ()

 
hb_bool_t
-(*hb_font_get_glyph_name_func_t) (hb_font_t *font,
+(*hb_font_get_glyph_name_func_t) (hb_font_t *font,
                                   void *font_data,
                                   hb_codepoint_t glyph,
                                   char *name,
@@ -1969,7 +1977,7 @@
 
hb_font_get_glyph_origin_for_direction ()

 
void
 hb_font_get_glyph_origin_for_direction
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 hb_codepoint_t glyph,
                                 hb_direction_t direction,
                                 hb_position_t *x,
@@ -2007,7 +2015,7 @@
 

 
hb_font_get_glyph_origin_func_t ()

 
hb_bool_t
-(*hb_font_get_glyph_origin_func_t) (hb_font_t *font,
+(*hb_font_get_glyph_origin_func_t) (hb_font_t *font,
                                     void *font_data,
                                     hb_codepoint_t glyph,
                                     hb_position_t *x,
@@ -2018,7 +2026,7 @@
 

 
hb_font_get_glyph_v_advance ()

 
hb_position_t
-hb_font_get_glyph_v_advance (hb_font_t *font,
+hb_font_get_glyph_v_advance (hb_font_t *font,
                              hb_codepoint_t glyph);

 

 
Parameters

@@ -2041,7 +2049,7 @@
 

 
hb_font_get_glyph_v_kerning ()

 
hb_position_t
-hb_font_get_glyph_v_kerning (hb_font_t *font,
+hb_font_get_glyph_v_kerning (hb_font_t *font,
                              hb_codepoint_t top_glyph,
                              hb_codepoint_t bottom_glyph);

 

@@ -2065,7 +2073,7 @@
 

 
hb_font_get_glyph_v_origin ()

 
hb_bool_t
-hb_font_get_glyph_v_origin (hb_font_t *font,
+hb_font_get_glyph_v_origin (hb_font_t *font,
                             hb_codepoint_t glyph,
                             hb_position_t *x,
                             hb_position_t *y);

@@ -2102,7 +2110,7 @@
 

 
hb_font_get_nominal_glyph ()

 
hb_bool_t
-hb_font_get_nominal_glyph (hb_font_t *font,
+hb_font_get_nominal_glyph (hb_font_t *font,
                            hb_codepoint_t unicode,
                            hb_codepoint_t *glyph);

 

@@ -2133,7 +2141,7 @@
 

 
hb_font_get_nominal_glyph_func_t ()

 
hb_bool_t
-(*hb_font_get_nominal_glyph_func_t) (hb_font_t *font,
+(*hb_font_get_nominal_glyph_func_t) (hb_font_t *font,
                                      void *font_data,
                                      hb_codepoint_t unicode,
                                      hb_codepoint_t *glyph,
@@ -2142,8 +2150,8 @@
 

 

 
hb_font_get_parent ()

-
hb_font_t *
-hb_font_get_parent (hb_font_t *font);

+
hb_font_t *
+hb_font_get_parent (hb_font_t *font);

 

 
Parameters

 

@@ -2170,7 +2178,7 @@
 

 
hb_font_get_ppem ()

 
void
-hb_font_get_ppem (hb_font_t *font,
+hb_font_get_ppem (hb_font_t *font,
                   unsigned int *x_ppem,
                   unsigned int *y_ppem);

 

@@ -2206,7 +2214,7 @@
 

 
hb_font_get_ptem ()

 
float
-hb_font_get_ptem (hb_font_t *font);

+hb_font_get_ptem (hb_font_t *font);
 
Gets the "point size" of the font.  A value of 0 means unset.

 

 
Parameters

@@ -2233,7 +2241,7 @@
 

 
hb_font_get_scale ()

 
void
-hb_font_get_scale (hb_font_t *font,
+hb_font_get_scale (hb_font_t *font,
                    int *x_scale,
                    int *y_scale);

 

@@ -2269,8 +2277,8 @@
 

 
hb_font_get_user_data ()

 
void *
-hb_font_get_user_data (hb_font_t *font,
-                       hb_user_data_key_t *key);

+hb_font_get_user_data (hb_font_t *font,
+                       hb_user_data_key_t *key);
 
[skip]

 

 
Parameters

@@ -2298,7 +2306,7 @@
 

 
hb_font_get_variation_glyph ()

 
hb_bool_t
-hb_font_get_variation_glyph (hb_font_t *font,
+hb_font_get_variation_glyph (hb_font_t *font,
                              hb_codepoint_t unicode,
                              hb_codepoint_t variation_selector,
                              hb_codepoint_t *glyph);

@@ -2330,7 +2338,7 @@
 

 
hb_font_get_variation_glyph_func_t ()

 
hb_bool_t
-(*hb_font_get_variation_glyph_func_t) (hb_font_t *font,
+(*hb_font_get_variation_glyph_func_t) (hb_font_t *font,
                                        void *font_data,
                                        hb_codepoint_t unicode,
                                        hb_codepoint_t variation_selector,
@@ -2341,7 +2349,7 @@
 

 
hb_font_get_var_coords_normalized ()

 
const int *
-hb_font_get_var_coords_normalized (hb_font_t *font,
+hb_font_get_var_coords_normalized (hb_font_t *font,
                                    unsigned int *length);

 
Return value is valid as long as variation coordinates of the font
 are not modified.

@@ -2351,7 +2359,7 @@
 

 
hb_font_glyph_from_string ()

 
hb_bool_t
-hb_font_glyph_from_string (hb_font_t *font,
+hb_font_glyph_from_string (hb_font_t *font,
                            const char *s,
                            int len,
                            hb_codepoint_t *glyph);

@@ -2388,7 +2396,7 @@
 

 
hb_font_glyph_to_string ()

 
void
-hb_font_glyph_to_string (hb_font_t *font,
+hb_font_glyph_to_string (hb_font_t *font,
                          hb_codepoint_t glyph,
                          char *s,
                          unsigned int size);

@@ -2420,7 +2428,7 @@
 

 
hb_font_is_immutable ()

 
hb_bool_t
-hb_font_is_immutable (hb_font_t *font);

+hb_font_is_immutable (hb_font_t *font);

 

 
Parameters

 

@@ -2442,7 +2450,7 @@
 

 
hb_font_make_immutable ()

 
void
-hb_font_make_immutable (hb_font_t *font);

+hb_font_make_immutable (hb_font_t *font);
 

 
Parameters

 

@@ -2463,8 +2471,8 @@
 

 
hb_font_reference ()

-
hb_font_t *
-hb_font_reference (hb_font_t *font);

+
hb_font_t *
+hb_font_reference (hb_font_t *font);

 
[skip]

 

 
Parameters

@@ -2492,8 +2500,8 @@
 

 
hb_font_set_face ()

 
void
-hb_font_set_face (hb_font_t *font,
-                  hb_face_t *face);

+hb_font_set_face (hb_font_t *font,
+                  hb_face_t *face);
 
Sets font-face of font
 .

 

@@ -2524,8 +2532,8 @@
 

 
hb_font_set_funcs ()

 
void
-hb_font_set_funcs (hb_font_t *font,
-                   hb_font_funcs_t *klass,
+hb_font_set_funcs (hb_font_t *font,
+                   hb_font_funcs_t *klass,
                    void *font_data,
                    hb_destroy_func_t destroy);

 

@@ -2556,7 +2564,7 @@
 

 
hb_font_set_funcs_data ()

 
void
-hb_font_set_funcs_data (hb_font_t *font,
+hb_font_set_funcs_data (hb_font_t *font,
                         void *font_data,
                         hb_destroy_func_t destroy);

 

@@ -2587,8 +2595,8 @@
 

 
hb_font_set_parent ()

 
void
-hb_font_set_parent (hb_font_t *font,
-                    hb_font_t *parent);

+hb_font_set_parent (hb_font_t *font,
+                    hb_font_t *parent);
 
Sets parent font of font
 .

 

@@ -2619,7 +2627,7 @@
 

 
hb_font_set_ppem ()

 
void
-hb_font_set_ppem (hb_font_t *font,
+hb_font_set_ppem (hb_font_t *font,
                   unsigned int x_ppem,
                   unsigned int y_ppem);

 

@@ -2643,7 +2651,7 @@
 

 
hb_font_set_ptem ()

 
void
-hb_font_set_ptem (hb_font_t *font,
+hb_font_set_ptem (hb_font_t *font,
                   float ptem);

 
Sets "point size" of the font.

 

@@ -2667,7 +2675,7 @@
 

 
hb_font_set_scale ()

 
void
-hb_font_set_scale (hb_font_t *font,
+hb_font_set_scale (hb_font_t *font,
                    int x_scale,
                    int y_scale);

 

@@ -2691,8 +2699,8 @@
 

 
hb_font_set_user_data ()

 
hb_bool_t
-hb_font_set_user_data (hb_font_t *font,
-                       hb_user_data_key_t *key,
+hb_font_set_user_data (hb_font_t *font,
+                       hb_user_data_key_t *key,
                        void *data,
                        hb_destroy_func_t destroy,
                        hb_bool_t replace);

@@ -2736,7 +2744,7 @@
 

 
hb_font_set_variations ()

 
void
-hb_font_set_variations (hb_font_t *font,
+hb_font_set_variations (hb_font_t *font,
                         const hb_variation_t *variations,
                         unsigned int variations_length);

 
Since: 1.4.2

@@ -2745,7 +2753,7 @@
 

 
hb_font_set_var_coords_design ()

 
void
-hb_font_set_var_coords_design (hb_font_t *font,
+hb_font_set_var_coords_design (hb_font_t *font,
                                const float *coords,
                                unsigned int coords_length);

 
Since: 1.4.2

@@ -2754,7 +2762,7 @@
 

 
hb_font_set_var_coords_normalized ()

 
void
-hb_font_set_var_coords_normalized (hb_font_t *font,
+hb_font_set_var_coords_normalized (hb_font_t *font,
                                    const int *coords,
                                    unsigned int coords_length);

 
Since: 1.4.2

@@ -2764,7 +2772,7 @@
 
hb_font_subtract_glyph_origin_for_direction ()

 
void
 hb_font_subtract_glyph_origin_for_direction
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 hb_codepoint_t glyph,
                                 hb_direction_t direction,
                                 hb_position_t *x,
@@ -2801,8 +2809,8 @@
 

 

 
hb_reference_table_func_t ()

-
hb_blob_t *
-(*hb_reference_table_func_t) (hb_face_t *face,
+
hb_blob_t *
+(*hb_reference_table_func_t) (hb_face_t *face,
                               hb_tag_t tag,
                               void *user_data);

 

@@ -2810,7 +2818,7 @@
 

 
hb_font_funcs_set_font_h_extents_func ()

 
void
-hb_font_funcs_set_font_h_extents_func (hb_font_funcs_t *ffuncs,
+hb_font_funcs_set_font_h_extents_func (hb_font_funcs_t *ffuncs,
                                        hb_font_get_font_h_extents_func_t func,
                                        void *user_data,
                                        hb_destroy_func_t destroy);

@@ -2842,7 +2850,7 @@
 

 
hb_font_funcs_set_font_v_extents_func ()

 
void
-hb_font_funcs_set_font_v_extents_func (hb_font_funcs_t *ffuncs,
+hb_font_funcs_set_font_v_extents_func (hb_font_funcs_t *ffuncs,
                                        hb_font_get_font_v_extents_func_t func,
                                        void *user_data,
                                        hb_destroy_func_t destroy);

@@ -2874,7 +2882,7 @@
 

 
hb_font_get_extents_for_direction ()

 
void
-hb_font_get_extents_for_direction (hb_font_t *font,
+hb_font_get_extents_for_direction (hb_font_t *font,
                                    hb_direction_t direction,
                                    hb_font_extents_t *extents);

 

@@ -2898,7 +2906,7 @@
 

 
hb_font_get_font_extents_func_t ()

 
hb_bool_t
-(*hb_font_get_font_extents_func_t) (hb_font_t *font,
+(*hb_font_get_font_extents_func_t) (hb_font_t *font,
                                     void *font_data,
                                     hb_font_extents_t *metrics,
                                     void *user_data);

@@ -2907,7 +2915,7 @@
 

 
hb_font_get_h_extents ()

 
hb_bool_t
-hb_font_get_h_extents (hb_font_t *font,
+hb_font_get_h_extents (hb_font_t *font,
                        hb_font_extents_t *extents);

 

 
Parameters

@@ -2937,7 +2945,7 @@
 

 
hb_font_get_v_extents ()

 
hb_bool_t
-hb_font_get_v_extents (hb_font_t *font,
+hb_font_get_v_extents (hb_font_t *font,
                        hb_font_extents_t *extents);

 

 
Parameters

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-ft.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-ft.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-ft.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-ft.html	2017-12-04 17:01:56.000000000 +0000
@@ -41,7 +41,7 @@
 

 
 

 
-hb_face_t *
+hb_face_t *
 
 
 hb_ft_face_create ()
@@ -49,7 +49,7 @@
 

 

 
-hb_face_t *
+hb_face_t *
 
 
 hb_ft_face_create_cached ()
@@ -57,7 +57,7 @@
 

 

 
-hb_face_t *
+hb_face_t *
 
 
 hb_ft_face_create_referenced ()
@@ -65,7 +65,7 @@
 

 

 
-hb_font_t *
+hb_font_t *
 
 
 hb_ft_font_create ()
@@ -73,7 +73,7 @@
 

 

 
-hb_font_t *
+hb_font_t *
 
 
 hb_ft_font_create_referenced ()
@@ -129,7 +129,7 @@
 
Functions

 

 
hb_ft_face_create ()

-
hb_face_t *
+
hb_face_t *
 hb_ft_face_create (FT_Face ft_face,
                    hb_destroy_func_t destroy);

 

@@ -157,7 +157,7 @@
 

 

 
hb_ft_face_create_cached ()

-
hb_face_t *
+
hb_face_t *
 hb_ft_face_create_cached (FT_Face ft_face);

 

 
Returns

@@ -169,7 +169,7 @@
 

 

 
hb_ft_face_create_referenced ()

-
hb_face_t *
+
hb_face_t *
 hb_ft_face_create_referenced (FT_Face ft_face);

 

 
Returns

@@ -181,7 +181,7 @@
 

 

 
hb_ft_font_create ()

-
hb_font_t *
+
hb_font_t *
 hb_ft_font_create (FT_Face ft_face,
                    hb_destroy_func_t destroy);

 

@@ -209,7 +209,7 @@
 

 

 
hb_ft_font_create_referenced ()

-
hb_font_t *
+
hb_font_t *
 hb_ft_font_create_referenced (FT_Face ft_face);

 

 
Returns

@@ -222,19 +222,19 @@
 

 
hb_ft_font_changed ()

 
void
-hb_ft_font_changed (hb_font_t *font);

+hb_ft_font_changed (hb_font_t *font);

 

 

 

 
hb_ft_font_get_face ()

 
FT_Face
-hb_ft_font_get_face (hb_font_t *font);

+hb_ft_font_get_face (hb_font_t *font);

 

 

 

 
hb_ft_font_set_load_flags ()

 
void
-hb_ft_font_set_load_flags (hb_font_t *font,
+hb_ft_font_set_load_flags (hb_font_t *font,
                            int load_flags);

 
Since: 1.0.5

 

@@ -242,14 +242,14 @@
 

 
hb_ft_font_get_load_flags ()

 
int
-hb_ft_font_get_load_flags (hb_font_t *font);

+hb_ft_font_get_load_flags (hb_font_t *font);

 
Since: 1.0.5

 

 

 

 
hb_ft_font_set_funcs ()

 
void
-hb_ft_font_set_funcs (hb_font_t *font);

+hb_ft_font_set_funcs (hb_font_t *font);

 

 

 

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-glib.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-glib.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-glib.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-glib.html	2017-12-04 17:01:56.000000000 +0000
@@ -41,7 +41,7 @@
 

 

 
-hb_unicode_funcs_t *
+hb_unicode_funcs_t *
 
 
 hb_glib_get_unicode_funcs ()
@@ -65,7 +65,7 @@
 

 

 
-hb_blob_t *
+hb_blob_t *
 
 
 hb_glib_blob_create ()
@@ -81,7 +81,7 @@
 
Functions

 

 
hb_glib_get_unicode_funcs ()

-
hb_unicode_funcs_t *
+
hb_unicode_funcs_t *
 hb_glib_get_unicode_funcs (void);

 

 

@@ -99,7 +99,7 @@
 

 

 
hb_glib_blob_create ()

-
hb_blob_t *
+
hb_blob_t *
 hb_glib_blob_create (GBytes *gbytes);

 
Since: 0.9.38

 

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-gobject.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-gobject.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-gobject.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-gobject.html	2017-12-04 17:01:56.000000000 +0000
@@ -32,14 +32,744 @@
 		
 

 

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GType
+
+hb_gobject_blob_get_type ()
+

+GType
+
+hb_gobject_buffer_content_type_get_type ()
+

+GType
+
+hb_gobject_buffer_diff_flags_get_type ()
+

+GType
+
+hb_gobject_buffer_flags_get_type ()
+

+GType
+
+hb_gobject_buffer_get_type ()
+

+GType
+
+hb_gobject_buffer_serialize_flags_get_type ()
+

+GType
+
+hb_gobject_buffer_serialize_format_get_type ()
+

+GType
+
+hb_gobject_direction_get_type ()
+

+GType
+
+hb_gobject_face_get_type ()
+

+GType
+
+hb_gobject_font_funcs_get_type ()
+

+GType
+
+hb_gobject_font_get_type ()
+

+GType
+
+hb_gobject_glyph_flags_get_type ()
+

+GType
+
+hb_gobject_memory_mode_get_type ()
+

+GType
+
+hb_gobject_ot_layout_glyph_class_get_type ()
+

+GType
+
+hb_gobject_ot_math_constant_get_type ()
+

+GType
+
+hb_gobject_ot_math_glyph_part_flags_get_type ()
+

+GType
+
+hb_gobject_ot_math_kern_get_type ()
+

+GType
+
+hb_gobject_script_get_type ()
+

+GType
+
+hb_gobject_shape_plan_get_type ()
+

+GType
+
+hb_gobject_unicode_combining_class_get_type ()
+

+GType
+
+hb_gobject_unicode_funcs_get_type ()
+

+GType
+
+hb_gobject_unicode_general_category_get_type ()
+

+GType
+
+hb_gobject_buffer_cluster_level_get_type ()
+

+GType
+
+hb_gobject_feature_get_type ()
+

+GType
+
+hb_gobject_glyph_info_get_type ()
+

+GType
+
+hb_gobject_glyph_position_get_type ()
+

+GType
+
+hb_gobject_segment_properties_get_type ()
+

+GType
+
+hb_gobject_set_get_type ()
+

+GType
+
+hb_gobject_user_data_key_get_type ()
+

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineHB_GOBJECT_TYPE_BLOB
#defineHB_GOBJECT_TYPE_BUFFER
#defineHB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE
#defineHB_GOBJECT_TYPE_BUFFER_DIFF_FLAGS
#defineHB_GOBJECT_TYPE_BUFFER_FLAGS
#defineHB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS
#defineHB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT
#defineHB_GOBJECT_TYPE_DIRECTION
#defineHB_GOBJECT_TYPE_FACE
#defineHB_GOBJECT_TYPE_FONT
#defineHB_GOBJECT_TYPE_FONT_FUNCS
#defineHB_GOBJECT_TYPE_GLYPH_FLAGS
#defineHB_GOBJECT_TYPE_MEMORY_MODE
#defineHB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS
#defineHB_GOBJECT_TYPE_OT_MATH_CONSTANT
#defineHB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS
#defineHB_GOBJECT_TYPE_OT_MATH_KERN
#defineHB_GOBJECT_TYPE_SCRIPT
#defineHB_GOBJECT_TYPE_SHAPE_PLAN
#defineHB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS
#defineHB_GOBJECT_TYPE_UNICODE_FUNCS
#defineHB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY
#defineHB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL
#defineHB_GOBJECT_TYPE_FEATURE
#defineHB_GOBJECT_TYPE_GLYPH_INFO
#defineHB_GOBJECT_TYPE_GLYPH_POSITION
#defineHB_GOBJECT_TYPE_SEGMENT_PROPERTIES
#defineHB_GOBJECT_TYPE_SET
#defineHB_GOBJECT_TYPE_USER_DATA_KEY

+

+

 
Description

 

 

 
Functions

-

+

+
hb_gobject_blob_get_type ()

+
GType
+hb_gobject_blob_get_type (void);

+
Since: 0.9.2

+

+

+

+
hb_gobject_buffer_content_type_get_type ()

+
GType
+hb_gobject_buffer_content_type_get_type
+                               (void);

+

+

+

+
hb_gobject_buffer_diff_flags_get_type ()

+
GType
+hb_gobject_buffer_diff_flags_get_type (void);

+

+

+

+
hb_gobject_buffer_flags_get_type ()

+
GType
+hb_gobject_buffer_flags_get_type (void);

+

+

+

+
hb_gobject_buffer_get_type ()

+
GType
+hb_gobject_buffer_get_type (void);

+
Since: 0.9.2

+

+

+

+
hb_gobject_buffer_serialize_flags_get_type ()

+
GType
+hb_gobject_buffer_serialize_flags_get_type
+                               (void);

+

+

+

+
hb_gobject_buffer_serialize_format_get_type ()

+
GType
+hb_gobject_buffer_serialize_format_get_type
+                               (void);

+

+

+

+
hb_gobject_direction_get_type ()

+
GType
+hb_gobject_direction_get_type (void);

+

+

+

+
hb_gobject_face_get_type ()

+
GType
+hb_gobject_face_get_type (void);

+
Since: 0.9.2

+

+

+

+
hb_gobject_font_funcs_get_type ()

+
GType
+hb_gobject_font_funcs_get_type (void);

+
Since: 0.9.2

+

+

+

+
hb_gobject_font_get_type ()

+
GType
+hb_gobject_font_get_type (void);

+
Since: 0.9.2

+

+

+

+
hb_gobject_glyph_flags_get_type ()

+
GType
+hb_gobject_glyph_flags_get_type (void);

+

+

+

+
hb_gobject_memory_mode_get_type ()

+
GType
+hb_gobject_memory_mode_get_type (void);

+

+

+

+
hb_gobject_ot_layout_glyph_class_get_type ()

+
GType
+hb_gobject_ot_layout_glyph_class_get_type
+                               (void);

+

+

+

+
hb_gobject_ot_math_constant_get_type ()

+
GType
+hb_gobject_ot_math_constant_get_type (void);

+

+

+

+
hb_gobject_ot_math_glyph_part_flags_get_type ()

+
GType
+hb_gobject_ot_math_glyph_part_flags_get_type
+                               (void);

+

+

+

+
hb_gobject_ot_math_kern_get_type ()

+
GType
+hb_gobject_ot_math_kern_get_type (void);

+

+

+

+
hb_gobject_script_get_type ()

+
GType
+hb_gobject_script_get_type (void);

+

+

+

+
hb_gobject_shape_plan_get_type ()

+
GType
+hb_gobject_shape_plan_get_type (void);

+

+

+

+
hb_gobject_unicode_combining_class_get_type ()

+
GType
+hb_gobject_unicode_combining_class_get_type
+                               (void);

+

+

+

+
hb_gobject_unicode_funcs_get_type ()

+
GType
+hb_gobject_unicode_funcs_get_type (void);

+
Since: 0.9.2

+

+

+

+
hb_gobject_unicode_general_category_get_type ()

+
GType
+hb_gobject_unicode_general_category_get_type
+                               (void);

+

+

+

+
hb_gobject_buffer_cluster_level_get_type ()

+
GType
+hb_gobject_buffer_cluster_level_get_type
+                               (void);

+

+

+

+
hb_gobject_feature_get_type ()

+
GType
+hb_gobject_feature_get_type (void);

+

+

+

+
hb_gobject_glyph_info_get_type ()

+
GType
+hb_gobject_glyph_info_get_type (void);

+

+

+

+
hb_gobject_glyph_position_get_type ()

+
GType
+hb_gobject_glyph_position_get_type (void);

+

+

+

+
hb_gobject_segment_properties_get_type ()

+
GType
+hb_gobject_segment_properties_get_type
+                               (void);

+

+

+

+
hb_gobject_set_get_type ()

+
GType
+hb_gobject_set_get_type (void);

+

+

+

+
hb_gobject_user_data_key_get_type ()

+
GType
+hb_gobject_user_data_key_get_type (void);

+

 

 

 
Types and Values

+

+
HB_GOBJECT_TYPE_BLOB

+
#define HB_GOBJECT_TYPE_BLOB (hb_gobject_blob_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_BUFFER

+
#define HB_GOBJECT_TYPE_BUFFER (hb_gobject_buffer_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE

+
#define HB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE (hb_gobject_buffer_content_type_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_BUFFER_DIFF_FLAGS

+
#define HB_GOBJECT_TYPE_BUFFER_DIFF_FLAGS (hb_gobject_buffer_diff_flags_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_BUFFER_FLAGS

+
#define HB_GOBJECT_TYPE_BUFFER_FLAGS (hb_gobject_buffer_flags_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS

+
#define HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS (hb_gobject_buffer_serialize_flags_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT

+
#define HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT (hb_gobject_buffer_serialize_format_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_DIRECTION

+
#define HB_GOBJECT_TYPE_DIRECTION (hb_gobject_direction_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_FACE

+
#define HB_GOBJECT_TYPE_FACE (hb_gobject_face_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_FONT

+
#define HB_GOBJECT_TYPE_FONT (hb_gobject_font_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_FONT_FUNCS

+
#define HB_GOBJECT_TYPE_FONT_FUNCS (hb_gobject_font_funcs_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_GLYPH_FLAGS

+
#define HB_GOBJECT_TYPE_GLYPH_FLAGS (hb_gobject_glyph_flags_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_MEMORY_MODE

+
#define HB_GOBJECT_TYPE_MEMORY_MODE (hb_gobject_memory_mode_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS

+
#define HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS (hb_gobject_ot_layout_glyph_class_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_OT_MATH_CONSTANT

+
#define HB_GOBJECT_TYPE_OT_MATH_CONSTANT (hb_gobject_ot_math_constant_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS

+
#define HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS (hb_gobject_ot_math_glyph_part_flags_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_OT_MATH_KERN

+
#define HB_GOBJECT_TYPE_OT_MATH_KERN (hb_gobject_ot_math_kern_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_SCRIPT

+
#define HB_GOBJECT_TYPE_SCRIPT (hb_gobject_script_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_SHAPE_PLAN

+
#define HB_GOBJECT_TYPE_SHAPE_PLAN (hb_gobject_shape_plan_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS

+
#define HB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS (hb_gobject_unicode_combining_class_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_UNICODE_FUNCS

+
#define HB_GOBJECT_TYPE_UNICODE_FUNCS (hb_gobject_unicode_funcs_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY

+
#define HB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY (hb_gobject_unicode_general_category_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL

+
#define HB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL (hb_gobject_buffer_cluster_level_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_FEATURE

+
#define HB_GOBJECT_TYPE_FEATURE (hb_gobject_feature_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_GLYPH_INFO

+
#define HB_GOBJECT_TYPE_GLYPH_INFO (hb_gobject_glyph_info_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_GLYPH_POSITION

+
#define HB_GOBJECT_TYPE_GLYPH_POSITION (hb_gobject_glyph_position_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_SEGMENT_PROPERTIES

+
#define HB_GOBJECT_TYPE_SEGMENT_PROPERTIES (hb_gobject_segment_properties_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_SET

+
#define HB_GOBJECT_TYPE_SET (hb_gobject_set_get_type ())
+

+

+

+

+
HB_GOBJECT_TYPE_USER_DATA_KEY

+
#define HB_GOBJECT_TYPE_USER_DATA_KEY (hb_gobject_user_data_key_get_type ())
+

+

 

 

 

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-graphite2.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-graphite2.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-graphite2.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-graphite2.html	2017-12-04 17:01:56.000000000 +0000
@@ -79,13 +79,13 @@
 

 
hb_graphite2_face_get_gr_face ()

 
gr_face *
-hb_graphite2_face_get_gr_face (hb_face_t *face);

+hb_graphite2_face_get_gr_face (hb_face_t *face);

 

 

 

 
hb_graphite2_font_get_gr_font ()

 
gr_font *
-hb_graphite2_font_get_gr_font (hb_font_t *font);

+hb_graphite2_font_get_gr_font (hb_font_t *font);

hb_graphite2_font_get_gr_font is deprecated and should not be used in newly-written code.

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-icu.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-icu.html --- harfbuzz-1.7.1/docs/html/harfbuzz-hb-icu.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-icu.html 2017-12-04 17:01:56.000000000 +0000 @@ -41,7 +41,7 @@ -hb_unicode_funcs_t * +hb_unicode_funcs_t * hb_icu_get_unicode_funcs () @@ -73,7 +73,7 @@

Functions

hb_icu_get_unicode_funcs ()

-
hb_unicode_funcs_t *
+
hb_unicode_funcs_t *
 hb_icu_get_unicode_funcs (void);
diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-ot-font.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-ot-font.html --- harfbuzz-1.7.1/docs/html/harfbuzz-hb-ot-font.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-ot-font.html 2017-12-04 17:01:56.000000000 +0000 @@ -56,7 +56,7 @@

hb_ot_font_set_funcs ()

void
-hb_ot_font_set_funcs (hb_font_t *font);
+hb_ot_font_set_funcs (hb_font_t *font);

Since: 0.9.28

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-ot-layout.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-ot-layout.html --- harfbuzz-1.7.1/docs/html/harfbuzz-hb-ot-layout.html 2017-11-14 19:14:10.000000000 +0000 +++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-ot-layout.html 2017-12-04 17:01:56.000000000 +0000 @@ -15,7 +15,8 @@ @@ -312,6 +313,12 @@
+

Object Hierarchy

+
    GEnum
+    ╰── hb_ot_layout_glyph_class_t
+
+
+

Description

@@ -319,19 +326,19 @@

hb_ot_layout_collect_lookups ()

void
-hb_ot_layout_collect_lookups (hb_face_t *face,
+hb_ot_layout_collect_lookups (hb_face_t *face,
                               hb_tag_t table_tag,
                               const hb_tag_t *scripts,
                               const hb_tag_t *languages,
                               const hb_tag_t *features,
-                              hb_set_t *lookup_indexes);
+ hb_set_t *lookup_indexes);

Since: 0.9.8

hb_ot_layout_feature_get_lookups ()

unsigned int
-hb_ot_layout_feature_get_lookups (hb_face_t *face,
+hb_ot_layout_feature_get_lookups (hb_face_t *face,
                                   hb_tag_t table_tag,
                                   unsigned int feature_index,
                                   unsigned int start_offset,
@@ -344,7 +351,7 @@
 
hb_ot_layout_feature_with_variations_get_lookups ()

 
unsigned int
 hb_ot_layout_feature_with_variations_get_lookups
-                               (hb_face_t *face,
+                               (hb_face_t *face,
                                 hb_tag_t table_tag,
                                 unsigned int feature_index,
                                 unsigned int variations_index,
@@ -356,7 +363,7 @@
 

 
hb_ot_layout_get_attach_points ()

 
unsigned int
-hb_ot_layout_get_attach_points (hb_face_t *face,
+hb_ot_layout_get_attach_points (hb_face_t *face,
                                 hb_codepoint_t glyph,
                                 unsigned int start_offset,
                                 unsigned int *point_count,
@@ -366,7 +373,7 @@
 

 
hb_ot_layout_get_glyph_class ()

 
hb_ot_layout_glyph_class_t
-hb_ot_layout_get_glyph_class (hb_face_t *face,
+hb_ot_layout_get_glyph_class (hb_face_t *face,
                               hb_codepoint_t glyph);

 
Since: 0.9.7

 

@@ -374,16 +381,16 @@
 

 
hb_ot_layout_get_glyphs_in_class ()

 
void
-hb_ot_layout_get_glyphs_in_class (hb_face_t *face,
+hb_ot_layout_get_glyphs_in_class (hb_face_t *face,
                                   hb_ot_layout_glyph_class_t klass,
-                                  hb_set_t *glyphs);

+                                  hb_set_t *glyphs);

 
Since: 0.9.7

 

 

 

 
hb_ot_layout_get_ligature_carets ()

 
unsigned int
-hb_ot_layout_get_ligature_carets (hb_font_t *font,
+hb_ot_layout_get_ligature_carets (hb_font_t *font,
                                   hb_direction_t direction,
                                   hb_codepoint_t glyph,
                                   unsigned int start_offset,
@@ -394,7 +401,7 @@
 

 
hb_ot_layout_get_size_params ()

 
hb_bool_t
-hb_ot_layout_get_size_params (hb_face_t *face,
+hb_ot_layout_get_size_params (hb_face_t *face,
                               unsigned int *design_size,
                               unsigned int *subfamily_id,
                               unsigned int *subfamily_name_id,
@@ -406,7 +413,7 @@
 

 
hb_ot_layout_glyph_sequence_func_t ()

 
hb_bool_t
-(*hb_ot_layout_glyph_sequence_func_t) (hb_font_t *font,
+(*hb_ot_layout_glyph_sequence_func_t) (hb_font_t *font,
                                        hb_tag_t table_tag,
                                        unsigned int lookup_index,
                                        const hb_ot_layout_glyph_sequence_t *sequence,
@@ -416,25 +423,25 @@
 

 
hb_ot_layout_has_glyph_classes ()

 
hb_bool_t
-hb_ot_layout_has_glyph_classes (hb_face_t *face);

+hb_ot_layout_has_glyph_classes (hb_face_t *face);

 

 

 

 
hb_ot_layout_has_positioning ()

 
hb_bool_t
-hb_ot_layout_has_positioning (hb_face_t *face);

+hb_ot_layout_has_positioning (hb_face_t *face);

 

 

 

 
hb_ot_layout_has_substitution ()

 
hb_bool_t
-hb_ot_layout_has_substitution (hb_face_t *face);

+hb_ot_layout_has_substitution (hb_face_t *face);

 

 

 

 
hb_ot_layout_language_find_feature ()

 
hb_bool_t
-hb_ot_layout_language_find_feature (hb_face_t *face,
+hb_ot_layout_language_find_feature (hb_face_t *face,
                                     hb_tag_t table_tag,
                                     unsigned int script_index,
                                     unsigned int language_index,
@@ -446,7 +453,7 @@
 
hb_ot_layout_language_get_feature_indexes ()

 
unsigned int
 hb_ot_layout_language_get_feature_indexes
-                               (hb_face_t *face,
+                               (hb_face_t *face,
                                 hb_tag_t table_tag,
                                 unsigned int script_index,
                                 unsigned int language_index,
@@ -459,7 +466,7 @@
 
hb_ot_layout_language_get_feature_tags ()

 
unsigned int
 hb_ot_layout_language_get_feature_tags
-                               (hb_face_t *face,
+                               (hb_face_t *face,
                                 hb_tag_t table_tag,
                                 unsigned int script_index,
                                 unsigned int language_index,
@@ -472,7 +479,7 @@
 
hb_ot_layout_language_get_required_feature ()

 
hb_bool_t
 hb_ot_layout_language_get_required_feature
-                               (hb_face_t *face,
+                               (hb_face_t *face,
                                 hb_tag_t table_tag,
                                 unsigned int script_index,
                                 unsigned int language_index,
@@ -484,13 +491,13 @@
 

 
hb_ot_layout_lookup_collect_glyphs ()

 
void
-hb_ot_layout_lookup_collect_glyphs (hb_face_t *face,
+hb_ot_layout_lookup_collect_glyphs (hb_face_t *face,
                                     hb_tag_t table_tag,
                                     unsigned int lookup_index,
-                                    hb_set_t *glyphs_before,
-                                    hb_set_t *glyphs_input,
-                                    hb_set_t *glyphs_after,
-                                    hb_set_t *glyphs_output);

+                                    hb_set_t *glyphs_before,
+                                    hb_set_t *glyphs_input,
+                                    hb_set_t *glyphs_after,
+                                    hb_set_t *glyphs_output);

 
Since: 0.9.7

 

 

@@ -498,16 +505,16 @@
 
hb_ot_layout_lookup_substitute_closure ()

 
void
 hb_ot_layout_lookup_substitute_closure
-                               (hb_face_t *face,
+                               (hb_face_t *face,
                                 unsigned int lookup_index,
-                                hb_set_t *glyphs);

+                                hb_set_t *glyphs);

 
Since: 0.9.7

hb_ot_layout_lookup_would_substitute ()

hb_bool_t
-hb_ot_layout_lookup_would_substitute (hb_face_t *face,
+hb_ot_layout_lookup_would_substitute (hb_face_t *face,
                                       unsigned int lookup_index,
                                       const hb_codepoint_t *glyphs,
                                       unsigned int glyphs_length,
@@ -518,7 +525,7 @@
 

 
hb_ot_layout_script_find_language ()

 
hb_bool_t
-hb_ot_layout_script_find_language (hb_face_t *face,
+hb_ot_layout_script_find_language (hb_face_t *face,
                                    hb_tag_t table_tag,
                                    unsigned int script_index,
                                    hb_tag_t language_tag,
@@ -528,7 +535,7 @@
 

 
hb_ot_layout_script_get_language_tags ()

 
unsigned int
-hb_ot_layout_script_get_language_tags (hb_face_t *face,
+hb_ot_layout_script_get_language_tags (hb_face_t *face,
                                        hb_tag_t table_tag,
                                        unsigned int script_index,
                                        unsigned int start_offset,
@@ -539,7 +546,7 @@
 

 
hb_ot_layout_table_choose_script ()

 
hb_bool_t
-hb_ot_layout_table_choose_script (hb_face_t *face,
+hb_ot_layout_table_choose_script (hb_face_t *face,
                                   hb_tag_t table_tag,
                                   const hb_tag_t *script_tags,
                                   unsigned int *script_index,
@@ -550,7 +557,7 @@
 
hb_ot_layout_table_find_feature_variations ()

 
hb_bool_t
 hb_ot_layout_table_find_feature_variations
-                               (hb_face_t *face,
+                               (hb_face_t *face,
                                 hb_tag_t table_tag,
                                 const int *coords,
                                 unsigned int num_coords,
@@ -560,7 +567,7 @@
 

 
hb_ot_layout_table_find_script ()

 
hb_bool_t
-hb_ot_layout_table_find_script (hb_face_t *face,
+hb_ot_layout_table_find_script (hb_face_t *face,
                                 hb_tag_t table_tag,
                                 hb_tag_t script_tag,
                                 unsigned int *script_index);

@@ -569,7 +576,7 @@
 

 
hb_ot_layout_table_get_feature_tags ()

 
unsigned int
-hb_ot_layout_table_get_feature_tags (hb_face_t *face,
+hb_ot_layout_table_get_feature_tags (hb_face_t *face,
                                      hb_tag_t table_tag,
                                      unsigned int start_offset,
                                      unsigned int *feature_count,
@@ -579,7 +586,7 @@
 

 
hb_ot_layout_table_get_script_tags ()

 
unsigned int
-hb_ot_layout_table_get_script_tags (hb_face_t *face,
+hb_ot_layout_table_get_script_tags (hb_face_t *face,
                                     hb_tag_t table_tag,
                                     unsigned int start_offset,
                                     unsigned int *script_count,
@@ -589,7 +596,7 @@
 

 
hb_ot_layout_table_get_lookup_count ()

 
unsigned int
-hb_ot_layout_table_get_lookup_count (hb_face_t *face,
+hb_ot_layout_table_get_lookup_count (hb_face_t *face,
                                      hb_tag_t table_tag);

 
Since: 0.9.22

 

@@ -597,9 +604,9 @@
 

 
hb_ot_shape_plan_collect_lookups ()

 
void
-hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
+hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
                                   hb_tag_t table_tag,
-                                  hb_set_t *lookup_indexes);

+                                  hb_set_t *lookup_indexes);

 
Since: 0.9.7

 

 

@@ -607,7 +614,7 @@
 
hb_ot_layout_language_get_required_feature_index ()

 
hb_bool_t
 hb_ot_layout_language_get_required_feature_index
-                               (hb_face_t *face,
+                               (hb_face_t *face,
                                 hb_tag_t table_tag,
                                 unsigned int script_index,
                                 unsigned int language_index,
diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-ot-math.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-ot-math.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-ot-math.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-ot-math.html	2017-12-04 17:01:56.000000000 +0000
@@ -15,7 +15,8 @@
 
@@ -152,6 +153,15 @@
 

 

 

+
Object Hierarchy

+
    GEnum
+    ├── hb_ot_math_constant_t
+    ╰── hb_ot_math_kern_t
+    GFlags
+    ╰── hb_ot_math_glyph_part_flags_t
+

+

+

 
Description

 

 

@@ -159,7 +169,7 @@
 

 
hb_ot_math_has_data ()

 
hb_bool_t
-hb_ot_math_has_data (hb_face_t *face);

+hb_ot_math_has_data (hb_face_t *face);

 
This function allows to verify the presence of an OpenType MATH table on the
 face.

 

@@ -172,7 +182,7 @@
 
 
 
face

-
hb_face_t to test

+
hb_face_t to test

  
 
 

@@ -187,7 +197,7 @@
 

 
hb_ot_math_get_constant ()

 
hb_position_t
-hb_ot_math_get_constant (hb_font_t *font,
+hb_ot_math_get_constant (hb_font_t *font,
                          hb_ot_math_constant_t constant);

 
This function returns the requested math constants as a hb_position_t.
 If the request constant is HB_OT_MATH_CONSTANT_SCRIPT_PERCENT_SCALE_DOWN,
@@ -205,7 +215,7 @@
 
 
 
font

-
hb_font_t from which to retrieve the value

+
hb_font_t from which to retrieve the value

  
 
 
@@ -227,7 +237,7 @@
 
hb_ot_math_get_glyph_italics_correction ()

 
hb_position_t
 hb_ot_math_get_glyph_italics_correction
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 hb_codepoint_t glyph);

 

 
Parameters

@@ -240,7 +250,7 @@
 
 
 
font

-
hb_font_t from which to retrieve the value

+
hb_font_t from which to retrieve the value

  
 
 
@@ -262,7 +272,7 @@
 
hb_ot_math_get_glyph_top_accent_attachment ()

 
hb_position_t
 hb_ot_math_get_glyph_top_accent_attachment
-                               (hb_font_t *font,
+                               (hb_font_t *font,
                                 hb_codepoint_t glyph);

 

 
Parameters

@@ -275,7 +285,7 @@
 
 
 
font

-
hb_font_t from which to retrieve the value

+
hb_font_t from which to retrieve the value

  
 
 
@@ -296,7 +306,7 @@
 

 
hb_ot_math_get_glyph_kerning ()

 
hb_position_t
-hb_ot_math_get_glyph_kerning (hb_font_t *font,
+hb_ot_math_get_glyph_kerning (hb_font_t *font,
                               hb_codepoint_t glyph,
                               hb_ot_math_kern_t kern,
                               hb_position_t correction_height);

@@ -316,7 +326,7 @@
 
 
 
font

-
hb_font_t from which to retrieve the value

+
hb_font_t from which to retrieve the value

  
 
 
@@ -347,7 +357,7 @@
 

 
hb_ot_math_is_glyph_extended_shape ()

 
hb_bool_t
-hb_ot_math_is_glyph_extended_shape (hb_face_t *face,
+hb_ot_math_is_glyph_extended_shape (hb_face_t *face,
                                     hb_codepoint_t glyph);

 

 
Parameters

@@ -360,7 +370,7 @@
 
 
 
face

-
a hb_face_t to test

+
a hb_face_t to test

  
 
 
@@ -381,7 +391,7 @@
 

 
hb_ot_math_get_glyph_variants ()

 
unsigned int
-hb_ot_math_get_glyph_variants (hb_font_t *font,
+hb_ot_math_get_glyph_variants (hb_font_t *font,
                                hb_codepoint_t glyph,
                                hb_direction_t direction,
                                unsigned int start_offset,
@@ -402,7 +412,7 @@
 
 
 
font

-
hb_font_t from which to retrieve the values

+
hb_font_t from which to retrieve the values

  
 
 
@@ -445,7 +455,7 @@
 

 
hb_ot_math_get_min_connector_overlap ()

 
hb_position_t
-hb_ot_math_get_min_connector_overlap (hb_font_t *font,
+hb_ot_math_get_min_connector_overlap (hb_font_t *font,
                                       hb_direction_t direction);

 
This function tries to retrieve the MathVariants table for the specified
 font and returns the minimum overlap of connecting glyphs to draw a glyph
@@ -462,7 +472,7 @@
 
 
 
font

-
hb_font_t from which to retrieve the value

+
hb_font_t from which to retrieve the value

  
 
 
@@ -483,7 +493,7 @@
 

 
hb_ot_math_get_glyph_assembly ()

 
unsigned int
-hb_ot_math_get_glyph_assembly (hb_font_t *font,
+hb_ot_math_get_glyph_assembly (hb_font_t *font,
                                hb_codepoint_t glyph,
                                hb_direction_t direction,
                                unsigned int start_offset,
@@ -505,7 +515,7 @@
 
 
 
font

-
hb_font_t from which to retrieve the values

+
hb_font_t from which to retrieve the values

  
 
 
diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-ot-shape.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-ot-shape.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-ot-shape.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-ot-shape.html	2017-12-04 17:01:56.000000000 +0000
@@ -56,11 +56,11 @@
 

 
hb_ot_shape_glyphs_closure ()

 
void
-hb_ot_shape_glyphs_closure (hb_font_t *font,
-                            hb_buffer_t *buffer,
-                            const hb_feature_t *features,
+hb_ot_shape_glyphs_closure (hb_font_t *font,
+                            hb_buffer_t *buffer,
+                            const hb_feature_t *features,
                             unsigned int num_features,
-                            hb_set_t *glyphs);

+                            hb_set_t *glyphs);

 
Since: 0.9.2

 

 

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-set.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-set.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-set.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-set.html	2017-12-04 17:01:56.000000000 +0000
@@ -15,7 +15,8 @@
 
@@ -73,7 +74,7 @@
 
-
-
-
-

 

-

+

 
Types and Values

 
@@ -263,12 +256,18 @@
 
-
+

 

 

 typedefhb_set_thb_set_t
 

 
 

 

 

+
Object Hierarchy

+
    GBoxed
+    ╰── hb_set_t
+

+

+

 
Description

 

 

@@ -276,7 +275,7 @@
 

 
hb_set_add ()

 
void
-hb_set_add (hb_set_t *set,
+hb_set_add (hb_set_t *set,
             hb_codepoint_t codepoint);

 

 
Parameters

@@ -299,7 +298,7 @@
 

 
hb_set_add_range ()

 
void
-hb_set_add_range (hb_set_t *set,
+hb_set_add_range (hb_set_t *set,
                   hb_codepoint_t first,
                   hb_codepoint_t last);

 

@@ -323,7 +322,7 @@
 

 
hb_set_allocation_successful ()

 
hb_bool_t
-hb_set_allocation_successful (const hb_set_t *set);

+hb_set_allocation_successful (const hb_set_t *set);

 

 
Parameters

 

@@ -345,7 +344,7 @@
 

 
hb_set_clear ()

 
void
-hb_set_clear (hb_set_t *set);

+hb_set_clear (hb_set_t *set);
 

 
Parameters

 

@@ -366,7 +365,7 @@
 

 
hb_set_create ()

-
hb_set_t *
+
hb_set_t *
 hb_set_create (void);

 
[Xconstructor]

 

@@ -380,7 +379,7 @@
 

 
hb_set_del ()

 
void
-hb_set_del (hb_set_t *set,
+hb_set_del (hb_set_t *set,
             hb_codepoint_t codepoint);

 

 
Parameters

@@ -403,7 +402,7 @@
 

 
hb_set_del_range ()

 
void
-hb_set_del_range (hb_set_t *set,
+hb_set_del_range (hb_set_t *set,
                   hb_codepoint_t first,
                   hb_codepoint_t last);

 

@@ -427,7 +426,7 @@
 

 
hb_set_destroy ()

 
void
-hb_set_destroy (hb_set_t *set);

+hb_set_destroy (hb_set_t *set);

 
[skip]

 

 
Parameters

@@ -449,7 +448,7 @@
 

 

 
hb_set_get_empty ()

-
hb_set_t *
+
hb_set_t *
 hb_set_get_empty (void);

 

 
Returns

@@ -462,7 +461,7 @@
 

 
hb_set_get_max ()

 
hb_codepoint_t
-hb_set_get_max (const hb_set_t *set);

+hb_set_get_max (const hb_set_t *set);

 
Finds the maximum number in the set.

 

 
Parameters

@@ -489,7 +488,7 @@
 

 
hb_set_get_min ()

 
hb_codepoint_t
-hb_set_get_min (const hb_set_t *set);

+hb_set_get_min (const hb_set_t *set);
 
Finds the minimum number in the set.

 

 
Parameters

@@ -516,7 +515,7 @@
 

 
hb_set_get_population ()

 
unsigned int
-hb_set_get_population (const hb_set_t *set);

+hb_set_get_population (const hb_set_t *set);
 
Returns the number of numbers in the set.

 

 
Parameters

@@ -543,8 +542,8 @@
 

 
hb_set_get_user_data ()

 
void *
-hb_set_get_user_data (hb_set_t *set,
-                      hb_user_data_key_t *key);

+hb_set_get_user_data (hb_set_t *set,
+                      hb_user_data_key_t *key);
 
[skip]

 

 
Parameters

@@ -572,7 +571,7 @@
 

 
hb_set_has ()

 
hb_bool_t
-hb_set_has (const hb_set_t *set,
+hb_set_has (const hb_set_t *set,
             hb_codepoint_t codepoint);

 

 
Parameters

@@ -595,8 +594,8 @@
 

 
hb_set_intersect ()

 
void
-hb_set_intersect (hb_set_t *set,
-                  const hb_set_t *other);

+hb_set_intersect (hb_set_t *set,
+                  const hb_set_t *other);
 

 
Parameters

 

 

@@ -616,32 +615,9 @@
 

-
hb_set_invert ()

-
void
-hb_set_invert (hb_set_t *set);

-
hb_set_invert has been deprecated since version 1.6.1 and should not be used in newly-written code.

-

-
Parameters

-

 
 

-----
-
-
-
-
-
-





set
a set.
 

-

-
Since: 0.9.10

-

-

-

 
hb_set_is_empty ()

 
hb_bool_t
-hb_set_is_empty (const hb_set_t *set);

+hb_set_is_empty (const hb_set_t *set);

 

 
Parameters

 

@@ -663,8 +639,8 @@
 

 
hb_set_is_equal ()

 
hb_bool_t
-hb_set_is_equal (const hb_set_t *set,
-                 const hb_set_t *other);

+hb_set_is_equal (const hb_set_t *set,
+                 const hb_set_t *other);
 

 
Parameters

 

@@ -686,7 +662,7 @@
 

 
hb_set_next ()

 
hb_bool_t
-hb_set_next (const hb_set_t *set,
+hb_set_next (const hb_set_t *set,
              hb_codepoint_t *codepoint);

 

 
Parameters

@@ -720,7 +696,7 @@
 

 
hb_set_next_range ()

 
hb_bool_t
-hb_set_next_range (const hb_set_t *set,
+hb_set_next_range (const hb_set_t *set,
                    hb_codepoint_t *first,
                    hb_codepoint_t *last);

 
Gets the next consecutive range of numbers in set
@@ -763,8 +739,8 @@
 

 

 
hb_set_reference ()

-
hb_set_t *
-hb_set_reference (hb_set_t *set);

+
hb_set_t *
+hb_set_reference (hb_set_t *set);

 
[skip]

 

 
Parameters

@@ -792,8 +768,8 @@
 

 
hb_set_set ()

 
void
-hb_set_set (hb_set_t *set,
-            const hb_set_t *other);

+hb_set_set (hb_set_t *set,
+            const hb_set_t *other);
 

 
Parameters

 

@@ -815,8 +791,8 @@
 

 
hb_set_set_user_data ()

 
hb_bool_t
-hb_set_set_user_data (hb_set_t *set,
-                      hb_user_data_key_t *key,
+hb_set_set_user_data (hb_set_t *set,
+                      hb_user_data_key_t *key,
                       void *data,
                       hb_destroy_func_t destroy,
                       hb_bool_t replace);

@@ -842,8 +818,8 @@
 

 
hb_set_subtract ()

 
void
-hb_set_subtract (hb_set_t *set,
-                 const hb_set_t *other);

+hb_set_subtract (hb_set_t *set,
+                 const hb_set_t *other);
 

 
Parameters

 

@@ -865,8 +841,8 @@
 

 
hb_set_symmetric_difference ()

 
void
-hb_set_symmetric_difference (hb_set_t *set,
-                             const hb_set_t *other);

+hb_set_symmetric_difference (hb_set_t *set,
+                             const hb_set_t *other);
 

 
Parameters

 

@@ -888,8 +864,8 @@
 

 
hb_set_union ()

 
void
-hb_set_union (hb_set_t *set,
-              const hb_set_t *other);

+hb_set_union (hb_set_t *set,
+              const hb_set_t *other);
 

 
Parameters

 

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-shape-plan.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-shape-plan.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-shape-plan.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-shape-plan.html	2017-12-04 17:01:56.000000000 +0000
@@ -15,7 +15,8 @@
 

@@ -41,7 +42,7 @@
 

 

-

+

 
Types and Values

 
@@ -138,21 +139,27 @@
 
-
+

 

 

 typedefhb_shape_plan_thb_shape_plan_t
 

 

 

 

+
Object Hierarchy

+
    GBoxed
+    ╰── hb_shape_plan_t
+

+

+

 
Description

 

 

 
Functions

 

 
hb_shape_plan_create ()

-
hb_shape_plan_t *
-hb_shape_plan_create (hb_face_t *face,
-                      const hb_segment_properties_t *props,
-                      const hb_feature_t *user_features,
+
hb_shape_plan_t *
+hb_shape_plan_create (hb_face_t *face,
+                      const hb_segment_properties_t *props,
+                      const hb_feature_t *user_features,
                       unsigned int num_user_features,
                       const char * const *shaper_list);

 
[Xconstructor]

@@ -188,10 +195,10 @@
 

 

 
hb_shape_plan_create_cached ()

-
hb_shape_plan_t *
-hb_shape_plan_create_cached (hb_face_t *face,
-                             const hb_segment_properties_t *props,
-                             const hb_feature_t *user_features,
+
hb_shape_plan_t *
+hb_shape_plan_create_cached (hb_face_t *face,
+                             const hb_segment_properties_t *props,
+                             const hb_feature_t *user_features,
                              unsigned int num_user_features,
                              const char * const *shaper_list);

 

@@ -226,10 +233,10 @@
 

 

 
hb_shape_plan_create2 ()

-
hb_shape_plan_t *
-hb_shape_plan_create2 (hb_face_t *face,
-                       const hb_segment_properties_t *props,
-                       const hb_feature_t *user_features,
+
hb_shape_plan_t *
+hb_shape_plan_create2 (hb_face_t *face,
+                       const hb_segment_properties_t *props,
+                       const hb_feature_t *user_features,
                        unsigned int num_user_features,
                        const int *coords,
                        unsigned int num_coords,
@@ -238,10 +245,10 @@
 

 

 
hb_shape_plan_create_cached2 ()

-
hb_shape_plan_t *
-hb_shape_plan_create_cached2 (hb_face_t *face,
-                              const hb_segment_properties_t *props,
-                              const hb_feature_t *user_features,
+
hb_shape_plan_t *
+hb_shape_plan_create_cached2 (hb_face_t *face,
+                              const hb_segment_properties_t *props,
+                              const hb_feature_t *user_features,
                               unsigned int num_user_features,
                               const int *coords,
                               unsigned int num_coords,
@@ -251,7 +258,7 @@
 

 
hb_shape_plan_destroy ()

 
void
-hb_shape_plan_destroy (hb_shape_plan_t *shape_plan);

+hb_shape_plan_destroy (hb_shape_plan_t *shape_plan);

 
[skip]

 

 
Parameters

@@ -274,10 +281,10 @@
 

 
hb_shape_plan_execute ()

 
hb_bool_t
-hb_shape_plan_execute (hb_shape_plan_t *shape_plan,
-                       hb_font_t *font,
-                       hb_buffer_t *buffer,
-                       const hb_feature_t *features,
+hb_shape_plan_execute (hb_shape_plan_t *shape_plan,
+                       hb_font_t *font,
+                       hb_buffer_t *buffer,
+                       const hb_feature_t *features,
                        unsigned int num_features);

 

 
Parameters

@@ -316,7 +323,7 @@
 

 

 
hb_shape_plan_get_empty ()

-
hb_shape_plan_t *
+
hb_shape_plan_t *
 hb_shape_plan_get_empty (void);

 

 
Returns

@@ -329,7 +336,7 @@
 

 
hb_shape_plan_get_shaper ()

 
const char *
-hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan);

+hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan);

 

 
Parameters

 

@@ -356,8 +363,8 @@
 

 
hb_shape_plan_get_user_data ()

 
void *
-hb_shape_plan_get_user_data (hb_shape_plan_t *shape_plan,
-                             hb_user_data_key_t *key);

+hb_shape_plan_get_user_data (hb_shape_plan_t *shape_plan,
+                             hb_user_data_key_t *key);
 
[skip]

 

 
Parameters

@@ -384,8 +391,8 @@
 

 

 
hb_shape_plan_reference ()

-
hb_shape_plan_t *
-hb_shape_plan_reference (hb_shape_plan_t *shape_plan);

+
hb_shape_plan_t *
+hb_shape_plan_reference (hb_shape_plan_t *shape_plan);

 
[skip]

 

 
Parameters

@@ -413,8 +420,8 @@
 

 
hb_shape_plan_set_user_data ()

 
hb_bool_t
-hb_shape_plan_set_user_data (hb_shape_plan_t *shape_plan,
-                             hb_user_data_key_t *key,
+hb_shape_plan_set_user_data (hb_shape_plan_t *shape_plan,
+                             hb_user_data_key_t *key,
                              void *data,
                              hb_destroy_func_t destroy,
                              hb_bool_t replace);

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-unicode.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-unicode.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-unicode.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-unicode.html	2017-12-04 17:01:56.000000000 +0000
@@ -15,7 +15,8 @@
 

@@ -103,7 +104,7 @@
 

 

-

+

 
Types and Values

 
@@ -314,7 +315,7 @@
 
-
+
@@ -324,6 +325,15 @@
 

 

 

 typedefhb_unicode_funcs_thb_unicode_funcs_t
 

 

 enum

 

 

+
Object Hierarchy

+
    GBoxed
+    ╰── hb_unicode_funcs_t
+    GEnum
+    ├── hb_unicode_combining_class_t
+    ╰── hb_unicode_general_category_t
+

+

+

 
Description

 

 

@@ -331,7 +341,7 @@
 

 
hb_unicode_combining_class ()

 
hb_unicode_combining_class_t
-hb_unicode_combining_class (hb_unicode_funcs_t *ufuncs,
+hb_unicode_combining_class (hb_unicode_funcs_t *ufuncs,
                             hb_codepoint_t unicode);

 
Since: 0.9.2

 

@@ -339,7 +349,7 @@
 

 
hb_unicode_combining_class_func_t ()

 
hb_unicode_combining_class_t
-(*hb_unicode_combining_class_func_t) (hb_unicode_funcs_t *ufuncs,
+(*hb_unicode_combining_class_func_t) (hb_unicode_funcs_t *ufuncs,
                                       hb_codepoint_t unicode,
                                       void *user_data);

 

@@ -347,7 +357,7 @@
 

 
hb_unicode_compose ()

 
hb_bool_t
-hb_unicode_compose (hb_unicode_funcs_t *ufuncs,
+hb_unicode_compose (hb_unicode_funcs_t *ufuncs,
                     hb_codepoint_t a,
                     hb_codepoint_t b,
                     hb_codepoint_t *ab);

@@ -379,7 +389,7 @@
 

 
hb_unicode_compose_func_t ()

 
hb_bool_t
-(*hb_unicode_compose_func_t) (hb_unicode_funcs_t *ufuncs,
+(*hb_unicode_compose_func_t) (hb_unicode_funcs_t *ufuncs,
                               hb_codepoint_t a,
                               hb_codepoint_t b,
                               hb_codepoint_t *ab,
@@ -389,7 +399,7 @@
 

 
hb_unicode_decompose ()

 
hb_bool_t
-hb_unicode_decompose (hb_unicode_funcs_t *ufuncs,
+hb_unicode_decompose (hb_unicode_funcs_t *ufuncs,
                       hb_codepoint_t ab,
                       hb_codepoint_t *a,
                       hb_codepoint_t *b);

@@ -426,7 +436,7 @@
 

 
hb_unicode_decompose_compatibility ()

 
unsigned int
-hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
+hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
                                     hb_codepoint_t u,
                                     hb_codepoint_t *decomposed);

 

@@ -457,7 +467,7 @@
 

 
hb_unicode_decompose_func_t ()

 
hb_bool_t
-(*hb_unicode_decompose_func_t) (hb_unicode_funcs_t *ufuncs,
+(*hb_unicode_decompose_func_t) (hb_unicode_funcs_t *ufuncs,
                                 hb_codepoint_t ab,
                                 hb_codepoint_t *a,
                                 hb_codepoint_t *b,
@@ -467,15 +477,15 @@
 

 
hb_unicode_eastasian_width ()

 
unsigned int
-hb_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs,
+hb_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs,
                             hb_codepoint_t unicode);

 
Since: 0.9.2

 

 

 

 
hb_unicode_funcs_create ()

-
hb_unicode_funcs_t *
-hb_unicode_funcs_create (hb_unicode_funcs_t *parent);

+
hb_unicode_funcs_t *
+hb_unicode_funcs_create (hb_unicode_funcs_t *parent);

 
[Xconstructor]

 

 
Parameters

@@ -503,7 +513,7 @@
 

 
hb_unicode_funcs_destroy ()

 
void
-hb_unicode_funcs_destroy (hb_unicode_funcs_t *ufuncs);

+hb_unicode_funcs_destroy (hb_unicode_funcs_t *ufuncs);

 
[skip]

 

 
Parameters

@@ -525,13 +535,13 @@
 

 

 
hb_unicode_funcs_get_default ()

-
hb_unicode_funcs_t *
+
hb_unicode_funcs_t *
 hb_unicode_funcs_get_default (void);

 

 

 

 
hb_unicode_funcs_get_empty ()

-
hb_unicode_funcs_t *
+
hb_unicode_funcs_t *
 hb_unicode_funcs_get_empty (void);

 

 
Returns

@@ -543,8 +553,8 @@
 

 

 
hb_unicode_funcs_get_parent ()

-
hb_unicode_funcs_t *
-hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs);

+
hb_unicode_funcs_t *
+hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs);

 

 
Parameters

 

@@ -566,8 +576,8 @@
 

 
hb_unicode_funcs_get_user_data ()

 
void *
-hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs,
-                                hb_user_data_key_t *key);

+hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs,
+                                hb_user_data_key_t *key);
 
[skip]

 

 
Parameters

@@ -595,7 +605,7 @@
 

 
hb_unicode_funcs_is_immutable ()

 
hb_bool_t
-hb_unicode_funcs_is_immutable (hb_unicode_funcs_t *ufuncs);

+hb_unicode_funcs_is_immutable (hb_unicode_funcs_t *ufuncs);
 

 
Parameters

 

@@ -617,7 +627,7 @@
 

 
hb_unicode_funcs_make_immutable ()

 
void
-hb_unicode_funcs_make_immutable (hb_unicode_funcs_t *ufuncs);

+hb_unicode_funcs_make_immutable (hb_unicode_funcs_t *ufuncs);
 

 
Parameters

 

@@ -638,8 +648,8 @@
 

 
hb_unicode_funcs_reference ()

-
hb_unicode_funcs_t *
-hb_unicode_funcs_reference (hb_unicode_funcs_t *ufuncs);

+
hb_unicode_funcs_t *
+hb_unicode_funcs_reference (hb_unicode_funcs_t *ufuncs);

 
[skip]

 

 
Parameters

@@ -668,7 +678,7 @@
 
hb_unicode_funcs_set_combining_class_func ()

 
void
 hb_unicode_funcs_set_combining_class_func
-                               (hb_unicode_funcs_t *ufuncs,
+                               (hb_unicode_funcs_t *ufuncs,
                                 hb_unicode_combining_class_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -700,7 +710,7 @@
 

 
hb_unicode_funcs_set_compose_func ()

 
void
-hb_unicode_funcs_set_compose_func (hb_unicode_funcs_t *ufuncs,
+hb_unicode_funcs_set_compose_func (hb_unicode_funcs_t *ufuncs,
                                    hb_unicode_compose_func_t func,
                                    void *user_data,
                                    hb_destroy_func_t destroy);

@@ -733,7 +743,7 @@
 
hb_unicode_funcs_set_decompose_compatibility_func ()

 
void
 hb_unicode_funcs_set_decompose_compatibility_func
-                               (hb_unicode_funcs_t *ufuncs,
+                               (hb_unicode_funcs_t *ufuncs,
                                 hb_unicode_decompose_compatibility_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -765,7 +775,7 @@
 

 
hb_unicode_funcs_set_decompose_func ()

 
void
-hb_unicode_funcs_set_decompose_func (hb_unicode_funcs_t *ufuncs,
+hb_unicode_funcs_set_decompose_func (hb_unicode_funcs_t *ufuncs,
                                      hb_unicode_decompose_func_t func,
                                      void *user_data,
                                      hb_destroy_func_t destroy);

@@ -798,7 +808,7 @@
 
hb_unicode_funcs_set_eastasian_width_func ()

 
void
 hb_unicode_funcs_set_eastasian_width_func
-                               (hb_unicode_funcs_t *ufuncs,
+                               (hb_unicode_funcs_t *ufuncs,
                                 hb_unicode_eastasian_width_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -831,7 +841,7 @@
 
hb_unicode_funcs_set_general_category_func ()

 
void
 hb_unicode_funcs_set_general_category_func
-                               (hb_unicode_funcs_t *ufuncs,
+                               (hb_unicode_funcs_t *ufuncs,
                                 hb_unicode_general_category_func_t func,
                                 void *user_data,
                                 hb_destroy_func_t destroy);

@@ -863,7 +873,7 @@
 

 
hb_unicode_funcs_set_mirroring_func ()

 
void
-hb_unicode_funcs_set_mirroring_func (hb_unicode_funcs_t *ufuncs,
+hb_unicode_funcs_set_mirroring_func (hb_unicode_funcs_t *ufuncs,
                                      hb_unicode_mirroring_func_t func,
                                      void *user_data,
                                      hb_destroy_func_t destroy);

@@ -895,7 +905,7 @@
 

 
hb_unicode_funcs_set_script_func ()

 
void
-hb_unicode_funcs_set_script_func (hb_unicode_funcs_t *ufuncs,
+hb_unicode_funcs_set_script_func (hb_unicode_funcs_t *ufuncs,
                                   hb_unicode_script_func_t func,
                                   void *user_data,
                                   hb_destroy_func_t destroy);

@@ -927,8 +937,8 @@
 

 
hb_unicode_funcs_set_user_data ()

 
hb_bool_t
-hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs,
-                                hb_user_data_key_t *key,
+hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs,
+                                hb_user_data_key_t *key,
                                 void *data,
                                 hb_destroy_func_t destroy,
                                 hb_bool_t replace);

@@ -954,7 +964,7 @@
 

 
hb_unicode_general_category ()

 
hb_unicode_general_category_t
-hb_unicode_general_category (hb_unicode_funcs_t *ufuncs,
+hb_unicode_general_category (hb_unicode_funcs_t *ufuncs,
                              hb_codepoint_t unicode);

 
Since: 0.9.2

 

@@ -962,7 +972,7 @@
 

 
hb_unicode_general_category_func_t ()

 
hb_unicode_general_category_t
-(*hb_unicode_general_category_func_t) (hb_unicode_funcs_t *ufuncs,
+(*hb_unicode_general_category_func_t) (hb_unicode_funcs_t *ufuncs,
                                        hb_codepoint_t unicode,
                                        void *user_data);

 

@@ -970,7 +980,7 @@
 

 
hb_unicode_mirroring ()

 
hb_codepoint_t
-hb_unicode_mirroring (hb_unicode_funcs_t *ufuncs,
+hb_unicode_mirroring (hb_unicode_funcs_t *ufuncs,
                       hb_codepoint_t unicode);

 
Since: 0.9.2

 

@@ -978,7 +988,7 @@
 

 
hb_unicode_mirroring_func_t ()

 
hb_codepoint_t
-(*hb_unicode_mirroring_func_t) (hb_unicode_funcs_t *ufuncs,
+(*hb_unicode_mirroring_func_t) (hb_unicode_funcs_t *ufuncs,
                                 hb_codepoint_t unicode,
                                 void *user_data);

 

@@ -986,7 +996,7 @@
 

 
hb_unicode_script ()

 
hb_script_t
-hb_unicode_script (hb_unicode_funcs_t *ufuncs,
+hb_unicode_script (hb_unicode_funcs_t *ufuncs,
                    hb_codepoint_t unicode);

 
Since: 0.9.2

 

@@ -994,7 +1004,7 @@
 

 
hb_unicode_script_func_t ()

 
hb_script_t
-(*hb_unicode_script_func_t) (hb_unicode_funcs_t *ufuncs,
+(*hb_unicode_script_func_t) (hb_unicode_funcs_t *ufuncs,
                              hb_codepoint_t unicode,
                              void *user_data);

 

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-uniscribe.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-uniscribe.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-uniscribe.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-uniscribe.html	2017-12-04 17:01:56.000000000 +0000
@@ -66,13 +66,13 @@
 

 
hb_uniscribe_font_get_hfont ()

 
HFONT
-hb_uniscribe_font_get_hfont (hb_font_t *font);

+hb_uniscribe_font_get_hfont (hb_font_t *font);
 

 

 

 
hb_uniscribe_font_get_logfontw ()

 
LOGFONTW *
-hb_uniscribe_font_get_logfontw (hb_font_t *font);

+hb_uniscribe_font_get_logfontw (hb_font_t *font);
 

 

 

diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-hb-version.html harfbuzz-1.7.2/docs/html/harfbuzz-hb-version.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-hb-version.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-hb-version.html	2017-12-04 17:01:56.000000000 +0000
@@ -176,7 +176,7 @@
 

 

 
HB_VERSION_MICRO

-
#define HB_VERSION_MICRO 0
+
#define HB_VERSION_MICRO 1
 

 

 

@@ -188,7 +188,7 @@
 

 

 
HB_VERSION_STRING

-
#define HB_VERSION_STRING "1.7.0"
+
#define HB_VERSION_STRING "1.7.1"
 

 

 

Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/docs/html/HarfBuzz.png and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/docs/html/HarfBuzz.png differ
diff -Nru harfbuzz-1.7.1/docs/html/harfbuzz-Shaping.html harfbuzz-1.7.2/docs/html/harfbuzz-Shaping.html
--- harfbuzz-1.7.1/docs/html/harfbuzz-Shaping.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/harfbuzz-Shaping.html	2017-12-04 17:01:56.000000000 +0000
@@ -15,7 +15,8 @@
 

 

@@ -81,7 +82,7 @@
 

 

-

+

 
Types and Values

 
@@ -90,11 +91,17 @@
 
-
+

 

 

  hb_feature_thb_feature_t
 

 

 

 

+
Object Hierarchy

+
    GBoxed
+    ╰── hb_feature_t
+

+

+

 
Includes

 
#include <hb.h>
 

@@ -113,8 +120,8 @@
 
hb_bool_t
 hb_feature_from_string (const char *str,
                         int len,
-                        hb_feature_t *feature);

-
Parses a string into a hb_feature_t.

+                        hb_feature_t *feature);

+
Parses a string into a hb_feature_t.

 
TODO: document the syntax here.

 

 
Parameters

@@ -138,7 +145,7 @@
 
 
 
feature

-
 the hb_feature_t to initialize with the parsed values. 

+
 the hb_feature_t to initialize with the parsed values. 

 [out]
 
 
@@ -155,10 +162,10 @@
 

 
hb_feature_to_string ()

 
void
-hb_feature_to_string (hb_feature_t *feature,
+hb_feature_to_string (hb_feature_t *feature,
                       char *buf,
                       unsigned int size);

-
Converts a hb_feature_t into a NULL-terminated string in the format
+
Converts a hb_feature_t into a NULL-terminated string in the format
 understood by hb_feature_from_string(). The client in responsible for
 allocating big enough size for buf
 , 128 bytes is more than enough.

@@ -173,7 +180,7 @@
 
 
 
feature

-
an hb_feature_t to convert

+
an hb_feature_t to convert

  
 
 
@@ -196,9 +203,9 @@
 

 
hb_shape ()

 
void
-hb_shape (hb_font_t *font,
-          hb_buffer_t *buffer,
-          const hb_feature_t *features,
+hb_shape (hb_font_t *font,
+          hb_buffer_t *buffer,
+          const hb_feature_t *features,
           unsigned int num_features);

 
Shapes buffer
  using font
@@ -217,18 +224,18 @@
 
 
 
font

-
an hb_font_t to use for shaping

+
an hb_font_t to use for shaping

  
 
 
 
buffer

-
an hb_buffer_t to shape

+
an hb_buffer_t to shape

  
 
 
 
features

 
 an array of user
-specified hb_feature_t or NULL. 

+specified hb_feature_t or NULL. 

 [array length=num_features][allow-none]
 
 
@@ -246,9 +253,9 @@
 

 
hb_shape_full ()

 
hb_bool_t
-hb_shape_full (hb_font_t *font,
-               hb_buffer_t *buffer,
-               const hb_feature_t *features,
+hb_shape_full (hb_font_t *font,
+               hb_buffer_t *buffer,
+               const hb_feature_t *features,
                unsigned int num_features,
                const char * const *shaper_list);

 
See hb_shape() for details. If shaper_list
@@ -266,18 +273,18 @@
 
 
 
font

-
an hb_font_t to use for shaping

+
an hb_font_t to use for shaping

  
 
 
 
buffer

-
an hb_buffer_t to shape

+
an hb_buffer_t to shape

  
 
 
 
features

 
 an array of user
-specified hb_feature_t or NULL. 

+specified hb_feature_t or NULL. 

 [array length=num_features][allow-none]
 
 
@@ -319,7 +326,7 @@
 

 
Types and Values

 

-
hb_feature_t

+
hb_feature_t

 
typedef struct {
   hb_tag_t      tag;
   uint32_t      value;
diff -Nru harfbuzz-1.7.1/docs/html/HarfBuzz.svg harfbuzz-1.7.2/docs/html/HarfBuzz.svg
--- harfbuzz-1.7.1/docs/html/HarfBuzz.svg	1970-01-01 00:00:00.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/HarfBuzz.svg	2017-12-04 17:01:56.000000000 +0000
@@ -0,0 +1,277 @@
+
+
+
+
+  
+    
+      
+        image/svg+xml
+        
+        
+      
+    
+  
+  
+    
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
diff -Nru harfbuzz-1.7.1/docs/html/index.html harfbuzz-1.7.2/docs/html/index.html
--- harfbuzz-1.7.1/docs/html/index.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/index.html	2017-12-04 17:01:56.000000000 +0000
@@ -30,7 +30,7 @@
         source tree is available
         here.
         Also available on
-        github.
+        github.
         See Download for release tarballs.
       

 

diff -Nru harfbuzz-1.7.1/docs/html/install-harfbuzz.html harfbuzz-1.7.2/docs/html/install-harfbuzz.html
--- harfbuzz-1.7.1/docs/html/install-harfbuzz.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/install-harfbuzz.html	2017-12-04 17:01:56.000000000 +0000
@@ -39,7 +39,7 @@
 

       The canonical source tree is available
       here.
-      Also available on github.
+      Also available on github.
     

 

       The API that comes with hb.h will
diff -Nru harfbuzz-1.7.1/docs/html/object-tree.html harfbuzz-1.7.2/docs/html/object-tree.html
--- harfbuzz-1.7.1/docs/html/object-tree.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/object-tree.html	2017-12-04 17:01:56.000000000 +0000
@@ -23,7 +23,38 @@
 

 Object Hierarchy

 
-
+    GBoxed
+    ├── hb_blob_t
+    ├── hb_buffer_t
+    ├── hb_face_t
+    ├── hb_feature_t
+    ├── hb_font_funcs_t
+    ├── hb_font_t
+    ├── hb_glyph_info_t
+    ├── hb_glyph_position_t
+    ├── hb_segment_properties_t
+    ├── hb_set_t
+    ├── hb_shape_plan_t
+    ├── hb_unicode_funcs_t
+    ╰── hb_user_data_key_t
+    GEnum
+    ├── hb_buffer_cluster_level_t
+    ├── hb_buffer_content_type_t
+    ├── hb_buffer_serialize_format_t
+    ├── hb_direction_t
+    ├── hb_memory_mode_t
+    ├── hb_ot_layout_glyph_class_t
+    ├── hb_ot_math_constant_t
+    ├── hb_ot_math_kern_t
+    ├── hb_script_t
+    ├── hb_unicode_combining_class_t
+    ╰── hb_unicode_general_category_t
+    GFlags
+    ├── hb_buffer_diff_flags_t
+    ├── hb_buffer_flags_t
+    ├── hb_buffer_serialize_flags_t
+    ├── hb_glyph_flags_t
+    ╰── hb_ot_math_glyph_part_flags_t
 

 

 

diff -Nru harfbuzz-1.7.1/docs/html/pt02.html harfbuzz-1.7.2/docs/html/pt02.html
--- harfbuzz-1.7.1/docs/html/pt02.html	2017-11-14 19:14:10.000000000 +0000
+++ harfbuzz-1.7.2/docs/html/pt02.html	2017-12-04 17:01:56.000000000 +0000
@@ -24,7 +24,7 @@
 

 Part II. Reference manual

 

-        This document is for HarfBuzz 1.7.1
+        This document is for HarfBuzz 1.7.2
 .
         
       

diff -Nru harfbuzz-1.7.1/docs/Makefile.am harfbuzz-1.7.2/docs/Makefile.am
--- harfbuzz-1.7.1/docs/Makefile.am	2017-10-13 10:58:06.000000000 +0000
+++ harfbuzz-1.7.2/docs/Makefile.am	2017-11-22 00:37:04.000000000 +0000
@@ -67,7 +67,8 @@
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=  \
-	HarfBuzz.png
+	HarfBuzz.png \
+	HarfBuzz.svg
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
diff -Nru harfbuzz-1.7.1/docs/Makefile.in harfbuzz-1.7.2/docs/Makefile.in
--- harfbuzz-1.7.1/docs/Makefile.in	2017-11-14 19:13:33.000000000 +0000
+++ harfbuzz-1.7.2/docs/Makefile.in	2017-12-04 16:53:00.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -377,7 +377,8 @@
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES = \
-	HarfBuzz.png
+	HarfBuzz.png \
+	HarfBuzz.svg
 
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
diff -Nru harfbuzz-1.7.1/docs/usermanual-install-harfbuzz.xml harfbuzz-1.7.2/docs/usermanual-install-harfbuzz.xml
--- harfbuzz-1.7.1/docs/usermanual-install-harfbuzz.xml	2017-10-13 10:58:06.000000000 +0000
+++ harfbuzz-1.7.2/docs/usermanual-install-harfbuzz.xml	2017-11-20 21:10:35.000000000 +0000
@@ -12,7 +12,7 @@
     
       The canonical source tree is available
       here.
-      Also available on github.
+      Also available on github.
     
     
       The API that comes with hb.h will
diff -Nru harfbuzz-1.7.1/docs/version.xml harfbuzz-1.7.2/docs/version.xml
--- harfbuzz-1.7.1/docs/version.xml	2017-11-14 19:13:41.000000000 +0000
+++ harfbuzz-1.7.2/docs/version.xml	2017-12-04 16:53:06.000000000 +0000
@@ -1 +1 @@
-1.7.1
+1.7.2
diff -Nru harfbuzz-1.7.1/harfbuzz.doap harfbuzz-1.7.2/harfbuzz.doap
--- harfbuzz-1.7.1/harfbuzz.doap	2017-10-23 17:01:31.000000000 +0000
+++ harfbuzz-1.7.2/harfbuzz.doap	2017-11-20 21:10:35.000000000 +0000
@@ -13,7 +13,7 @@
   
   
+  rdf:resource="https://github.com/harfbuzz/harfbuzz/issues" />
 
   
     
diff -Nru harfbuzz-1.7.1/Makefile.in harfbuzz-1.7.2/Makefile.in
--- harfbuzz-1.7.1/Makefile.in	2017-11-14 19:13:33.000000000 +0000
+++ harfbuzz-1.7.2/Makefile.in	2017-12-04 16:52:59.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -675,7 +675,7 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -700,7 +700,7 @@
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -718,7 +718,7 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -728,7 +728,7 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
diff -Nru harfbuzz-1.7.1/NEWS harfbuzz-1.7.2/NEWS
--- harfbuzz-1.7.1/NEWS	2017-11-14 19:09:05.000000000 +0000
+++ harfbuzz-1.7.2/NEWS	2017-12-04 17:01:31.000000000 +0000
@@ -1,3 +1,13 @@
+Overview of changes leading to 1.7.2
+Monday, December 4, 2017
+====================================
+
+- Optimize hb_set_add_range().
+- Misc fixes.
+- New API:
+hb_coretext_font_create()
+
+
 Overview of changes leading to 1.7.1
 Tuesday, November 14, 2017
 ====================================
@@ -33,7 +43,7 @@
 
 - Yesterday's release had a bad crasher; don't use it.  That's what
   happens when one works on Sunday...
-  https://github.com/behdad/harfbuzz/issues/578
+  https://github.com/harfbuzz/harfbuzz/issues/578
 - Build fixes for FreeBSD and Chrome Android.
 
 
@@ -42,7 +52,7 @@
 ====================================
 
 - Don't skip over COMBINING GRAPHEME JOINER when ligating, etc.
-  To be refined: https://github.com/behdad/harfbuzz/issues/554
+  To be refined: https://github.com/harfbuzz/harfbuzz/issues/554
 - Faster hb_set_t implementation.
 - Don't use deprecated ICU API.
 - Fix undefined-behavior in Myanmar shaper, introduced in 1.6.0
@@ -443,7 +453,7 @@
 - CoreText: Drastically speed up font initialization.
 - CoreText: Fix tiny leak.
 - Group ZWJ/ZWNJ with previous syllable under cluster-level=0.
-  https://github.com/behdad/harfbuzz/issues/217
+  https://github.com/harfbuzz/harfbuzz/issues/217
 - Add test/shaping/README.md about how to add tests to the suite.
 
 
@@ -459,8 +469,8 @@
 - Allow GPOS cursive connection on marks, and fix the interaction with
   mark attachment.  This work resulted in some changes to how mark
   attachments work.  See:
-  https://github.com/behdad/harfbuzz/issues/211
-  https://github.com/behdad/harfbuzz/commit/86c68c7a2c971efe8e35b1f1bd99401dc8b688d2
+  https://github.com/harfbuzz/harfbuzz/issues/211
+  https://github.com/harfbuzz/harfbuzz/commit/86c68c7a2c971efe8e35b1f1bd99401dc8b688d2
 - Graphite2 shaper: improved negative advance handling (eg. Nastaliq).
 - Add nmake-based build system for Windows.
 - Minor speedup.
@@ -501,7 +511,7 @@
 ====================================
 
 - Fix badly-broken fallback shaper that affected terminology.
-  https://github.com/behdad/harfbuzz/issues/187
+  https://github.com/harfbuzz/harfbuzz/issues/187
 - Fix y_scaling in Graphite shaper.
 - API changes:
   * An unset glyph_h_origin() function in font-funcs now (sensibly)
@@ -523,11 +533,11 @@
 ====================================
 
 - Implement 'stch' stretch feature for Syriac Abbreviation Mark.
-  https://github.com/behdad/harfbuzz/issues/141
+  https://github.com/harfbuzz/harfbuzz/issues/141
 - Disable use of decompose_compatibility() callback.
 - Implement "shaping" of various Unicode space characters, even
   if the font does not support them.
-  https://github.com/behdad/harfbuzz/issues/153
+  https://github.com/harfbuzz/harfbuzz/issues/153
 - If font does not support U+2011 NO-BREAK HYPHEN, fallback to
   U+2010 HYPHEN.
 - Changes resulting from libFuzzer continuous fuzzing:
@@ -550,7 +560,7 @@
 - Revert default load-flags of fonts created using hb_ft_font_create()
   back to FT_LOAD_DEFAULT|FT_LOAD_NO_HINTING.  This was changed in
   last release (1.0.5), but caused major issues, so revert.
-  https://github.com/behdad/harfbuzz/issues/143
+  https://github.com/harfbuzz/harfbuzz/issues/143
 
 
 Overview of changes leading to 1.0.5
@@ -558,7 +568,7 @@
 ====================================
 
 - Fix multiple memory access bugs discovered using libFuzzer.
-  https://github.com/behdad/harfbuzz/issues/139
+  https://github.com/harfbuzz/harfbuzz/issues/139
   Everyone should upgrade to this version as soon as possible.
   We now have continuous fuzzing set up, to avoid issues like
   these creeping in again.
diff -Nru harfbuzz-1.7.1/README harfbuzz-1.7.2/README
--- harfbuzz-1.7.1/README	2017-10-31 20:11:47.000000000 +0000
+++ harfbuzz-1.7.2/README	2017-11-21 22:03:53.000000000 +0000
@@ -1,7 +1,7 @@
-[![Build Status](https://travis-ci.org/behdad/harfbuzz.svg)](https://travis-ci.org/behdad/harfbuzz)
-[![Build Status](https://ci.appveyor.com/api/projects/status/4oaq58ns2h0m2soa?svg=true)](https://ci.appveyor.com/project/behdad/harfbuzz)
-[![CircleCI](https://circleci.com/gh/behdad/harfbuzz.svg?style=svg)](https://circleci.com/gh/behdad/harfbuzz)
-[![Coverage Status](https://img.shields.io/coveralls/behdad/harfbuzz.svg)](https://coveralls.io/r/behdad/harfbuzz)
+[![Build Status](https://travis-ci.org/harfbuzz/harfbuzz.svg)](https://travis-ci.org/harfbuzz/harfbuzz)
+[![Build Status](https://ci.appveyor.com/api/projects/status/4oaq58ns2h0m2soa?svg=true)](https://ci.appveyor.com/project/harfbuzz/harfbuzz)
+[![CircleCI](https://circleci.com/gh/harfbuzz/harfbuzz.svg?style=svg)](https://circleci.com/gh/harfbuzz/harfbuzz)
+[![Coverage Status](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.
@@ -11,3 +11,5 @@
   http://harfbuzz.org/
 
 For license information, see the file COPYING.
+
+Documentation: https://harfbuzz.github.io
diff -Nru harfbuzz-1.7.1/RELEASING.md harfbuzz-1.7.2/RELEASING.md
--- harfbuzz-1.7.1/RELEASING.md	2017-10-23 17:10:17.000000000 +0000
+++ harfbuzz-1.7.2/RELEASING.md	2017-11-20 21:10:35.000000000 +0000
@@ -59,7 +59,7 @@
 12. Push the commit and tag out: "git push --follow-tags".  Make sure it's
     pushed both to freedesktop repo and github.
 
-13. Go to GitHub release page [here](https://github.com/behdad/harfbuzz/releases),
+13. Go to GitHub release page [here](https://github.com/harfbuzz/harfbuzz/releases),
     edit the tag, upload artefacts and NEWS entry and save.
 
 
diff -Nru harfbuzz-1.7.1/src/gen-use-table.py harfbuzz-1.7.2/src/gen-use-table.py
--- harfbuzz-1.7.1/src/gen-use-table.py	2017-10-13 10:58:06.000000000 +0000
+++ harfbuzz-1.7.2/src/gen-use-table.py	2017-11-21 21:48:40.000000000 +0000
@@ -44,6 +44,7 @@
 # TODO Characters that are not in Unicode Indic files, but used in USE
 data[0][0x034F] = defaults[0]
 data[0][0x2060] = defaults[0]
+data[0][0x20F0] = defaults[0]
 for u in range (0xFE00, 0xFE0F + 1):
 	data[0][u] = defaults[0]
 
@@ -300,9 +301,15 @@
 		# the nasalization marks, maybe only for U+1CE9..U+1CF1.
 		if U == 0x1CED: UISC = Tone_Mark
 
-		# TODO: https://github.com/behdad/harfbuzz/issues/525
+		# TODO: https://github.com/harfbuzz/harfbuzz/issues/525
 		if U == 0x1A7F: UISC = Consonant_Final; UIPC = Bottom
 
+		# TODO: https://github.com/harfbuzz/harfbuzz/pull/609
+		if U == 0x20F0: UISC = Cantillation_Mark; UIPC = Top
+
+		# TODO: https://github.com/harfbuzz/harfbuzz/pull/626
+		if U == 0xA8B4: UISC = Consonant_Medial
+
 		values = [k for k,v in items if v(U,UISC,UGC)]
 		assert len(values) == 1, "%s %s %s %s" % (hex(U), UISC, UGC, values)
 		USE = values[0]
diff -Nru harfbuzz-1.7.1/src/hb-buffer.cc harfbuzz-1.7.2/src/hb-buffer.cc
--- harfbuzz-1.7.1/src/hb-buffer.cc	2017-11-01 18:28:58.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-buffer.cc	2017-11-16 00:11:43.000000000 +0000
@@ -722,6 +722,7 @@
     return hb_buffer_get_empty ();
 
   buffer->max_len = HB_BUFFER_MAX_LEN_DEFAULT;
+  buffer->max_ops = HB_BUFFER_MAX_OPS_DEFAULT;
 
   buffer->reset ();
 
@@ -749,6 +750,7 @@
     HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT,
     HB_BUFFER_SCRATCH_FLAG_DEFAULT,
     HB_BUFFER_MAX_LEN_DEFAULT,
+    HB_BUFFER_MAX_OPS_DEFAULT,
 
     HB_BUFFER_CONTENT_TYPE_INVALID,
     HB_SEGMENT_PROPERTIES_DEFAULT,
diff -Nru harfbuzz-1.7.1/src/hb-buffer-private.hh harfbuzz-1.7.2/src/hb-buffer-private.hh
--- harfbuzz-1.7.1/src/hb-buffer-private.hh	2017-11-14 04:20:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-buffer-private.hh	2017-11-16 00:11:43.000000000 +0000
@@ -35,8 +35,8 @@
 #include "hb-unicode-private.hh"
 
 
-#ifndef HB_BUFFER_MAX_EXPANSION_FACTOR
-#define HB_BUFFER_MAX_EXPANSION_FACTOR 32
+#ifndef HB_BUFFER_MAX_LEN_FACTOR
+#define HB_BUFFER_MAX_LEN_FACTOR 32
 #endif
 #ifndef HB_BUFFER_MAX_LEN_MIN
 #define HB_BUFFER_MAX_LEN_MIN 8192
@@ -45,6 +45,16 @@
 #define HB_BUFFER_MAX_LEN_DEFAULT 0x3FFFFFFF /* Shaping more than a billion chars? Let us know! */
 #endif
 
+#ifndef HB_BUFFER_MAX_OPS_FACTOR
+#define HB_BUFFER_MAX_OPS_FACTOR 64
+#endif
+#ifndef HB_BUFFER_MAX_OPS_MIN
+#define HB_BUFFER_MAX_OPS_MIN 1024
+#endif
+#ifndef HB_BUFFER_MAX_OPS_DEFAULT
+#define HB_BUFFER_MAX_OPS_DEFAULT 0x1FFFFFFF /* Shaping more than a billion operations? Let us know! */
+#endif
+
 static_assert ((sizeof (hb_glyph_info_t) == 20), "");
 static_assert ((sizeof (hb_glyph_info_t) == sizeof (hb_glyph_position_t)), "");
 
@@ -84,6 +94,7 @@
   hb_codepoint_t replacement; /* U+FFFD or something else. */
   hb_buffer_scratch_flags_t scratch_flags; /* Have space-flallback, etc. */
   unsigned int max_len; /* Maximum allowed len. */
+  int max_ops; /* Maximum allowed operations. */
 
   /* Buffer contents */
   hb_buffer_content_type_t content_type;
@@ -102,17 +113,6 @@
   hb_glyph_info_t     *out_info;
   hb_glyph_position_t *pos;
 
-  inline hb_glyph_info_t &cur (unsigned int i = 0) { return info[idx + i]; }
-  inline hb_glyph_info_t cur (unsigned int i = 0) const { return info[idx + i]; }
-
-  inline hb_glyph_position_t &cur_pos (unsigned int i = 0) { return pos[idx + i]; }
-  inline hb_glyph_position_t cur_pos (unsigned int i = 0) const { return pos[idx + i]; }
-
-  inline hb_glyph_info_t &prev (void) { return out_info[out_len ? out_len - 1 : 0]; }
-  inline hb_glyph_info_t prev (void) const { return out_info[out_len ? out_len - 1 : 0]; }
-
-  inline bool has_separate_output (void) const { return info != out_info; }
-
   unsigned int serial;
 
   /* Text before / after the main buffer contents.
@@ -132,6 +132,10 @@
 #ifndef HB_NDEBUG
   uint8_t allocated_var_bits;
 #endif
+
+
+  /* Methods */
+
   inline void allocate_var (unsigned int start, unsigned int count)
   {
 #ifndef HB_NDEBUG
@@ -168,8 +172,17 @@
 #endif
   }
 
+  inline hb_glyph_info_t &cur (unsigned int i = 0) { return info[idx + i]; }
+  inline hb_glyph_info_t cur (unsigned int i = 0) const { return info[idx + i]; }
+
+  inline hb_glyph_position_t &cur_pos (unsigned int i = 0) { return pos[idx + i]; }
+  inline hb_glyph_position_t cur_pos (unsigned int i = 0) const { return pos[idx + i]; }
+
+  inline hb_glyph_info_t &prev (void) { return out_info[out_len ? out_len - 1 : 0]; }
+  inline hb_glyph_info_t prev (void) const { return out_info[out_len ? out_len - 1 : 0]; }
+
+  inline bool has_separate_output (void) const { return info != out_info; }
 
-  /* Methods */
 
   HB_INTERNAL void reset (void);
   HB_INTERNAL void clear (void);
diff -Nru harfbuzz-1.7.1/src/hb-coretext.cc harfbuzz-1.7.2/src/hb-coretext.cc
--- harfbuzz-1.7.1/src/hb-coretext.cc	2017-11-14 04:20:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-coretext.cc	2017-12-02 23:04:00.000000000 +0000
@@ -81,21 +81,12 @@
   CGFontRelease ((CGFontRef) data);
 }
 
-hb_face_t *
-hb_coretext_face_create (CGFontRef cg_font)
-{
-  return hb_face_create_for_tables (reference_table, CGFontRetain (cg_font), _hb_cg_font_release);
-}
 
 HB_SHAPER_DATA_ENSURE_DEFINE(coretext, face)
 HB_SHAPER_DATA_ENSURE_DEFINE_WITH_CONDITION(coretext, font,
 	fabs (CTFontGetSize((CTFontRef) data) - coretext_font_size (font->ptem)) <= .5
 )
 
-/*
- * shaper face data
- */
-
 static CTFontDescriptorRef
 get_last_resort_font_desc (void)
 {
@@ -267,6 +258,12 @@
   CFRelease ((CGFontRef) data);
 }
 
+hb_face_t *
+hb_coretext_face_create (CGFontRef cg_font)
+{
+  return hb_face_create_for_tables (reference_table, CGFontRetain (cg_font), _hb_cg_font_release);
+}
+
 /*
  * Since: 0.9.10
  */
@@ -278,10 +275,6 @@
 }
 
 
-/*
- * shaper font data
- */
-
 hb_coretext_shaper_font_data_t *
 _hb_coretext_shaper_font_data_create (hb_font_t *font)
 {
@@ -306,6 +299,35 @@
   CFRelease ((CTFontRef) data);
 }
 
+/*
+ * Since: 1.7.2
+ */
+hb_font_t *
+hb_coretext_font_create (CTFontRef ct_font)
+{
+  CGFontRef cg_font = CTFontCopyGraphicsFont (ct_font, 0);
+  hb_face_t *face = hb_coretext_face_create (cg_font);
+  CFRelease (cg_font);
+  hb_font_t *font = hb_font_create (face);
+  hb_face_destroy (face);
+
+  if (unlikely (hb_object_is_inert (font)))
+    return font;
+
+  /* Let there be dragons here... */
+  HB_SHAPER_DATA_GET (font) = (hb_coretext_shaper_font_data_t *) CFRetain (ct_font);
+
+  return font;
+}
+
+CTFontRef
+hb_coretext_font_get_ct_font (hb_font_t *font)
+{
+  if (unlikely (!hb_coretext_shaper_font_data_ensure (font))) return nullptr;
+  return (CTFontRef) HB_SHAPER_DATA_GET (font);
+}
+
+
 
 /*
  * shaper shape_plan data
@@ -328,13 +350,6 @@
 {
 }
 
-CTFontRef
-hb_coretext_font_get_ct_font (hb_font_t *font)
-{
-  if (unlikely (!hb_coretext_shaper_font_data_ensure (font))) return nullptr;
-  return (CTFontRef)HB_SHAPER_DATA_GET (font);
-}
-
 
 /*
  * shaper
@@ -1000,7 +1015,7 @@
 	 * However, even that wouldn't work if we were passed in the CGFont to
 	 * construct a hb_face to begin with.
 	 *
-	 * See: http://github.com/behdad/harfbuzz/pull/36
+	 * See: http://github.com/harfbuzz/harfbuzz/pull/36
 	 *
 	 * Also see: https://bugs.chromium.org/p/chromium/issues/detail?id=597098
 	 */
diff -Nru harfbuzz-1.7.1/src/hb-coretext.h harfbuzz-1.7.2/src/hb-coretext.h
--- harfbuzz-1.7.1/src/hb-coretext.h	2017-10-15 09:26:12.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-coretext.h	2017-12-02 23:04:00.000000000 +0000
@@ -48,6 +48,9 @@
 HB_EXTERN hb_face_t *
 hb_coretext_face_create (CGFontRef cg_font);
 
+HB_EXTERN hb_font_t *
+hb_coretext_font_create (CTFontRef ct_font);
+
 
 HB_EXTERN CGFontRef
 hb_coretext_face_get_cg_font (hb_face_t *face);
diff -Nru harfbuzz-1.7.1/src/hb-debug.hh harfbuzz-1.7.2/src/hb-debug.hh
--- harfbuzz-1.7.1/src/hb-debug.hh	2017-11-03 21:18:17.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-debug.hh	2017-11-20 21:10:35.000000000 +0000
@@ -221,12 +221,14 @@
 
 template 
 struct hb_auto_trace_t {
+
   explicit inline hb_auto_trace_t (unsigned int *plevel_,
 				   const char *what_,
 				   const void *obj_,
 				   const char *func,
 				   const char *message,
-				   ...) : plevel (plevel_), what (what_), obj (obj_), returned (false)
+				   ...) HB_PRINTF_FUNC(6, 7)
+				   : plevel (plevel_), what (what_), obj (obj_), returned (false)
   {
     if (plevel) ++*plevel;
 
@@ -270,7 +272,7 @@
 struct hb_auto_trace_t<0, ret_t>;
 
 /* For disabled tracing; optimize out everything.
- * https://github.com/behdad/harfbuzz/pull/605 */
+ * https://github.com/harfbuzz/harfbuzz/pull/605 */
 template 
 struct hb_no_trace_t {
   inline ret_t ret (ret_t v, unsigned int line HB_UNUSED = 0) { return v; }
@@ -343,7 +345,7 @@
 #define TRACE_CLOSURE(this) \
 	hb_auto_trace_t trace \
 	(&c->debug_depth, c->get_name (), this, HB_FUNC, \
-	 "")
+	 " ")
 #else
 #define TRACE_CLOSURE(this) hb_no_trace_t trace HB_UNUSED
 #endif
@@ -355,7 +357,7 @@
 #define TRACE_COLLECT_GLYPHS(this) \
 	hb_auto_trace_t trace \
 	(&c->debug_depth, c->get_name (), this, HB_FUNC, \
-	 "")
+	 " ")
 #else
 #define TRACE_COLLECT_GLYPHS(this) hb_no_trace_t trace HB_UNUSED
 #endif
@@ -367,7 +369,7 @@
 #define TRACE_SANITIZE(this) \
 	hb_auto_trace_t trace \
 	(&c->debug_depth, c->get_name (), this, HB_FUNC, \
-	 "");
+	 " ");
 #else
 #define TRACE_SANITIZE(this) hb_no_trace_t trace
 #endif
@@ -379,7 +381,7 @@
 #define TRACE_SERIALIZE(this) \
 	hb_auto_trace_t trace \
 	(&c->debug_depth, "SERIALIZE", c, HB_FUNC, \
-	 "");
+	 " ");
 #else
 #define TRACE_SERIALIZE(this) hb_no_trace_t trace
 #endif
diff -Nru harfbuzz-1.7.1/src/hb-open-file-private.hh harfbuzz-1.7.2/src/hb-open-file-private.hh
--- harfbuzz-1.7.1/src/hb-open-file-private.hh	2017-11-01 18:28:58.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-open-file-private.hh	2017-11-16 00:11:43.000000000 +0000
@@ -64,9 +64,9 @@
 
   Tag		tag;		/* 4-byte identifier. */
   CheckSum	checkSum;	/* CheckSum for this table. */
-  ULONG		offset;		/* Offset from beginning of TrueType font
+  UINT32		offset;		/* Offset from beginning of TrueType font
 				 * file. */
-  ULONG		length;		/* Length of this table. */
+  UINT32		length;		/* Length of this table. */
   public:
   DEFINE_SIZE_STATIC (16);
 } OpenTypeTable;
@@ -154,7 +154,7 @@
   Tag		ttcTag;		/* TrueType Collection ID string: 'ttcf' */
   FixedVersion<>version;	/* Version of the TTC Header (1.0),
 				 * 0x00010000u */
-  ArrayOf, ULONG>
+  ArrayOf, UINT32>
 		table;		/* Array of offsets to the OffsetTable for each font
 				 * from the beginning of the file */
   public:
diff -Nru harfbuzz-1.7.1/src/hb-open-type-private.hh harfbuzz-1.7.2/src/hb-open-type-private.hh
--- harfbuzz-1.7.1/src/hb-open-type-private.hh	2017-11-14 04:26:25.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-open-type-private.hh	2017-11-16 00:11:43.000000000 +0000
@@ -635,23 +635,22 @@
   DEFINE_SIZE_STATIC (Size);
 };
 
-typedef IntType CHAR;	/* 8-bit signed integer. */
-typedef IntType BYTE;	/* 8-bit unsigned integer. */
+typedef IntType UINT8;	/* 8-bit unsigned integer. */
 typedef IntType INT8;	/* 8-bit signed integer. */
-typedef IntType USHORT;	/* 16-bit unsigned integer. */
-typedef IntType SHORT;	/* 16-bit signed integer. */
-typedef IntType ULONG;	/* 32-bit unsigned integer. */
-typedef IntType LONG;	/* 32-bit signed integer. */
+typedef IntType UINT16;	/* 16-bit unsigned integer. */
+typedef IntType INT16;	/* 16-bit signed integer. */
+typedef IntType UINT32;	/* 32-bit unsigned integer. */
+typedef IntType INT32;	/* 32-bit signed integer. */
 typedef IntType UINT24;	/* 24-bit unsigned integer. */
 
-/* 16-bit signed integer (SHORT) that describes a quantity in FUnits. */
-typedef SHORT FWORD;
+/* 16-bit signed integer (INT16) that describes a quantity in FUnits. */
+typedef INT16 FWORD;
 
-/* 16-bit unsigned integer (USHORT) that describes a quantity in FUnits. */
-typedef USHORT UFWORD;
+/* 16-bit unsigned integer (UINT16) that describes a quantity in FUnits. */
+typedef UINT16 UFWORD;
 
 /* 16-bit signed fixed number with the low 14 bits of fraction (2.14). */
-struct F2DOT14 : SHORT
+struct F2DOT14 : INT16
 {
   //inline float to_float (void) const { return ???; }
   //inline void set_float (float f) { v.set (f * ???); }
@@ -660,7 +659,7 @@
 };
 
 /* 32-bit signed fixed-point number (16.16). */
-struct Fixed: LONG
+struct Fixed: INT32
 {
   //inline float to_float (void) const { return ???; }
   //inline void set_float (float f) { v.set (f * ???); }
@@ -678,15 +677,15 @@
     return_trace (likely (c->check_struct (this)));
   }
   protected:
-  LONG major;
-  ULONG minor;
+  INT32 major;
+  UINT32 minor;
   public:
   DEFINE_SIZE_STATIC (8);
 };
 
 /* Array of four uint8s (length = 32 bits) used to identify a script, language
  * system, feature, or baseline */
-struct Tag : ULONG
+struct Tag : UINT32
 {
   /* What the char* converters return is NOT nul-terminated.  Print using "%.4s" */
   inline operator const char* (void) const { return reinterpret_cast (&this->v); }
@@ -697,16 +696,16 @@
 DEFINE_NULL_DATA (Tag, "    ");
 
 /* Glyph index number, same as uint16 (length = 16 bits) */
-typedef USHORT GlyphID;
+typedef UINT16 GlyphID;
 
 /* Script/language-system/feature index */
-struct Index : USHORT {
+struct Index : UINT16 {
   static const unsigned int NOT_FOUND_INDEX = 0xFFFFu;
 };
 DEFINE_NULL_DATA (Index, "\xff\xff");
 
 /* Offset, Null offset = 0 */
-template 
+template 
 struct Offset : Type
 {
   inline bool is_null (void) const { return 0 == *this; }
@@ -714,15 +713,18 @@
   DEFINE_SIZE_STATIC (sizeof(Type));
 };
 
+typedef Offset Offset16;
+typedef Offset Offset32;
+
 
 /* CheckSum */
-struct CheckSum : ULONG
+struct CheckSum : UINT32
 {
   /* This is reference implementation from the spec. */
-  static inline uint32_t CalcTableChecksum (const ULONG *Table, uint32_t Length)
+  static inline uint32_t CalcTableChecksum (const UINT32 *Table, uint32_t Length)
   {
     uint32_t Sum = 0L;
-    const ULONG *EndPtr = Table+((Length+3) & ~3) / ULONG::static_size;
+    const UINT32 *EndPtr = Table+((Length+3) & ~3) / UINT32::static_size;
 
     while (Table < EndPtr)
       Sum += *Table++;
@@ -731,7 +733,7 @@
 
   /* Note: data should be 4byte aligned and have 4byte padding at the end. */
   inline void set_for_data (const void *data, unsigned int length)
-  { set (CalcTableChecksum ((const ULONG *) data, length)); }
+  { set (CalcTableChecksum ((const UINT32 *) data, length)); }
 
   public:
   DEFINE_SIZE_STATIC (4);
@@ -742,7 +744,7 @@
  * Version Numbers
  */
 
-template 
+template 
 struct FixedVersion
 {
   inline uint32_t to_int (void) const { return (major << (sizeof(FixedType) * 8)) + minor; }
@@ -766,7 +768,7 @@
  * Use: (base+offset)
  */
 
-template 
+template 
 struct OffsetTo : Offset
 {
   inline const Type& operator () (const void *base) const
@@ -811,7 +813,7 @@
   }
   DEFINE_SIZE_STATIC (sizeof(OffsetType));
 };
-template  struct LOffsetTo : OffsetTo {};
+template  struct LOffsetTo : OffsetTo {};
 template 
 static inline const Type& operator + (const Base &base, const OffsetTo &offset) { return offset (base); }
 template 
@@ -823,7 +825,7 @@
  */
 
 /* An array with a number of elements. */
-template 
+template 
 struct ArrayOf
 {
   const Type *sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const
@@ -933,10 +935,10 @@
   public:
   DEFINE_SIZE_ARRAY (sizeof (LenType), array);
 };
-template  struct LArrayOf : ArrayOf {};
+template  struct LArrayOf : ArrayOf {};
 
 /* Array of Offset's */
-template 
+template 
 struct OffsetArrayOf : ArrayOf > {};
 
 /* Array of offsets relative to the beginning of the array itself. */
@@ -964,7 +966,7 @@
 
 
 /* An array starting at second element. */
-template 
+template 
 struct HeadlessArrayOf
 {
   inline const Type& operator [] (unsigned int i) const
@@ -1026,7 +1028,7 @@
 /*
  * An array with sorted elements.  Supports binary searching.
  */
-template 
+template 
 struct SortedArrayOf : ArrayOf
 {
   template 
@@ -1065,10 +1067,10 @@
   }
 
   protected:
-  USHORT	len;
-  USHORT	searchRangeZ;
-  USHORT	entrySelectorZ;
-  USHORT	rangeShiftZ;
+  UINT16	len;
+  UINT16	searchRangeZ;
+  UINT16	entrySelectorZ;
+  UINT16	rangeShiftZ;
 
   public:
   DEFINE_SIZE_STATIC (8);
diff -Nru harfbuzz-1.7.1/src/hb-ot-cbdt-table.hh harfbuzz-1.7.2/src/hb-ot-cbdt-table.hh
--- harfbuzz-1.7.1/src/hb-ot-cbdt-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-cbdt-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -47,20 +47,20 @@
     extents->height = -height;
   }
 
-  BYTE height;
-  BYTE width;
-  CHAR bearingX;
-  CHAR bearingY;
-  BYTE advance;
+  UINT8 height;
+  UINT8 width;
+  INT8 bearingX;
+  INT8 bearingY;
+  UINT8 advance;
 
   DEFINE_SIZE_STATIC(5);
 };
 
 struct BigGlyphMetrics : SmallGlyphMetrics
 {
-  CHAR vertBearingX;
-  CHAR vertBearingY;
-  BYTE vertAdvance;
+  INT8 vertBearingX;
+  INT8 vertBearingY;
+  UINT8 vertAdvance;
 
   DEFINE_SIZE_STATIC(8);
 };
@@ -73,18 +73,18 @@
     return_trace (c->check_struct (this));
   }
 
-  CHAR ascender;
-  CHAR decender;
-  BYTE widthMax;
-  CHAR caretSlopeNumerator;
-  CHAR caretSlopeDenominator;
-  CHAR caretOffset;
-  CHAR minOriginSB;
-  CHAR minAdvanceSB;
-  CHAR maxBeforeBL;
-  CHAR minAfterBL;
-  CHAR padding1;
-  CHAR padding2;
+  INT8 ascender;
+  INT8 decender;
+  UINT8 widthMax;
+  INT8 caretSlopeNumerator;
+  INT8 caretSlopeDenominator;
+  INT8 caretOffset;
+  INT8 minOriginSB;
+  INT8 minAdvanceSB;
+  INT8 maxBeforeBL;
+  INT8 minAfterBL;
+  INT8 padding1;
+  INT8 padding2;
 
   DEFINE_SIZE_STATIC(12);
 };
@@ -102,9 +102,9 @@
     return_trace (c->check_struct (this));
   }
 
-  USHORT indexFormat;
-  USHORT imageFormat;
-  ULONG imageDataOffset;
+  UINT16 indexFormat;
+  UINT16 imageFormat;
+  UINT32 imageDataOffset;
 
   DEFINE_SIZE_STATIC(8);
 };
@@ -137,8 +137,8 @@
   DEFINE_SIZE_ARRAY(8, offsetArrayZ);
 };
 
-struct IndexSubtableFormat1 : IndexSubtableFormat1Or3 {};
-struct IndexSubtableFormat3 : IndexSubtableFormat1Or3 {};
+struct IndexSubtableFormat1 : IndexSubtableFormat1Or3 {};
+struct IndexSubtableFormat3 : IndexSubtableFormat1Or3 {};
 
 struct IndexSubtable
 {
@@ -214,8 +214,8 @@
 						   offset, length, format);
   }
 
-  USHORT firstGlyphIndex;
-  USHORT lastGlyphIndex;
+  UINT16 firstGlyphIndex;
+  UINT16 lastGlyphIndex;
   LOffsetTo offsetToSubtable;
 
   DEFINE_SIZE_STATIC(8);
@@ -276,19 +276,19 @@
 
   protected:
   LOffsetTo indexSubtableArrayOffset;
-  ULONG indexTablesSize;
-  ULONG numberOfIndexSubtables;
-  ULONG colorRef;
+  UINT32 indexTablesSize;
+  UINT32 numberOfIndexSubtables;
+  UINT32 colorRef;
   SBitLineMetrics horizontal;
   SBitLineMetrics vertical;
-  USHORT startGlyphIndex;
-  USHORT endGlyphIndex;
-  BYTE ppemX;
-  BYTE ppemY;
-  BYTE bitDepth;
-  CHAR flags;
+  UINT16 startGlyphIndex;
+  UINT16 endGlyphIndex;
+  UINT8 ppemX;
+  UINT8 ppemY;
+  UINT8 bitDepth;
+  INT8 flags;
 
-public:
+  public:
   DEFINE_SIZE_STATIC(48);
 };
 
@@ -300,8 +300,8 @@
 struct GlyphBitmapDataFormat17
 {
   SmallGlyphMetrics glyphMetrics;
-  ULONG dataLen;
-  BYTE dataZ[VAR];
+  UINT32 dataLen;
+  UINT8 dataZ[VAR];
 
   DEFINE_SIZE_ARRAY(9, dataZ);
 };
@@ -315,6 +315,8 @@
 
 struct CBLC
 {
+  friend struct CBDT;
+
   static const hb_tag_t tableTag = HB_OT_TAG_CBLC;
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -325,7 +327,7 @@
 		  sizeTables.sanitize (c, this));
   }
 
-  public:
+  protected:
   const IndexSubtableRecord *find_table (hb_codepoint_t glyph,
 					 unsigned int *x_ppem, unsigned int *y_ppem) const
   {
@@ -371,9 +373,94 @@
 		  likely (version.major == 2 || version.major == 3));
   }
 
+  struct accelerator_t
+  {
+    inline void init (hb_face_t *face)
+    {
+      upem = face->get_upem();
+
+      cblc_blob = Sanitizer::sanitize (face->reference_table (HB_OT_TAG_CBLC));
+      cbdt_blob = Sanitizer::sanitize (face->reference_table (HB_OT_TAG_CBDT));
+      cbdt_len = hb_blob_get_length (cbdt_blob);
+
+      if (hb_blob_get_length (cblc_blob) == 0) {
+	cblc = nullptr;
+	cbdt = nullptr;
+	return;  /* Not a bitmap font. */
+      }
+      cblc = Sanitizer::lock_instance (cblc_blob);
+      cbdt = Sanitizer::lock_instance (cbdt_blob);
+
+    }
+
+    inline void fini (void)
+    {
+      hb_blob_destroy (this->cblc_blob);
+      hb_blob_destroy (this->cbdt_blob);
+    }
+
+    inline bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
+    {
+      unsigned int x_ppem = upem, y_ppem = upem; /* TODO Use font ppem if available. */
+
+      if (!cblc)
+	return false;  // Not a color bitmap font.
+
+      const IndexSubtableRecord *subtable_record = this->cblc->find_table(glyph, &x_ppem, &y_ppem);
+      if (!subtable_record || !x_ppem || !y_ppem)
+	return false;
+
+      if (subtable_record->get_extents (extents))
+	return true;
+
+      unsigned int image_offset = 0, image_length = 0, image_format = 0;
+      if (!subtable_record->get_image_data (glyph, &image_offset, &image_length, &image_format))
+	return false;
+
+      {
+	if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length))
+	  return false;
+
+	switch (image_format)
+	{
+	  case 17: {
+	    if (unlikely (image_length < GlyphBitmapDataFormat17::min_size))
+	      return false;
+
+	    const GlyphBitmapDataFormat17& glyphFormat17 =
+		StructAtOffset (this->cbdt, image_offset);
+	    glyphFormat17.glyphMetrics.get_extents (extents);
+	  }
+	  break;
+	  default:
+	    // TODO: Support other image formats.
+	    return false;
+	}
+      }
+
+      /* Convert to the font units. */
+      extents->x_bearing *= upem / (float) x_ppem;
+      extents->y_bearing *= upem / (float) y_ppem;
+      extents->width *= upem / (float) x_ppem;
+      extents->height *= upem / (float) y_ppem;
+
+      return true;
+    }
+
+    private:
+    hb_blob_t *cblc_blob;
+    hb_blob_t *cbdt_blob;
+    const CBLC *cblc;
+    const CBDT *cbdt;
+
+    unsigned int cbdt_len;
+    unsigned int upem;
+  };
+
+
   protected:
   FixedVersion<>version;
-  BYTE dataZ[VAR];
+  UINT8 dataZ[VAR];
 
   public:
   DEFINE_SIZE_ARRAY(4, dataZ);
diff -Nru harfbuzz-1.7.1/src/hb-ot-cmap-table.hh harfbuzz-1.7.2/src/hb-ot-cmap-table.hh
--- harfbuzz-1.7.1/src/hb-ot-cmap-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-cmap-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -58,10 +58,10 @@
   }
 
   protected:
-  USHORT	format;		/* Format number is set to 0. */
-  USHORT	lengthZ;	/* Byte length of this subtable. */
-  USHORT	languageZ;	/* Ignore. */
-  BYTE		glyphIdArray[256];/* An array that maps character
+  UINT16	format;		/* Format number is set to 0. */
+  UINT16	lengthZ;	/* Byte length of this subtable. */
+  UINT16	languageZ;	/* Ignore. */
+  UINT8		glyphIdArray[256];/* An array that maps character
 				 * code to glyph index values. */
   public:
   DEFINE_SIZE_STATIC (6 + 256);
@@ -88,8 +88,8 @@
 
       /* Custom two-array bsearch. */
       int min = 0, max = (int) thiz->segCount - 1;
-      const USHORT *startCount = thiz->startCount;
-      const USHORT *endCount = thiz->endCount;
+      const UINT16 *startCount = thiz->startCount;
+      const UINT16 *endCount = thiz->endCount;
       unsigned int i;
       while (min <= max)
       {
@@ -127,11 +127,11 @@
       return true;
     }
 
-    const USHORT *endCount;
-    const USHORT *startCount;
-    const USHORT *idDelta;
-    const USHORT *idRangeOffset;
-    const USHORT *glyphIdArray;
+    const UINT16 *endCount;
+    const UINT16 *startCount;
+    const UINT16 *idDelta;
+    const UINT16 *idRangeOffset;
+    const UINT16 *glyphIdArray;
     unsigned int segCount;
     unsigned int glyphIdArrayLength;
   };
@@ -165,24 +165,24 @@
   }
 
   protected:
-  USHORT	format;		/* Format number is set to 4. */
-  USHORT	length;		/* This is the length in bytes of the
+  UINT16	format;		/* Format number is set to 4. */
+  UINT16	length;		/* This is the length in bytes of the
 				 * subtable. */
-  USHORT	languageZ;	/* Ignore. */
-  USHORT	segCountX2;	/* 2 x segCount. */
-  USHORT	searchRangeZ;	/* 2 * (2**floor(log2(segCount))) */
-  USHORT	entrySelectorZ;	/* log2(searchRange/2) */
-  USHORT	rangeShiftZ;	/* 2 x segCount - searchRange */
+  UINT16	languageZ;	/* Ignore. */
+  UINT16	segCountX2;	/* 2 x segCount. */
+  UINT16	searchRangeZ;	/* 2 * (2**floor(log2(segCount))) */
+  UINT16	entrySelectorZ;	/* log2(searchRange/2) */
+  UINT16	rangeShiftZ;	/* 2 x segCount - searchRange */
 
-  USHORT	values[VAR];
+  UINT16	values[VAR];
 #if 0
-  USHORT	endCount[segCount];	/* End characterCode for each segment,
+  UINT16	endCount[segCount];	/* End characterCode for each segment,
 					 * last=0xFFFFu. */
-  USHORT	reservedPad;		/* Set to 0. */
-  USHORT	startCount[segCount];	/* Start character code for each segment. */
-  SHORT		idDelta[segCount];	/* Delta for all character codes in segment. */
-  USHORT	idRangeOffset[segCount];/* Offsets into glyphIdArray or 0 */
-  USHORT	glyphIdArray[VAR];	/* Glyph index array (arbitrary length) */
+  UINT16	reservedPad;		/* Set to 0. */
+  UINT16	startCount[segCount];	/* Start character code for each segment. */
+  INT16		idDelta[segCount];	/* Delta for all character codes in segment. */
+  UINT16	idRangeOffset[segCount];/* Offsets into glyphIdArray or 0 */
+  UINT16	glyphIdArray[VAR];	/* Glyph index array (arbitrary length) */
 #endif
 
   public:
@@ -208,9 +208,9 @@
   }
 
   private:
-  ULONG		startCharCode;	/* First character code in this group. */
-  ULONG		endCharCode;	/* Last character code in this group. */
-  ULONG		glyphID;	/* Glyph index; interpretation depends on
+  UINT32		startCharCode;	/* First character code in this group. */
+  UINT32		endCharCode;	/* Last character code in this group. */
+  UINT32		glyphID;	/* Glyph index; interpretation depends on
 				 * subtable format. */
   public:
   DEFINE_SIZE_STATIC (12);
@@ -247,8 +247,8 @@
   DEFINE_SIZE_ARRAY (5 * sizeof (UINT), glyphIdArray);
 };
 
-struct CmapSubtableFormat6  : CmapSubtableTrimmed {};
-struct CmapSubtableFormat10 : CmapSubtableTrimmed {};
+struct CmapSubtableFormat6  : CmapSubtableTrimmed {};
+struct CmapSubtableFormat10 : CmapSubtableTrimmed {};
 
 template 
 struct CmapSubtableLongSegmented
@@ -269,11 +269,11 @@
   }
 
   protected:
-  USHORT	format;		/* Subtable format; set to 12. */
-  USHORT	reservedZ;	/* Reserved; set to 0. */
-  ULONG		lengthZ;	/* Byte length of this subtable. */
-  ULONG		languageZ;	/* Ignore. */
-  SortedArrayOf
+  UINT16	format;		/* Subtable format; set to 12. */
+  UINT16	reservedZ;	/* Reserved; set to 0. */
+  UINT32		lengthZ;	/* Byte length of this subtable. */
+  UINT32		languageZ;	/* Ignore. */
+  SortedArrayOf
 		groups;		/* Groupings. */
   public:
   DEFINE_SIZE_ARRAY (16, groups);
@@ -316,13 +316,13 @@
   }
 
   UINT24	startUnicodeValue;	/* First value in this range. */
-  BYTE		additionalCount;	/* Number of additional values in this
+  UINT8		additionalCount;	/* Number of additional values in this
 					 * range. */
   public:
   DEFINE_SIZE_STATIC (4);
 };
 
-typedef SortedArrayOf DefaultUVS;
+typedef SortedArrayOf DefaultUVS;
 
 struct UVSMapping
 {
@@ -343,7 +343,7 @@
   DEFINE_SIZE_STATIC (5);
 };
 
-typedef SortedArrayOf NonDefaultUVS;
+typedef SortedArrayOf NonDefaultUVS;
 
 struct VariationSelectorRecord
 {
@@ -405,9 +405,9 @@
   }
 
   protected:
-  USHORT	format;		/* Format number is set to 14. */
-  ULONG		lengthZ;	/* Byte length of this subtable. */
-  SortedArrayOf
+  UINT16	format;		/* Format number is set to 14. */
+  UINT32		lengthZ;	/* Byte length of this subtable. */
+  SortedArrayOf
 		record;		/* Variation selector records; sorted
 				 * in increasing order of `varSelector'. */
   public:
@@ -451,7 +451,7 @@
 
   public:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   CmapSubtableFormat0	format0;
   CmapSubtableFormat4	format4;
   CmapSubtableFormat6	format6;
@@ -484,8 +484,8 @@
 		  subtable.sanitize (c, base));
   }
 
-  USHORT	platformID;	/* Platform ID. */
-  USHORT	encodingID;	/* Platform-specific encoding ID. */
+  UINT16	platformID;	/* Platform ID. */
+  UINT16	encodingID;	/* Platform-specific encoding ID. */
   LOffsetTo
 		subtable;	/* Byte offset from beginning of table to the subtable for this encoding. */
   public:
@@ -496,6 +496,146 @@
 {
   static const hb_tag_t tableTag	= HB_OT_TAG_cmap;
 
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+		  likely (version == 0) &&
+		  encodingRecord.sanitize (c, this));
+  }
+
+  struct accelerator_t
+  {
+    inline void init (hb_face_t *face)
+    {
+      this->blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_cmap));
+      const OT::cmap *cmap = OT::Sanitizer::lock_instance (this->blob);
+      const OT::CmapSubtable *subtable = nullptr;
+      const OT::CmapSubtableFormat14 *subtable_uvs = nullptr;
+
+      bool symbol = false;
+      /* 32-bit subtables. */
+      if (!subtable) subtable = cmap->find_subtable (3, 10);
+      if (!subtable) subtable = cmap->find_subtable (0, 6);
+      if (!subtable) subtable = cmap->find_subtable (0, 4);
+      /* 16-bit subtables. */
+      if (!subtable) subtable = cmap->find_subtable (3, 1);
+      if (!subtable) subtable = cmap->find_subtable (0, 3);
+      if (!subtable) subtable = cmap->find_subtable (0, 2);
+      if (!subtable) subtable = cmap->find_subtable (0, 1);
+      if (!subtable) subtable = cmap->find_subtable (0, 0);
+      if (!subtable)
+      {
+	subtable = cmap->find_subtable (3, 0);
+	if (subtable) symbol = true;
+      }
+      /* Meh. */
+      if (!subtable) subtable = &OT::Null(OT::CmapSubtable);
+
+      /* UVS subtable. */
+      if (!subtable_uvs)
+      {
+	const OT::CmapSubtable *st = cmap->find_subtable (0, 5);
+	if (st && st->u.format == 14)
+	  subtable_uvs = &st->u.format14;
+      }
+      /* Meh. */
+      if (!subtable_uvs) subtable_uvs = &OT::Null(OT::CmapSubtableFormat14);
+
+      this->uvs_table = subtable_uvs;
+
+      this->get_glyph_data = subtable;
+      if (unlikely (symbol))
+	this->get_glyph_func = get_glyph_from_symbol;
+      else
+	switch (subtable->u.format) {
+	/* Accelerate format 4 and format 12. */
+	default: this->get_glyph_func = get_glyph_from;		break;
+	case 12: this->get_glyph_func = get_glyph_from;	break;
+	case  4:
+	  {
+	    this->format4_accel.init (&subtable->u.format4);
+	    this->get_glyph_data = &this->format4_accel;
+	    this->get_glyph_func = this->format4_accel.get_glyph_func;
+	  }
+	  break;
+	}
+    }
+
+    inline void fini (void)
+    {
+      hb_blob_destroy (this->blob);
+    }
+
+    inline bool get_nominal_glyph (hb_codepoint_t  unicode,
+				   hb_codepoint_t *glyph) const
+    {
+      return this->get_glyph_func (this->get_glyph_data, unicode, glyph);
+    }
+
+    inline bool get_variation_glyph (hb_codepoint_t  unicode,
+				     hb_codepoint_t  variation_selector,
+				     hb_codepoint_t *glyph) const
+    {
+      switch (this->uvs_table->get_glyph_variant (unicode,
+						  variation_selector,
+						  glyph))
+      {
+	case OT::GLYPH_VARIANT_NOT_FOUND:		return false;
+	case OT::GLYPH_VARIANT_FOUND:		return true;
+	case OT::GLYPH_VARIANT_USE_DEFAULT:	break;
+      }
+
+      return get_nominal_glyph (unicode, glyph);
+    }
+
+    protected:
+    typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj,
+					      hb_codepoint_t codepoint,
+					      hb_codepoint_t *glyph);
+
+    template 
+    static inline bool get_glyph_from (const void *obj,
+				       hb_codepoint_t codepoint,
+				       hb_codepoint_t *glyph)
+    {
+      const Type *typed_obj = (const Type *) obj;
+      return typed_obj->get_glyph (codepoint, glyph);
+    }
+
+    template 
+    static inline bool get_glyph_from_symbol (const void *obj,
+					      hb_codepoint_t codepoint,
+					      hb_codepoint_t *glyph)
+    {
+      const Type *typed_obj = (const Type *) obj;
+      if (likely (typed_obj->get_glyph (codepoint, glyph)))
+	return true;
+
+      if (codepoint <= 0x00FFu)
+      {
+	/* For symbol-encoded OpenType fonts, we duplicate the
+	 * U+F000..F0FF range at U+0000..U+00FF.  That's what
+	 * Windows seems to do, and that's hinted about at:
+	 * http://www.microsoft.com/typography/otspec/recom.htm
+	 * under "Non-Standard (Symbol) Fonts". */
+	return typed_obj->get_glyph (0xF000u + codepoint, glyph);
+      }
+
+      return false;
+    }
+
+    private:
+    hb_cmap_get_glyph_func_t get_glyph_func;
+    const void *get_glyph_data;
+    OT::CmapSubtableFormat4::accelerator_t format4_accel;
+
+    const OT::CmapSubtableFormat14 *uvs_table;
+    hb_blob_t *blob;
+  };
+
+  protected:
+
   inline const CmapSubtable *find_subtable (unsigned int platform_id,
 					    unsigned int encoding_id) const
   {
@@ -513,15 +653,8 @@
     return &(this+encodingRecord[result].subtable);
   }
 
-  inline bool sanitize (hb_sanitize_context_t *c) const
-  {
-    TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) &&
-		  likely (version == 0) &&
-		  encodingRecord.sanitize (c, this));
-  }
-
-  USHORT		version;	/* Table version number (0). */
+  protected:
+  UINT16		version;	/* Table version number (0). */
   SortedArrayOf
 			encodingRecord;	/* Encoding tables. */
   public:
diff -Nru harfbuzz-1.7.1/src/hb-ot-font.cc harfbuzz-1.7.2/src/hb-ot-font.cc
--- harfbuzz-1.7.1/src/hb-ot-font.cc	2017-11-14 18:59:54.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-font.cc	2017-11-16 00:11:43.000000000 +0000
@@ -33,466 +33,20 @@
 #include "hb-ot-cmap-table.hh"
 #include "hb-ot-cbdt-table.hh"
 #include "hb-ot-glyf-table.hh"
-#include "hb-ot-head-table.hh"
-#include "hb-ot-hhea-table.hh"
 #include "hb-ot-hmtx-table.hh"
 #include "hb-ot-kern-table.hh"
-#include "hb-ot-os2-table.hh"
 #include "hb-ot-post-table.hh"
-#include "hb-ot-var-hvar-table.hh"
 
 
-struct hb_ot_face_metrics_accelerator_t
-{
-  unsigned int num_metrics;
-  unsigned int num_advances;
-  unsigned int default_advance;
-  unsigned short ascender;
-  unsigned short descender;
-  unsigned short line_gap;
-  bool has_font_extents;
-
-  const OT::hmtxvmtx *table;
-  hb_blob_t *blob;
-
-  const OT::HVARVVAR *var;
-  hb_blob_t *var_blob;
-
-  inline void init (hb_face_t *face,
-		    hb_tag_t _hea_tag,
-		    hb_tag_t _mtx_tag,
-		    hb_tag_t _var_tag,
-		    hb_tag_t os2_tag,
-		    unsigned int default_advance = 0)
-  {
-    this->default_advance = default_advance ? default_advance : face->get_upem ();
-
-    bool got_font_extents = false;
-    if (os2_tag)
-    {
-      hb_blob_t *os2_blob = OT::Sanitizer::sanitize (face->reference_table (os2_tag));
-      const OT::os2 *os2 = OT::Sanitizer::lock_instance (os2_blob);
-#define USE_TYPO_METRICS (1u<<7)
-      if (0 != (os2->fsSelection & USE_TYPO_METRICS))
-      {
-	this->ascender = os2->sTypoAscender;
-	this->descender = os2->sTypoDescender;
-	this->line_gap = os2->sTypoLineGap;
-	got_font_extents = (this->ascender | this->descender) != 0;
-      }
-      hb_blob_destroy (os2_blob);
-    }
-
-    hb_blob_t *_hea_blob = OT::Sanitizer::sanitize (face->reference_table (_hea_tag));
-    const OT::_hea *_hea = OT::Sanitizer::lock_instance (_hea_blob);
-    this->num_advances = _hea->numberOfLongMetrics;
-    if (!got_font_extents)
-    {
-      this->ascender = _hea->ascender;
-      this->descender = _hea->descender;
-      this->line_gap = _hea->lineGap;
-      got_font_extents = (this->ascender | this->descender) != 0;
-    }
-    hb_blob_destroy (_hea_blob);
-
-    this->has_font_extents = got_font_extents;
-
-    this->blob = OT::Sanitizer::sanitize (face->reference_table (_mtx_tag));
-
-    /* Cap num_metrics() and num_advances() based on table length. */
-    unsigned int len = hb_blob_get_length (this->blob);
-    if (unlikely (this->num_advances * 4 > len))
-      this->num_advances = len / 4;
-    this->num_metrics = this->num_advances + (len - 4 * this->num_advances) / 2;
-
-    /* We MUST set num_metrics to zero if num_advances is zero.
-     * Our get_advance() depends on that. */
-    if (unlikely (!this->num_advances))
-    {
-      this->num_metrics = this->num_advances = 0;
-      hb_blob_destroy (this->blob);
-      this->blob = hb_blob_get_empty ();
-    }
-    this->table = OT::Sanitizer::lock_instance (this->blob);
-
-    this->var_blob = OT::Sanitizer::sanitize (face->reference_table (_var_tag));
-    this->var = OT::Sanitizer::lock_instance (this->var_blob);
-  }
-
-  inline void fini (void)
-  {
-    hb_blob_destroy (this->blob);
-    hb_blob_destroy (this->var_blob);
-  }
-
-  inline unsigned int get_advance (hb_codepoint_t  glyph,
-				   hb_font_t      *font) const
-  {
-    if (unlikely (glyph >= this->num_metrics))
-    {
-      /* If this->num_metrics is zero, it means we don't have the metrics table
-       * for this direction: return default advance.  Otherwise, it means that the
-       * glyph index is out of bound: return zero. */
-      if (this->num_metrics)
-	return 0;
-      else
-	return this->default_advance;
-    }
-
-    return this->table->longMetric[MIN (glyph, (uint32_t) this->num_advances - 1)].advance
-	 + this->var->get_advance_var (glyph, font->coords, font->num_coords); // TODO Optimize?!
-  }
-};
-
-struct hb_ot_face_glyf_accelerator_t
-{
-  bool short_offset;
-  unsigned int num_glyphs;
-  const OT::loca *loca;
-  const OT::glyf *glyf;
-  hb_blob_t *loca_blob;
-  hb_blob_t *glyf_blob;
-  unsigned int glyf_len;
-
-  inline void init (hb_face_t *face)
-  {
-    hb_blob_t *head_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_head));
-    const OT::head *head = OT::Sanitizer::lock_instance (head_blob);
-    if ((unsigned int) head->indexToLocFormat > 1 || head->glyphDataFormat != 0)
-    {
-      /* Unknown format.  Leave num_glyphs=0, that takes care of disabling us. */
-      hb_blob_destroy (head_blob);
-      return;
-    }
-    this->short_offset = 0 == head->indexToLocFormat;
-    hb_blob_destroy (head_blob);
-
-    this->loca_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_loca));
-    this->loca = OT::Sanitizer::lock_instance (this->loca_blob);
-    this->glyf_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_glyf));
-    this->glyf = OT::Sanitizer::lock_instance (this->glyf_blob);
-
-    this->num_glyphs = MAX (1u, hb_blob_get_length (this->loca_blob) / (this->short_offset ? 2 : 4)) - 1;
-    this->glyf_len = hb_blob_get_length (this->glyf_blob);
-  }
-
-  inline void fini (void)
-  {
-    hb_blob_destroy (this->loca_blob);
-    hb_blob_destroy (this->glyf_blob);
-  }
-
-  inline bool get_extents (hb_codepoint_t glyph,
-			   hb_glyph_extents_t *extents) const
-  {
-    if (unlikely (glyph >= this->num_glyphs))
-      return false;
-
-    unsigned int start_offset, end_offset;
-    if (this->short_offset)
-    {
-      start_offset = 2 * this->loca->u.shortsZ[glyph];
-      end_offset   = 2 * this->loca->u.shortsZ[glyph + 1];
-    }
-    else
-    {
-      start_offset = this->loca->u.longsZ[glyph];
-      end_offset   = this->loca->u.longsZ[glyph + 1];
-    }
-
-    if (start_offset > end_offset || end_offset > this->glyf_len)
-      return false;
-
-    if (end_offset - start_offset < OT::glyfGlyphHeader::static_size)
-      return true; /* Empty glyph; zero extents. */
-
-    const OT::glyfGlyphHeader &glyph_header = OT::StructAtOffset (this->glyf, start_offset);
-
-    extents->x_bearing = MIN (glyph_header.xMin, glyph_header.xMax);
-    extents->y_bearing = MAX (glyph_header.yMin, glyph_header.yMax);
-    extents->width     = MAX (glyph_header.xMin, glyph_header.xMax) - extents->x_bearing;
-    extents->height    = MIN (glyph_header.yMin, glyph_header.yMax) - extents->y_bearing;
-
-    return true;
-  }
-};
-
-struct hb_ot_face_cbdt_accelerator_t
-{
-  hb_blob_t *cblc_blob;
-  hb_blob_t *cbdt_blob;
-  const OT::CBLC *cblc;
-  const OT::CBDT *cbdt;
-
-  unsigned int cbdt_len;
-  unsigned int upem;
-
-  inline void init (hb_face_t *face)
-  {
-    upem = face->get_upem();
-
-    cblc_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_CBLC));
-    cbdt_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_CBDT));
-    cbdt_len = hb_blob_get_length (cbdt_blob);
-
-    if (hb_blob_get_length (cblc_blob) == 0) {
-      cblc = nullptr;
-      cbdt = nullptr;
-      return;  /* Not a bitmap font. */
-    }
-    cblc = OT::Sanitizer::lock_instance (cblc_blob);
-    cbdt = OT::Sanitizer::lock_instance (cbdt_blob);
-
-  }
-
-  inline void fini (void)
-  {
-    hb_blob_destroy (this->cblc_blob);
-    hb_blob_destroy (this->cbdt_blob);
-  }
-
-  inline bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
-  {
-    unsigned int x_ppem = upem, y_ppem = upem; /* TODO Use font ppem if available. */
-
-    if (!cblc)
-      return false;  // Not a color bitmap font.
-
-    const OT::IndexSubtableRecord *subtable_record = this->cblc->find_table(glyph, &x_ppem, &y_ppem);
-    if (!subtable_record || !x_ppem || !y_ppem)
-      return false;
-
-    if (subtable_record->get_extents (extents))
-      return true;
-
-    unsigned int image_offset = 0, image_length = 0, image_format = 0;
-    if (!subtable_record->get_image_data (glyph, &image_offset, &image_length, &image_format))
-      return false;
-
-    {
-      /* TODO Move the following into CBDT struct when adding more formats. */
-
-      if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length))
-	return false;
-
-      switch (image_format)
-      {
-	case 17: {
-	  if (unlikely (image_length < OT::GlyphBitmapDataFormat17::min_size))
-	    return false;
-
-	  const OT::GlyphBitmapDataFormat17& glyphFormat17 =
-	      OT::StructAtOffset (this->cbdt, image_offset);
-	  glyphFormat17.glyphMetrics.get_extents (extents);
-	}
-	break;
-	default:
-	  // TODO: Support other image formats.
-	  return false;
-      }
-    }
-
-    /* Convert to the font units. */
-    extents->x_bearing *= upem / (float) x_ppem;
-    extents->y_bearing *= upem / (float) y_ppem;
-    extents->width *= upem / (float) x_ppem;
-    extents->height *= upem / (float) y_ppem;
-
-    return true;
-  }
-};
-
-struct hb_ot_face_post_accelerator_t
-{
-  hb_blob_t *post_blob;
-  OT::post::accelerator_t accel;
-
-  inline void init (hb_face_t *face)
-  {
-    hb_blob_t *blob = this->post_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_post));
-    accel.init (OT::Sanitizer::lock_instance (blob), hb_blob_get_length (blob));
-  }
-
-  inline void fini (void)
-  {
-    accel.fini ();
-    hb_blob_destroy (this->post_blob);
-  }
-
-  inline bool get_glyph_name (hb_codepoint_t glyph,
-			      char *name, unsigned int size) const
-  {
-    return this->accel.get_glyph_name (glyph, name, size);
-  }
-
-  inline bool get_glyph_from_name (const char *name, int len,
-				   hb_codepoint_t *glyph) const
-  {
-    if (unlikely (!len))
-      return false;
-
-    return this->accel.get_glyph_from_name (name, len, glyph);
-  }
-};
-
-struct hb_ot_face_kern_accelerator_t
-{
-  hb_blob_t *kern_blob;
-  OT::kern::accelerator_t accel;
-
-  inline void init (hb_face_t *face)
-  {
-    hb_blob_t *blob = this->kern_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_kern));
-    accel.init (OT::Sanitizer::lock_instance (blob), hb_blob_get_length (blob));
-  }
-
-  inline void fini (void)
-  {
-    accel.fini ();
-    hb_blob_destroy (this->kern_blob);
-  }
-
-  inline int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const
-  { return accel.get_h_kerning (left, right); }
-};
-
-typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj,
-					  hb_codepoint_t codepoint,
-					  hb_codepoint_t *glyph);
-
-template 
-static inline bool get_glyph_from (const void *obj,
-				   hb_codepoint_t codepoint,
-				   hb_codepoint_t *glyph)
-{
-  const Type *typed_obj = (const Type *) obj;
-  return typed_obj->get_glyph (codepoint, glyph);
-}
-
-template 
-static inline bool get_glyph_from_symbol (const void *obj,
-					  hb_codepoint_t codepoint,
-					  hb_codepoint_t *glyph)
-{
-  const Type *typed_obj = (const Type *) obj;
-  if (likely (typed_obj->get_glyph (codepoint, glyph)))
-    return true;
-
-  if (codepoint <= 0x00FFu)
-  {
-    /* For symbol-encoded OpenType fonts, we duplicate the
-     * U+F000..F0FF range at U+0000..U+00FF.  That's what
-     * Windows seems to do, and that's hinted about at:
-     * http://www.microsoft.com/typography/otspec/recom.htm
-     * under "Non-Standard (Symbol) Fonts". */
-    return typed_obj->get_glyph (0xF000u + codepoint, glyph);
-  }
-
-  return false;
-}
-
-struct hb_ot_face_cmap_accelerator_t
-{
-  hb_cmap_get_glyph_func_t get_glyph_func;
-  const void *get_glyph_data;
-  OT::CmapSubtableFormat4::accelerator_t format4_accel;
-
-  const OT::CmapSubtableFormat14 *uvs_table;
-  hb_blob_t *blob;
-
-  inline void init (hb_face_t *face)
-  {
-    this->blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_cmap));
-    const OT::cmap *cmap = OT::Sanitizer::lock_instance (this->blob);
-    const OT::CmapSubtable *subtable = nullptr;
-    const OT::CmapSubtableFormat14 *subtable_uvs = nullptr;
-
-    bool symbol = false;
-    /* 32-bit subtables. */
-    if (!subtable) subtable = cmap->find_subtable (3, 10);
-    if (!subtable) subtable = cmap->find_subtable (0, 6);
-    if (!subtable) subtable = cmap->find_subtable (0, 4);
-    /* 16-bit subtables. */
-    if (!subtable) subtable = cmap->find_subtable (3, 1);
-    if (!subtable) subtable = cmap->find_subtable (0, 3);
-    if (!subtable) subtable = cmap->find_subtable (0, 2);
-    if (!subtable) subtable = cmap->find_subtable (0, 1);
-    if (!subtable) subtable = cmap->find_subtable (0, 0);
-    if (!subtable)
-    {
-      subtable = cmap->find_subtable (3, 0);
-      if (subtable) symbol = true;
-    }
-    /* Meh. */
-    if (!subtable) subtable = &OT::Null(OT::CmapSubtable);
-
-    /* UVS subtable. */
-    if (!subtable_uvs)
-    {
-      const OT::CmapSubtable *st = cmap->find_subtable (0, 5);
-      if (st && st->u.format == 14)
-        subtable_uvs = &st->u.format14;
-    }
-    /* Meh. */
-    if (!subtable_uvs) subtable_uvs = &OT::Null(OT::CmapSubtableFormat14);
-
-    this->uvs_table = subtable_uvs;
-
-    this->get_glyph_data = subtable;
-    if (unlikely (symbol))
-      this->get_glyph_func = get_glyph_from_symbol;
-    else
-      switch (subtable->u.format) {
-      /* Accelerate format 4 and format 12. */
-      default: this->get_glyph_func = get_glyph_from;		break;
-      case 12: this->get_glyph_func = get_glyph_from;	break;
-      case  4:
-	{
-	  this->format4_accel.init (&subtable->u.format4);
-	  this->get_glyph_data = &this->format4_accel;
-	  this->get_glyph_func = this->format4_accel.get_glyph_func;
-	}
-	break;
-      }
-  }
-
-  inline void fini (void)
-  {
-    hb_blob_destroy (this->blob);
-  }
-
-  inline bool get_nominal_glyph (hb_codepoint_t  unicode,
-				 hb_codepoint_t *glyph) const
-  {
-    return this->get_glyph_func (this->get_glyph_data, unicode, glyph);
-  }
-
-  inline bool get_variation_glyph (hb_codepoint_t  unicode,
-				   hb_codepoint_t  variation_selector,
-				   hb_codepoint_t *glyph) const
-  {
-    switch (this->uvs_table->get_glyph_variant (unicode,
-						variation_selector,
-						glyph))
-    {
-      case OT::GLYPH_VARIANT_NOT_FOUND:		return false;
-      case OT::GLYPH_VARIANT_FOUND:		return true;
-      case OT::GLYPH_VARIANT_USE_DEFAULT:	break;
-    }
-
-    return get_nominal_glyph (unicode, glyph);
-  }
-};
-
 struct hb_ot_font_t
 {
-  hb_ot_face_cmap_accelerator_t cmap;
-  hb_ot_face_metrics_accelerator_t h_metrics;
-  hb_ot_face_metrics_accelerator_t v_metrics;
-  OT::hb_lazy_loader_t glyf;
-  OT::hb_lazy_loader_t cbdt;
-  OT::hb_lazy_loader_t post;
-  OT::hb_lazy_loader_t kern;
+  OT::cmap::accelerator_t cmap;
+  OT::hmtx::accelerator_t h_metrics;
+  OT::vmtx::accelerator_t v_metrics;
+  OT::hb_lazy_loader_t glyf;
+  OT::hb_lazy_loader_t cbdt;
+  OT::hb_lazy_loader_t post;
+  OT::hb_lazy_loader_t kern;
 };
 
 
@@ -505,9 +59,8 @@
     return nullptr;
 
   ot_font->cmap.init (face);
-  ot_font->h_metrics.init (face, HB_OT_TAG_hhea, HB_OT_TAG_hmtx, HB_OT_TAG_HVAR, HB_OT_TAG_os2);
-  ot_font->v_metrics.init (face, HB_OT_TAG_vhea, HB_OT_TAG_vmtx, HB_OT_TAG_VVAR, HB_TAG_NONE,
-			   ot_font->h_metrics.ascender - ot_font->h_metrics.descender); /* TODO Can we do this lazily? */
+  ot_font->h_metrics.init (face);
+  ot_font->v_metrics.init (face, ot_font->h_metrics.ascender - ot_font->h_metrics.descender); /* TODO Can we do this lazily? */
   ot_font->glyf.init (face);
   ot_font->cbdt.init (face);
   ot_font->post.init (face);
@@ -688,7 +241,7 @@
     hb_font_funcs_set_glyph_h_kerning_func (funcs, hb_ot_get_glyph_h_kerning, nullptr, nullptr);
     //hb_font_funcs_set_glyph_v_kerning_func (funcs, hb_ot_get_glyph_v_kerning, nullptr, nullptr);
     hb_font_funcs_set_glyph_extents_func (funcs, hb_ot_get_glyph_extents, nullptr, nullptr);
-    //hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ot_get_glyph_contour_point, nullptr, nullptr); TODO
+    //hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ot_get_glyph_contour_point, nullptr, nullptr);
     hb_font_funcs_set_glyph_name_func (funcs, hb_ot_get_glyph_name, nullptr, nullptr);
     hb_font_funcs_set_glyph_from_name_func (funcs, hb_ot_get_glyph_from_name, nullptr, nullptr);
 
diff -Nru harfbuzz-1.7.1/src/hb-ot-glyf-table.hh harfbuzz-1.7.2/src/hb-ot-glyf-table.hh
--- harfbuzz-1.7.1/src/hb-ot-glyf-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-glyf-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -28,6 +28,7 @@
 #define HB_OT_GLYF_TABLE_HH
 
 #include "hb-open-type-private.hh"
+#include "hb-ot-head-table.hh"
 
 
 namespace OT {
@@ -42,6 +43,8 @@
 
 struct loca
 {
+  friend struct glyf;
+
   static const hb_tag_t tableTag = HB_OT_TAG_loca;
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -50,12 +53,9 @@
     return_trace (true);
   }
 
-  public:
-  union {
-    USHORT	shortsZ[VAR];		/* Location offset divided by 2. */
-    ULONG	longsZ[VAR];		/* Location offset. */
-  } u;
-  DEFINE_SIZE_ARRAY (0, u.longsZ);
+  protected:
+  UINT8		dataX[VAR];		/* Location data. */
+  DEFINE_SIZE_ARRAY (0, dataX);
 };
 
 
@@ -78,24 +78,100 @@
     return_trace (true);
   }
 
-  public:
-  BYTE		dataX[VAR];		/* Glyphs data. */
+  struct GlyphHeader
+  {
+    INT16		numberOfContours;	/* If the number of contours is
+					   * greater than or equal to zero,
+					   * this is a simple glyph; if negative,
+					   * this is a composite glyph. */
+    FWORD		xMin;			/* Minimum x for coordinate data. */
+    FWORD		yMin;			/* Minimum y for coordinate data. */
+    FWORD		xMax;			/* Maximum x for coordinate data. */
+    FWORD		yMax;			/* Maximum y for coordinate data. */
 
-  DEFINE_SIZE_ARRAY (0, dataX);
-};
+    DEFINE_SIZE_STATIC (10);
+  };
 
-struct glyfGlyphHeader
-{
-  SHORT		numberOfContours;	/* If the number of contours is
-					 * greater than or equal to zero,
-					 * this is a simple glyph; if negative,
-					 * this is a composite glyph. */
-  FWORD		xMin;			/* Minimum x for coordinate data. */
-  FWORD		yMin;			/* Minimum y for coordinate data. */
-  FWORD		xMax;			/* Maximum x for coordinate data. */
-  FWORD		yMax;			/* Maximum y for coordinate data. */
+  struct accelerator_t
+  {
+    inline void init (hb_face_t *face)
+    {
+      hb_blob_t *head_blob = Sanitizer::sanitize (face->reference_table (HB_OT_TAG_head));
+      const head *head_table = Sanitizer::lock_instance (head_blob);
+      if ((unsigned int) head_table->indexToLocFormat > 1 || head_table->glyphDataFormat != 0)
+      {
+	/* Unknown format.  Leave num_glyphs=0, that takes care of disabling us. */
+	hb_blob_destroy (head_blob);
+	return;
+      }
+      short_offset = 0 == head_table->indexToLocFormat;
+      hb_blob_destroy (head_blob);
+
+      loca_blob = Sanitizer::sanitize (face->reference_table (HB_OT_TAG_loca));
+      loca_table = Sanitizer::lock_instance (loca_blob);
+      glyf_blob = Sanitizer::sanitize (face->reference_table (HB_OT_TAG_glyf));
+      glyf_table = Sanitizer::lock_instance (glyf_blob);
+
+      num_glyphs = MAX (1u, hb_blob_get_length (loca_blob) / (short_offset ? 2 : 4)) - 1;
+      glyf_len = hb_blob_get_length (glyf_blob);
+    }
+
+    inline void fini (void)
+    {
+      hb_blob_destroy (loca_blob);
+      hb_blob_destroy (glyf_blob);
+    }
+
+    inline bool get_extents (hb_codepoint_t glyph,
+			     hb_glyph_extents_t *extents) const
+    {
+      if (unlikely (glyph >= num_glyphs))
+	return false;
+
+      unsigned int start_offset, end_offset;
+      if (short_offset)
+      {
+        const UINT16 *offsets = (const UINT16 *) loca_table->dataX;
+	start_offset = 2 * offsets[glyph];
+	end_offset   = 2 * offsets[glyph + 1];
+      }
+      else
+      {
+        const UINT32 *offsets = (const UINT32 *) loca_table->dataX;
+	start_offset = offsets[glyph];
+	end_offset   = offsets[glyph + 1];
+      }
+
+      if (start_offset > end_offset || end_offset > glyf_len)
+	return false;
+
+      if (end_offset - start_offset < GlyphHeader::static_size)
+	return true; /* Empty glyph; zero extents. */
+
+      const GlyphHeader &glyph_header = StructAtOffset (glyf_table, start_offset);
+
+      extents->x_bearing = MIN (glyph_header.xMin, glyph_header.xMax);
+      extents->y_bearing = MAX (glyph_header.yMin, glyph_header.yMax);
+      extents->width     = MAX (glyph_header.xMin, glyph_header.xMax) - extents->x_bearing;
+      extents->height    = MIN (glyph_header.yMin, glyph_header.yMax) - extents->y_bearing;
+
+      return true;
+    }
+
+    private:
+    bool short_offset;
+    unsigned int num_glyphs;
+    const loca *loca_table;
+    const glyf *glyf_table;
+    hb_blob_t *loca_blob;
+    hb_blob_t *glyf_blob;
+    unsigned int glyf_len;
+  };
 
-  DEFINE_SIZE_STATIC (10);
+  protected:
+  UINT8		dataX[VAR];		/* Glyphs data. */
+
+  DEFINE_SIZE_ARRAY (0, dataX);
 };
 
 } /* namespace OT */
diff -Nru harfbuzz-1.7.1/src/hb-ot-head-table.hh harfbuzz-1.7.2/src/hb-ot-head-table.hh
--- harfbuzz-1.7.1/src/hb-ot-head-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-head-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -64,11 +64,11 @@
   FixedVersion<>version;		/* Version of the head table--currently
 					 * 0x00010000u for version 1.0. */
   FixedVersion<>fontRevision;		/* Set by font manufacturer. */
-  ULONG		checkSumAdjustment;	/* To compute: set it to 0, sum the
-					 * entire font as ULONG, then store
+  UINT32		checkSumAdjustment;	/* To compute: set it to 0, sum the
+					 * entire font as UINT32, then store
 					 * 0xB1B0AFBAu - sum. */
-  ULONG		magicNumber;		/* Set to 0x5F0F3CF5u. */
-  USHORT	flags;			/* Bit 0: Baseline for font at y=0;
+  UINT32		magicNumber;		/* Set to 0x5F0F3CF5u. */
+  UINT16	flags;			/* Bit 0: Baseline for font at y=0;
 					 * Bit 1: Left sidebearing point at x=0;
 					 * Bit 2: Instructions may depend on point size;
 					 * Bit 3: Force ppem to integer values for all
@@ -114,18 +114,18 @@
 					 * encoded in the cmap subtables represent proper
 					 * support for those code points.
 					 * Bit 15: Reserved, set to 0. */
-  USHORT	unitsPerEm;		/* Valid range is from 16 to 16384. This value
+  UINT16	unitsPerEm;		/* Valid range is from 16 to 16384. This value
 					 * should be a power of 2 for fonts that have
 					 * TrueType outlines. */
   LONGDATETIME	created;		/* Number of seconds since 12:00 midnight,
 					   January 1, 1904. 64-bit integer */
   LONGDATETIME	modified;		/* Number of seconds since 12:00 midnight,
 					   January 1, 1904. 64-bit integer */
-  SHORT		xMin;			/* For all glyph bounding boxes. */
-  SHORT		yMin;			/* For all glyph bounding boxes. */
-  SHORT		xMax;			/* For all glyph bounding boxes. */
-  SHORT		yMax;			/* For all glyph bounding boxes. */
-  USHORT	macStyle;		/* Bit 0: Bold (if set to 1);
+  INT16		xMin;			/* For all glyph bounding boxes. */
+  INT16		yMin;			/* For all glyph bounding boxes. */
+  INT16		xMax;			/* For all glyph bounding boxes. */
+  INT16		yMax;			/* For all glyph bounding boxes. */
+  UINT16	macStyle;		/* Bit 0: Bold (if set to 1);
 					 * Bit 1: Italic (if set to 1)
 					 * Bit 2: Underline (if set to 1)
 					 * Bit 3: Outline (if set to 1)
@@ -133,16 +133,16 @@
 					 * Bit 5: Condensed (if set to 1)
 					 * Bit 6: Extended (if set to 1)
 					 * Bits 7-15: Reserved (set to 0). */
-  USHORT	lowestRecPPEM;		/* Smallest readable size in pixels. */
-  SHORT		fontDirectionHint;	/* Deprecated (Set to 2).
+  UINT16	lowestRecPPEM;		/* Smallest readable size in pixels. */
+  INT16		fontDirectionHint;	/* Deprecated (Set to 2).
 					 * 0: Fully mixed directional glyphs;
 					 * 1: Only strongly left to right;
 					 * 2: Like 1 but also contains neutrals;
 					 * -1: Only strongly right to left;
 					 * -2: Like -1 but also contains neutrals. */
   public:
-  SHORT		indexToLocFormat;	/* 0 for short offsets, 1 for long. */
-  SHORT		glyphDataFormat;	/* 0 for current format. */
+  INT16		indexToLocFormat;	/* 0 for short offsets, 1 for long. */
+  INT16		glyphDataFormat;	/* 0 for current format. */
 
   DEFINE_SIZE_STATIC (54);
 };
diff -Nru harfbuzz-1.7.1/src/hb-ot-hhea-table.hh harfbuzz-1.7.2/src/hb-ot-hhea-table.hh
--- harfbuzz-1.7.1/src/hb-ot-hhea-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-hhea-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -44,11 +44,6 @@
 
 struct _hea
 {
-  static const hb_tag_t tableTag = HB_TAG('_','h','e','a');
-
-  static const hb_tag_t hheaTag	= HB_OT_TAG_hhea;
-  static const hb_tag_t vheaTag	= HB_OT_TAG_vhea;
-
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -69,21 +64,21 @@
 					 * (xMax - xMin)) for horizontal. */
   FWORD		maxExtent;		/* horizontal: Max(lsb + (xMax - xMin)),
 					 * vertical: minLeadingBearing+(yMax-yMin). */
-  SHORT		caretSlopeRise;		/* Used to calculate the slope of the
+  INT16		caretSlopeRise;		/* Used to calculate the slope of the
 					 * cursor (rise/run); 1 for vertical caret,
 					 * 0 for horizontal.*/
-  SHORT		caretSlopeRun;		/* 0 for vertical caret, 1 for horizontal. */
-  SHORT		caretOffset;		/* The amount by which a slanted
+  INT16		caretSlopeRun;		/* 0 for vertical caret, 1 for horizontal. */
+  INT16		caretOffset;		/* The amount by which a slanted
 					 * highlight on a glyph needs
 					 * to be shifted to produce the
 					 * best appearance. Set to 0 for
 					 * non-slanted fonts. */
-  SHORT		reserved1;		/* Set to 0. */
-  SHORT		reserved2;		/* Set to 0. */
-  SHORT		reserved3;		/* Set to 0. */
-  SHORT		reserved4;		/* Set to 0. */
-  SHORT		metricDataFormat;	/* 0 for current format. */
-  USHORT	numberOfLongMetrics;	/* Number of LongMetric entries in metric
+  INT16		reserved1;		/* Set to 0. */
+  INT16		reserved2;		/* Set to 0. */
+  INT16		reserved3;		/* Set to 0. */
+  INT16		reserved4;		/* Set to 0. */
+  INT16		metricDataFormat;	/* 0 for current format. */
+  UINT16	numberOfLongMetrics;	/* Number of LongMetric entries in metric
 					 * table. */
   public:
   DEFINE_SIZE_STATIC (36);
diff -Nru harfbuzz-1.7.1/src/hb-ot-hmtx-table.hh harfbuzz-1.7.2/src/hb-ot-hmtx-table.hh
--- harfbuzz-1.7.1/src/hb-ot-hmtx-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-hmtx-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -28,6 +28,9 @@
 #define HB_OT_HMTX_TABLE_HH
 
 #include "hb-open-type-private.hh"
+#include "hb-ot-hhea-table.hh"
+#include "hb-ot-os2-table.hh"
+#include "hb-ot-var-hvar-table.hh"
 
 
 namespace OT {
@@ -50,11 +53,9 @@
   DEFINE_SIZE_STATIC (4);
 };
 
+template 
 struct hmtxvmtx
 {
-  static const hb_tag_t hmtxTag	= HB_OT_TAG_hmtx;
-  static const hb_tag_t vmtxTag	= HB_OT_TAG_vmtx;
-
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -63,7 +64,107 @@
     return_trace (true);
   }
 
-  public:
+  struct accelerator_t
+  {
+    inline void init (hb_face_t *face,
+		      unsigned int default_advance_ = 0)
+    {
+      default_advance = default_advance_ ? default_advance_ : face->get_upem ();
+
+      bool got_font_extents = false;
+      if (T::os2Tag)
+      {
+	hb_blob_t *os2_blob = Sanitizer::sanitize (face->reference_table (T::os2Tag));
+	const os2 *os2_table = Sanitizer::lock_instance (os2_blob);
+#define USE_TYPO_METRICS (1u<<7)
+	if (0 != (os2_table->fsSelection & USE_TYPO_METRICS))
+	{
+	  ascender = os2_table->sTypoAscender;
+	  descender = os2_table->sTypoDescender;
+	  line_gap = os2_table->sTypoLineGap;
+	  got_font_extents = (ascender | descender) != 0;
+	}
+	hb_blob_destroy (os2_blob);
+      }
+
+      hb_blob_t *_hea_blob = Sanitizer<_hea>::sanitize (face->reference_table (T::headerTag));
+      const _hea *_hea_table = Sanitizer<_hea>::lock_instance (_hea_blob);
+      num_advances = _hea_table->numberOfLongMetrics;
+      if (!got_font_extents)
+      {
+	ascender = _hea_table->ascender;
+	descender = _hea_table->descender;
+	line_gap = _hea_table->lineGap;
+	got_font_extents = (ascender | descender) != 0;
+      }
+      hb_blob_destroy (_hea_blob);
+
+      has_font_extents = got_font_extents;
+
+      blob = Sanitizer::sanitize (face->reference_table (T::tableTag));
+
+      /* Cap num_metrics() and num_advances() based on table length. */
+      unsigned int len = hb_blob_get_length (blob);
+      if (unlikely (num_advances * 4 > len))
+	num_advances = len / 4;
+      num_metrics = num_advances + (len - 4 * num_advances) / 2;
+
+      /* We MUST set num_metrics to zero if num_advances is zero.
+       * Our get_advance() depends on that. */
+      if (unlikely (!num_advances))
+      {
+	num_metrics = num_advances = 0;
+	hb_blob_destroy (blob);
+	blob = hb_blob_get_empty ();
+      }
+      table = Sanitizer::lock_instance (blob);
+
+      var_blob = Sanitizer::sanitize (face->reference_table (T::variationsTag));
+      var_table = Sanitizer::lock_instance (var_blob);
+    }
+
+    inline void fini (void)
+    {
+      hb_blob_destroy (blob);
+      hb_blob_destroy (var_blob);
+    }
+
+    inline unsigned int get_advance (hb_codepoint_t  glyph,
+				     hb_font_t      *font) const
+    {
+      if (unlikely (glyph >= num_metrics))
+      {
+	/* If num_metrics is zero, it means we don't have the metrics table
+	 * for this direction: return default advance.  Otherwise, it means that the
+	 * glyph index is out of bound: return zero. */
+	if (num_metrics)
+	  return 0;
+	else
+	  return default_advance;
+      }
+
+      return table->longMetric[MIN (glyph, (uint32_t) num_advances - 1)].advance
+	   + var_table->get_advance_var (glyph, font->coords, font->num_coords); // TODO Optimize?!
+    }
+
+    public:
+    bool has_font_extents;
+    unsigned short ascender;
+    unsigned short descender;
+    unsigned short line_gap;
+
+    private:
+    unsigned int num_metrics;
+    unsigned int num_advances;
+    unsigned int default_advance;
+
+    const hmtxvmtx *table;
+    hb_blob_t *blob;
+    const HVARVVAR *var_table;
+    hb_blob_t *var_blob;
+  };
+
+  protected:
   LongMetric	longMetric[VAR];	/* Paired advance width and leading
 					 * bearing values for each glyph. The
 					 * value numOfHMetrics comes from
@@ -89,11 +190,17 @@
   DEFINE_SIZE_ARRAY2 (0, longMetric, leadingBearingX);
 };
 
-struct hmtx : hmtxvmtx {
+struct hmtx : hmtxvmtx {
   static const hb_tag_t tableTag	= HB_OT_TAG_hmtx;
+  static const hb_tag_t headerTag	= HB_OT_TAG_hhea;
+  static const hb_tag_t variationsTag	= HB_OT_TAG_HVAR;
+  static const hb_tag_t os2Tag		= HB_OT_TAG_os2;
 };
-struct vmtx : hmtxvmtx {
+struct vmtx : hmtxvmtx {
   static const hb_tag_t tableTag	= HB_OT_TAG_vmtx;
+  static const hb_tag_t headerTag	= HB_OT_TAG_vhea;
+  static const hb_tag_t variationsTag	= HB_OT_TAG_VVAR;
+  static const hb_tag_t os2Tag		= HB_TAG_NONE;
 };
 
 } /* namespace OT */
diff -Nru harfbuzz-1.7.1/src/hb-ot-kern-table.hh harfbuzz-1.7.2/src/hb-ot-kern-table.hh
--- harfbuzz-1.7.1/src/hb-ot-kern-table.hh	2017-11-14 04:20:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-kern-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -104,8 +104,8 @@
   }
 
   protected:
-  USHORT		firstGlyph;	/* First glyph in class range. */
-  ArrayOf	classes;	/* Glyph classes. */
+  UINT16		firstGlyph;	/* First glyph in class range. */
+  ArrayOf	classes;	/* Glyph classes. */
   public:
   DEFINE_SIZE_ARRAY (4, classes);
 };
@@ -136,7 +136,7 @@
   }
 
   protected:
-  USHORT	rowWidth;	/* The width, in bytes, of a row in the table. */
+  UINT16	rowWidth;	/* The width, in bytes, of a row in the table. */
   OffsetTo
 		leftClassTable;	/* Offset from beginning of this subtable to
 				 * left-hand class table. */
@@ -275,19 +275,19 @@
     };
 
     protected:
-    USHORT	versionZ;	/* Unused. */
-    USHORT	length;		/* Length of the subtable (including this header). */
-    BYTE	format;		/* Subtable format. */
-    BYTE	coverage;	/* Coverage bits. */
+    UINT16	versionZ;	/* Unused. */
+    UINT16	length;		/* Length of the subtable (including this header). */
+    UINT8	format;		/* Subtable format. */
+    UINT8	coverage;	/* Coverage bits. */
     KernSubTable subtable;	/* Subtable data. */
     public:
     DEFINE_SIZE_MIN (6);
   };
 
   protected:
-  USHORT	version;	/* Version--0x0000u */
-  USHORT	nTables;	/* Number of subtables in the kerning table. */
-  BYTE		data[VAR];
+  UINT16	version;	/* Version--0x0000u */
+  UINT16	nTables;	/* Number of subtables in the kerning table. */
+  UINT8		data[VAR];
   public:
   DEFINE_SIZE_ARRAY (4, data);
 };
@@ -314,10 +314,10 @@
     };
 
     protected:
-    ULONG	length;		/* Length of the subtable (including this header). */
-    BYTE	coverage;	/* Coverage bits. */
-    BYTE	format;		/* Subtable format. */
-    USHORT	tupleIndex;	/* The tuple index (used for variations fonts).
+    UINT32	length;		/* Length of the subtable (including this header). */
+    UINT8	coverage;	/* Coverage bits. */
+    UINT8	format;		/* Subtable format. */
+    UINT16	tupleIndex;	/* The tuple index (used for variations fonts).
 				 * This value specifies which tuple this subtable covers. */
     KernSubTable subtable;	/* Subtable data. */
     public:
@@ -325,9 +325,9 @@
   };
 
   protected:
-  ULONG		version;	/* Version--0x00010000u */
-  ULONG		nTables;	/* Number of subtables in the kerning table. */
-  BYTE		data[VAR];
+  UINT32		version;	/* Version--0x00010000u */
+  UINT32		nTables;	/* Number of subtables in the kerning table. */
+  UINT8		data[VAR];
   public:
   DEFINE_SIZE_ARRAY (8, data);
 };
@@ -358,24 +358,29 @@
 
   struct accelerator_t
   {
-    inline void init (const kern *table_, unsigned int table_length_)
+    inline void init (hb_face_t *face)
     {
-      table = table_;
-      table_length = table_length_;
+      blob = Sanitizer::sanitize (face->reference_table (HB_OT_TAG_kern));
+      table = Sanitizer::lock_instance (blob);
+      table_length = hb_blob_get_length (blob);
+    }
+    inline void fini (void)
+    {
+      hb_blob_destroy (blob);
     }
-    inline void fini (void) {}
 
     inline int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const
     { return table->get_h_kerning (left, right, table_length); }
 
     private:
+    hb_blob_t *blob;
     const kern *table;
     unsigned int table_length;
   };
 
   protected:
   union {
-  USHORT		major;
+  UINT16		major;
   KernOT		ot;
   KernAAT		aat;
   } u;
diff -Nru harfbuzz-1.7.1/src/hb-ot-layout.cc harfbuzz-1.7.2/src/hb-ot-layout.cc
--- harfbuzz-1.7.1/src/hb-ot-layout.cc	2017-10-30 20:11:22.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-layout.cc	2017-12-01 20:37:05.000000000 +0000
@@ -601,6 +601,7 @@
 hb_ot_layout_table_get_lookup_count (hb_face_t    *face,
 				     hb_tag_t      table_tag)
 {
+  if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return 0;
   switch (table_tag)
   {
     case HB_OT_TAG_GSUB:
diff -Nru harfbuzz-1.7.1/src/hb-ot-layout-common-private.hh harfbuzz-1.7.2/src/hb-ot-layout-common-private.hh
--- harfbuzz-1.7.1/src/hb-ot-layout-common-private.hh	2017-11-03 21:18:17.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-layout-common-private.hh	2017-11-16 00:11:43.000000000 +0000
@@ -161,7 +161,7 @@
 
   GlyphID	start;		/* First GlyphID in the range */
   GlyphID	end;		/* Last GlyphID in the range */
-  USHORT	value;		/* Value */
+  UINT16	value;		/* Value */
   public:
   DEFINE_SIZE_STATIC (6);
 };
@@ -175,7 +175,7 @@
 				   unsigned int *_indexes /* OUT */) const
   {
     if (_count) {
-      const USHORT *arr = this->sub_array (start_offset, _count);
+      const UINT16 *arr = this->sub_array (start_offset, _count);
       unsigned int count = *_count;
       for (unsigned int i = 0; i < count; i++)
 	_indexes[i] = arr[i];
@@ -216,9 +216,9 @@
     return_trace (c->check_struct (this) && featureIndex.sanitize (c));
   }
 
-  Offset<>	lookupOrderZ;	/* = Null (reserved for an offset to a
+  Offset16	lookupOrderZ;	/* = Null (reserved for an offset to a
 				 * reordering table) */
-  USHORT	reqFeatureIndex;/* Index of a feature required for this
+  UINT16	reqFeatureIndex;/* Index of a feature required for this
 				 * language system--if no required features
 				 * = 0xFFFFu */
   IndexArray	featureIndex;	/* Array of indices into the FeatureList */
@@ -343,12 +343,12 @@
       return_trace (true);
   }
 
-  USHORT	designSize;	/* Represents the design size in 720/inch
+  UINT16	designSize;	/* Represents the design size in 720/inch
 				 * units (decipoints).  The design size entry
 				 * must be non-zero.  When there is a design
 				 * size but no recommended size range, the
 				 * rest of the array will consist of zeros. */
-  USHORT	subfamilyID;	/* Has no independent meaning, but serves
+  UINT16	subfamilyID;	/* Has no independent meaning, but serves
 				 * as an identifier that associates fonts
 				 * in a subfamily. All fonts which share a
 				 * Preferred or Font Family name and which
@@ -358,7 +358,7 @@
 				 * same subfamily value. If this value is
 				 * zero, the remaining fields in the array
 				 * will be ignored. */
-  USHORT	subfamilyNameID;/* If the preceding value is non-zero, this
+  UINT16	subfamilyNameID;/* If the preceding value is non-zero, this
 				 * value must be set in the range 256 - 32767
 				 * (inclusive). It records the value of a
 				 * field in the name table, which must
@@ -372,10 +372,10 @@
 				 * subfamily in a menu.  Applications will
 				 * choose the appropriate version based on
 				 * their selection criteria. */
-  USHORT	rangeStart;	/* Large end of the recommended usage range
+  UINT16	rangeStart;	/* Large end of the recommended usage range
 				 * (inclusive), stored in 720/inch units
 				 * (decipoints). */
-  USHORT	rangeEnd;	/* Small end of the recommended usage range
+  UINT16	rangeEnd;	/* Small end of the recommended usage range
 				   (exclusive), stored in 720/inch units
 				 * (decipoints). */
   public:
@@ -393,12 +393,12 @@
     return_trace (c->check_struct (this));
   }
 
-  USHORT	version;	/* (set to 0): This corresponds to a “minor”
+  UINT16	version;	/* (set to 0): This corresponds to a “minor”
 				 * version number. Additional data may be
 				 * added to the end of this Feature Parameters
 				 * table in the future. */
 
-  USHORT	uiNameID;	/* The 'name' table name ID that specifies a
+  UINT16	uiNameID;	/* The 'name' table name ID that specifies a
 				 * string (or strings, for multiple languages)
 				 * for a user-interface label for this
 				 * feature.  The values of uiLabelNameId and
@@ -426,25 +426,25 @@
 		  characters.sanitize (c));
   }
 
-  USHORT	format;			/* Format number is set to 0. */
-  USHORT	featUILableNameID;	/* The ‘name’ table name ID that
+  UINT16	format;			/* Format number is set to 0. */
+  UINT16	featUILableNameID;	/* The ‘name’ table name ID that
 					 * specifies a string (or strings,
 					 * for multiple languages) for a
 					 * user-interface label for this
 					 * feature. (May be nullptr.) */
-  USHORT	featUITooltipTextNameID;/* The ‘name’ table name ID that
+  UINT16	featUITooltipTextNameID;/* The ‘name’ table name ID that
 					 * specifies a string (or strings,
 					 * for multiple languages) that an
 					 * application can use for tooltip
 					 * text for this feature. (May be
 					 * nullptr.) */
-  USHORT	sampleTextNameID;	/* The ‘name’ table name ID that
+  UINT16	sampleTextNameID;	/* The ‘name’ table name ID that
 					 * specifies sample text that
 					 * illustrates the effect of this
 					 * feature. (May be nullptr.) */
-  USHORT	numNamedParameters;	/* Number of named parameters. (May
+  UINT16	numNamedParameters;	/* Number of named parameters. (May
 					 * be zero.) */
-  USHORT	firstParamUILabelNameID;/* The first ‘name’ table name ID
+  UINT16	firstParamUILabelNameID;/* The first ‘name’ table name ID
 					 * used to specify strings for
 					 * user-interface labels for the
 					 * feature parameters. (Must be zero
@@ -562,7 +562,7 @@
 typedef RecordListOf FeatureList;
 
 
-struct LookupFlag : USHORT
+struct LookupFlag : UINT16
 {
   enum Flags {
     RightToLeft		= 0x0001u,
@@ -608,7 +608,7 @@
     unsigned int flag = lookupFlag;
     if (unlikely (flag & LookupFlag::UseMarkFilteringSet))
     {
-      const USHORT &markFilteringSet = StructAfter (subTable);
+      const UINT16 &markFilteringSet = StructAfter (subTable);
       flag += (markFilteringSet << 16);
     }
     return flag;
@@ -640,7 +640,7 @@
     if (unlikely (!subTable.serialize (c, num_subtables))) return_trace (false);
     if (lookupFlag & LookupFlag::UseMarkFilteringSet)
     {
-      USHORT &markFilteringSet = StructAfter (subTable);
+      UINT16 &markFilteringSet = StructAfter (subTable);
       markFilteringSet.set (lookup_props >> 16);
     }
     return_trace (true);
@@ -653,18 +653,18 @@
     if (!(c->check_struct (this) && subTable.sanitize (c))) return_trace (false);
     if (lookupFlag & LookupFlag::UseMarkFilteringSet)
     {
-      const USHORT &markFilteringSet = StructAfter (subTable);
+      const UINT16 &markFilteringSet = StructAfter (subTable);
       if (!markFilteringSet.sanitize (c)) return_trace (false);
     }
     return_trace (true);
   }
 
   private:
-  USHORT	lookupType;		/* Different enumerations for GSUB and GPOS */
-  USHORT	lookupFlag;		/* Lookup qualifiers */
-  ArrayOf >
+  UINT16	lookupType;		/* Different enumerations for GSUB and GPOS */
+  UINT16	lookupFlag;		/* Lookup qualifiers */
+  ArrayOf
 		subTable;		/* Array of SubTables */
-  USHORT	markFilteringSetX[VAR];	/* Index (base 0) into GDEF mark glyph sets
+  UINT16	markFilteringSetX[VAR];	/* Index (base 0) into GDEF mark glyph sets
 					 * structure. This field is only present if bit
 					 * UseMarkFilteringSet of lookup flags is set. */
   public:
@@ -737,7 +737,7 @@
   private:
 
   protected:
-  USHORT	coverageFormat;	/* Format identifier--format = 1 */
+  UINT16	coverageFormat;	/* Format identifier--format = 1 */
   SortedArrayOf
 		glyphArray;	/* Array of GlyphIDs--in numerical order */
   public:
@@ -860,7 +860,7 @@
   private:
 
   protected:
-  USHORT	coverageFormat;	/* Format identifier--format = 2 */
+  UINT16	coverageFormat;	/* Format identifier--format = 2 */
   SortedArrayOf
 		rangeRecord;	/* Array of glyph ranges--ordered by
 				 * Start GlyphID. rangeCount entries
@@ -985,7 +985,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   CoverageFormat1	format1;
   CoverageFormat2	format2;
   } u;
@@ -1047,9 +1047,9 @@
   }
 
   protected:
-  USHORT	classFormat;		/* Format identifier--format = 1 */
+  UINT16	classFormat;		/* Format identifier--format = 1 */
   GlyphID	startGlyph;		/* First GlyphID of the classValueArray */
-  ArrayOf
+  ArrayOf
 		classValue;		/* Array of Class Values--one per GlyphID */
   public:
   DEFINE_SIZE_ARRAY (6, classValue);
@@ -1107,7 +1107,7 @@
   }
 
   protected:
-  USHORT	classFormat;	/* Format identifier--format = 2 */
+  UINT16	classFormat;	/* Format identifier--format = 2 */
   SortedArrayOf
 		rangeRecord;	/* Array of glyph ranges--ordered by
 				 * Start GlyphID */
@@ -1155,7 +1155,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   ClassDefFormat1	format1;
   ClassDefFormat2	format2;
   } u;
@@ -1240,8 +1240,8 @@
   }
 
   protected:
-  USHORT	axisCount;
-  USHORT	regionCount;
+  UINT16	axisCount;
+  UINT16	regionCount;
   VarRegionAxis	axesZ[VAR];
   public:
   DEFINE_SIZE_ARRAY (4, axesZ);
@@ -1265,13 +1265,13 @@
    unsigned int count = regionIndices.len;
    unsigned int scount = shortCount;
 
-   const BYTE *bytes = &StructAfter (regionIndices);
-   const BYTE *row = bytes + inner * (scount + count);
+   const UINT8 *bytes = &StructAfter (regionIndices);
+   const UINT8 *row = bytes + inner * (scount + count);
 
    float delta = 0.;
    unsigned int i = 0;
 
-   const SHORT *scursor = reinterpret_cast (row);
+   const INT16 *scursor = reinterpret_cast (row);
    for (; i < scount; i++)
    {
      float scalar = regions.evaluate (regionIndices.array[i], coords, coord_count);
@@ -1293,15 +1293,15 @@
     return_trace (c->check_struct (this) &&
 		  regionIndices.sanitize(c) &&
 		  shortCount <= regionIndices.len &&
-		  c->check_array (&StructAfter (regionIndices),
+		  c->check_array (&StructAfter (regionIndices),
 				  get_row_size (), itemCount));
   }
 
   protected:
-  USHORT		itemCount;
-  USHORT		shortCount;
-  ArrayOf	regionIndices;
-  BYTE			bytesX[VAR];
+  UINT16		itemCount;
+  UINT16		shortCount;
+  ArrayOf	regionIndices;
+  UINT8			bytesX[VAR];
   public:
   DEFINE_SIZE_ARRAY2 (6, regionIndices, bytesX);
 };
@@ -1337,9 +1337,9 @@
   }
 
   protected:
-  USHORT				format;
+  UINT16				format;
   LOffsetTo		regions;
-  OffsetArrayOf		dataSets;
+  OffsetArrayOf		dataSets;
   public:
   DEFINE_SIZE_ARRAY (8, dataSets);
 };
@@ -1366,8 +1366,8 @@
   }
 
   protected:
-  USHORT	format;		/* Format identifier--format = 1 */
-  USHORT	axisIndex;
+  UINT16	format;		/* Format identifier--format = 1 */
+  UINT16	axisIndex;
   F2DOT14	filterRangeMinValue;
   F2DOT14	filterRangeMaxValue;
   public:
@@ -1396,7 +1396,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   ConditionFormat1	format1;
   } u;
   public:
@@ -1421,7 +1421,7 @@
   }
 
   protected:
-  OffsetArrayOf conditions;
+  OffsetArrayOf conditions;
   public:
   DEFINE_SIZE_ARRAY (2, conditions);
 };
@@ -1437,7 +1437,7 @@
   }
 
   protected:
-  USHORT		featureIndex;
+  UINT16		featureIndex;
   LOffsetTo	feature;
   public:
   DEFINE_SIZE_STATIC (6);
@@ -1557,8 +1557,8 @@
   inline unsigned int get_size (void) const
   {
     unsigned int f = deltaFormat;
-    if (unlikely (f < 1 || f > 3 || startSize > endSize)) return 3 * USHORT::static_size;
-    return USHORT::static_size * (4 + ((endSize - startSize) >> (4 - f)));
+    if (unlikely (f < 1 || f > 3 || startSize > endSize)) return 3 * UINT16::static_size;
+    return UINT16::static_size * (4 + ((endSize - startSize) >> (4 - f)));
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -1603,14 +1603,14 @@
   }
 
   protected:
-  USHORT	startSize;		/* Smallest size to correct--in ppem */
-  USHORT	endSize;		/* Largest size to correct--in ppem */
-  USHORT	deltaFormat;		/* Format of DeltaValue array data: 1, 2, or 3
+  UINT16	startSize;		/* Smallest size to correct--in ppem */
+  UINT16	endSize;		/* Largest size to correct--in ppem */
+  UINT16	deltaFormat;		/* Format of DeltaValue array data: 1, 2, or 3
 					 * 1	Signed 2-bit value, 8 values per uint16
 					 * 2	Signed 4-bit value, 4 values per uint16
 					 * 3	Signed 8-bit value, 2 values per uint16
 					 */
-  USHORT	deltaValue[VAR];	/* Array of compressed data */
+  UINT16	deltaValue[VAR];	/* Array of compressed data */
   public:
   DEFINE_SIZE_ARRAY (6, deltaValue);
 };
@@ -1641,9 +1641,9 @@
   }
 
   protected:
-  USHORT	outerIndex;
-  USHORT	innerIndex;
-  USHORT	deltaFormat;	/* Format identifier for this table: 0x0x8000 */
+  UINT16	outerIndex;
+  UINT16	innerIndex;
+  UINT16	deltaFormat;	/* Format identifier for this table: 0x0x8000 */
   public:
   DEFINE_SIZE_STATIC (6);
 };
@@ -1651,10 +1651,10 @@
 struct DeviceHeader
 {
   protected:
-  USHORT		reserved1;
-  USHORT		reserved2;
+  UINT16		reserved1;
+  UINT16		reserved2;
   public:
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   public:
   DEFINE_SIZE_STATIC (6);
 };
diff -Nru harfbuzz-1.7.1/src/hb-ot-layout-gdef-table.hh harfbuzz-1.7.2/src/hb-ot-layout-gdef-table.hh
--- harfbuzz-1.7.1/src/hb-ot-layout-gdef-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-layout-gdef-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -41,7 +41,7 @@
  * Attachment List Table
  */
 
-typedef ArrayOf AttachPoint;	/* Array of contour point indices--in
+typedef ArrayOf AttachPoint;	/* Array of contour point indices--in
 					 * increasing numerical order */
 
 struct AttachList
@@ -62,7 +62,7 @@
     const AttachPoint &points = this+attachPoint[index];
 
     if (point_count) {
-      const USHORT *array = points.sub_array (start_offset, point_count);
+      const UINT16 *array = points.sub_array (start_offset, point_count);
       unsigned int count = *point_count;
       for (unsigned int i = 0; i < count; i++)
 	point_array[i] = array[i];
@@ -109,8 +109,8 @@
   }
 
   protected:
-  USHORT	caretValueFormat;	/* Format identifier--format = 1 */
-  SHORT		coordinate;		/* X or Y value, in design units */
+  UINT16	caretValueFormat;	/* Format identifier--format = 1 */
+  INT16		coordinate;		/* X or Y value, in design units */
   public:
   DEFINE_SIZE_STATIC (4);
 };
@@ -136,8 +136,8 @@
   }
 
   protected:
-  USHORT	caretValueFormat;	/* Format identifier--format = 2 */
-  USHORT	caretValuePoint;	/* Contour point index on glyph */
+  UINT16	caretValueFormat;	/* Format identifier--format = 2 */
+  UINT16	caretValuePoint;	/* Contour point index on glyph */
   public:
   DEFINE_SIZE_STATIC (4);
 };
@@ -160,8 +160,8 @@
   }
 
   protected:
-  USHORT	caretValueFormat;	/* Format identifier--format = 3 */
-  SHORT		coordinate;		/* X or Y value, in design units */
+  UINT16	caretValueFormat;	/* Format identifier--format = 3 */
+  INT16		coordinate;		/* X or Y value, in design units */
   OffsetTo
 		deviceTable;		/* Offset to Device table for X or Y
 					 * value--from beginning of CaretValue
@@ -199,7 +199,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   CaretValueFormat1	format1;
   CaretValueFormat2	format2;
   CaretValueFormat3	format3;
@@ -294,7 +294,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   ArrayOf >
 		coverage;		/* Array of long offsets to mark set
 					 * coverage tables */
@@ -324,7 +324,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   MarkGlyphSetsFormat1	format1;
   } u;
   public:
diff -Nru harfbuzz-1.7.1/src/hb-ot-layout-gpos-table.hh harfbuzz-1.7.2/src/hb-ot-layout-gpos-table.hh
--- harfbuzz-1.7.1/src/hb-ot-layout-gpos-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-layout-gpos-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -51,11 +51,11 @@
 
 /* Shared Tables: ValueRecord, Anchor Table, and MarkArray */
 
-typedef USHORT Value;
+typedef UINT16 Value;
 
 typedef Value ValueRecord[VAR];
 
-struct ValueFormat : USHORT
+struct ValueFormat : UINT16
 {
   enum Flags {
     xPlacement	= 0x0001u,	/* Includes horizontal adjustment for placement */
@@ -74,14 +74,14 @@
 
 /* All fields are options.  Only those available advance the value pointer. */
 #if 0
-  SHORT		xPlacement;		/* Horizontal adjustment for
+  INT16		xPlacement;		/* Horizontal adjustment for
 					 * placement--in design units */
-  SHORT		yPlacement;		/* Vertical adjustment for
+  INT16		yPlacement;		/* Vertical adjustment for
 					 * placement--in design units */
-  SHORT		xAdvance;		/* Horizontal adjustment for
+  INT16		xAdvance;		/* Horizontal adjustment for
 					 * advance--in design units (only used
 					 * for horizontal writing) */
-  SHORT		yAdvance;		/* Vertical adjustment for advance--in
+  INT16		yAdvance;		/* Vertical adjustment for advance--in
 					 * design units (only used for vertical
 					 * writing) */
   Offset	xPlaDevice;		/* Offset to Device table for
@@ -178,8 +178,8 @@
   static inline const OffsetTo& get_device (const Value* value)
   { return *CastP > (value); }
 
-  static inline const SHORT& get_short (const Value* value)
-  { return *CastP (value); }
+  static inline const INT16& get_short (const Value* value)
+  { return *CastP (value); }
 
   public:
 
@@ -247,9 +247,9 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
-  SHORT		xCoordinate;		/* Horizontal value--in design units */
-  SHORT		yCoordinate;		/* Vertical value--in design units */
+  UINT16	format;			/* Format identifier--format = 1 */
+  INT16		xCoordinate;		/* Horizontal value--in design units */
+  INT16		yCoordinate;		/* Vertical value--in design units */
   public:
   DEFINE_SIZE_STATIC (6);
 };
@@ -278,10 +278,10 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 2 */
-  SHORT		xCoordinate;		/* Horizontal value--in design units */
-  SHORT		yCoordinate;		/* Vertical value--in design units */
-  USHORT	anchorPoint;		/* Index to glyph contour point */
+  UINT16	format;			/* Format identifier--format = 2 */
+  INT16		xCoordinate;		/* Horizontal value--in design units */
+  INT16		yCoordinate;		/* Vertical value--in design units */
+  UINT16	anchorPoint;		/* Index to glyph contour point */
   public:
   DEFINE_SIZE_STATIC (8);
 };
@@ -308,9 +308,9 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 3 */
-  SHORT		xCoordinate;		/* Horizontal value--in design units */
-  SHORT		yCoordinate;		/* Vertical value--in design units */
+  UINT16	format;			/* Format identifier--format = 3 */
+  INT16		xCoordinate;		/* Horizontal value--in design units */
+  INT16		yCoordinate;		/* Vertical value--in design units */
   OffsetTo
 		xDeviceTable;		/* Offset to Device table for X
 					 * coordinate-- from beginning of
@@ -351,7 +351,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   AnchorFormat1		format1;
   AnchorFormat2		format2;
   AnchorFormat3		format3;
@@ -382,7 +382,7 @@
     return_trace (true);
   }
 
-  USHORT	rows;			/* Number of rows */
+  UINT16	rows;			/* Number of rows */
   protected:
   OffsetTo
 		matrixZ[VAR];		/* Matrix of offsets to Anchor tables--
@@ -403,7 +403,7 @@
   }
 
   protected:
-  USHORT	klass;			/* Class defined for this mark */
+  UINT16	klass;			/* Class defined for this mark */
   OffsetTo
 		markAnchor;		/* Offset to Anchor table--from
 					 * beginning of MarkArray table */
@@ -492,7 +492,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of subtable */
@@ -544,13 +544,13 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 2 */
+  UINT16	format;			/* Format identifier--format = 2 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of subtable */
   ValueFormat	valueFormat;		/* Defines the types of data in the
 					 * ValueRecord */
-  USHORT	valueCount;		/* Number of ValueRecords */
+  UINT16	valueCount;		/* Number of ValueRecords */
   ValueRecord	values;			/* Array of ValueRecords--positioning
 					 * values applied to glyphs */
   public:
@@ -573,7 +573,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   SinglePosFormat1	format1;
   SinglePosFormat2	format2;
   } u;
@@ -604,7 +604,7 @@
     TRACE_COLLECT_GLYPHS (this);
     unsigned int len1 = valueFormats[0].get_len ();
     unsigned int len2 = valueFormats[1].get_len ();
-    unsigned int record_size = USHORT::static_size * (1 + len1 + len2);
+    unsigned int record_size = UINT16::static_size * (1 + len1 + len2);
 
     const PairValueRecord *record = CastP (arrayZ);
     unsigned int count = len;
@@ -623,7 +623,7 @@
     hb_buffer_t *buffer = c->buffer;
     unsigned int len1 = valueFormats[0].get_len ();
     unsigned int len2 = valueFormats[1].get_len ();
-    unsigned int record_size = USHORT::static_size * (1 + len1 + len2);
+    unsigned int record_size = UINT16::static_size * (1 + len1 + len2);
 
     const PairValueRecord *record_array = CastP (arrayZ);
     unsigned int count = len;
@@ -668,7 +668,7 @@
   {
     TRACE_SANITIZE (this);
     if (!(c->check_struct (this)
-       && c->check_array (arrayZ, USHORT::static_size * closure->stride, len))) return_trace (false);
+       && c->check_array (arrayZ, UINT16::static_size * closure->stride, len))) return_trace (false);
 
     unsigned int count = len;
     const PairValueRecord *record = CastP (arrayZ);
@@ -677,8 +677,8 @@
   }
 
   protected:
-  USHORT	len;			/* Number of PairValueRecords */
-  USHORT	arrayZ[VAR];		/* Array of PairValueRecords--ordered
+  UINT16	len;			/* Number of PairValueRecords */
+  UINT16	arrayZ[VAR];		/* Array of PairValueRecords--ordered
 					 * by GlyphID of the second glyph */
   public:
   DEFINE_SIZE_ARRAY (2, arrayZ);
@@ -733,7 +733,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of subtable */
@@ -823,7 +823,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 2 */
+  UINT16	format;			/* Format identifier--format = 2 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of subtable */
@@ -841,9 +841,9 @@
 		classDef2;		/* Offset to ClassDef table--from
 					 * beginning of PairPos subtable--for
 					 * the second glyph of the pair */
-  USHORT	class1Count;		/* Number of classes in ClassDef1
+  UINT16	class1Count;		/* Number of classes in ClassDef1
 					 * table--includes Class0 */
-  USHORT	class2Count;		/* Number of classes in ClassDef2
+  UINT16	class2Count;		/* Number of classes in ClassDef2
 					 * table--includes Class0 */
   ValueRecord	values;			/* Matrix of value pairs:
 					 * class1-major, class2-minor,
@@ -868,7 +868,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   PairPosFormat1	format1;
   PairPosFormat2	format2;
   } u;
@@ -1022,7 +1022,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of subtable */
@@ -1048,7 +1048,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   CursivePosFormat1	format1;
   } u;
 };
@@ -1113,14 +1113,14 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		markCoverage;		/* Offset to MarkCoverage table--from
 					 * beginning of MarkBasePos subtable */
   OffsetTo
 		baseCoverage;		/* Offset to BaseCoverage table--from
 					 * beginning of MarkBasePos subtable */
-  USHORT	classCount;		/* Number of classes defined for marks */
+  UINT16	classCount;		/* Number of classes defined for marks */
   OffsetTo
 		markArray;		/* Offset to MarkArray table--from
 					 * beginning of MarkBasePos subtable */
@@ -1146,7 +1146,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   MarkBasePosFormat1	format1;
   } u;
 };
@@ -1230,7 +1230,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		markCoverage;		/* Offset to Mark Coverage table--from
 					 * beginning of MarkLigPos subtable */
@@ -1238,7 +1238,7 @@
 		ligatureCoverage;	/* Offset to Ligature Coverage
 					 * table--from beginning of MarkLigPos
 					 * subtable */
-  USHORT	classCount;		/* Number of defined mark classes */
+  UINT16	classCount;		/* Number of defined mark classes */
   OffsetTo
 		markArray;		/* Offset to MarkArray table--from
 					 * beginning of MarkLigPos subtable */
@@ -1264,7 +1264,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   MarkLigPosFormat1	format1;
   } u;
 };
@@ -1344,7 +1344,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		mark1Coverage;		/* Offset to Combining Mark1 Coverage
 					 * table--from beginning of MarkMarkPos
@@ -1353,7 +1353,7 @@
 		mark2Coverage;		/* Offset to Combining Mark2 Coverage
 					 * table--from beginning of MarkMarkPos
 					 * subtable */
-  USHORT	classCount;		/* Number of defined mark classes */
+  UINT16	classCount;		/* Number of defined mark classes */
   OffsetTo
 		mark1Array;		/* Offset to Mark1Array table--from
 					 * beginning of MarkMarkPos subtable */
@@ -1379,7 +1379,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   MarkMarkPosFormat1	format1;
   } u;
 };
@@ -1438,7 +1438,7 @@
 
   protected:
   union {
-  USHORT		sub_format;
+  UINT16		sub_format;
   SinglePos		single;
   PairPos		pair;
   CursivePos		cursive;
diff -Nru harfbuzz-1.7.1/src/hb-ot-layout-gsubgpos-private.hh harfbuzz-1.7.2/src/hb-ot-layout-gsubgpos-private.hh
--- harfbuzz-1.7.1/src/hb-ot-layout-gsubgpos-private.hh	2017-11-03 21:18:17.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-layout-gsubgpos-private.hh	2017-11-20 21:10:35.000000000 +0000
@@ -234,7 +234,7 @@
 	     match_func (nullptr),
 	     match_data (nullptr) {};
 
-    typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const void *data);
+    typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const UINT16 &value, const void *data);
 
     inline void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; }
     inline void set_ignore_zwj (bool ignore_zwj_) { ignore_zwj = ignore_zwj_; }
@@ -252,7 +252,7 @@
     };
 
     inline may_match_t may_match (const hb_glyph_info_t &info,
-				  const USHORT          *glyph_data) const
+				  const UINT16          *glyph_data) const
     {
       if (!(info.mask & mask) ||
 	  (syllable && syllable != info.syllable ()))
@@ -315,7 +315,7 @@
     }
     inline void set_match_func (matcher_t::match_func_t match_func_,
 				const void *match_data_,
-				const USHORT glyph_data[])
+				const UINT16 glyph_data[])
     {
       matcher.set_match_func (match_func_, match_data_);
       match_glyph_data = glyph_data;
@@ -398,7 +398,7 @@
     protected:
     hb_apply_context_t *c;
     matcher_t matcher;
-    const USHORT *match_glyph_data;
+    const UINT16 *match_glyph_data;
 
     unsigned int num_items;
     unsigned int end;
@@ -413,7 +413,7 @@
   bool stop_sublookup_iteration (return_t r) const { return r; }
   return_t recurse (unsigned int lookup_index)
   {
-    if (unlikely (nesting_level_left == 0 || !recurse_func))
+    if (unlikely (nesting_level_left == 0 || !recurse_func || buffer->max_ops-- <= 0))
       return default_return_value ();
 
     nesting_level_left--;
@@ -568,9 +568,9 @@
 
 
 
-typedef bool (*intersects_func_t) (hb_set_t *glyphs, const USHORT &value, const void *data);
-typedef void (*collect_glyphs_func_t) (hb_set_t *glyphs, const USHORT &value, const void *data);
-typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const void *data);
+typedef bool (*intersects_func_t) (hb_set_t *glyphs, const UINT16 &value, const void *data);
+typedef void (*collect_glyphs_func_t) (hb_set_t *glyphs, const UINT16 &value, const void *data);
+typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const UINT16 &value, const void *data);
 
 struct ContextClosureFuncs
 {
@@ -586,16 +586,16 @@
 };
 
 
-static inline bool intersects_glyph (hb_set_t *glyphs, const USHORT &value, const void *data HB_UNUSED)
+static inline bool intersects_glyph (hb_set_t *glyphs, const UINT16 &value, const void *data HB_UNUSED)
 {
   return glyphs->has (value);
 }
-static inline bool intersects_class (hb_set_t *glyphs, const USHORT &value, const void *data)
+static inline bool intersects_class (hb_set_t *glyphs, const UINT16 &value, const void *data)
 {
   const ClassDef &class_def = *reinterpret_cast(data);
   return class_def.intersects_class (glyphs, value);
 }
-static inline bool intersects_coverage (hb_set_t *glyphs, const USHORT &value, const void *data)
+static inline bool intersects_coverage (hb_set_t *glyphs, const UINT16 &value, const void *data)
 {
   const OffsetTo &coverage = (const OffsetTo&)value;
   return (data+coverage).intersects (glyphs);
@@ -603,7 +603,7 @@
 
 static inline bool intersects_array (hb_closure_context_t *c,
 				     unsigned int count,
-				     const USHORT values[],
+				     const UINT16 values[],
 				     intersects_func_t intersects_func,
 				     const void *intersects_data)
 {
@@ -614,16 +614,16 @@
 }
 
 
-static inline void collect_glyph (hb_set_t *glyphs, const USHORT &value, const void *data HB_UNUSED)
+static inline void collect_glyph (hb_set_t *glyphs, const UINT16 &value, const void *data HB_UNUSED)
 {
   glyphs->add (value);
 }
-static inline void collect_class (hb_set_t *glyphs, const USHORT &value, const void *data)
+static inline void collect_class (hb_set_t *glyphs, const UINT16 &value, const void *data)
 {
   const ClassDef &class_def = *reinterpret_cast(data);
   class_def.add_class (glyphs, value);
 }
-static inline void collect_coverage (hb_set_t *glyphs, const USHORT &value, const void *data)
+static inline void collect_coverage (hb_set_t *glyphs, const UINT16 &value, const void *data)
 {
   const OffsetTo &coverage = (const OffsetTo&)value;
   (data+coverage).add_coverage (glyphs);
@@ -631,7 +631,7 @@
 static inline void collect_array (hb_collect_glyphs_context_t *c HB_UNUSED,
 				  hb_set_t *glyphs,
 				  unsigned int count,
-				  const USHORT values[],
+				  const UINT16 values[],
 				  collect_glyphs_func_t collect_func,
 				  const void *collect_data)
 {
@@ -640,16 +640,16 @@
 }
 
 
-static inline bool match_glyph (hb_codepoint_t glyph_id, const USHORT &value, const void *data HB_UNUSED)
+static inline bool match_glyph (hb_codepoint_t glyph_id, const UINT16 &value, const void *data HB_UNUSED)
 {
   return glyph_id == value;
 }
-static inline bool match_class (hb_codepoint_t glyph_id, const USHORT &value, const void *data)
+static inline bool match_class (hb_codepoint_t glyph_id, const UINT16 &value, const void *data)
 {
   const ClassDef &class_def = *reinterpret_cast(data);
   return class_def.get_class (glyph_id) == value;
 }
-static inline bool match_coverage (hb_codepoint_t glyph_id, const USHORT &value, const void *data)
+static inline bool match_coverage (hb_codepoint_t glyph_id, const UINT16 &value, const void *data)
 {
   const OffsetTo &coverage = (const OffsetTo&)value;
   return (data+coverage).get_coverage (glyph_id) != NOT_COVERED;
@@ -657,7 +657,7 @@
 
 static inline bool would_match_input (hb_would_apply_context_t *c,
 				      unsigned int count, /* Including the first glyph (not matched) */
-				      const USHORT input[], /* Array of input values--start with second glyph */
+				      const UINT16 input[], /* Array of input values--start with second glyph */
 				      match_func_t match_func,
 				      const void *match_data)
 {
@@ -672,7 +672,7 @@
 }
 static inline bool match_input (hb_apply_context_t *c,
 				unsigned int count, /* Including the first glyph (not matched) */
-				const USHORT input[], /* Array of input values--start with second glyph */
+				const UINT16 input[], /* Array of input values--start with second glyph */
 				match_func_t match_func,
 				const void *match_data,
 				unsigned int *end_offset,
@@ -711,7 +711,7 @@
    *   o If two marks want to ligate and they belong to different components of the
    *     same ligature glyph, and said ligature glyph is to be ignored according to
    *     mark-filtering rules, then allow.
-   *     https://github.com/behdad/harfbuzz/issues/545
+   *     https://github.com/harfbuzz/harfbuzz/issues/545
    */
 
   bool is_mark_ligature = _hb_glyph_info_is_mark (&buffer->cur());
@@ -896,7 +896,7 @@
 
 static inline bool match_backtrack (hb_apply_context_t *c,
 				    unsigned int count,
-				    const USHORT backtrack[],
+				    const UINT16 backtrack[],
 				    match_func_t match_func,
 				    const void *match_data,
 				    unsigned int *match_start)
@@ -918,7 +918,7 @@
 
 static inline bool match_lookahead (hb_apply_context_t *c,
 				    unsigned int count,
-				    const USHORT lookahead[],
+				    const UINT16 lookahead[],
 				    match_func_t match_func,
 				    const void *match_data,
 				    unsigned int offset,
@@ -949,9 +949,9 @@
     return_trace (c->check_struct (this));
   }
 
-  USHORT	sequenceIndex;		/* Index into current glyph
+  UINT16	sequenceIndex;		/* Index into current glyph
 					 * sequence--first glyph = 0 */
-  USHORT	lookupListIndex;	/* Lookup to apply to that
+  UINT16	lookupListIndex;	/* Lookup to apply to that
 					 * position--zero--based */
   public:
   DEFINE_SIZE_STATIC (4);
@@ -1002,7 +1002,11 @@
     if (idx == 0 && lookupRecord[i].lookupListIndex == c->lookup_index)
       continue;
 
-    buffer->move_to (match_positions[idx]);
+    if (unlikely (!buffer->move_to (match_positions[idx])))
+      break;
+
+    if (unlikely (buffer->max_ops <= 0))
+      break;
 
     unsigned int orig_len = buffer->backtrack_len () + buffer->lookahead_len ();
     if (!c->recurse (lookupRecord[i].lookupListIndex))
@@ -1108,7 +1112,7 @@
 
 static inline void context_closure_lookup (hb_closure_context_t *c,
 					   unsigned int inputCount, /* Including the first glyph (not matched) */
-					   const USHORT input[], /* Array of input values--start with second glyph */
+					   const UINT16 input[], /* Array of input values--start with second glyph */
 					   unsigned int lookupCount,
 					   const LookupRecord lookupRecord[],
 					   ContextClosureLookupContext &lookup_context)
@@ -1122,7 +1126,7 @@
 
 static inline void context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c,
 						  unsigned int inputCount, /* Including the first glyph (not matched) */
-						  const USHORT input[], /* Array of input values--start with second glyph */
+						  const UINT16 input[], /* Array of input values--start with second glyph */
 						  unsigned int lookupCount,
 						  const LookupRecord lookupRecord[],
 						  ContextCollectGlyphsLookupContext &lookup_context)
@@ -1136,7 +1140,7 @@
 
 static inline bool context_would_apply_lookup (hb_would_apply_context_t *c,
 					       unsigned int inputCount, /* Including the first glyph (not matched) */
-					       const USHORT input[], /* Array of input values--start with second glyph */
+					       const UINT16 input[], /* Array of input values--start with second glyph */
 					       unsigned int lookupCount HB_UNUSED,
 					       const LookupRecord lookupRecord[] HB_UNUSED,
 					       ContextApplyLookupContext &lookup_context)
@@ -1147,7 +1151,7 @@
 }
 static inline bool context_apply_lookup (hb_apply_context_t *c,
 					 unsigned int inputCount, /* Including the first glyph (not matched) */
-					 const USHORT input[], /* Array of input values--start with second glyph */
+					 const UINT16 input[], /* Array of input values--start with second glyph */
 					 unsigned int lookupCount,
 					 const LookupRecord lookupRecord[],
 					 ContextApplyLookupContext &lookup_context)
@@ -1213,11 +1217,11 @@
   }
 
   protected:
-  USHORT	inputCount;		/* Total number of glyphs in input
+  UINT16	inputCount;		/* Total number of glyphs in input
 					 * glyph sequence--includes the first
 					 * glyph */
-  USHORT	lookupCount;		/* Number of LookupRecords */
-  USHORT	inputZ[VAR];		/* Array of match inputs--start with
+  UINT16	lookupCount;		/* Number of LookupRecords */
+  UINT16	inputZ[VAR];		/* Array of match inputs--start with
 					 * second glyph */
   LookupRecord	lookupRecordX[VAR];	/* Array of LookupRecords--in
 					 * design order */
@@ -1357,7 +1361,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of table */
@@ -1450,7 +1454,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 2 */
+  UINT16	format;			/* Format identifier--format = 2 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of table */
@@ -1479,7 +1483,7 @@
       this
     };
     context_closure_lookup (c,
-			    glyphCount, (const USHORT *) (coverageZ + 1),
+			    glyphCount, (const UINT16 *) (coverageZ + 1),
 			    lookupCount, lookupRecord,
 			    lookup_context);
   }
@@ -1496,7 +1500,7 @@
     };
 
     context_collect_glyphs_lookup (c,
-				   glyphCount, (const USHORT *) (coverageZ + 1),
+				   glyphCount, (const UINT16 *) (coverageZ + 1),
 				   lookupCount, lookupRecord,
 				   lookup_context);
   }
@@ -1510,7 +1514,7 @@
       {match_coverage},
       this
     };
-    return_trace (context_would_apply_lookup (c, glyphCount, (const USHORT *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
+    return_trace (context_would_apply_lookup (c, glyphCount, (const UINT16 *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
   }
 
   inline const Coverage &get_coverage (void) const
@@ -1529,7 +1533,7 @@
       {match_coverage},
       this
     };
-    return_trace (context_apply_lookup (c, glyphCount, (const USHORT *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
+    return_trace (context_apply_lookup (c, glyphCount, (const UINT16 *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -1546,10 +1550,10 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 3 */
-  USHORT	glyphCount;		/* Number of glyphs in the input glyph
+  UINT16	format;			/* Format identifier--format = 3 */
+  UINT16	glyphCount;		/* Number of glyphs in the input glyph
 					 * sequence */
-  USHORT	lookupCount;		/* Number of LookupRecords */
+  UINT16	lookupCount;		/* Number of LookupRecords */
   OffsetTo
 		coverageZ[VAR];		/* Array of offsets to Coverage
 					 * table in glyph sequence order */
@@ -1576,7 +1580,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   ContextFormat1	format1;
   ContextFormat2	format2;
   ContextFormat3	format3;
@@ -1606,11 +1610,11 @@
 
 static inline void chain_context_closure_lookup (hb_closure_context_t *c,
 						 unsigned int backtrackCount,
-						 const USHORT backtrack[],
+						 const UINT16 backtrack[],
 						 unsigned int inputCount, /* Including the first glyph (not matched) */
-						 const USHORT input[], /* Array of input values--start with second glyph */
+						 const UINT16 input[], /* Array of input values--start with second glyph */
 						 unsigned int lookaheadCount,
-						 const USHORT lookahead[],
+						 const UINT16 lookahead[],
 						 unsigned int lookupCount,
 						 const LookupRecord lookupRecord[],
 						 ChainContextClosureLookupContext &lookup_context)
@@ -1630,11 +1634,11 @@
 
 static inline void chain_context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c,
 						        unsigned int backtrackCount,
-						        const USHORT backtrack[],
+						        const UINT16 backtrack[],
 						        unsigned int inputCount, /* Including the first glyph (not matched) */
-						        const USHORT input[], /* Array of input values--start with second glyph */
+						        const UINT16 input[], /* Array of input values--start with second glyph */
 						        unsigned int lookaheadCount,
-						        const USHORT lookahead[],
+						        const UINT16 lookahead[],
 						        unsigned int lookupCount,
 						        const LookupRecord lookupRecord[],
 						        ChainContextCollectGlyphsLookupContext &lookup_context)
@@ -1654,11 +1658,11 @@
 
 static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c,
 						     unsigned int backtrackCount,
-						     const USHORT backtrack[] HB_UNUSED,
+						     const UINT16 backtrack[] HB_UNUSED,
 						     unsigned int inputCount, /* Including the first glyph (not matched) */
-						     const USHORT input[], /* Array of input values--start with second glyph */
+						     const UINT16 input[], /* Array of input values--start with second glyph */
 						     unsigned int lookaheadCount,
-						     const USHORT lookahead[] HB_UNUSED,
+						     const UINT16 lookahead[] HB_UNUSED,
 						     unsigned int lookupCount HB_UNUSED,
 						     const LookupRecord lookupRecord[] HB_UNUSED,
 						     ChainContextApplyLookupContext &lookup_context)
@@ -1671,11 +1675,11 @@
 
 static inline bool chain_context_apply_lookup (hb_apply_context_t *c,
 					       unsigned int backtrackCount,
-					       const USHORT backtrack[],
+					       const UINT16 backtrack[],
 					       unsigned int inputCount, /* Including the first glyph (not matched) */
-					       const USHORT input[], /* Array of input values--start with second glyph */
+					       const UINT16 input[], /* Array of input values--start with second glyph */
 					       unsigned int lookaheadCount,
-					       const USHORT lookahead[],
+					       const UINT16 lookahead[],
 					       unsigned int lookupCount,
 					       const LookupRecord lookupRecord[],
 					       ChainContextApplyLookupContext &lookup_context)
@@ -1706,8 +1710,8 @@
   inline void closure (hb_closure_context_t *c, ChainContextClosureLookupContext &lookup_context) const
   {
     TRACE_CLOSURE (this);
-    const HeadlessArrayOf &input = StructAfter > (backtrack);
-    const ArrayOf &lookahead = StructAfter > (input);
+    const HeadlessArrayOf &input = StructAfter > (backtrack);
+    const ArrayOf &lookahead = StructAfter > (input);
     const ArrayOf &lookup = StructAfter > (lookahead);
     chain_context_closure_lookup (c,
 				  backtrack.len, backtrack.array,
@@ -1720,8 +1724,8 @@
   inline void collect_glyphs (hb_collect_glyphs_context_t *c, ChainContextCollectGlyphsLookupContext &lookup_context) const
   {
     TRACE_COLLECT_GLYPHS (this);
-    const HeadlessArrayOf &input = StructAfter > (backtrack);
-    const ArrayOf &lookahead = StructAfter > (input);
+    const HeadlessArrayOf &input = StructAfter > (backtrack);
+    const ArrayOf &lookahead = StructAfter > (input);
     const ArrayOf &lookup = StructAfter > (lookahead);
     chain_context_collect_glyphs_lookup (c,
 					 backtrack.len, backtrack.array,
@@ -1734,8 +1738,8 @@
   inline bool would_apply (hb_would_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
   {
     TRACE_WOULD_APPLY (this);
-    const HeadlessArrayOf &input = StructAfter > (backtrack);
-    const ArrayOf &lookahead = StructAfter > (input);
+    const HeadlessArrayOf &input = StructAfter > (backtrack);
+    const ArrayOf &lookahead = StructAfter > (input);
     const ArrayOf &lookup = StructAfter > (lookahead);
     return_trace (chain_context_would_apply_lookup (c,
 						    backtrack.len, backtrack.array,
@@ -1747,8 +1751,8 @@
   inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY (this);
-    const HeadlessArrayOf &input = StructAfter > (backtrack);
-    const ArrayOf &lookahead = StructAfter > (input);
+    const HeadlessArrayOf &input = StructAfter > (backtrack);
+    const ArrayOf &lookahead = StructAfter > (input);
     const ArrayOf &lookup = StructAfter > (lookahead);
     return_trace (chain_context_apply_lookup (c,
 					      backtrack.len, backtrack.array,
@@ -1761,23 +1765,23 @@
   {
     TRACE_SANITIZE (this);
     if (!backtrack.sanitize (c)) return_trace (false);
-    const HeadlessArrayOf &input = StructAfter > (backtrack);
+    const HeadlessArrayOf &input = StructAfter > (backtrack);
     if (!input.sanitize (c)) return_trace (false);
-    const ArrayOf &lookahead = StructAfter > (input);
+    const ArrayOf &lookahead = StructAfter > (input);
     if (!lookahead.sanitize (c)) return_trace (false);
     const ArrayOf &lookup = StructAfter > (lookahead);
     return_trace (lookup.sanitize (c));
   }
 
   protected:
-  ArrayOf
+  ArrayOf
 		backtrack;		/* Array of backtracking values
 					 * (to be matched before the input
 					 * sequence) */
-  HeadlessArrayOf
+  HeadlessArrayOf
 		inputX;			/* Array of input values (start with
 					 * second glyph) */
-  ArrayOf
+  ArrayOf
 		lookaheadX;		/* Array of lookahead values's (to be
 					 * matched after the input sequence) */
   ArrayOf
@@ -1914,7 +1918,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of table */
@@ -2029,7 +2033,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 2 */
+  UINT16	format;			/* Format identifier--format = 2 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of table */
@@ -2069,9 +2073,9 @@
       {this, this, this}
     };
     chain_context_closure_lookup (c,
-				  backtrack.len, (const USHORT *) backtrack.array,
-				  input.len, (const USHORT *) input.array + 1,
-				  lookahead.len, (const USHORT *) lookahead.array,
+				  backtrack.len, (const UINT16 *) backtrack.array,
+				  input.len, (const UINT16 *) input.array + 1,
+				  lookahead.len, (const UINT16 *) lookahead.array,
 				  lookup.len, lookup.array,
 				  lookup_context);
   }
@@ -2090,9 +2094,9 @@
       {this, this, this}
     };
     chain_context_collect_glyphs_lookup (c,
-					 backtrack.len, (const USHORT *) backtrack.array,
-					 input.len, (const USHORT *) input.array + 1,
-					 lookahead.len, (const USHORT *) lookahead.array,
+					 backtrack.len, (const UINT16 *) backtrack.array,
+					 input.len, (const UINT16 *) input.array + 1,
+					 lookahead.len, (const UINT16 *) lookahead.array,
 					 lookup.len, lookup.array,
 					 lookup_context);
   }
@@ -2109,9 +2113,9 @@
       {this, this, this}
     };
     return_trace (chain_context_would_apply_lookup (c,
-						    backtrack.len, (const USHORT *) backtrack.array,
-						    input.len, (const USHORT *) input.array + 1,
-						    lookahead.len, (const USHORT *) lookahead.array,
+						    backtrack.len, (const UINT16 *) backtrack.array,
+						    input.len, (const UINT16 *) input.array + 1,
+						    lookahead.len, (const UINT16 *) lookahead.array,
 						    lookup.len, lookup.array, lookup_context));
   }
 
@@ -2136,9 +2140,9 @@
       {this, this, this}
     };
     return_trace (chain_context_apply_lookup (c,
-					      backtrack.len, (const USHORT *) backtrack.array,
-					      input.len, (const USHORT *) input.array + 1,
-					      lookahead.len, (const USHORT *) lookahead.array,
+					      backtrack.len, (const UINT16 *) backtrack.array,
+					      input.len, (const UINT16 *) input.array + 1,
+					      lookahead.len, (const UINT16 *) lookahead.array,
 					      lookup.len, lookup.array, lookup_context));
   }
 
@@ -2156,7 +2160,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 3 */
+  UINT16	format;			/* Format identifier--format = 3 */
   OffsetArrayOf
 		backtrack;		/* Array of coverage tables
 					 * in backtracking sequence, in  glyph
@@ -2193,7 +2197,7 @@
 
   protected:
   union {
-  USHORT		format;	/* Format identifier */
+  UINT16		format;	/* Format identifier */
   ChainContextFormat1	format1;
   ChainContextFormat2	format2;
   ChainContextFormat3	format3;
@@ -2230,11 +2234,11 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier. Set to 1. */
-  USHORT	extensionLookupType;	/* Lookup type of subtable referenced
+  UINT16	format;			/* Format identifier. Set to 1. */
+  UINT16	extensionLookupType;	/* Lookup type of subtable referenced
 					 * by ExtensionOffset (i.e. the
 					 * extension subtable). */
-  ULONG		extensionOffset;	/* Offset to the extension subtable,
+  UINT32		extensionOffset;	/* Offset to the extension subtable,
 					 * of lookup type subtable. */
   public:
   DEFINE_SIZE_STATIC (8);
@@ -2272,7 +2276,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   ExtensionFormat1	format1;
   } u;
 };
@@ -2284,9 +2288,6 @@
 
 struct GSUBGPOS
 {
-  static const hb_tag_t GSUBTag	= HB_OT_TAG_GSUB;
-  static const hb_tag_t GPOSTag	= HB_OT_TAG_GPOS;
-
   inline unsigned int get_script_count (void) const
   { return (this+scriptList).len; }
   inline const Tag& get_script_tag (unsigned int i) const
diff -Nru harfbuzz-1.7.1/src/hb-ot-layout-gsub-table.hh harfbuzz-1.7.2/src/hb-ot-layout-gsub-table.hh
--- harfbuzz-1.7.1/src/hb-ot-layout-gsub-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-layout-gsub-table.hh	2017-12-01 18:26:23.000000000 +0000
@@ -44,7 +44,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       /* TODO Switch to range-based API to work around malicious fonts.
-       * https://github.com/behdad/harfbuzz/issues/363 */
+       * https://github.com/harfbuzz/harfbuzz/issues/363 */
       hb_codepoint_t glyph_id = iter.get_glyph ();
       if (c->glyphs->has (glyph_id))
 	c->glyphs->add ((glyph_id + deltaGlyphID) & 0xFFFFu);
@@ -58,7 +58,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       /* TODO Switch to range-based API to work around malicious fonts.
-       * https://github.com/behdad/harfbuzz/issues/363 */
+       * https://github.com/harfbuzz/harfbuzz/issues/363 */
       hb_codepoint_t glyph_id = iter.get_glyph ();
       c->input->add (glyph_id);
       c->output->add ((glyph_id + deltaGlyphID) & 0xFFFFu);
@@ -110,11 +110,11 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of Substitution table */
-  SHORT		deltaGlyphID;		/* Add to original GlyphID to get
+  INT16		deltaGlyphID;		/* Add to original GlyphID to get
 					 * substitute GlyphID */
   public:
   DEFINE_SIZE_STATIC (6);
@@ -130,7 +130,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
 	c->glyphs->add (substitute[iter.get_coverage ()]);
     }
@@ -144,7 +144,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       c->input->add (iter.get_glyph ());
       c->output->add (substitute[iter.get_coverage ()]);
     }
@@ -195,7 +195,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 2 */
+  UINT16	format;			/* Format identifier--format = 2 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of Substitution table */
@@ -249,7 +249,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   SingleSubstFormat1	format1;
   SingleSubstFormat2	format2;
   } u;
@@ -287,7 +287,7 @@
       return_trace (true);
     }
     /* Spec disallows this, but Uniscribe allows it.
-     * https://github.com/behdad/harfbuzz/issues/253 */
+     * https://github.com/harfbuzz/harfbuzz/issues/253 */
     else if (unlikely (count == 0))
     {
       c->buffer->delete_glyph ();
@@ -339,7 +339,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
 	(this+sequence[iter.get_coverage ()]).closure (c);
     }
@@ -400,7 +400,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of Substitution table */
@@ -442,7 +442,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   MultipleSubstFormat1	format1;
   } u;
 };
@@ -461,7 +461,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ())) {
 	const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()];
 	unsigned int count = alt_set.len;
@@ -479,7 +479,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       c->input->add (iter.get_glyph ());
       const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()];
       unsigned int count = alt_set.len;
@@ -552,7 +552,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of Substitution table */
@@ -594,7 +594,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   AlternateSubstFormat1	format1;
   } u;
 };
@@ -792,7 +792,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
 	(this+ligatureSet[iter.get_coverage ()]).closure (c);
     }
@@ -806,7 +806,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       c->input->add (iter.get_glyph ());
       (this+ligatureSet[iter.get_coverage ()]).collect_glyphs (c);
     }
@@ -868,7 +868,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of Substitution table */
@@ -918,7 +918,7 @@
 
   protected:
   union {
-  USHORT		format;		/* Format identifier */
+  UINT16		format;		/* Format identifier */
   LigatureSubstFormat1	format1;
   } u;
 };
@@ -961,7 +961,7 @@
     for (iter.init (this+coverage); iter.more (); iter.next ())
     {
       if (unlikely (iter.get_coverage () >= count))
-        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
+        break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
 	c->glyphs->add (substitute[iter.get_coverage ()]);
     }
@@ -1016,11 +1016,11 @@
 
   unsigned int start_index = 0, end_index = 0;
     if (match_backtrack (c,
-			 backtrack.len, (USHORT *) backtrack.array,
+			 backtrack.len, (UINT16 *) backtrack.array,
 			 match_coverage, this,
 			 &start_index) &&
         match_lookahead (c,
-			 lookahead.len, (USHORT *) lookahead.array,
+			 lookahead.len, (UINT16 *) lookahead.array,
 			 match_coverage, this,
 			 1, &end_index))
     {
@@ -1048,7 +1048,7 @@
   }
 
   protected:
-  USHORT	format;			/* Format identifier--format = 1 */
+  UINT16	format;			/* Format identifier--format = 1 */
   OffsetTo
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of table */
@@ -1082,7 +1082,7 @@
 
   protected:
   union {
-  USHORT				format;		/* Format identifier */
+  UINT16				format;		/* Format identifier */
   ReverseChainSingleSubstFormat1	format1;
   } u;
 };
@@ -1128,7 +1128,7 @@
 
   protected:
   union {
-  USHORT			sub_format;
+  UINT16			sub_format;
   SingleSubst			single;
   MultipleSubst			multiple;
   AlternateSubst		alternate;
@@ -1280,9 +1280,11 @@
     if (unlikely (get_type () == SubstLookupSubTable::Extension))
     {
       /* The spec says all subtables of an Extension lookup should
-       * have the same type.  This is specially important if one has
-       * a reverse type! */
+       * have the same type, which shall not be the Extension type
+       * itself. This is specially important if one has a reverse type! */
       unsigned int type = get_subtable (0).u.extension.get_type ();
+      if (unlikely (type == SubstLookupSubTable::Extension))
+	return_trace (false);
       unsigned int count = get_subtable_count ();
       for (unsigned int i = 1; i < count; i++)
         if (get_subtable (i).u.extension.get_type () != type)
diff -Nru harfbuzz-1.7.1/src/hb-ot-layout-private.hh harfbuzz-1.7.2/src/hb-ot-layout-private.hh
--- harfbuzz-1.7.1/src/hb-ot-layout-private.hh	2017-10-15 12:07:18.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-layout-private.hh	2017-11-20 21:10:35.000000000 +0000
@@ -273,13 +273,13 @@
        * what we do for joiners in Indic-like shapers, but since the
        * FVSes are GC=Mn, we have use a separate bit to remember them.
        * Fixes:
-       * https://github.com/behdad/harfbuzz/issues/234 */
+       * https://github.com/harfbuzz/harfbuzz/issues/234 */
       else if (unlikely (hb_in_range (u, 0x180Bu, 0x180Du))) props |= UPROPS_MASK_HIDDEN;
       /* TAG characters need similar treatment. Fixes:
-       * https://github.com/behdad/harfbuzz/issues/463 */
+       * https://github.com/harfbuzz/harfbuzz/issues/463 */
       else if (unlikely (hb_in_range (u, 0xE0020u, 0xE007Fu))) props |= UPROPS_MASK_HIDDEN;
       /* COMBINING GRAPHEME JOINER should not be skipped; at least some times.
-       * https://github.com/behdad/harfbuzz/issues/554 */
+       * https://github.com/harfbuzz/harfbuzz/issues/554 */
       else if (unlikely (u == 0x034Fu)) props |= UPROPS_MASK_HIDDEN;
     }
     else if (unlikely (HB_UNICODE_GENERAL_CATEGORY_IS_NON_ENCLOSING_MARK_OR_MODIFIER_SYMBOL (gen_cat)))
@@ -305,7 +305,7 @@
       /* Recategorize emoji skin-tone modifiers as Unicode mark, so they
        * behave correctly in non-native directionality.  They originally
        * are MODIFIER_SYMBOL.  Fixes:
-       * https://github.com/behdad/harfbuzz/issues/169
+       * https://github.com/harfbuzz/harfbuzz/issues/169
        */
       if (unlikely (hb_in_range (u, 0x1F3FBu, 0x1F3FFu)))
       {
diff -Nru harfbuzz-1.7.1/src/hb-ot-math-table.hh harfbuzz-1.7.2/src/hb-ot-math-table.hh
--- harfbuzz-1.7.1/src/hb-ot-math-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-math-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -48,7 +48,7 @@
   }
 
   protected:
-  SHORT			value;		/* The X or Y value in design units */
+  INT16			value;		/* The X or Y value in design units */
   OffsetTo	deviceTable;	/* Offset to the device table - from the
 					 * beginning of parent table. May be nullptr.
 					 * Suggested format for device table is 1. */
@@ -154,10 +154,10 @@
   }
 
   protected:
-  SHORT percentScaleDown[2];
-  USHORT minHeight[2];
+  INT16 percentScaleDown[2];
+  UINT16 minHeight[2];
   MathValueRecord mathValueRecords[51];
-  SHORT radicalDegreeBottomRaisePercent;
+  INT16 radicalDegreeBottomRaisePercent;
 
   public:
   DEFINE_SIZE_STATIC (214);
@@ -279,7 +279,7 @@
   }
 
   protected:
-  USHORT	  heightCount;
+  UINT16	  heightCount;
   MathValueRecord mathValueRecords[VAR]; /* Array of correction heights at
 					  * which the kern value changes.
 					  * Sorted by the height value in
@@ -425,7 +425,7 @@
 
   protected:
   GlyphID variantGlyph;       /* Glyph ID for the variant. */
-  USHORT  advanceMeasurement; /* Advance width/height, in design units, of the
+  UINT16  advanceMeasurement; /* Advance width/height, in design units, of the
 			       * variant, in the direction of requested
 			       * glyph extension. */
 
@@ -433,7 +433,7 @@
   DEFINE_SIZE_STATIC (4);
 };
 
-struct PartFlags : USHORT
+struct PartFlags : UINT16
 {
   enum Flags {
     Extender	= 0x0001u, /* If set, the part can be skipped or repeated. */
@@ -473,15 +473,15 @@
 
   protected:
   GlyphID   glyph;		  /* Glyph ID for the part. */
-  USHORT    startConnectorLength; /* Advance width/ height of the straight bar
+  UINT16    startConnectorLength; /* Advance width/ height of the straight bar
 				   * connector material, in design units, is at
 				   * the beginning of the glyph, in the
 				   * direction of the extension. */
-  USHORT    endConnectorLength;   /* Advance width/ height of the straight bar
+  UINT16    endConnectorLength;   /* Advance width/ height of the straight bar
 				   * connector material, in design units, is at
 				   * the end of the glyph, in the direction of
 				   * the extension. */
-  USHORT    fullAdvance;	  /* Full advance width/height for this part,
+  UINT16    fullAdvance;	  /* Full advance width/height for this part,
 				   * in the direction of the extension.
 				   * In design units. */
   PartFlags partFlags;		  /* Part qualifiers. */
@@ -651,7 +651,7 @@
   }
 
   protected:
-  USHORT	     minConnectorOverlap; /* Minimum overlap of connecting
+  UINT16	     minConnectorOverlap; /* Minimum overlap of connecting
 					   * glyphs during glyph construction,
 					   * in design units. */
   OffsetTo vertGlyphCoverage;   /* Offset to Coverage table -
@@ -660,10 +660,10 @@
   OffsetTo horizGlyphCoverage;  /* Offset to Coverage table -
 					   * from the beginning of MathVariants
 					   * table. */
-  USHORT	     vertGlyphCount;      /* Number of glyphs for which
+  UINT16	     vertGlyphCount;      /* Number of glyphs for which
 					   * information is provided for
 					   * vertically growing variants. */
-  USHORT	     horizGlyphCount;     /* Number of glyphs for which
+  UINT16	     horizGlyphCount;     /* Number of glyphs for which
 					   * information is provided for
 					   * horizontally growing variants. */
 
diff -Nru harfbuzz-1.7.1/src/hb-ot-maxp-table.hh harfbuzz-1.7.2/src/hb-ot-maxp-table.hh
--- harfbuzz-1.7.1/src/hb-ot-maxp-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-maxp-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -60,7 +60,7 @@
   protected:
   FixedVersion<>version;		/* Version of the maxp table (0.5 or 1.0),
 					 * 0x00005000u or 0x00010000u. */
-  USHORT	numGlyphs;		/* The number of glyphs in the font. */
+  UINT16	numGlyphs;		/* The number of glyphs in the font. */
   public:
   DEFINE_SIZE_STATIC (6);
 };
diff -Nru harfbuzz-1.7.1/src/hb-ot-name-table.hh harfbuzz-1.7.2/src/hb-ot-name-table.hh
--- harfbuzz-1.7.1/src/hb-ot-name-table.hh	2017-10-30 20:11:54.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-name-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -65,12 +65,12 @@
     return_trace (c->check_struct (this) && c->check_range ((char *) base, (unsigned int) length + offset));
   }
 
-  USHORT	platformID;	/* Platform ID. */
-  USHORT	encodingID;	/* Platform-specific encoding ID. */
-  USHORT	languageID;	/* Language ID. */
-  USHORT	nameID;		/* Name ID. */
-  USHORT	length;		/* String length (in bytes). */
-  USHORT	offset;		/* String offset from start of storage area (in bytes). */
+  UINT16	platformID;	/* Platform ID. */
+  UINT16	encodingID;	/* Platform-specific encoding ID. */
+  UINT16	languageID;	/* Language ID. */
+  UINT16	nameID;		/* Name ID. */
+  UINT16	length;		/* String length (in bytes). */
+  UINT16	offset;		/* String offset from start of storage area (in bytes). */
   public:
   DEFINE_SIZE_STATIC (12);
 };
@@ -123,9 +123,9 @@
   }
 
   /* We only implement format 0 for now. */
-  USHORT	format;			/* Format selector (=0/1). */
-  USHORT	count;			/* Number of name records. */
-  Offset<>	stringOffset;		/* Offset to start of string storage (from start of table). */
+  UINT16	format;			/* Format selector (=0/1). */
+  UINT16	count;			/* Number of name records. */
+  Offset16	stringOffset;		/* Offset to start of string storage (from start of table). */
   NameRecord	nameRecord[VAR];	/* The name records where count is the number of records. */
   public:
   DEFINE_SIZE_ARRAY (6, nameRecord);
diff -Nru harfbuzz-1.7.1/src/hb-ot-os2-table.hh harfbuzz-1.7.2/src/hb-ot-os2-table.hh
--- harfbuzz-1.7.1/src/hb-ot-os2-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-os2-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -50,50 +50,50 @@
   }
 
   public:
-  USHORT	version;
+  UINT16	version;
 
   /* Version 0 */
-  SHORT		xAvgCharWidth;
-  USHORT	usWeightClass;
-  USHORT	usWidthClass;
-  USHORT	fsType;
-  SHORT		ySubscriptXSize;
-  SHORT		ySubscriptYSize;
-  SHORT		ySubscriptXOffset;
-  SHORT		ySubscriptYOffset;
-  SHORT		ySuperscriptXSize;
-  SHORT		ySuperscriptYSize;
-  SHORT		ySuperscriptXOffset;
-  SHORT		ySuperscriptYOffset;
-  SHORT		yStrikeoutSize;
-  SHORT		yStrikeoutPosition;
-  SHORT		sFamilyClass;
-  BYTE		panose[10];
-  ULONG		ulUnicodeRange[4];
+  INT16		xAvgCharWidth;
+  UINT16	usWeightClass;
+  UINT16	usWidthClass;
+  UINT16	fsType;
+  INT16		ySubscriptXSize;
+  INT16		ySubscriptYSize;
+  INT16		ySubscriptXOffset;
+  INT16		ySubscriptYOffset;
+  INT16		ySuperscriptXSize;
+  INT16		ySuperscriptYSize;
+  INT16		ySuperscriptXOffset;
+  INT16		ySuperscriptYOffset;
+  INT16		yStrikeoutSize;
+  INT16		yStrikeoutPosition;
+  INT16		sFamilyClass;
+  UINT8		panose[10];
+  UINT32		ulUnicodeRange[4];
   Tag		achVendID;
-  USHORT	fsSelection;
-  USHORT	usFirstCharIndex;
-  USHORT	usLastCharIndex;
-  SHORT		sTypoAscender;
-  SHORT		sTypoDescender;
-  SHORT		sTypoLineGap;
-  USHORT	usWinAscent;
-  USHORT	usWinDescent;
+  UINT16	fsSelection;
+  UINT16	usFirstCharIndex;
+  UINT16	usLastCharIndex;
+  INT16		sTypoAscender;
+  INT16		sTypoDescender;
+  INT16		sTypoLineGap;
+  UINT16	usWinAscent;
+  UINT16	usWinDescent;
 
   /* Version 1 */
-  //ULONG ulCodePageRange1;
-  //ULONG ulCodePageRange2;
+  //UINT32 ulCodePageRange1;
+  //UINT32 ulCodePageRange2;
 
   /* Version 2 */
-  //SHORT sxHeight;
-  //SHORT sCapHeight;
-  //USHORT  usDefaultChar;
-  //USHORT  usBreakChar;
-  //USHORT  usMaxContext;
+  //INT16 sxHeight;
+  //INT16 sCapHeight;
+  //UINT16  usDefaultChar;
+  //UINT16  usBreakChar;
+  //UINT16  usMaxContext;
 
   /* Version 5 */
-  //USHORT  usLowerOpticalPointSize;
-  //USHORT  usUpperOpticalPointSize;
+  //UINT16  usLowerOpticalPointSize;
+  //UINT16  usUpperOpticalPointSize;
 
   public:
   DEFINE_SIZE_STATIC (78);
diff -Nru harfbuzz-1.7.1/src/hb-ot-post-table.hh harfbuzz-1.7.2/src/hb-ot-post-table.hh
--- harfbuzz-1.7.1/src/hb-ot-post-table.hh	2017-10-31 22:54:31.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-post-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -56,10 +56,10 @@
     return_trace (glyphNameIndex.sanitize (c));
   }
 
-  ArrayOfglyphNameIndex;	/* This is not an offset, but is the
+  ArrayOfglyphNameIndex;	/* This is not an offset, but is the
 					 * ordinal number of the glyph in 'post'
 					 * string tables. */
-  BYTE		namesX[VAR];		/* Glyph names with length bytes [variable]
+  UINT8		namesX[VAR];		/* Glyph names with length bytes [variable]
 					 * (a Pascal string). */
 
   DEFINE_SIZE_ARRAY2 (2, glyphNameIndex, namesX);
@@ -84,8 +84,12 @@
 
   struct accelerator_t
   {
-    inline void init (const post *table, unsigned int post_len)
+    inline void init (hb_face_t *face)
     {
+      blob = Sanitizer::sanitize (face->reference_table (HB_OT_TAG_post));
+      const post *table = Sanitizer::lock_instance (blob);
+      unsigned int table_length = hb_blob_get_length (blob);
+
       version = table->version.to_int ();
       index_to_offset.init ();
       if (version != 0x00020000)
@@ -96,7 +100,7 @@
       glyphNameIndex = &v2.glyphNameIndex;
       pool = &StructAfter (v2.glyphNameIndex);
 
-      const uint8_t *end = (uint8_t *) table + post_len;
+      const uint8_t *end = (uint8_t *) table + table_length;
       for (const uint8_t *data = pool; data < end && data + *data <= end; data += 1 + *data)
       {
 	uint32_t *offset = index_to_offset.push ();
@@ -227,8 +231,10 @@
       return hb_string_t ((const char *) data, name_length);
     }
 
+    private:
+    hb_blob_t *blob;
     uint32_t version;
-    const ArrayOf *glyphNameIndex;
+    const ArrayOf *glyphNameIndex;
     hb_prealloced_array_t index_to_offset;
     const uint8_t *pool;
     mutable uint16_t *gids_sorted_by_name;
@@ -255,16 +261,16 @@
 					 * from the value of this field. */
   FWORD		underlineThickness;	/* Suggested values for the underline
 					   thickness. */
-  ULONG		isFixedPitch;		/* Set to 0 if the font is proportionally
+  UINT32		isFixedPitch;		/* Set to 0 if the font is proportionally
 					 * spaced, non-zero if the font is not
 					 * proportionally spaced (i.e. monospaced). */
-  ULONG		minMemType42;		/* Minimum memory usage when an OpenType font
+  UINT32		minMemType42;		/* Minimum memory usage when an OpenType font
 					 * is downloaded. */
-  ULONG		maxMemType42;		/* Maximum memory usage when an OpenType font
+  UINT32		maxMemType42;		/* Maximum memory usage when an OpenType font
 					 * is downloaded. */
-  ULONG		minMemType1;		/* Minimum memory usage when an OpenType font
+  UINT32		minMemType1;		/* Minimum memory usage when an OpenType font
 					 * is downloaded as a Type 1 font. */
-  ULONG		maxMemType1;		/* Maximum memory usage when an OpenType font
+  UINT32		maxMemType1;		/* Maximum memory usage when an OpenType font
 					 * is downloaded as a Type 1 font. */
 /*postV2Tail	v2[VAR];*/
   DEFINE_SIZE_STATIC (32);
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape.cc harfbuzz-1.7.2/src/hb-ot-shape.cc
--- harfbuzz-1.7.1/src/hb-ot-shape.cc	2017-10-22 21:47:57.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape.cc	2017-11-20 21:10:35.000000000 +0000
@@ -108,7 +108,7 @@
     /* We really want to find a 'vert' feature if there's any in the font, no
      * matter which script/langsys it is listed (or not) under.
      * See various bugs referenced from:
-     * https://github.com/behdad/harfbuzz/issues/63 */
+     * https://github.com/harfbuzz/harfbuzz/issues/63 */
     map->add_feature (HB_TAG ('v','e','r','t'), 1, F_GLOBAL | F_GLOBAL_SEARCH);
   }
 
@@ -817,11 +817,16 @@
 {
   c->buffer->deallocate_var_all ();
   c->buffer->scratch_flags = HB_BUFFER_SCRATCH_FLAG_DEFAULT;
-  if (likely (!_hb_unsigned_int_mul_overflows (c->buffer->len, HB_BUFFER_MAX_EXPANSION_FACTOR)))
+  if (likely (!_hb_unsigned_int_mul_overflows (c->buffer->len, HB_BUFFER_MAX_LEN_FACTOR)))
   {
-    c->buffer->max_len = MAX (c->buffer->len * HB_BUFFER_MAX_EXPANSION_FACTOR,
+    c->buffer->max_len = MAX (c->buffer->len * HB_BUFFER_MAX_LEN_FACTOR,
 			      (unsigned) HB_BUFFER_MAX_LEN_MIN);
   }
+  if (likely (!_hb_unsigned_int_mul_overflows (c->buffer->len, HB_BUFFER_MAX_OPS_FACTOR)))
+  {
+    c->buffer->max_ops = MAX (c->buffer->len * HB_BUFFER_MAX_OPS_FACTOR,
+			      (unsigned) HB_BUFFER_MAX_OPS_MIN);
+  }
 
   bool disable_otl = c->plan->shaper->disable_otl && c->plan->shaper->disable_otl (c->plan);
   //c->fallback_substitute     = disable_otl || !hb_ot_layout_has_substitution (c->face);
@@ -861,6 +866,7 @@
   c->buffer->props.direction = c->target_direction;
 
   c->buffer->max_len = HB_BUFFER_MAX_LEN_DEFAULT;
+  c->buffer->max_ops = HB_BUFFER_MAX_OPS_DEFAULT;
   c->buffer->deallocate_var_all ();
 }
 
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape-complex-arabic.cc harfbuzz-1.7.2/src/hb-ot-shape-complex-arabic.cc
--- harfbuzz-1.7.1/src/hb-ot-shape-complex-arabic.cc	2017-11-14 04:20:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape-complex-arabic.cc	2017-11-20 21:10:35.000000000 +0000
@@ -36,7 +36,7 @@
 #define HB_BUFFER_SCRATCH_FLAG_ARABIC_HAS_STCH HB_BUFFER_SCRATCH_FLAG_COMPLEX0
 
 /* See:
- * https://github.com/behdad/harfbuzz/commit/6e6f82b6f3dde0fc6c3c7d991d9ec6cfff57823d#commitcomment-14248516 */
+ * https://github.com/harfbuzz/harfbuzz/commit/6e6f82b6f3dde0fc6c3c7d991d9ec6cfff57823d#commitcomment-14248516 */
 #define HB_ARABIC_GENERAL_CATEGORY_IS_WORD(gen_cat) \
 	(FLAG_UNSAFE (gen_cat) & \
 	 (FLAG (HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED) | \
@@ -198,7 +198,7 @@
    * pause for Arabic, not other scripts.
    *
    * A pause after calt is required to make KFGQPC Uthmanic Script HAFS
-   * work correctly.  See https://github.com/behdad/harfbuzz/issues/505
+   * work correctly.  See https://github.com/harfbuzz/harfbuzz/issues/505
    */
 
   map->add_gsub_pause (nuke_joiners);
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape-complex-arabic-win1256.hh harfbuzz-1.7.2/src/hb-ot-shape-complex-arabic-win1256.hh
--- harfbuzz-1.7.1/src/hb-ot-shape-complex-arabic-win1256.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape-complex-arabic-win1256.hh	2017-11-16 00:11:43.000000000 +0000
@@ -43,16 +43,16 @@
 #define OT_TABLE_END			}
 #define OT_LABEL_START(Name)		unsigned char Name[
 #define OT_LABEL_END			];
-#define OT_BYTE(u8)			+1/*byte*/
-#define OT_USHORT(u16)			+2/*bytes*/
+#define OT_UINT8(u8)			+1/*byte*/
+#define OT_UINT16(u16)			+2/*bytes*/
 #else
 #undef  OT_MEASURE
 #define OT_TABLE_START			TABLE_NAME = {
 #define OT_TABLE_END			};
 #define OT_LABEL_START(Name)		{
 #define OT_LABEL_END			},
-#define OT_BYTE(u8)			(u8),
-#define OT_USHORT(u16)			(unsigned char)((u16)>>8), (unsigned char)((u16)&0xFFu),
+#define OT_UINT8(u8)			(u8),
+#define OT_UINT16(u16)			(unsigned char)((u16)>>8), (unsigned char)((u16)&0xFFu),
 #define OT_COUNT(Name, ItemSize)	((unsigned int) sizeof(((struct TABLE_NAME*)0)->Name) \
 					 / (unsigned int)(ItemSize) \
 					 /* OT_ASSERT it's divisible (and positive). */)
@@ -80,24 +80,24 @@
  */
 
 #define OT_TAG(a,b,c,d) \
-	OT_BYTE(a) OT_BYTE(b) OT_BYTE(c) OT_BYTE(d)
+	OT_UINT8(a) OT_UINT8(b) OT_UINT8(c) OT_UINT8(d)
 
 #define OT_OFFSET(From, To) /* Offset from From to To in bytes */ \
-	OT_USHORT(OT_DISTANCE(From, To))
+	OT_UINT16(OT_DISTANCE(From, To))
 
 #define OT_GLYPHID /* GlyphID */ \
-	OT_USHORT
+	OT_UINT16
 
 #define OT_UARRAY(Name, Items) \
 	OT_LABEL_START(Name) \
-	OT_USHORT(OT_COUNT(Name##Data, 2)) \
+	OT_UINT16(OT_COUNT(Name##Data, 2)) \
 	OT_LABEL(Name##Data) \
 	Items \
 	OT_LABEL_END
 
 #define OT_UHEADLESSARRAY(Name, Items) \
 	OT_LABEL_START(Name) \
-	OT_USHORT(OT_COUNT(Name##Data, 2) + 1) \
+	OT_UINT16(OT_COUNT(Name##Data, 2) + 1) \
 	OT_LABEL(Name##Data) \
 	Items \
 	OT_LABEL_END
@@ -111,19 +111,19 @@
 
 #define OT_LOOKUP(Name, LookupType, LookupFlag, SubLookupOffsets) \
 	OT_LABEL_START(Name) \
-	OT_USHORT(LookupType) \
-	OT_USHORT(LookupFlag) \
+	OT_UINT16(LookupType) \
+	OT_UINT16(LookupFlag) \
 	OT_LABEL_END \
 	OT_UARRAY(Name##SubLookupOffsetsArray, OT_LIST(SubLookupOffsets))
 
 #define OT_SUBLOOKUP(Name, SubFormat, Items) \
 	OT_LABEL_START(Name) \
-	OT_USHORT(SubFormat) \
+	OT_UINT16(SubFormat) \
 	Items
 
 #define OT_COVERAGE1(Name, Items) \
 	OT_LABEL_START(Name) \
-	OT_USHORT(1) \
+	OT_UINT16(1) \
 	OT_LABEL_END \
 	OT_UARRAY(Name##Glyphs, OT_LIST(Items))
 
@@ -174,7 +174,7 @@
 /* Table manifest. */
 #define MANIFEST(Items) \
 	OT_LABEL_START(manifest) \
-	OT_USHORT(OT_COUNT(manifestData, 6)) \
+	OT_UINT16(OT_COUNT(manifestData, 6)) \
 	OT_LABEL(manifestData) \
 	Items \
 	OT_LABEL_END
@@ -304,8 +304,8 @@
 #undef OT_TABLE_END
 #undef OT_LABEL_START
 #undef OT_LABEL_END
-#undef OT_BYTE
-#undef OT_USHORT
+#undef OT_UINT8
+#undef OT_UINT16
 #undef OT_DISTANCE
 #undef OT_COUNT
 
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape-complex-hebrew.cc harfbuzz-1.7.2/src/hb-ot-shape-complex-hebrew.cc
--- harfbuzz-1.7.1/src/hb-ot-shape-complex-hebrew.cc	2017-10-27 20:42:17.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape-complex-hebrew.cc	2017-11-20 21:10:35.000000000 +0000
@@ -161,7 +161,7 @@
    * script.  This matches Uniscribe better, and makes fonts like
    * Arial that have GSUB/GPOS/GDEF but no data for Hebrew work.
    * See:
-   * https://github.com/behdad/harfbuzz/issues/347#issuecomment-267838368
+   * https://github.com/harfbuzz/harfbuzz/issues/347#issuecomment-267838368
    */
   return plan->map.chosen_script[1] != HB_TAG ('h','e','b','r');
 }
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape-complex-indic.cc harfbuzz-1.7.2/src/hb-ot-shape-complex-indic.cc
--- harfbuzz-1.7.1/src/hb-ot-shape-complex-indic.cc	2017-11-14 04:20:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape-complex-indic.cc	2017-11-20 21:10:35.000000000 +0000
@@ -210,7 +210,7 @@
   }
   else if (unlikely (u == 0x0A51u))
   {
-    /* https://github.com/behdad/harfbuzz/issues/524 */
+    /* https://github.com/harfbuzz/harfbuzz/issues/524 */
     cat = OT_M;
     pos = POS_BELOW_C;
   }
@@ -220,9 +220,10 @@
   else if (unlikely (u == 0x11301u || u == 0x11303u)) cat = OT_SM;
   else if (unlikely (u == 0x1133cu)) cat = OT_N;
 
-  else if (unlikely (u == 0x0AFBu)) cat = OT_N; /* https://github.com/behdad/harfbuzz/issues/552 */
+  else if (unlikely (u == 0x0AFBu)) cat = OT_N; /* https://github.com/harfbuzz/harfbuzz/issues/552 */
 
-  else if (unlikely (u == 0x0980u)) cat = OT_PLACEHOLDER; /* https://github.com/behdad/harfbuzz/issues/538 */
+  else if (unlikely (u == 0x0980u)) cat = OT_PLACEHOLDER; /* https://github.com/harfbuzz/harfbuzz/issues/538 */
+  else if (unlikely (u == 0x0C80u)) cat = OT_PLACEHOLDER; /* https://github.com/harfbuzz/harfbuzz/pull/623 */
   else if (unlikely (u == 0x17C6u)) cat = OT_N; /* Khmer Bindu doesn't like to be repositioned. */
   else if (unlikely (hb_in_range (u, 0x2010u, 0x2011u)))
 				    cat = OT_PLACEHOLDER;
@@ -691,7 +692,7 @@
   const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
   hb_glyph_info_t *info = buffer->info;
 
-  /* https://github.com/behdad/harfbuzz/issues/435#issuecomment-335560167
+  /* https://github.com/harfbuzz/harfbuzz/issues/435#issuecomment-335560167
    * // For compatibility with legacy usage in Kannada,
    * // Ra+h+ZWJ must behave like Ra+ZWJ+h...
    */
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape-complex-indic-private.hh harfbuzz-1.7.2/src/hb-ot-shape-complex-indic-private.hh
--- harfbuzz-1.7.1/src/hb-ot-shape-complex-indic-private.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape-complex-indic-private.hh	2017-11-20 21:10:35.000000000 +0000
@@ -123,7 +123,7 @@
   INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED		= OT_CM,
   INDIC_SYLLABIC_CATEGORY_CONSONANT_SUCCEEDING_REPHA	= OT_N,
   INDIC_SYLLABIC_CATEGORY_CONSONANT_WITH_STACKER	= OT_CS,
-  INDIC_SYLLABIC_CATEGORY_GEMINATION_MARK		= OT_SM, /* https://github.com/behdad/harfbuzz/issues/552 */
+  INDIC_SYLLABIC_CATEGORY_GEMINATION_MARK		= OT_SM, /* https://github.com/harfbuzz/harfbuzz/issues/552 */
   INDIC_SYLLABIC_CATEGORY_INVISIBLE_STACKER		= OT_Coeng,
   INDIC_SYLLABIC_CATEGORY_JOINER			= OT_ZWJ,
   INDIC_SYLLABIC_CATEGORY_MODIFYING_LETTER		= OT_X,
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape-complex-use-machine.rl harfbuzz-1.7.2/src/hb-ot-shape-complex-use-machine.rl
--- harfbuzz-1.7.1/src/hb-ot-shape-complex-use-machine.rl	2017-10-13 10:58:06.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape-complex-use-machine.rl	2017-11-20 21:10:35.000000000 +0000
@@ -90,7 +90,7 @@
 
 
 consonant_modifiers = CMAbv* CMBlw* ((H B | SUB) VS? CMAbv? CMBlw*)*;
-# Override: Allow two MBlw. https://github.com/behdad/harfbuzz/issues/376
+# Override: Allow two MBlw. https://github.com/harfbuzz/harfbuzz/issues/376
 medial_consonants = MPre? MAbv? MBlw?.MBlw? MPst?;
 dependent_vowels = VPre* VAbv* VBlw* VPst*;
 vowel_modifiers = VMPre* VMAbv* VMBlw* VMPst*;
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape-complex-use-table.cc harfbuzz-1.7.2/src/hb-ot-shape-complex-use-table.cc
--- harfbuzz-1.7.1/src/hb-ot-shape-complex-use-table.cc	2017-10-15 10:05:46.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape-complex-use-table.cc	2017-11-21 21:48:40.000000000 +0000
@@ -348,7 +348,14 @@
   /* 2070 */     O,     O,     O,     O,    FM,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 2080 */     O,     O,    FM,    FM,    FM,     O,     O,     O,
 
-#define use_offset_0xa800u 2616
+#define use_offset_0x20f0u 2616
+
+
+  /* Combining Diacritical Marks for Symbols */
+
+  /* 20F0 */ VMAbv,     O,     O,     O,     O,     O,     O,     O,
+
+#define use_offset_0xa800u 2624
 
 
   /* Syloti Nagri */
@@ -370,7 +377,7 @@
   /* A880 */ VMPst, VMPst,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* A890 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* A8A0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
-  /* A8B0 */     B,     B,     B,     B,  FPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,
+  /* A8B0 */     B,     B,     B,     B,  MPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,  VPst,
   /* A8C0 */  VPst,  VPst,  VPst,  VPst,     H, VMAbv,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
   /* A8D0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
@@ -435,7 +442,7 @@
   /* AAE0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,  VPre,  VBlw,  VAbv,  VPre,  VPst,
   /* AAF0 */     O,     O,     O,     O,     O, VMPst,     H,     O,
 
-#define use_offset_0xabc0u 3376
+#define use_offset_0xabc0u 3384
 
 
   /* Meetei Mayek */
@@ -445,14 +452,14 @@
   /* ABE0 */     B,     B,     B,  VPst,  VPst,  VAbv,  VPst,  VPst,  VBlw,  VPst,  VPst,     O, VMPst,  VBlw,     O,     O,
   /* ABF0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0xfe00u 3440
+#define use_offset_0xfe00u 3448
 
 
   /* Variation Selectors */
 
   /* FE00 */    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,    VS,
 
-#define use_offset_0x10a00u 3456
+#define use_offset_0x10a00u 3464
 
 
   /* Kharoshthi */
@@ -463,7 +470,7 @@
   /* 10A30 */     B,     B,     B,     B,     O,     O,     O,     O, CMAbv, CMBlw, CMBlw,     O,     O,     O,     O,     H,
   /* 10A40 */     B,     B,     B,     B,     B,     B,     B,     B,
 
-#define use_offset_0x11000u 3528
+#define use_offset_0x11000u 3536
 
 
   /* Brahmi */
@@ -484,7 +491,7 @@
   /* 110A0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* 110B0 */  VPst,  VPre,  VPst,  VBlw,  VBlw,  VAbv,  VAbv,  VPst,  VPst,     H, CMBlw,     O,     O,     O,     O,     O,
 
-#define use_offset_0x11100u 3720
+#define use_offset_0x11100u 3728
 
 
   /* Chakma */
@@ -522,7 +529,7 @@
   /* 11220 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,  VPst,  VPst,  VPst,  VBlw,
   /* 11230 */  VAbv,  VAbv,  VAbv,  VAbv, VMAbv,     H, CMAbv, CMAbv,     O,     O,     O,     O,     O,     O, VMAbv,     O,
 
-#define use_offset_0x11280u 4040
+#define use_offset_0x11280u 4048
 
 
   /* Multani */
@@ -550,7 +557,7 @@
   /* 11360 */     B,     B,  VPst,  VPst,     O,     O, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv,     O,     O,     O,
   /* 11370 */ VMAbv, VMAbv, VMAbv, VMAbv, VMAbv,     O,     O,     O,
 
-#define use_offset_0x11400u 4288
+#define use_offset_0x11400u 4296
 
 
   /* Newa */
@@ -573,7 +580,7 @@
   /* 114C0 */ VMAbv, VMPst,     H, CMBlw,     B,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 114D0 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0x11580u 4512
+#define use_offset_0x11580u 4520
 
 
   /* Siddham */
@@ -616,7 +623,7 @@
   /* 11720 */  VPst,  VPst,  VAbv,  VAbv,  VBlw,  VBlw,  VPre,  VAbv,  VBlw,  VAbv,  VAbv,  VAbv,     O,     O,     O,     O,
   /* 11730 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,
 
-#define use_offset_0x11a00u 4960
+#define use_offset_0x11a00u 4968
 
 
   /* Zanabazar Square */
@@ -635,7 +642,7 @@
   /* 11A80 */     B,     B,     B,     B,     O,     O,     R,     R,     R,     R,  FBlw,  FBlw,  FBlw,  FBlw,  FBlw,  FBlw,
   /* 11A90 */  FBlw,  FBlw,  FBlw,  FBlw,  FBlw,  FBlw, VMAbv, VMPst, CMAbv,     H,     O,     O,     O,     O,     O,     O,
 
-#define use_offset_0x11c00u 5120
+#define use_offset_0x11c00u 5128
 
 
   /* Bhaiksuki */
@@ -656,7 +663,7 @@
   /* 11CA0 */   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,     O,   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,   SUB,
   /* 11CB0 */  VBlw,  VPre,  VBlw,  VAbv,  VPst, VMAbv, VMAbv,     O,
 
-#define use_offset_0x11d00u 5304
+#define use_offset_0x11d00u 5312
 
 
   /* Masaram Gondi */
@@ -668,7 +675,7 @@
   /* 11D40 */ VMAbv, VMAbv, CMBlw,  VAbv,  VBlw,     H,     R,  MBlw,     O,     O,     O,     O,     O,     O,     O,     O,
   /* 11D50 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
 
-}; /* Table items: 5400; occupancy: 73% */
+}; /* Table items: 5408; occupancy: 73% */
 
 USE_TABLE_ELEMENT_TYPE
 hb_use_get_categories (hb_codepoint_t u)
@@ -694,6 +701,7 @@
     case 0x2u:
       if (hb_in_range (u, 0x2008u, 0x2017u)) return use_table[u - 0x2008u + use_offset_0x2008u];
       if (hb_in_range (u, 0x2060u, 0x2087u)) return use_table[u - 0x2060u + use_offset_0x2060u];
+      if (hb_in_range (u, 0x20F0u, 0x20F7u)) return use_table[u - 0x20F0u + use_offset_0x20f0u];
       if (unlikely (u == 0x25CCu)) return GB;
       break;
 
diff -Nru harfbuzz-1.7.1/src/hb-ot-shape-fallback.cc harfbuzz-1.7.2/src/hb-ot-shape-fallback.cc
--- harfbuzz-1.7.1/src/hb-ot-shape-fallback.cc	2017-11-03 21:18:17.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-shape-fallback.cc	2017-11-21 03:40:47.000000000 +0000
@@ -218,10 +218,10 @@
     case HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW:
     case HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE:
       if (buffer->props.direction == HB_DIRECTION_LTR) {
-	pos.x_offset += base_extents.x_bearing - mark_extents.width / 2 - mark_extents.x_bearing;
+	pos.x_offset += base_extents.x_bearing + base_extents.width - mark_extents.width / 2 - mark_extents.x_bearing;
         break;
       } else if (buffer->props.direction == HB_DIRECTION_RTL) {
-	pos.x_offset += base_extents.x_bearing + base_extents.width - mark_extents.width / 2 - mark_extents.x_bearing;
+	pos.x_offset += base_extents.x_bearing - mark_extents.width / 2 - mark_extents.x_bearing;
         break;
       }
       HB_FALLTHROUGH;
diff -Nru harfbuzz-1.7.1/src/hb-ot-var-avar-table.hh harfbuzz-1.7.2/src/hb-ot-var-avar-table.hh
--- harfbuzz-1.7.1/src/hb-ot-var-avar-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-var-avar-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -133,8 +133,8 @@
   protected:
   FixedVersion<>version;	/* Version of the avar table
 				 * initially set to 0x00010000u */
-  USHORT	reserved;	/* This field is permanently reserved. Set to 0. */
-  USHORT	axisCount;	/* The number of variation axes in the font. This
+  UINT16	reserved;	/* This field is permanently reserved. Set to 0. */
+  UINT16	axisCount;	/* The number of variation axes in the font. This
 				 * must be the same number as axisCount in the
 				 * 'fvar' table. */
   SegmentMaps	axisSegmentMapsZ;
diff -Nru harfbuzz-1.7.1/src/hb-ot-var-fvar-table.hh harfbuzz-1.7.2/src/hb-ot-var-fvar-table.hh
--- harfbuzz-1.7.1/src/hb-ot-var-fvar-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-var-fvar-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -42,11 +42,11 @@
   }
 
   protected:
-  USHORT	subfamilyNameID;/* The name ID for entries in the 'name' table
+  UINT16	subfamilyNameID;/* The name ID for entries in the 'name' table
 				 * that provide subfamily names for this instance. */
-  USHORT	reserved;	/* Reserved for future use — set to 0. */
+  UINT16	reserved;	/* Reserved for future use — set to 0. */
   Fixed		coordinates[VAR];/* The coordinates array for this instance. */
-  //USHORT	postScriptNameIDX;/*Optional. The name ID for entries in the 'name'
+  //UINT16	postScriptNameIDX;/*Optional. The name ID for entries in the 'name'
   //				  * table that provide PostScript names for this
   //				  * instance. */
 
@@ -67,8 +67,8 @@
   Fixed		minValue;	/* The minimum coordinate value for the axis. */
   Fixed		defaultValue;	/* The default coordinate value for the axis. */
   Fixed		maxValue;	/* The maximum coordinate value for the axis. */
-  USHORT	reserved;	/* Reserved for future use — set to 0. */
-  USHORT	axisNameID;	/* The name ID for entries in the 'name' table that
+  UINT16	reserved;	/* Reserved for future use — set to 0. */
+  UINT16	axisNameID;	/* The name ID for entries in the 'name' table that
 				 * provide a display name for this axis. */
 
   public:
@@ -186,16 +186,16 @@
   protected:
   FixedVersion<>version;	/* Version of the fvar table
 				 * initially set to 0x00010000u */
-  Offset<>	things;		/* Offset in bytes from the beginning of the table
+  Offset16	things;		/* Offset in bytes from the beginning of the table
 				 * to the start of the AxisRecord array. */
-  USHORT	reserved;	/* This field is permanently reserved. Set to 2. */
-  USHORT	axisCount;	/* The number of variation axes in the font (the
+  UINT16	reserved;	/* This field is permanently reserved. Set to 2. */
+  UINT16	axisCount;	/* The number of variation axes in the font (the
 				 * number of records in the axes array). */
-  USHORT	axisSize;	/* The size in bytes of each VariationAxisRecord —
+  UINT16	axisSize;	/* The size in bytes of each VariationAxisRecord —
 				 * set to 20 (0x0014) for this version. */
-  USHORT	instanceCount;	/* The number of named instances defined in the font
+  UINT16	instanceCount;	/* The number of named instances defined in the font
 				 * (the number of records in the instances array). */
-  USHORT	instanceSize;	/* The size in bytes of each InstanceRecord — set
+  UINT16	instanceSize;	/* The size in bytes of each InstanceRecord — set
 				 * to either axisCount * sizeof(Fixed) + 4, or to
 				 * axisCount * sizeof(Fixed) + 6. */
 
diff -Nru harfbuzz-1.7.1/src/hb-ot-var-hvar-table.hh harfbuzz-1.7.2/src/hb-ot-var-hvar-table.hh
--- harfbuzz-1.7.1/src/hb-ot-var-hvar-table.hh	2017-10-15 10:10:52.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-var-hvar-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -55,7 +55,7 @@
     unsigned int u = 0;
     { /* Fetch it. */
       unsigned int w = get_width ();
-      const BYTE *p = mapData + w * v;
+      const UINT8 *p = mapData + w * v;
       for (; w; w--)
 	u = (u << 8) + *p++;
     }
@@ -78,10 +78,10 @@
   { return (format & 0xF) + 1; }
 
   protected:
-  USHORT	format;		/* A packed field that describes the compressed
+  UINT16	format;		/* A packed field that describes the compressed
 				 * representation of delta-set indices. */
-  USHORT	mapCount;	/* The number of mapping entries. */
-  BYTE		mapData[VAR];	/* The delta-set index mapping data. */
+  UINT16	mapCount;	/* The number of mapping entries. */
+  UINT8		mapData[VAR];	/* The delta-set index mapping data. */
 
   public:
   DEFINE_SIZE_ARRAY (4, mapData);
diff -Nru harfbuzz-1.7.1/src/hb-ot-var-mvar-table.hh harfbuzz-1.7.2/src/hb-ot-var-mvar-table.hh
--- harfbuzz-1.7.1/src/hb-ot-var-mvar-table.hh	2017-10-29 22:55:48.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ot-var-mvar-table.hh	2017-11-16 00:11:43.000000000 +0000
@@ -43,7 +43,7 @@
 
   public:
   Tag		valueTag;	/* Four-byte tag identifying a font-wide measure. */
-  ULONG		varIdx;		/* Outer/inner index into VariationStore item. */
+  UINT32		varIdx;		/* Outer/inner index into VariationStore item. */
 
   public:
   DEFINE_SIZE_STATIC (8);
@@ -95,13 +95,13 @@
   protected:
   FixedVersion<>version;	/* Version of the metrics variation table
 				 * initially set to 0x00010000u */
-  USHORT	reserved;	/* Not used; set to 0. */
-  USHORT	valueRecordSize;/* The size in bytes of each value record —
+  UINT16	reserved;	/* Not used; set to 0. */
+  UINT16	valueRecordSize;/* The size in bytes of each value record —
 				 * must be greater than zero. */
-  USHORT	valueRecordCount;/* The number of value records — may be zero. */
+  UINT16	valueRecordCount;/* The number of value records — may be zero. */
   OffsetTo
 		varStore;	/* Offset to item variation store table. */
-  BYTE		values[VAR];	/* Array of value records. The records must be
+  UINT8		values[VAR];	/* Array of value records. The records must be
 				 * in binary order of their valueTag field. */
 
   public:
diff -Nru harfbuzz-1.7.1/src/hb-private.hh harfbuzz-1.7.2/src/hb-private.hh
--- harfbuzz-1.7.1/src/hb-private.hh	2017-11-03 21:18:17.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-private.hh	2017-11-20 21:10:35.000000000 +0000
@@ -692,7 +692,7 @@
  * one enum to another...  So this doesn't provide the type-checking that I
  * originally had in mind... :(.
  *
- * For MSVC warnings, see: https://github.com/behdad/harfbuzz/pull/163
+ * For MSVC warnings, see: https://github.com/harfbuzz/harfbuzz/pull/163
  */
 #ifdef _MSC_VER
 # pragma warning(disable:4200)
diff -Nru harfbuzz-1.7.1/src/hb-set-private.hh harfbuzz-1.7.2/src/hb-set-private.hh
--- harfbuzz-1.7.1/src/hb-set-private.hh	2017-10-26 17:33:38.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-set-private.hh	2017-12-02 23:21:42.000000000 +0000
@@ -35,6 +35,9 @@
  * hb_set_t
  */
 
+/* TODO Keep a free-list so we can free pages that are completely zeroed.  At that
+ * point maybe also use a sentinel value for "all-1" pages? */
+
 struct hb_set_t
 {
   struct page_map_t
@@ -47,9 +50,8 @@
 
   struct page_t
   {
-    inline void init (void) {
-      memset (&v, 0, sizeof (v));
-    }
+    inline void init0 (void) { memset (&v, 0, sizeof (v)); }
+    inline void init1 (void) { memset (&v, 0xff, sizeof (v)); }
 
     inline unsigned int len (void) const
     { return ARRAY_LENGTH_CONST (v); }
@@ -66,6 +68,24 @@
     inline void del (hb_codepoint_t g) { elt (g) &= ~mask (g); }
     inline bool has (hb_codepoint_t g) const { return !!(elt (g) & mask (g)); }
 
+    inline void add_range (hb_codepoint_t a, hb_codepoint_t b)
+    {
+     elt_t *la = &elt (a);
+     elt_t *lb = &elt (b);
+     if (la == lb)
+       *la |= (mask (b) << 1) - mask(a);
+     else
+     {
+       *la |= ~(mask (a) - 1);
+       la++;
+
+       memset (la, 0xff, (char *) lb - (char *) la);
+
+       *lb |= ((mask (b) << 1) - 1);
+
+     }
+    }
+
     inline bool is_equal (const page_t *other) const
     {
       return 0 == memcmp (&v, &other->v, sizeof (v));
@@ -196,16 +216,37 @@
     if (unlikely (in_error)) return;
     if (unlikely (g == INVALID)) return;
     page_t *page = page_for_insert (g);
-    if (!page)
-      return;
+    if (unlikely (!page)) return;
     page->add (g);
   }
   inline void add_range (hb_codepoint_t a, hb_codepoint_t b)
   {
-    if (unlikely (in_error)) return;
-    /* TODO Speedup */
-    for (unsigned int i = a; i < b + 1; i++)
-      add (i);
+    if (unlikely (in_error || a > b || a == INVALID || b == INVALID)) return;
+    unsigned int ma = get_major (a);
+    unsigned int mb = get_major (b);
+    if (ma == mb)
+    {
+      page_t *page = page_for_insert (a);
+      if (unlikely (!page)) return;
+      page->add_range (a, b);
+    }
+    else
+    {
+      page_t *page = page_for_insert (a);
+      if (unlikely (!page)) return;
+      page->add_range (a, major_start (ma + 1) - 1);
+
+      for (unsigned int m = ma + 1; m < mb; m++)
+      {
+	page = page_for_insert (major_start (m));
+	if (unlikely (!page)) return;
+	page->init1 ();
+      }
+
+      page = page_for_insert (b);
+      if (unlikely (!page)) return;
+      page->add_range (major_start (mb), b);
+    }
   }
   inline void del (hb_codepoint_t g)
   {
@@ -217,6 +258,7 @@
   }
   inline void del_range (hb_codepoint_t a, hb_codepoint_t b)
   {
+    /* TODO Optimize, like add_range(). */
     if (unlikely (in_error)) return;
     for (unsigned int i = a; i < b + 1; i++)
       del (i);
@@ -433,7 +475,7 @@
 
   static  const hb_codepoint_t INVALID = HB_SET_VALUE_INVALID;
 
-  page_t *page_for_insert (hb_codepoint_t g)
+  inline page_t *page_for_insert (hb_codepoint_t g)
   {
     page_map_t map = {get_major (g), pages.len};
     unsigned int i;
@@ -442,13 +484,13 @@
       if (!resize (pages.len + 1))
 	return nullptr;
 
-      pages[map.index].init ();
+      pages[map.index].init0 ();
       memmove (&page_map[i + 1], &page_map[i], (page_map.len - 1 - i) * sizeof (page_map[0]));
       page_map[i] = map;
     }
     return &pages[page_map[i].index];
   }
-  page_t *page_for (hb_codepoint_t g)
+  inline page_t *page_for (hb_codepoint_t g)
   {
     page_map_t key = {get_major (g)};
     const page_map_t *found = page_map.bsearch (&key);
@@ -456,7 +498,7 @@
       return &pages[found->index];
     return nullptr;
   }
-  const page_t *page_for (hb_codepoint_t g) const
+  inline const page_t *page_for (hb_codepoint_t g) const
   {
     page_map_t key = {get_major (g)};
     const page_map_t *found = page_map.bsearch (&key);
@@ -464,9 +506,10 @@
       return &pages[found->index];
     return nullptr;
   }
-  page_t &page_at (unsigned int i) { return pages[page_map[i].index]; }
-  const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; }
-  unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
+  inline page_t &page_at (unsigned int i) { return pages[page_map[i].index]; }
+  inline const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; }
+  inline unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
+  inline hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; }
 };
 
 
diff -Nru harfbuzz-1.7.1/src/hb-string-array.hh harfbuzz-1.7.2/src/hb-string-array.hh
--- harfbuzz-1.7.1/src/hb-string-array.hh	2017-10-30 18:20:47.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-string-array.hh	2017-11-16 00:11:43.000000000 +0000
@@ -48,7 +48,7 @@
 #include HB_STRING_ARRAY_LIST
 #undef _S
   } st;
-  char str[0];
+  char str[VAR];
 }
 HB_STRING_ARRAY_POOL_NAME =
 {
diff -Nru harfbuzz-1.7.1/src/hb-ucdn/Makefile.in harfbuzz-1.7.2/src/hb-ucdn/Makefile.in
--- harfbuzz-1.7.1/src/hb-ucdn/Makefile.in	2017-11-14 19:13:33.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-ucdn/Makefile.in	2017-12-04 16:53:00.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru harfbuzz-1.7.1/src/hb-unicode-private.hh harfbuzz-1.7.2/src/hb-unicode-private.hh
--- harfbuzz-1.7.1/src/hb-unicode-private.hh	2017-10-19 18:39:42.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-unicode-private.hh	2017-11-20 21:10:35.000000000 +0000
@@ -137,7 +137,7 @@
    * we do NOT want to hide them, as the way Uniscribe has implemented them
    * is with regular spacing glyphs, and that's the way fonts are made to work.
    * As such, we make exceptions for those four.
-   * Also ignoring U+1BCA0..1BCA3. https://github.com/behdad/harfbuzz/issues/503
+   * Also ignoring U+1BCA0..1BCA3. https://github.com/harfbuzz/harfbuzz/issues/503
    *
    * Unicode 7.0:
    * $ grep '; Default_Ignorable_Code_Point ' DerivedCoreProperties.txt | sed 's/;.*#/#/'
diff -Nru harfbuzz-1.7.1/src/hb-version.h harfbuzz-1.7.2/src/hb-version.h
--- harfbuzz-1.7.1/src/hb-version.h	2017-11-14 19:13:40.000000000 +0000
+++ harfbuzz-1.7.2/src/hb-version.h	2017-12-04 16:53:06.000000000 +0000
@@ -38,9 +38,9 @@
 
 #define HB_VERSION_MAJOR 1
 #define HB_VERSION_MINOR 7
-#define HB_VERSION_MICRO 1
+#define HB_VERSION_MICRO 2
 
-#define HB_VERSION_STRING "1.7.1"
+#define HB_VERSION_STRING "1.7.2"
 
 #define HB_VERSION_ATLEAST(major,minor,micro) \
 	((major)*10000+(minor)*100+(micro) <= \
diff -Nru harfbuzz-1.7.1/src/main.cc harfbuzz-1.7.2/src/main.cc
--- harfbuzz-1.7.1/src/main.cc	2017-10-27 21:50:09.000000000 +0000
+++ harfbuzz-1.7.2/src/main.cc	2017-11-16 00:11:43.000000000 +0000
@@ -106,8 +106,8 @@
 
       switch (table.tag) {
 
-      case GSUBGPOS::GSUBTag:
-      case GSUBGPOS::GPOSTag:
+      case HB_OT_TAG_GSUB:
+      case HB_OT_TAG_GPOS:
 	{
 
 	const GSUBGPOS &g = *CastP (font_data + table.offset);
diff -Nru harfbuzz-1.7.1/src/Makefile.am harfbuzz-1.7.2/src/Makefile.am
--- harfbuzz-1.7.1/src/Makefile.am	2017-10-13 10:58:06.000000000 +0000
+++ harfbuzz-1.7.2/src/Makefile.am	2017-11-16 00:11:43.000000000 +0000
@@ -99,6 +99,9 @@
 HBCFLAGS += -I$(srcdir)/hb-ucdn
 HBLIBS   += hb-ucdn/libhb-ucdn.la
 HBSOURCES += $(HB_UCDN_sources)
+hb-ucdn/libhb-ucdn.la: ucdn
+ucdn:
+	@$(MAKE) $(AM_MAKEFLAGS) -C hb-ucdn
 endif
 DIST_SUBDIRS += hb-ucdn
 
@@ -135,9 +138,12 @@
 	-DHB_NDEBUG \
 	-DHB_MAX_NESTING_LEVEL=3 \
 	-DHB_SANITIZE_MAX_EDITS=3 \
-	-DHB_BUFFER_MAX_EXPANSION_FACTOR=3 \
+	-DHB_BUFFER_MAX_LEN_FACTOR=3 \
 	-DHB_BUFFER_MAX_LEN_MIN=8 \
 	-DHB_BUFFER_MAX_LEN_DEFAULT=128 \
+	-DHB_BUFFER_MAX_OPS_FACTOR=8 \
+	-DHB_BUFFER_MAX_OPS_MIN=64 \
+	-DHB_BUFFER_MAX_OPS_DEFAULT=1024 \
 	$(NULL)
 EXTRA_LTLIBRARIES = libharfbuzz-fuzzing.la
 libharfbuzz_fuzzing_la_LINK = $(libharfbuzz_la_LINK)
diff -Nru harfbuzz-1.7.1/src/Makefile.in harfbuzz-1.7.2/src/Makefile.in
--- harfbuzz-1.7.1/src/Makefile.in	2017-11-14 19:13:33.000000000 +0000
+++ harfbuzz-1.7.2/src/Makefile.in	2017-12-04 16:53:00.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1246,9 +1246,12 @@
 	-DHB_NDEBUG \
 	-DHB_MAX_NESTING_LEVEL=3 \
 	-DHB_SANITIZE_MAX_EDITS=3 \
-	-DHB_BUFFER_MAX_EXPANSION_FACTOR=3 \
+	-DHB_BUFFER_MAX_LEN_FACTOR=3 \
 	-DHB_BUFFER_MAX_LEN_MIN=8 \
 	-DHB_BUFFER_MAX_LEN_DEFAULT=128 \
+	-DHB_BUFFER_MAX_OPS_FACTOR=8 \
+	-DHB_BUFFER_MAX_OPS_MIN=64 \
+	-DHB_BUFFER_MAX_OPS_DEFAULT=1024 \
 	$(NULL)
 
 EXTRA_LTLIBRARIES = libharfbuzz-fuzzing.la
@@ -2988,6 +2991,9 @@
 # Convenience targets:
 lib: $(BUILT_SOURCES) libharfbuzz.la
 fuzzing: $(BUILT_SOURCES) libharfbuzz-fuzzing.la
+@HAVE_UCDN_TRUE@hb-ucdn/libhb-ucdn.la: ucdn
+@HAVE_UCDN_TRUE@ucdn:
+@HAVE_UCDN_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) -C hb-ucdn
 @HAVE_GOBJECT_TRUE@hb-gobject-enums.%: hb-gobject-enums.%.tmpl $(HBHEADERS)
 @HAVE_GOBJECT_TRUE@	$(AM_V_GEN) $(GLIB_MKENUMS) \
 @HAVE_GOBJECT_TRUE@		--identifier-prefix hb_ --symbol-prefix hb_gobject \
diff -Nru harfbuzz-1.7.1/test/api/Makefile.in harfbuzz-1.7.2/test/api/Makefile.in
--- harfbuzz-1.7.1/test/api/Makefile.in	2017-11-14 19:13:33.000000000 +0000
+++ harfbuzz-1.7.2/test/api/Makefile.in	2017-12-04 16:53:00.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru harfbuzz-1.7.1/test/api/test-set.c harfbuzz-1.7.2/test/api/test-set.c
--- harfbuzz-1.7.1/test/api/test-set.c	2017-10-26 17:43:25.000000000 +0000
+++ harfbuzz-1.7.2/test/api/test-set.c	2017-12-02 23:13:56.000000000 +0000
@@ -86,6 +86,30 @@
   test_not_empty (s);
   g_assert (!hb_set_has (s, 13));
 
+  hb_set_add_range (s, 200, 800);
+  test_not_empty (s);
+  g_assert (!hb_set_has (s, 100));
+  g_assert (!hb_set_has (s, 199));
+  g_assert (hb_set_has (s, 200));
+  g_assert (hb_set_has (s, 201));
+  g_assert (hb_set_has (s, 243));
+  g_assert (hb_set_has (s, 254));
+  g_assert (hb_set_has (s, 255));
+  g_assert (hb_set_has (s, 256));
+  g_assert (hb_set_has (s, 257));
+  g_assert (hb_set_has (s, 511));
+  g_assert (hb_set_has (s, 512));
+  g_assert (hb_set_has (s, 600));
+  g_assert (hb_set_has (s, 767));
+  g_assert (hb_set_has (s, 768));
+  g_assert (hb_set_has (s, 769));
+  g_assert (hb_set_has (s, 782));
+  g_assert (hb_set_has (s, 798));
+  g_assert (hb_set_has (s, 799));
+  g_assert (hb_set_has (s, 800));
+  g_assert (!hb_set_has (s, 801));
+  g_assert (!hb_set_has (s, 802));
+
   hb_set_destroy (s);
 }
 
@@ -159,7 +183,7 @@
   g_assert (!hb_set_has (s, 13));
   g_assert (hb_set_has (s, 19));
 
-  /* https://github.com/behdad/harfbuzz/issues/579 */
+  /* https://github.com/harfbuzz/harfbuzz/issues/579 */
   hb_set_clear (s);
   test_empty (s);
   hb_set_add_range (s, 886, 895);
diff -Nru harfbuzz-1.7.1/test/fuzzing/Makefile.in harfbuzz-1.7.2/test/fuzzing/Makefile.in
--- harfbuzz-1.7.1/test/fuzzing/Makefile.in	2017-11-14 19:13:34.000000000 +0000
+++ harfbuzz-1.7.2/test/fuzzing/Makefile.in	2017-12-04 16:53:01.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru harfbuzz-1.7.1/test/fuzzing/README harfbuzz-1.7.2/test/fuzzing/README
--- harfbuzz-1.7.1/test/fuzzing/README	2017-10-13 10:58:06.000000000 +0000
+++ harfbuzz-1.7.2/test/fuzzing/README	2017-11-20 21:10:35.000000000 +0000
@@ -18,4 +18,4 @@
 For more details consult the following locations:
   - http://llvm.org/docs/LibFuzzer.html or
   - https://github.com/google/libfuzzer-bot/tree/master/harfbuzz
-  - https://github.com/behdad/harfbuzz/issues/139
+  - https://github.com/harfbuzz/harfbuzz/issues/139
diff -Nru harfbuzz-1.7.1/test/Makefile.in harfbuzz-1.7.2/test/Makefile.in
--- harfbuzz-1.7.1/test/Makefile.in	2017-11-14 19:13:33.000000000 +0000
+++ harfbuzz-1.7.2/test/Makefile.in	2017-12-04 16:53:00.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/16bbf8f4b111c50042261f45449509129d3f9328.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/16bbf8f4b111c50042261f45449509129d3f9328.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/373e67bf41ca264e260a9716162b71a23549e885.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/373e67bf41ca264e260a9716162b71a23549e885.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/81c368a33816fb20e9f647e8f24e2180f4720263.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/81c368a33816fb20e9f647e8f24e2180f4720263.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/8709edb8f55332062f8cbdf4019ead8fda12bdd8.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/8709edb8f55332062f8cbdf4019ead8fda12bdd8.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf differ
Binary files /tmp/tmprHf2ey/_n8nLtHG45/harfbuzz-1.7.1/test/shaping/fonts/sha1sum/ef2511f215aa3ca847cbfffbf861793b42170875.ttf and /tmp/tmprHf2ey/0gzGVlDss9/harfbuzz-1.7.2/test/shaping/fonts/sha1sum/ef2511f215aa3ca847cbfffbf861793b42170875.ttf differ
diff -Nru harfbuzz-1.7.1/test/shaping/Makefile.in harfbuzz-1.7.2/test/shaping/Makefile.in
--- harfbuzz-1.7.1/test/shaping/Makefile.in	2017-11-14 19:13:34.000000000 +0000
+++ harfbuzz-1.7.2/test/shaping/Makefile.in	2017-12-04 16:53:01.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru harfbuzz-1.7.1/test/shaping/tests/fallback-positioning.tests harfbuzz-1.7.2/test/shaping/tests/fallback-positioning.tests
--- harfbuzz-1.7.1/test/shaping/tests/fallback-positioning.tests	2017-11-14 04:20:52.000000000 +0000
+++ harfbuzz-1.7.2/test/shaping/tests/fallback-positioning.tests	2017-11-21 03:43:07.000000000 +0000
@@ -1 +1,2 @@
 fonts/sha1sum/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf::U+0078,U+0301,U+0058,U+0301:[x=0+1030|acutecomb=0@-21,-27+0|X=2+1295|acutecomb=2@-147,320+0]
+fonts/sha1sum/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf::U+0061,U+035C,U+0062:[uni0061=0+512|uni035C=0@-64,-128+0|uni0062=2+512]
diff -Nru harfbuzz-1.7.1/test/shaping/tests/fuzzed.tests harfbuzz-1.7.2/test/shaping/tests/fuzzed.tests
--- harfbuzz-1.7.1/test/shaping/tests/fuzzed.tests	2017-11-14 04:20:52.000000000 +0000
+++ harfbuzz-1.7.2/test/shaping/tests/fuzzed.tests	2017-12-01 18:26:23.000000000 +0000
@@ -6,7 +6,7 @@
 fonts/sha1sum/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf:--font-funcs=ot:U+0041:[gid0=0+1024]
 fonts/sha1sum/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf:--font-funcs=ot:U+0041:[gid0=0+1000|gid1=0+1000|gid8=0+1000|gid3=0+1000|gid0=0+1000|gid1=0+1000|gid1=0+1000|gid8=0+1000|gid3=0+1000|gid0=0+1000|gid1=0+1000|gid8=0+1000|gid3=0+1000|gid0=0+1000|gid1=0+1000|gid1=0+1000]
 fonts/sha1sum/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf:--font-funcs=ot:U+0041:[gid0=0+1000]
-fonts/sha1sum/3511ff5c1647150595846ac414c595cccac34f18.ttf:--font-funcs=ot:U+0041:[gid0=0+1000|gid512=0+1000|gid15104=0+1000|gid11004=0+1000|gid3408=0+1000|gid18244=0+1000|gid17872=0+1000|gid17961=0+1000|gid0=0+1000|gid992=0+1000|gid15616=0+1000|gid0=0+1000|gid14151=0+1000|gid20559=0+1000|gid20992=0+1000|gid5440=0+1000|gid256=0+1000|gid0=0+1000|gid10=0+1000|gid8960=0+1000|gid256=0+1000|gid1024=0+1000|gid1490=0+1000|gid0=0+1000|gid768=0+1000|gid4096=0+1000|gid256=0+1000|gid2216=0+1000|gid0=0+1000|gid256=0+1000|gid256=0+1000|gid0=0+1000|gid768=0+1000|gid10752=0+1000|gid11004=0+1000|gid3408=0+1000|gid18244=0+1000|gid17734=0+1000|gid53248=0+1000|gid256=0+1000|gid0=0+1000|gid512=0+1000|gid14848=0+1000|gid10793=0+1000|gid57344=0+1000|gid768=0+1000|gid18227=0+1000|gid20285=0+1000|gid20480=0+1000|gid0=0+1000|gid256=0+1000|gid0=0+1000|gid810=0+1000|gid0=0+1000|gid11004=0+1000|gid3408=0+1000|gid18244=0+1000|gid17734=0+1000|gid53289=0+1000|gid57344=0+1000|gid768=0+1000|gid15667=0+1000|gid71=0+1000|gid0=0+1000|gid20559=0+1000|gid21248=0+1000|gid256=0+1000|gid0=0+1000|gid2816=0+1000|gid2776=0+1000|gid0=0+1000|gid51516=0+1000|gid0=0+1000|gid32=0+1000|gid26209=0+1000|gid28005=0+1000|gid65249=0+1000|gid29690=0+1000|gid0=0+1000|gid51548=0+1000|gid0=0+1000|gid2454=0+1000|gid28783=0+1000|gid29556=0+1000|gid1291=0+1000|gid3458=0+1000|gid80=0+1000|gid0=0+1000|gid2804=0+1000|gid210=0+1000|gid28786=0+1000|gid25968=0+1000|gid45763=0+1000|gid50546=0+1000|gid0=0+1000|gid59136=0+1000|gid0=0+1000|gid38144=0+1000|gid256=0+1000|gid0=0+1000|gid2560=0+1000|gid30208=0+1000|gid52224=0+1000|gid580=0+1000|gid17996=0+1000|gid21504=0+1000|gid6734=0+1000|gid108=0+1000|gid116=0+1000|gid24846=0+1000|gid1024=0+1000|gid0=0+1000|gid255=0+1000|gid65280=0+1000|gid256=0+1000|gid0=0+1000|gid8704=0+1000|gid1345=0+1000|gid23109=0+1000|gid8192=0+1000|gid10823=0+1000|gid21076=0+1000|gid8192=0+1000|gid12877=0+1000|gid20300=0+1000|gid8192=0+1000|gid6738=0+1000|gid20301=0+1000|gid8192=0+1000|gid16980=0+1000|gid21067=0+1000|gid8251=0+1000|gid18944=0+1000|gid255=0+1000|gid65280=0+1000|gid15360=0+1000|gid256=0+1000|gid255=0+1000|gid65280=0+1000|gid256=0+1000|gid768=0+1000|gid255=0+1000|gid65280=0+1000|gid256=0+1000|gid768=0+1000|gid255=0+1000|gid65280=0+1000|gid256=0+1000|gid1024=0+1000|gid12=0+1000|gid65280=0+1000|gid256=0+1000|gid1280=0+1000|gid255=0+1000|gid65280=0+1000|gid256=0+1000|gid1536=0+1000|gid1899=0+1000|gid25970=0+1000|gid110=0+1000|gid11264=0+1000|gid27502=0+1000|gid29285=0+1000|gid12907=0+1000|gid25974=0+1000|gid28160=0+1000|gid14443=0+1000|gid25970=0+1000|gid28288=0+1000|gid3=0+1000|gid118=0+1000|gid18259=0+1000|gid21826=0+1000|gid45716=0+1000|gid46369=0+1000|gid0=0+1000|gid0=0+1000|gid1=0+1000|gid16=0+1000|gid17=0+1000|gid256=0+1000|gid4=0+1000|gid16=0+1000|gid18244=0+1000|gid17734=0+1000|gid28=0+1000|gid12=0+1000|gid0=0+1000|gid284=0+1000|gid0=0+1000|gid28=0+1000|gid18256=0+1000|gid20307=0+1000|gid45114=0+1000|gid47616=0+1000|gid226=0+1000|gid10296=0+1000|gid0=0+1000|gid57927=0+1000|gid1=0+1000|gid0=0+1000|gid0=0+1000|gid21248=0+1000|gid5440=0+1000|gid256=0+1000|gid0=0+1000|gid10=0+1000|gid768=0+1000|gid256=0+1000|gid1024=0+1000|gid512=0+1000|gid0=0+1000|gid297=0+1000|gid16=0+1000|gid24833=0+1000|gid28774=0+1000|gid10794=0+1000|gid2304=0+1000|gid29=0+1000|gid32=0+1000|gid42=0+1000|gid64515=0+1000|gid42=0+1000|gid42=0+1000|gid64525=0+1000|gid20551=0+1000|gid17477=0+1000|gid18128=0+1000|gid10720=0+1000|gid3=0+1000|gid61=0+1000|gid3408=0+1000|gid18244=0+1000|gid17734=0+1000|gid53289=0+1000|gid57344=0+1000|gid768=0+1000|gid15616=0+1000|gid512=0+1000|gid55=0+1000|gid10576=0+1000|gid20307=0+1000|gid0=0+1000|gid255=0+1000|gid56063=0+1000|gid53504=0+1000|gid42=0+1000|gid42=0+1000|gid64525=0+1000|gid12288=0+1000|gid18176=0+1000|gid80=0+1000|gid20307=0+1000|gid1=0+1000|gid0=0+1000|gid62=0+1000]
+fonts/sha1sum/3511ff5c1647150595846ac414c595cccac34f18.ttf:--font-funcs=ot --no-positions --no-clusters --no-glyph-names:U+0041:[0|512|15104|11004|3408|18244|17872|17961|0|992|15616|0|14151|20559|20992|5440|256|0|10|8960|256|1024|1490|0|768|4096|256|2216|0|256|256|0|768|10752|11004|3408|18244|17734|53248|256|0|512|14848|10793|57344|768|18227|20285|20480|0|256|0|810|0|11004|3408|18244|17734|53289|57344|768|15667|71|0|20559|21248|256|0|2816|2776|0|51516|0|32|26209|28005|65249|29690|0|51548|0|2454|28783|29556|1291|3458|80|0|2804|210|28786|25968|45763|50546|0|59136|0|38144|256|0|2560|30208|52224|580|17996|21504|6734|108|116|24846|1024|0|255|65280|256|0|8704|1345|23109|8192|10823|21076|8192|12877|20300|8192|6738|20301|8192|16980|21067|8251|18944|255|65280|15360|256|255|65280|256|768|255|65280|256|768|255|65280|256|1024|12|65280|256|1280|255|65280|256|1536|1899|25970|110|11264|27502|29285|12907|25974|28160|14443|25970|28288|3|118|18259|21826|45716|46369|0|0|1|16|17|256|4|16|18244|17734|28|12|0|284|0|28|18256|20307|45114|47616|226|10296|0|57927|1|0|0|21248|5440|256|0|10|768|256|1024|512|0|297|16|24833|28774|10794|2304|29|32|42|64515|42|42|64525|20551|17477|18128|10720|3|61|3408|18244|17734|53289|57344|768|15616|512|55|10576|20307|0|255|56063|53504|42|42|64525|12288|18176|80|20307|1|0|62]
 fonts/sha1sum/fab39d60d758cb586db5a504f218442cd1395725.ttf:--font-funcs=ot:U+0041,U+0041:[gid0=0+1000|gid0=1+1000]
 fonts/sha1sum/205edd09bd3d141cc9580f650109556cc28b22cb.ttf:--font-funcs=ot:U+0041:[gid0=0+1000]
 fonts/sha1sum/217a934cfe15c548b572c203dceb2befdf026462.ttf:--font-funcs=ot:U+0061,U+0061,U+0061:[]
@@ -16,3 +16,7 @@
 fonts/sha1sum/b6acef662e0beb8d5fcf5b61c6b0ca69537b7402.ttf:--font-funcs=ot:U+0041:[gid0=0+1000]
 fonts/sha1sum/e88c339237f52d21e01c55f01b9c1b4cc14a0467.ttf:--font-funcs=ot:U+0041:[gid0=0+1000]
 fonts/sha1sum/243798dd281c1c77c065958e1ff467420faa9bde.ttf:--font-funcs=ot:U+0041:[gid0=0+1000]
+fonts/sha1sum/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf:--font-funcs=ot --no-positions --no-clusters --no-glyph-names:U+0041:[0|0|2|0|0|2|0|0|2|0|0|2|0|0|2|0|0|2|0|0|0|2|0|0|0|2|0|0|2|0|0|2|0|0|2|0|0|2|0|0|0|2|0|0|2|0|0|2|0|0|2|0]
+fonts/sha1sum/ef2511f215aa3ca847cbfffbf861793b42170875.ttf:--font-funcs=ot:U+0041:[gid0=0+1000]
+fonts/sha1sum/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf:--font-funcs=ot:U+0041:[gid0=0+1000]
+fonts/sha1sum/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf:--font-funcs=ot:U+0041:[gid0=0+1000]
diff -Nru harfbuzz-1.7.1/test/shaping/tests/indic-syllable.tests harfbuzz-1.7.2/test/shaping/tests/indic-syllable.tests
--- harfbuzz-1.7.1/test/shaping/tests/indic-syllable.tests	2017-10-25 23:30:30.000000000 +0000
+++ harfbuzz-1.7.2/test/shaping/tests/indic-syllable.tests	2017-11-20 21:10:35.000000000 +0000
@@ -5,3 +5,4 @@
 fonts/sha1sum/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf::U+0A15,U+0A51,U+0A47:[kaguru=0+1273|udaatguru=0@75,0+0|eematraguru=0@-40,0+0]
 fonts/sha1sum/1735326da89f0818cd8c51a0600e9789812c0f94.ttf::U+0A51:[uni25CC=0+1044|udaatguru=0+0]
 fonts/sha1sum/1735326da89f0818cd8c51a0600e9789812c0f94.ttf::U+25CC,U+0A51:[uni25CC=0+1044|udaatguru=0+0]
+fonts/sha1sum/81c368a33816fb20e9f647e8f24e2180f4720263.ttf:--no-glyph-names:U+0C80,U+0C82:[1=0+502|2=0+502]
diff -Nru harfbuzz-1.7.1/test/shaping/tests/use-syllable.tests harfbuzz-1.7.2/test/shaping/tests/use-syllable.tests
--- harfbuzz-1.7.1/test/shaping/tests/use-syllable.tests	2017-10-13 10:58:06.000000000 +0000
+++ harfbuzz-1.7.2/test/shaping/tests/use-syllable.tests	2017-11-21 21:48:40.000000000 +0000
@@ -2,3 +2,5 @@
 fonts/sha1sum/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf::U+AA00,U+AA34,U+AA36:[raMedial_cham_pre=0+400|a_cham=0+1121|waMedial_cham=0@-32,0+0]
 fonts/sha1sum/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf::U+AA00,U+AA35,U+AA33:[a_cham=0+1121|laMedial_cham=0@-32,0+0|yaMedial_cham=0+542]
 fonts/sha1sum/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf::U+AA00,U+AA35,U+AA36:[a_cham=0+1121|laMedial_waMedial_cham=0@43,0+0]
+fonts/sha1sum/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf:--no-glyph-names:U+11320,U+20F0,U+11367:[3=0+502|1=0@33,0+0|4=0@300,8+0]
+fonts/sha1sum/373e67bf41ca264e260a9716162b71a23549e885.ttf:--no-glyph-names:U+A8AC,U+A8B4,U+A8B5:[2=0+377|3=0+242|4=0+210]
diff -Nru harfbuzz-1.7.1/util/Makefile.in harfbuzz-1.7.2/util/Makefile.in
--- harfbuzz-1.7.1/util/Makefile.in	2017-11-14 19:13:34.000000000 +0000
+++ harfbuzz-1.7.2/util/Makefile.in	2017-12-04 16:53:01.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru harfbuzz-1.7.1/util/options.cc harfbuzz-1.7.2/util/options.cc
--- harfbuzz-1.7.1/util/options.cc	2017-10-15 10:09:42.000000000 +0000
+++ harfbuzz-1.7.2/util/options.cc	2017-11-21 03:39:37.000000000 +0000
@@ -475,7 +475,7 @@
     case 2: return true;
     default:
       g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
-		   "%s argument should be one to four space-separated numbers",
+		   "%s argument should be one or two space-separated numbers",
 		   name);
       return false;
   }