version 1.93, 2015/01/24 01:58:33 |
version 1.97, 2015/02/06 09:38:43 |
Line 72 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 72 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */ |
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */ |
{ 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 }, /* na */ |
|
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_BSCOPE }, /* nf */ |
{ in_line_eoln, MAN_BSCOPE }, /* nf */ |
{ in_line_eoln, MAN_BSCOPE }, /* fi */ |
{ in_line_eoln, MAN_BSCOPE }, /* fi */ |
Line 320 blk_close(MACRO_PROT_ARGS) |
|
Line 319 blk_close(MACRO_PROT_ARGS) |
|
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
line, ppos, man_macronames[tok]); |
line, ppos, man_macronames[tok]); |
rew_scope(MAN_BLOCK, man, MAN_PP); |
rew_scope(MAN_BLOCK, man, MAN_PP); |
} else |
} else { |
|
line = man->last->line; |
|
ppos = man->last->pos; |
|
ntok = man->last->tok; |
man_unscope(man, nn); |
man_unscope(man, nn); |
|
|
|
/* Move a trailing paragraph behind the block. */ |
|
|
|
if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) { |
|
*pos = strlen(buf); |
|
blk_imp(man, ntok, line, ppos, pos, buf); |
|
} |
|
} |
} |
} |
|
|
void |
void |
Line 410 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 420 in_line_eoln(MACRO_PROT_ARGS) |
|
n = man->last; |
n = man->last; |
|
|
for (;;) { |
for (;;) { |
|
if (buf[*pos] != '\0' && (tok == MAN_br || |
|
tok == MAN_fi || tok == MAN_nf)) { |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
|
man->parse, line, *pos, "%s %s", |
|
man_macronames[tok], buf + *pos); |
|
break; |
|
} |
|
if (buf[*pos] != '\0' && man->last != n && |
|
(tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) { |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
|
man->parse, line, *pos, "%s ... %s", |
|
man_macronames[tok], buf + *pos); |
|
break; |
|
} |
la = *pos; |
la = *pos; |
if ( ! man_args(man, line, pos, buf, &p)) |
if ( ! man_args(man, line, pos, buf, &p)) |
break; |
break; |