=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.49 retrieving revision 1.53 diff -u -p -r1.49 -r1.53 --- mandoc/man.c 2010/01/07 10:24:43 1.49 +++ mandoc/man.c 2010/03/23 21:50:43 1.53 @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.49 2010/01/07 10:24:43 kristaps Exp $ */ +/* $Id: man.c,v 1.53 2010/03/23 21:50:43 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -35,6 +35,7 @@ const char *const __man_merrnames[WERRMAX] = { "invalid manual section", /* WMSEC */ "invalid date format", /* WDATE */ "scope of prior line violated", /* WLNSCOPE */ + "over-zealous prior line scope violation", /* WLNSCOPE2 */ "trailing whitespace", /* WTSPACE */ "unterminated quoted parameter", /* WTQUOTE */ "document has no body", /* WNODATA */ @@ -59,13 +60,14 @@ const char *const __man_macronames[MAN_MAX] = { "R", "B", "I", "IR", "RI", "na", "i", "sp", "nf", "fi", "r", "RE", - "RS", "DT", "UC", "PD" + "RS", "DT", "UC", "PD", + "Sp", "Vb", "Ve", }; const char * const *man_macronames = __man_macronames; static struct man_node *man_node_alloc(int, int, - enum man_type, int); + enum man_type, enum mant); static int man_node_append(struct man *, struct man_node *); static int man_ptext(struct man *, int, char *); @@ -240,7 +242,7 @@ man_node_append(struct man *man, struct man_node *p) static struct man_node * -man_node_alloc(int line, int pos, enum man_type type, int tok) +man_node_alloc(int line, int pos, enum man_type type, enum mant tok) { struct man_node *p; @@ -254,7 +256,7 @@ man_node_alloc(int line, int pos, enum man_type type, int -man_elem_alloc(struct man *m, int line, int pos, int tok) +man_elem_alloc(struct man *m, int line, int pos, enum mant tok) { struct man_node *p; @@ -267,7 +269,7 @@ man_elem_alloc(struct man *m, int line, int pos, int t int -man_head_alloc(struct man *m, int line, int pos, int tok) +man_head_alloc(struct man *m, int line, int pos, enum mant tok) { struct man_node *p; @@ -280,7 +282,7 @@ man_head_alloc(struct man *m, int line, int pos, int t int -man_body_alloc(struct man *m, int line, int pos, int tok) +man_body_alloc(struct man *m, int line, int pos, enum mant tok) { struct man_node *p; @@ -293,7 +295,7 @@ man_body_alloc(struct man *m, int line, int pos, int t int -man_block_alloc(struct man *m, int line, int pos, int tok) +man_block_alloc(struct man *m, int line, int pos, enum mant tok) { struct man_node *p; @@ -312,7 +314,7 @@ pstring(struct man *m, int line, int pos, struct man_node *n; size_t sv; - n = man_node_alloc(line, pos, MAN_TEXT, -1); + n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX); n->string = mandoc_malloc(len + 1); sv = strlcpy(n->string, p, len + 1); @@ -467,7 +469,8 @@ macrowarn(struct man *m, int ln, const char *buf) int man_pmacro(struct man *m, int ln, char *buf) { - int i, j, c, ppos, fl; + int i, j, ppos, fl; + enum mant tok; char mac[5]; struct man_node *n; @@ -517,7 +520,7 @@ man_pmacro(struct man *m, int ln, char *buf) return(1); } - if (MAN_MAX == (c = man_hash_find(mac))) { + if (MAN_MAX == (tok = man_hash_find(mac))) { if ( ! macrowarn(m, ln, mac)) goto err; return(1); @@ -534,43 +537,70 @@ man_pmacro(struct man *m, int ln, char *buf) if ( ! man_pwarn(m, ln, i - 1, WTSPACE)) goto err; - /* Remove prior ELINE macro, if applicable. */ + /* + * Remove prior ELINE macro, as it's being clobbering by a new + * macro. Note that NSCOPED macros do not close out ELINE + * macros---they don't print text---so we let those slip by. + */ - if (m->flags & MAN_ELINE) { + if ( ! (MAN_NSCOPED & man_macros[tok].flags) && + m->flags & MAN_ELINE) { + assert(MAN_TEXT != m->last->type); + + /* + * This occurs in the following construction: + * .B + * .br + * .B + * .br + * I hate man macros. + * Flat-out disallow this madness. + */ + if (MAN_NSCOPED & man_macros[m->last->tok].flags) + return(man_perr(m, ln, ppos, WLNSCOPE)); + n = m->last; + + assert(n); assert(NULL == n->child); assert(0 == n->nchild); + if ( ! man_nwarn(m, n, WLNSCOPE)) return(0); - if (n->prev) { - assert(n != n->parent->child); - assert(n == n->prev->next); - n->prev->next = NULL; - m->last = n->prev; - m->next = MAN_NEXT_SIBLING; - } else { - assert(n == n->parent->child); - n->parent->child = NULL; - m->last = n->parent; - m->next = MAN_NEXT_CHILD; - } - + man_node_unlink(m, n); man_node_free(n); m->flags &= ~MAN_ELINE; } /* Begin recursive parse sequence. */ - assert(man_macros[c].fp); + assert(man_macros[tok].fp); - if ( ! (*man_macros[c].fp)(m, c, ln, ppos, &i, buf)) + if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf)) goto err; out: - if ( ! (MAN_BLINE & fl)) + /* + * We weren't in a block-line scope when entering the + * above-parsed macro, so return. + */ + + if ( ! (MAN_BLINE & fl)) { + m->flags &= ~MAN_ILINE; return(1); + } + /* + * If we're in a block scope, then allow this macro to slip by + * without closing scope around it. + */ + + if (MAN_ILINE & m->flags) { + m->flags &= ~MAN_ILINE; + return(1); + } + /* * If we've opened a new next-line element scope, then return * now, as the next line will close out the block scope. @@ -639,4 +669,29 @@ man_err(struct man *m, int line, int pos, int iserr, e return(man_verr(m, line, pos, p)); return(man_vwarn(m, line, pos, p)); +} + + +void +man_node_unlink(struct man *m, struct man_node *n) +{ + + if (n->prev) { + n->prev->next = n->next; + if (m->last == n) { + assert(NULL == n->next); + m->last = n->prev; + m->next = MAN_NEXT_SIBLING; + } + } else { + n->parent->child = n->next; + if (m->last == n) { + assert(NULL == n->next); + m->last = n->parent; + m->next = MAN_NEXT_CHILD; + } + } + + if (n->next) + n->next->prev = n->prev; }