From 1bb62f96b4f07edc4d7fa3082c5dc826541df890 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 1 Mar 2005 22:12:06 +0000 Subject: Don't break lines on LINE_SEPARATOR in single-paragraph mode. (#168589, 2005-03-01 Owen Taylor * pango/pango-layout.c (process_item): Don't break lines on LINE_SEPARATOR in single-paragraph mode. (#168589, Damon Chaplin) --- pango/pango-layout.c | 3 ++- pango/pangoxft-font.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'pango') diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 53106f20..8fef04bd 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -2777,7 +2777,8 @@ process_item (PangoLayout *layout, processing_new_item = TRUE; } - if (g_utf8_get_char (layout->text + item->offset) == LINE_SEPARATOR) + if (!layout->single_paragraph && + g_utf8_get_char (layout->text + item->offset) == LINE_SEPARATOR) { insert_run (line, state, item, TRUE); state->log_widths_offset += item->num_chars; diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index c8fab24c..210a939a 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -386,7 +386,7 @@ xft_font_get_font (PangoFont *font) _pango_xft_font_map_get_info (fcfont->fontmap, &display, &screen); - font->xft_font = XftFontOpenPattern (display, pattern); + xfont->xft_font = XftFontOpenPattern (display, pattern); if (!xfont->xft_font) { gchar *name = pango_font_description_to_string (fcfont->description); -- cgit v1.2.1