preserve .PP before .RE; effect found in audio/pms(1)

diff --git a/regress/usr.bin/mandoc/man/RS/broken.in b/regress/usr.bin/mandoc/man/RS/broken.in
index 5c915c6..ea81c0c 100644 (file)
--- a/regress/usr.bin/mandoc/man/RS/broken.in
+++ b/regress/usr.bin/mandoc/man/RS/broken.in
@@ -37,4 +37,9 @@ Let's have a longer text here such that we can see the line break.
 .PP
 still indented
 .RE
+trailing PP:
+.RS
+indented
+.PP
+.RE
 final text

diff --git a/regress/usr.bin/mandoc/man/RS/broken.out_ascii b/regress/usr.bin/mandoc/man/RS/broken.out_ascii
index 199ef05..ab219ac 100644 (file)
--- a/regress/usr.bin/mandoc/man/RS/broken.out_ascii
+++ b/regress/usr.bin/mandoc/man/RS/broken.out_ascii
@@ -31,6 +31,9 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
                 break.
 
               still indented
+       trailing PP:
+              indented
+
        final text
 
 

diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c
index 96f8017..56cd937 100644 (file)
--- 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