summaryrefslogtreecommitdiff
path: root/pango/mapping.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-04-04 00:36:30 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-04-04 00:36:30 +0000
commit2149bad49c6b0603daa2ee90d66a9f37d75f1eb9 (patch)
tree8611273faef107a30a29da4fdec6daa76a4d65cf /pango/mapping.c
parentf3542cd8e6a4f666b3c39cb8d562a88369d9e858 (diff)
downloadpango-2149bad49c6b0603daa2ee90d66a9f37d75f1eb9.tar.gz
Fix handling of positions at character limits.
Mon Apr 3 20:30:20 2000 Owen Taylor <otaylor@redhat.com> * pango/mapping.c (pango_glyph_string_x_to_index): Fix handling of positions at character limits. * modules/basic/basic.c (basic_engine_shape): Fix bug that was causing mirrored characters not to mirror.
Diffstat (limited to 'pango/mapping.c')
-rw-r--r--pango/mapping.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/pango/mapping.c b/pango/mapping.c
index c58a1187..3ed47c66 100644
--- a/pango/mapping.c
+++ b/pango/mapping.c
@@ -285,7 +285,7 @@ pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
char *p = text + start_index;
int i = 0;
- while (i + 1 < cp)
+ while (i + 1 <= cp)
{
p = unicode_next_utf8 (p);
i++;
@@ -293,8 +293,11 @@ pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
*index = (p - text);
}
+
+ /* FIXME: Handle multiple character clusters better
+ */
if (trailing)
- *trailing = (cp - (int)cp) > 0.5 ? 1 : 0;
+ *trailing = (cp - (int)cp > 0.5) ? 1 : 0;
}
}