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.
 
Index: pango/pango-layout.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-layout.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- pango/pango-layout.c	3 Aug 2003 21:57:33 -0000	1.104
+++ pango/pango-layout.c	31 Oct 2003 17:40:24 -0000	1.105
@@ -3954,13 +3954,13 @@
     {
       /* 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];
     }
 }
 
@@ -4213,7 +4213,7 @@
   
   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;