diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-02-03 00:48:47 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-02-03 00:48:47 +0000 |
commit | 2efed192ca84723eb58ba173fb232892e4af0a3a (patch) | |
tree | f12424b7099ebfb6a337c56b70868f97fefef6a2 /mdoc_macro.c | |
parent | 722eb681eacb445abee48a93e7201b627c5f4122 (diff) | |
download | mandoc-2efed192ca84723eb58ba173fb232892e4af0a3a.tar.gz |
Bring .Pp/.Lp handling inside .Nm blocks closer to groff;
as a bonus, get rid of another call to rew_sub().
Diffstat (limited to 'mdoc_macro.c')
-rw-r--r-- | mdoc_macro.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index cfc32caf..80023269 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1459,10 +1459,17 @@ in_line_argn(MACRO_PROT_ARGS) static void in_line_eoln(MACRO_PROT_ARGS) { - struct mdoc_arg *arg; + struct mdoc_node *n; + struct mdoc_arg *arg; - if (tok == MDOC_Pp) - rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos); + if ((tok == MDOC_Pp || tok == MDOC_Lp) && + ! (mdoc->flags & MDOC_SYNOPSIS)) { + n = mdoc->last; + if (mdoc->next == MDOC_NEXT_SIBLING) + n = n->parent; + if (n->tok == MDOC_Nm) + rew_last(mdoc, mdoc->last->parent); + } mdoc_argv(mdoc, line, tok, &arg, pos, buf); mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |