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

[Behdad Esfahbod]

 TODO                         |    2 ++
 src/hb-ot-shape-normalize.cc |    4 ++++
 test/test-c.c                |    2 +-
 util/options.cc              |   17 ++++++++++++++++-
 4 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit fd528c17b7b5ac912f1ac980e1d9981f561c3b46
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Oct 12 15:03:58 2011 -0400

    [util] Add --list-shapers to hb-view and hb-shape

diff --git a/util/options.cc b/util/options.cc
index 349c199..a3da825 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -182,6 +182,19 @@ parse_shapers (const char *name G_GNUC_UNUSED,
   return TRUE;
 }
 
+static G_GNUC_NORETURN gboolean
+list_shapers (const char *name G_GNUC_UNUSED,
+	      const char *arg G_GNUC_UNUSED,
+	      gpointer    data G_GNUC_UNUSED,
+	      GError    **error G_GNUC_UNUSED)
+{
+  for (const char **shaper = hb_shape_list_shapers (); *shaper; shaper++)
+    g_printf ("%s\n", *shaper);
+
+  exit(0);
+}
+
+
 
 static void
 parse_space (char **pp)
@@ -370,7 +383,9 @@ shape_options_t::add_options (option_parser_t *parser)
 {
   GOptionEntry entries[] =
   {
-    {"shapers",		0, 0, G_OPTION_ARG_CALLBACK,	(gpointer) &parse_shapers,	"Comma-separated list of shapers",	"list"},
+    {"list-shapers",	0, G_OPTION_FLAG_NO_ARG,
+			      G_OPTION_ARG_CALLBACK,	(gpointer) &list_shapers,	"List available shapers and quit",	NULL},
+    {"shapers",		0, 0, G_OPTION_ARG_CALLBACK,	(gpointer) &parse_shapers,	"Comma-separated list of shapers to try","list"},
     {"direction",	0, 0, G_OPTION_ARG_STRING,	&this->direction,		"Set text direction (default: auto)",	"ltr/rtl/ttb/btt"},
     {"language",	0, 0, G_OPTION_ARG_STRING,	&this->language,		"Set text language (default: $LANG)",	"langstr"},
     {"script",		0, 0, G_OPTION_ARG_STRING,	&this->script,			"Set text script (default: auto)",	"ISO-15924 tag"},
commit a17554bfd51dc8a37b1674d1ede63e616618e0a6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Sep 28 16:57:34 2011 -0400

    Make test-c.c actually use hb
    
    This will make sure we test that C code can actually link to the
    library.

diff --git a/test/test-c.c b/test/test-c.c
index 7e7c502..25a38e5 100644
--- a/test/test-c.c
+++ b/test/test-c.c
@@ -54,5 +54,5 @@
 int
 main (int argc, char **argv)
 {
-  return 0;
+  return !*hb_shape_list_shapers ();
 }
commit 55deff7595ef357d000fef83559c74c9f8acad00
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Sep 28 16:20:09 2011 -0400

    Add comments

diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index f695c49..6d516c5 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -55,6 +55,10 @@
  *     feature in the font is not adequate, use the precomposed character
  *     which typically has better mark positioning.
  *
+ *   - When a font does not support a combining mark, but supports it precomposed
+ *     with previous base.  This needs the itemizer to have this knowledge too.
+ *     We need ot provide assistance to the itemizer.
+ *
  *   - When a font does not support a character but supports its decomposition,
  *     well, use the decomposition.
  *
commit a240d5a0a3ccc71902e7a341b6d531995319999d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 27 13:50:45 2011 -0400

    Add TODO item

diff --git a/TODO b/TODO
index d064e48..7a99cd2 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
 General fixes:
 =============
 
+- Move feature parsing from util into the library
+
 - 'const' for getter APIs? (use mutable internally)
 
 - Fix TT 'kern' on/off and GPOS interaction (move kerning before GPOS)