Keeping track of changes...

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 5974c19b9a80c63d08c3fd0b461138a06e76b519..aa6891fd7f00a314699eb26f7b584b70af3daa46 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.125 2010/05/08 07:30:19 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.127 2010/05/08 10:25:27 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -665,16 +665,28 @@ mdoc_ptext(struct mdoc *m, int line, char *buf)
                return(1);
        }
 
-       /* Warn if the last un-escaped character is whitespace. */
+       /* 
+        * Warn if the last un-escaped character is whitespace. Then
+        * strip away the remaining spaces (tabs stay!).   
+        */
 
        i = (int)strlen(buf);
        assert(i);
 
-       if (' ' == buf[i - 1] || '\t' == buf[i - 1])
-               if (1 == i || ('\\' != buf[i - 2]))
+       if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
+               if (i > 1 && '\\' != buf[i - 2])
                        if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
                                return(0);
 
+               for (--i; i && ' ' == buf[i]; i--)
+                       /* Spin back to non-space. */ ;
+
+               /* Jump ahead of escaped whitespace. */
+               i += '\\' == buf[i] ? 2 : 1;
+
+               buf[i] = '\0';
+       }
+
        /* Allocate the whole word. */
 
        return(mdoc_word_alloc(m, line, 0, buf));