===================================================================
RCS file: /cvs/docbook2mdoc/macro.c,v
retrieving revision 1.14
retrieving revision 1.17
diff -u -p -r1.14 -r1.17
--- docbook2mdoc/macro.c	2019/04/16 14:26:27	1.14
+++ docbook2mdoc/macro.c	2019/05/01 15:05:39	1.17
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.14 2019/04/16 14:26:27 schwarze Exp $ */
+/* $Id: macro.c,v 1.17 2019/05/01 15:05:39 schwarze Exp $ */
 /*
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -49,6 +49,8 @@ macro_open(struct format *f, const char *name)
 		}
 		/* FALLTHROUGH */
 	case LINE_TEXT:
+		if (f->nofill)
+			fputs(" \\c", stdout);
 		putchar('\n');
 		/* FALLTHROUGH */
 	case LINE_NEW:
@@ -164,7 +166,7 @@ void
 macro_addnode(struct format *f, struct pnode *n, int flags)
 {
 	struct pnode	*nc;
-	int		 quote_now;
+	int		 is_text, quote_now;
 
 	assert(f->linestate == LINE_MACRO);
 
@@ -209,8 +211,14 @@ macro_addnode(struct format *f, struct pnode *n, int f
 
 	while (nc != NULL) {
 		macro_addnode(f, nc, flags);
+		is_text = pnode_class(nc->node) == CLASS_TEXT;
 		nc = TAILQ_NEXT(nc, child);
-		flags |= ARG_SPACE;
+		if (nc == NULL || pnode_class(nc->node) != CLASS_TEXT)
+			is_text = 0;
+		if (is_text && (nc->flags & NFLAG_SPC) == 0)
+			flags &= ~ARG_SPACE;
+		else
+			flags |= ARG_SPACE;
 	}
 	if (quote_now)
 		putchar('"');