From: Sam Lown <me@samlown.com>
Date: Wed, 7 Jul 2010 18:43:22 +0000 (+0200)
Subject: Using regexp to remove white space from text instead of detecting newlines in xml
X-Git-Tag: glabels-2_3_1~213^2~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e9f492c8fc1638bc9a0a7014653e54306c7e974e;p=glabels

Using regexp to remove white space from text instead of detecting newlines in xml
---

diff --git a/src/xml-label.c b/src/xml-label.c
index 09930a4e..578a1a09 100644
--- a/src/xml-label.c
+++ b/src/xml-label.c
@@ -967,6 +967,7 @@ xml_parse_toplevel_span  (xmlNodePtr        node,
 	GList            *lines, *text_nodes;
 	xmlNodePtr        child;
 	glTextNode       *text_node;
+	GRegex					 *strip_regex;
 
 	gl_debug (DEBUG_XML, "START");
 
@@ -1008,22 +1009,10 @@ xml_parse_toplevel_span  (xmlNodePtr        node,
 	/* Now descend children, and build lines of text nodes */
 	lines = NULL;
 	text_nodes = NULL;
+	strip_regex = g_regex_new("\\A\\n\\s*|\\n\\s*\\Z", 0, 0, NULL);
 	for (child = node->xmlChildrenNode; child != NULL; child = child->next) {
 
-		if (xmlNodeIsText (child)) {
-			gchar *data = lgl_xml_get_node_content (child); 
-
-			/* Hack: if the first char is LF, it's an xml formatting string */
-			if (data[0] != '\n') { 
-				/* Literal text */
-				text_node = g_new0 (glTextNode, 1);
-				text_node->field_flag = FALSE;
-				text_node->data = g_strdup ((gchar *)data);
-				text_nodes = g_list_append (text_nodes, text_node);
-			}
-			g_free (data);
-
-		} else if (lgl_xml_is_node (child, "Span")) {
+		if (lgl_xml_is_node (child, "Span")) {
 
 			g_message ("Unexpected rich text (not supported, yet!)");
 
@@ -1042,6 +1031,23 @@ xml_parse_toplevel_span  (xmlNodePtr        node,
 			lines = g_list_append (lines, text_nodes);
 			text_nodes = NULL;
 
+    } else if (xmlNodeIsText (child)) {
+			gchar *orig_data = lgl_xml_get_node_content (child); 
+			gchar *data;
+
+			/* Literal text */
+
+			/* Stip out white space before and after */
+			data = g_regex_replace(strip_regex, orig_data, -1, 0, "", 0, NULL);
+			g_free (orig_data);
+
+			text_node = g_new0 (glTextNode, 1);
+			text_node->field_flag = FALSE;
+			text_node->data = g_strdup ((gchar *)data);
+			text_nodes = g_list_append (text_nodes, text_node);
+
+			g_free (data);
+
 		} else {
 			g_message ("Unexpected Span child: \"%s\"", child->name);
 		}