version 1.120, 2017/05/05 15:17:32 |
version 1.123, 2017/06/25 11:45:37 |
Line 69 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
Line 69 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
{ in_line_eoln, 0 }, /* UC */ |
{ in_line_eoln, 0 }, /* UC */ |
{ 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, MAN_NSCOPED }, /* in */ |
{ 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 */ |
|
{ blk_exp, MAN_BSCOPE }, /* MT */ |
|
{ blk_close, MAN_BSCOPE }, /* ME */ |
}; |
}; |
const struct man_macro *const man_macros = __man_macros - MAN_TH; |
const struct man_macro *const man_macros = __man_macros - MAN_TH; |
|
|
Line 217 blk_close(MACRO_PROT_ARGS) |
|
Line 219 blk_close(MACRO_PROT_ARGS) |
|
case MAN_UE: |
case MAN_UE: |
ntok = MAN_UR; |
ntok = MAN_UR; |
break; |
break; |
|
case MAN_ME: |
|
ntok = MAN_MT; |
|
break; |
default: |
default: |
abort(); |
abort(); |
} |
} |
Line 235 blk_close(MACRO_PROT_ARGS) |
|
Line 240 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 256 blk_exp(MACRO_PROT_ARGS) |
|
Line 265 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, |