From: schwarze <schwarze@openbsd.org>
Date: Sat, 24 Jan 2015 10:07:58 +0000 (+0000)
Subject: preserve .PP before .RE; effect found in audio/pms(1)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4ca21368726c679d7e7191bd116ff165b9cc6287;p=openbsd

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 5c915c640fe..ea81c0c3e2c 100644
--- 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 199ef05fbde..ab219ac1f49 100644
--- a/regress/usr.bin/mandoc/man/RS/broken.out_ascii
+++ b/regress/usr.bin/mandoc/man/RS/broken.out_ascii
@@ -31,6 +31,9 @@ DDEESSCCRRIIPPTTIIOONN
                 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 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