Commited relaxation of title-less document error-out noted by Christian Weisgerber...

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index cd184b097bab9b7db02cdedb3658dacb77082013..d5e4d1b0696d2d850ff7894d7e7d09687a49f8e5 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.114 2010/01/01 17:14:29 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.120 2010/04/05 08:59:46 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "libmdoc.h"
 #include "libmandoc.h"
@@ -143,7 +144,7 @@ const       char * const *mdoc_argnames = __mdoc_argnames;
 static void              mdoc_free1(struct mdoc *);
 static void              mdoc_alloc1(struct mdoc *);
 static struct mdoc_node *node_alloc(struct mdoc *, int, int, 
-                               int, enum mdoc_type);
+                               enum mdoct, enum mdoc_type);
 static int               node_append(struct mdoc *, 
                                struct mdoc_node *);
 static int               parsetext(struct mdoc *, int, char *);
@@ -341,16 +342,32 @@ mdoc_err(struct mdoc *m, int line, int pos, int iserr, enum merr type)
 
 
 int
-mdoc_macro(struct mdoc *m, int tok, 
+mdoc_macro(struct mdoc *m, enum mdoct tok, 
                int ln, int pp, int *pos, char *buf)
 {
+
+       assert(tok < MDOC_MAX);
        /*
         * If we're in the prologue, deny "body" macros.  Similarly, if
         * we're in the body, deny prologue calls.
         */
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-                       MDOC_PBODY & m->flags)
-               return(mdoc_perr(m, ln, pp, EPROLBODY));
+                       MDOC_PBODY & m->flags) {
+               if ( ! mdoc_pwarn(m, ln, pp, EBODYPROL))
+                       return(0);
+               /*
+                * FIXME: do this in mdoc_action.c.
+                */
+               if (NULL == m->meta.title)
+                       m->meta.title = mandoc_strdup("unknown");
+               if (NULL == m->meta.vol)
+                       m->meta.vol = mandoc_strdup("local");
+               if (NULL == m->meta.os)
+                       m->meta.os = mandoc_strdup("local");
+               if (0 == m->meta.date)
+                       m->meta.date = time(NULL);
+               m->flags |= MDOC_PBODY;
+       }
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
                        ! (MDOC_PBODY & m->flags))
                return(mdoc_perr(m, ln, pp, EBODYPROL));
@@ -424,8 +441,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
 
 static struct mdoc_node *
-node_alloc(struct mdoc *m, int line, 
-               int pos, int tok, enum mdoc_type type)
+node_alloc(struct mdoc *m, int line, int pos, 
+               enum mdoct tok, enum mdoc_type type)
 {
        struct mdoc_node *p;
 
@@ -434,15 +451,14 @@ node_alloc(struct mdoc *m, int line,
        p->line = line;
        p->pos = pos;
        p->tok = tok;
-       if (MDOC_TEXT != (p->type = type))
-               assert(p->tok >= 0);
+       p->type = type;
 
        return(p);
 }
 
 
 int
-mdoc_tail_alloc(struct mdoc *m, int line, int pos, int tok)
+mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
        struct mdoc_node *p;
 
@@ -455,7 +471,7 @@ mdoc_tail_alloc(struct mdoc *m, int line, int pos, int tok)
 
 
 int
-mdoc_head_alloc(struct mdoc *m, int line, int pos, int tok)
+mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
        struct mdoc_node *p;
 
@@ -471,7 +487,7 @@ mdoc_head_alloc(struct mdoc *m, int line, int pos, int tok)
 
 
 int
-mdoc_body_alloc(struct mdoc *m, int line, int pos, int tok)
+mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
        struct mdoc_node *p;
 
@@ -485,7 +501,7 @@ mdoc_body_alloc(struct mdoc *m, int line, int pos, int tok)
 
 int
 mdoc_block_alloc(struct mdoc *m, int line, int pos, 
-               int tok, struct mdoc_arg *args)
+               enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;
 
@@ -502,7 +518,7 @@ mdoc_block_alloc(struct mdoc *m, int line, int pos,
 
 int
 mdoc_elem_alloc(struct mdoc *m, int line, int pos, 
-               int tok, struct mdoc_arg *args)
+               enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;
 
@@ -581,6 +597,7 @@ static int
 parsetext(struct mdoc *m, int line, char *buf)
 {
        int              i, j;
+       char             sv;
 
        if (SEC_NONE == m->lastnamed)
                return(mdoc_perr(m, line, 0, ETEXTPROL));
@@ -597,8 +614,19 @@ parsetext(struct mdoc *m, int line, char *buf)
 
        for (i = 0; ' ' == buf[i]; i++)
                /* Skip leading whitespace. */ ;
-       if (0 == buf[i])
-               return(mdoc_perr(m, line, 0, ENOBLANK));
+
+       if ('\0' == buf[i]) {
+               if ( ! mdoc_pwarn(m, line, 0, ENOBLANK))
+                       return(0);
+               /*
+                * Assume that a `Pp' should be inserted in the case of
+                * a blank line.  Technically, blank lines aren't
+                * allowed, but enough manuals assume this behaviour
+                * that we want to work around it.
+                */
+               if ( ! mdoc_elem_alloc(m, line, 0, MDOC_Pp, NULL))
+                       return(0);
+       }
 
        /*
         * Break apart a free-form line into tokens.  Spaces are
@@ -613,15 +641,30 @@ parsetext(struct mdoc *m, int line, char *buf)
                if (i && ' ' == buf[i] && '\\' == buf[i - 1])
                        continue;
 
-               buf[i++] = 0;
+               sv = buf[i];
+               buf[i++] = '\0';
+
                if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
                        return(0);
 
+               /* Trailing whitespace?  Check at overwritten byte. */
+
+               if (' ' == sv && '\0' == buf[i])
+                       if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
+                               return(0);
+
                for ( ; ' ' == buf[i]; i++)
                        /* Skip trailing whitespace. */ ;
 
                j = i;
-               if (0 == buf[i])
+
+               /* Trailing whitespace? */
+
+               if (' ' == buf[i - 1] && '\0' == buf[i])
+                       if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
+                               return(0);
+
+               if ('\0' == buf[i])
                        break;
        }
 
@@ -658,7 +701,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 
        /* Empty lines are ignored. */
 
-       if (0 == buf[1])
+       if ('\0' == buf[1])
                return(1);
 
        i = 1;
@@ -669,14 +712,14 @@ parsemacro(struct mdoc *m, int ln, char *buf)
                i++;
                while (buf[i] && ' ' == buf[i])
                        i++;
-               if (0 == buf[i])
+               if ('\0' == buf[i])
                        return(1);
        }
 
        /* Copy the first word into a nil-terminated buffer. */
 
        for (j = 0; j < 4; j++, i++) {
-               if (0 == (mac[j] = buf[i]))
+               if ('\0' == (mac[j] = buf[i]))
                        break;
                else if (' ' == buf[i])
                        break;
@@ -707,6 +750,12 @@ parsemacro(struct mdoc *m, int ln, char *buf)
        while (buf[i] && ' ' == buf[i])
                i++;
 
+       /* Trailing whitespace? */
+
+       if ('\0' == buf[i] && ' ' == buf[i - 1])
+               if ( ! mdoc_pwarn(m, ln, i - 1, ETAILWS))
+                       goto err;
+
        /* 
         * Begin recursive parse sequence.  Since we're at the start of
         * the line, we don't need to do callable/parseable checks.