145 files changed, 245 insertions, 48 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 4a519d46619..a2058789deb 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -21,7 +21,7 @@ gd 2.1.0 - checked 26jun13
 graphite2 1.2.3 - checked 12jun13
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
-harfbuzz 0.9.21 - checked 17sep13
+harfbuzz 0.9.22 - checked 4oct13
   http://www.freedesktop.org/software/harfbuzz/release/
 
 icu 52.1 (52_rc2) - checked 26sep13
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 68280cfaeeb..56d47fc0610 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import harfbuzz-0.9.22.
+	* version.ac: Adjust.
+
 2013-09-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import harfbuzz-0.9.21.
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index 3bb996011a9..77b5e4b1384 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.21/src/hb-version.h.in \
+	$(top_srcdir)/harfbuzz-0.9.22/src/hb-version.h.in \
 	$(am__dist_check_SCRIPTS_DIST) \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog \
@@ -771,7 +771,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.21/src/hb-version.h.in
+hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.22/src/hb-version.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-noinstLIBRARIES:
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index ec1c7326408..1093db05143 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.21.
+# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 0.9.22.
 #
 # 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.21'
-PACKAGE_STRING='harfbuzz (TeX Live) 0.9.21'
+PACKAGE_VERSION='0.9.22'
+PACKAGE_STRING='harfbuzz (TeX Live) 0.9.22'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="harfbuzz-0.9.21/src/harfbuzz.pc.in"
+ac_unique_file="harfbuzz-0.9.22/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.21 to adapt to many kinds of systems.
+\`configure' configures harfbuzz (TeX Live) 0.9.22 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.21:";;
+     short | recursive ) echo "Configuration of harfbuzz (TeX Live) 0.9.22:";;
    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.21
+harfbuzz (TeX Live) configure 0.9.22
 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.21, which was
+It was created by harfbuzz (TeX Live) $as_me 0.9.22, 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.21'
+ VERSION='0.9.22'
 
 
 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=21
-HB_VERSION=0.9.21
+HB_VERSION_MICRO=22
+HB_VERSION=0.9.22
 
 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.21
+HARFBUZZ_TREE=harfbuzz-0.9.22
 
 
 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.21/src/hb-version.h.in"
+ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.22/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.21, which was
+This file was extended by harfbuzz (TeX Live) $as_me 0.9.22, 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.21
+harfbuzz (TeX Live) config.status 0.9.22
 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.21/src/hb-version.h.in" ;;
+    "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.22/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.21-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.22-PATCHES/ChangeLog
index d86feffede0..0e6d7f29c6d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported harfbuzz-0.9.22 source tree from:
+	  http://www.freedesktop.org/software/harfbuzz/release/
+
 2013-09-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported harfbuzz-0.9.21 source tree from:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-0.9.22-PATCHES/TL-Changes
index f8d99b0e03b..dfbe753b014 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21-PATCHES/TL-Changes
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the harfbuzz-0.9.21/ tree as obtained from:
-	http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.21.tar.bz2
+Changes applied to the harfbuzz-0.9.22/ tree as obtained from:
+	http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.22.tar.bz2
 
 Removed:
 	COPYING
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/AUTHORS b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/AUTHORS
index c611d7d4769..c611d7d4769 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/AUTHORS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/AUTHORS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/Android.mk b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/Android.mk
index 62cc21f2572..757d136e509 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/Android.mk
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/Android.mk
@@ -16,17 +16,7 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-#############################################################
-#   build the harfbuzz library
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES:= \
+HARFBUZZ_SRC_FILES = \
 	src/hb-blob.cc \
 	src/hb-buffer-serialize.cc \
 	src/hb-buffer.cc \
@@ -53,7 +43,20 @@ LOCAL_SRC_FILES:= \
 	src/hb-ot-shape-complex-sea.cc \
 	src/hb-ot-shape-complex-thai.cc \
 	src/hb-ot-shape-normalize.cc \
-	src/hb-ot-shape-fallback.cc \
+	src/hb-ot-shape-fallback.cc
+
+#############################################################
+#   build the harfbuzz library
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES:= \
+	$(HARFBUZZ_SRC_FILES) \
 	src/hb-icu.cc
 
 LOCAL_CPP_EXTENSION := .cc
@@ -76,4 +79,27 @@ LOCAL_MODULE:= libharfbuzz_ng
 
 include $(BUILD_SHARED_LIBRARY)
 
+#############################################################
+#   build the harfbuzz static library
+#
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES:= \
+	$(HARFBUZZ_SRC_FILES) \
+	src/hb-ucdn.cc \
+	src/hb-ucdn/ucdn.c
+
+LOCAL_CPP_EXTENSION     := .cc
+LOCAL_STATIC_LIBRARIES  := libft2
+LOCAL_C_INCLUDES        := \
+  $(LOCAL_PATH)/src \
+  external/freetype/include
+LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_UCDN -DHAVE_FREETYPE
+LOCAL_LDLIBS += -lpthread
+
+LOCAL_MODULE:= libharfbuzz_ng
+
+include $(BUILD_STATIC_LIBRARY)
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/ChangeLog
index 22a4a5b8ab9..a08344752ba 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/ChangeLog
@@ -1,3 +1,101 @@
+commit 27674b4bb351e501373bd9994e4ba6546e465cf7
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Thu Oct 3 14:54:50 2013 -0400
+
+    [OTLayout] Protect against out-of-range lookup indices
+
+    Filter them out when compiling map.
+
+ src/hb-ot-layout.cc | 17 +++++++++++++++++
+ src/hb-ot-layout.h  |  5 +++++
+ src/hb-ot-map.cc    |  8 +++++++-
+ 3 files changed, 29 insertions(+), 1 deletion(-)
+
+commit 6b4fdded94b7efb96c6e41cca4350878ed859ff1
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Sep 30 13:48:19 2013 -0400
+
+    Update git.mk
+
+ git.mk | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+commit 2a2b5b89ef3a606ba2996bc89fd1c577a6c98f40
+Author: M1cha <sigmaepsilon92@gmail.com>
+Date:   Mon Sep 30 08:55:52 2013 +0000
+
+    Cleanup Android.mk
+    - use common src files for both static and shared libs
+    - remove empty LOCAL_SHARED_LIBRARIES
+
+ Android.mk | 58
+ +++++++++++++++++-----------------------------------------
+ 1 file changed, 17 insertions(+), 41 deletions(-)
+
+commit 622bc3d829cab84c3a4148b88f2c91fee491ef39
+Merge: 3d2c4f0 d583df1
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Sun Sep 29 13:31:58 2013 -0700
+
+    Merge pull request #4 from amarullz/master
+
+    Add build static library on Android.mk
+
+commit 3d2c4f0c2ff8fab4262988aad65b170e5b479b20
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Fri Sep 27 17:06:29 2013 -0400
+
+    Fix hiding of default_ignorables if font doesn't have space glyph
+
+    Based on patch from Jonathan Kew.  See discussion on the list.
+
+ src/hb-ot-shape.cc | 40 ++++++++++++++++++++++++++++++----------
+ 1 file changed, 30 insertions(+), 10 deletions(-)
+
+commit d583df1e78003f8f1039ad72331bf877b13d1ae5
+Author: Ahmad Amarullah <support@amarullz.com>
+Date:   Fri Sep 27 19:04:32 2013 +0700
+
+    Add build static library on Android.mk
+
+    Use UCDN instead ICU
+    HAVE Freetype
+
+ Android.mk | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 50 insertions(+)
+
+commit 078de49ca10285f6cd1452abd40f831a17af5d1a
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Thu Sep 26 18:26:43 2013 -0400
+
+    [util] Don't use g_array_unref()
+
+    Was introduced in glib 2.22.
+
+ util/view-cairo.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 48360ec03b225dfec5f90bc5cb93122203d2dd6b
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Thu Sep 26 16:48:42 2013 -0400
+
+    Bug 68990 - test-common fails on i686-linux
+
+    Fix use-after-end-of-scope.
+
+ src/hb-common.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit b61f97d544ce43d85f5fe93e682c324e042c0770
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Sep 16 22:07:22 2013 -0400
+
+    0.9.21
+
+ NEWS         | 12 ++++++++++++
+ configure.ac |  2 +-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
 commit 2af826296315d89f3a433952903c5968e56044ea
 Author: Behdad Esfahbod <behdad@behdad.org>
 Date:   Mon Sep 16 21:49:56 2013 -0400
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/Makefile.am
index 15ccbf87134..15ccbf87134 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/NEWS b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/NEWS
index 57ec3804b43..ae4bc2bc089 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/NEWS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/NEWS
@@ -1,3 +1,16 @@
+Overview of changes leading to 0.9.22
+Thursday, October 3, 2013
+=====================================
+
+- Fix use-after-end-of-scope in hb_language_from_string().
+- Fix hiding of default_ignorables if font doesn't have space glyph.
+- Protect against out-of-range lookup indices.
+
+- API Changes:
+
+  * Added hb_ot_layout_table_get_lookup_count()
+
+
 Overview of changes leading to 0.9.21
 Monday, September 16, 2013
 =====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/README b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/README
index 74e739da52a..74e739da52a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/README
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/README
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/THANKS b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/THANKS
index 940cfde5c39..940cfde5c39 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/THANKS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/THANKS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/TODO b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/TODO
index e1aa39c4c01..e1aa39c4c01 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/TODO
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/TODO
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/autogen.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/autogen.sh
index 6f4e903d745..6f4e903d745 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/autogen.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/autogen.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/config.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/config.h.in
index 3e906b18416..3e906b18416 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/config.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/config.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/configure.ac
index 0a6795c3c90..17a7fb91f52 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/configure.ac
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [0.9.21],
+        [0.9.22],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/gtk-doc.make b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/gtk-doc.make
index 104c3993f3e..104c3993f3e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/gtk-doc.make
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/gtk-doc.make
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/harfbuzz.doap b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/harfbuzz.doap
index d2896ebefa8..d2896ebefa8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/harfbuzz.doap
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/harfbuzz.doap
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/Makefile.am
index 81802252fd7..81802252fd7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-c-linkage-decls.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-c-linkage-decls.sh
index b10310f5384..b10310f5384 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-c-linkage-decls.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-c-linkage-decls.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-defs.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-defs.sh
index d7a8ec281bf..d7a8ec281bf 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-defs.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-defs.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-header-guards.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-header-guards.sh
index 9a3302c7f87..9a3302c7f87 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-header-guards.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-header-guards.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-includes.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-includes.sh
index 5643c6973bc..5643c6973bc 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-includes.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-includes.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-libstdc++.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-libstdc++.sh
index e7e0e295e1a..e7e0e295e1a 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-libstdc++.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-libstdc++.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-static-inits.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-static-inits.sh
index bb0a7ff630d..bb0a7ff630d 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-static-inits.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-static-inits.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-symbols.sh
index 67bdf71e1b1..67bdf71e1b1 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/check-symbols.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/check-symbols.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/gen-arabic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/gen-arabic-table.py
index da5a4fcbf5c..da5a4fcbf5c 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/gen-arabic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/gen-arabic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/gen-indic-table.py
index 9ed3fd6d34d..9ed3fd6d34d 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/gen-indic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/gen-indic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/harfbuzz-gobject.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/harfbuzz-gobject.pc.in
index 70083601901..70083601901 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/harfbuzz-gobject.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/harfbuzz-gobject.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/harfbuzz-icu.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/harfbuzz-icu.pc.in
index 949869a3563..949869a3563 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/harfbuzz-icu.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/harfbuzz-icu.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/harfbuzz.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/harfbuzz.pc.in
index 7f27bbbdef0..7f27bbbdef0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/harfbuzz.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/harfbuzz.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-atomic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-atomic-private.hh
index 9cc3bc5587c..9cc3bc5587c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-atomic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-atomic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-blob.cc
index 7a659b26b97..7a659b26b97 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-blob.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-blob.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-blob.h
index d3d0f41b11c..d3d0f41b11c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-blob.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-blob.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-deserialize-json.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-deserialize-json.hh
index dead700db82..dead700db82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-deserialize-json.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-deserialize-json.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-deserialize-json.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-deserialize-json.rl
index 7351b2ab47c..7351b2ab47c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-deserialize-json.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-deserialize-json.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-deserialize-text.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-deserialize-text.hh
index a38efe3a415..a38efe3a415 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-deserialize-text.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-deserialize-text.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-deserialize-text.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-deserialize-text.rl
index 8856580fbe3..8856580fbe3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-deserialize-text.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-deserialize-text.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-private.hh
index a8cf7702446..a8cf7702446 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-serialize.cc
index b32092cf0b3..b32092cf0b3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer-serialize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer.cc
index 54626db2830..54626db2830 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer.h
index 87c4ce58e83..87c4ce58e83 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-buffer.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-buffer.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-cache-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-cache-private.hh
index 19b70b7e395..19b70b7e395 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-cache-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-cache-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-common.cc
index 88f7ed13bda..cf24660f798 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-common.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-common.cc
@@ -292,11 +292,13 @@ retry:
 hb_language_t
 hb_language_from_string (const char *str, int len)
 {
+  char strbuf[64];
+
   if (!str || !len || !*str)
     return HB_LANGUAGE_INVALID;
 
-  if (len >= 0) {
-    char strbuf[64];
+  if (len >= 0)
+  {
     len = MIN (len, (int) sizeof (strbuf) - 1);
     str = (char *) memcpy (strbuf, str, len);
     strbuf[len] = '\0';
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-common.h
index 40c18872964..40c18872964 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-common.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-common.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-coretext.cc
index f780973565b..f780973565b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-coretext.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-coretext.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-coretext.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-coretext.h
index c4954fa1b2c..c4954fa1b2c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-coretext.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-coretext.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-deprecated.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-deprecated.h
index 30ae4b1caf7..30ae4b1caf7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-deprecated.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-deprecated.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-face-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-face-private.hh
index b33be0e5fce..b33be0e5fce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-face-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-face-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-face.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-face.cc
index ebe8ec5e5d5..ebe8ec5e5d5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-face.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-face.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-face.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-face.h
index f682c468de5..f682c468de5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-face.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-face.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-fallback-shape.cc
index 1a1fcfbda1e..1a1fcfbda1e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-fallback-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-fallback-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-font-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-font-private.hh
index 00c0cc3f25f..00c0cc3f25f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-font-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-font-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-font.cc
index 855864377e7..855864377e7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-font.h
index 7273db43eda..7273db43eda 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-font.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ft.cc
index ff1e187b343..ff1e187b343 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ft.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ft.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ft.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ft.h
index 696251e143f..696251e143f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ft.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ft.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-glib.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-glib.cc
index c35d9966c26..c35d9966c26 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-glib.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-glib.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-glib.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-glib.h
index 63a9d3366c5..63a9d3366c5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-glib.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-glib.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject-enums.cc.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject-enums.cc.tmpl
index ca458a3846c..ca458a3846c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject-enums.cc.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject-enums.cc.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject-enums.h.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject-enums.h.tmpl
index 6ecda06c2a6..6ecda06c2a6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject-enums.h.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject-enums.h.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject-structs.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject-structs.cc
index 2451b66291b..2451b66291b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject-structs.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject-structs.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject-structs.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject-structs.h
index 4a88d569e8d..4a88d569e8d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject-structs.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject-structs.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject.h
index ea1bd25df82..ea1bd25df82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-gobject.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-gobject.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-graphite2.cc
index 6fe16ca93cd..6fe16ca93cd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-graphite2.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-graphite2.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-graphite2.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-graphite2.h
index 3eae54acbd8..3eae54acbd8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-graphite2.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-graphite2.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-icu.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-icu.cc
index c177be2c4b2..c177be2c4b2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-icu.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-icu.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-icu.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-icu.h
index f2f35f0f2ce..f2f35f0f2ce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-icu.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-icu.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-mutex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-mutex-private.hh
index 0fb21c2e86e..0fb21c2e86e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-mutex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-mutex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-object-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-object-private.hh
index 8a9ae34dbee..8a9ae34dbee 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-object-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-object-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-open-file-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-open-file-private.hh
index 250504ae20b..250504ae20b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-open-file-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-open-file-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-open-type-private.hh
index ee3a21dc3b1..ee3a21dc3b1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-open-type-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-open-type-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-head-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-head-table.hh
index 0285f0cf310..0285f0cf310 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-head-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-head-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-hhea-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-hhea-table.hh
index 611de8a6665..611de8a6665 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-hhea-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-hhea-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-hmtx-table.hh
index d107cf990a2..d107cf990a2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-hmtx-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-hmtx-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-common-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-common-private.hh
index 2f6e80468eb..2f6e80468eb 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-common-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-common-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-gdef-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-gdef-table.hh
index d2fd8757fcb..d2fd8757fcb 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-gdef-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-gdef-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-gpos-table.hh
index 05a6f5edc7e..05a6f5edc7e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-gpos-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-gpos-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-gsub-table.hh
index fefc71e8b49..fefc71e8b49 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-gsub-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-gsub-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-gsubgpos-private.hh
index 316f506f0d3..316f506f0d3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-gsubgpos-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-gsubgpos-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-jstf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-jstf-table.hh
index 79eb859566a..79eb859566a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-jstf-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-jstf-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-private.hh
index c5ba8b4b4d7..c5ba8b4b4d7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout.cc
index 80d92b43083..07c093f8f4f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout.cc
@@ -414,6 +414,23 @@ hb_ot_layout_feature_get_lookups (hb_face_t    *face,
   return f.get_lookup_indexes (start_offset, lookup_count, lookup_indexes);
 }
 
+unsigned int
+hb_ot_layout_table_get_lookup_count (hb_face_t    *face,
+				     hb_tag_t      table_tag)
+{
+  switch (table_tag)
+  {
+    case HB_OT_TAG_GSUB:
+    {
+      return hb_ot_layout_from_face (face)->gsub_lookup_count;
+    }
+    case HB_OT_TAG_GPOS:
+    {
+      return hb_ot_layout_from_face (face)->gpos_lookup_count;
+    }
+  }
+}
+
 static void
 _hb_ot_layout_collect_lookups_lookups (hb_face_t      *face,
 				       hb_tag_t        table_tag,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout.h
index d2a314cad6c..dfc7f2446f7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-layout.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-layout.h
@@ -180,6 +180,11 @@ hb_ot_layout_feature_get_lookups (hb_face_t    *face,
 				  unsigned int *lookup_count /* IN/OUT */,
 				  unsigned int *lookup_indexes /* OUT */);
 
+unsigned int
+hb_ot_layout_table_get_lookup_count (hb_face_t    *face,
+				     hb_tag_t      table_tag);
+
+
 void
 hb_ot_layout_collect_lookups (hb_face_t      *face,
 			      hb_tag_t        table_tag,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-map-private.hh
index 0e718a6f1f5..0e718a6f1f5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-map-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-map-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-map.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-map.cc
index 43856fa37ee..17dc934e2fa 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-map.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-map.cc
@@ -40,6 +40,9 @@ hb_ot_map_t::add_lookups (hb_face_t    *face,
 {
   unsigned int lookup_indices[32];
   unsigned int offset, len;
+  unsigned int table_lookup_count;
+
+  table_lookup_count = hb_ot_layout_table_get_lookup_count (face, table_tags[table_index]);
 
   offset = 0;
   do {
@@ -50,7 +53,10 @@ hb_ot_map_t::add_lookups (hb_face_t    *face,
 				      offset, &len,
 				      lookup_indices);
 
-    for (unsigned int i = 0; i < len; i++) {
+    for (unsigned int i = 0; i < len; i++)
+    {
+      if (lookup_indices[i] >= table_lookup_count)
+	continue;
       hb_ot_map_t::lookup_map_t *lookup = lookups[table_index].push ();
       if (unlikely (!lookup))
         return;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-maxp-table.hh
index e6d255579c6..e6d255579c6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-maxp-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-maxp-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-name-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-name-table.hh
index 07dc0565ca6..07dc0565ca6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-name-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-name-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-arabic-fallback.hh
index 6b2b87e3f28..6b2b87e3f28 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-arabic-fallback.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-arabic-table.hh
index 730a275bf0a..730a275bf0a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-arabic-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-arabic-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-arabic.cc
index a57e81a5ecf..a57e81a5ecf 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-arabic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-arabic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-default.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-default.cc
index d6afa0e1c11..d6afa0e1c11 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-default.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-default.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic-machine.hh
index c251160880c..c251160880c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic-machine.rl
index f9f07d801d9..f9f07d801d9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic-private.hh
index 39268b14533..39268b14533 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic-table.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic-table.cc
index 18a022bc507..18a022bc507 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic-table.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic.cc
index d3c475b6abb..d3c475b6abb 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-indic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-indic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-myanmar-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-myanmar-machine.hh
index 797bfc5bea0..797bfc5bea0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-myanmar-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-myanmar-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-myanmar-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-myanmar-machine.rl
index 51d42dd64ab..51d42dd64ab 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-myanmar-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-myanmar-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-myanmar.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-myanmar.cc
index 29f29bb556b..29f29bb556b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-myanmar.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-myanmar.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-private.hh
index a099e05d748..a099e05d748 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-sea-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-sea-machine.hh
index 86b7ae7d5ca..86b7ae7d5ca 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-sea-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-sea-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-sea-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-sea-machine.rl
index 46140fc4d5f..46140fc4d5f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-sea-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-sea-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-sea.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-sea.cc
index 9c0c303e3df..9c0c303e3df 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-sea.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-sea.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-thai.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-thai.cc
index 45945339d6b..45945339d6b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-complex-thai.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-complex-thai.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-fallback-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-fallback-private.hh
index ec653513f1b..ec653513f1b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-fallback-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-fallback-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-fallback.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-fallback.cc
index 284d030d5f4..284d030d5f4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-fallback.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-fallback.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-normalize-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-normalize-private.hh
index 085d48511d0..085d48511d0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-normalize-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-normalize-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-normalize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-normalize.cc
index 3fee809cf93..3fee809cf93 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-normalize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-normalize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-private.hh
index 817147199fd..817147199fd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape.cc
index 15f4461b5af..4ed6b842071 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-shape.cc
@@ -533,22 +533,42 @@ hb_ot_hide_default_ignorables (hb_ot_shape_context_t *c)
   if (c->buffer->flags & HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES)
     return;
 
-  hb_codepoint_t space = 0;
+  hb_codepoint_t space;
+  enum {
+    SPACE_DONT_KNOW,
+    SPACE_AVAILABLE,
+    SPACE_UNAVAILABLE
+  } space_status = SPACE_DONT_KNOW;
 
   unsigned int count = c->buffer->len;
+  hb_glyph_info_t *info = c->buffer->info;
+  hb_glyph_position_t *pos = c->buffer->pos;
+  unsigned int j = 0;
   for (unsigned int i = 0; i < count; i++)
-    if (unlikely (!is_a_ligature (c->buffer->info[i]) &&
-		  _hb_glyph_info_is_default_ignorable (&c->buffer->info[i])))
+  {
+    if (unlikely (!is_a_ligature (info[i]) &&
+		  _hb_glyph_info_is_default_ignorable (&info[i])))
     {
-      if (!space) {
-        /* We assume that the space glyph is not gid0. */
-        if (unlikely (!c->font->get_glyph (' ', 0, &space)) || !space)
-	return; /* No point! */
+      if (space_status == SPACE_DONT_KNOW)
+	space_status = c->font->get_glyph (' ', 0, &space) ? SPACE_AVAILABLE : SPACE_UNAVAILABLE;
+
+      if (space_status == SPACE_AVAILABLE)
+      {
+	info[i].codepoint = space;
+	pos[i].x_advance = 0;
+	pos[i].y_advance = 0;
       }
-      c->buffer->info[i].codepoint = space;
-      c->buffer->pos[i].x_advance = 0;
-      c->buffer->pos[i].y_advance = 0;
+      else
+	continue; /* Delete it. */
+    }
+    if (j != i)
+    {
+      info[j] = info[i];
+      pos[j] = pos[i];
     }
+    j++;
+  }
+  c->buffer->len = j;
 }
 
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-tag.cc
index 91ebec76ee3..91ebec76ee3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-tag.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-tag.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-tag.h
index 1bf12ab3c09..1bf12ab3c09 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot-tag.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot-tag.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot.h
index 80739063991..80739063991 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ot.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ot.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-private.hh
index 4152e275523..4152e275523 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-set-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-set-private.hh
index ca2a07b7619..ca2a07b7619 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-set-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-set-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-set.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-set.cc
index 59a0af46ed4..59a0af46ed4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-set.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-set.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-set.h
index bafdae96333..bafdae96333 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-set.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-set.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape-plan-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape-plan-private.hh
index dd014e38d01..dd014e38d01 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape-plan-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape-plan-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape-plan.cc
index b44a9e2ab77..b44a9e2ab77 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape-plan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape-plan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape-plan.h
index 8f54552f90b..8f54552f90b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape-plan.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape-plan.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape.cc
index c1b752405e1..c1b752405e1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape.h
index 10a35cb517e..10a35cb517e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shaper-impl-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shaper-impl-private.hh
index 7844081e95b..7844081e95b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shaper-impl-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shaper-impl-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shaper-list.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shaper-list.hh
index b9c029e58f1..b9c029e58f1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shaper-list.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shaper-list.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shaper-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shaper-private.hh
index 29c4493943d..29c4493943d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shaper-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shaper-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shaper.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shaper.cc
index 44f718aa702..44f718aa702 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-shaper.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-shaper.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-tt-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-tt-font.cc
index c503a404380..c503a404380 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-tt-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-tt-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ucdn.cc
index 7d24559de67..7d24559de67 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-ucdn.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-ucdn.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-unicode-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-unicode-private.hh
index dd4d00138e1..dd4d00138e1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-unicode-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-unicode-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-unicode.cc
index 5b44913bd35..5b44913bd35 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-unicode.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-unicode.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-unicode.h
index 1c4e097b92d..1c4e097b92d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-unicode.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-unicode.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-uniscribe.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-uniscribe.cc
index 65a63f3be54..65a63f3be54 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-uniscribe.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-uniscribe.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-uniscribe.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-uniscribe.h
index 51887c8794b..51887c8794b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-uniscribe.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-uniscribe.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-utf-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-utf-private.hh
index b9a6519d28e..b9a6519d28e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-utf-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-utf-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-version.h.in
index 43634f91ce8..43634f91ce8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-version.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-version.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-warning.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-warning.cc
index 4f1f65f5a21..4f1f65f5a21 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb-warning.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb-warning.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb.h
index c5a938a3818..c5a938a3818 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/hb.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/hb.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/main.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/main.cc
index ff75237b23f..ff75237b23f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/main.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/main.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/test-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/test-buffer-serialize.cc
index 827b0513b37..827b0513b37 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/test-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/test-buffer-serialize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/test-size-params.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/test-size-params.cc
index 947b5669a14..947b5669a14 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/test-size-params.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/test-size-params.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/test-would-substitute.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/test-would-substitute.cc
index 4731e265607..4731e265607 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/test-would-substitute.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/test-would-substitute.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/test.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/test.cc
index 1acb6ead70b..1acb6ead70b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.21/src/test.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.22/src/test.cc
diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac
index 78448dbe960..f02192a1d82 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.21])
+m4_define([harfbuzz_version], [0.9.22])