153 files changed, 776 insertions, 152 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 5b3d9297df5..b6cc1dae8c0 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -21,7 +21,7 @@ gd 2.1.0 - checked 26jun13
 graphite2 1.2.4 - checked 2dec13
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
-harfbuzz 0.9.27 - checked 19mar14
+harfbuzz 0.9.28 - checked 29apr14
   http://www.freedesktop.org/software/harfbuzz/release/
 
 icu 53.1 (release) - checked 3apr14
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 54173efe4da..8500f3a2e66 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import harfbuzz-0.9.28.
+	* version.ac, Makefile.am, include/Makefile.am: Adjust.
+
 2014-03-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import harfbuzz-0.9.27.
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am
index 0f53579e1c6..c961d1af963 100644
--- a/Build/source/libs/harfbuzz/Makefile.am
+++ b/Build/source/libs/harfbuzz/Makefile.am
@@ -65,7 +65,6 @@ libharfbuzz_a_SOURCES =  \
 	@HARFBUZZ_TREE@/src/hb-shaper-impl-private.hh \
 	@HARFBUZZ_TREE@/src/hb-shaper-private.hh \
 	@HARFBUZZ_TREE@/src/hb-shaper.cc \
-	@HARFBUZZ_TREE@/src/hb-tt-font.cc \
 	@HARFBUZZ_TREE@/src/hb-unicode-private.hh \
 	@HARFBUZZ_TREE@/src/hb-unicode.cc \
 	@HARFBUZZ_TREE@/src/hb-utf-private.hh \
@@ -73,6 +72,8 @@ libharfbuzz_a_SOURCES =  \
 
 ## native OpenType Layout backend
 libharfbuzz_a_SOURCES += \
+	@HARFBUZZ_TREE@/src/hb-ot-font.cc \
+	@HARFBUZZ_TREE@/src/hb-ot-font.h \
 	@HARFBUZZ_TREE@/src/hb-ot-layout.cc \
 	@HARFBUZZ_TREE@/src/hb-ot-layout-common-private.hh \
 	@HARFBUZZ_TREE@/src/hb-ot-layout-gdef-table.hh \
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index d994085cd23..71418d94274 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -83,7 +83,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
 	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(srcdir)/config.h.in \
-	$(top_srcdir)/harfbuzz-0.9.27/src/hb-version.h.in \
+	$(top_srcdir)/harfbuzz-0.9.28/src/hb-version.h.in \
 	$(am__dist_check_SCRIPTS_DIST) \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog \
@@ -137,9 +137,9 @@ am_libharfbuzz_a_OBJECTS = @HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-shape.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-shape-plan.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-shaper.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-tt-font.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-unicode.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-warning.$(OBJEXT) \
+	@HARFBUZZ_TREE@/src/hb-ot-font.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-ot-layout.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-ot-map.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-ot-shape.$(OBJEXT) \
@@ -665,11 +665,12 @@ libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-atomic-private.hh \
 	@HARFBUZZ_TREE@/src/hb-shaper-impl-private.hh \
 	@HARFBUZZ_TREE@/src/hb-shaper-private.hh \
 	@HARFBUZZ_TREE@/src/hb-shaper.cc \
-	@HARFBUZZ_TREE@/src/hb-tt-font.cc \
 	@HARFBUZZ_TREE@/src/hb-unicode-private.hh \
 	@HARFBUZZ_TREE@/src/hb-unicode.cc \
 	@HARFBUZZ_TREE@/src/hb-utf-private.hh \
 	@HARFBUZZ_TREE@/src/hb-warning.cc \
+	@HARFBUZZ_TREE@/src/hb-ot-font.cc \
+	@HARFBUZZ_TREE@/src/hb-ot-font.h \
 	@HARFBUZZ_TREE@/src/hb-ot-layout.cc \
 	@HARFBUZZ_TREE@/src/hb-ot-layout-common-private.hh \
 	@HARFBUZZ_TREE@/src/hb-ot-layout-gdef-table.hh \
@@ -777,7 +778,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.27/src/hb-version.h.in
+hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.28/src/hb-version.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-noinstLIBRARIES:
@@ -824,15 +825,15 @@ clean-noinstLIBRARIES:
 @HARFBUZZ_TREE@/src/hb-shaper.$(OBJEXT):  \
 	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
 	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-tt-font.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
 @HARFBUZZ_TREE@/src/hb-unicode.$(OBJEXT):  \
 	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
 	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
 @HARFBUZZ_TREE@/src/hb-warning.$(OBJEXT):  \
 	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
 	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
+@HARFBUZZ_TREE@/src/hb-ot-font.$(OBJEXT):  \
+	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
+	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
 @HARFBUZZ_TREE@/src/hb-ot-layout.$(OBJEXT):  \
 	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
 	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
@@ -915,6 +916,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-icu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-arabic.Po@am__quote@
@@ -935,7 +937,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-tt-font.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po@am__quote@
 
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index db7bee3965e..298206ed172 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 0.9.27.
+# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 0.9.28.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='harfbuzz (TeX Live)'
 PACKAGE_TARNAME='harfbuzz--tex-live-'
-PACKAGE_VERSION='0.9.27'
-PACKAGE_STRING='harfbuzz (TeX Live) 0.9.27'
+PACKAGE_VERSION='0.9.28'
+PACKAGE_STRING='harfbuzz (TeX Live) 0.9.28'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="harfbuzz-0.9.27/src/harfbuzz.pc.in"
+ac_unique_file="harfbuzz-0.9.28/src/harfbuzz.pc.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1324,7 +1324,7 @@ if test "$ac_init_help" = "long"; then
   # 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 (TeX Live) 0.9.27 to adapt to many kinds of systems.
+\`configure' configures harfbuzz (TeX Live) 0.9.28 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1395,7 +1395,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of harfbuzz (TeX Live) 0.9.27:";;
+     short | recursive ) echo "Configuration of harfbuzz (TeX Live) 0.9.28:";;
    esac
   cat <<\_ACEOF
 
@@ -1508,7 +1508,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-harfbuzz (TeX Live) configure 0.9.27
+harfbuzz (TeX Live) configure 0.9.28
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1915,7 +1915,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by harfbuzz (TeX Live) $as_me 0.9.27, which was
+It was created by harfbuzz (TeX Live) $as_me 0.9.28, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3838,7 +3838,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='harfbuzz--tex-live-'
- VERSION='0.9.27'
+ VERSION='0.9.28'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4040,8 +4040,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 HB_VERSION_MAJOR=0
 HB_VERSION_MINOR=9
-HB_VERSION_MICRO=27
-HB_VERSION=0.9.27
+HB_VERSION_MICRO=28
+HB_VERSION=0.9.28
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6408,14 +6408,14 @@ $as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h
 
 fi
 
-HARFBUZZ_TREE=harfbuzz-0.9.27
+HARFBUZZ_TREE=harfbuzz-0.9.28
 
 
 if test -f $srcdir/$HARFBUZZ_TREE/src/hb-version.h; then
   as_fn_error $? "Sorry, you must remove the file $HARFBUZZ_TREE/src/hb-version.h" "$LINENO" 5
 fi
 
-ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.27/src/hb-version.h.in"
+ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.28/src/hb-version.h.in"
 
 
 cat >confcache <<\_ACEOF
@@ -6964,7 +6964,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by harfbuzz (TeX Live) $as_me 0.9.27, which was
+This file was extended by harfbuzz (TeX Live) $as_me 0.9.28, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7030,7 +7030,7 @@ _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 (TeX Live) config.status 0.9.27
+harfbuzz (TeX Live) config.status 0.9.28
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7163,7 +7163,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.27/src/hb-version.h.in" ;;
+    "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.28/src/hb-version.h.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.28-PATCHES/ChangeLog
index 2c94a42dc77..033e1164576 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported harfbuzz-0.9.28 source tree from:
+	  http://www.freedesktop.org/software/harfbuzz/release/
+
 2014-03-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported harfbuzz-0.9.27 source tree from:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-0.9.28-PATCHES/TL-Changes
index a54102d7886..e815451f1f4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27-PATCHES/TL-Changes
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the harfbuzz-0.9.27/ tree as obtained from:
+Changes applied to the harfbuzz-0.9.28/ tree as obtained from:
 	http://www.freedesktop.org/software/harfbuzz/release/
 
 Removed:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/AUTHORS b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/AUTHORS
index c611d7d4769..c611d7d4769 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/AUTHORS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/AUTHORS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/Android.mk b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/Android.mk
index 757d136e509..757d136e509 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/Android.mk
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/Android.mk
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/ChangeLog
index 313b9e3b722..672fb06b14a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/ChangeLog
@@ -1,3 +1,343 @@
+commit 79ecdc3f9525212053d2bc88a5541c41697159da
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 28 14:24:23 2014 -0700
+
+    0.9.28
+
+ NEWS         | 13 +++++++++++++
+ configure.ac |  2 +-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+commit 6faff8e4132197ba06f0e685b82efe35b546cf64
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 28 14:29:39 2014 -0700
+
+    Add static storage classifier to inline functions
+
+    Before we were just relying on the compiler inlining them and not
+    leaving a trace in our public API.  Try to fix.  Hopefully not
+    breaking anyone's build.
+
+ src/hb-open-type-private.hh    | 22 +++++++++++-----------
+ src/hb-ot-layout-gpos-table.hh |  4 ++--
+ src/hb-ot-layout-gsub-table.hh |  6 +++---
+ src/hb-ot-layout-private.hh    | 36 ++++++++++++++++++------------------
+ src/hb-ot-map-private.hh       | 10 +++++-----
+ src/hb-private.hh              |  2 +-
+ 6 files changed, 40 insertions(+), 40 deletions(-)
+
+commit 9c9411839bb89d0a1a83120af0982c60e0e393d9
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 28 12:38:25 2014 -0700
+
+    [tibetan] Reorder PADMA sign to occur after other below marks
+
+    Based on suggestion from Andrew Glass.
+
+    Test: U+0F40,0FC6,0F83
+
+ src/hb-unicode-private.hh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 659cd3c5b470ff9724ce5e53fedd1fea3e7512c4
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 28 12:43:42 2014 -0700
+
+    [test] Add test case for Tibetan sign PADMA
+
+    Currently fails.
+
+ test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt |
+ 1 +
+ 1 file changed, 1 insertion(+)
+
+commit ee703bc3ef740c300718fca7a12c050c322dce19
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 28 12:43:18 2014 -0700
+
+    Reshuffle test data
+
+ test/shaping/texts/in-tree/MANIFEST                      |  3 +++
+ test/shaping/texts/in-tree/shaper-default/MANIFEST       |  3 ---
+ .../texts/in-tree/shaper-default/script-hangul/MANIFEST  |  1 -
+ .../in-tree/shaper-default/script-hangul/misc/MANIFEST   |  1 -
+ .../in-tree/shaper-default/script-hangul/misc/misc.txt   |  4 ----
+ .../texts/in-tree/shaper-default/script-hebrew/MANIFEST  |  1 -
+ .../in-tree/shaper-default/script-hebrew/misc/MANIFEST   |  1 -
+ .../shaper-default/script-hebrew/misc/diacritics.txt     | 16
+ ----------------
+ .../texts/in-tree/shaper-default/script-tibetan/MANIFEST |  1 -
+ .../in-tree/shaper-default/script-tibetan/misc/MANIFEST  |  1 -
+ .../in-tree/shaper-default/script-tibetan/misc/misc.txt  |  1 -
+ .../texts/in-tree/shaper-hangul/script-hangul/MANIFEST   |  1 +
+ .../in-tree/shaper-hangul/script-hangul/misc/MANIFEST    |  1 +
+ .../in-tree/shaper-hangul/script-hangul/misc/misc.txt    |  4 ++++
+ .../texts/in-tree/shaper-hebrew/script-hebrew/MANIFEST   |  1 +
+ .../in-tree/shaper-hebrew/script-hebrew/misc/MANIFEST    |  1 +
+ .../shaper-hebrew/script-hebrew/misc/diacritics.txt      | 16
+ ++++++++++++++++
+ .../texts/in-tree/shaper-tibetan/script-tibetan/MANIFEST |  1 +
+ .../in-tree/shaper-tibetan/script-tibetan/misc/MANIFEST  |  1 +
+ .../in-tree/shaper-tibetan/script-tibetan/misc/misc.txt  |  1 +
+ 20 files changed, 30 insertions(+), 30 deletions(-)
+
+commit b082ef373cefb35dd98b5f2f0b677ccc7806f51e
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Fri Apr 25 11:48:10 2014 -0700
+
+    Typo
+
+ src/hb-ot-shape-complex-indic.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 828e109c7aac3389cc3b89ea1f13388aefb63804
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Fri Apr 18 16:53:34 2014 -0700
+
+    [indic] Fix-up zero-context matching
+
+    commit b5a0f69e47ace468b06e21cf069a18ddcfcf6064
+    Author: Behdad Esfahbod <behdad@behdad.org>
+    Date:   Thu Oct 17 18:04:23 2013 +0200
+
+        [indic] Pass zero-context=false to would_substitute for newer
+        scripts
+
+        For scripts without an old/new spec distinction, use
+        zero-context=false.
+        This changes behavior in Sinhala / Khmer, but doesn't seem
+        to regress.
+        This will be useful and used in Javanese.
+
+    The *intention* was to change zero-context from true to false for
+    scripts that
+    don't have old-vs-new specs.  However, checking the code, looks
+    like we
+    essentially change zero-context to always be true; ie. we only
+    changed things
+    for old-spec, and we broke them.  That's what causes this bug:
+
+      https://bugs.freedesktop.org/show_bug.cgi?id=76705
+
+    The root of the bug is here:
+
+      /* Use zero-context would_substitute() matching for new-spec of
+      the main
+       * Indic scripts, but not for old-spec or scripts with one spec
+       only. */
+      bool zero_context = indic_plan->config->has_old_spec ||
+      !indic_plan->is_old_spec;
+
+    Note that is_old_spec itself is:
+
+      indic_plan->is_old_spec = indic_plan->config->has_old_spec &&
+      ((plan->map.chosen_script[0] & 0x000000FF) != '2');
+
+    It's easy to show that zero_context is now always true.  What we
+    really meant was:
+
+      bool zero_context = indic_plan->config->has_old_spec &&
+      !indic_plan->is_old_spec;
+
+    Ie, "&&" instead of "||".  We made this change supposedly to make
+    Javanese
+    work.  But apparently we got it working regardless!  So I'm going
+    to fix this
+    to only change the logic for old-spec and not touch other cases.
+
+ src/hb-ot-shape-complex-indic.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 66c6a48b6ce9dab6375ba1a23d7e450d6974852a
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 14 15:55:42 2014 -0700
+
+    Add HB_NO_MERGE_CLUSTERS
+
+    Disables any cluster-merging.  Added for testing purposes while
+    we investigate what kind of API to add for this.
+
+ src/hb-buffer.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+commit 897c7b804d6817470a364ba31b1719555b12f751
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Thu Apr 10 16:27:13 2014 -0700
+
+    Add Khmer test for U+17DD
+
+ .../shaper-indic/south-east-asian/script-khmer/misc/other-marks.txt
+ | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 50a00535ccac538bbf93358fd2d2442e4c12542f
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Thu Apr 10 16:03:29 2014 -0700
+
+    Require gobject-introspection 1.34.0
+
+    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=75384
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 5fd996c4a4049a75c6d9e964f1a81c00ff191893
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Apr 9 16:38:26 2014 -0700
+
+    Further adjust check-defs and check-symbols for mipsel
+
+    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=74491
+
+ src/check-defs.sh    | 2 +-
+ src/check-symbols.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 75ec6d0bc5ca0170c73e4d1099a898d38d8f85c0
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Apr 9 16:33:32 2014 -0700
+
+    Tighten up check-static-inits.sh check
+
+    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=74490
+
+ src/check-static-inits.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 110ec0714a11b9417eed82f7d25b85c9dc7b6df4
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Apr 8 17:32:08 2014 -0700
+
+    Typo
+
+ src/hb-blob.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 0682ddd05c22a400ff5ce97d4ea4b52a18b845ae
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Apr 8 16:03:35 2014 -0700
+
+    [indic] Support U+17DD KHMER SIGN ATTHACAN
+
+    As requested by Martin Hosken on the list.
+
+ src/hb-ot-shape-complex-indic.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 05870ed62edd8728d6d732f60d6b7e149d45e6f4
+Author: Primiano Tucci <primiano@chromium.org>
+Date:   Wed Apr 2 11:35:27 2014 +0100
+
+    Use __aarch64__ for 64-bit ARM detection, not __arm64__
+
+    Many GCC versions don't define __arm64__
+
+ src/hb-atomic-private.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 04d894e89795041b2055dc172744a018644f2bca
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Mar 25 12:11:32 2014 -0700
+
+    Minor
+
+ src/hb-ot-layout-gsubgpos-private.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 903648437c180c7b039801cdb0672e0f8e14afd4
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Mar 24 14:26:36 2014 -0700
+
+    Start fleshing out builtin font functions
+
+ src/Makefile.am         |   3 +-
+ src/hb-glib.cc          |   2 +-
+ src/hb-icu.cc           |   2 +-
+ src/hb-ot-font.cc       | 260
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ src/hb-ot-font.h        |  41 ++++++++
+ src/hb-ot-hhea-table.hh |   2 +-
+ src/hb-ot-hmtx-table.hh |   2 +-
+ src/hb-ot.h             |   1 +
+ src/hb-tt-font.cc       |  77 --------------
+ util/Makefile.am        |   4 +-
+ util/options.cc         |   4 +
+ 11 files changed, 314 insertions(+), 84 deletions(-)
+
+commit 343a0e4e747d93eeeb724c5d585f5ba036a0df84
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Fri Mar 21 14:37:27 2014 -0700
+
+    Add "make built-sources"
+
+ src/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit e9853f33d1f53d4d69ee0fa340ce9225a5ed17ca
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Fri Mar 21 12:53:08 2014 -0700
+
+    One more fix for build without gtk-doc
+
+    Fixes https://github.com/behdad/harfbuzz/pull/35
+
+ autogen.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b96af03c20e46105982b3608b608614403540661
+Author: Konstantin Ritt <ritt.ks@gmail.com>
+Date:   Thu Mar 20 16:01:30 2014 +0200
+
+    Fix build with --coretext on iOS
+
+    On iOS CoreText and CoreGraphics are stand-alone frameworks
+
+ configure.ac      | 23 +++++++++++++++++++----
+ src/hb-coretext.h |  8 +++++++-
+ 2 files changed, 26 insertions(+), 5 deletions(-)
+
+commit ea5e8a02eb83ad19f3009b0008893f77ce113118
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Mar 19 15:38:02 2014 -0700
+
+    [util] Plug minor leak
+
+ util/hb-shape.cc     |  6 +++---
+ util/helper-cairo.cc | 21 ++++++++++++---------
+ util/helper-cairo.hh |  2 +-
+ util/options.cc      |  6 +++++-
+ util/options.hh      |  6 +++---
+ 5 files changed, 24 insertions(+), 17 deletions(-)
+
+commit 09732cc6695b8e41ba6cdcd4058a4f7cad90167a
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Mar 19 12:00:17 2014 -0700
+
+    Remove dead warning
+
+ src/hb-unicode.cc |  9 +++++++--
+ src/hb-warning.cc | 11 -----------
+ 2 files changed, 7 insertions(+), 13 deletions(-)
+
+commit b934b0f9d1b39fc7a06c812bea3d79ca5424e278
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Mar 19 11:52:40 2014 -0700
+
+    Yet another try to make build without gtk-doc succeed
+
+ autogen.sh                 | 1 +
+ docs/reference/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+commit a7a5be090dd9cc39605853e8994eb417550939d4
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Mar 19 11:39:23 2014 -0700
+
+    Another try to make gtk-doc optional
+
+ docs/reference/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit ba8c9d92935ea351970a80d0d3441858ad4cf33f
 Author: Dominik Röttsches <dominik.rottsches@intel.com>
 Date:   Tue Mar 18 14:39:03 2014 +0200
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/Makefile.am
index fa8711403d5..fa8711403d5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/NEWS b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/NEWS
index 2d7654c6be2..c2883ae9e65 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/NEWS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/NEWS
@@ -1,3 +1,16 @@
+Overview of changes leading to 0.9.28
+Monday, April 28, 2014
+=====================================
+
+- Unbreak old-spec Indic shaping. (bug 76705)
+- Fix shaping of U+17DD and U+0FC6.
+- Add HB_NO_MERGE_CLUSTERS build option.  NOT to be enabled by default
+  for shipping libraries.  It's an option for further experimentation
+  right now.  When we are sure how to do it properly, we will add
+  public run-time API for the functionality.
+- Build fixes.
+
+
 Overview of changes leading to 0.9.27
 Tuesday, March 18, 2014
 =====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/README b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/README
index 74e739da52a..74e739da52a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/README
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/README
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/THANKS b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/THANKS
index 940cfde5c39..940cfde5c39 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/THANKS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/THANKS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/TODO b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/TODO
index e1aa39c4c01..e1aa39c4c01 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/TODO
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/TODO
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/autogen.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/autogen.sh
index 9f990184754..a267f297b06 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/autogen.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/autogen.sh
@@ -24,6 +24,7 @@ if which gtkdocize ; then
 	gtkdocize --copy || exit 1
 else
 	echo "*** No gtkdocize found, skipping documentation ***"
+	echo "EXTRA_DIST = " > gtk-doc.make
 fi
 
 echo -n "checking for autoreconf... "
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/config.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/config.h.in
index 352a8d24882..352a8d24882 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/config.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/config.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/configure.ac
index 800a6983039..e10fb3444f9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/configure.ac
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [0.9.27],
+        [0.9.28],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
@@ -181,7 +181,7 @@ dnl ===========================================================================
 have_introspection=false
 m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
 	if $have_gobject; then
-		GOBJECT_INTROSPECTION_CHECK([1.32.0])
+		GOBJECT_INTROSPECTION_CHECK([1.34.0])
 		if test "x$found_introspection" = xyes; then
 			have_introspection=true
 		fi
@@ -342,15 +342,30 @@ AC_ARG_WITH(coretext,
 have_coretext=false
 if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then
 	AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <ApplicationServices/ApplicationServices.h>])
+
+	if $have_coretext; then
+		CORETEXT_CFLAGS=
+		CORETEXT_LIBS="-framework ApplicationServices"
+		AC_SUBST(CORETEXT_CFLAGS)
+		AC_SUBST(CORETEXT_LIBS)
+	else
+		# On iOS CoreText and CoreGraphics are stand-alone frameworks
+		if test "x$have_coretext" != "xtrue"; then
+			AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <CoreText/CoreText.h>])
+		fi
+
+		if $have_coretext; then
+			CORETEXT_CFLAGS=
+			CORETEXT_LIBS="-framework CoreText -framework CoreGraphics"
+			AC_SUBST(CORETEXT_CFLAGS)
+			AC_SUBST(CORETEXT_LIBS)
+		fi
+	fi
 fi
 if test "x$with_coretext" = "xyes" -a "x$have_coretext" != "xtrue"; then
 	AC_MSG_ERROR([CoreText support requested but libcoretext not found])
 fi
 if $have_coretext; then
-	CORETEXT_CFLAGS=
-	CORETEXT_LIBS="-framework ApplicationServices"
-	AC_SUBST(CORETEXT_CFLAGS)
-	AC_SUBST(CORETEXT_LIBS)
 	AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text backend])
 fi
 AM_CONDITIONAL(HAVE_CORETEXT, $have_coretext)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/gtk-doc.make b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/gtk-doc.make
index 104c3993f3e..104c3993f3e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/gtk-doc.make
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/gtk-doc.make
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/harfbuzz.doap b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/harfbuzz.doap
index d2896ebefa8..d2896ebefa8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/harfbuzz.doap
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/harfbuzz.doap
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/Makefile.am
index 87d989055e8..e2dd944e67f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/Makefile.am
@@ -51,7 +51,6 @@ HBSOURCES =  \
 	hb-shaper-impl-private.hh \
 	hb-shaper-private.hh \
 	hb-shaper.cc \
-	hb-tt-font.cc \
 	hb-unicode-private.hh \
 	hb-unicode.cc \
 	hb-utf-private.hh \
@@ -76,6 +75,7 @@ HBNODISTHEADERS = \
 
 if HAVE_OT
 HBSOURCES += \
+	hb-ot-font.cc \
 	hb-ot-layout.cc \
 	hb-ot-layout-common-private.hh \
 	hb-ot-layout-gdef-table.hh \
@@ -112,6 +112,7 @@ HBSOURCES += \
 	$(NULL)
 HBHEADERS += \
 	hb-ot.h \
+	hb-ot-font.h \
 	hb-ot-layout.h \
 	hb-ot-shape.h \
 	hb-ot-tag.h \
@@ -284,8 +285,9 @@ arabic-table: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt
 	mv hb-ot-shape-complex-arabic-table.hh.tmp $(srcdir)/hb-ot-shape-complex-arabic-table.hh || \
 	($(RM) hb-ot-shape-complex-arabic-table.hh.tmp; false)
 
+built-sources: $(BUILT_SOURCES)
 
-.PHONY: unicode-tables arabic-table indic-table
+.PHONY: unicode-tables arabic-table indic-table built-sources
 
 BUILT_SOURCES += \
 	hb-buffer-deserialize-json.hh \
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-c-linkage-decls.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-c-linkage-decls.sh
index b10310f5384..b10310f5384 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-c-linkage-decls.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-c-linkage-decls.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-defs.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-defs.sh
index d7a8ec281bf..357347f543a 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-defs.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-defs.sh
@@ -21,7 +21,7 @@ for def in $defs; do
 	lib=`echo "$def" | sed 's/[.]def$//;s@.*/@@'`
 	so=.libs/lib${lib}.so
 
-	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
+	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
 
 	if test -f "$so"; then
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-header-guards.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-header-guards.sh
index 9a3302c7f87..9a3302c7f87 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-header-guards.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-header-guards.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-includes.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-includes.sh
index 5643c6973bc..5643c6973bc 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-includes.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-includes.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-libstdc++.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-libstdc++.sh
index e7e0e295e1a..e7e0e295e1a 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-libstdc++.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-libstdc++.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-static-inits.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-static-inits.sh
index bb0a7ff630d..83d02c8a9bf 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-static-inits.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-static-inits.sh
@@ -30,7 +30,7 @@ done
 
 echo "Checking that no object file has lazy static C++ constructors/destructors or other such stuff"
 for obj in $OBJS; do
-	if objdump -t "$obj" | grep '__c'; then
+	if objdump -t "$obj" | grep '__cxa_'; then
 		echo "Ouch, $obj has lazy static C++ constructors/destructors or other such stuff"
 		stat=1
 	fi
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-symbols.sh
index 67bdf71e1b1..e000b01b863 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/check-symbols.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/check-symbols.sh
@@ -18,7 +18,7 @@ echo "Checking that we are not exposing internal symbols"
 tested=false
 for so in `ls .libs/lib*.so .libs/lib*.dylib 2>/dev/null` ; do
 	
-	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
+	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
 	prefix=`basename "$so" | sed 's/libharfbuzz/hb/; s/-/_/g; s/[.].*//'`
 
 	echo "Processing $so"
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/gen-arabic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/gen-arabic-table.py
index da5a4fcbf5c..da5a4fcbf5c 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/gen-arabic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/gen-arabic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/gen-indic-table.py
index 9ed3fd6d34d..9ed3fd6d34d 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/gen-indic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/gen-indic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/harfbuzz-gobject.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/harfbuzz-gobject.pc.in
index 70083601901..70083601901 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/harfbuzz-gobject.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/harfbuzz-gobject.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/harfbuzz-icu.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/harfbuzz-icu.pc.in
index 949869a3563..949869a3563 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/harfbuzz-icu.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/harfbuzz-icu.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/harfbuzz.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/harfbuzz.pc.in
index 7f27bbbdef0..7f27bbbdef0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/harfbuzz.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/harfbuzz.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-atomic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-atomic-private.hh
index 1c4e1202ec6..60cbcf91be1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-atomic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-atomic-private.hh
@@ -82,7 +82,7 @@ typedef int32_t hb_atomic_int_t;
 #if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100)
 #define hb_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
 #else
-#if __ppc64__ || __x86_64__ || __arm64__
+#if __ppc64__ || __x86_64__ || __aarch64__
 #define hb_atomic_ptr_cmpexch(P,O,N)    OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
 #else
 #define hb_atomic_ptr_cmpexch(P,O,N)    OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P))
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-blob.cc
index d6acca0fca5..d6acca0fca5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-blob.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-blob.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-blob.h
index d3d0f41b11c..e6db3915581 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-blob.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-blob.h
@@ -47,7 +47,7 @@ HB_BEGIN_DECLS
  * - Use MODE_READONLY otherse, unless you really really
  *   really know what you are doing,
  *
- * - MODE_WRITABLE is appropriate if you relaly made a
+ * - MODE_WRITABLE is appropriate if you really made a
  *   copy of data solely for the purpose of passing to
  *   HarfBuzz and doing that just once (no reuse!),
  *
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-deserialize-json.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-deserialize-json.hh
index dead700db82..dead700db82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-deserialize-json.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-deserialize-json.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-deserialize-json.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-deserialize-json.rl
index 7351b2ab47c..7351b2ab47c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-deserialize-json.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-deserialize-json.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-deserialize-text.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-deserialize-text.hh
index a38efe3a415..a38efe3a415 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-deserialize-text.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-deserialize-text.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-deserialize-text.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-deserialize-text.rl
index 8856580fbe3..8856580fbe3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-deserialize-text.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-deserialize-text.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-private.hh
index 3a2b9ab4816..3a2b9ab4816 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-serialize.cc
index 263bc81dc46..263bc81dc46 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer-serialize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer.cc
index d6c6fcb8e6e..76bb10c0c85 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer.cc
@@ -500,6 +500,10 @@ void
 hb_buffer_t::merge_clusters (unsigned int start,
 			     unsigned int end)
 {
+#ifdef HB_NO_MERGE_CLUSTERS
+  return;
+#endif
+
   if (unlikely (end - start < 2))
     return;
 
@@ -528,6 +532,10 @@ void
 hb_buffer_t::merge_out_clusters (unsigned int start,
 				 unsigned int end)
 {
+#ifdef HB_NO_MERGE_CLUSTERS
+  return;
+#endif
+
   if (unlikely (end - start < 2))
     return;
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer.h
index 3086851b012..3086851b012 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-buffer.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-buffer.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-cache-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-cache-private.hh
index 19b70b7e395..19b70b7e395 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-cache-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-cache-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-common.cc
index 96725c4e137..96725c4e137 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-common.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-common.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-common.h
index c8bfd8825a2..c8bfd8825a2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-common.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-common.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-coretext.cc
index 570513667da..570513667da 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-coretext.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-coretext.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-coretext.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-coretext.h
index 607bbbc1e91..837308f31bd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-coretext.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-coretext.h
@@ -29,7 +29,13 @@
 
 #include "hb.h"
 
-#include <ApplicationServices/ApplicationServices.h>
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_IPHONE)
+#  include <CoreText/CoreText.h>
+#  include <CoreGraphics/CoreGraphics.h>
+#else
+#  include <ApplicationServices/ApplicationServices.h>
+#endif
 
 HB_BEGIN_DECLS
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-deprecated.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-deprecated.h
index 30ae4b1caf7..30ae4b1caf7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-deprecated.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-deprecated.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-face-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-face-private.hh
index 6520d3dbdff..6520d3dbdff 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-face-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-face-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-face.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-face.cc
index 71cf49a5bc9..71cf49a5bc9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-face.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-face.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-face.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-face.h
index f682c468de5..f682c468de5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-face.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-face.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-fallback-shape.cc
index ea54bb8e0f0..ea54bb8e0f0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-fallback-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-fallback-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-font-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-font-private.hh
index 33bbf7143a2..33bbf7143a2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-font-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-font-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-font.cc
index fc4c8ebf077..fc4c8ebf077 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-font.h
index 7273db43eda..7273db43eda 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-font.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ft.cc
index 44e0b0bc2a5..44e0b0bc2a5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ft.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ft.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ft.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ft.h
index 696251e143f..696251e143f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ft.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ft.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-glib.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-glib.cc
index c35d9966c26..af43cab7113 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-glib.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-glib.cc
@@ -340,7 +340,7 @@ hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 					 void               *user_data HB_UNUSED)
 {
 #if GLIB_CHECK_VERSION(2,29,12)
-  return g_unichar_fully_decompose (u, TRUE, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN);
+  return g_unichar_fully_decompose (u, true, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN);
 #endif
 
   /* If the user doesn't have GLib >= 2.29.12 we have to perform
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-glib.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-glib.h
index 63a9d3366c5..63a9d3366c5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-glib.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-glib.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject-enums.cc.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject-enums.cc.tmpl
index ca458a3846c..ca458a3846c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject-enums.cc.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject-enums.cc.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject-enums.h.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject-enums.h.tmpl
index 6ecda06c2a6..6ecda06c2a6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject-enums.h.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject-enums.h.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject-structs.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject-structs.cc
index 2451b66291b..2451b66291b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject-structs.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject-structs.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject-structs.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject-structs.h
index 4a88d569e8d..4a88d569e8d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject-structs.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject-structs.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject.h
index ea1bd25df82..ea1bd25df82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-gobject.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-gobject.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-graphite2.cc
index a309ca853bc..a309ca853bc 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-graphite2.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-graphite2.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-graphite2.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-graphite2.h
index 3eae54acbd8..3eae54acbd8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-graphite2.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-graphite2.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-icu.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-icu.cc
index c177be2c4b2..86c8b5cc5a2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-icu.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-icu.cc
@@ -323,7 +323,7 @@ hb_icu_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 
   /* Copy @u into a UTF-16 array to be passed to ICU. */
   len = 0;
-  err = FALSE;
+  err = false;
   U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), u, err);
   if (err)
     return 0;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-icu.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-icu.h
index f2f35f0f2ce..f2f35f0f2ce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-icu.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-icu.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-mutex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-mutex-private.hh
index 0fb21c2e86e..0fb21c2e86e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-mutex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-mutex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-object-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-object-private.hh
index 8a9ae34dbee..8a9ae34dbee 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-object-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-object-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-open-file-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-open-file-private.hh
index 250504ae20b..250504ae20b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-open-file-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-open-file-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-open-type-private.hh
index 558103a8ecc..5a01a81d39b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-open-type-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-open-type-private.hh
@@ -42,36 +42,36 @@ namespace OT {
 
 /* Cast to struct T, reference to reference */
 template<typename Type, typename TObject>
-inline const Type& CastR(const TObject &X)
+static inline const Type& CastR(const TObject &X)
 { return reinterpret_cast<const Type&> (X); }
 template<typename Type, typename TObject>
-inline Type& CastR(TObject &X)
+static inline Type& CastR(TObject &X)
 { return reinterpret_cast<Type&> (X); }
 
 /* Cast to struct T, pointer to pointer */
 template<typename Type, typename TObject>
-inline const Type* CastP(const TObject *X)
+static inline const Type* CastP(const TObject *X)
 { return reinterpret_cast<const Type*> (X); }
 template<typename Type, typename TObject>
-inline Type* CastP(TObject *X)
+static inline Type* CastP(TObject *X)
 { return reinterpret_cast<Type*> (X); }
 
 /* StructAtOffset<T>(P,Ofs) returns the struct T& that is placed at memory
  * location pointed to by P plus Ofs bytes. */
 template<typename Type>
-inline const Type& StructAtOffset(const void *P, unsigned int offset)
+static inline const Type& StructAtOffset(const void *P, unsigned int offset)
 { return * reinterpret_cast<const Type*> ((const char *) P + offset); }
 template<typename Type>
-inline Type& StructAtOffset(void *P, unsigned int offset)
+static inline Type& StructAtOffset(void *P, unsigned int offset)
 { return * reinterpret_cast<Type*> ((char *) P + offset); }
 
 /* StructAfter<T>(X) returns the struct T& that is placed after X.
  * Works with X of variable size also.  X must implement get_size() */
 template<typename Type, typename TObject>
-inline const Type& StructAfter(const TObject &X)
+static inline const Type& StructAfter(const TObject &X)
 { return StructAtOffset<Type>(&X, X.get_size()); }
 template<typename Type, typename TObject>
-inline Type& StructAfter(TObject &X)
+static inline Type& StructAfter(TObject &X)
 { return StructAtOffset<Type>(&X, X.get_size()); }
 
 
@@ -145,7 +145,7 @@ static inline const Type& Null (void) {
 #define DEFINE_NULL_DATA(Type, data) \
 static const char _Null##Type[sizeof (Type) + 1] = data; /* +1 is for nul-termination in data */ \
 template <> \
-inline const Type& Null<Type> (void) { \
+/*static*/ inline const Type& Null<Type> (void) { \
   return *CastP<Type> (_Null##Type); \
 } /* The following line really exists such that we end in a place needing semicolon */ \
 ASSERT_STATIC (Type::min_size + 1 <= sizeof (_Null##Type))
@@ -738,9 +738,9 @@ struct GenericOffsetTo : OffsetType
   }
 };
 template <typename Base, typename OffsetType, typename Type>
-inline const Type& operator + (const Base &base, const GenericOffsetTo<OffsetType, Type> &offset) { return offset (base); }
+static inline const Type& operator + (const Base &base, const GenericOffsetTo<OffsetType, Type> &offset) { return offset (base); }
 template <typename Base, typename OffsetType, typename Type>
-inline Type& operator + (Base &base, GenericOffsetTo<OffsetType, Type> &offset) { return offset (base); }
+static inline Type& operator + (Base &base, GenericOffsetTo<OffsetType, Type> &offset) { return offset (base); }
 
 template <typename Type>
 struct OffsetTo : GenericOffsetTo<Offset, Type> {};
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-font.cc
new file mode 100644
index 00000000000..1a35057ab8d
--- /dev/null
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-font.cc
@@ -0,0 +1,260 @@
+/*
+ * Copyright © 2011,2014  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod, Roozbeh Pournader
+ */
+
+#include "hb-private.hh"
+
+#include "hb-ot.h"
+
+#include "hb-font-private.hh"
+
+#include "hb-ot-hhea-table.hh"
+#include "hb-ot-hmtx-table.hh"
+
+
+
+struct hb_ot_font_t
+{
+  unsigned int num_glyphs;
+  unsigned int num_hmetrics;
+  const OT::hmtx *hmtx;
+  hb_blob_t *hmtx_blob;
+};
+
+
+static hb_ot_font_t *
+_hb_ot_font_create (hb_font_t *font)
+{
+  hb_ot_font_t *ot_font = (hb_ot_font_t *) calloc (1, sizeof (hb_ot_font_t));
+
+  if (unlikely (!ot_font))
+    return NULL;
+
+  ot_font->num_glyphs = font->face->get_num_glyphs ();
+
+  {
+    hb_blob_t *hhea_blob = OT::Sanitizer<OT::hhea>::sanitize (font->face->reference_table (HB_OT_TAG_hhea));
+    const OT::hhea *hhea = OT::Sanitizer<OT::hhea>::lock_instance (hhea_blob);
+    ot_font->num_hmetrics = hhea->numberOfHMetrics;
+    hb_blob_destroy (hhea_blob);
+  }
+  ot_font->hmtx_blob = OT::Sanitizer<OT::hmtx>::sanitize (font->face->reference_table (HB_OT_TAG_hmtx));
+  if (unlikely (!ot_font->num_hmetrics ||
+		2 * (ot_font->num_hmetrics + ot_font->num_glyphs) < hb_blob_get_length (ot_font->hmtx_blob)))
+  {
+    hb_blob_destroy (ot_font->hmtx_blob);
+    free (ot_font);
+    return NULL;
+  }
+
+  ot_font->hmtx = OT::Sanitizer<OT::hmtx>::lock_instance (ot_font->hmtx_blob);
+
+  return ot_font;
+}
+
+static void
+_hb_ot_font_destroy (hb_ot_font_t *ot_font)
+{
+  hb_blob_destroy (ot_font->hmtx_blob);
+
+  free (ot_font);
+}
+
+
+static hb_bool_t
+hb_ot_get_glyph (hb_font_t *font HB_UNUSED,
+		 void *font_data,
+		 hb_codepoint_t unicode,
+		 hb_codepoint_t variation_selector,
+		 hb_codepoint_t *glyph,
+		 void *user_data HB_UNUSED)
+
+{
+#if 0
+  FT_Face ft_face = (FT_Face) font_data;
+
+#ifdef HAVE_FT_FACE_GETCHARVARIANTINDEX
+  if (unlikely (variation_selector)) {
+    *glyph = FT_Face_GetCharVariantIndex (ft_face, unicode, variation_selector);
+    return *glyph != 0;
+  }
+#endif
+
+  *glyph = FT_Get_Char_Index (ft_face, unicode);
+  return *glyph != 0;
+#endif
+  return true;
+}
+
+static hb_position_t
+hb_ot_get_glyph_h_advance (hb_font_t *font,
+			   void *font_data,
+			   hb_codepoint_t glyph,
+			   void *user_data HB_UNUSED)
+{
+  const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
+
+  if (unlikely (glyph >= ot_font->num_glyphs))
+    return 0; /* Maybe better to return notdef's advance instead? */
+
+  if (glyph >= ot_font->num_hmetrics)
+    glyph = ot_font->num_hmetrics - 1;
+
+  return font->em_scale_x (ot_font->hmtx->longHorMetric[glyph].advanceWidth);
+}
+
+static hb_position_t
+hb_ot_get_glyph_v_advance (hb_font_t *font HB_UNUSED,
+			   void *font_data,
+			   hb_codepoint_t glyph,
+			   void *user_data HB_UNUSED)
+{
+  /* TODO */
+  return 0;
+}
+
+static hb_bool_t
+hb_ot_get_glyph_h_origin (hb_font_t *font HB_UNUSED,
+			  void *font_data HB_UNUSED,
+			  hb_codepoint_t glyph HB_UNUSED,
+			  hb_position_t *x HB_UNUSED,
+			  hb_position_t *y HB_UNUSED,
+			  void *user_data HB_UNUSED)
+{
+  /* We always work in the horizontal coordinates. */
+  return true;
+}
+
+static hb_bool_t
+hb_ot_get_glyph_v_origin (hb_font_t *font HB_UNUSED,
+			  void *font_data,
+			  hb_codepoint_t glyph,
+			  hb_position_t *x,
+			  hb_position_t *y,
+			  void *user_data HB_UNUSED)
+{
+  /* TODO */
+  return false;
+}
+
+static hb_position_t
+hb_ot_get_glyph_h_kerning (hb_font_t *font,
+			   void *font_data,
+			   hb_codepoint_t left_glyph,
+			   hb_codepoint_t right_glyph,
+			   void *user_data HB_UNUSED)
+{
+  /* TODO */
+  return 0;
+}
+
+static hb_position_t
+hb_ot_get_glyph_v_kerning (hb_font_t *font HB_UNUSED,
+			   void *font_data HB_UNUSED,
+			   hb_codepoint_t top_glyph HB_UNUSED,
+			   hb_codepoint_t bottom_glyph HB_UNUSED,
+			   void *user_data HB_UNUSED)
+{
+  return 0;
+}
+
+static hb_bool_t
+hb_ot_get_glyph_extents (hb_font_t *font HB_UNUSED,
+			 void *font_data,
+			 hb_codepoint_t glyph,
+			 hb_glyph_extents_t *extents,
+			 void *user_data HB_UNUSED)
+{
+  /* TODO */
+  return false;
+}
+
+static hb_bool_t
+hb_ot_get_glyph_contour_point (hb_font_t *font HB_UNUSED,
+			       void *font_data,
+			       hb_codepoint_t glyph,
+			       unsigned int point_index,
+			       hb_position_t *x,
+			       hb_position_t *y,
+			       void *user_data HB_UNUSED)
+{
+  /* TODO */
+  return false;
+}
+
+static hb_bool_t
+hb_ot_get_glyph_name (hb_font_t *font HB_UNUSED,
+		      void *font_data,
+		      hb_codepoint_t glyph,
+		      char *name, unsigned int size,
+		      void *user_data HB_UNUSED)
+{
+  /* TODO */
+  return false;
+}
+
+static hb_bool_t
+hb_ot_get_glyph_from_name (hb_font_t *font HB_UNUSED,
+			   void *font_data,
+			   const char *name, int len, /* -1 means nul-terminated */
+			   hb_codepoint_t *glyph,
+			   void *user_data HB_UNUSED)
+{
+  /* TODO */
+  return false;
+}
+
+
+static hb_font_funcs_t *
+_hb_ot_get_font_funcs (void)
+{
+  static const hb_font_funcs_t ot_ffuncs = {
+    HB_OBJECT_HEADER_STATIC,
+
+    true, /* immutable */
+
+    {
+#define HB_FONT_FUNC_IMPLEMENT(name) hb_ot_get_##name,
+      HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_FONT_FUNC_IMPLEMENT
+    }
+  };
+
+  return const_cast<hb_font_funcs_t *> (&ot_ffuncs);
+}
+
+
+void
+hb_ot_font_set_funcs (hb_font_t *font)
+{
+  hb_ot_font_t *ot_font = _hb_ot_font_create (font);
+  if (unlikely (!ot_font))
+    return;
+
+  hb_font_set_funcs (font,
+		     _hb_ot_get_font_funcs (),
+		     ot_font,
+		     (hb_destroy_func_t) _hb_ot_font_destroy);
+}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-tt-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-font.h
index 2233a4f1d51..7a8c04ac33d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-tt-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-font.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011  Google, Inc.
+ * Copyright © 2014  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -21,57 +21,21 @@
  * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
- * Google Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod, Roozbeh Pournader
  */
 
-#include "hb-font-private.hh" /* Shall be first since may include windows.h */
+#ifndef HB_OT_FONT_H
+#define HB_OT_FONT_H
 
-#include "hb-open-type-private.hh"
+#include "hb.h"
 
-#include "hb-ot-hhea-table.hh"
-#include "hb-ot-hmtx-table.hh"
+HB_BEGIN_DECLS
 
-#include <string.h>
 
+void
+hb_ot_font_set_funcs (hb_font_t *font);
 
 
-#if 0
-struct hb_tt_font_t
-{
-  const struct hhea *hhea;
-  hb_blob_t *hhea_blob;
-};
+HB_END_DECLS
 
-
-static hb_tt_font_t *
-_hb_tt_font_create (hb_font_t *font)
-{
-  /* TODO Remove this object altogether */
-  hb_tt_font_t *tt = (hb_tt_font_t *) calloc (1, sizeof (hb_tt_font_t));
-
-  tt->hhea_blob = Sanitizer<hhea>::sanitize (font->face->reference_table (HB_OT_TAG_hhea));
-  tt->hhea = Sanitizer<hhea>::lock_instance (tt->hhea_blob);
-
-  return tt;
-}
-
-static void
-_hb_tt_font_destroy (hb_tt_font_t *tt)
-{
-  hb_blob_destroy (tt->hhea_blob);
-
-  free (tt);
-}
-
-static inline const hhea&
-_get_hhea (hb_face_t *face)
-{
-  return likely (face->tt && face->tt->hhea) ? *face->tt->hhea : Null(hhea);
-}
-
-
-/*
- * hb_tt_font_funcs_t
- */
-
-#endif
+#endif /* HB_OT_FONT_H */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-head-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-head-table.hh
index 0285f0cf310..0285f0cf310 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-head-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-head-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-hhea-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-hhea-table.hh
index 611de8a6665..f34bd26053a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-hhea-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-hhea-table.hh
@@ -49,7 +49,7 @@ struct hhea
     return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1));
   }
 
-  protected:
+  public:
   FixedVersion	version;		/* 0x00010000 for version 1.0. */
   FWORD		ascender;		/* Typographic ascent. <a
 					 * href="http://developer.apple.com/fonts/TTRefMan/RM06/Chap6hhea.html">
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-hmtx-table.hh
index d107cf990a2..e918e3b3f40 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-hmtx-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-hmtx-table.hh
@@ -59,7 +59,7 @@ struct hmtx
     return TRACE_RETURN (true);
   }
 
-  protected:
+  public:
   LongHorMetric	longHorMetric[VAR];	/* Paired advance width and left side
 					 * bearing values for each glyph. The
 					 * value numOfHMetrics comes from
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-common-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-common-private.hh
index 02d0d0f87c7..02d0d0f87c7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-common-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-common-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-gdef-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-gdef-table.hh
index 389cbb9e398..389cbb9e398 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-gdef-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-gdef-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-gpos-table.hh
index 7c0a4ea6667..91e1f8b0019 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-gpos-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-gpos-table.hh
@@ -1608,14 +1608,14 @@ GPOS::position_finish (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer)
 /* Out-of-class implementation for methods recursing */
 
 template <typename context_t>
-inline typename context_t::return_t PosLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index)
+/*static*/ inline typename context_t::return_t PosLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index)
 {
   const GPOS &gpos = *(hb_ot_layout_from_face (c->face)->gpos);
   const PosLookup &l = gpos.get_lookup (lookup_index);
   return l.dispatch (c);
 }
 
-inline bool PosLookup::apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index)
+/*static*/ inline bool PosLookup::apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index)
 {
   const GPOS &gpos = *(hb_ot_layout_from_face (c->face)->gpos);
   const PosLookup &l = gpos.get_lookup (lookup_index);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-gsub-table.hh
index 76b4f33c705..3a1a0ef3dd7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-gsub-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-gsub-table.hh
@@ -1338,7 +1338,7 @@ GSUB::substitute_finish (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer HB_UNUSE
 
 /* Out-of-class implementation for methods recursing */
 
-inline bool ExtensionSubst::is_reverse (void) const
+/*static*/ inline bool ExtensionSubst::is_reverse (void) const
 {
   unsigned int type = get_type ();
   if (unlikely (type == SubstLookupSubTable::Extension))
@@ -1347,14 +1347,14 @@ inline bool ExtensionSubst::is_reverse (void) const
 }
 
 template <typename context_t>
-inline typename context_t::return_t SubstLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index)
+/*static*/ inline typename context_t::return_t SubstLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index)
 {
   const GSUB &gsub = *(hb_ot_layout_from_face (c->face)->gsub);
   const SubstLookup &l = gsub.get_lookup (lookup_index);
   return l.dispatch (c);
 }
 
-inline bool SubstLookup::apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index)
+/*static*/ inline bool SubstLookup::apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index)
 {
   const GSUB &gsub = *(hb_ot_layout_from_face (c->face)->gsub);
   const SubstLookup &l = gsub.get_lookup (lookup_index);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-gsubgpos-private.hh
index bdd773e36b9..cd27c05b007 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-gsubgpos-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-gsubgpos-private.hh
@@ -882,6 +882,7 @@ static inline void ligate_input (hb_apply_context_t *c,
 	break;
     }
   }
+  TRACE_RETURN (true);
 }
 
 static inline bool match_backtrack (hb_apply_context_t *c,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-jstf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-jstf-table.hh
index 79eb859566a..79eb859566a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-jstf-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-jstf-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-private.hh
index 0a0a54b25d0..4f03e1b0e00 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout-private.hh
@@ -182,7 +182,7 @@ enum {
   MASK0_GEN_CAT   = 0x1Fu
 };
 
-inline void
+static inline void
 _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *unicode)
 {
   /* XXX This shouldn't be inlined, or at least not while is_default_ignorable() is inline. */
@@ -193,51 +193,51 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *uni
   info->unicode_props1() = unicode->modified_combining_class (info->codepoint);
 }
 
-inline void
+static inline void
 _hb_glyph_info_set_general_category (hb_glyph_info_t *info,
 				     hb_unicode_general_category_t gen_cat)
 {
   info->unicode_props0() = (unsigned int) gen_cat | ((info->unicode_props0()) & ~MASK0_GEN_CAT);
 }
 
-inline hb_unicode_general_category_t
+static inline hb_unicode_general_category_t
 _hb_glyph_info_get_general_category (const hb_glyph_info_t *info)
 {
   return (hb_unicode_general_category_t) (info->unicode_props0() & MASK0_GEN_CAT);
 }
 
-inline void
+static inline void
 _hb_glyph_info_set_modified_combining_class (hb_glyph_info_t *info,
 					     unsigned int modified_class)
 {
   info->unicode_props1() = modified_class;
 }
 
-inline unsigned int
+static inline unsigned int
 _hb_glyph_info_get_modified_combining_class (const hb_glyph_info_t *info)
 {
   return info->unicode_props1();
 }
 
-inline hb_bool_t
+static inline hb_bool_t
 _hb_glyph_info_is_default_ignorable (const hb_glyph_info_t *info)
 {
   return !!(info->unicode_props0() & MASK0_IGNORABLE);
 }
 
-inline hb_bool_t
+static inline hb_bool_t
 _hb_glyph_info_is_zwnj (const hb_glyph_info_t *info)
 {
   return !!(info->unicode_props0() & MASK0_ZWNJ);
 }
 
-inline hb_bool_t
+static inline hb_bool_t
 _hb_glyph_info_is_zwj (const hb_glyph_info_t *info)
 {
   return !!(info->unicode_props0() & MASK0_ZWJ);
 }
 
-inline void
+static inline void
 _hb_glyph_info_flip_joiners (hb_glyph_info_t *info)
 {
   info->unicode_props0() ^= MASK0_ZWNJ | MASK0_ZWJ;
@@ -339,31 +339,31 @@ _hb_allocate_lig_id (hb_buffer_t *buffer) {
 
 /* glyph_props: */
 
-inline void
+static inline void
 _hb_glyph_info_set_glyph_props (hb_glyph_info_t *info, unsigned int props)
 {
   info->glyph_props() = props;
 }
 
-inline unsigned int
+static inline unsigned int
 _hb_glyph_info_get_glyph_props (const hb_glyph_info_t *info)
 {
   return info->glyph_props();
 }
 
-inline bool
+static inline bool
 _hb_glyph_info_is_base_glyph (const hb_glyph_info_t *info)
 {
   return !!(info->glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH);
 }
 
-inline bool
+static inline bool
 _hb_glyph_info_is_ligature (const hb_glyph_info_t *info)
 {
   return !!(info->glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE);
 }
 
-inline bool
+static inline bool
 _hb_glyph_info_is_mark (const hb_glyph_info_t *info)
 {
   return !!(info->glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_MARK);
@@ -383,21 +383,21 @@ _hb_glyph_info_ligated (const hb_glyph_info_t *info)
 
 /* Allocation / deallocation. */
 
-inline void
+static inline void
 _hb_buffer_allocate_unicode_vars (hb_buffer_t *buffer)
 {
   HB_BUFFER_ALLOCATE_VAR (buffer, unicode_props0);
   HB_BUFFER_ALLOCATE_VAR (buffer, unicode_props1);
 }
 
-inline void
+static inline void
 _hb_buffer_deallocate_unicode_vars (hb_buffer_t *buffer)
 {
   HB_BUFFER_DEALLOCATE_VAR (buffer, unicode_props0);
   HB_BUFFER_DEALLOCATE_VAR (buffer, unicode_props1);
 }
 
-inline void
+static inline void
 _hb_buffer_allocate_gsubgpos_vars (hb_buffer_t *buffer)
 {
   HB_BUFFER_ALLOCATE_VAR (buffer, glyph_props);
@@ -405,7 +405,7 @@ _hb_buffer_allocate_gsubgpos_vars (hb_buffer_t *buffer)
   HB_BUFFER_ALLOCATE_VAR (buffer, syllable);
 }
 
-inline void
+static inline void
 _hb_buffer_deallocate_gsubgpos_vars (hb_buffer_t *buffer)
 {
   HB_BUFFER_DEALLOCATE_VAR (buffer, syllable);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout.cc
index 183726e63cf..183726e63cf 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout.h
index d90eff374d7..d90eff374d7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-layout.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-layout.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-map-private.hh
index 0e718a6f1f5..74e2d9aca4c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-map-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-map-private.hh
@@ -160,19 +160,19 @@ enum hb_ot_map_feature_flags_t {
 };
 /* Macro version for where const is desired. */
 #define F_COMBINE(l,r) (hb_ot_map_feature_flags_t ((unsigned int) (l) | (unsigned int) (r)))
-inline hb_ot_map_feature_flags_t
+static inline hb_ot_map_feature_flags_t
 operator | (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r)
 { return hb_ot_map_feature_flags_t ((unsigned int) l | (unsigned int) r); }
-inline hb_ot_map_feature_flags_t
+static inline hb_ot_map_feature_flags_t
 operator & (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r)
 { return hb_ot_map_feature_flags_t ((unsigned int) l & (unsigned int) r); }
-inline hb_ot_map_feature_flags_t
+static inline hb_ot_map_feature_flags_t
 operator ~ (hb_ot_map_feature_flags_t r)
 { return hb_ot_map_feature_flags_t (~(unsigned int) r); }
-inline hb_ot_map_feature_flags_t&
+static inline hb_ot_map_feature_flags_t&
 operator |= (hb_ot_map_feature_flags_t &l, hb_ot_map_feature_flags_t r)
 { l = l | r; return l; }
-inline hb_ot_map_feature_flags_t&
+static inline hb_ot_map_feature_flags_t&
 operator &= (hb_ot_map_feature_flags_t& l, hb_ot_map_feature_flags_t r)
 { l = l & r; return l; }
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-map.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-map.cc
index 559193c1bae..559193c1bae 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-map.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-map.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-maxp-table.hh
index e6d255579c6..e6d255579c6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-maxp-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-maxp-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-name-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-name-table.hh
index 07dc0565ca6..07dc0565ca6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-name-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-name-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-arabic-fallback.hh
index 6b2b87e3f28..6b2b87e3f28 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-arabic-fallback.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-arabic-table.hh
index 730a275bf0a..730a275bf0a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-arabic-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-arabic-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-arabic.cc
index ea6d85c1e6c..ea6d85c1e6c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-arabic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-arabic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-default.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-default.cc
index f7f097eedaa..f7f097eedaa 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-default.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-default.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-hangul.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-hangul.cc
index 47aa44fedba..47aa44fedba 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-hangul.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-hangul.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-hebrew.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-hebrew.cc
index 6bb6043f652..6bb6043f652 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-hebrew.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-hebrew.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic-machine.hh
index 747315b7a2a..747315b7a2a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic-machine.rl
index 5c3e734eb33..5c3e734eb33 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic-private.hh
index 3de5c203fa3..3de5c203fa3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic-table.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic-table.cc
index 18a022bc507..18a022bc507 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic-table.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic.cc
index 1e07d331778..47ccf7e690c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-indic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-indic.cc
@@ -201,7 +201,8 @@ set_indic_properties (hb_glyph_info_t &info)
   if (unlikely (u == 0x17D1))
     cat = OT_X;
   if (cat == OT_X &&
-      unlikely (hb_in_range<hb_codepoint_t> (u, 0x17CB, 0x17D3))) /* Khmer Various signs */
+      unlikely (hb_in_range<hb_codepoint_t> (u, 0x17CB, 0x17D3) ||
+		u == 0x17DD)) /* Khmer Various signs */
   {
     /* These are like Top Matras. */
     cat = OT_M;
@@ -556,8 +557,8 @@ data_create_indic (const hb_ot_shape_plan_t *plan)
   indic_plan->virama_glyph = (hb_codepoint_t) -1;
 
   /* Use zero-context would_substitute() matching for new-spec of the main
-   * Indic scripts, but not for old-spec or scripts with one spec only. */
-  bool zero_context = indic_plan->config->has_old_spec || !indic_plan->is_old_spec;
+   * Indic scripts, and scripts with one spec only, but not for old-specs. */
+  bool zero_context = !indic_plan->is_old_spec;
   indic_plan->rphf.init (&plan->map, HB_TAG('r','p','h','f'), zero_context);
   indic_plan->pref.init (&plan->map, HB_TAG('p','r','e','f'), zero_context);
   indic_plan->blwf.init (&plan->map, HB_TAG('b','l','w','f'), zero_context);
@@ -801,7 +802,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
       case BASE_POS_LAST_SINHALA:
       {
         /* Sinhala base positioning is slightly different from main Indic, in that:
-	 * 1. It's ZWJ behavior is different,
+	 * 1. Its ZWJ behavior is different,
 	 * 2. We don't need to look into the font for consonant positions.
 	 */
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-myanmar-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-myanmar-machine.hh
index 0e8114e98ab..0e8114e98ab 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-myanmar-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-myanmar-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-myanmar-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-myanmar-machine.rl
index 58ca8c82289..58ca8c82289 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-myanmar-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-myanmar-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-myanmar.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-myanmar.cc
index 50209ffb0ee..50209ffb0ee 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-myanmar.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-myanmar.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-private.hh
index 104726e8af5..104726e8af5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-sea-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-sea-machine.hh
index 86b7ae7d5ca..86b7ae7d5ca 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-sea-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-sea-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-sea-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-sea-machine.rl
index 46140fc4d5f..46140fc4d5f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-sea-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-sea-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-sea.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-sea.cc
index 6288a90c9a9..6288a90c9a9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-sea.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-sea.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-thai.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-thai.cc
index 8664eca45cd..8664eca45cd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-thai.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-thai.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-tibetan.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-tibetan.cc
index 01465a426f8..01465a426f8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-complex-tibetan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-complex-tibetan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-fallback-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-fallback-private.hh
index ec653513f1b..ec653513f1b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-fallback-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-fallback-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-fallback.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-fallback.cc
index 5d526c3a8e8..5d526c3a8e8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-fallback.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-fallback.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-normalize-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-normalize-private.hh
index c744e26451d..c744e26451d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-normalize-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-normalize-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-normalize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-normalize.cc
index 2a6a4390030..2a6a4390030 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-normalize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-normalize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-private.hh
index 54ac2c3cf7c..54ac2c3cf7c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape.cc
index 3080a1d03db..3080a1d03db 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape.h
index afe6fe9618c..afe6fe9618c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-tag.cc
index 5594ef5074a..5594ef5074a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-tag.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-tag.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-tag.h
index 1bf12ab3c09..1bf12ab3c09 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot-tag.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot-tag.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot.h
index e9a280b7dda..47c92a58e4b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ot.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ot.h
@@ -30,6 +30,7 @@
 
 #include "hb.h"
 
+#include "hb-ot-font.h"
 #include "hb-ot-layout.h"
 #include "hb-ot-tag.h"
 #include "hb-ot-shape.h"
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-private.hh
index 344c71b058e..e5011e2d3b7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-private.hh
@@ -725,7 +725,7 @@ static inline void _hb_warn_no_return (bool returned)
   }
 }
 template <>
-inline void _hb_warn_no_return<hb_void_t> (bool returned HB_UNUSED)
+/*static*/ inline void _hb_warn_no_return<hb_void_t> (bool returned HB_UNUSED)
 {}
 
 template <int max_level, typename ret_t>
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-set-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-set-private.hh
index 705f554ce69..705f554ce69 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-set-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-set-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-set.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-set.cc
index 59a0af46ed4..59a0af46ed4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-set.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-set.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-set.h
index bafdae96333..bafdae96333 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-set.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-set.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape-plan-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape-plan-private.hh
index 607da5e7791..607da5e7791 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape-plan-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape-plan-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape-plan.cc
index e354f291763..e354f291763 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape-plan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape-plan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape-plan.h
index 8f54552f90b..8f54552f90b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape-plan.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape-plan.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape.cc
index c1b752405e1..c1b752405e1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape.h
index 10a35cb517e..10a35cb517e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shaper-impl-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shaper-impl-private.hh
index 7844081e95b..7844081e95b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shaper-impl-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shaper-impl-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shaper-list.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shaper-list.hh
index 6c537d49215..6c537d49215 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shaper-list.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shaper-list.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shaper-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shaper-private.hh
index 29c4493943d..29c4493943d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shaper-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shaper-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shaper.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shaper.cc
index 44f718aa702..44f718aa702 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-shaper.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-shaper.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ucdn.cc
index 7d24559de67..7d24559de67 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-ucdn.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-ucdn.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-unicode-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-unicode-private.hh
index ba193e8fa5b..991130fa14e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-unicode-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-unicode-private.hh
@@ -112,6 +112,10 @@ HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE
      * Reorder SAKOT to ensure it comes after any tone marks. */
     if (unlikely (unicode == 0x1A60)) return 254;
 
+    /* XXX This hack belongs to the Tibetan shaper:
+     * Reorder PADMA to ensure it comes after any vowel marks. */
+    if (unlikely (unicode == 0x0FC6)) return 254;
+
     return _hb_modified_combining_class[combining_class (unicode)];
   }
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-unicode.cc
index ed99ca211dd..84e5c06fd35 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-unicode.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-unicode.cc
@@ -146,8 +146,13 @@ hb_unicode_funcs_get_default (void)
 }
 
 #if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL)
-#pragma message("Could not find any Unicode functions implementation, you have to provide your own.")
-#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS.")
+#ifdef _MSC_VER
+#pragma message("Could not find any Unicode functions implementation, you have to provide your own")
+#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS")
+#else
+#warning "Could not find any Unicode functions implementation, you have to provide your own"
+#warning "To suppress this warning, define HB_NO_UNICODE_FUNCS"
+#endif
 #endif
 
 /**
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-unicode.h
index 1c4e097b92d..1c4e097b92d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-unicode.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-unicode.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-uniscribe.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-uniscribe.cc
index 6571448872a..6571448872a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-uniscribe.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-uniscribe.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-uniscribe.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-uniscribe.h
index 51887c8794b..51887c8794b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-uniscribe.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-uniscribe.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-utf-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-utf-private.hh
index b9a6519d28e..b9a6519d28e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-utf-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-utf-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-version.h.in
index 43634f91ce8..43634f91ce8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-version.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-version.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-warning.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-warning.cc
index 4f1f65f5a21..e0f88e2d4ad 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb-warning.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb-warning.cc
@@ -53,14 +53,3 @@
 #endif
 
 
-#include "hb-unicode-private.hh"
-
-#if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL)
-#ifdef _MSC_VER
-#pragma message("Could not find any Unicode functions implementation, you have to provide your own")
-#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS")
-#else
-#warning "Could not find any Unicode functions implementation, you have to provide your own"
-#warning "To suppress this warning, define HB_NO_UNICODE_FUNCS"
-#endif
-#endif
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb.h
index c5a938a3818..c5a938a3818 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/hb.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/hb.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/main.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/main.cc
index ff75237b23f..ff75237b23f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/main.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/main.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/test-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/test-buffer-serialize.cc
index 18c46e9524b..18c46e9524b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/test-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/test-buffer-serialize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/test-size-params.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/test-size-params.cc
index 35d9e3c8e25..35d9e3c8e25 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/test-size-params.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/test-size-params.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/test-would-substitute.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/test-would-substitute.cc
index 8ea87cdf397..8ea87cdf397 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/test-would-substitute.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/test-would-substitute.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/test.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/test.cc
index a8fe046f34c..a8fe046f34c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.27/src/test.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.28/src/test.cc
diff --git a/Build/source/libs/harfbuzz/include/Makefile.am b/Build/source/libs/harfbuzz/include/Makefile.am
index 5e2c07bf7a4..f84a7ab33e0 100644
--- a/Build/source/libs/harfbuzz/include/Makefile.am
+++ b/Build/source/libs/harfbuzz/include/Makefile.am
@@ -27,6 +27,7 @@ hdr_links = \
 ## native OpenType Layout backend
 hdr_links += \
 	$(HARFBUZZ_SRC)/hb-ot.h \
+	$(HARFBUZZ_SRC)/hb-ot-font.h \
 	$(HARFBUZZ_SRC)/hb-ot-layout.h \
 	$(HARFBUZZ_SRC)/hb-ot-shape.h \
 	$(HARFBUZZ_SRC)/hb-ot-tag.h
diff --git a/Build/source/libs/harfbuzz/include/Makefile.in b/Build/source/libs/harfbuzz/include/Makefile.in
index 1ae59024d1e..37e6c3fd131 100644
--- a/Build/source/libs/harfbuzz/include/Makefile.in
+++ b/Build/source/libs/harfbuzz/include/Makefile.in
@@ -248,9 +248,10 @@ hdr_links = $(HARFBUZZ_SRC)/hb.h $(HARFBUZZ_SRC)/hb-blob.h \
 	$(HARFBUZZ_SRC)/hb-font.h $(HARFBUZZ_SRC)/hb-set.h \
 	$(HARFBUZZ_SRC)/hb-shape.h $(HARFBUZZ_SRC)/hb-shape-plan.h \
 	$(HARFBUZZ_SRC)/hb-unicode.h $(HARFBUZZ_BLD)/hb-version.h \
-	$(HARFBUZZ_SRC)/hb-ot.h $(HARFBUZZ_SRC)/hb-ot-layout.h \
-	$(HARFBUZZ_SRC)/hb-ot-shape.h $(HARFBUZZ_SRC)/hb-ot-tag.h \
-	$(HARFBUZZ_SRC)/hb-icu.h $(HARFBUZZ_SRC)/hb-graphite2.h
+	$(HARFBUZZ_SRC)/hb-ot.h $(HARFBUZZ_SRC)/hb-ot-font.h \
+	$(HARFBUZZ_SRC)/hb-ot-layout.h $(HARFBUZZ_SRC)/hb-ot-shape.h \
+	$(HARFBUZZ_SRC)/hb-ot-tag.h $(HARFBUZZ_SRC)/hb-icu.h \
+	$(HARFBUZZ_SRC)/hb-graphite2.h
 all: all-am
 
 .SUFFIXES:
diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac
index eade4b88d3d..2aa92f498c8 100644
--- a/Build/source/libs/harfbuzz/version.ac
+++ b/Build/source/libs/harfbuzz/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current harfbuzz version
-m4_define([harfbuzz_version], [0.9.27])
+m4_define([harfbuzz_version], [0.9.28])