[HarfBuzz] harfbuzz-ng: Branch 'master' - 6 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Wed Oct 27 11:09:52 PDT 2010
src/hb-ot-layout-common-private.hh | 2 -
src/hb-ot-layout-gdef-private.hh | 34 +++++++++++----------
src/hb-ot-layout-gpos-private.hh | 31 ++++++++++++++-----
src/hb-ot-layout-gsubgpos-private.hh | 6 ---
src/hb-ot-layout.cc | 55 +++++++++++++++++++++--------------
src/hb-ot-layout.h | 13 ++++----
6 files changed, 80 insertions(+), 61 deletions(-)
New commits:
commit 13528d0c78cadb1f67267c9a692558caef9fdaa6
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 27 14:09:27 2010 -0400
Supposedly implement vertical support in GPOS
Not tested at all.
diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index 6be604e..187dc98 100644
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -855,27 +855,40 @@ struct CursivePosFormat1
(this+this_record.exitAnchor).get_anchor (c->layout, c->buffer->info[i].codepoint, &exit_x, &exit_y);
(this+next_record.entryAnchor).get_anchor (c->layout, c->buffer->info[j].codepoint, &entry_x, &entry_y);
- /* TODO vertical */
+ hb_direction_t direction = c->buffer->props.direction;
- /* Align the exit anchor of the left glyph with the entry anchor of the right glyph. */
- if (c->buffer->props.direction == HB_DIRECTION_RTL)
+ /* Align the exit anchor of the left/top glyph with the entry anchor of the right/bottom glyph
+ * by adjusting advance of the left/top glyph. */
+ if (HB_DIRECTION_IS_BACKWARD (direction))
{
- c->buffer->pos[j].x_advance = c->buffer->pos[j].x_offset + entry_x - exit_x;
+ if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
+ c->buffer->pos[j].x_advance = c->buffer->pos[j].x_offset + entry_x - exit_x;
+ else
+ c->buffer->pos[j].y_advance = c->buffer->pos[j].y_offset + entry_y - exit_y;
}
else
{
- c->buffer->pos[i].x_advance = c->buffer->pos[i].x_offset + exit_x - entry_x;
+ if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
+ c->buffer->pos[i].x_advance = c->buffer->pos[i].x_offset + exit_x - entry_x;
+ else
+ c->buffer->pos[i].y_advance = c->buffer->pos[i].y_offset + exit_y - entry_y;
}
if (c->lookup_flag & LookupFlag::RightToLeft)
{
c->buffer->pos[i].cursive_chain = j - i;
- c->buffer->pos[i].y_offset = entry_y - exit_y;
+ if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
+ c->buffer->pos[i].y_offset = entry_y - exit_y;
+ else
+ c->buffer->pos[i].x_offset = entry_x - exit_x;
}
else
{
c->buffer->pos[j].cursive_chain = i - j;
- c->buffer->pos[j].y_offset = exit_y - entry_y;
+ if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
+ c->buffer->pos[j].y_offset = exit_y - entry_y;
+ else
+ c->buffer->pos[j].x_offset = exit_x - entry_x;
}
c->buffer->i = j;
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 75fa203..f85bf86 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -607,25 +607,34 @@ hb_ot_layout_position_finish (hb_font_t *font HB_UNUSED,
unsigned int i, j;
unsigned int len = hb_buffer_get_length (buffer);
hb_internal_glyph_position_t *pos = (hb_internal_glyph_position_t *) hb_buffer_get_glyph_positions (buffer);
+ hb_direction_t direction = buffer->props.direction;
/* TODO: Vertical */
- /* Handle cursive connections */
- /* First handle all chain-back connections */
- for (j = 0; j < len; j++) {
- if (pos[j].cursive_chain < 0)
- {
- pos[j].y_offset += pos[j + pos[j].cursive_chain].y_offset;
- pos[j].cursive_chain = 0;
+ /* Handle cursive connections:
+ * First handle all chain-back connections, then handle all chain-forward connections. */
+ if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
+ {
+ for (j = 0; j < len; j++) {
+ if (pos[j].cursive_chain < 0)
+ pos[j].y_offset += pos[j + pos[j].cursive_chain].y_offset;
+ }
+ for (i = len; i > 0; i--) {
+ j = i - 1;
+ if (pos[j].cursive_chain > 0)
+ pos[j].y_offset += pos[j + pos[j].cursive_chain].y_offset;
}
}
- /* Then handle all chain-forward connections */
- for (i = len; i > 0; i--) {
- j = i - 1;
- if (pos[j].cursive_chain > 0)
- {
- pos[j].y_offset += pos[j + pos[j].cursive_chain].y_offset;
- pos[j].cursive_chain = 0;
+ else
+ {
+ for (j = 0; j < len; j++) {
+ if (pos[j].cursive_chain < 0)
+ pos[j].x_offset += pos[j + pos[j].cursive_chain].x_offset;
+ }
+ for (i = len; i > 0; i--) {
+ j = i - 1;
+ if (pos[j].cursive_chain > 0)
+ pos[j].x_offset += pos[j + pos[j].cursive_chain].x_offset;
}
}
@@ -639,7 +648,7 @@ hb_ot_layout_position_finish (hb_font_t *font HB_UNUSED,
pos[i].x_offset += pos[back].x_offset;
pos[i].y_offset += pos[back].y_offset;
- if (buffer->props.direction == HB_DIRECTION_RTL)
+ if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction))
for (j = back + 1; j < i + 1; j++) {
pos[i].x_offset += pos[j].x_advance;
pos[i].y_offset += pos[j].y_advance;
commit 9624de5b496846cd89ee4f7b07d38029aca70ce1
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 27 13:44:59 2010 -0400
Clarify cursive_chain (and change its sign)
diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index c991a35..6be604e 100644
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -869,12 +869,12 @@ struct CursivePosFormat1
if (c->lookup_flag & LookupFlag::RightToLeft)
{
- c->buffer->pos[i].cursive_chain = i - j;
+ c->buffer->pos[i].cursive_chain = j - i;
c->buffer->pos[i].y_offset = entry_y - exit_y;
}
else
{
- c->buffer->pos[j].cursive_chain = j - i;
+ c->buffer->pos[j].cursive_chain = i - j;
c->buffer->pos[j].y_offset = exit_y - entry_y;
}
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index e880b9c..75fa203 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -611,24 +611,25 @@ hb_ot_layout_position_finish (hb_font_t *font HB_UNUSED,
/* TODO: Vertical */
/* Handle cursive connections */
- /* First handle all left-to-right connections */
+ /* First handle all chain-back connections */
for (j = 0; j < len; j++) {
- if (pos[j].cursive_chain > 0)
+ if (pos[j].cursive_chain < 0)
{
- pos[j].y_offset += pos[j - pos[j].cursive_chain].y_offset;
+ pos[j].y_offset += pos[j + pos[j].cursive_chain].y_offset;
pos[j].cursive_chain = 0;
}
}
- /* Then handle all right-to-left connections */
+ /* Then handle all chain-forward connections */
for (i = len; i > 0; i--) {
j = i - 1;
- if (pos[j].cursive_chain < 0)
+ if (pos[j].cursive_chain > 0)
{
- pos[j].y_offset += pos[j - pos[j].cursive_chain].y_offset;
+ pos[j].y_offset += pos[j + pos[j].cursive_chain].y_offset;
pos[j].cursive_chain = 0;
}
}
+
/* Handle attachments */
for (i = 0; i < len; i++)
if (pos[i].back)
commit d6c9eadb88240c40b3cb9a33f067e575cbc2f729
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 27 12:34:50 2010 -0400
Remove more pointless LONGTERMTODO items
diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index 6ea2d0e..ccbd939 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -257,8 +257,6 @@ struct Feature
&& lookupIndex.sanitize (c);
}
- /* LONGTERMTODO: implement get_feature_parameters() */
- /* LONGTERMTODO: implement FeatureSize and other special features? */
Offset featureParams; /* Offset to Feature Parameters table (if one
* has been defined for the feature), relative
* to the beginning of the Feature Table; = Null
commit e204674fe340a57c48a9fe7e1ed02a9a08f4aca4
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 27 12:32:02 2010 -0400
Rename hb_ot_layout_get_lig_carets() to hb_ot_layout_get_ligature_carets()
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 3028d86..e880b9c 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -316,13 +316,13 @@ hb_ot_layout_get_attach_points (hb_face_t *face,
}
unsigned int
-hb_ot_layout_get_lig_carets (hb_font_t *font,
- hb_face_t *face,
- hb_direction_t direction,
- hb_codepoint_t glyph,
- unsigned int start_offset,
- unsigned int *caret_count /* IN/OUT */,
- int *caret_array /* OUT */)
+hb_ot_layout_get_ligature_carets (hb_font_t *font,
+ hb_face_t *face,
+ hb_direction_t direction,
+ hb_codepoint_t glyph,
+ unsigned int start_offset,
+ unsigned int *caret_count /* IN/OUT */,
+ int *caret_array /* OUT */)
{
hb_ot_layout_context_t c;
c.font = font;
diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h
index 9c47435..541b191 100644
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -84,13 +84,13 @@ hb_ot_layout_get_attach_points (hb_face_t *face,
/* Ligature caret positions */
unsigned int
-hb_ot_layout_get_lig_carets (hb_font_t *font,
- hb_face_t *face,
- hb_direction_t direction,
- hb_codepoint_t glyph,
- unsigned int start_offset,
- unsigned int *caret_count /* IN/OUT */,
- int *caret_array /* OUT */);
+hb_ot_layout_get_ligature_carets (hb_font_t *font,
+ hb_face_t *face,
+ hb_direction_t direction,
+ hb_codepoint_t glyph,
+ unsigned int start_offset,
+ unsigned int *caret_count /* IN/OUT */,
+ int *caret_array /* OUT */);
/*
commit 3357d145f81cb7b746c910018fe3a0dfab00972c
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 27 12:30:46 2010 -0400
Implement vertical support in get_lig_carets()
diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-private.hh
index 52d528a..c7bd738 100644
--- a/src/hb-ot-layout-gdef-private.hh
+++ b/src/hb-ot-layout-gdef-private.hh
@@ -94,10 +94,9 @@ struct CaretValueFormat1
friend struct CaretValue;
private:
- inline int get_caret_value (hb_ot_layout_context_t *c, hb_codepoint_t glyph_id HB_UNUSED) const
+ inline int get_caret_value (hb_ot_layout_context_t *c, hb_direction_t direction, hb_codepoint_t glyph_id HB_UNUSED) const
{
- /* TODO vertical */
- return c->scale_x (coordinate);
+ return HB_DIRECTION_IS_HORIZONTAL (direction) ? c->scale_x (coordinate) : c->scale_y (coordinate);
}
inline bool sanitize (hb_sanitize_context_t *c) {
@@ -117,12 +116,11 @@ struct CaretValueFormat2
friend struct CaretValue;
private:
- inline int get_caret_value (hb_ot_layout_context_t *c, hb_codepoint_t glyph_id) const
+ inline int get_caret_value (hb_ot_layout_context_t *c, hb_direction_t direction, hb_codepoint_t glyph_id) const
{
- /* TODO vertical */
hb_position_t x, y;
if (hb_font_get_contour_point (c->font, c->face, caretValuePoint, glyph_id, &x, &y))
- return x;
+ return HB_DIRECTION_IS_HORIZONTAL (direction) ? x : y;
else
return 0;
}
@@ -143,10 +141,11 @@ struct CaretValueFormat3
{
friend struct CaretValue;
- inline int get_caret_value (hb_ot_layout_context_t *c, hb_codepoint_t glyph_id HB_UNUSED) const
+ inline int get_caret_value (hb_ot_layout_context_t *c, hb_direction_t direction, hb_codepoint_t glyph_id) const
{
- /* TODO vertical */
- return c->scale_x (coordinate) + ((this+deviceTable).get_x_delta (c));
+ return HB_DIRECTION_IS_HORIZONTAL (direction) ?
+ c->scale_x (coordinate) + (this+deviceTable).get_x_delta (c) :
+ c->scale_y (coordinate) + (this+deviceTable).get_y_delta (c);
}
inline bool sanitize (hb_sanitize_context_t *c) {
@@ -168,12 +167,12 @@ struct CaretValueFormat3
struct CaretValue
{
- inline int get_caret_value (hb_ot_layout_context_t *c, hb_codepoint_t glyph_id) const
+ inline int get_caret_value (hb_ot_layout_context_t *c, hb_direction_t direction, hb_codepoint_t glyph_id) const
{
switch (u.format) {
- case 1: return u.format1.get_caret_value (c, glyph_id);
- case 2: return u.format2.get_caret_value (c, glyph_id);
- case 3: return u.format3.get_caret_value (c, glyph_id);
+ case 1: return u.format1.get_caret_value (c, direction, glyph_id);
+ case 2: return u.format2.get_caret_value (c, direction, glyph_id);
+ case 3: return u.format3.get_caret_value (c, direction, glyph_id);
default:return 0;
}
}
@@ -203,6 +202,7 @@ struct CaretValue
struct LigGlyph
{
inline unsigned int get_lig_carets (hb_ot_layout_context_t *c,
+ hb_direction_t direction,
hb_codepoint_t glyph_id,
unsigned int start_offset,
unsigned int *caret_count /* IN/OUT */,
@@ -212,7 +212,7 @@ struct LigGlyph
const OffsetTo<CaretValue> *array = carets.sub_array (start_offset, caret_count);
unsigned int count = *caret_count;
for (unsigned int i = 0; i < count; i++)
- caret_array[i] = (this+array[i]).get_caret_value (c, glyph_id);
+ caret_array[i] = (this+array[i]).get_caret_value (c, direction, glyph_id);
}
return carets.len;
@@ -235,6 +235,7 @@ struct LigGlyph
struct LigCaretList
{
inline unsigned int get_lig_carets (hb_ot_layout_context_t *c,
+ hb_direction_t direction,
hb_codepoint_t glyph_id,
unsigned int start_offset,
unsigned int *caret_count /* IN/OUT */,
@@ -248,7 +249,7 @@ struct LigCaretList
return 0;
}
const LigGlyph &lig_glyph = this+ligGlyph[index];
- return lig_glyph.get_lig_carets (c, glyph_id, start_offset, caret_count, caret_array);
+ return lig_glyph.get_lig_carets (c, direction, glyph_id, start_offset, caret_count, caret_array);
}
inline bool sanitize (hb_sanitize_context_t *c) {
@@ -350,11 +351,12 @@ struct GDEF
inline bool has_lig_carets (void) const { return ligCaretList != 0; }
inline unsigned int get_lig_carets (hb_ot_layout_context_t *c,
+ hb_direction_t direction,
hb_codepoint_t glyph_id,
unsigned int start_offset,
unsigned int *caret_count /* IN/OUT */,
int *caret_array /* OUT */) const
- { return (this+ligCaretList).get_lig_carets (c, glyph_id, start_offset, caret_count, caret_array); }
+ { return (this+ligCaretList).get_lig_carets (c, direction, glyph_id, start_offset, caret_count, caret_array); }
inline bool has_mark_sets (void) const { return version >= 0x00010002 && markGlyphSetsDef[0] != 0; }
inline bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 5126f37..3028d86 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -318,6 +318,7 @@ hb_ot_layout_get_attach_points (hb_face_t *face,
unsigned int
hb_ot_layout_get_lig_carets (hb_font_t *font,
hb_face_t *face,
+ hb_direction_t direction,
hb_codepoint_t glyph,
unsigned int start_offset,
unsigned int *caret_count /* IN/OUT */,
@@ -326,7 +327,7 @@ hb_ot_layout_get_lig_carets (hb_font_t *font,
hb_ot_layout_context_t c;
c.font = font;
c.face = face;
- return _get_gdef (face).get_lig_carets (&c, glyph, start_offset, caret_count, caret_array);
+ return _get_gdef (face).get_lig_carets (&c, direction, glyph, start_offset, caret_count, caret_array);
}
/*
diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h
index e1b6381..9c47435 100644
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -86,6 +86,7 @@ hb_ot_layout_get_attach_points (hb_face_t *face,
unsigned int
hb_ot_layout_get_lig_carets (hb_font_t *font,
hb_face_t *face,
+ hb_direction_t direction,
hb_codepoint_t glyph,
unsigned int start_offset,
unsigned int *caret_count /* IN/OUT */,
commit 8eeed7eddc789151cbffe62ed6bfd77612266bf1
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 27 12:07:49 2010 -0400
Remove LONGTERMTODO item that I'll never fix
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index c13cddf..8268d0f 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -395,9 +395,6 @@ struct ContextFormat2
const ClassDef &class_def = this+classDef;
index = class_def (c->buffer->info[c->buffer->i].codepoint);
const RuleSet &rule_set = this+ruleSet[index];
- /* LONGTERMTODO: Old code fetches glyph classes at most once and caches
- * them across subrule lookups. Not sure it's worth it.
- */
struct ContextLookupContext lookup_context = {
{match_class, apply_func},
&class_def
@@ -688,9 +685,6 @@ struct ChainContextFormat2
index = input_class_def (c->buffer->info[c->buffer->i].codepoint);
const ChainRuleSet &rule_set = this+ruleSet[index];
- /* LONGTERMTODO: Old code fetches glyph classes at most once and caches
- * them across subrule lookups. Not sure it's worth it.
- */
struct ChainContextLookupContext lookup_context = {
{match_class, apply_func},
{&backtrack_class_def,
More information about the HarfBuzz
mailing list