version 1.48, 2010/01/07 10:05:24 |
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; |
|
|
man_ptext(struct man *m, int line, char *buf) |
man_ptext(struct man *m, int line, char *buf) |
{ |
{ |
int i, j; |
int i, j; |
|
char sv; |
|
|
/* Literal free-form text whitespace is preserved. */ |
/* Literal free-form text whitespace is preserved. */ |
|
|
Line 379 man_ptext(struct man *m, int line, char *buf) |
|
Line 382 man_ptext(struct man *m, int line, char *buf) |
|
for (i = 0; ' ' == buf[i]; i++) |
for (i = 0; ' ' == buf[i]; i++) |
/* Skip leading whitespace. */ ; |
/* Skip leading whitespace. */ ; |
|
|
if (0 == buf[i]) { |
if ('\0' == buf[i]) { |
|
/* Trailing whitespace? */ |
|
if (i && ' ' == buf[i - 1]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
if ( ! pstring(m, line, 0, &buf[i], 0)) |
if ( ! pstring(m, line, 0, &buf[i], 0)) |
return(0); |
return(0); |
goto descope; |
goto descope; |
Line 393 man_ptext(struct man *m, int line, char *buf) |
|
Line 400 man_ptext(struct man *m, int line, char *buf) |
|
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
continue; |
continue; |
|
|
buf[i++] = 0; |
sv = buf[i]; |
|
buf[i++] = '\0'; |
|
|
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
return(0); |
return(0); |
|
|
|
/* Trailing whitespace? Check at overwritten byte. */ |
|
|
|
if (' ' == sv && '\0' == buf[i]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
|
|
for ( ; ' ' == buf[i]; i++) |
for ( ; ' ' == buf[i]; i++) |
/* Skip trailing whitespace. */ ; |
/* Skip trailing whitespace. */ ; |
|
|
j = i; |
j = i; |
if (0 == buf[i]) |
|
|
/* Trailing whitespace? */ |
|
|
|
if (' ' == buf[i - 1] && '\0' == buf[i]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
|
|
|
if ('\0' == buf[i]) |
break; |
break; |
} |
} |
|
|
Line 514 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 536 man_pmacro(struct man *m, int ln, char *buf) |
|
if ( ! man_pwarn(m, ln, i - 1, WTSPACE)) |
if ( ! man_pwarn(m, ln, i - 1, WTSPACE)) |
goto err; |
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[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); |
|
|
if (n->prev) { |
man_node_unlink(m, n); |
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 548 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 580 man_pmacro(struct man *m, int ln, char *buf) |
|
goto err; |
goto err; |
|
|
out: |
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); |
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 |
* If we've opened a new next-line element scope, then return |
* now, as the next line will close out the block scope. |
* now, as the next line will close out the block scope. |
Line 619 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; |
} |
} |