summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-01-24 23:18:03 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-01-24 23:18:03 +0000
commit8e6f34e2b82737b61645d43476602fc6ec59630e (patch)
tree8bf75a725803158aab04d41d43764f01cd0862cb
parent3aef4b97ebf2973a14e0b039428052e4e3542cf6 (diff)
downloadpango-8e6f34e2b82737b61645d43476602fc6ec59630e.tar.gz
Fix problems with computing the length of the paragraph delimiter.
Thu Jan 24 18:05:54 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (get_items_log_attrs): Fix problems with computing the length of the paragraph delimiter. (Reported by Evan Martin)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-05
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pango-layout.c2
8 files changed, 36 insertions, 1 deletions
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 <otaylor@redhat.com>
+
+ * 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 <sven@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <sven@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <sven@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <sven@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <sven@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <sven@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <sven@gimp.org>
* 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,