summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-08-10 16:01:46 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-08-10 16:01:46 +0000
commitf978372136fc20679761bc86eff186edbca8ee42 (patch)
tree7e51fbd012914249b5da3ac336db74f7f930bf6d
parent285abaf4388ff793e1daf5d2084c69a83a9d82eb (diff)
downloadpango-f978372136fc20679761bc86eff186edbca8ee42.tar.gz
Fix bug where cluster was getting set to 0 for non-spacing marks rather
Tue Aug 10 11:51:10 2004 Owen Taylor <otaylor@redhat.com> * modules/arabic/arabic-fc.c (arabic_engine_shape): Fix bug where cluster was getting set to 0 for non-spacing marks rather than to the cluster of the base character. (#149126, Behdad Esfahbod)
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-1-107
-rw-r--r--ChangeLog.pre-1-67
-rw-r--r--ChangeLog.pre-1-87
-rw-r--r--modules/arabic/arabic-fc.c2
5 files changed, 29 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 11bd4d0d..d8317c3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Aug 10 11:51:10 2004 Owen Taylor <otaylor@redhat.com>
+
+ * modules/arabic/arabic-fc.c (arabic_engine_shape): Fix
+ bug where cluster was getting set to 0 for non-spacing
+ marks rather than to the cluster of the base character.
+ (#149126, Behdad Esfahbod)
+
2004-08-06 Hans Breuer <hans@breuer.org>
* pango/pango.def pango/pangoft2.def pango/pangowin32.def
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 11bd4d0d..d8317c3f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Tue Aug 10 11:51:10 2004 Owen Taylor <otaylor@redhat.com>
+
+ * modules/arabic/arabic-fc.c (arabic_engine_shape): Fix
+ bug where cluster was getting set to 0 for non-spacing
+ marks rather than to the cluster of the base character.
+ (#149126, Behdad Esfahbod)
+
2004-08-06 Hans Breuer <hans@breuer.org>
* pango/pango.def pango/pangoft2.def pango/pangowin32.def
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 11bd4d0d..d8317c3f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Tue Aug 10 11:51:10 2004 Owen Taylor <otaylor@redhat.com>
+
+ * modules/arabic/arabic-fc.c (arabic_engine_shape): Fix
+ bug where cluster was getting set to 0 for non-spacing
+ marks rather than to the cluster of the base character.
+ (#149126, Behdad Esfahbod)
+
2004-08-06 Hans Breuer <hans@breuer.org>
* pango/pango.def pango/pangoft2.def pango/pangowin32.def
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 11bd4d0d..d8317c3f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Tue Aug 10 11:51:10 2004 Owen Taylor <otaylor@redhat.com>
+
+ * modules/arabic/arabic-fc.c (arabic_engine_shape): Fix
+ bug where cluster was getting set to 0 for non-spacing
+ marks rather than to the cluster of the base character.
+ (#149126, Behdad Esfahbod)
+
2004-08-06 Hans Breuer <hans@breuer.org>
* pango/pango.def pango/pangoft2.def pango/pangowin32.def
diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index e037a609..04ea2418 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -257,6 +257,7 @@ arabic_engine_shape (PangoEngineShape *engine,
PangoOTRuleset *ruleset;
PangoOTBuffer *buffer;
PangoFcFont *fc_font;
+ int cluster = 0;
g_return_if_fail (font != NULL);
g_return_if_fail (text != NULL);
@@ -292,7 +293,6 @@ arabic_engine_shape (PangoEngineShape *engine,
PangoGlyph index;
char buf[6];
const char *input;
- int cluster = 0;
wc = g_utf8_get_char (p);