harfbuzz 0.9.11

git-svn-id: svn://tug.org/texlive/trunk@28795 c570f23f-e606-0410-a88d-b1316a301751

125 files changed, 122 insertions, 77 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 632a8ebcc56..3b6d0215932 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -25,7 +25,7 @@ gd 2.0.35 - unchecked 10may12, libgd still down
 graphite2 1.2.0 - checked 4dec12
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
-harfbuzz 0.9.10 - checked 3jan13
+harfbuzz 0.9.11 - checked 11jan13
   http://www.freedesktop.org/software/harfbuzz/release/
 
 icu 50.1 (50_1) - checked 7nov12
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 130281a2a87..9cf1311cb01 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import harfbuzz-0.9.11.
+	* version.ac: Adjust.
+
 2013-01-03  Khaled Hosny  <khaledhosny@eglug.org>
 
 	Import harfbuzz-0.9.10.
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index bb2ac892831..ced5884e3fd 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -54,7 +54,7 @@ subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/config.h.in \
-	$(top_srcdir)/harfbuzz-0.9.10/src/hb-version.h.in \
+	$(top_srcdir)/harfbuzz-0.9.11/src/hb-version.h.in \
 	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
@@ -514,7 +514,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.10/src/hb-version.h.in
+hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.11/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 f5db637e1b8..1859db91563 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 for TeX Live 0.9.10.
+# Generated by GNU Autoconf 2.69 for harfbuzz for TeX Live 0.9.11.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='harfbuzz for TeX Live'
 PACKAGE_TARNAME='harfbuzz-for-tex-live'
-PACKAGE_VERSION='0.9.10'
-PACKAGE_STRING='harfbuzz for TeX Live 0.9.10'
+PACKAGE_VERSION='0.9.11'
+PACKAGE_STRING='harfbuzz for TeX Live 0.9.11'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="harfbuzz-0.9.10/harfbuzz.pc.in"
+ac_unique_file="harfbuzz-0.9.11/harfbuzz.pc.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1360,7 +1360,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 for TeX Live 0.9.10 to adapt to many kinds of systems.
+\`configure' configures harfbuzz for TeX Live 0.9.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1431,7 +1431,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of harfbuzz for TeX Live 0.9.10:";;
+     short | recursive ) echo "Configuration of harfbuzz for TeX Live 0.9.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1555,7 +1555,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-harfbuzz for TeX Live configure 0.9.10
+harfbuzz for TeX Live configure 0.9.11
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2045,7 +2045,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 for TeX Live $as_me 0.9.10, which was
+It was created by harfbuzz for TeX Live $as_me 0.9.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3909,7 +3909,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='harfbuzz-for-tex-live'
- VERSION='0.9.10'
+ VERSION='0.9.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4065,8 +4065,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 HB_VERSION_MAJOR=0
 HB_VERSION_MINOR=9
-HB_VERSION_MICRO=10
-HB_VERSION=0.9.10
+HB_VERSION_MICRO=11
+HB_VERSION=0.9.11
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -16486,7 +16486,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-harfbuzz for TeX Live config.lt 0.9.10
+harfbuzz for TeX Live config.lt 0.9.11
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -18302,14 +18302,14 @@ $as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h
 
 fi
 
-HARFBUZZ_TREE=harfbuzz-0.9.10
+HARFBUZZ_TREE=harfbuzz-0.9.11
 
 
 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.10/src/hb-version.h.in"
+ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.11/src/hb-version.h.in"
 
 
 cat >confcache <<\_ACEOF
@@ -18858,7 +18858,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 for TeX Live $as_me 0.9.10, which was
+This file was extended by harfbuzz for TeX Live $as_me 0.9.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18924,7 +18924,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 for TeX Live config.status 0.9.10
+harfbuzz for TeX Live config.status 0.9.11
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19434,7 +19434,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.10/src/hb-version.h.in" ;;
+    "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.11/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.10-PATCHES/patch-01-const b/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/patch-01-const
deleted file mode 100644
index 98eabbd22ec..00000000000
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/patch-01-const
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur harfbuzz-0.9.10.orig/src/hb-ot-layout-gsubgpos-private.hh harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh
---- harfbuzz-0.9.10.orig/src/hb-ot-layout-gsubgpos-private.hh	2013-01-03 07:14:24.000000000 +0100
-+++ harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh	2013-01-04 13:31:51.000000000 +0100
-@@ -62,7 +62,7 @@
-   template <typename T>
-   inline return_t process (const T &obj) { obj.closure (this); return HB_VOID; }
-   static return_t default_return_value (void) { return HB_VOID; }
--  bool stop_sublookup_iteration (const return_t r HB_UNUSED) const { return false; }
-+  bool stop_sublookup_iteration (return_t r HB_UNUSED) const { return false; }
-   return_t recurse (unsigned int lookup_index)
-   {
-     if (unlikely (nesting_level_left == 0 || !recurse_func))
-@@ -111,7 +111,7 @@
-   template <typename T>
-   inline return_t process (const T &obj) { return obj.would_apply (this); }
-   static return_t default_return_value (void) { return false; }
--  bool stop_sublookup_iteration (const return_t r) const { return r; }
-+  bool stop_sublookup_iteration (return_t r) const { return r; }
- 
-   hb_face_t *face;
-   const hb_codepoint_t *glyphs;
-@@ -150,7 +150,7 @@
-   template <typename T>
-   inline return_t process (const T &obj) { obj.collect_glyphs (this); return HB_VOID; }
-   static return_t default_return_value (void) { return HB_VOID; }
--  bool stop_sublookup_iteration (const return_t r HB_UNUSED) const { return false; }
-+  bool stop_sublookup_iteration (return_t r HB_UNUSED) const { return false; }
-   return_t recurse (unsigned int lookup_index)
-   {
-     if (unlikely (nesting_level_left == 0 || !recurse_func))
-@@ -243,7 +243,7 @@
-   template <typename T>
-   inline return_t process (const T &obj) { return obj.apply (this); }
-   static return_t default_return_value (void) { return false; }
--  bool stop_sublookup_iteration (const return_t r) const { return r; }
-+  bool stop_sublookup_iteration (return_t r) const { return r; }
-   return_t recurse (unsigned int lookup_index)
-   {
-     if (unlikely (nesting_level_left == 0 || !recurse_func))
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.11-PATCHES/ChangeLog
index f83bde030e3..7a7357c25d5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported harfbuzz-0.9.11 source tree from:
+	  http://www.freedesktop.org/software/harfbuzz/release/
+	* patch-01-const (removed): Applied upstream.
+
 2013-01-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-01-const (new): Backport from upstream.
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-0.9.11-PATCHES/TL-Changes
index be519ce4cc3..6cd29deacee 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/TL-Changes
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the harfbuzz-0.9.10/ tree as obtained from:
-	http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.10.tar.bz2
+Changes applied to the harfbuzz-0.9.11/ tree as obtained from:
+	http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.11.tar.bz2
 
 Removed:
 	COPYING
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/AUTHORS b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/AUTHORS
index c611d7d4769..c611d7d4769 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/AUTHORS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/AUTHORS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/Android.mk b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/Android.mk
index 832d55e475a..832d55e475a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/Android.mk
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/Android.mk
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/Makefile.am
index d7181268797..d7181268797 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/NEWS b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/NEWS
index ef643f02134..51fe2cea0bd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/NEWS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/NEWS
@@ -1,3 +1,17 @@
+Overview of changes leading to 0.9.11
+Thursday, January 10, 2013
+=====================================
+
+- Build fixes.
+- Fix GPOS mark attachment with null Anchor offsets.
+- [Indic] Fix old-spec reordering of viramas if sequence ends in one.
+- Fix multi-threaded shaper data creation crash.
+- Add atomic ops for Solaris.
+
+API changes:
+- Rename hb_buffer_clear() to hb_buffer_clear_contents().
+
+
 Overview of changes leading to 0.9.10
 Thursday, January 3, 2013
 =====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/README b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/README
index 74e739da52a..74e739da52a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/README
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/README
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/THANKS b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/THANKS
index 940cfde5c39..940cfde5c39 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/THANKS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/THANKS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/TODO b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/TODO
index c93b33e62d7..c93b33e62d7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/TODO
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/TODO
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/autogen.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/autogen.sh
index 47640c3e490..47640c3e490 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/autogen.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/autogen.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/config.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/config.h.in
index 0973c936bb2..4b5c99a7b4d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/config.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/config.h.in
@@ -78,9 +78,12 @@
 /* Define to 1 if you have the <sched.h> header file. */
 #undef HAVE_SCHED_H
 
-/* Define to 1 if you have the `sched_yield' function. */
+/* Have sched_yield */
 #undef HAVE_SCHED_YIELD
 
+/* Have Solaris __machine_*_barrier and atomic_* operations */
+#undef HAVE_SOLARIS_ATOMIC_OPS
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/configure.ac
index 91ea7136938..afb0c5d08cb 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/configure.ac
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [0.9.10],
+        [0.9.11],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
@@ -55,8 +55,8 @@ dnl GOBJECT_INTROSPECTION_CHECK([0.9.0])
 dnl GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
 
 # Functions and headers
-AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize sched_yield mmap _setmode isatty)
-AC_CHECK_HEADERS(unistd.h sys/mman.h sched.h io.h)
+AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap _setmode isatty)
+AC_CHECK_HEADERS(unistd.h sys/mman.h io.h)
 
 # Compiler flags
 AC_CANONICAL_HOST
@@ -171,6 +171,7 @@ dnl ==========================================================================
 
 PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, have_icu=false)
 if $have_icu; then
+	CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS icu-uc`"
 	AC_DEFINE(HAVE_ICU, 1, [Have ICU library])
 fi
 AM_CONDITIONAL(HAVE_ICU, $have_icu)
@@ -260,6 +261,29 @@ fi
 
 dnl ===========================================================================
 
+AC_CACHE_CHECK([for Solaris atomic operations], hb_cv_have_solaris_atomic_ops, [
+	hb_cv_have_solaris_atomic_ops=false
+	AC_TRY_LINK([
+		#include <atomic.h>
+		/* This requires Solaris Studio 12.2 or newer: */
+		#include <mbarrier.h>
+		void memory_barrier (void) { __machine_rw_barrier (); }
+		int atomic_add (volatile unsigned *i) { return atomic_add_int_nv (i, 1); }
+		void *atomic_ptr_cmpxchg (volatile void **target, void *cmp, void *newval) { return atomic_cas_ptr (target, cmp, newval); }
+		], [], hb_cv_have_solaris_atomic_ops=true
+	)
+])
+if $hb_cv_have_solaris_atomic_ops; then
+	AC_DEFINE(HAVE_SOLARIS_ATOMIC_OPS, 1, [Have Solaris __machine_*_barrier and atomic_* operations])
+fi
+
+if test "$os_win32" = no && ! $have_pthread; then
+	AC_CHECK_HEADERS(sched.h)
+	AC_SEARCH_LIBS(sched_yield,rt,AC_DEFINE(HAVE_SCHED_YIELD, 1, [Have sched_yield]))
+fi
+
+dnl ===========================================================================
+
 AC_CONFIG_FILES([
 Makefile
 harfbuzz.pc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/harfbuzz.doap b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/harfbuzz.doap
index d2896ebefa8..d2896ebefa8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/harfbuzz.doap
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/harfbuzz.doap
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/harfbuzz.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/harfbuzz.pc.in
index e92319e156c..e92319e156c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/harfbuzz.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/harfbuzz.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/Makefile.am
index 558ce08ead9..558ce08ead9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-c-linkage-decls.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-c-linkage-decls.sh
index 44cdfa0f23c..44cdfa0f23c 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-c-linkage-decls.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-c-linkage-decls.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-exported-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-exported-symbols.sh
index 6f0bf7fd823..6f0bf7fd823 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-exported-symbols.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-exported-symbols.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-header-guards.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-header-guards.sh
index af9fa7fc24e..af9fa7fc24e 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-header-guards.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-header-guards.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-includes.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-includes.sh
index 79323a74fb2..79323a74fb2 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-includes.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-includes.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-internal-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-internal-symbols.sh
index a8fdc537dd7..a8fdc537dd7 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-internal-symbols.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-internal-symbols.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-libstdc++.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-libstdc++.sh
index e7e0e295e1a..e7e0e295e1a 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-libstdc++.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-libstdc++.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-static-inits.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-static-inits.sh
index bb0a7ff630d..bb0a7ff630d 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/check-static-inits.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/check-static-inits.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/gen-arabic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/gen-arabic-table.py
index da5a4fcbf5c..da5a4fcbf5c 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/gen-arabic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/gen-arabic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/gen-indic-table.py
index 94aa2ab0728..94aa2ab0728 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/gen-indic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/gen-indic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-atomic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-atomic-private.hh
index 67579cdd442..75fbcd6f77e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-atomic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-atomic-private.hh
@@ -99,6 +99,18 @@ typedef int hb_atomic_int_t;
 #define hb_atomic_ptr_cmpexch(P,O,N)	__sync_bool_compare_and_swap ((P), (O), (N))
 
 
+#elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)
+
+#include <atomic.h>
+#include <mbarrier.h>
+
+typedef unsigned int fc_atomic_int_t;
+#define fc_atomic_int_add(AI, V)	( ({__machine_rw_barrier ();}), atomic_add_int_nv (&(AI), (V)) - (V))
+
+#define fc_atomic_ptr_get(P)		( ({__machine_rw_barrier ();}), (void *) *(P))
+#define fc_atomic_ptr_cmpexch(P,O,N)	( ({__machine_rw_barrier ();}), atomic_cas_ptr ((P), (O), (N)) == (void *) (O) ? FcTrue : FcFalse)
+
+
 #elif !defined(HB_NO_MT)
 
 #define HB_ATOMIC_INT_NIL 1 /* Warn that fallback implementation is in use. */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-blob.cc
index b6e696be322..b6e696be322 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-blob.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-blob.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-blob.h
index 1a93baa46dc..1a93baa46dc 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-blob.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-blob.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-buffer-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-buffer-private.hh
index 13cf4bb0e9b..13cf4bb0e9b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-buffer-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-buffer-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-buffer.cc
index 4b644e40217..c7860e9bc30 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-buffer.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-buffer.cc
@@ -790,7 +790,7 @@ hb_buffer_reset (hb_buffer_t *buffer)
 }
 
 void
-hb_buffer_clear (hb_buffer_t *buffer)
+hb_buffer_clear_contents (hb_buffer_t *buffer)
 {
   buffer->clear ();
 }
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-buffer.h
index 48ec4a527ad..5386e360add 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-buffer.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-buffer.h
@@ -193,7 +193,7 @@ hb_buffer_reset (hb_buffer_t *buffer);
 
 /* Like reset, but does NOT clear unicode_funcs. */
 void
-hb_buffer_clear (hb_buffer_t *buffer);
+hb_buffer_clear_contents (hb_buffer_t *buffer);
 
 /* Returns false if allocation failed */
 hb_bool_t
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-cache-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-cache-private.hh
index 19b70b7e395..19b70b7e395 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-cache-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-cache-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-common.cc
index 9422555cfbc..9422555cfbc 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-common.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-common.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-common.h
index cc221d33be9..cc221d33be9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-common.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-common.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-coretext.cc
index 8f94795928c..8f94795928c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-coretext.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-coretext.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-coretext.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-coretext.h
index c4954fa1b2c..c4954fa1b2c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-coretext.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-coretext.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-fallback-shape.cc
index bdc8a80c4bd..bdc8a80c4bd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-fallback-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-fallback-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-font-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-font-private.hh
index 48fbb0ee549..48fbb0ee549 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-font-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-font-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-font.cc
index b59fdebaea7..b59fdebaea7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-font.h
index 88d489551e8..88d489551e8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-font.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ft.cc
index 6198185e9e4..6198185e9e4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ft.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ft.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ft.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ft.h
index 696251e143f..696251e143f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ft.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ft.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-glib.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-glib.cc
index 676e6601628..676e6601628 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-glib.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-glib.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-glib.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-glib.h
index 63a9d3366c5..63a9d3366c5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-glib.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-glib.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-gobject-enums.cc.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-gobject-enums.cc.tmpl
index 05abd898d4f..05abd898d4f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-gobject-enums.cc.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-gobject-enums.cc.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-gobject-structs.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-gobject-structs.cc
index cec48542275..cec48542275 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-gobject-structs.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-gobject-structs.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-gobject.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-gobject.h
index 4f23fdd385d..4f23fdd385d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-gobject.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-gobject.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-graphite2.cc
index 16ef9a4dabe..16ef9a4dabe 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-graphite2.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-graphite2.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-graphite2.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-graphite2.h
index bea68f939b4..bea68f939b4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-graphite2.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-graphite2.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-icu-le.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-icu-le.cc
index c05d330b957..c05d330b957 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-icu-le.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-icu-le.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-icu.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-icu.cc
index c177be2c4b2..c177be2c4b2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-icu.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-icu.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-icu.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-icu.h
index f2f35f0f2ce..f2f35f0f2ce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-icu.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-icu.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-mutex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-mutex-private.hh
index 5b3a17e9174..5b3a17e9174 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-mutex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-mutex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-object-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-object-private.hh
index 8a9ae34dbee..8a9ae34dbee 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-object-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-object-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-old.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-old.cc
index a7ea8ed9bbe..a7ea8ed9bbe 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-old.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-old.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-open-file-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-open-file-private.hh
index 250504ae20b..250504ae20b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-open-file-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-open-file-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-open-type-private.hh
index 5bfeb165470..90f28364019 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-open-type-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-open-type-private.hh
@@ -616,10 +616,20 @@ struct Index : USHORT {
 DEFINE_NULL_DATA (Index, "\xff\xff");
 
 /* Offset to a table, same as uint16 (length = 16 bits), Null offset = 0x0000 */
-typedef USHORT Offset;
+struct Offset : USHORT
+{
+  inline bool is_null (void) const { return 0 == *this; }
+  public:
+  DEFINE_SIZE_STATIC (2);
+};
 
 /* LongOffset to a table, same as uint32 (length = 32 bits), Null offset = 0x00000000 */
-typedef ULONG LongOffset;
+struct LongOffset : ULONG
+{
+  inline bool is_null (void) const { return 0 == *this; }
+  public:
+  DEFINE_SIZE_STATIC (4);
+};
 
 
 /* CheckSum */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-head-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-head-table.hh
index 3a9451295de..3a9451295de 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-head-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-head-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-hhea-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-hhea-table.hh
index 2b89c4e0208..2b89c4e0208 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-hhea-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-hhea-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-hmtx-table.hh
index b94337d0be7..b94337d0be7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-hmtx-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-hmtx-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-common-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-common-private.hh
index e6018db1243..e6018db1243 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-common-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-common-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gdef-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-gdef-table.hh
index ff2d09c51f0..ff2d09c51f0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gdef-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-gdef-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-gpos-table.hh
index d27ce4f71ee..3e436946b8b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gpos-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-gpos-table.hh
@@ -336,8 +336,10 @@ struct Anchor
 
 struct AnchorMatrix
 {
-  inline const Anchor& get_anchor (unsigned int row, unsigned int col, unsigned int cols) const {
+  inline const Anchor& get_anchor (unsigned int row, unsigned int col, unsigned int cols, bool *found) const {
+    *found = false;
     if (unlikely (row >= rows || col >= cols)) return Null(Anchor);
+    *found = !matrix[row * cols + col].is_null ();
     return this+matrix[row * cols + col];
   }
 
@@ -392,7 +394,11 @@ struct MarkArray : ArrayOf<MarkRecord>	/* Array of MarkRecords--in Coverage orde
     unsigned int mark_class = record.klass;
 
     const Anchor& mark_anchor = this + record.markAnchor;
-    const Anchor& glyph_anchor = anchors.get_anchor (glyph_index, mark_class, class_count);
+    bool found;
+    const Anchor& glyph_anchor = anchors.get_anchor (glyph_index, mark_class, class_count, &found);
+    /* If this subtable doesn't have an anchor for this base and this class,
+     * return false such that the subsequent subtables have a chance at it. */
+    if (unlikely (!found)) return TRACE_RETURN (false);
 
     hb_position_t mark_x, mark_y, base_x, base_y;
 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-gsub-table.hh
index 2642acbbb5c..2642acbbb5c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsub-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-gsub-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-gsubgpos-private.hh
index 0b000051f74..0b000051f74 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-gsubgpos-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-private.hh
index 49093de8a1e..49093de8a1e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout.cc
index 5c266e61942..5c266e61942 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout.h
index 134f1a6c164..134f1a6c164 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-layout.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-map-private.hh
index b140207aa97..b140207aa97 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-map-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-map-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-map.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-map.cc
index 62f7904b2f9..62f7904b2f9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-map.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-map.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-maxp-table.hh
index 0ce3ebcc2a6..0ce3ebcc2a6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-maxp-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-maxp-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-name-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-name-table.hh
index 75a1b94ea31..75a1b94ea31 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-name-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-name-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-arabic-fallback.hh
index 4fcd0a2fd94..4fcd0a2fd94 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-arabic-fallback.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-arabic-table.hh
index 730a275bf0a..730a275bf0a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-arabic-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-arabic-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-arabic.cc
index 35356fe97d3..35356fe97d3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-arabic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-arabic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-default.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-default.cc
index 5340293db50..5340293db50 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-default.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-default.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic-machine.hh
index ed40b968bcb..ed40b968bcb 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic-machine.rl
index 11115c9cda4..11115c9cda4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic-private.hh
index e36090e4837..e36090e4837 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic-table.hh
index 70765b6d6f4..70765b6d6f4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic.cc
index 1bc8a773e31..5afede0c1b5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-indic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-indic.cc
@@ -644,15 +644,16 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
     info[start].indic_position() = POS_RA_TO_BECOME_REPH;
 
   /* For old-style Indic script tags, move the first post-base Halant after
-   * last consonant. */
+   * last consonant.  Only do this if there is *not* a Halant after last
+   * consonant.  Otherwise it becomes messy. */
   if (indic_plan->is_old_spec) {
     for (unsigned int i = base + 1; i < end; i++)
       if (info[i].indic_category() == OT_H) {
         unsigned int j;
         for (j = end - 1; j > i; j--)
-	  if (is_consonant (info[j]))
+	  if (is_consonant (info[j]) || info[j].indic_category() == OT_H)
 	    break;
-	if (j > i) {
+	if (info[j].indic_category() != OT_H && j > i) {
 	  /* Move Halant to after last consonant. */
 	  hb_glyph_info_t t = info[i];
 	  memmove (&info[i], &info[i + 1], (j - i) * sizeof (info[0]));
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-private.hh
index 26871c2fc09..26871c2fc09 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-thai.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-thai.cc
index 24d476a0ba3..24d476a0ba3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-complex-thai.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-complex-thai.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-fallback-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-fallback-private.hh
index 5e9cb061780..5e9cb061780 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-fallback-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-fallback-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-fallback.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-fallback.cc
index 6f3426e6b49..6f3426e6b49 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-fallback.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-fallback.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-normalize-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-normalize-private.hh
index 8112f03aee9..8112f03aee9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-normalize-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-normalize-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-normalize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-normalize.cc
index c5325e42b53..c5325e42b53 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-normalize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-normalize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-private.hh
index 23e80b7bdfa..23e80b7bdfa 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape.cc
index 96461d7079e..96461d7079e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-tag.cc
index 91ebec76ee3..91ebec76ee3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-tag.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-tag.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-tag.h
index 1bf12ab3c09..1bf12ab3c09 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-tag.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot-tag.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot.h
index 80739063991..80739063991 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ot.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-private.hh
index be0d505f7b5..be0d505f7b5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-set-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-set-private.hh
index 5e30a7e3616..5e30a7e3616 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-set-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-set-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-set.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-set.cc
index 5f427a5d8e0..5f427a5d8e0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-set.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-set.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-set.h
index 291e24974e6..291e24974e6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-set.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-set.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape-plan-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape-plan-private.hh
index dd014e38d01..dd014e38d01 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape-plan-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape-plan-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape-plan.cc
index 22a226f3a6c..22a226f3a6c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape-plan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape-plan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape-plan.h
index 8f54552f90b..8f54552f90b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape-plan.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape-plan.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape.cc
index 389ce3e34b1..389ce3e34b1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape.h
index 10a35cb517e..10a35cb517e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shaper-impl-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shaper-impl-private.hh
index 7844081e95b..7844081e95b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shaper-impl-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shaper-impl-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shaper-list.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shaper-list.hh
index b9c029e58f1..b9c029e58f1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shaper-list.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shaper-list.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shaper-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shaper-private.hh
index 9d30c1ea0c2..29c4493943d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shaper-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shaper-private.hh
@@ -95,7 +95,10 @@ hb_##shaper##_shaper_##object##_data_ensure (hb_##object##_t *object) \
     if (unlikely (!data)) \
       data = (HB_SHAPER_DATA_TYPE (shaper, object) *) HB_SHAPER_DATA_INVALID; \
     if (!hb_atomic_ptr_cmpexch (&HB_SHAPER_DATA (shaper, object), NULL, data)) { \
-      HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (data); \
+      if (data && \
+	  data != HB_SHAPER_DATA_INVALID && \
+	  data != HB_SHAPER_DATA_SUCCEEDED) \
+	HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (data); \
       goto retry; \
     } \
   } \
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shaper.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shaper.cc
index 1c1aed9034a..1c1aed9034a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-shaper.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-shaper.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-tt-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-tt-font.cc
index c503a404380..c503a404380 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-tt-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-tt-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ucdn.cc
index 61e6ad36229..61e6ad36229 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ucdn.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-ucdn.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-unicode-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-unicode-private.hh
index 7be4b04da6b..7be4b04da6b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-unicode-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-unicode-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-unicode.cc
index 0a3907eec8c..0a3907eec8c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-unicode.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-unicode.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-unicode.h
index 2e10d98a3b3..2e10d98a3b3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-unicode.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-unicode.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-uniscribe.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-uniscribe.cc
index 2f01c28778f..2f01c28778f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-uniscribe.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-uniscribe.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-uniscribe.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-uniscribe.h
index 51887c8794b..51887c8794b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-uniscribe.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-uniscribe.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-utf-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-utf-private.hh
index b9a6519d28e..b9a6519d28e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-utf-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-utf-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-version.h.in
index 43634f91ce8..43634f91ce8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-version.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-version.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-warning.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-warning.cc
index 01adceac325..01adceac325 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-warning.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb-warning.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb.h
index 52c479cc2e5..52c479cc2e5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/hb.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/main.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/main.cc
index b362744e213..b362744e213 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/main.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/main.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/test-size-params.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/test-size-params.cc
index 947b5669a14..947b5669a14 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/test-size-params.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/test-size-params.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/test-would-substitute.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/test-would-substitute.cc
index 4731e265607..4731e265607 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/test-would-substitute.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/test-would-substitute.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/test.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/test.cc
index 22108b86b7a..22108b86b7a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/test.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.11/src/test.cc
diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac
index 22de668c57b..b70535456c2 100644
--- a/Build/source/libs/harfbuzz/version.ac
+++ b/Build/source/libs/harfbuzz/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current harfbuzz version
-m4_define([harfbuzz_version], [0.9.10])
+m4_define([harfbuzz_version], [0.9.11])