===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.134
retrieving revision 1.137
diff -u -p -r1.134 -r1.137
--- docbook2mdoc/docbook2mdoc.c	2019/04/23 22:25:28	1.134
+++ docbook2mdoc/docbook2mdoc.c	2019/04/24 15:20:12	1.137
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.134 2019/04/23 22:25:28 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.137 2019/04/24 15:20:12 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -90,17 +90,19 @@ pnode_printtext(struct format *f, struct pnode *n)
 		break;
 	case LINE_TEXT:
 		if (n->spc) {
-			if (n->node == NODE_TEXT)
+			if (pnode_class(n->node) == CLASS_TEXT)
 				macro_close(f);
 			else
 				putchar(' ');
 		}
 		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;
 	}
 
@@ -1037,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);
 }
 
@@ -1063,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);
 }
 
@@ -1082,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);
 }
 
@@ -1100,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);
 }
 
@@ -1480,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: