===================================================================
RCS file: /cvs/docbook2mdoc/macro.c,v
retrieving revision 1.12
retrieving revision 1.17
diff -u -p -r1.12 -r1.17
--- docbook2mdoc/macro.c	2019/04/14 12:59:15	1.12
+++ docbook2mdoc/macro.c	2019/05/01 15:05:39	1.17
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.12 2019/04/14 12:59:15 schwarze Exp $ */
+/* $Id: macro.c,v 1.17 2019/05/01 15:05:39 schwarze Exp $ */
 /*
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -30,6 +30,13 @@
 void
 macro_open(struct format *f, const char *name)
 {
+	if (f->parastate == PARA_WANT) {
+		if (f->linestate != LINE_NEW) {
+			putchar('\n');
+			f->linestate = LINE_NEW;
+		}
+		puts(".Pp");
+	}
 	switch (f->linestate) {
 	case LINE_MACRO:
 		if (f->flags & FMT_NOSPC) {
@@ -42,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:
@@ -53,6 +62,7 @@ macro_open(struct format *f, const char *name)
 	fputs(name, stdout);
 	f->flags &= FMT_IMPL;
 	f->flags |= FMT_ARG;
+	f->parastate = PARA_MID;
 }
 
 void
@@ -79,11 +89,13 @@ void
 macro_addarg(struct format *f, const char *arg, int flags)
 {
 	const char	*cp;
+	int		 quote_now;
 
 	assert(f->linestate == LINE_MACRO);
 
 	/* Quote if requested and necessary. */
 
+	quote_now = 0;
 	if ((flags & (ARG_SINGLE | ARG_QUOTED)) == ARG_SINGLE) {
 		for (cp = arg; *cp != '\0'; cp++)
 			if (isspace((unsigned char)*cp))
@@ -95,6 +107,7 @@ macro_addarg(struct format *f, const char *arg, int fl
 			}
 			putchar('"');
 			flags = ARG_QUOTED;
+			quote_now = 1;
 		}
 	}
 
@@ -133,6 +146,9 @@ macro_addarg(struct format *f, const char *arg, int fl
 		if (*cp == '\\')
 			putchar('e');
 	}
+	if (quote_now)
+		putchar('"');
+	f->parastate = PARA_MID;
 }
 
 void
@@ -150,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);
 
@@ -165,6 +181,7 @@ macro_addnode(struct format *f, struct pnode *n, int f
 
 	if (n->node == NODE_TEXT || n->node == NODE_ESCAPE) {
 		macro_addarg(f, n->b, flags);
+		f->parastate = PARA_MID;
 		return;
 	}
 
@@ -194,11 +211,18 @@ 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('"');
+	f->parastate = PARA_MID;
 }
 
 void
@@ -217,6 +241,13 @@ macro_nodeline(struct format *f, const char *name, str
 void
 print_text(struct format *f, const char *word, int flags)
 {
+	if (f->parastate == PARA_WANT) {
+		if (f->linestate != LINE_NEW) {
+			putchar('\n');
+			f->linestate = LINE_NEW;
+		}
+		puts(".Pp");
+	}
 	switch (f->linestate) {
 	case LINE_NEW:
 		break;
@@ -236,6 +267,7 @@ print_text(struct format *f, const char *word, int fla
 			putchar('e');
 	}
 	f->linestate = LINE_TEXT;
+	f->parastate = PARA_MID;
 	f->flags = 0;
 }