===================================================================
RCS file: /cvs/docbook2mdoc/macro.c,v
retrieving revision 1.17
retrieving revision 1.19
diff -u -p -r1.17 -r1.19
--- docbook2mdoc/macro.c	2019/05/01 15:05:39	1.17
+++ docbook2mdoc/macro.c	2019/05/02 04:12:18	1.19
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.17 2019/05/01 15:05:39 schwarze Exp $ */
+/* $Id: macro.c,v 1.19 2019/05/02 04:12:18 schwarze Exp $ */
 /*
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -28,28 +28,35 @@
  */
 
 void
-macro_open(struct format *f, const char *name)
+para_check(struct format *f)
 {
-	if (f->parastate == PARA_WANT) {
-		if (f->linestate != LINE_NEW) {
-			putchar('\n');
-			f->linestate = LINE_NEW;
-		}
-		puts(".Pp");
+	if (f->parastate != PARA_WANT)
+		return;
+	if (f->linestate != LINE_NEW) {
+		putchar('\n');
+		f->linestate = LINE_NEW;
 	}
+	puts(".Pp");
+	f->parastate = PARA_HAVE;
+}
+
+void
+macro_open(struct format *f, const char *name)
+{
+	para_check(f);
 	switch (f->linestate) {
 	case LINE_MACRO:
 		if (f->flags & FMT_NOSPC) {
 			fputs(" Ns ", stdout);
 			break;
 		}
-		if (f->flags & (FMT_CHILD | FMT_IMPL)) {
+		if (f->nofill || f->flags & (FMT_CHILD | FMT_IMPL)) {
 			putchar(' ');
 			break;
 		}
 		/* FALLTHROUGH */
 	case LINE_TEXT:
-		if (f->nofill)
+		if (f->nofill && f->linestate == LINE_TEXT)
 			fputs(" \\c", stdout);
 		putchar('\n');
 		/* FALLTHROUGH */
@@ -241,13 +248,7 @@ macro_nodeline(struct format *f, const char *name, str
 void
 print_text(struct format *f, const char *word, int flags)
 {
-	if (f->parastate == PARA_WANT) {
-		if (f->linestate != LINE_NEW) {
-			putchar('\n');
-			f->linestate = LINE_NEW;
-		}
-		puts(".Pp");
-	}
+	para_check(f);
 	switch (f->linestate) {
 	case LINE_NEW:
 		break;