version 1.33, 2009/08/20 11:51:07 |
version 1.36, 2009/08/21 13:18:32 |
Line 41 const char *const __man_merrnames[WERRMAX] = { |
|
Line 41 const char *const __man_merrnames[WERRMAX] = { |
|
"unknown macro", /* WMACRO */ |
"unknown macro", /* WMACRO */ |
"ill-formed macro", /* WMACROFORM */ |
"ill-formed macro", /* WMACROFORM */ |
"scope open on exit", /* WEXITSCOPE */ |
"scope open on exit", /* WEXITSCOPE */ |
"no scope context" /* WNOSCOPE */ |
"no scope context", /* WNOSCOPE */ |
|
"literal context already open", /* WOLITERAL */ |
|
"no literal context open" /* WNLITERAL */ |
}; |
}; |
|
|
const char *const __man_macronames[MAN_MAX] = { |
const char *const __man_macronames[MAN_MAX] = { |
Line 392 man_ptext(struct man *m, int line, char *buf) |
|
Line 394 man_ptext(struct man *m, int line, char *buf) |
|
{ |
{ |
int i, j; |
int i, j; |
|
|
|
/* Literal free-form text whitespace is preserved. */ |
|
|
|
if (MAN_LITERAL & m->flags) { |
|
if ( ! man_word_alloc(m, line, 0, buf)) |
|
return(0); |
|
goto descope; |
|
} |
|
|
/* First de-chunk and allocate words. */ |
/* First de-chunk and allocate words. */ |
|
|
for (i = 0; ' ' == buf[i]; i++) |
for (i = 0; ' ' == buf[i]; i++) |
|
|
* out the block scope (also if applicable). |
* out the block scope (also if applicable). |
*/ |
*/ |
|
|
/* XXX - this should be in man_action.c. */ |
|
|
|
if (MAN_ELINE & m->flags) { |
if (MAN_ELINE & m->flags) { |
m->flags &= ~MAN_ELINE; |
m->flags &= ~MAN_ELINE; |
if ( ! man_unscope(m, m->last->parent)) |
if ( ! man_unscope(m, m->last->parent)) |
|
|
int |
int |
man_pmacro(struct man *m, int ln, char *buf) |
man_pmacro(struct man *m, int ln, char *buf) |
{ |
{ |
int i, j, c, ppos, fl; |
int i, j, c, ppos, fl; |
char mac[5]; |
char mac[5]; |
|
struct man_node *n; |
|
|
/* Comments and empties are quickly ignored. */ |
/* Comments and empties are quickly ignored. */ |
|
|
Line 512 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 521 man_pmacro(struct man *m, int ln, char *buf) |
|
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
|
|
|
/* Remove prior ELINE macro, if applicable. */ |
|
|
|
if (m->flags & MAN_ELINE) { |
|
n = m->last; |
|
assert(NULL == n->child); |
|
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; |
|
} else { |
|
assert(n == n->parent->child); |
|
n->parent->child = NULL; |
|
m->last = n->parent; |
|
} |
|
|
|
man_node_free(n); |
|
m->flags &= ~MAN_ELINE; |
|
} |
|
|
/* Begin recursive parse sequence. */ |
/* Begin recursive parse sequence. */ |
|
|
assert(man_macros[c].fp); |
assert(man_macros[c].fp); |
|
|
return(1); |
return(1); |
|
|
/* Close out the block scope opened in the prior line. */ |
/* Close out the block scope opened in the prior line. */ |
|
|
/* XXX - this should be in man_action.c. */ |
|
|
|
assert(MAN_BLINE & m->flags); |
assert(MAN_BLINE & m->flags); |
m->flags &= ~MAN_BLINE; |
m->flags &= ~MAN_BLINE; |