[HarfBuzz] harfbuzz-ng: Branch 'master' - 8 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Sat Aug 13 04:11:08 PDT 2011
src/hb-fallback-shape-private.hh | 2
src/hb-fallback-shape.cc | 2
src/hb-ft.cc | 15 +
src/hb-ft.h | 2
src/hb-ot-shape.cc | 2
src/hb-ot-shape.h | 2
src/hb-shape.cc | 14 -
src/hb-shape.h | 12 -
src/hb-uniscribe-shape.cc | 26 ++
src/hb-uniscribe.h | 10 +
util/Makefile.am | 26 ++
util/common.cc | 40 ++++
util/common.hh | 49 +++++
util/hb-view.cc | 350 +++------------------------------------
util/options.cc | 318 +++++++++++++++++++++++++++++++++++
util/options.hh | 86 +++++++++
16 files changed, 607 insertions(+), 349 deletions(-)
New commits:
commit 3bb300ee78a40f9ded21ab19283863b733aeb677
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Aug 11 11:54:31 2011 +0200
Refactor hb-view code
diff --git a/util/Makefile.am b/util/Makefile.am
index a3ae980..7939975 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -12,9 +12,29 @@ if HAVE_GLIB
if HAVE_FREETYPE
if HAVE_CAIRO_FT
if HAVE_CAIRO_PNG
-hb_view_SOURCES = hb-view.cc
-hb_view_CPPFLAGS = -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) $(FREETYPE_CFLAGS) $(CAIRO_FT_CFLAGS) $(CAIRO_PNG_CFLAGS)
-hb_view_LDADD = $(top_builddir)/src/libharfbuzz.la -lm $(GLIB_LIBS) $(FREETYPE_LIBS) $(CAIRO_FT_LIBS) $(CAIRO_PNG_LIBS)
+hb_view_SOURCES = \
+ hb-view.cc \
+ common.cc \
+ common.hh \
+ options.cc \
+ options.hh \
+ $(NULL)
+hb_view_CPPFLAGS = \
+ -I$(top_srcdir)/src/ \
+ -I$(top_builddir)/src/ \
+ $(GLIB_CFLAGS) \
+ $(FREETYPE_CFLAGS) \
+ $(CAIRO_FT_CFLAGS) \
+ $(CAIRO_PNG_CFLAGS) \
+ $(NULL)
+hb_view_LDADD = \
+ $(top_builddir)/src/libharfbuzz.la \
+ -lm \
+ $(GLIB_LIBS) \
+ $(FREETYPE_LIBS) \
+ $(CAIRO_FT_LIBS) \
+ $(CAIRO_PNG_LIBS) \
+ $(NULL)
bin_PROGRAMS += hb-view
endif
endif
diff --git a/util/common.cc b/util/common.cc
new file mode 100644
index 0000000..7326b8c
--- /dev/null
+++ b/util/common.cc
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2011 Google, Inc.
+ *
+ * This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#include "common.hh"
+
+void
+fail (const char *format, ...)
+{
+ const char *msg;
+
+ va_list vap;
+ va_start (vap, format);
+ msg = g_strdup_vprintf (format, vap);
+ g_printerr ("%s: %s\n", g_get_prgname (), msg);
+
+ exit (1);
+}
diff --git a/util/common.hh b/util/common.hh
new file mode 100644
index 0000000..5c8baab
--- /dev/null
+++ b/util/common.hh
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2011 Google, Inc.
+ *
+ * This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+
+#ifndef COMMON_HH
+#define COMMON_HH
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <assert.h>
+#include <stdio.h>
+#include <math.h>
+#include <locale.h>
+
+#include <hb.h>
+#include <glib.h>
+#include <glib/gprintf.h>
+
+void fail (const char *format, ...);
+
+#endif
diff --git a/util/hb-view.cc b/util/hb-view.cc
index 9fb6e10..d533dde 100644
--- a/util/hb-view.cc
+++ b/util/hb-view.cc
@@ -25,49 +25,15 @@
* Google Author(s): Behdad Esfahbod
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "common.hh"
-#include <unistd.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <locale.h>
-
-#include <glib.h>
-#include <glib/gprintf.h>
#include <cairo-ft.h>
#include <hb-ft.h>
+#include "options.hh"
-/* Controlled by cmd-line options */
-struct margin_t {
- double t, r, b, l;
-};
-static margin_t opt_margin = {18, 18, 18, 18};
-static char **opt_shapers;
-static double line_space = 0;
-static int face_index = 0;
-static double font_size = 36;
-static const char *fore = "#000000";
-static const char *back = "#ffffff";
-static const char *text = NULL;
-static const char *font_file = NULL;
-static const char *out_file = "/dev/stdout";
-static const char *direction = NULL;
-static const char *script = NULL;
-static const char *language = NULL;
-static hb_bool_t annotate = FALSE;
-static hb_bool_t debug = FALSE;
-
-static hb_feature_t *features = NULL;
-static unsigned int num_features;
-
/* Ugh, global vars. Ugly, but does the job */
static int width = 0;
static int height = 0;
@@ -77,309 +43,6 @@ static cairo_pattern_t *back_pattern = NULL;
static cairo_font_face_t *cairo_face;
-static gchar *
-shapers_to_string (void)
-{
- GString *shapers = g_string_new (NULL);
- const char **shaper_list = hb_shape_list_shapers ();
-
- for (; *shaper_list; shaper_list++) {
- g_string_append (shapers, *shaper_list);
- g_string_append_c (shapers, ',');
- }
- g_string_truncate (shapers, MAX (0, (gint)shapers->len - 1));
-
- return g_string_free (shapers, FALSE);
-}
-
-
-static G_GNUC_NORETURN gboolean
-show_version (const char *name G_GNUC_UNUSED,
- const char *arg G_GNUC_UNUSED,
- gpointer data G_GNUC_UNUSED,
- GError **error G_GNUC_UNUSED)
-{
- g_printf ("%s (%s) %s\n", g_get_prgname (), PACKAGE_NAME, PACKAGE_VERSION);
-
- char *shapers = shapers_to_string ();
- g_printf ("Available shapers: %s\n", shapers);
- g_free (shapers);
- if (strcmp (HB_VERSION_STRING, hb_version_string ()))
- g_printf ("Linked HarfBuzz library has a different version: %s\n", hb_version_string ());
-
- exit(0);
-}
-
-
-static gboolean
-parse_features (const char *name G_GNUC_UNUSED,
- const char *arg,
- gpointer data G_GNUC_UNUSED,
- GError **error G_GNUC_UNUSED);
-
-static gboolean
-parse_margin (const char *name G_GNUC_UNUSED,
- const char *arg,
- gpointer data G_GNUC_UNUSED,
- GError **error G_GNUC_UNUSED)
-{
- switch (sscanf (arg, "%f %f %f %f", &opt_margin.t, &opt_margin.r, &opt_margin.b, &opt_margin.l)) {
- case 1: opt_margin.r = opt_margin.t;
- case 2: opt_margin.b = opt_margin.t;
- case 3: opt_margin.l = opt_margin.r;
- case 4: return TRUE;
- default:
- g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
- "%s argument should be one to four space-separated numbers",
- name);
- return FALSE;
- }
-}
-
-static gboolean
-parse_shapers (const char *name G_GNUC_UNUSED,
- const char *arg,
- gpointer data G_GNUC_UNUSED,
- GError **error G_GNUC_UNUSED)
-{
- opt_shapers = g_strsplit (arg, ",", 0);
- return TRUE;
-}
-
-
-void
-fail (const char *format, ...)
-{
- const char *msg;
-
- va_list vap;
- va_start (vap, format);
- msg = g_strdup_vprintf (format, vap);
- g_printerr ("%s: %s\n", g_get_prgname (), msg);
-
- exit (1);
-}
-
-void
-parse_options (int argc, char *argv[])
-{
- GOptionEntry entries[] =
- {
- {"version", 0, G_OPTION_FLAG_NO_ARG,
- G_OPTION_ARG_CALLBACK, (gpointer) &show_version, "Show version numbers", NULL},
- {"debug", 0, 0, G_OPTION_ARG_NONE, &debug, "Free all resources before exit", NULL},
- {"output", 0, 0, G_OPTION_ARG_STRING, &out_file, "Set output file name", "filename"},
-
- {"annotate", 0, 0, G_OPTION_ARG_NONE, &annotate, "Annotate output rendering", NULL},
- {"background", 0, 0, G_OPTION_ARG_STRING, &back, "Set background color", "red/#rrggbb/#rrggbbaa"},
- {"foreground", 0, 0, G_OPTION_ARG_STRING, &fore, "Set foreground color", "red/#rrggbb/#rrggbbaa"},
- {"line-space", 0, 0, G_OPTION_ARG_DOUBLE, &font_size, "Set space between lines (default: 0)", "units"},
- {"margin", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_margin, "Margin around output", "one to four numbers"},
-
- {"shapers", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_shapers, "Comma-separated list of shapers", "list"},
- {"direction", 0, 0, G_OPTION_ARG_STRING, &direction, "Set text direction (default: auto)", "ltr/rtl/ttb/btt"},
- {"language", 0, 0, G_OPTION_ARG_STRING, &language, "Set text language (default: $LANG)", "langstr"},
- {"script", 0, 0, G_OPTION_ARG_STRING, &script, "Set text script (default: auto)", "ISO-15924 tag"},
- {"features", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_features, "Font features to apply to text", "TODO"},
-
- {"face-index", 0, 0, G_OPTION_ARG_INT, &face_index, "Face index (default: 0)", "index"},
- {"font-size", 0, 0, G_OPTION_ARG_DOUBLE, &font_size, "Font size", "size"},
-
- {NULL}
- };
- GError *error = NULL;
- GError *parse_error = NULL;
- GOptionContext *context;
- size_t len;
-
- context = g_option_context_new ("- FONT-FILE TEXT");
-
- g_option_context_add_main_entries (context, entries, NULL);
-
- if (!g_option_context_parse (context, &argc, &argv, &parse_error))
- {
- if (parse_error != NULL)
- fail ("%s", parse_error->message);
- else
- fail ("Option parse error");
- exit(1);
- }
- g_option_context_free(context);
-
- if (argc != 3) {
- g_printerr ("Usage: %s [OPTION...] FONT-FILE TEXT\n", g_get_prgname ());
- exit (1);
- }
-
- font_file = argv[1];
- text = argv[2];
-}
-
-
-
-static void
-parse_space (char **pp)
-{
- char c;
-#define ISSPACE(c) ((c)==' '||(c)=='\f'||(c)=='\n'||(c)=='\r'||(c)=='\t'||(c)=='\v')
- while (c = **pp, ISSPACE (c))
- (*pp)++;
-#undef ISSPACE
-}
-
-static hb_bool_t
-parse_char (char **pp, char c)
-{
- parse_space (pp);
-
- if (**pp != c)
- return FALSE;
-
- (*pp)++;
- return TRUE;
-}
-
-static hb_bool_t
-parse_uint (char **pp, unsigned int *pv)
-{
- char *p = *pp;
- unsigned int v;
-
- v = strtol (p, pp, 0);
-
- if (p == *pp)
- return FALSE;
-
- *pv = v;
- return TRUE;
-}
-
-
-static hb_bool_t
-parse_feature_value_prefix (char **pp, hb_feature_t *feature)
-{
- if (parse_char (pp, '-'))
- feature->value = 0;
- else {
- parse_char (pp, '+');
- feature->value = 1;
- }
-
- return TRUE;
-}
-
-static hb_bool_t
-parse_feature_tag (char **pp, hb_feature_t *feature)
-{
- char *p = *pp, c;
-
- parse_space (pp);
-
-#define ISALNUM(c) (('a' <= (c) && (c) <= 'z') || ('A' <= (c) && (c) <= 'Z') || ('0' <= (c) && (c) <= '9'))
- while (c = **pp, ISALNUM(c))
- (*pp)++;
-#undef ISALNUM
-
- if (p == *pp)
- return FALSE;
-
- **pp = '\0';
- feature->tag = hb_tag_from_string (p);
- **pp = c;
-
- return TRUE;
-}
-
-static hb_bool_t
-parse_feature_indices (char **pp, hb_feature_t *feature)
-{
- hb_bool_t has_start;
-
- feature->start = 0;
- feature->end = (unsigned int) -1;
-
- if (!parse_char (pp, '['))
- return TRUE;
-
- has_start = parse_uint (pp, &feature->start);
-
- if (parse_char (pp, ':')) {
- parse_uint (pp, &feature->end);
- } else {
- if (has_start)
- feature->end = feature->start + 1;
- }
-
- return parse_char (pp, ']');
-}
-
-static hb_bool_t
-parse_feature_value_postfix (char **pp, hb_feature_t *feature)
-{
- return !parse_char (pp, '=') || parse_uint (pp, &feature->value);
-}
-
-
-static hb_bool_t
-parse_one_feature (char **pp, hb_feature_t *feature)
-{
- return parse_feature_value_prefix (pp, feature) &&
- parse_feature_tag (pp, feature) &&
- parse_feature_indices (pp, feature) &&
- parse_feature_value_postfix (pp, feature) &&
- (parse_char (pp, ',') || **pp == '\0');
-}
-
-static void
-skip_one_feature (char **pp)
-{
- char *e;
- e = strchr (*pp, ',');
- if (e)
- *pp = e + 1;
- else
- *pp = *pp + strlen (*pp);
-}
-
-static gboolean
-parse_features (const char *name G_GNUC_UNUSED,
- const char *arg,
- gpointer data G_GNUC_UNUSED,
- GError **error G_GNUC_UNUSED)
-{
- char *s = (char *) arg;
- char *p;
-
- num_features = 0;
- features = NULL;
-
- if (!*s)
- return TRUE;
-
- /* count the features first, so we can allocate memory */
- p = s;
- do {
- num_features++;
- p = strchr (p, ',');
- if (p)
- p++;
- } while (p);
-
- features = (hb_feature_t *) calloc (num_features, sizeof (*features));
-
- /* now do the actual parsing */
- p = s;
- num_features = 0;
- while (*p) {
- if (parse_one_feature (&p, &features[num_features]))
- num_features++;
- else
- skip_one_feature (&p);
- }
-
- return TRUE;
-}
-
static cairo_glyph_t *
_hb_cr_text_glyphs (cairo_t *cr,
@@ -398,18 +61,18 @@ _hb_cr_text_glyphs (cairo_t *cr,
hb_buffer = hb_buffer_create (0);
- if (direction)
- hb_buffer_set_direction (hb_buffer, hb_direction_from_string (direction));
- if (script)
- hb_buffer_set_script (hb_buffer, hb_script_from_string (script));
- if (language)
- hb_buffer_set_language (hb_buffer, hb_language_from_string (language));
+ if (shape_opts->direction)
+ hb_buffer_set_direction (hb_buffer, hb_direction_from_string (shape_opts->direction));
+ if (shape_opts->script)
+ hb_buffer_set_script (hb_buffer, hb_script_from_string (shape_opts->script));
+ if (shape_opts->language)
+ hb_buffer_set_language (hb_buffer, hb_language_from_string (shape_opts->language));
if (len < 0)
len = strlen (utf8);
hb_buffer_add_utf8 (hb_buffer, utf8, len, 0, len);
- if (!hb_shape_full (hb_font, hb_buffer, features, num_features, NULL, opt_shapers))
+ if (!hb_shape_full (hb_font, hb_buffer, shape_opts->features, shape_opts->num_features, NULL, shape_opts->shapers))
fail ("All shapers failed");
num_glyphs = hb_buffer_get_length (hb_buffer);
@@ -452,11 +115,11 @@ create_context (void)
cairo_pattern_destroy (fore_pattern);
br = bg = bb = ba = 255;
- sscanf (back + (*back=='#'), "%2x%2x%2x%2x", &br, &bg, &bb, &ba);
+ sscanf (view_opts->back + (*view_opts->back=='#'), "%2x%2x%2x%2x", &br, &bg, &bb, &ba);
fr = fg = fb = 0; fa = 255;
- sscanf (fore + (*fore=='#'), "%2x%2x%2x%2x", &fr, &fg, &fb, &fa);
+ sscanf (view_opts->fore + (*view_opts->fore=='#'), "%2x%2x%2x%2x", &fr, &fg, &fb, &fa);
- if (!annotate && ba == 255 && fa == 255 && br == bg && bg == bb && fr == fg && fg == fb) {
+ if (!view_opts->annotate && ba == 255 && fa == 255 && br == bg && bg == bb && fr == fg && fg == fb) {
/* grayscale. use A8 surface */
surface = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
cr = cairo_create (surface);
@@ -494,19 +157,19 @@ draw (void)
cairo_glyph_t *glyphs = NULL;
unsigned int num_glyphs = 0;
- const char *end, *p = text;
+ const char *end, *p = shape_opts->text;
double x, y;
cr= create_context ();
- cairo_set_font_size (cr, font_size);
+ cairo_set_font_size (cr, font_opts->font_size);
cairo_font_extents (cr, &font_extents);
height = 0;
width = 0;
- x = opt_margin.l;
- y = opt_margin.t;
+ x = view_opts->margin.l;
+ y = view_opts->margin.t;
do {
cairo_text_extents_t extents;
@@ -515,8 +178,8 @@ draw (void)
if (!end)
end = p + strlen (p);
- if (p != text)
- y += line_space;
+ if (p != shape_opts->text)
+ y += view_opts->line_space;
if (p != end) {
glyphs = _hb_cr_text_glyphs (cr, p, end - p, &num_glyphs);
@@ -527,7 +190,7 @@ draw (void)
width = MAX (width, extents.x_advance);
cairo_save (cr);
cairo_translate (cr, x, y);
- if (annotate) {
+ if (view_opts->annotate) {
unsigned int i;
cairo_save (cr);
@@ -553,8 +216,8 @@ draw (void)
p = end + 1;
} while (*end);
- height = y + opt_margin.b;
- width += opt_margin.l + opt_margin.r;
+ height = y + view_opts->margin.b;
+ width += view_opts->margin.l + view_opts->margin.r;
cairo_destroy (cr);
}
@@ -573,8 +236,8 @@ main (int argc, char **argv)
parse_options (argc, argv);
FT_Init_FreeType (&ft_library);
- if (FT_New_Face (ft_library, font_file, face_index, &ft_face)) {
- fprintf (stderr, "Failed to open font file `%s'\n", font_file);
+ if (FT_New_Face (ft_library, font_opts->font_file, font_opts->face_index, &ft_face)) {
+ fprintf (stderr, "Failed to open font file `%s'\n", font_opts->font_file);
exit (1);
}
cairo_face = cairo_ft_font_face_create_for_ft_face (ft_face, 0);
@@ -590,8 +253,8 @@ main (int argc, char **argv)
}
if (debug) {
- free (features);
- g_free (opt_shapers);
+ free (shape_opts->features);
+ g_free (shape_opts->shapers);
cairo_pattern_destroy (fore_pattern);
cairo_pattern_destroy (back_pattern);
diff --git a/util/options.cc b/util/options.cc
new file mode 100644
index 0000000..2bc2c70
--- /dev/null
+++ b/util/options.cc
@@ -0,0 +1,318 @@
+/*
+ * Copyright © 2011 Google, Inc.
+ *
+ * This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#include "options.hh"
+
+
+view_options_t view_opts[1];
+shape_options_t shape_opts[1];
+font_options_t font_opts[1];
+
+
+
+static gboolean
+parse_margin (const char *name G_GNUC_UNUSED,
+ const char *arg,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED)
+{
+ view_options_t::margin_t &m = view_opts->margin;
+ switch (sscanf (arg, "%f %f %f %f", &m.t, &m.r, &m.b, &m.l)) {
+ case 1: m.r = m.t;
+ case 2: m.b = m.t;
+ case 3: m.l = m.r;
+ case 4: return TRUE;
+ default:
+ g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
+ "%s argument should be one to four space-separated numbers",
+ name);
+ return FALSE;
+ }
+}
+
+
+static gboolean
+parse_shapers (const char *name G_GNUC_UNUSED,
+ const char *arg,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED)
+{
+ shape_opts->shapers = g_strsplit (arg, ",", 0);
+ return TRUE;
+}
+
+
+static void
+parse_space (char **pp)
+{
+ char c;
+#define ISSPACE(c) ((c)==' '||(c)=='\f'||(c)=='\n'||(c)=='\r'||(c)=='\t'||(c)=='\v')
+ while (c = **pp, ISSPACE (c))
+ (*pp)++;
+#undef ISSPACE
+}
+
+static hb_bool_t
+parse_char (char **pp, char c)
+{
+ parse_space (pp);
+
+ if (**pp != c)
+ return FALSE;
+
+ (*pp)++;
+ return TRUE;
+}
+
+static hb_bool_t
+parse_uint (char **pp, unsigned int *pv)
+{
+ char *p = *pp;
+ unsigned int v;
+
+ v = strtol (p, pp, 0);
+
+ if (p == *pp)
+ return FALSE;
+
+ *pv = v;
+ return TRUE;
+}
+
+
+static hb_bool_t
+parse_feature_value_prefix (char **pp, hb_feature_t *feature)
+{
+ if (parse_char (pp, '-'))
+ feature->value = 0;
+ else {
+ parse_char (pp, '+');
+ feature->value = 1;
+ }
+
+ return TRUE;
+}
+
+static hb_bool_t
+parse_feature_tag (char **pp, hb_feature_t *feature)
+{
+ char *p = *pp, c;
+
+ parse_space (pp);
+
+#define ISALNUM(c) (('a' <= (c) && (c) <= 'z') || ('A' <= (c) && (c) <= 'Z') || ('0' <= (c) && (c) <= '9'))
+ while (c = **pp, ISALNUM(c))
+ (*pp)++;
+#undef ISALNUM
+
+ if (p == *pp)
+ return FALSE;
+
+ **pp = '\0';
+ feature->tag = hb_tag_from_string (p);
+ **pp = c;
+
+ return TRUE;
+}
+
+static hb_bool_t
+parse_feature_indices (char **pp, hb_feature_t *feature)
+{
+ hb_bool_t has_start;
+
+ feature->start = 0;
+ feature->end = (unsigned int) -1;
+
+ if (!parse_char (pp, '['))
+ return TRUE;
+
+ has_start = parse_uint (pp, &feature->start);
+
+ if (parse_char (pp, ':')) {
+ parse_uint (pp, &feature->end);
+ } else {
+ if (has_start)
+ feature->end = feature->start + 1;
+ }
+
+ return parse_char (pp, ']');
+}
+
+static hb_bool_t
+parse_feature_value_postfix (char **pp, hb_feature_t *feature)
+{
+ return !parse_char (pp, '=') || parse_uint (pp, &feature->value);
+}
+
+
+static hb_bool_t
+parse_one_feature (char **pp, hb_feature_t *feature)
+{
+ return parse_feature_value_prefix (pp, feature) &&
+ parse_feature_tag (pp, feature) &&
+ parse_feature_indices (pp, feature) &&
+ parse_feature_value_postfix (pp, feature) &&
+ (parse_char (pp, ',') || **pp == '\0');
+}
+
+static void
+skip_one_feature (char **pp)
+{
+ char *e;
+ e = strchr (*pp, ',');
+ if (e)
+ *pp = e + 1;
+ else
+ *pp = *pp + strlen (*pp);
+}
+
+static gboolean
+parse_features (const char *name G_GNUC_UNUSED,
+ const char *arg,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED)
+{
+ char *s = (char *) arg;
+ char *p;
+
+ shape_opts->num_features = 0;
+ shape_opts->features = NULL;
+
+ if (!*s)
+ return TRUE;
+
+ /* count the features first, so we can allocate memory */
+ p = s;
+ do {
+ shape_opts->num_features++;
+ p = strchr (p, ',');
+ if (p)
+ p++;
+ } while (p);
+
+ shape_opts->features = (hb_feature_t *) calloc (shape_opts->num_features, sizeof (*shape_opts->features));
+
+ /* now do the actual parsing */
+ p = s;
+ shape_opts->num_features = 0;
+ while (*p) {
+ if (parse_one_feature (&p, &shape_opts->features[shape_opts->num_features]))
+ shape_opts->num_features++;
+ else
+ skip_one_feature (&p);
+ }
+
+ return TRUE;
+}
+
+
+static gchar *
+shapers_to_string (void)
+{
+ GString *shapers = g_string_new (NULL);
+ const char **shaper_list = hb_shape_list_shapers ();
+
+ for (; *shaper_list; shaper_list++) {
+ g_string_append (shapers, *shaper_list);
+ g_string_append_c (shapers, ',');
+ }
+ g_string_truncate (shapers, MAX (0, (gint)shapers->len - 1));
+
+ return g_string_free (shapers, FALSE);
+}
+
+static G_GNUC_NORETURN gboolean
+show_version (const char *name G_GNUC_UNUSED,
+ const char *arg G_GNUC_UNUSED,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED)
+{
+ g_printf ("%s (%s) %s\n", g_get_prgname (), PACKAGE_NAME, PACKAGE_VERSION);
+
+ char *shapers = shapers_to_string ();
+ g_printf ("Available shapers: %s\n", shapers);
+ g_free (shapers);
+ if (strcmp (HB_VERSION_STRING, hb_version_string ()))
+ g_printf ("Linked HarfBuzz library has a different version: %s\n", hb_version_string ());
+
+ exit(0);
+}
+
+
+void
+parse_options (int argc, char *argv[])
+{
+ GOptionEntry entries[] =
+ {
+ {"version", 0, G_OPTION_FLAG_NO_ARG,
+ G_OPTION_ARG_CALLBACK, (gpointer) &show_version, "Show version numbers", NULL},
+ {"debug", 0, 0, G_OPTION_ARG_NONE, &debug, "Free all resources before exit", NULL},
+ {"output", 0, 0, G_OPTION_ARG_STRING, &out_file, "Set output file name", "filename"},
+
+ {"annotate", 0, 0, G_OPTION_ARG_NONE, &view_opts->annotate, "Annotate output rendering", NULL},
+ {"background", 0, 0, G_OPTION_ARG_STRING, &view_opts->back, "Set background color", "red/#rrggbb/#rrggbbaa"},
+ {"foreground", 0, 0, G_OPTION_ARG_STRING, &view_opts->fore, "Set foreground color", "red/#rrggbb/#rrggbbaa"},
+ {"line-space", 0, 0, G_OPTION_ARG_DOUBLE, &view_opts->line_space, "Set space between lines (default: 0)", "units"},
+ {"margin", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_margin, "Margin around output", "one to four numbers"},
+
+ {"shapers", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_shapers, "Comma-separated list of shapers", "list"},
+ {"direction", 0, 0, G_OPTION_ARG_STRING, &shape_opts->direction, "Set text direction (default: auto)", "ltr/rtl/ttb/btt"},
+ {"language", 0, 0, G_OPTION_ARG_STRING, &shape_opts->language, "Set text language (default: $LANG)", "langstr"},
+ {"script", 0, 0, G_OPTION_ARG_STRING, &shape_opts->script, "Set text script (default: auto)", "ISO-15924 tag"},
+ {"features", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_features, "Font features to apply to text", "TODO"},
+
+ {"face-index", 0, 0, G_OPTION_ARG_INT, &font_opts->face_index, "Face index (default: 0)", "index"},
+ {"font-size", 0, 0, G_OPTION_ARG_DOUBLE, &font_opts->font_size, "Font size", "size"},
+
+ {NULL}
+ };
+ GError *error = NULL;
+ GError *parse_error = NULL;
+ GOptionContext *context;
+ size_t len;
+
+ context = g_option_context_new ("- FONT-FILE TEXT");
+
+ g_option_context_add_main_entries (context, entries, NULL);
+
+ if (!g_option_context_parse (context, &argc, &argv, &parse_error))
+ {
+ if (parse_error != NULL)
+ fail ("%s", parse_error->message);
+ else
+ fail ("Option parse error");
+ exit(1);
+ }
+ g_option_context_free(context);
+
+ if (argc != 3) {
+ g_printerr ("Usage: %s [OPTION...] FONT-FILE TEXT\n", g_get_prgname ());
+ exit (1);
+ }
+
+ font_opts->font_file = argv[1];
+ shape_opts->text = argv[2];
+}
diff --git a/util/options.hh b/util/options.hh
new file mode 100644
index 0000000..4c6e973
--- /dev/null
+++ b/util/options.hh
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2011 Google, Inc.
+ *
+ * This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#include "common.hh"
+
+#ifndef OPTIONS_HH
+#define OPTIONS_HH
+
+
+extern struct view_options_t
+{
+ view_options_t (void) {
+ memset (this, 0, sizeof (*this));
+ fore = "#000000";
+ back = "#ffffff";
+ margin.t = margin.r = margin.b = margin.l = 18.;
+ }
+
+ hb_bool_t annotate;
+ const char *fore;
+ const char *back;
+ double line_space;
+ struct margin_t {
+ double t, r, b, l;
+ } margin;
+} view_opts[1];
+
+extern struct shape_options_t
+{
+ shape_options_t (void) {
+ memset (this, 0, sizeof (*this));
+ }
+
+ const char *text;
+ const char *direction;
+ const char *language;
+ const char *script;
+ hb_feature_t *features;
+ unsigned int num_features;
+ char **shapers;
+} shape_opts[1];
+
+extern struct font_options_t
+{
+ font_options_t (void) {
+ memset (this, 0, sizeof (*this));
+ font_size = 36.;
+ }
+
+ const char *font_file;
+ int face_index;
+ double font_size;
+} font_opts[1];
+
+
+static const char *out_file = "/dev/stdout";
+static hb_bool_t debug = FALSE;
+
+
+void parse_options (int argc, char *argv[]);
+
+
+#endif
commit d6660356dd81358033743f72d8a5fbf2fc70eaf7
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Aug 10 22:08:36 2011 +0200
Add uniscribe font getters
diff --git a/src/hb-uniscribe-shape.cc b/src/hb-uniscribe-shape.cc
index 601e01c..a222fdf 100644
--- a/src/hb-uniscribe-shape.cc
+++ b/src/hb-uniscribe-shape.cc
@@ -146,6 +146,7 @@ _hb_uniscribe_face_get_data (hb_face_t *face)
static struct hb_uniscribe_font_data_t {
HDC hdc;
+ LOGFONTW log_font;
HFONT hfont;
SCRIPT_CACHE script_cache;
} _hb_uniscribe_font_data_nil = {NULL, NULL, NULL};
@@ -176,11 +177,10 @@ _hb_uniscribe_font_get_data (hb_font_t *font)
data->hdc = GetDC (NULL);
- LOGFONTW log_font;
- if (unlikely (!populate_log_font (&log_font, data->hdc, font)))
+ if (unlikely (!populate_log_font (&data->log_font, data->hdc, font)))
DEBUG_MSG (UNISCRIBE, font, "Font populate_log_font() failed");
else {
- data->hfont = CreateFontIndirectW (&log_font);
+ data->hfont = CreateFontIndirectW (&data->log_font);
if (unlikely (!data->hfont))
DEBUG_MSG (UNISCRIBE, font, "Font CreateFontIndirectW() failed");
if (!SelectObject (data->hdc, data->hfont))
@@ -202,6 +202,24 @@ _hb_uniscribe_font_get_data (hb_font_t *font)
return data;
}
+LOGFONTW *
+hb_uniscribe_font_get_logfontw (hb_font_t *font)
+{
+ hb_uniscribe_font_data_t *font_data = _hb_uniscribe_font_get_data (font);
+ if (unlikely (!font_data))
+ return NULL;
+ return &font_data->log_font;
+}
+
+HFONT
+hb_uniscribe_font_get_hfont (hb_font_t *font)
+{
+ hb_uniscribe_font_data_t *font_data = _hb_uniscribe_font_get_data (font);
+ if (unlikely (!font_data))
+ return 0;
+ return font_data->hfont;
+}
+
hb_bool_t
hb_uniscribe_shape (hb_font_t *font,
diff --git a/src/hb-uniscribe.h b/src/hb-uniscribe.h
index bbb4635..dbcacd7 100644
--- a/src/hb-uniscribe.h
+++ b/src/hb-uniscribe.h
@@ -30,6 +30,8 @@
#include "hb-common.h"
#include "hb-shape.h"
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
HB_BEGIN_DECLS
@@ -41,6 +43,12 @@ hb_uniscribe_shape (hb_font_t *font,
unsigned int num_features,
const char * const *shaper_options);
+LOGFONTW *
+hb_uniscribe_font_get_logfontw (hb_font_t *font);
+
+HFONT
+hb_uniscribe_font_get_hfont (hb_font_t *font);
+
HB_END_DECLS
commit 01ec13a1d9ae380305b593e1c52cebb0e8327cb6
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Aug 10 22:00:35 2011 +0200
Implement hb_ft_font_get_face
diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 6af4e06..aa73e7b 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -325,6 +325,11 @@ hb_ft_face_create_cached (FT_Face ft_face)
return hb_face_reference ((hb_face_t *) ft_face->generic.data);
}
+void
+_do_nothing (void)
+{
+}
+
hb_font_t *
hb_ft_font_create (FT_Face ft_face,
@@ -338,7 +343,7 @@ hb_ft_font_create (FT_Face ft_face,
hb_face_destroy (face);
hb_font_set_funcs (font,
_hb_ft_get_font_funcs (),
- ft_face, NULL);
+ ft_face, (hb_destroy_func_t) _do_nothing);
hb_font_set_scale (font,
((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM) >> 16,
((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM) >> 16);
@@ -413,3 +418,11 @@ hb_ft_font_set_funcs (hb_font_t *font)
ft_face,
(hb_destroy_func_t) FT_Done_Face);
}
+
+FT_Face
+hb_ft_font_get_face (hb_font_t *font)
+{
+ if (font->destroy == (hb_destroy_func_t) FT_Done_Face ||
+ font->destroy == (hb_destroy_func_t) _do_nothing)
+ return (FT_Face) font->user_data;
+}
diff --git a/src/hb-ft.h b/src/hb-ft.h
index f575d2e..c1772ac 100644
--- a/src/hb-ft.h
+++ b/src/hb-ft.h
@@ -55,6 +55,8 @@ hb_ft_font_create (FT_Face ft_face,
void
hb_ft_font_set_funcs (hb_font_t *font);
+FT_Face
+hb_ft_font_get_face (hb_font_t *font);
HB_END_DECLS
commit 36a4fe037df201f85b7a544eb30d75dc3585a1b6
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Aug 10 21:54:22 2011 +0200
Fix charset conversion
diff --git a/util/hb-view.cc b/util/hb-view.cc
index a78983e..9fb6e10 100644
--- a/util/hb-view.cc
+++ b/util/hb-view.cc
@@ -212,7 +212,7 @@ parse_options (int argc, char *argv[])
}
font_file = argv[1];
- text = g_locale_to_utf8 (argv[2], -1, NULL, NULL, &error);
+ text = argv[2];
}
commit 25c4830593064f023e296aa795b72ddcaa1c9322
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Aug 10 16:28:38 2011 +0200
[util] Add hb-shape --shapers
If the specified shapers fail, hb-shape will fail immediately
diff --git a/util/hb-view.cc b/util/hb-view.cc
index 9954853..a78983e 100644
--- a/util/hb-view.cc
+++ b/util/hb-view.cc
@@ -50,6 +50,7 @@ struct margin_t {
double t, r, b, l;
};
static margin_t opt_margin = {18, 18, 18, 18};
+static char **opt_shapers;
static double line_space = 0;
static int face_index = 0;
static double font_size = 36;
@@ -76,23 +77,35 @@ static cairo_pattern_t *back_pattern = NULL;
static cairo_font_face_t *cairo_face;
-G_GNUC_NORETURN static void
-usage (FILE *f, int status)
+static gchar *
+shapers_to_string (void)
{
- fprintf (f, "usage: hb-view [OPTS...] font-file text\n");
- exit (status);
+ GString *shapers = g_string_new (NULL);
+ const char **shaper_list = hb_shape_list_shapers ();
+
+ for (; *shaper_list; shaper_list++) {
+ g_string_append (shapers, *shaper_list);
+ g_string_append_c (shapers, ',');
+ }
+ g_string_truncate (shapers, MAX (0, (gint)shapers->len - 1));
+
+ return g_string_free (shapers, FALSE);
}
+
static G_GNUC_NORETURN gboolean
show_version (const char *name G_GNUC_UNUSED,
const char *arg G_GNUC_UNUSED,
gpointer data G_GNUC_UNUSED,
GError **error G_GNUC_UNUSED)
{
- g_printf("%s (%s) %s\n", g_get_prgname (), PACKAGE_NAME, PACKAGE_VERSION);
+ g_printf ("%s (%s) %s\n", g_get_prgname (), PACKAGE_NAME, PACKAGE_VERSION);
+ char *shapers = shapers_to_string ();
+ g_printf ("Available shapers: %s\n", shapers);
+ g_free (shapers);
if (strcmp (HB_VERSION_STRING, hb_version_string ()))
- g_printf("Linked HarfBuzz library has a different version: %s\n", hb_version_string ());
+ g_printf ("Linked HarfBuzz library has a different version: %s\n", hb_version_string ());
exit(0);
}
@@ -123,6 +136,16 @@ parse_margin (const char *name G_GNUC_UNUSED,
}
}
+static gboolean
+parse_shapers (const char *name G_GNUC_UNUSED,
+ const char *arg,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED)
+{
+ opt_shapers = g_strsplit (arg, ",", 0);
+ return TRUE;
+}
+
void
fail (const char *format, ...)
@@ -137,25 +160,9 @@ fail (const char *format, ...)
exit (1);
}
-static gchar *
-shapers_to_string (void)
-{
- GString *shapers = g_string_new (NULL);
- const char **shaper_list = hb_shape_list_shapers ();
-
- for (; *shaper_list; shaper_list++) {
- g_string_append (shapers, *shaper_list);
- g_string_append_c (shapers, ',');
- }
- g_string_truncate (shapers, MAX (0, (gint)shapers->len - 1));
-
- return g_string_free(shapers, FALSE);
-}
-
void
parse_options (int argc, char *argv[])
{
- gchar *shapers_options = shapers_to_string ();
GOptionEntry entries[] =
{
{"version", 0, G_OPTION_FLAG_NO_ARG,
@@ -169,6 +176,7 @@ parse_options (int argc, char *argv[])
{"line-space", 0, 0, G_OPTION_ARG_DOUBLE, &font_size, "Set space between lines (default: 0)", "units"},
{"margin", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_margin, "Margin around output", "one to four numbers"},
+ {"shapers", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_shapers, "Comma-separated list of shapers", "list"},
{"direction", 0, 0, G_OPTION_ARG_STRING, &direction, "Set text direction (default: auto)", "ltr/rtl/ttb/btt"},
{"language", 0, 0, G_OPTION_ARG_STRING, &language, "Set text language (default: $LANG)", "langstr"},
{"script", 0, 0, G_OPTION_ARG_STRING, &script, "Set text script (default: auto)", "ISO-15924 tag"},
@@ -197,7 +205,6 @@ parse_options (int argc, char *argv[])
exit(1);
}
g_option_context_free(context);
- g_free(shapers_options);
if (argc != 3) {
g_printerr ("Usage: %s [OPTION...] FONT-FILE TEXT\n", g_get_prgname ());
@@ -402,7 +409,8 @@ _hb_cr_text_glyphs (cairo_t *cr,
len = strlen (utf8);
hb_buffer_add_utf8 (hb_buffer, utf8, len, 0, len);
- hb_shape (hb_font, hb_buffer, features, num_features);
+ if (!hb_shape_full (hb_font, hb_buffer, features, num_features, NULL, opt_shapers))
+ fail ("All shapers failed");
num_glyphs = hb_buffer_get_length (hb_buffer);
hb_glyph = hb_buffer_get_glyph_infos (hb_buffer, NULL);
@@ -583,6 +591,7 @@ main (int argc, char **argv)
if (debug) {
free (features);
+ g_free (opt_shapers);
cairo_pattern_destroy (fore_pattern);
cairo_pattern_destroy (back_pattern);
commit 0501573deda3a8dcdfcea491392f554f21ed0154
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Aug 10 16:25:56 2011 +0200
Fix const correctness in the API
diff --git a/src/hb-fallback-shape-private.hh b/src/hb-fallback-shape-private.hh
index 40e9541..d0beb16 100644
--- a/src/hb-fallback-shape-private.hh
+++ b/src/hb-fallback-shape-private.hh
@@ -40,7 +40,7 @@ hb_fallback_shape (hb_font_t *font,
hb_buffer_t *buffer,
const hb_feature_t *features,
unsigned int num_features,
- const char *shaper_options);
+ const char * const *shaper_options);
HB_END_DECLS
diff --git a/src/hb-fallback-shape.cc b/src/hb-fallback-shape.cc
index 0462400..2fd527f 100644
--- a/src/hb-fallback-shape.cc
+++ b/src/hb-fallback-shape.cc
@@ -33,7 +33,7 @@ hb_fallback_shape (hb_font_t *font,
hb_buffer_t *buffer,
const hb_feature_t *features,
unsigned int num_features,
- const char *shaper_options)
+ const char * const *shaper_options)
{
buffer->guess_properties ();
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index fc2fa41..4275afc 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -433,7 +433,7 @@ hb_ot_shape (hb_font_t *font,
hb_buffer_t *buffer,
const hb_feature_t *features,
unsigned int num_features,
- const char *shaper_options)
+ const char * const *shaper_options)
{
hb_ot_shape_plan_t plan;
diff --git a/src/hb-ot-shape.h b/src/hb-ot-shape.h
index 0fa3f36..1897e84 100644
--- a/src/hb-ot-shape.h
+++ b/src/hb-ot-shape.h
@@ -39,7 +39,7 @@ hb_ot_shape (hb_font_t *font,
hb_buffer_t *buffer,
const hb_feature_t *features,
unsigned int num_features,
- const char *shaper_options);
+ const char * const *shaper_options);
HB_END_DECLS
diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 9a4ebfe..d42be6c 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -42,7 +42,7 @@ typedef hb_bool_t (*hb_shape_func_t) (hb_font_t *font,
hb_buffer_t *buffer,
const hb_feature_t *features,
unsigned int num_features,
- const char *shaper_options);
+ const char * const *shaper_options);
#define HB_SHAPER_IMPLEMENT(name) {#name, hb_##name##_shape}
static struct hb_shaper_pair_t {
@@ -110,12 +110,12 @@ hb_shape_list_shapers (void)
}
hb_bool_t
-hb_shape_full (hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features,
- const char *shaper_options,
- const char **shaper_list)
+hb_shape_full (hb_font_t *font,
+ hb_buffer_t *buffer,
+ const hb_feature_t *features,
+ unsigned int num_features,
+ const char * const *shaper_options,
+ const char * const *shaper_list)
{
if (likely (!shaper_list)) {
for (unsigned int i = 0; i < ARRAY_LENGTH (shapers); i++)
diff --git a/src/hb-shape.h b/src/hb-shape.h
index 18b35ae..685b11d 100644
--- a/src/hb-shape.h
+++ b/src/hb-shape.h
@@ -49,12 +49,12 @@ hb_shape (hb_font_t *font,
unsigned int num_features);
hb_bool_t
-hb_shape_full (hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features,
- const char *shaper_options,
- const char **shaper_list);
+hb_shape_full (hb_font_t *font,
+ hb_buffer_t *buffer,
+ const hb_feature_t *features,
+ unsigned int num_features,
+ const char * const *shaper_options,
+ const char * const *shaper_list);
const char **
hb_shape_list_shapers (void);
diff --git a/src/hb-uniscribe-shape.cc b/src/hb-uniscribe-shape.cc
index e583ae1..601e01c 100644
--- a/src/hb-uniscribe-shape.cc
+++ b/src/hb-uniscribe-shape.cc
@@ -208,7 +208,7 @@ hb_uniscribe_shape (hb_font_t *font,
hb_buffer_t *buffer,
const hb_feature_t *features,
unsigned int num_features,
- const char *shaper_options)
+ const char * const *shaper_options)
{
buffer->guess_properties ();
diff --git a/src/hb-uniscribe.h b/src/hb-uniscribe.h
index aa893bd..bbb4635 100644
--- a/src/hb-uniscribe.h
+++ b/src/hb-uniscribe.h
@@ -39,7 +39,7 @@ hb_uniscribe_shape (hb_font_t *font,
hb_buffer_t *buffer,
const hb_feature_t *features,
unsigned int num_features,
- const char *shaper_options);
+ const char * const *shaper_options);
HB_END_DECLS
commit a21add6c0da067173d51792d716d6e38379f138f
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Aug 10 16:07:49 2011 +0200
Reformat
diff --git a/util/hb-view.cc b/util/hb-view.cc
index 3d441f6..9954853 100644
--- a/util/hb-view.cc
+++ b/util/hb-view.cc
@@ -158,37 +158,24 @@ parse_options (int argc, char *argv[])
gchar *shapers_options = shapers_to_string ();
GOptionEntry entries[] =
{
- {"version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) &show_version,
- "Show version numbers", NULL},
- {"debug", 0, 0, G_OPTION_ARG_NONE, &debug,
- "Free all resources before exit", NULL},
- {"output", 0, 0, G_OPTION_ARG_STRING, &out_file,
- "Set output file name", "filename"},
-
- {"annotate", 0, 0, G_OPTION_ARG_NONE, &annotate,
- "Annotate output rendering", NULL},
- {"background", 0, 0, G_OPTION_ARG_STRING, &back,
- "Set background color", "red/#rrggbb/#rrggbbaa"},
- {"foreground", 0, 0, G_OPTION_ARG_STRING, &fore,
- "Set foreground color", "red/#rrggbb/#rrggbbaa"},
- {"line-space", 0, 0, G_OPTION_ARG_DOUBLE, &font_size,
- "Set space between lines (default: 0)", "units"},
- {"margin", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_margin,
- "Margin around output", "one to four numbers"},
-
- {"direction", 0, 0, G_OPTION_ARG_STRING, &direction,
- "Set text direction (default: auto)", "ltr/rtl/ttb/btt"},
- {"language", 0, 0, G_OPTION_ARG_STRING, &language,
- "Set text language (default: $LANG)", "langstr"},
- {"script", 0, 0, G_OPTION_ARG_STRING, &script,
- "Set text script (default: auto)", "ISO-15924 tag"},
- {"features", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_features,
- "Font features to apply to text", "TODO"},
-
- {"face-index", 0, 0, G_OPTION_ARG_INT, &face_index,
- "Face index (default: 0)", "index"},
- {"font-size", 0, 0, G_OPTION_ARG_DOUBLE, &font_size,
- "Font size", "size"},
+ {"version", 0, G_OPTION_FLAG_NO_ARG,
+ G_OPTION_ARG_CALLBACK, (gpointer) &show_version, "Show version numbers", NULL},
+ {"debug", 0, 0, G_OPTION_ARG_NONE, &debug, "Free all resources before exit", NULL},
+ {"output", 0, 0, G_OPTION_ARG_STRING, &out_file, "Set output file name", "filename"},
+
+ {"annotate", 0, 0, G_OPTION_ARG_NONE, &annotate, "Annotate output rendering", NULL},
+ {"background", 0, 0, G_OPTION_ARG_STRING, &back, "Set background color", "red/#rrggbb/#rrggbbaa"},
+ {"foreground", 0, 0, G_OPTION_ARG_STRING, &fore, "Set foreground color", "red/#rrggbb/#rrggbbaa"},
+ {"line-space", 0, 0, G_OPTION_ARG_DOUBLE, &font_size, "Set space between lines (default: 0)", "units"},
+ {"margin", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_margin, "Margin around output", "one to four numbers"},
+
+ {"direction", 0, 0, G_OPTION_ARG_STRING, &direction, "Set text direction (default: auto)", "ltr/rtl/ttb/btt"},
+ {"language", 0, 0, G_OPTION_ARG_STRING, &language, "Set text language (default: $LANG)", "langstr"},
+ {"script", 0, 0, G_OPTION_ARG_STRING, &script, "Set text script (default: auto)", "ISO-15924 tag"},
+ {"features", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_features, "Font features to apply to text", "TODO"},
+
+ {"face-index", 0, 0, G_OPTION_ARG_INT, &face_index, "Face index (default: 0)", "index"},
+ {"font-size", 0, 0, G_OPTION_ARG_DOUBLE, &font_size, "Font size", "size"},
{NULL}
};
commit 8df90c81187db58eee6b90426cd16c32feef6be3
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Aug 10 15:26:41 2011 +0200
[util] Port hb-view to GOption
diff --git a/util/hb-view.cc b/util/hb-view.cc
index dc3fc47..3d441f6 100644
--- a/util/hb-view.cc
+++ b/util/hb-view.cc
@@ -38,6 +38,7 @@
#include <locale.h>
#include <glib.h>
+#include <glib/gprintf.h>
#include <cairo-ft.h>
#include <hb-ft.h>
@@ -45,13 +46,13 @@
/* Controlled by cmd-line options */
-static int margin_t = 10;
-static int margin_b = 10;
-static int margin_l = 10;
-static int margin_r = 10;
-static int line_space = 0;
+struct margin_t {
+ double t, r, b, l;
+};
+static margin_t opt_margin = {18, 18, 18, 18};
+static double line_space = 0;
static int face_index = 0;
-static double font_size = 18;
+static double font_size = 36;
static const char *fore = "#000000";
static const char *back = "#ffffff";
static const char *text = NULL;
@@ -60,11 +61,12 @@ static const char *out_file = "/dev/stdout";
static const char *direction = NULL;
static const char *script = NULL;
static const char *language = NULL;
-static hb_feature_t *features = NULL;
-static unsigned int num_features;
static hb_bool_t annotate = FALSE;
static hb_bool_t debug = FALSE;
+static hb_feature_t *features = NULL;
+static unsigned int num_features;
+
/* Ugh, global vars. Ugly, but does the job */
static int width = 0;
static int height = 0;
@@ -81,110 +83,146 @@ usage (FILE *f, int status)
exit (status);
}
-G_GNUC_NORETURN static void
-version (void)
+static G_GNUC_NORETURN gboolean
+show_version (const char *name G_GNUC_UNUSED,
+ const char *arg G_GNUC_UNUSED,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED)
{
- printf ("hb-view (harfbuzz) %s\n", HB_VERSION_STRING);
- exit (0);
+ g_printf("%s (%s) %s\n", g_get_prgname (), PACKAGE_NAME, PACKAGE_VERSION);
+
+ if (strcmp (HB_VERSION_STRING, hb_version_string ()))
+ g_printf("Linked HarfBuzz library has a different version: %s\n", hb_version_string ());
+
+ exit(0);
}
-static void parse_features (char *s);
-static void
-parse_opts (int argc, char **argv)
+static gboolean
+parse_features (const char *name G_GNUC_UNUSED,
+ const char *arg,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED);
+
+static gboolean
+parse_margin (const char *name G_GNUC_UNUSED,
+ const char *arg,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED)
{
- argv[0] = (char *) "hb-view";
- while (1)
- {
- int option_index = 0, c;
- static const struct option long_options[] = {
- {"annotate", 0, &annotate, TRUE},
- {"background", 1, 0, 'B'},
- {"debug", 0, &debug, TRUE},
- {"direction", 1, 0, 'd'},
- {"features", 1, 0, 'f'},
- {"font-size", 1, 0, 's'},
- {"face-index", 1, 0, 'i'},
- {"foreground", 1, 0, 'F'},
- {"help", 0, 0, 'h'},
- {"language", 1, 0, 'L'},
- {"line-space", 1, 0, 'l'},
- {"margin", 1, 0, 'm'},
- {"output", 1, 0, 'o'},
- {"script", 1, 0, 'S'},
- {"version", 0, 0, 'v'},
- {0, 0, 0, 0}
- };
-
- c = getopt_long (argc, argv, "", long_options, &option_index);
- if (c == -1)
- break;
-
- switch (c)
- {
- case 0:
- break;
- case 'h':
- usage (stdout, 0);
- break;
- case 'v':
- version ();
- break;
- case 'i':
- face_index = atoi (optarg);
- break;
- case 'l':
- line_space = atoi (optarg);
- break;
- case 'm':
- switch (sscanf (optarg, "%d %d %d %d", &margin_t, &margin_r, &margin_b, &margin_l)) {
- default: break;
- case 1: margin_r = margin_t;
- case 2: margin_b = margin_t;
- case 3: margin_l = margin_r;
- }
- break;
- case 's':
- font_size = strtod (optarg, NULL);
- break;
- case 'f':
- parse_features (optarg);
- break;
- case 'F':
- fore = optarg;
- break;
- case 'B':
- back = optarg;
- break;
- case 't':
- text = optarg;
- break;
- case 'd':
- direction = optarg;
- break;
- case 'S':
- script = optarg;
- break;
- case 'L':
- language = optarg;
- break;
- case 'o':
- out_file = optarg;
- break;
- case '?':
- usage (stdout, 1);
- break;
- default:
- break;
- }
- }
- if (optind + 2 != argc)
- usage (stderr, 1);
- font_file = argv[optind++];
- text = argv[optind++];
+ switch (sscanf (arg, "%f %f %f %f", &opt_margin.t, &opt_margin.r, &opt_margin.b, &opt_margin.l)) {
+ case 1: opt_margin.r = opt_margin.t;
+ case 2: opt_margin.b = opt_margin.t;
+ case 3: opt_margin.l = opt_margin.r;
+ case 4: return TRUE;
+ default:
+ g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
+ "%s argument should be one to four space-separated numbers",
+ name);
+ return FALSE;
+ }
}
+void
+fail (const char *format, ...)
+{
+ const char *msg;
+
+ va_list vap;
+ va_start (vap, format);
+ msg = g_strdup_vprintf (format, vap);
+ g_printerr ("%s: %s\n", g_get_prgname (), msg);
+
+ exit (1);
+}
+
+static gchar *
+shapers_to_string (void)
+{
+ GString *shapers = g_string_new (NULL);
+ const char **shaper_list = hb_shape_list_shapers ();
+
+ for (; *shaper_list; shaper_list++) {
+ g_string_append (shapers, *shaper_list);
+ g_string_append_c (shapers, ',');
+ }
+ g_string_truncate (shapers, MAX (0, (gint)shapers->len - 1));
+
+ return g_string_free(shapers, FALSE);
+}
+
+void
+parse_options (int argc, char *argv[])
+{
+ gchar *shapers_options = shapers_to_string ();
+ GOptionEntry entries[] =
+ {
+ {"version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) &show_version,
+ "Show version numbers", NULL},
+ {"debug", 0, 0, G_OPTION_ARG_NONE, &debug,
+ "Free all resources before exit", NULL},
+ {"output", 0, 0, G_OPTION_ARG_STRING, &out_file,
+ "Set output file name", "filename"},
+
+ {"annotate", 0, 0, G_OPTION_ARG_NONE, &annotate,
+ "Annotate output rendering", NULL},
+ {"background", 0, 0, G_OPTION_ARG_STRING, &back,
+ "Set background color", "red/#rrggbb/#rrggbbaa"},
+ {"foreground", 0, 0, G_OPTION_ARG_STRING, &fore,
+ "Set foreground color", "red/#rrggbb/#rrggbbaa"},
+ {"line-space", 0, 0, G_OPTION_ARG_DOUBLE, &font_size,
+ "Set space between lines (default: 0)", "units"},
+ {"margin", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_margin,
+ "Margin around output", "one to four numbers"},
+
+ {"direction", 0, 0, G_OPTION_ARG_STRING, &direction,
+ "Set text direction (default: auto)", "ltr/rtl/ttb/btt"},
+ {"language", 0, 0, G_OPTION_ARG_STRING, &language,
+ "Set text language (default: $LANG)", "langstr"},
+ {"script", 0, 0, G_OPTION_ARG_STRING, &script,
+ "Set text script (default: auto)", "ISO-15924 tag"},
+ {"features", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_features,
+ "Font features to apply to text", "TODO"},
+
+ {"face-index", 0, 0, G_OPTION_ARG_INT, &face_index,
+ "Face index (default: 0)", "index"},
+ {"font-size", 0, 0, G_OPTION_ARG_DOUBLE, &font_size,
+ "Font size", "size"},
+
+ {NULL}
+ };
+ GError *error = NULL;
+ GError *parse_error = NULL;
+ GOptionContext *context;
+ size_t len;
+
+ context = g_option_context_new ("- FONT-FILE TEXT");
+
+ g_option_context_add_main_entries (context, entries, NULL);
+
+ if (!g_option_context_parse (context, &argc, &argv, &parse_error))
+ {
+ if (parse_error != NULL)
+ fail ("%s", parse_error->message);
+ else
+ fail ("Option parse error");
+ exit(1);
+ }
+ g_option_context_free(context);
+ g_free(shapers_options);
+
+ if (argc != 3) {
+ g_printerr ("Usage: %s [OPTION...] FONT-FILE TEXT\n", g_get_prgname ());
+ exit (1);
+ }
+
+ font_file = argv[1];
+ text = g_locale_to_utf8 (argv[2], -1, NULL, NULL, &error);
+}
+
+
+
static void
parse_space (char **pp)
{
@@ -309,15 +347,20 @@ skip_one_feature (char **pp)
*pp = *pp + strlen (*pp);
}
-static void parse_features (char *s)
+static gboolean
+parse_features (const char *name G_GNUC_UNUSED,
+ const char *arg,
+ gpointer data G_GNUC_UNUSED,
+ GError **error G_GNUC_UNUSED)
{
+ char *s = (char *) arg;
char *p;
num_features = 0;
features = NULL;
if (!*s)
- return;
+ return TRUE;
/* count the features first, so we can allocate memory */
p = s;
@@ -339,6 +382,8 @@ static void parse_features (char *s)
else
skip_one_feature (&p);
}
+
+ return TRUE;
}
@@ -465,8 +510,8 @@ draw (void)
height = 0;
width = 0;
- x = margin_l;
- y = margin_t;
+ x = opt_margin.l;
+ y = opt_margin.t;
do {
cairo_text_extents_t extents;
@@ -513,8 +558,8 @@ draw (void)
p = end + 1;
} while (*end);
- height = y + margin_b;
- width += margin_l + margin_r;
+ height = y + opt_margin.b;
+ width += opt_margin.l + opt_margin.r;
cairo_destroy (cr);
}
@@ -530,7 +575,7 @@ main (int argc, char **argv)
setlocale (LC_ALL, "");
- parse_opts (argc, argv);
+ parse_options (argc, argv);
FT_Init_FreeType (&ft_library);
if (FT_New_Face (ft_library, font_file, face_index, &ft_face)) {
More information about the HarfBuzz
mailing list