From 8e6f34e2b82737b61645d43476602fc6ec59630e Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 24 Jan 2002 23:18:03 +0000 Subject: Fix problems with computing the length of the paragraph delimiter. Thu Jan 24 18:05:54 2002 Owen Taylor * pango/pango-layout.c (get_items_log_attrs): Fix problems with computing the length of the paragraph delimiter. (Reported by Evan Martin) --- ChangeLog | 5 +++++ ChangeLog.pre-1-0 | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-2 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/pango-layout.c | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ae0681be..9a67b853 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 24 18:05:54 2002 Owen Taylor + + * pango/pango-layout.c (get_items_log_attrs): Fix problems with + computing the length of the paragraph delimiter. (Reported by Evan Martin) + 2002-01-24 Sven Neumann * configure.in diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index ae0681be..9a67b853 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,8 @@ +Thu Jan 24 18:05:54 2002 Owen Taylor + + * pango/pango-layout.c (get_items_log_attrs): Fix problems with + computing the length of the paragraph delimiter. (Reported by Evan Martin) + 2002-01-24 Sven Neumann * configure.in diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ae0681be..9a67b853 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Thu Jan 24 18:05:54 2002 Owen Taylor + + * pango/pango-layout.c (get_items_log_attrs): Fix problems with + computing the length of the paragraph delimiter. (Reported by Evan Martin) + 2002-01-24 Sven Neumann * configure.in diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index ae0681be..9a67b853 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +Thu Jan 24 18:05:54 2002 Owen Taylor + + * pango/pango-layout.c (get_items_log_attrs): Fix problems with + computing the length of the paragraph delimiter. (Reported by Evan Martin) + 2002-01-24 Sven Neumann * configure.in diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ae0681be..9a67b853 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Thu Jan 24 18:05:54 2002 Owen Taylor + + * pango/pango-layout.c (get_items_log_attrs): Fix problems with + computing the length of the paragraph delimiter. (Reported by Evan Martin) + 2002-01-24 Sven Neumann * configure.in diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ae0681be..9a67b853 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Thu Jan 24 18:05:54 2002 Owen Taylor + + * pango/pango-layout.c (get_items_log_attrs): Fix problems with + computing the length of the paragraph delimiter. (Reported by Evan Martin) + 2002-01-24 Sven Neumann * configure.in diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ae0681be..9a67b853 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Thu Jan 24 18:05:54 2002 Owen Taylor + + * pango/pango-layout.c (get_items_log_attrs): Fix problems with + computing the length of the paragraph delimiter. (Reported by Evan Martin) + 2002-01-24 Sven Neumann * configure.in diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 8d6b1025..cfeea281 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -2791,8 +2791,8 @@ get_items_log_attrs (const char *text, /* Break the paragraph delimiters with the last item */ if (items->next == NULL) { + tmp_item.num_chars += g_utf8_strlen (text + index + tmp_item.length, para_delimiter_len); tmp_item.length += para_delimiter_len; - tmp_item.num_chars += g_utf8_strlen (text + index, para_delimiter_len); } pango_break (text + index, tmp_item.length, &tmp_item.analysis, -- cgit v1.2.1