[HarfBuzz] harfbuzz: Branch 'master' - 3 commits

[Behdad Esfahbod]

 NEWS                     |   10 ++++++++++
 configure.ac             |    4 ++--
 src/hb-ot-layout.cc      |    6 +++---
 test/shaping/Makefile.am |    3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit dce79c2bd747d398bdf2f4b171b0ba9b5b951f72
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 28 20:26:40 2013 +0100

    0.9.23

diff --git a/NEWS b/NEWS
index ae4bc2b..3636f77 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Overview of changes leading to 0.9.23
+Monday, October 28, 2013
+=====================================
+
+- "Udupi HarfBuzz Hackfest", Paris, October 14..18 2013.
+- Fix (Chain)Context recursion with non-monotone lookup positions.
+- Misc Indic bug fixes.
+- New Javanese / Buginese shaping, similar to Windows 8.1.
+
+
 Overview of changes leading to 0.9.22
 Thursday, October 3, 2013
 =====================================
diff --git a/configure.ac b/configure.ac
index 45d70a6..d1c40da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [0.9.22],
+        [0.9.23],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
commit 2e990a3d722c10d1eefdc4c5ccbdaa384625c3fd
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 28 20:23:07 2013 +0100

    Make "make distcheck" happy

diff --git a/configure.ac b/configure.ac
index 17a7fb9..45d70a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/harfbuzz.pc.in])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.11.1 gnits dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability])
+AM_INIT_AUTOMAKE([1.11.1 gnits tar-pax dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability])
 AM_SILENT_RULES([yes])
 
 # Initialize libtool
diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index d45dd30..7fcb54c 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -21,6 +21,9 @@ EXTRA_DIST += \
 	hb-unicode-encode \
 	hb-unicode-prettyname \
 	run-tests.sh \
+	texts/in-tree \
+	fonts/sha1sum \
+	$(TESTS) \
 	$(NULL)
 
 # TODO Figure out Python stuff
commit 6ffc007b61402c9d1d4de368deed4971a10ed00b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 28 19:26:02 2013 +0100

    [otlayout] Optimize inplace
    
    See thread started by Jonathan with subject "an optimization for complex
    fonts".

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index bd8ef08..183726e 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -783,6 +783,7 @@ hb_ot_layout_get_size_params (hb_face_t    *face,
 struct GSUBProxy
 {
   static const unsigned int table_index = 0;
+  static const bool inplace = false;
   typedef OT::SubstLookup Lookup;
 
   GSUBProxy (hb_face_t *face) :
@@ -796,6 +797,7 @@ struct GSUBProxy
 struct GPOSProxy
 {
   static const unsigned int table_index = 1;
+  static const bool inplace = true;
   typedef OT::PosLookup Lookup;
 
   GPOSProxy (hb_face_t *face) :
@@ -823,8 +825,6 @@ apply_string (OT::hb_apply_context_t *c,
 	      const hb_ot_layout_lookup_accelerator_t &accel)
 {
   bool ret = false;
-  OT::hb_is_inplace_context_t inplace_c (c->face);
-  bool inplace = lookup.is_inplace (&inplace_c);
   hb_buffer_t *buffer = c->buffer;
 
   if (unlikely (!buffer->len || !c->lookup_mask))
@@ -850,7 +850,7 @@ apply_string (OT::hb_apply_context_t *c,
     }
     if (ret)
     {
-      if (!inplace)
+      if (!Proxy::inplace)
 	buffer->swap_buffers ();
       else
         assert (!buffer->has_separate_output ());