fix for #1296

  substitute   (required_space) for spaces after first one

diff --git a/lib/common/labels.c b/lib/common/labels.c
index 7e10c8087dd4e2a922bcd44ff3099ee41c585b69..a87142c9b0ace196f6219ea7574f2e271deaf617 100644 (file)
--- a/lib/common/labels.c
+++ b/lib/common/labels.c
@@ -366,7 +366,7 @@ char *xml_string(char *s)
 {
     static char *buf = NULL;
     static int bufsize = 0;
-    char *p, *sub;
+    char *p, *sub, *prev = NULL;
     int len, pos = 0;
 
     if (!buf) {
@@ -398,6 +398,10 @@ char *xml_string(char *s)
        } else if (*s == '\'') {
            sub = "'";
            len = 5;
+       } else if (*s == ' ' && prev && *prev == ' ') {
+           /* substitute 2nd and subsequent spaces with required_spaces */
+           sub = " ";  /* inkscape doesn't recognise   */
+           len = 6;
        }
        /* escape '&' only if not part of a legal entity sequence */
        else if (*s == '&' && !(xml_isentity(s))) {
@@ -411,6 +415,7 @@ char *xml_string(char *s)
            *p++ = *sub++;
            pos++;
        }
+       prev = s;
        s++;
     }
     *p = '\0';