157 files changed, 351 insertions, 59 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 93fc8c9fc5d..f7cae0ff701 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -24,7 +24,7 @@ gmp 6.0.0 - checked 25mar14
 graphite2 1.3.0 - checked 5aug15
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
-harfbuzz 1.0.1 - checked 28jul15
+harfbuzz 1.0.2 - checked 20aug15
   http://www.freedesktop.org/software/harfbuzz/release/
 
 icu 55.1 (release) - checked 12apr15
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 00f5559393d..41666954e8b 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import harfbuzz-1.0.2.
+	* version.ac, Makefile.am: Adjust.
+
 2015-07-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import harfbuzz-1.0.1.
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index 1142358a8ad..47607d0b573 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -461,7 +461,7 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing \
 	$(top_srcdir)/../../build-aux/test-driver \
-	$(top_srcdir)/harfbuzz-1.0.1/src/hb-version.h.in \
+	$(top_srcdir)/harfbuzz-1.0.2/src/hb-version.h.in \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -789,7 +789,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-1.0.1/src/hb-version.h.in
+hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-1.0.2/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 0c092eca6ad..26d2ad28283 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) 1.0.1.
+# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.0.2.
 #
 # 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='1.0.1'
-PACKAGE_STRING='harfbuzz (TeX Live) 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='harfbuzz (TeX Live) 1.0.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="harfbuzz-1.0.1/src/harfbuzz.pc.in"
+ac_unique_file="harfbuzz-1.0.2/src/harfbuzz.pc.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1312,7 +1312,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) 1.0.1 to adapt to many kinds of systems.
+\`configure' configures harfbuzz (TeX Live) 1.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1383,7 +1383,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.0.1:";;
+     short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1490,7 +1490,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-harfbuzz (TeX Live) configure 1.0.1
+harfbuzz (TeX Live) configure 1.0.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2080,7 +2080,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 1.0.1, which was
+It was created by harfbuzz (TeX Live) $as_me 1.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4003,7 +4003,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='harfbuzz--tex-live-'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4206,8 +4206,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 HB_VERSION_MAJOR=1
 HB_VERSION_MINOR=0
-HB_VERSION_MICRO=1
-HB_VERSION=1.0.1
+HB_VERSION_MICRO=2
+HB_VERSION=1.0.2
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6310,14 +6310,14 @@ $as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h
 
 fi
 
-HARFBUZZ_TREE=harfbuzz-1.0.1
+HARFBUZZ_TREE=harfbuzz-1.0.2
 
 
 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-1.0.1/src/hb-version.h.in"
+ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-1.0.2/src/hb-version.h.in"
 
 
 cat >confcache <<\_ACEOF
@@ -6866,7 +6866,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 1.0.1, which was
+This file was extended by harfbuzz (TeX Live) $as_me 1.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6932,7 +6932,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 1.0.1
+harfbuzz (TeX Live) config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7065,7 +7065,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-1.0.1/src/hb-version.h.in" ;;
+    "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-1.0.2/src/hb-version.h.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-1.0.2-PATCHES/ChangeLog
index 62fff4f77ce..62fff4f77ce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2-PATCHES/ChangeLog
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-1.0.2-PATCHES/TL-Changes
index 33c03df25dd..7113c1bde37 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1-PATCHES/TL-Changes
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the harfbuzz-1.0.1/ tree as obtained from:
+Changes applied to the harfbuzz-1.0.2/ tree as obtained from:
 	http://www.freedesktop.org/software/harfbuzz/release/
 
 Removed:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/AUTHORS b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/AUTHORS
index 81cdc4cf37f..81cdc4cf37f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/AUTHORS
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/AUTHORS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/Android.mk b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/Android.mk
index 05525078516..2c266221d85 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/Android.mk
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/Android.mk
@@ -75,9 +75,10 @@ HARFBUZZ_SRC_FILES = \
 	src/hb-ot-shape-complex-indic.cc \
 	src/hb-ot-shape-complex-indic-table.cc \
 	src/hb-ot-shape-complex-myanmar.cc \
-	src/hb-ot-shape-complex-sea.cc \
 	src/hb-ot-shape-complex-thai.cc \
 	src/hb-ot-shape-complex-tibetan.cc \
+	src/hb-ot-shape-complex-use.cc \
+	src/hb-ot-shape-complex-use-table.cc \
 	src/hb-ot-shape-normalize.cc \
 	src/hb-ot-shape-fallback.cc \
 	$(NULL)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/ChangeLog
index 24d5a24982a..47286d1d599 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/ChangeLog
@@ -1,3 +1,213 @@
+commit 958c268fa3a520666436e77a2111a3b564a36d96
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Aug 19 13:22:12 2015 +0100
+
+    [coretext] Add TODO item
+
+ src/hb-coretext.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 7c5bee09d9c7c25672c7c77572ebae0b731892d0
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Aug 19 13:20:31 2015 +0100
+
+    [uniscribe] Fix font scale handling
+
+    By default shape at upem (or ppem), and scale results.
+    Similar to work done in CoreText backend, but using upem as default.
+
+ src/hb-uniscribe.cc | 25 +++++++++++++++++++------
+ 1 file changed, 19 insertions(+), 6 deletions(-)
+
+commit 902e74a098dad8c3b487856284f9fdf99b04f9f1
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Aug 18 18:55:03 2015 +0100
+
+    Commented-out code to print buffer before each lookup
+
+    To be turned into a useful HB_DEBUG_SHAPE infrastructure...
+
+ src/hb-ot-layout.cc | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 75504a50488a6aac0b9789f728fb5b87e641d4c3
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Aug 18 18:47:02 2015 +0100
+
+    Allow serializing buffer with output-buffer being used
+
+    Ie, don't call get_positions() if positions are not
+    requested for serialization.
+
+ src/hb-buffer-serialize.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit e47b772a56af44a9a4f9ec907ee2091b725b94c1
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Aug 18 18:42:47 2015 +0100
+
+    [ot] Change buffer content type right after we map to glyphs
+
+    Needed for upcoming debug output changes.
+
+ src/hb-ot-shape.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit d104415e4c1e0f9140f794cd8d09c6460c63e966
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Aug 18 17:33:34 2015 +0100
+
+    [Android.mk] Update for SEA removal and USE addition
+
+ Android.mk | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit ddd6bf12f1cabaa298feed820313483b9893528c
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Aug 18 15:55:09 2015 +0100
+
+    Don't declare dependency on freetype in harfbuzz.pc
+
+    See comments.
+
+ src/Makefile.am | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit 2c8b3b2e5312c9858584f568b1528c57e5bb8a10
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Aug 18 14:36:43 2015 +0100
+
+    [debug] Print lookup index in debug-apply output
+
+ src/hb-ot-layout-gpos-table.hh       | 5 ++++-
+ src/hb-ot-layout-gsub-table.hh       | 5 ++++-
+ src/hb-ot-layout-gsubgpos-private.hh | 7 +++++--
+ src/hb-ot-layout.cc                  | 3 ++-
+ 4 files changed, 15 insertions(+), 5 deletions(-)
+
+commit 50ad7788eeb7160caef4ec78e65c7c630e601b06
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Aug 18 10:22:16 2015 +0100
+
+    [coretext] Remove assert that kicks in on Mac OS 10.6
+
+    http://crbug.com/419769
+
+ src/hb-coretext.cc | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+commit 2b646fa07f5f9d4d10d563a91d22a2750b5fc771
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Aug 17 16:03:28 2015 +0200
+
+    Remove unused function
+
+ src/hb-ot-shape-complex-use.cc | 8 --------
+ 1 file changed, 8 deletions(-)
+
+commit 539a610e2e72375e598ab29fd390ed9ec93816d5
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Tue Aug 11 12:58:49 2015 +0200
+
+    Add Libs.private and Requires.private to harfbuzz.pc
+
+    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=64501
+
+ configure.ac       | 12 +++++++++---
+ src/Makefile.am    | 15 ++++++++++++---
+ src/harfbuzz.pc.in |  2 ++
+ 3 files changed, 23 insertions(+), 6 deletions(-)
+
+commit c7dfe316f8c0fc04b7976fca5e58eb46d91b4821
+Author: jfkthame <jfkthame@gmail.com>
+Date:   Fri Aug 7 17:55:03 2015 +0100
+
+    Don't rely on .cluster in _hb_ot_shape_normalize()
+
+    Fixes https://github.com/behdad/harfbuzz/pull/124
+
+ src/hb-ot-shape-normalize.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9099e48e29fe5cfdf8566c8f1ba6ddc8c0799e7e
+Author: jfkthame <jfkthame@gmail.com>
+Date:   Fri Aug 7 17:51:28 2015 +0100
+
+    Don't rely on .cluster field in fallback_position
+
+    Fixes tests/cluster.
+
+    Fixes https://github.com/behdad/harfbuzz/pull/123
+
+ src/hb-ot-shape-fallback.cc | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+commit f3792342f670978cdc3f8512fb5e80314ca0678d
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Sat Aug 8 18:02:18 2015 +0200
+
+    [tests] Add test for fallback positioning with cluster_level > 0
+
+    For https://github.com/behdad/harfbuzz/pull/123
+    Currently fails.  Fix coming.
+
+ test/shaping/Makefile.am                                  |   1 +
+ .../sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf  | Bin 0 ->
+ 824 bytes
+ test/shaping/fonts/sha1sum/MANIFEST                       |   1 +
+ test/shaping/tests/MANIFEST                               |   1 +
+ test/shaping/tests/cluster.tests                          |   1 +
+ 5 files changed, 4 insertions(+)
+
+commit bd22a5cfae24b3b9253bccaeb139e698e74cd0c3
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Fri Aug 7 11:13:27 2015 +0200
+
+    Bug 91559 - HarfBuzz 1.0.1: Inconsistent DLL files
+    specified/created...
+
+    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=91559
+
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 02d6439f420d959183dd446abd0b0118ee1ee061
+Merge: 9002c27 160f635
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Aug 3 22:47:18 2015 +0300
+
+    Merge pull request #122 from RomainNaour/static-fix
+
+    fix static linking with icu-uc
+
+commit 160f635523d596f61e292776f638d4eb09673463
+Author: Romain Naour <romain.naour@openwide.fr>
+Date:   Wed Jul 22 23:26:23 2015 +0200
+
+    fix static linking with icu-uc
+
+    When linking test-unicode statically it needs $(ICU_LIBS)
+    which contains all required flags.
+    Especially -lstdc++.
+
+    Fixes:
+    http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/
+
+    Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+
+ test/api/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9002c27b2f54bb5135db92045c0d770b47317577
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Jul 27 12:17:54 2015 +0200
+
+    1.0.1
+
+ NEWS         | 9 ++++++++-
+ configure.ac | 2 +-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
 commit f1c20e1ba5bf218df7dc3e198bdcf1f449fc9387
 Author: Behdad Esfahbod <behdad@behdad.org>
 Date:   Mon Jul 27 12:16:02 2015 +0200
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/Makefile.am
index 47aeb97768e..47aeb97768e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/NEWS b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/NEWS
index ed67abf120e..67bef7f62e9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/NEWS
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/NEWS
@@ -1,3 +1,16 @@
+Overview of changes leading to 1.0.2
+Wednesday, August 19, 2015
+====================================
+
+- Fix shaping with cluster-level > 0.
+- Fix Uniscribe backend font-size scaling.
+- Declare dependencies in harfbuzz.pc.
+  FreeType is not declared though, to avoid bugs in pkg-config
+  0.26 with recursive dependencies.
+- Slightly improved debug infrastructure.  More to come later.
+- Misc build fixes.
+
+
 Overview of changes leading to 1.0.1
 Monday, July 27, 2015
 ====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/README b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/README
index dea10688f3f..dea10688f3f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/README
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/README
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/README.python b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/README.python
index cd312649dbc..cd312649dbc 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/README.python
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/README.python
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/THANKS b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/THANKS
index 940cfde5c39..940cfde5c39 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/THANKS
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/THANKS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/TODO b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/TODO
index e1aa39c4c01..e1aa39c4c01 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/TODO
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/TODO
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/autogen.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/autogen.sh
index ff1b0c0c99b..ff1b0c0c99b 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/autogen.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/autogen.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/config.h.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/config.h.in
index 8937bd644d6..8937bd644d6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/config.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/config.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/configure.ac
index 4d64586b5ce..a73fe6201b9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/configure.ac
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [1.0.1],
+        [1.0.2],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
@@ -145,8 +145,10 @@ AC_ARG_WITH(glib,
 			[Use glib @<:@default=auto@:>@])],,
 	[with_glib=auto])
 have_glib=false
+GLIB_DEPS="glib-2.0 >= 2.16"
+AC_SUBST(GLIB_DEPS)
 if test "x$with_glib" = "xyes" -o "x$with_glib" = "xauto"; then
-	PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, have_glib=true, :)
+	PKG_CHECK_MODULES(GLIB, $GLIB_DEPS, have_glib=true, :)
 fi
 if test "x$with_glib" = "xyes" -a "x$have_glib" != "xtrue"; then
 	AC_MSG_ERROR([glib support requested but glib-2.0 not found])
@@ -296,8 +298,10 @@ AC_ARG_WITH(graphite2,
 			[Use the graphite2 library @<:@default=no@:>@])],,
 	[with_graphite2=no])
 have_graphite2=false
+GRAPHITE2_DEPS="graphite2"
+AC_SUBST(GRAPHITE2_DEPS)
 if test "x$with_graphite2" = "xyes" -o "x$with_graphite2" = "xauto"; then
-	PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite2=true, :)
+	PKG_CHECK_MODULES(GRAPHITE2, $GRAPHITE2_DEPS, have_graphite2=true, :)
 fi
 if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then
 	AC_MSG_ERROR([graphite2 support requested but libgraphite2 not found])
@@ -314,9 +318,11 @@ AC_ARG_WITH(freetype,
 			[Use the FreeType library @<:@default=auto@:>@])],,
 	[with_freetype=auto])
 have_freetype=false
+FREETYPE_DEPS="freetype2 >= 12.0.6"
+AC_SUBST(FREETYPE_DEPS)
 if test "x$with_freetype" = "xyes" -o "x$with_freetype" = "xauto"; then
 	# See freetype/docs/VERSION.DLL; 12.0.6 means freetype-2.4.2
-	PKG_CHECK_MODULES(FREETYPE, freetype2 >= 12.0.6, have_freetype=true, :)
+	PKG_CHECK_MODULES(FREETYPE, $FREETYPE_DEPS, have_freetype=true, :)
 fi
 if test "x$with_freetype" = "xyes" -a "x$have_freetype" != "xtrue"; then
 	AC_MSG_ERROR([FreeType support requested but libfreetype2 not found])
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/gtk-doc.make b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/gtk-doc.make
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/gtk-doc.make
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/harfbuzz.doap b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/harfbuzz.doap
index d2896ebefa8..d2896ebefa8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/harfbuzz.doap
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/harfbuzz.doap
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/Makefile.am
index 753b9308f55..856aae6a3d5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/Makefile.am
@@ -20,6 +20,8 @@ lib_LTLIBRARIES = libharfbuzz.la
 
 HBCFLAGS =
 HBLIBS =
+HBNONPCLIBS =
+HBDEPS =
 HBSOURCES =  \
 	hb-atomic-private.hh \
 	hb-blob.cc \
@@ -133,12 +135,13 @@ endif
 
 if HAVE_PTHREAD
 HBCFLAGS += $(PTHREAD_CFLAGS)
-HBLIBS   += $(PTHREAD_LIBS)
+HBNONPCLIBS += $(PTHREAD_LIBS)
 endif
 
 if HAVE_GLIB
 HBCFLAGS += $(GLIB_CFLAGS)
 HBLIBS   += $(GLIB_LIBS)
+HBDEPS   += $(GLIB_DEPS)
 HBSOURCES += hb-glib.cc
 HBHEADERS += hb-glib.h
 endif
@@ -146,6 +149,12 @@ endif
 if HAVE_FREETYPE
 HBCFLAGS += $(FREETYPE_CFLAGS)
 HBLIBS   += $(FREETYPE_LIBS)
+# XXX
+# The following creates a recursive dependency on FreeType if FreeType is
+# built with HarfBuzz support enabled.  Newer pkg-config handles that just
+# fine but pkg-config 0.26 as shipped in Ubuntu 14.04 crashes.  Remove
+# in a year or two, or otherwise work around it...
+#HBDEPS   += $(FREETYPE_DEPS)
 HBSOURCES += hb-ft.cc
 HBHEADERS += hb-ft.h
 endif
@@ -153,20 +162,21 @@ endif
 if HAVE_GRAPHITE2
 HBCFLAGS += $(GRAPHITE2_CFLAGS)
 HBLIBS   += $(GRAPHITE2_LIBS)
+HBDEPS   += $(GRAPHITE2_DEPS)
 HBSOURCES += hb-graphite2.cc
 HBHEADERS += hb-graphite2.h
 endif
 
 if HAVE_UNISCRIBE
 HBCFLAGS += $(UNISCRIBE_CFLAGS)
-HBLIBS   += $(UNISCRIBE_LIBS)
+HBNONPCLIBS += $(UNISCRIBE_LIBS)
 HBSOURCES += hb-uniscribe.cc
 HBHEADERS += hb-uniscribe.h
 endif
 
 if HAVE_CORETEXT
 HBCFLAGS += $(CORETEXT_CFLAGS)
-HBLIBS   += $(CORETEXT_LIBS)
+HBNONPCLIBS += $(CORETEXT_LIBS)
 HBSOURCES += hb-coretext.cc
 HBHEADERS += hb-coretext.h
 endif
@@ -182,6 +192,8 @@ DIST_SUBDIRS += hb-ucdn
 
 # Put the library together
 
+HBLIBS += $(HBNONPCLIBS)
+
 if OS_WIN32
 export_symbols = -export-symbols harfbuzz.def
 harfbuzz_def_dependency = harfbuzz.def
@@ -256,6 +268,8 @@ EXTRA_DIST += \
 		-e 's@%exec_prefix%@$(exec_prefix)@g' \
 		-e 's@%libdir%@$(libdir)@g' \
 		-e 's@%includedir%@$(includedir)@g' \
+		-e 's@%libs_private%@$(HBNONPCLIBS)@g' \
+		-e 's@%requires_private%@$(HBDEPS)@g' \
 		-e 's@%VERSION%@$(VERSION)@g' \
 	"$<" > "$@" \
 	|| ($(RM) "$@"; false)
@@ -270,7 +284,7 @@ harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS)
 	$(EGREP) '^hb_.* \(' | \
 	sed -e 's/ (.*//' | \
 	LANG=C sort; \
-	echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \
+	echo LIBRARY libharfbuzz-0.dll; \
 	) >"$@"
 	@ ! grep -q hb_ERROR "$@" \
 	|| ($(RM) "$@"; false)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-c-linkage-decls.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-c-linkage-decls.sh
index b10310f5384..b10310f5384 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-c-linkage-decls.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-c-linkage-decls.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-defs.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-defs.sh
index 65a24670e48..65a24670e48 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-defs.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-defs.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-header-guards.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-header-guards.sh
index 9a3302c7f87..9a3302c7f87 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-header-guards.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-header-guards.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-includes.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-includes.sh
index 902f2357e2a..902f2357e2a 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-includes.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-includes.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-libstdc++.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-libstdc++.sh
index b541828bcd9..b541828bcd9 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-libstdc++.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-libstdc++.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-static-inits.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-static-inits.sh
index 1446fa73405..1446fa73405 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-static-inits.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-static-inits.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-symbols.sh
index b2bf43fcea5..b2bf43fcea5 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/check-symbols.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/check-symbols.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/gen-arabic-table.py b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/gen-arabic-table.py
index 308435f991e..308435f991e 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/gen-arabic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/gen-arabic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/gen-indic-table.py
index f5716bda789..f5716bda789 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/gen-indic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/gen-indic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/gen-use-table.py b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/gen-use-table.py
index be04e4ba4c5..be04e4ba4c5 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/gen-use-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/gen-use-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/harfbuzz-gobject.pc.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/harfbuzz-gobject.pc.in
index 70083601901..70083601901 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/harfbuzz-gobject.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/harfbuzz-gobject.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/harfbuzz-icu.pc.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/harfbuzz-icu.pc.in
index 949869a3563..949869a3563 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/harfbuzz-icu.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/harfbuzz-icu.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/harfbuzz.pc.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/harfbuzz.pc.in
index 7f27bbbdef0..b3e124aa8c3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/harfbuzz.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/harfbuzz.pc.in
@@ -8,4 +8,6 @@ Description: HarfBuzz text shaping library
 Version: %VERSION%
 
 Libs: -L${libdir} -lharfbuzz
+Libs.private: %libs_private%
+Requires.private: %requires_private%
 Cflags: -I${includedir}/harfbuzz
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-atomic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-atomic-private.hh
index 8179571ad2d..8179571ad2d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-atomic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-atomic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-blob.cc
index 8759a252a57..8759a252a57 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-blob.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-blob.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-blob.h
index b2419abfd2a..b2419abfd2a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-blob.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-blob.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-deserialize-json.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-deserialize-json.hh
index 3f626bda40d..3f626bda40d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-deserialize-json.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-deserialize-json.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-deserialize-json.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-deserialize-json.rl
index 91b350f5ac0..91b350f5ac0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-deserialize-json.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-deserialize-json.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-deserialize-text.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-deserialize-text.hh
index d2d8daae7ed..d2d8daae7ed 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-deserialize-text.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-deserialize-text.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-deserialize-text.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-deserialize-text.rl
index 8a682f7378a..8a682f7378a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-deserialize-text.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-deserialize-text.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-private.hh
index 9aa5e7d7e1f..9aa5e7d7e1f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-serialize.cc
index 406d69db758..8a22224a5a2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer-serialize.cc
@@ -99,7 +99,8 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
 				  hb_buffer_serialize_flags_t flags)
 {
   hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, NULL);
-  hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, NULL);
+  hb_glyph_position_t *pos = (flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS) ?
+			     NULL : hb_buffer_get_glyph_positions (buffer, NULL);
 
   *buf_consumed = 0;
   for (unsigned int i = start; i < end; i++)
@@ -172,7 +173,8 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
 				  hb_buffer_serialize_flags_t flags)
 {
   hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, NULL);
-  hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, NULL);
+  hb_glyph_position_t *pos = (flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS) ?
+			     NULL : hb_buffer_get_glyph_positions (buffer, NULL);
 
   *buf_consumed = 0;
   for (unsigned int i = start; i < end; i++)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer.cc
index 03fe8e1348b..03fe8e1348b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer.h
index 4b285bbb3d6..4b285bbb3d6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-buffer.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-buffer.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-cache-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-cache-private.hh
index 19b70b7e395..19b70b7e395 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-cache-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-cache-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-common.cc
index d510c9be4f6..d510c9be4f6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-common.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-common.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-common.h
index d160be5ca75..d160be5ca75 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-common.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-common.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-coretext.cc
index 0b710c2b7d3..b0df2f4b8e6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-coretext.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-coretext.cc
@@ -156,6 +156,7 @@ _hb_coretext_shaper_font_data_create (hb_font_t *font)
   hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face);
 
   /* Choose a CoreText font size and calculate multipliers to convert to HarfBuzz space. */
+  /* TODO: use upem instead of 36? */
   CGFloat font_size = 36.; /* Default... */
   /* No idea if the following is even a good idea. */
   if (font->y_ppem)
@@ -1034,10 +1035,20 @@ retry:
       buffer->len += num_glyphs;
     }
 
-    /* Make sure all runs had the expected direction. */
-    bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
-    assert (bool (status_and & kCTRunStatusRightToLeft) == backward);
-    assert (bool (status_or  & kCTRunStatusRightToLeft) == backward);
+    /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel,
+     * or if it does, it doesn't resepct it.  So we get runs with wrong
+     * directions.  As such, disable the assert...  It wouldn't crash, but
+     * cursoring will be off...
+     *
+     * http://crbug.com/419769
+     */
+    if (0)
+    {
+      /* Make sure all runs had the expected direction. */
+      bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
+      assert (bool (status_and & kCTRunStatusRightToLeft) == backward);
+      assert (bool (status_or  & kCTRunStatusRightToLeft) == backward);
+    }
 
     buffer->clear_positions ();
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-coretext.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-coretext.h
index 25267bc9784..25267bc9784 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-coretext.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-coretext.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-deprecated.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-deprecated.h
index 30ae4b1caf7..30ae4b1caf7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-deprecated.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-deprecated.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-face-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-face-private.hh
index c4266fff4f0..c4266fff4f0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-face-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-face-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-face.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-face.cc
index 96ea1da46b0..96ea1da46b0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-face.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-face.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-face.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-face.h
index f682c468de5..f682c468de5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-face.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-face.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-fallback-shape.cc
index 9d061a9e845..9d061a9e845 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-fallback-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-fallback-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-font-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-font-private.hh
index 33bbf7143a2..33bbf7143a2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-font-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-font-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-font.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-font.cc
index 0cfba837a27..0cfba837a27 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-font.h
index cf22589ec65..cf22589ec65 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-font.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ft.cc
index 468742cfd05..468742cfd05 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ft.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ft.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ft.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ft.h
index 92f4b361441..92f4b361441 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ft.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ft.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-glib.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-glib.cc
index 7dbd83d2962..7dbd83d2962 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-glib.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-glib.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-glib.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-glib.h
index 1a8f42ea529..1a8f42ea529 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-glib.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-glib.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject-enums.cc.tmpl b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject-enums.cc.tmpl
index ca458a3846c..ca458a3846c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject-enums.cc.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject-enums.cc.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject-enums.h.tmpl b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject-enums.h.tmpl
index 6ecda06c2a6..6ecda06c2a6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject-enums.h.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject-enums.h.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject-structs.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject-structs.cc
index 6bd63368b65..6bd63368b65 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject-structs.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject-structs.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject-structs.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject-structs.h
index 0a0387dce31..0a0387dce31 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject-structs.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject-structs.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject.h
index ea1bd25df82..ea1bd25df82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-gobject.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-gobject.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-graphite2.cc
index 626b84f4e98..626b84f4e98 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-graphite2.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-graphite2.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-graphite2.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-graphite2.h
index 3eae54acbd8..3eae54acbd8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-graphite2.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-graphite2.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-icu.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-icu.cc
index 24cec9d7266..24cec9d7266 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-icu.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-icu.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-icu.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-icu.h
index f2f35f0f2ce..f2f35f0f2ce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-icu.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-icu.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-mutex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-mutex-private.hh
index ed2703571c1..ed2703571c1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-mutex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-mutex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-object-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-object-private.hh
index 635d62dc1ae..635d62dc1ae 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-object-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-object-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-open-file-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-open-file-private.hh
index 178bc7ccb85..178bc7ccb85 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-open-file-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-open-file-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-open-type-private.hh
index 75a0f568d11..75a0f568d11 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-open-type-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-open-type-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-cmap-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-cmap-table.hh
index 04823125538..04823125538 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-cmap-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-cmap-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-font.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-font.cc
index df6514dd31f..df6514dd31f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-font.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-font.h
index b9947a16bc8..b9947a16bc8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-font.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-head-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-head-table.hh
index 268f133408c..268f133408c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-head-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-head-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-hhea-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-hhea-table.hh
index 992fe552021..992fe552021 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-hhea-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-hhea-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-hmtx-table.hh
index a0e3855a849..a0e3855a849 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-hmtx-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-hmtx-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-common-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-common-private.hh
index 3db7f57ab42..3db7f57ab42 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-common-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-common-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-gdef-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-gdef-table.hh
index 7a6c04d1700..7a6c04d1700 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-gdef-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-gdef-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-gpos-table.hh
index 69609d06cbe..da9506c7665 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-gpos-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-gpos-table.hh
@@ -1568,8 +1568,11 @@ template <typename context_t>
   const GPOS &gpos = *(hb_ot_layout_from_face (c->face)->gpos);
   const PosLookup &l = gpos.get_lookup (lookup_index);
   unsigned int saved_lookup_props = c->lookup_props;
-  c->set_lookup (l);
+  unsigned int saved_lookup_index = c->lookup_index;
+  c->set_lookup_index (lookup_index);
+  c->set_lookup_props (l.get_props ());
   bool ret = l.dispatch (c);
+  c->set_lookup_index (saved_lookup_index);
   c->set_lookup_props (saved_lookup_props);
   return ret;
 }
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-gsub-table.hh
index ad1339dc64d..ff204847017 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-gsub-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-gsub-table.hh
@@ -1311,8 +1311,11 @@ template <typename context_t>
   const GSUB &gsub = *(hb_ot_layout_from_face (c->face)->gsub);
   const SubstLookup &l = gsub.get_lookup (lookup_index);
   unsigned int saved_lookup_props = c->lookup_props;
-  c->set_lookup (l);
+  unsigned int saved_lookup_index = c->lookup_index;
+  c->set_lookup_index (lookup_index);
+  c->set_lookup_props (l.get_props ());
   bool ret = l.dispatch (c);
+  c->set_lookup_index (saved_lookup_index);
   c->set_lookup_props (saved_lookup_props);
   return ret;
 }
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-gsubgpos-private.hh
index 5033a223dfa..3e74dfeee70 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-gsubgpos-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-gsubgpos-private.hh
@@ -266,7 +266,8 @@ struct hb_add_coverage_context_t
 #define TRACE_APPLY(this) \
 	hb_auto_trace_t<HB_DEBUG_APPLY, bool> trace \
 	(&c->debug_depth, c->get_name (), this, HB_FUNC, \
-	 "idx %d codepoint %u", c->buffer->idx, c->buffer->cur().codepoint);
+	 "idx %d gid %u lookup %d", \
+	 c->buffer->idx, c->buffer->cur().codepoint, (int) c->lookup_index);
 
 struct hb_apply_context_t
 {
@@ -481,6 +482,7 @@ struct hb_apply_context_t
   const GDEF &gdef;
   bool has_glyph_classes;
   skipping_iterator_t iter_input, iter_context;
+  unsigned int lookup_index;
   unsigned int debug_depth;
 
 
@@ -499,12 +501,13 @@ struct hb_apply_context_t
 			has_glyph_classes (gdef.has_glyph_classes ()),
 			iter_input (),
 			iter_context (),
+			lookup_index ((unsigned int) -1),
 			debug_depth (0) {}
 
   inline void set_lookup_mask (hb_mask_t mask) { lookup_mask = mask; }
   inline void set_auto_zwj (bool auto_zwj_) { auto_zwj = auto_zwj_; }
   inline void set_recurse_func (recurse_func_t func) { recurse_func = func; }
-  inline void set_lookup (const Lookup &l) { set_lookup_props (l.get_props ()); }
+  inline void set_lookup_index (unsigned int lookup_index_) { lookup_index = lookup_index_; }
   inline void set_lookup_props (unsigned int lookup_props_)
   {
     lookup_props = lookup_props_;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-jstf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-jstf-table.hh
index 739dfd91067..739dfd91067 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-jstf-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-jstf-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-private.hh
index d168e27f534..d168e27f534 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout.cc
index 6fe7b6ca01b..39d007d6764 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout.cc
@@ -959,7 +959,7 @@ apply_string (OT::hb_apply_context_t *c,
   if (unlikely (!buffer->len || !c->lookup_mask))
     return;
 
-  c->set_lookup (lookup);
+  c->set_lookup_props (lookup.get_props ());
 
   if (likely (!lookup.is_reverse ()))
   {
@@ -1010,7 +1010,20 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
     const stage_map_t *stage = &stages[table_index][stage_index];
     for (; i < stage->last_lookup; i++)
     {
+#if 0
+      char buf[4096];
+      hb_buffer_serialize_glyphs (buffer, 0, buffer->len,
+				  buf, sizeof (buf), NULL,
+				  font,
+				  HB_BUFFER_SERIALIZE_FORMAT_TEXT,
+				  Proxy::table_index == 0 ?
+				  HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS :
+				  HB_BUFFER_SERIALIZE_FLAG_DEFAULT);
+      printf ("buf: [%s]\n", buf);
+#endif
+
       unsigned int lookup_index = lookups[table_index][i].index;
+      c.set_lookup_index (lookup_index);
       c.set_lookup_mask (lookups[table_index][i].mask);
       c.set_auto_zwj (lookups[table_index][i].auto_zwj);
       apply_string<Proxy> (&c,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout.h
index 949678ac422..949678ac422 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-layout.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-layout.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-map-private.hh
index f9538af1831..f9538af1831 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-map-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-map-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-map.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-map.cc
index 95bd04ee8e2..95bd04ee8e2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-map.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-map.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-maxp-table.hh
index 0d9a0fa1d87..0d9a0fa1d87 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-maxp-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-maxp-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-name-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-name-table.hh
index 21450c61382..21450c61382 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-name-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-name-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic-fallback.hh
index a77f24ec849..a77f24ec849 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic-fallback.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic-private.hh
index fcedc7d7420..fcedc7d7420 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic-table.hh
index 80d50443546..80d50443546 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic-win1256.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic-win1256.hh
index e70c48f427c..e70c48f427c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic-win1256.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic-win1256.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic.cc
index cde02e0a567..cde02e0a567 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-arabic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-arabic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-default.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-default.cc
index f7f097eedaa..f7f097eedaa 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-default.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-default.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-hangul.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-hangul.cc
index 763dbf00d08..763dbf00d08 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-hangul.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-hangul.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-hebrew.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-hebrew.cc
index c7b7a5eba6a..c7b7a5eba6a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-hebrew.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-hebrew.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic-machine.hh
index f652d4fda73..f652d4fda73 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic-machine.rl
index 694b235d1d1..694b235d1d1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic-private.hh
index 559ebe49867..559ebe49867 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic-table.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic-table.cc
index 2e159a12b00..2e159a12b00 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic-table.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic.cc
index b7f3d5c66e7..b7f3d5c66e7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-indic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-indic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-myanmar-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-myanmar-machine.hh
index 29fdf9a1aef..29fdf9a1aef 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-myanmar-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-myanmar-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-myanmar-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-myanmar-machine.rl
index 9649a916f02..9649a916f02 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-myanmar-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-myanmar-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-myanmar.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-myanmar.cc
index 7e3ab01d525..7e3ab01d525 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-myanmar.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-myanmar.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-private.hh
index 8d03dee51f1..8d03dee51f1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-thai.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-thai.cc
index feb7fc7a148..feb7fc7a148 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-thai.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-thai.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-tibetan.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-tibetan.cc
index 01465a426f8..01465a426f8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-tibetan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-tibetan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use-machine.hh
index ced9d97f28f..ced9d97f28f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use-machine.rl
index b8242bab1e7..b8242bab1e7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use-private.hh
index a1437362119..a1437362119 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use-table.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use-table.cc
index 6cd1c5db75f..6cd1c5db75f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use-table.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use.cc
index 1d44d220006..41eb43ffb69 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-complex-use.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-complex-use.cc
@@ -238,14 +238,6 @@ enum syllable_type_t {
 #include "hb-ot-shape-complex-use-machine.hh"
 
 
-static inline void
-set_use_properties (hb_glyph_info_t &info)
-{
-  hb_codepoint_t u = info.codepoint;
-  info.use_category() = hb_use_get_categories (u);
-}
-
-
 static void
 setup_masks_use (const hb_ot_shape_plan_t *plan,
 		 hb_buffer_t              *buffer,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-fallback-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-fallback-private.hh
index ec653513f1b..ec653513f1b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-fallback-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-fallback-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-fallback.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-fallback.cc
index 53274b502a5..748372d01fe 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-fallback.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-fallback.cc
@@ -418,13 +418,12 @@ _hb_ot_shape_fallback_position (const hb_ot_shape_plan_t *plan,
   _hb_buffer_assert_gsubgpos_vars (buffer);
 
   unsigned int start = 0;
-  unsigned int last_cluster = buffer->info[0].cluster;
   unsigned int count = buffer->len;
+  hb_glyph_info_t *info = buffer->info;
   for (unsigned int i = 1; i < count; i++)
-    if (buffer->info[i].cluster != last_cluster) {
+    if (likely (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&info[i])))) {
       position_cluster (plan, font, buffer, start, i);
       start = i;
-      last_cluster = buffer->info[i].cluster;
     }
   position_cluster (plan, font, buffer, start, count);
 }
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-normalize-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-normalize-private.hh
index c744e26451d..c744e26451d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-normalize-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-normalize-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-normalize.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-normalize.cc
index 8cc64af0144..111b5908f17 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-normalize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-normalize.cc
@@ -323,7 +323,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
   {
     unsigned int end;
     for (end = buffer->idx + 1; end < count; end++)
-      if (buffer->cur().cluster != buffer->info[end].cluster)
+      if (likely (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[end]))))
         break;
 
     decompose_cluster (&c, end, might_short_circuit, always_short_circuit);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-private.hh
index 54ac2c3cf7c..54ac2c3cf7c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape.cc
index f20be2aac8f..e24f7a837f7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape.cc
@@ -513,6 +513,8 @@ hb_ot_map_glyphs_fast (hb_buffer_t  *buffer)
   hb_glyph_info_t *info = buffer->info;
   for (unsigned int i = 0; i < count; i++)
     info[i].codepoint = info[i].glyph_index();
+
+  buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
 }
 
 static inline void
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape.h
index 1402f54acc5..1402f54acc5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-tag.cc
index 61c38b19626..61c38b19626 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-tag.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-tag.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-tag.h
index 1bf12ab3c09..1bf12ab3c09 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot-tag.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot-tag.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot.h
index 47c92a58e4b..47c92a58e4b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ot.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ot.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-private.hh
index 8112934324d..8112934324d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-set-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-set-private.hh
index 3c302b1daf6..3c302b1daf6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-set-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-set-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-set.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-set.cc
index cb7fcdbf64c..cb7fcdbf64c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-set.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-set.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-set.h
index bafdae96333..bafdae96333 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-set.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-set.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape-plan-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape-plan-private.hh
index 607da5e7791..607da5e7791 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape-plan-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape-plan-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape-plan.cc
index d2f293d69de..d2f293d69de 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape-plan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape-plan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape-plan.h
index 8f54552f90b..8f54552f90b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape-plan.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape-plan.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape.cc
index 5ddde5ad59d..5ddde5ad59d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape.h
index b665509a0dd..b665509a0dd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shaper-impl-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shaper-impl-private.hh
index 7844081e95b..7844081e95b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shaper-impl-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shaper-impl-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shaper-list.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shaper-list.hh
index 6c537d49215..6c537d49215 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shaper-list.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shaper-list.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shaper-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shaper-private.hh
index d1d1146dad2..d1d1146dad2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shaper-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shaper-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shaper.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shaper.cc
index 580b95c84b4..580b95c84b4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-shaper.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-shaper.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ucdn.cc
index b4a58332445..b4a58332445 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-ucdn.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-ucdn.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-unicode-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-unicode-private.hh
index 968bca5567d..968bca5567d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-unicode-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-unicode-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-unicode.cc
index 6b32faf667f..6b32faf667f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-unicode.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-unicode.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-unicode.h
index bf1796dcafd..bf1796dcafd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-unicode.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-unicode.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-uniscribe.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-uniscribe.cc
index e7bcad2ea86..3a08c747a1d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-uniscribe.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-uniscribe.cc
@@ -486,14 +486,16 @@ struct hb_uniscribe_shaper_font_data_t {
   LOGFONTW log_font;
   HFONT hfont;
   SCRIPT_CACHE script_cache;
+  double x_mult, y_mult; /* From LOGFONT space to HB space. */
 };
 
 static bool
 populate_log_font (LOGFONTW  *lf,
-		   hb_font_t *font)
+		   hb_font_t *font,
+		   unsigned int font_size)
 {
   memset (lf, 0, sizeof (*lf));
-  lf->lfHeight = -font->y_scale;
+  lf->lfHeight = -font_size;
   lf->lfCharSet = DEFAULT_CHARSET;
 
   hb_face_t *face = font->face;
@@ -513,9 +515,19 @@ _hb_uniscribe_shaper_font_data_create (hb_font_t *font)
   if (unlikely (!data))
     return NULL;
 
+  int font_size = font->face->get_upem (); /* Default... */
+  /* No idea if the following is even a good idea. */
+  if (font->y_ppem)
+    font_size = font->y_ppem;
+
+  if (font_size < 0)
+    font_size = -font_size;
+  data->x_mult = (double) font->x_scale / font_size;
+  data->y_mult = (double) font->y_scale / font_size;
+
   data->hdc = GetDC (NULL);
 
-  if (unlikely (!populate_log_font (&data->log_font, font))) {
+  if (unlikely (!populate_log_font (&data->log_font, font, font_size))) {
     DEBUG_MSG (UNISCRIBE, font, "Font populate_log_font() failed");
     _hb_uniscribe_shaper_font_data_destroy (data);
     return NULL;
@@ -1000,15 +1012,16 @@ retry:
 
   /* Set glyph positions */
   buffer->clear_positions ();
+  double x_mult = font_data->x_mult, y_mult = font_data->y_mult;
   for (unsigned int i = 0; i < glyphs_len; i++)
   {
     hb_glyph_info_t *info = &buffer->info[i];
     hb_glyph_position_t *pos = &buffer->pos[i];
 
     /* TODO vertical */
-    pos->x_advance = info->mask;
-    pos->x_offset = backward ? -info->var1.u32 : info->var1.u32;
-    pos->y_offset = info->var2.u32;
+    pos->x_advance = x_mult * info->mask;
+    pos->x_offset = x_mult * (backward ? -info->var1.u32 : info->var1.u32);
+    pos->y_offset = y_mult * info->var2.u32;
   }
 
   if (backward)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-uniscribe.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-uniscribe.h
index 001ab38ea87..001ab38ea87 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-uniscribe.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-uniscribe.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-utf-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-utf-private.hh
index 14d3c2e369b..14d3c2e369b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-utf-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-utf-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-version.h.in
index 2517160d18b..2517160d18b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-version.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-version.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-warning.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-warning.cc
index 8f322bcb10d..8f322bcb10d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb-warning.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb-warning.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb.h
index c5a938a3818..c5a938a3818 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/hb.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/hb.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/main.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/main.cc
index f9708cc948e..f9708cc948e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/main.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/main.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/test-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/test-buffer-serialize.cc
index 18c46e9524b..18c46e9524b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/test-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/test-buffer-serialize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/test-size-params.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/test-size-params.cc
index 35d9e3c8e25..35d9e3c8e25 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/test-size-params.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/test-size-params.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/test-would-substitute.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/test-would-substitute.cc
index 8ea87cdf397..8ea87cdf397 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/test-would-substitute.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/test-would-substitute.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/test.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/test.cc
index a8fe046f34c..a8fe046f34c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.1/src/test.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.2/src/test.cc
diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac
index 25eb9ce3874..f733789c08d 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], [1.0.1])
+m4_define([harfbuzz_version], [1.0.2])