===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.144
retrieving revision 1.147
diff -u -p -r1.144 -r1.147
--- docbook2mdoc/docbook2mdoc.c	2019/05/01 11:34:19	1.144
+++ docbook2mdoc/docbook2mdoc.c	2019/05/01 17:20:47	1.147
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.144 2019/05/01 11:34:19 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.147 2019/05/01 17:20:47 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -40,6 +40,7 @@ pnode_printtext(struct format *f, struct pnode *n)
 	char		*cp;
 	int		 accept_arg;
 
+	para_check(f);
 	cp = n->b;
 	accept_arg = f->flags & FMT_ARG;
 	if (f->linestate == LINE_MACRO && !accept_arg &&
@@ -345,7 +346,7 @@ pnode_printmath(struct format *f, struct pnode *n)
 static void
 pnode_printfuncprototype(struct format *f, struct pnode *n)
 {
-	struct pnode	*fdef, *ftype, *nc, *nn;
+	struct pnode	*fdef, *fps, *ftype, *nc, *nn;
 
 	/*
 	 * Extract <funcdef> child and ignore <void> child.
@@ -399,7 +400,16 @@ pnode_printfuncprototype(struct format *f, struct pnod
 		return;
 
 	while (nc != NULL) {
-		macro_nodeline(f, "Fa", nc, ARG_SINGLE);
+		if ((fps = pnode_takefirst(nc, NODE_FUNCPARAMS)) != NULL) {
+			macro_open(f, "Fa \"");
+			macro_addnode(f, nc, ARG_QUOTED);
+			macro_addarg(f, "(", ARG_QUOTED);
+			macro_addnode(f, fps, ARG_QUOTED);
+			macro_addarg(f, ")", ARG_QUOTED);
+			putchar('"');
+			macro_close(f);
+		} else
+			macro_nodeline(f, "Fa", nc, ARG_SINGLE);
 		pnode_unlink(nc);
 		nc = TAILQ_FIRST(&n->childq);
 	}
@@ -921,6 +931,10 @@ pnode_print(struct format *f, struct pnode *n)
 	if (n == NULL)
 		return;
 
+	if (n->flags & NFLAG_LINE &&
+	    (f->nofill || (f->flags & (FMT_ARG | FMT_IMPL)) == 0))
+		macro_close(f);
+
 	was_impl = f->flags & FMT_IMPL;
 	if (n->flags & NFLAG_SPC)
 		f->flags &= ~FMT_NOSPC;
@@ -1184,6 +1198,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);
 
@@ -1297,6 +1314,8 @@ pnode_print(struct format *f, struct pnode *n)
 		break;
 	}
 	f->flags &= ~FMT_ARG;
+	if (pnode_class(n->node) == CLASS_NOFILL)
+		f->nofill--;
 }
 
 void
@@ -1304,7 +1323,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);