=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.163 retrieving revision 1.168 diff -u -p -r1.163 -r1.168 --- mandoc/mdoc.c 2010/08/20 01:02:07 1.163 +++ mandoc/mdoc.c 2010/12/06 11:01:19 1.168 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.163 2010/08/20 01:02:07 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.168 2010/12/06 11:01:19 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -286,6 +286,8 @@ mdoc_macro(MACRO_PROT_ARGS) ! (MDOC_PBODY & m->flags)) { if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) return(0); + if (NULL == m->meta.msec) + m->meta.msec = mandoc_strdup("1"); if (NULL == m->meta.title) m->meta.title = mandoc_strdup("UNKNOWN"); if (NULL == m->meta.vol) @@ -328,8 +330,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) if ( ! mdoc_valid_pre(mdoc, p)) return(0); - if ( ! mdoc_action_pre(mdoc, p)) - return(0); switch (p->type) { case (MDOC_HEAD): @@ -356,8 +356,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) case (MDOC_TEXT): if ( ! mdoc_valid_post(mdoc)) return(0); - if ( ! mdoc_action_post(mdoc)) - return(0); break; default: break; @@ -691,11 +689,11 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of return(0); /* - * Insert a `Pp' in the case of a blank line. Technically, + * Insert a `sp' 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, offs, MDOC_Pp, NULL)) + if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL)) return(0); m->next = MDOC_NEXT_SIBLING; @@ -768,9 +766,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX; if (MDOC_MAX == tok) { - mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, - "unknown macro: %s%s", - buf, strlen(buf) > 3 ? "..." : ""); + mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1); return(1); }