===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- docbook2mdoc/docbook2mdoc.c	2019/05/01 12:52:05	1.145
+++ docbook2mdoc/docbook2mdoc.c	2019/05/01 15:05:39	1.146
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.145 2019/05/01 12:52:05 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.146 2019/05/01 15:05:39 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -930,6 +930,9 @@ pnode_print(struct format *f, struct pnode *n)
 	if (n == NULL)
 		return;
 
+	if (f->nofill && n->flags & NFLAG_LINE)
+		macro_close(f);
+
 	was_impl = f->flags & FMT_IMPL;
 	if (n->flags & NFLAG_SPC)
 		f->flags &= ~FMT_NOSPC;
@@ -1193,6 +1196,9 @@ pnode_print(struct format *f, struct pnode *n)
 		break;
 	}
 
+	if (pnode_class(n->node) == CLASS_NOFILL)
+		f->nofill++;
+
 	TAILQ_FOREACH(nc, &n->childq, child)
 		pnode_print(f, nc);
 
@@ -1306,6 +1312,8 @@ pnode_print(struct format *f, struct pnode *n)
 		break;
 	}
 	f->flags &= ~FMT_ARG;
+	if (pnode_class(n->node) == CLASS_NOFILL)
+		f->nofill--;
 }
 
 void
@@ -1313,7 +1321,7 @@ ptree_print_mdoc(struct ptree *tree)
 {
 	struct format	 formatter;
 
-	formatter.level = 0;
+	formatter.level = formatter.nofill = 0;
 	formatter.linestate = LINE_NEW;
 	formatter.parastate = PARA_HAVE;
 	pnode_printprologue(&formatter, tree->root);