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

[Behdad Esfahbod]

 src/hb-ot-shape-complex-indic.cc |    4 ++++
 util/options.cc                  |    6 +++---
 util/options.hh                  |    1 -
 util/view-cairo.cc               |    2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 422558142aabb996d8ad1848df7ea4d5a8ade98a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 19 17:57:02 2011 -0400

    [util] Account for line-space in surface size

diff --git a/util/options.cc b/util/options.cc
index a48f606..97be635 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -640,7 +640,7 @@ format_options_t::serialize (hb_buffer_t *buffer,
   hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, NULL);
 
   g_string_append_c (gs, '<');
-  for (unsigned int i = 0; i < (int) num_glyphs; i++)
+  for (unsigned int i = 0; i < num_glyphs; i++)
   {
     if (i)
       g_string_append_c (gs, '|');
diff --git a/util/options.hh b/util/options.hh
index af9bedb..171fbe6 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include <assert.h>
 #include <stdio.h>
 #include <math.h>
 #include <locale.h>
diff --git a/util/view-cairo.cc b/util/view-cairo.cc
index 4671147..f766a4f 100644
--- a/util/view-cairo.cc
+++ b/util/view-cairo.cc
@@ -65,7 +65,7 @@ view_cairo_t::get_surface_size (cairo_scaled_font_t *scaled_font,
 
   *h = font_extents.ascent
      + font_extents.descent
-     + ((int) lines->len - 1) * font_extents.height;
+     + ((int) lines->len - 1) * (font_extents.height + line_space);
   *w = 0;
   for (unsigned int i = 0; i < lines->len; i++) {
     helper_cairo_line_t &line = g_array_index (lines, helper_cairo_line_t, i);
commit b5afd8f78e6b372f1bbed469329c1554adb20eea
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 19 16:56:21 2011 -0400

    [util] Rename --output to --output_file, and --format to --output-format

diff --git a/util/options.cc b/util/options.cc
index 21ab973..a48f606 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -421,8 +421,8 @@ output_options_t::add_options (option_parser_t *parser)
 {
   GOptionEntry entries[] =
   {
-    {"output",		0, 0, G_OPTION_ARG_STRING,	&this->output_file,		"Set output file-name (default: stdout)","filename"},
-    {"format",		0, 0, G_OPTION_ARG_STRING,	&this->output_format,		"Set output format",			"format"},
+    {"output-file",	0, 0, G_OPTION_ARG_STRING,	&this->output_file,		"Set output file-name (default: stdout)","filename"},
+    {"output-format",	0, 0, G_OPTION_ARG_STRING,	&this->output_format,		"Set output format",			"format"},
     {NULL}
   };
   parser->add_group (entries,
commit 0a965eee880428a43ad7f9d1317c344666247dd7
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 19 16:53:47 2011 -0400

    Minor

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index f3bae9a..4ef19c0 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -643,6 +643,10 @@ found_non_indic (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *mask_ar
 static void
 remove_joiners (hb_buffer_t *buffer)
 {
+  /* For now we remove joiners.  However, Uniscbire seems to keep them
+   * and output a zero-width space glyph for them.  It is not clear to
+   * me how that is supposed to interact with GSUB. */
+
   buffer->clear_output ();
   unsigned int count = buffer->len;
   for (buffer->idx = 0; buffer->idx < count;)