summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-08-06 08:35:12 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-08-06 08:35:12 +0000
commit66240b30bc5a2b29b0d5f3bb5396f85ef557b077 (patch)
treead6a2273d558a077d31236b6409b5df9853685b8
parent0438a4cb186c288648ba326d392ebf46d05ee86c (diff)
downloadpango-66240b30bc5a2b29b0d5f3bb5396f85ef557b077.tar.gz
Justify lines broken by U+2028 LINE SEPARATOR. Also affects return value
2008-07-19 Behdad Esfahbod <behdad@gnome.org> * pango/pango-layout.c (process_line): Justify lines broken by U+2028 LINE SEPARATOR. Also affects return value of pango_layout_is_wrapped(). svn path=/trunk/; revision=2672
-rw-r--r--ChangeLog5
-rw-r--r--pango/pango-layout.c12
2 files changed, 8 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 964001d2..a88a7b9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-19 Behdad Esfahbod <behdad@gnome.org>
+
+ * pango/pango-layout.c (process_line): Justify lines broken by U+2028
+ LINE SEPARATOR. Also affects return value of pango_layout_is_wrapped().
+
2008-08-06 Tor Lillqvist <tml@novell.com>
* pango/Makefile.am (install-def-files): Add a mkdir to be sure
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 459f21be..f9e34114 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3545,15 +3545,9 @@ process_line (PangoLayout *layout,
case BREAK_LINE_SEPARATOR:
state->items = g_list_delete_link (state->items, state->items);
state->start_offset += old_num_chars;
- /* FIXME We don't set wrapped here. Which means we don't justify
- * lines that end in a line separator. Not sure which behavior is
- * more desired. For now that we do greedy line breaking, not
- * justifying lines of potentially very small length is a good idea,
- * but when we do a better job at that, if there's a different
- * between line separator and paragraph separator, it should be that
- * line separator acts just like a forced break, with no effect on
- * justification.
- */
+ /* A line-separate is just a forced break. Set wrapped, so we do
+ * justification */
+ wrapped = TRUE;
goto done;
}
}