===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.132
retrieving revision 1.136
diff -u -p -r1.132 -r1.136
--- docbook2mdoc/docbook2mdoc.c	2019/04/21 14:48:11	1.132
+++ docbook2mdoc/docbook2mdoc.c	2019/04/24 14:56:51	1.136
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.132 2019/04/21 14:48:11 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.136 2019/04/24 14:56:51 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -97,10 +97,12 @@ pnode_printtext(struct format *f, struct pnode *n)
 		}
 		break;
 	case LINE_MACRO:
-		if (accept_arg)
-			putchar(' ');
-		else
+		if (accept_arg == 0)
 			macro_close(f);
+		else if (n->spc || (f->flags & FMT_ARG) == 0 ||
+		    (nn = TAILQ_PREV(n, pnodeq, child)) == NULL ||
+		    pnode_class(nn->node) != CLASS_TEXT)
+			putchar(' ');
 		break;
 	}
 
@@ -812,6 +814,8 @@ pnode_printrefentry(struct format *f, struct pnode *n)
 			pnode_unlink(info);
 			info = NULL;
 		}
+		if (info == NULL)
+			info = pnode_takefirst(n, NODE_INFO);
 		meta = pnode_takefirst(n, NODE_REFMETA);
 		if (meta != NULL && TAILQ_FIRST(&meta->childq) == NULL) {
 			pnode_unlink(meta);
@@ -929,16 +933,17 @@ pnode_printrefentry(struct format *f, struct pnode *n)
 static void
 pnode_printvarlistentry(struct format *f, struct pnode *n)
 {
-	struct pnode	*nc, *nn;
-	int		 first = 1;
+	struct pnode	*nc, *nn, *ncc;
+	int		 comma;
 
 	macro_open(f, "It");
 	f->parastate = PARA_HAVE;
 	f->flags |= FMT_IMPL;
+	comma = -1;
 	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
 		if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM)
 			continue;
-		if (first == 0) {
+		if (comma != -1) {
 			switch (f->linestate) {
 			case LINE_NEW:
 				break;
@@ -946,14 +951,15 @@ pnode_printvarlistentry(struct format *f, struct pnode
 				print_text(f, ",", 0);
 				break;
 			case LINE_MACRO:
-				macro_addarg(f, ",", 0);
+				macro_addarg(f, ",", comma);
 				break;
 			}
 		}
 		f->parastate = PARA_HAVE;
+		comma = (ncc = TAILQ_FIRST(&nc->childq)) == NULL ||
+		    pnode_class(ncc->node) == CLASS_TEXT ? 0 : ARG_SPACE;
 		pnode_print(f, nc);
 		pnode_unlink(nc);
-		first = 0;
 	}
 	macro_close(f);
 	f->parastate = PARA_HAVE;
@@ -1033,6 +1039,7 @@ pnode_printtgroup2(struct format *f, struct pnode *n)
 		pnode_unlink(nr);
 	}
 	macro_line(f, "El");
+	f->parastate = PARA_WANT;
 	pnode_unlinksub(n);
 }
 
@@ -1059,6 +1066,7 @@ pnode_printtgroup(struct format *f, struct pnode *n)
 		pnode_printrow(f, nc);
 	}
 	macro_line(f, "El");
+	f->parastate = PARA_WANT;
 	pnode_unlinksub(n);
 }
 
@@ -1078,6 +1086,7 @@ pnode_printlist(struct format *f, struct pnode *n)
 		f->parastate = PARA_HAVE;
 	}
 	macro_line(f, "El");
+	f->parastate = PARA_WANT;
 	pnode_unlinksub(n);
 }
 
@@ -1096,6 +1105,7 @@ pnode_printvariablelist(struct format *f, struct pnode
 			macro_nodeline(f, "It", nc, 0);
 	}
 	macro_line(f, "El");
+	f->parastate = PARA_WANT;
 	pnode_unlinksub(n);
 }
 
@@ -1476,6 +1486,7 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_SYNOPSIS:
 		f->parastate = PARA_HAVE;
 		macro_line(f, "Ed");
+		f->parastate = PARA_WANT;
 		break;
 	case NODE_TITLE:
 	case NODE_SUBTITLE: