=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.117 retrieving revision 1.120 diff -u -p -r1.117 -r1.120 --- mandoc/mdoc.c 2010/03/31 07:13:53 1.117 +++ mandoc/mdoc.c 2010/04/05 08:59:46 1.120 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.117 2010/03/31 07:13:53 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.120 2010/04/05 08:59:46 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -26,6 +26,7 @@ #include #include #include +#include #include "libmdoc.h" #include "libmandoc.h" @@ -351,8 +352,22 @@ mdoc_macro(struct mdoc *m, enum mdoct tok, * 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)); @@ -436,6 +451,7 @@ node_alloc(struct mdoc *m, int line, int pos, p->line = line; p->pos = pos; p->tok = tok; + p->type = type; return(p); } @@ -599,8 +615,18 @@ 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