diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-12-07 00:10:59 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-12-07 00:10:59 +0000 |
| commit | ed501e35b65432d62f955a126d2632d4286a915d (patch) | |
| tree | 79ed825e099f890e566d04b43fd83d4149069770 | |
| parent | 13d01a3a024339d8cc65d511d2caad7dc60e947a (diff) | |
| download | pango-ed501e35b65432d62f955a126d2632d4286a915d.tar.gz | |
Fix problem where length passed in didn't get adjusted for paragraph
Thu Dec 6 19:07:31 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (get_items_log_attrs): Fix problem
where length passed in didn't get adjusted for paragraph
delimiters.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pango-layout.c | 5 |
8 files changed, 46 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Dec 6 19:07:31 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_items_log_attrs): Fix problem + where length passed in didn't get adjusted for paragraph + delimiters. + Thu Dec 6 12:10:53 2001 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Simplify by diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 37b635aa..48c50aa3 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +Thu Dec 6 19:07:31 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_items_log_attrs): Fix problem + where length passed in didn't get adjusted for paragraph + delimiters. + Thu Dec 6 12:10:53 2001 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Simplify by diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 37b635aa..48c50aa3 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Thu Dec 6 19:07:31 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_items_log_attrs): Fix problem + where length passed in didn't get adjusted for paragraph + delimiters. + Thu Dec 6 12:10:53 2001 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Simplify by diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 37b635aa..48c50aa3 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +Thu Dec 6 19:07:31 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_items_log_attrs): Fix problem + where length passed in didn't get adjusted for paragraph + delimiters. + Thu Dec 6 12:10:53 2001 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Simplify by diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 37b635aa..48c50aa3 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Thu Dec 6 19:07:31 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_items_log_attrs): Fix problem + where length passed in didn't get adjusted for paragraph + delimiters. + Thu Dec 6 12:10:53 2001 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Simplify by diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 37b635aa..48c50aa3 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Thu Dec 6 19:07:31 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_items_log_attrs): Fix problem + where length passed in didn't get adjusted for paragraph + delimiters. + Thu Dec 6 12:10:53 2001 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Simplify by diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 37b635aa..48c50aa3 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Thu Dec 6 19:07:31 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_items_log_attrs): Fix problem + where length passed in didn't get adjusted for paragraph + delimiters. + Thu Dec 6 12:10:53 2001 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Simplify by diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 1e75ea85..29295b23 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -2792,7 +2792,10 @@ get_items_log_attrs (const char *text, /* Break the paragraph delimiters with the last item */ if (items->next == NULL) - 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, log_attrs + offset, tmp_item.num_chars + 1); |