summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-07-21 18:46:01 +0000
committerOwen Taylor <otaylor@src.gnome.org>2005-07-21 18:46:01 +0000
commit86264b6c02c16e6f417192ed8f8fcbe3f8f4da39 (patch)
tree42f5a580f8ad870e6825e815e5fb4ce4aeb17773
parent79bd22a212421749deeeb45b429c898118e96016 (diff)
downloadpango-86264b6c02c16e6f417192ed8f8fcbe3f8f4da39.tar.gz
Merges of fixes from Arabic module (#308813, Emil Soleyman-Zomalan)
2005-07-21 Owen Taylor <otaylor@redhat.com> Merges of fixes from Arabic module (#308813, Emil Soleyman-Zomalan) * modules/syriac/syriac-fc.c (syriac_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) * modules/syriac/syriac-fc.c (syriac_engine_shape): Turn on zero-width-marks setting. [Not clear that this is needed here, since it is mostly set in the Arabic engine to handle legacy fonts, but it shouldn't hurt]
-rw-r--r--ChangeLog14
-rw-r--r--ChangeLog.pre-1-1014
-rw-r--r--modules/syriac/syriac-fc.c3
3 files changed, 30 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a299779..8e75a088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2005-07-21 Owen Taylor <otaylor@redhat.com>
+ Merges of fixes from Arabic module (#308813, Emil Soleyman-Zomalan)
+
+ * modules/syriac/syriac-fc.c (syriac_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)
+
+ * modules/syriac/syriac-fc.c (syriac_engine_shape): Turn
+ on zero-width-marks setting. [Not clear that this is
+ needed here, since it is mostly set in the Arabic engine
+ to handle legacy fonts, but it shouldn't hurt]
+
+2005-07-21 Owen Taylor <otaylor@redhat.com>
+
Fix up places where there is missing or incomplete
Copyright and License information (Reported by William N. Ray)
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 7a299779..8e75a088 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,5 +1,19 @@
2005-07-21 Owen Taylor <otaylor@redhat.com>
+ Merges of fixes from Arabic module (#308813, Emil Soleyman-Zomalan)
+
+ * modules/syriac/syriac-fc.c (syriac_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)
+
+ * modules/syriac/syriac-fc.c (syriac_engine_shape): Turn
+ on zero-width-marks setting. [Not clear that this is
+ needed here, since it is mostly set in the Arabic engine
+ to handle legacy fonts, but it shouldn't hurt]
+
+2005-07-21 Owen Taylor <otaylor@redhat.com>
+
Fix up places where there is missing or incomplete
Copyright and License information (Reported by William N. Ray)
diff --git a/modules/syriac/syriac-fc.c b/modules/syriac/syriac-fc.c
index 59d5bfb7..4a78ab3d 100644
--- a/modules/syriac/syriac-fc.c
+++ b/modules/syriac/syriac-fc.c
@@ -256,6 +256,7 @@ syriac_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);
@@ -276,6 +277,7 @@ syriac_engine_shape (PangoEngineShape *engine,
buffer = pango_ot_buffer_new (fc_font);
pango_ot_buffer_set_rtl (buffer, analysis->level % 2 != 0);
+ pango_ot_buffer_set_zero_width_marks (buffer, TRUE);
wcs = g_utf8_to_ucs4_fast (text, length, &n_chars);
properties = g_new0 (gulong, n_chars);
@@ -288,7 +290,6 @@ syriac_engine_shape (PangoEngineShape *engine,
gunichar wc;
gunichar mirrored_ch;
PangoGlyph index;
- int cluster = 0;
wc = g_utf8_get_char (p);