From 774888236caa9a767d2c65c0b4e4d69233d52eba Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 16 Jan 2002 20:00:50 +0000 Subject: A string ending in a paragraph delimiter has an empty line at the end. Wed Jan 16 14:45:23 2002 Owen Taylor * pango/pango-layout.c (pango_layout_check_lines): A string ending in a paragraph delimiter has an empty line at the end. (#68079, Arjan J. Molenaar.) --- ChangeLog | 6 ++++++ ChangeLog.pre-1-0 | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-2 | 6 ++++++ ChangeLog.pre-1-4 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/pango-layout.c | 2 +- 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3839457e..0c5a2eb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 16 14:45:23 2002 Owen Taylor + + * pango/pango-layout.c (pango_layout_check_lines): + A string ending in a paragraph delimiter has an + empty line at the end. (#68079, Arjan J. Molenaar.) + Wed Jan 16 09:25:34 2002 Owen Taylor * pango/fonts.c (pango_font_description_from_string): Initialize diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 3839457e..0c5a2eb5 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +Wed Jan 16 14:45:23 2002 Owen Taylor + + * pango/pango-layout.c (pango_layout_check_lines): + A string ending in a paragraph delimiter has an + empty line at the end. (#68079, Arjan J. Molenaar.) + Wed Jan 16 09:25:34 2002 Owen Taylor * pango/fonts.c (pango_font_description_from_string): Initialize diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 3839457e..0c5a2eb5 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Wed Jan 16 14:45:23 2002 Owen Taylor + + * pango/pango-layout.c (pango_layout_check_lines): + A string ending in a paragraph delimiter has an + empty line at the end. (#68079, Arjan J. Molenaar.) + Wed Jan 16 09:25:34 2002 Owen Taylor * pango/fonts.c (pango_font_description_from_string): Initialize diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 3839457e..0c5a2eb5 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +Wed Jan 16 14:45:23 2002 Owen Taylor + + * pango/pango-layout.c (pango_layout_check_lines): + A string ending in a paragraph delimiter has an + empty line at the end. (#68079, Arjan J. Molenaar.) + Wed Jan 16 09:25:34 2002 Owen Taylor * pango/fonts.c (pango_font_description_from_string): Initialize diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 3839457e..0c5a2eb5 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Wed Jan 16 14:45:23 2002 Owen Taylor + + * pango/pango-layout.c (pango_layout_check_lines): + A string ending in a paragraph delimiter has an + empty line at the end. (#68079, Arjan J. Molenaar.) + Wed Jan 16 09:25:34 2002 Owen Taylor * pango/fonts.c (pango_font_description_from_string): Initialize diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 3839457e..0c5a2eb5 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Wed Jan 16 14:45:23 2002 Owen Taylor + + * pango/pango-layout.c (pango_layout_check_lines): + A string ending in a paragraph delimiter has an + empty line at the end. (#68079, Arjan J. Molenaar.) + Wed Jan 16 09:25:34 2002 Owen Taylor * pango/fonts.c (pango_font_description_from_string): Initialize diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 3839457e..0c5a2eb5 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Wed Jan 16 14:45:23 2002 Owen Taylor + + * pango/pango-layout.c (pango_layout_check_lines): + A string ending in a paragraph delimiter has an + empty line at the end. (#68079, Arjan J. Molenaar.) + Wed Jan 16 09:25:34 2002 Owen Taylor * pango/fonts.c (pango_font_description_from_string): Initialize diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 80d3f06c..834ee2dd 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -2889,7 +2889,7 @@ pango_layout_check_lines (PangoLayout *layout) delim_len = next_para_index - delimiter_index; - if ((end + delim_len) == (layout->text + layout->length)) + if (end == (layout->text + layout->length)) done = TRUE; g_assert (end <= (layout->text + layout->length)); -- cgit v1.2.1