version 1.219, 2017/04/24 23:06:18 |
version 1.221, 2017/05/04 17:48:29 |
Line 197 const struct mdoc_macro __mdoc_macros[MDOC_MAX - MDOC_ |
|
Line 197 const struct mdoc_macro __mdoc_macros[MDOC_MAX - MDOC_ |
|
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */ |
{ in_line_eoln, MDOC_JOIN }, /* %Q */ |
{ in_line_eoln, MDOC_JOIN }, /* %Q */ |
{ in_line_eoln, 0 }, /* br */ |
|
{ in_line_eoln, 0 }, /* sp */ |
{ in_line_eoln, 0 }, /* sp */ |
{ in_line_eoln, 0 }, /* %U */ |
{ in_line_eoln, 0 }, /* %U */ |
{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ |
{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ |
Line 247 lookup(struct roff_man *mdoc, int from, int line, int |
|
Line 246 lookup(struct roff_man *mdoc, int from, int line, int |
|
return TOKEN_NONE; |
return TOKEN_NONE; |
} |
} |
if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) { |
if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) { |
res = mdoc_hash_find(p); |
res = roffhash_find(mdoc->mdocmac, p, 0); |
if (res != TOKEN_NONE) { |
if (res != TOKEN_NONE) { |
if (mdoc_macros[res].flags & MDOC_CALLABLE) |
if (mdoc_macros[res].flags & MDOC_CALLABLE) |
return res; |
return res; |
if (res != MDOC_br && res != MDOC_sp && res != MDOC_ll) |
if (res != MDOC_sp && res != MDOC_ll) |
mandoc_msg(MANDOCERR_MACRO_CALL, |
mandoc_msg(MANDOCERR_MACRO_CALL, |
mdoc->parse, line, ppos, p); |
mdoc->parse, line, ppos, p); |
} |
} |
Line 682 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 681 blk_exp_close(MACRO_PROT_ARGS) |
|
* Stray .Ec without previous .Eo: |
* Stray .Ec without previous .Eo: |
* Break the output line, keep the arguments. |
* Break the output line, keep the arguments. |
*/ |
*/ |
roff_elem_alloc(mdoc, line, ppos, MDOC_br); |
roff_elem_alloc(mdoc, line, ppos, ROFF_br); |
rew_elem(mdoc, MDOC_br); |
rew_elem(mdoc, ROFF_br); |
} |
} |
} else if (endbody == NULL) { |
} else if (endbody == NULL) { |
rew_last(mdoc, body); |
rew_last(mdoc, body); |
Line 1023 blk_full(MACRO_PROT_ARGS) |
|
Line 1022 blk_full(MACRO_PROT_ARGS) |
|
if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) { |
if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) { |
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
line, ppos, "It %s", buf + *pos); |
line, ppos, "It %s", buf + *pos); |
roff_elem_alloc(mdoc, line, ppos, MDOC_br); |
roff_elem_alloc(mdoc, line, ppos, ROFF_br); |
rew_elem(mdoc, MDOC_br); |
rew_elem(mdoc, ROFF_br); |
return; |
return; |
} |
} |
} |
} |