[HarfBuzz] harfbuzz-ng: Branch 'master' - 6 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Thu Jul 21 07:17:27 PDT 2011
src/Makefile.am | 1
src/hb-buffer-private.hh | 10 ++++++
src/hb-buffer.cc | 19 +++++++++--
src/hb-ot-shape-normalize.cc | 71 +++++++++++++++++++++++++++++++++++++++++++
src/hb-ot-shape-private.hh | 12 +++++++
src/hb-ot-shape.cc | 18 +++-------
test/test-unicode.c | 2 -
7 files changed, 117 insertions(+), 16 deletions(-)
New commits:
commit ad903e66b1cc4ec1b8160f93b3ab2b5e636f8d62
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Jul 21 10:17:22 2011 -0400
s/COMBINING_MARK/SPACING_MARK/ here too. Oops!
diff --git a/test/test-unicode.c b/test/test-unicode.c
index dd57984..c614c7d 100644
--- a/test/test-unicode.c
+++ b/test/test-unicode.c
@@ -234,7 +234,7 @@ static const test_pair_t general_category_tests[] =
{ 0x3400, HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER },
{ 0x01C5, HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER },
{ 0xFF21, HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER },
- { 0x0903, HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK },
+ { 0x0903, HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK },
{ 0x20DD, HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK },
{ 0xA806, HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK },
{ 0xFF10, HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER },
commit cf7f43ec3382cac2af11f5637c840500daabf889
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Jul 21 01:12:26 2011 -0400
Remove stale comment
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index b9754ce..50f2986 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -371,7 +371,6 @@ hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
/* SUBSTITUTE */
{
- /* Mirroring needs to see the original direction */
hb_mirror_chars (c);
hb_substitute_default (c);
commit 54d1a0d2b2c4ffe15494967122c6422ecb1fc80b
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Jul 21 01:11:09 2011 -0400
Form clusters before ensuring native direciton
This is essential as ensure_native_direction uses cluster info that
is set by form_clusters().
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 33123d4..b9754ce 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -361,10 +361,10 @@ hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
hb_set_unicode_props (c); /* BUFFER: Set general_category and combining_class in var1 */
- hb_ensure_native_direction (c);
-
hb_form_clusters (c);
+ hb_ensure_native_direction (c);
+
_hb_normalize (c);
hb_ot_shape_setup_masks (c); /* BUFFER: Clobbers var2 */
commit 9111b21ef99d5e53348176f683261b0101eb427f
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Jul 21 00:58:29 2011 -0400
Add _hb_buffer_output_glyph() and _hb_buffer_skip_glyph()
diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index 4fae884..73535d4 100644
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -66,6 +66,13 @@ _hb_buffer_replace_glyph (hb_buffer_t *buffer,
hb_codepoint_t glyph_index);
HB_INTERNAL void
+_hb_buffer_output_glyph (hb_buffer_t *buffer,
+ hb_codepoint_t glyph_index);
+
+HB_INTERNAL void
+_hb_buffer_skip_glyph (hb_buffer_t *buffer);
+
+HB_INTERNAL void
_hb_buffer_next_glyph (hb_buffer_t *buffer);
@@ -125,6 +132,9 @@ struct _hb_buffer_t {
{ _hb_buffer_replace_glyphs_be16 (this, num_in, num_out, glyph_data_be); }
inline void replace_glyph (hb_codepoint_t glyph_index)
{ _hb_buffer_replace_glyph (this, glyph_index); }
+ inline void output_glyph (hb_codepoint_t glyph_index)
+ { _hb_buffer_output_glyph (this, glyph_index); }
+ inline void skip_glyph (void) { _hb_buffer_skip_glyph (this); }
inline void reset_masks (hb_mask_t mask)
{
diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index b65ddbb..174d8e8 100644
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -404,8 +404,8 @@ _hb_buffer_replace_glyphs_be16 (hb_buffer_t *buffer,
}
void
-_hb_buffer_replace_glyph (hb_buffer_t *buffer,
- hb_codepoint_t glyph_index)
+_hb_buffer_output_glyph (hb_buffer_t *buffer,
+ hb_codepoint_t glyph_index)
{
hb_glyph_info_t *info;
@@ -420,11 +420,24 @@ _hb_buffer_replace_glyph (hb_buffer_t *buffer,
info = &buffer->out_info[buffer->out_len];
info->codepoint = glyph_index;
- buffer->i++;
buffer->out_len++;
}
void
+_hb_buffer_replace_glyph (hb_buffer_t *buffer,
+ hb_codepoint_t glyph_index)
+{
+ _hb_buffer_output_glyph (buffer, glyph_index);
+ _hb_buffer_skip_glyph (buffer);
+}
+
+void
+_hb_buffer_skip_glyph (hb_buffer_t *buffer)
+{
+ buffer->i++;
+}
+
+void
_hb_buffer_next_glyph (hb_buffer_t *buffer)
{
if (buffer->have_output)
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 306beb3..33123d4 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -264,7 +264,7 @@ hb_map_glyphs (hb_font_t *font,
if (unlikely (is_variation_selector (buffer->info[buffer->i + 1].codepoint))) {
hb_font_get_glyph (font, buffer->info[buffer->i].codepoint, buffer->info[buffer->i + 1].codepoint, &glyph);
buffer->replace_glyph (glyph);
- buffer->i++;
+ buffer->skip_glyph ();
} else {
hb_font_get_glyph (font, buffer->info[buffer->i].codepoint, 0, &glyph);
buffer->replace_glyph (glyph);
commit 655586fe5e1fadf2a2ef7826e61ee9a445ffa37a
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Jul 21 00:51:18 2011 -0400
Towards normalization
diff --git a/src/Makefile.am b/src/Makefile.am
index 4bff997..2692d33 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,6 +60,7 @@ HBSOURCES += \
hb-ot-shape-complex-indic-table.hh \
hb-ot-shape-complex-misc.cc \
hb-ot-shape-complex-private.hh \
+ hb-ot-shape-normalize.cc \
hb-ot-shape-private.hh \
hb-ot-tag.cc \
$(NULL)
diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
new file mode 100644
index 0000000..6d55a30
--- /dev/null
+++ b/src/hb-ot-shape-normalize.cc
@@ -0,0 +1,71 @@
+/*
+ * 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 "hb-ot-shape-private.hh"
+
+HB_BEGIN_DECLS
+
+static void
+handle_single_char_cluster (hb_ot_shape_context_t *c,
+ unsigned int i)
+{
+ hb_buffer_t *b = c->buffer;
+ hb_codepoint_t glyph;
+
+ if (hb_font_get_glyph (c->font, b->info[i].codepoint, 0, &glyph))
+ return;
+
+ /* Decompose */
+}
+
+static void
+handle_multi_char_cluster (hb_ot_shape_context_t *c,
+ unsigned int i,
+ unsigned int end)
+{
+ /* If there's a variation-selector, give-up, it's just too hard. */
+}
+
+void
+_hb_normalize (hb_ot_shape_context_t *c)
+{
+ hb_buffer_t *b = c->buffer;
+
+ unsigned int count = b->len;
+ for (unsigned int i = 0; i < count;) {
+ unsigned int end;
+ for (end = i + 1; end < count; end++)
+ if (b->info[i].cluster != b->info[end].cluster)
+ break;
+ if (i + 1 == end)
+ handle_single_char_cluster (c, i);
+ else
+ handle_multi_char_cluster (c, i, end);
+ i = end;
+ }
+}
+
+HB_END_DECLS
diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape-private.hh
index 307784d..d64178a 100644
--- a/src/hb-ot-shape-private.hh
+++ b/src/hb-ot-shape-private.hh
@@ -91,6 +91,18 @@ struct hb_ot_shape_context_t
};
+static inline hb_bool_t
+is_variation_selector (hb_codepoint_t unicode)
+{
+ return unlikely ((unicode >= 0x180B && unicode <= 0x180D) || /* MONGOLIAN FREE VARIATION SELECTOR ONE..THREE */
+ (unicode >= 0xFE00 && unicode <= 0xFE0F) || /* VARIATION SELECTOR-1..16 */
+ (unicode >= 0xE0100 && unicode <= 0xE01EF)); /* VARIATION SELECTOR-17..256 */
+}
+
+
+HB_INTERNAL void _hb_normalize (hb_ot_shape_context_t *c);
+
+
HB_END_DECLS
#endif /* HB_OT_SHAPE_PRIVATE_HH */
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 2abcb9e..306beb3 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -176,14 +176,6 @@ hb_ot_position_complex (hb_ot_shape_context_t *c)
/* Prepare */
-static inline hb_bool_t
-is_variation_selector (hb_codepoint_t unicode)
-{
- return unlikely ((unicode >= 0x180B && unicode <= 0x180D) || /* MONGOLIAN FREE VARIATION SELECTOR ONE..THREE */
- (unicode >= 0xFE00 && unicode <= 0xFE0F) || /* VARIATION SELECTOR-1..16 */
- (unicode >= 0xE0100 && unicode <= 0xE01EF)); /* VARIATION SELECTOR-17..256 */
-}
-
static void
hb_set_unicode_props (hb_ot_shape_context_t *c)
{
@@ -373,6 +365,8 @@ hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
hb_form_clusters (c);
+ _hb_normalize (c);
+
hb_ot_shape_setup_masks (c); /* BUFFER: Clobbers var2 */
/* SUBSTITUTE */
commit 49741c86334d12fa08a5bfa2110ff3b9adcba1c7
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Jul 21 00:35:37 2011 -0400
Include variation-selectors in cluster calculation
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index a9a8a7a..2abcb9e 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -205,7 +205,8 @@ hb_form_clusters (hb_ot_shape_context_t *c)
if (FLAG (c->buffer->info[i].general_category()) &
(FLAG (HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK) |
FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) |
- FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)))
+ FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)) ||
+ is_variation_selector (c->buffer->info[c->buffer->i].codepoint))
c->buffer->info[i].cluster = c->buffer->info[i - 1].cluster;
}
More information about the HarfBuzz
mailing list