Proper leading spaces for new- and old-groff in -man -Tascii mode.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index e3741cdd6e82f845733a667e4eeeb6a91a8476d8..aa6891fd7f00a314699eb26f7b584b70af3daa46 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.124 2010/05/07 15:49:36 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>
  *
@@ -542,7 +542,7 @@ mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 
        len = strlen(p);
 
-       n = node_alloc(m, line, pos, -1, MDOC_TEXT);
+       n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT);
        n->string = mandoc_malloc(len + 1);
        sv = strlcpy(n->string, p, len + 1);
 
@@ -665,29 +665,39 @@ 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));
 }
 
 
-
 static int
 macrowarn(struct mdoc *m, int ln, const char *buf)
 {
        if ( ! (MDOC_IGN_MACRO & m->pflags))
-               return(mdoc_verr(m, ln, 0, 
-                               "unknown macro: %s%s", 
+               return(mdoc_verr(m, ln, 0, "unknown macro: %s%s", 
                                buf, strlen(buf) > 3 ? "..." : ""));
        return(mdoc_vwarn(m, ln, 0, "unknown macro: %s%s",
                                buf, strlen(buf) > 3 ? "..." : ""));
@@ -701,8 +711,9 @@ macrowarn(struct mdoc *m, int ln, const char *buf)
 int
 mdoc_pmacro(struct mdoc *m, int ln, char *buf)
 {
-       int               i, j, c;
-       char              mac[5];
+       enum mdoct      tok;
+       int             i, j;
+       char            mac[5];
 
        /* Empty lines are ignored. */
 
@@ -744,7 +755,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf)
                return(1);
        } 
        
-       if (MDOC_MAX == (c = mdoc_hash_find(mac))) {
+       if (MDOC_MAX == (tok = mdoc_hash_find(mac))) {
                if ( ! macrowarn(m, ln, mac))
                        goto err;
                return(1);
@@ -755,7 +766,10 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf)
        while (buf[i] && ' ' == buf[i])
                i++;
 
-       /* Trailing whitespace? */
+       /* 
+        * Trailing whitespace.  Note that tabs are allowed to be passed
+        * into the parser as "text", so we only warn about spaces here.
+        */
 
        if ('\0' == buf[i] && ' ' == buf[i - 1])
                if ( ! mdoc_pwarn(m, ln, i - 1, ETAILWS))
@@ -765,7 +779,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf)
         * Begin recursive parse sequence.  Since we're at the start of
         * the line, we don't need to do callable/parseable checks.
         */
-       if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
+       if ( ! mdoc_macro(m, tok, ln, 1, &i, buf)) 
                goto err;
 
        return(1);