[evolution-patches] [gtkhtml] #54852 Line wrapping happens on punctuation

[Radek Doulík <rodo novell com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2041
diff -u -p -r1.2041 ChangeLog
--- ChangeLog	20 Sep 2004 16:16:41 -0000	1.2041
+++ ChangeLog	22 Sep 2004 17:37:44 -0000
@@ -1,3 +1,11 @@
+2004-09-22  Radek Doulik  <rodo ximian com>
+
+	* htmltext.c (html_text_remove_unwanted_line_breaks): added '-' to
+	unwanted break characters
+	(html_text_remove_unwanted_line_breaks): fix braces breaking
+
+	Fixes #54852
+
 2004-09-02  Radek Doulik  <rodo ximian com>
 
 	* htmlprinter.c (process_attrs): get fixed style from pango family
Index: htmltext.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltext.c,v
retrieving revision 1.262
diff -u -p -r1.262 htmltext.c
--- htmltext.c	20 Sep 2004 16:16:41 -0000	1.262
+++ htmltext.c	22 Sep 2004 17:37:45 -0000
@@ -1162,10 +1162,18 @@ html_text_remove_unwanted_line_breaks (c
 
 		if (attrs [i].is_line_break) {
 			if (last_uc == '.' || last_uc == '/' ||
-			    last_uc == '(' || last_uc == ')' ||
-			    last_uc == '{' || last_uc == '}' ||
-			    last_uc == '[' || last_uc == ']' ||
-			    last_uc == '<' || last_uc == '>')
+			    last_uc == '-' ||
+			    last_uc == ')' ||
+			    last_uc == '}' ||
+			    last_uc == ']' ||
+			    last_uc == '>')
+				attrs [i].is_line_break = 0;
+			else if ((uc == '(' ||
+				  uc == '{' ||
+				  uc == '[' ||
+				  uc == '<'
+				  )
+				 && i > 0 && !attrs [i - 1].is_white)
 				attrs [i].is_line_break = 0;
 		}
 		s = g_utf8_next_char (s);