From 3c5734925c52ae38922a5f660600de0e47c5d4c2 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Mon, 27 Sep 2010 11:21:39 +0000
Subject: Suppress whitespace following Pp, Lp, sp, and the other
 newline-emitting macros within an unfilled or literal `Bd'.

---
 mdoc_term.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'mdoc_term.c')

diff --git a/mdoc_term.c b/mdoc_term.c
index c04587eb..9acd6f06 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1578,6 +1578,26 @@ termp_bd_pre(DECL_ARGS)
 
 	for (nn = n->child; nn; nn = nn->next) {
 		print_mdoc_node(p, pair, m, nn);
+		/*
+		 * If the printed node flushes its own line, then we
+		 * needn't do it here as well.  This is hacky, but the
+		 * notion of selective eoln whitespace is pretty dumb
+		 * anyway, so don't sweat it.
+		 */
+		switch (nn->tok) {
+		case (MDOC_br):
+			/* FALLTHROUGH */
+		case (MDOC_sp):
+			/* FALLTHROUGH */
+		case (MDOC_Bl):
+			/* FALLTHROUGH */
+		case (MDOC_Lp):
+			/* FALLTHROUGH */
+		case (MDOC_Pp):
+			continue;
+		default:
+			break;
+		}
 		if (nn->next && nn->next->line == nn->line)
 			continue;
 		term_flushln(p);
-- 
cgit