docs tweak (pango_layout_iter_next_cluster): update iter->index here

2002-01-11  Havoc Pennington  <hp@redhat.com>
	* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
	(pango_layout_iter_next_cluster): update iter->index here

8 files changed, 41 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f64ef91..3fc7a2bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-11  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
+	(pango_layout_iter_next_cluster): update iter->index here
+
 Fri Jan 11 15:01:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangoft2-fontmap.c (pango_ft2_make_pattern) 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 5f64ef91..3fc7a2bc 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+2002-01-11  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
+	(pango_layout_iter_next_cluster): update iter->index here
+
 Fri Jan 11 15:01:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangoft2-fontmap.c (pango_ft2_make_pattern) 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 5f64ef91..3fc7a2bc 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2002-01-11  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
+	(pango_layout_iter_next_cluster): update iter->index here
+
 Fri Jan 11 15:01:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangoft2-fontmap.c (pango_ft2_make_pattern) 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 5f64ef91..3fc7a2bc 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+2002-01-11  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
+	(pango_layout_iter_next_cluster): update iter->index here
+
 Fri Jan 11 15:01:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangoft2-fontmap.c (pango_ft2_make_pattern) 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 5f64ef91..3fc7a2bc 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2002-01-11  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
+	(pango_layout_iter_next_cluster): update iter->index here
+
 Fri Jan 11 15:01:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangoft2-fontmap.c (pango_ft2_make_pattern) 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 5f64ef91..3fc7a2bc 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2002-01-11  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
+	(pango_layout_iter_next_cluster): update iter->index here
+
 Fri Jan 11 15:01:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangoft2-fontmap.c (pango_ft2_make_pattern) 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 5f64ef91..3fc7a2bc 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2002-01-11  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
+	(pango_layout_iter_next_cluster): update iter->index here
+
 Fri Jan 11 15:01:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangoft2-fontmap.c (pango_ft2_make_pattern) 
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 76a1a085..068bd7fb 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -4029,7 +4029,8 @@ pango_layout_iter_free (PangoLayoutIter *iter)
  * 
  * Gets the current byte index. Note that iterating forward by char
  * moves in visual order, not logical order, so indexes may not be
- * sequential.
+ * sequential. Also, the index may be equal to the length of the text
+ * in the layout, if on the %NULL run (see pango_layout_iter_get_run()).
  * 
  * Return value: current byte index
  **/
@@ -4189,6 +4190,7 @@ pango_layout_iter_next_cluster (PangoLayoutIter *iter)
       iter->cluster_start = iter->next_cluster_start;
       iter->next_cluster_start = next_cluster_start (gs, iter->cluster_start);
       iter->cluster_index = gs->log_clusters[iter->cluster_start];
+      iter->index = iter->cluster_index;
       return TRUE;
     }
 }
@@ -4274,6 +4276,7 @@ pango_layout_iter_next_line (PangoLayoutIter *iter)
   else
     iter->run = NULL;
 
+  /* FIXME isn't this broken? we can have \r\n etc. */
   /* If we move on to an empty line (no runs), it means the empty line
    * represents a '\n' in layout->text, so advance iter->index
    */
@@ -4340,6 +4343,8 @@ pango_layout_iter_get_char_extents (PangoLayoutIter *iter,
       end_index = start_index;
       start_index = tmp;
     }
+
+  g_assert (start_index < end_index);
   
   p = iter->layout->text + start_index;
   current = iter->layout->text + iter->index;