diff options
| author |   schwarze <schwarze@openbsd.org> | 2015-01-24 10:07:58 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2015-01-24 10:07:58 +0000 |
| commit | 4ca21368726c679d7e7191bd116ff165b9cc6287 (patch) | |
| tree | 4531c03780bd70289ed6ead63142cefb5aef49d8 /usr.bin/mandoc/man_macro.c | |
| parent | Convert openssl(1) sess_id to the new option handling. (diff) | |
| download | wireguard-openbsd-4ca21368726c679d7e7191bd116ff165b9cc6287.tar.xz wireguard-openbsd-4ca21368726c679d7e7191bd116ff165b9cc6287.zip | |
preserve .PP before .RE; effect found in audio/pms(1)
Diffstat (limited to 'usr.bin/mandoc/man_macro.c')
| -rw-r--r-- | usr.bin/mandoc/man_macro.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c index 96f8017cc50..56cd937d050 100644 --- a/usr.bin/mandoc/man_macro.c +++ b/usr.bin/mandoc/man_macro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man_macro.c,v 1.56 2015/01/24 02:41:32 schwarze Exp $ */ +/* $OpenBSD: man_macro.c,v 1.57 2015/01/24 10:07:58 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -317,8 +317,19 @@ blk_close(MACRO_PROT_ARGS) mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, line, ppos, man_macronames[tok]); rew_scope(MAN_BLOCK, man, MAN_PP); - } else + } else { + line = man->last->line; + ppos = man->last->pos; + ntok = man->last->tok; man_unscope(man, nn); + + /* Move a trailing paragraph behind the block. */ + + if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) { + *pos = strlen(buf); + blk_imp(man, ntok, line, ppos, pos, buf); + } + } } void |