version 1.108, 2015/04/19 14:57:38 |
version 1.115, 2017/01/10 13:47:00 |
Line 63 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 63 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, 0 }, /* IR */ |
{ in_line_eoln, 0 }, /* IR */ |
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_BSCOPE }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_BSCOPE }, /* fi */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
{ blk_exp, MAN_BSCOPE }, /* RS */ |
{ blk_exp, MAN_BSCOPE }, /* RS */ |
{ in_line_eoln, 0 }, /* DT */ |
{ in_line_eoln, 0 }, /* DT */ |
Line 95 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 95 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
/* Reached the end of the document? */ |
/* Reached the end of the document? */ |
|
|
if (to == NULL && ! (n->flags & MAN_VALID)) { |
if (to == NULL && ! (n->flags & NODE_VALID)) { |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
man_macros[n->tok].flags & MAN_SCOPED) { |
man_macros[n->tok].flags & MAN_SCOPED) { |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
Line 130 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 130 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
man->last = n; |
man->last = n; |
n = n->parent; |
n = n->parent; |
man_valid_post(man); |
man->last->flags |= NODE_VALID; |
} |
} |
|
|
/* |
/* |
Line 157 rew_scope(struct roff_man *man, int tok) |
|
Line 157 rew_scope(struct roff_man *man, int tok) |
|
/* Preserve empty paragraphs before RS. */ |
/* Preserve empty paragraphs before RS. */ |
|
|
n = man->last; |
n = man->last; |
if (tok == MAN_RS && n->nchild == 0 && |
if (tok == MAN_RS && n->child == NULL && |
(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP)) |
(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP)) |
return; |
return; |
|
|
for (;;) { |
for (;;) { |
if (n->type == ROFFT_ROOT) |
if (n->type == ROFFT_ROOT) |
return; |
return; |
if (n->flags & MAN_VALID) { |
if (n->flags & NODE_VALID) { |
n = n->parent; |
n = n->parent; |
continue; |
continue; |
} |
} |
Line 225 blk_close(MACRO_PROT_ARGS) |
|
Line 225 blk_close(MACRO_PROT_ARGS) |
|
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
|
|
for (nn = man->last->parent; nn; nn = nn->parent) |
for (nn = man->last->parent; nn; nn = nn->parent) |
Line 357 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 356 in_line_eoln(MACRO_PROT_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Append MAN_EOS in case the last snipped argument |
* Append NODE_EOS in case the last snipped argument |
* ends with a dot, e.g. `.IR syslog (3).' |
* ends with a dot, e.g. `.IR syslog (3).' |
*/ |
*/ |
|
|
if (n != man->last && |
if (n != man->last && |
mandoc_eos(man->last->string, strlen(man->last->string))) |
mandoc_eos(man->last->string, strlen(man->last->string))) |
man->last->flags |= MAN_EOS; |
man->last->flags |= NODE_EOS; |
|
|
/* |
/* |
* If no arguments are specified and this is MAN_SCOPED (i.e., |
* If no arguments are specified and this is MAN_SCOPED (i.e., |
Line 380 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 379 in_line_eoln(MACRO_PROT_ARGS) |
|
assert(man->last->type != ROFFT_ROOT); |
assert(man->last->type != ROFFT_ROOT); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
|
|
/* |
/* Rewind our element scope. */ |
* Rewind our element scope. Note that when TH is pruned, we'll |
|
* be back at the root, so make sure that we don't clobber as |
|
* its sibling. |
|
*/ |
|
|
|
for ( ; man->last; man->last = man->last->parent) { |
for ( ; man->last; man->last = man->last->parent) { |
|
man_state(man, man->last); |
if (man->last == n) |
if (man->last == n) |
break; |
break; |
if (man->last->type == ROFFT_ROOT) |
|
break; |
|
man_valid_post(man); |
|
} |
} |
|
|
assert(man->last); |
|
|
|
/* |
|
* Same here regarding whether we're back at the root. |
|
*/ |
|
|
|
if (man->last->type != ROFFT_ROOT) |
|
man_valid_post(man); |
|
} |
} |
|
|
|
|
void |
void |
man_macroend(struct roff_man *man) |
man_endparse(struct roff_man *man) |
{ |
{ |
|
|
man_unscope(man, man->first); |
man_unscope(man, man->first); |
|
man->flags &= ~MAN_LITERAL; |
} |
} |
|
|
static int |
static int |
Line 422 man_args(struct roff_man *man, int line, int *pos, cha |
|
Line 406 man_args(struct roff_man *man, int line, int *pos, cha |
|
assert(' ' != *start); |
assert(' ' != *start); |
|
|
if ('\0' == *start) |
if ('\0' == *start) |
return(0); |
return 0; |
|
|
*v = mandoc_getarg(man->parse, v, line, pos); |
*v = mandoc_getarg(man->parse, v, line, pos); |
return(1); |
return 1; |
} |
} |