Fix one problem with iteration by chars (Part of #89541, Mariano

Fri Oct 31 12:32:38 2003  Owen Taylor  <otaylor@redhat.com>

        Fix one problem with iteration by chars (Part of
        #89541, Mariano Suárez-Alvarez)

        * Pango/pango-layout.c (cluster_end_index): Fix to
        be item relative, like iter->cluster_index.

        * pango/pango-layout.c (pango_layout_iter_next_char):
        Adapt.

6 files changed, 59 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 98997e4a..9496bf06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Oct 31 12:32:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Fix one problem with iteration by chars (Part of
+	#89541, Mariano Suárez-Alvarez)
+
+	* Pango/pango-layout.c (cluster_end_index): Fix to 
+	be item relative, like iter->cluster_index.
+
+	* pango/pango-layout.c (pango_layout_iter_next_char): 
+	Adapt.
+
 Tue Oct 14 19:00:17 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hebrew/hebrew-xft.c (hebrew_engine_shape): 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 98997e4a..9496bf06 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+Fri Oct 31 12:32:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Fix one problem with iteration by chars (Part of
+	#89541, Mariano Suárez-Alvarez)
+
+	* Pango/pango-layout.c (cluster_end_index): Fix to 
+	be item relative, like iter->cluster_index.
+
+	* pango/pango-layout.c (pango_layout_iter_next_char): 
+	Adapt.
+
 Tue Oct 14 19:00:17 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hebrew/hebrew-xft.c (hebrew_engine_shape): 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 98997e4a..9496bf06 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+Fri Oct 31 12:32:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Fix one problem with iteration by chars (Part of
+	#89541, Mariano Suárez-Alvarez)
+
+	* Pango/pango-layout.c (cluster_end_index): Fix to 
+	be item relative, like iter->cluster_index.
+
+	* pango/pango-layout.c (pango_layout_iter_next_char): 
+	Adapt.
+
 Tue Oct 14 19:00:17 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hebrew/hebrew-xft.c (hebrew_engine_shape): 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 98997e4a..9496bf06 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+Fri Oct 31 12:32:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Fix one problem with iteration by chars (Part of
+	#89541, Mariano Suárez-Alvarez)
+
+	* Pango/pango-layout.c (cluster_end_index): Fix to 
+	be item relative, like iter->cluster_index.
+
+	* pango/pango-layout.c (pango_layout_iter_next_char): 
+	Adapt.
+
 Tue Oct 14 19:00:17 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hebrew/hebrew-xft.c (hebrew_engine_shape): 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 98997e4a..9496bf06 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+Fri Oct 31 12:32:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Fix one problem with iteration by chars (Part of
+	#89541, Mariano Suárez-Alvarez)
+
+	* Pango/pango-layout.c (cluster_end_index): Fix to 
+	be item relative, like iter->cluster_index.
+
+	* pango/pango-layout.c (pango_layout_iter_next_char): 
+	Adapt.
+
 Tue Oct 14 19:00:17 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hebrew/hebrew-xft.c (hebrew_engine_shape): 
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 63e96c49..2f679bf1 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3957,13 +3957,13 @@ cluster_end_index (PangoLayoutIter *iter)
     {
       /* Use the left or right end of the run */
       if (iter->ltr)
-        return iter->run->item->offset + iter->run->item->length;
+        return iter->run->item->length;
       else
-        return iter->run->item->offset;
+        return 0;
     }
   else
     {
-      return iter->run->item->offset + gs->log_clusters[iter->next_cluster_start];
+      return gs->log_clusters[iter->next_cluster_start];
     }
 }
 
@@ -4216,7 +4216,7 @@ pango_layout_iter_next_char (PangoLayoutIter *iter)
   
   gs = iter->run->glyphs;
 
-  next_cluster_index = cluster_end_index (iter);
+  next_cluster_index = iter->run->item->offset + cluster_end_index (iter);
   
   oldp = iter->layout->text + iter->index;