version 1.50, 2010/03/22 05:59:32 |
version 1.52, 2010/03/23 11:30:48 |
Line 35 const char *const __man_merrnames[WERRMAX] = { |
|
Line 35 const char *const __man_merrnames[WERRMAX] = { |
|
"invalid manual section", /* WMSEC */ |
"invalid manual section", /* WMSEC */ |
"invalid date format", /* WDATE */ |
"invalid date format", /* WDATE */ |
"scope of prior line violated", /* WLNSCOPE */ |
"scope of prior line violated", /* WLNSCOPE */ |
|
"over-zealous prior line scope violation", /* WLNSCOPE2 */ |
"trailing whitespace", /* WTSPACE */ |
"trailing whitespace", /* WTSPACE */ |
"unterminated quoted parameter", /* WTQUOTE */ |
"unterminated quoted parameter", /* WTQUOTE */ |
"document has no body", /* WNODATA */ |
"document has no body", /* WNODATA */ |
Line 59 const char *const __man_macronames[MAN_MAX] = { |
|
Line 60 const char *const __man_macronames[MAN_MAX] = { |
|
"R", "B", "I", "IR", |
"R", "B", "I", "IR", |
"RI", "na", "i", "sp", |
"RI", "na", "i", "sp", |
"nf", "fi", "r", "RE", |
"nf", "fi", "r", "RE", |
"RS", "DT", "UC", "PD" |
"RS", "DT", "UC", "PD", |
|
"Sp", "Vb", "Ve", |
}; |
}; |
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
Line 535 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 537 man_pmacro(struct man *m, int ln, char *buf) |
|
goto err; |
goto err; |
|
|
/* |
/* |
* Remove prior ELINE macro, as a macro is clobbering it by |
* Remove prior ELINE macro, as it's being clobbering by a new |
* being invoked without prior text. Note that NSCOPED macros |
* macro. Note that NSCOPED macros do not close out ELINE |
* do not close out ELINE macros, as they print no text. |
* macros---they don't print text---so we let those slip by. |
*/ |
*/ |
|
|
if (m->flags & MAN_ELINE && |
if ( ! (MAN_NSCOPED & man_macros[c].flags) && |
! (MAN_NSCOPED & man_macros[c].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; |
n = m->last; |
|
|
|
assert(n); |
assert(NULL == n->child); |
assert(NULL == n->child); |
assert(0 == n->nchild); |
assert(0 == n->nchild); |
|
|
if ( ! man_nwarn(m, n, WLNSCOPE)) |
if ( ! man_nwarn(m, n, WLNSCOPE)) |
return(0); |
return(0); |
|
|
/* FIXME: when called as in: |
man_node_unlink(m, n); |
* |
|
* .B |
|
* .br |
|
* .B |
|
* .br |
|
* hello |
|
*/ |
|
|
|
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_free(n); |
man_node_free(n); |
m->flags &= ~MAN_ELINE; |
m->flags &= ~MAN_ELINE; |
} |
} |
Line 670 man_err(struct man *m, int line, int pos, int iserr, e |
|
Line 668 man_err(struct man *m, int line, int pos, int iserr, e |
|
return(man_verr(m, line, pos, p)); |
return(man_verr(m, line, pos, p)); |
|
|
return(man_vwarn(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; |
} |
} |