Fix problem with returned width on lines other than the first line

Mon Dec 10 09:18:09 2001  Owen Taylor  <otaylor@redhat.com>
        * pango/pango-layout.c (pango_layout_index_to_pos):
        Fix problem with returned width on lines other than
        the first line (#66274).
        * pango/pangox,ft2,win32.c (pango_*_render_layout):
        Fix problem where indent wasn't honored (#66275).
        [ Note, however, there are remaining problems - see, #66626 ]

11 files changed, 74 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 48c50aa3..ecc425c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Dec 10 09:18:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_index_to_pos): 
+	Fix problem with returned width on lines other than
+	the first line (#66274).
+
+	* pango/pangox,ft2,win32.c (pango_*_render_layout):
+	Fix problem where indent wasn't honored (#66275). 
+	[ Note, however, there are remaining problems - see, #66626 ]
+
 Thu Dec  6 19:07:31 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (get_items_log_attrs): Fix problem
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 48c50aa3..ecc425c8 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,13 @@
+Mon Dec 10 09:18:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_index_to_pos): 
+	Fix problem with returned width on lines other than
+	the first line (#66274).
+
+	* pango/pangox,ft2,win32.c (pango_*_render_layout):
+	Fix problem where indent wasn't honored (#66275). 
+	[ Note, however, there are remaining problems - see, #66626 ]
+
 Thu Dec  6 19:07:31 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (get_items_log_attrs): Fix problem
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 48c50aa3..ecc425c8 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Mon Dec 10 09:18:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_index_to_pos): 
+	Fix problem with returned width on lines other than
+	the first line (#66274).
+
+	* pango/pangox,ft2,win32.c (pango_*_render_layout):
+	Fix problem where indent wasn't honored (#66275). 
+	[ Note, however, there are remaining problems - see, #66626 ]
+
 Thu Dec  6 19:07:31 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (get_items_log_attrs): Fix problem
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 48c50aa3..ecc425c8 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+Mon Dec 10 09:18:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_index_to_pos): 
+	Fix problem with returned width on lines other than
+	the first line (#66274).
+
+	* pango/pangox,ft2,win32.c (pango_*_render_layout):
+	Fix problem where indent wasn't honored (#66275). 
+	[ Note, however, there are remaining problems - see, #66626 ]
+
 Thu Dec  6 19:07:31 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (get_items_log_attrs): Fix problem
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 48c50aa3..ecc425c8 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Mon Dec 10 09:18:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_index_to_pos): 
+	Fix problem with returned width on lines other than
+	the first line (#66274).
+
+	* pango/pangox,ft2,win32.c (pango_*_render_layout):
+	Fix problem where indent wasn't honored (#66275). 
+	[ Note, however, there are remaining problems - see, #66626 ]
+
 Thu Dec  6 19:07:31 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (get_items_log_attrs): Fix problem
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 48c50aa3..ecc425c8 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Mon Dec 10 09:18:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_index_to_pos): 
+	Fix problem with returned width on lines other than
+	the first line (#66274).
+
+	* pango/pangox,ft2,win32.c (pango_*_render_layout):
+	Fix problem where indent wasn't honored (#66275). 
+	[ Note, however, there are remaining problems - see, #66626 ]
+
 Thu Dec  6 19:07:31 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (get_items_log_attrs): Fix problem
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 48c50aa3..ecc425c8 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Mon Dec 10 09:18:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_index_to_pos): 
+	Fix problem with returned width on lines other than
+	the first line (#66274).
+
+	* pango/pangox,ft2,win32.c (pango_*_render_layout):
+	Fix problem where indent wasn't honored (#66275). 
+	[ Note, however, there are remaining problems - see, #66626 ]
+
 Thu Dec  6 19:07:31 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (get_items_log_attrs): Fix problem
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 29295b23..148909b3 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -1509,7 +1509,7 @@ pango_layout_index_to_pos (PangoLayout    *layout,
   pango_layout_line_index_to_x (layout_line, index, 0, &x_pos);
   pos->x = logical_rect.x + x_pos;
 
-  if (index < layout_line->length)
+  if (index < layout_line->start_index + layout_line->length)
     {
       pango_layout_line_index_to_x (layout_line, index, 1, &x_pos);
       pos->width = (logical_rect.x + x_pos) - pos->x;
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index a5b83ba1..fc62b6f7 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -756,7 +756,7 @@ pango_ft2_render_layout (FT_Bitmap   *bitmap,
   int width;
   int y_offset = 0;
 
-  gboolean first = FALSE;
+  gboolean first = TRUE;
   
   g_return_if_fail (bitmap != NULL);
   g_return_if_fail (layout != NULL);
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index f9634011..e444e179 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -643,7 +643,7 @@ pango_win32_render_layout (HDC              hdc,
   int width;
   int y_offset = 0;
 
-  gboolean first = FALSE;
+  gboolean first = TRUE;
   
   g_return_if_fail (layout != NULL);
 
diff --git a/pango/pangox.c b/pango/pangox.c
index 5200e6fa..553b48d8 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -1543,7 +1543,7 @@ pango_x_render_layout (Display         *display,
   int width;
   int y_offset = 0;
 
-  gboolean first = FALSE;
+  gboolean first = TRUE;
   
   g_return_if_fail (display != NULL);
   g_return_if_fail (layout != NULL);