version 1.116, 2017/04/24 23:06:18 |
version 1.121, 2017/06/13 19:34:40 |
Line 61 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
Line 61 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
{ 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 }, /* br */ |
|
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
|
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
Line 72 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
Line 70 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
{ in_line_eoln, MAN_NSCOPED }, /* PD */ |
{ in_line_eoln, MAN_NSCOPED }, /* PD */ |
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, 0 }, /* in */ |
{ in_line_eoln, 0 }, /* in */ |
{ in_line_eoln, 0 }, /* ft */ |
|
{ in_line_eoln, 0 }, /* OP */ |
{ in_line_eoln, 0 }, /* OP */ |
{ in_line_eoln, MAN_BSCOPE }, /* EX */ |
{ in_line_eoln, MAN_BSCOPE }, /* EX */ |
{ in_line_eoln, MAN_BSCOPE }, /* EE */ |
{ in_line_eoln, MAN_BSCOPE }, /* EE */ |
{ blk_exp, MAN_BSCOPE }, /* UR */ |
{ blk_exp, MAN_BSCOPE }, /* UR */ |
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ in_line_eoln, 0 }, /* ll */ |
|
}; |
}; |
const struct man_macro *const man_macros = __man_macros - MAN_TH; |
const struct man_macro *const man_macros = __man_macros - MAN_TH; |
|
|
Line 239 blk_close(MACRO_PROT_ARGS) |
|
Line 235 blk_close(MACRO_PROT_ARGS) |
|
ntok = man->last->tok; |
ntok = man->last->tok; |
man_unscope(man, nn); |
man_unscope(man, nn); |
|
|
|
if (tok == MAN_RE && nn->head->aux > 0) |
|
roff_setreg(man->roff, "an-margin", |
|
nn->head->aux, '-'); |
|
|
/* Move a trailing paragraph behind the block. */ |
/* Move a trailing paragraph behind the block. */ |
|
|
if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) { |
if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) { |
Line 260 blk_exp(MACRO_PROT_ARGS) |
|
Line 260 blk_exp(MACRO_PROT_ARGS) |
|
head = roff_head_alloc(man, line, ppos, tok); |
head = roff_head_alloc(man, line, ppos, tok); |
|
|
la = *pos; |
la = *pos; |
if (man_args(man, line, pos, buf, &p)) |
if (man_args(man, line, pos, buf, &p)) { |
roff_word_alloc(man, line, la, p); |
roff_word_alloc(man, line, la, p); |
|
if (tok == MAN_RS) { |
|
if (roff_getreg(man->roff, "an-margin") == 0) |
|
roff_setreg(man->roff, "an-margin", |
|
7 * 24, '='); |
|
if ((head->aux = strtod(p, NULL) * 24.0) > 0) |
|
roff_setreg(man->roff, "an-margin", |
|
head->aux, '+'); |
|
} |
|
} |
|
|
if (buf[*pos] != '\0') |
if (buf[*pos] != '\0') |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line, |
Line 328 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 337 in_line_eoln(MACRO_PROT_ARGS) |
|
n = man->last; |
n = man->last; |
|
|
for (;;) { |
for (;;) { |
if (buf[*pos] != '\0' && (tok == MAN_br || |
if (buf[*pos] != '\0' && (tok == MAN_fi || tok == MAN_nf)) { |
tok == MAN_fi || tok == MAN_nf)) { |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
man->parse, line, *pos, "%s %s", |
man->parse, line, *pos, "%s %s", |
roff_name[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
break; |
break; |
} |
} |
if (buf[*pos] != '\0' && man->last != n && |
if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) { |
(tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) { |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
man->parse, line, *pos, "%s ... %s", |
man->parse, line, *pos, "%s ... %s", |
roff_name[tok], buf + *pos); |
roff_name[tok], buf + *pos); |