diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-09-04 21:25:00 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-09-04 21:25:00 +0000 |
commit | 41352abb31bca3448fdf6a656c79fb4986624085 (patch) | |
tree | c5be5c34a1ae5085a012f5b17c63af239cdd6def | |
parent | 1bca1b26aa408603e89d1a896729319ba8f93084 (diff) | |
download | mandoc-41352abb31bca3448fdf6a656c79fb4986624085.tar.gz |
Fill mode changes don't break next-line scope in all cases,
in particular not for tagged paragraphs.
Issue found by Christian Neukirchen <chneukirchen at gmail dot com>
in the exiv2(1) manual page.
-rw-r--r-- | man.c | 14 | ||||
-rw-r--r-- | man_macro.c | 4 |
2 files changed, 16 insertions, 2 deletions
@@ -283,6 +283,20 @@ man_breakscope(struct roff_man *man, int tok) } /* + * Weird special case: + * Switching fill mode closes section headers. + */ + + if (man->flags & MAN_BLINE && + (tok == MAN_nf || tok == MAN_fi) && + (man->last->tok == MAN_SH || man->last->tok == MAN_SS)) { + n = man->last; + man_unscope(man, n); + roff_body_alloc(man, n->line, n->pos, n->tok); + man->flags &= ~MAN_BLINE; + } + + /* * A block header next line scope is open, * and the new macro is not allowed inside block headers. * Delete the block that is being broken. diff --git a/man_macro.c b/man_macro.c index 4ba357b5..1b97ce8c 100644 --- a/man_macro.c +++ b/man_macro.c @@ -63,8 +63,8 @@ const struct man_macro __man_macros[MAN_MAX] = { { in_line_eoln, 0 }, /* IR */ { in_line_eoln, 0 }, /* RI */ { in_line_eoln, MAN_NSCOPED }, /* sp */ - { in_line_eoln, MAN_BSCOPE }, /* nf */ - { in_line_eoln, MAN_BSCOPE }, /* fi */ + { in_line_eoln, MAN_NSCOPED }, /* nf */ + { in_line_eoln, MAN_NSCOPED }, /* fi */ { blk_close, MAN_BSCOPE }, /* RE */ { blk_exp, MAN_BSCOPE }, /* RS */ { in_line_eoln, 0 }, /* DT */ |