===================================================================
RCS file: /cvs/docbook2mdoc/macro.c,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- docbook2mdoc/macro.c	2019/03/26 19:17:29	1.1
+++ docbook2mdoc/macro.c	2019/04/03 15:04:03	1.5
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.1 2019/03/26 19:17:29 schwarze Exp $ */
+/* $Id: macro.c,v 1.5 2019/04/03 15:04:03 schwarze Exp $ */
 /*
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -47,7 +47,8 @@ macro_open(struct format *f, const char *name)
 void
 macro_close(struct format *f)
 {
-	assert(f->linestate == LINE_MACRO);
+	if (f->linestate == LINE_NEW)
+		return;
 	putchar('\n');
 	f->linestate = LINE_NEW;
 }
@@ -152,18 +153,21 @@ macro_argline(struct format *f, const char *name, cons
 void
 macro_addnode(struct format *f, struct pnode *pn, int flags)
 {
+	struct pnode	*nc;
 	int		 quote_now;
 
 	assert(f->linestate == LINE_MACRO);
 
 	/*
-	 * If the only child is a text node, just add that text,
-	 * letting macro_addarg() decide about quoting.
+	 * If this node or its only child is a text node, just add
+	 * that text, letting macro_addarg() decide about quoting.
 	 */
 
-	pn = TAILQ_FIRST(&pn->childq);
-	if (pn != NULL && pn->node == NODE_TEXT &&
-	    TAILQ_NEXT(pn, child) == NULL) {
+	while ((nc = TAILQ_FIRST(&pn->childq)) != NULL &&
+	    TAILQ_NEXT(nc, child) == NULL)
+		pn = nc;
+
+	if (pn->node == NODE_TEXT || pn->node == NODE_ESCAPE) {
 		macro_addarg(f, pn->b, flags);
 		return;
 	}
@@ -192,12 +196,9 @@ macro_addnode(struct format *f, struct pnode *pn, int 
 	 * inserting whitespace between nodes.
 	 */
 
-	while (pn != NULL) {
-		if (pn->node == NODE_TEXT)
-			macro_addarg(f, pn->b, flags);
-		else
-			macro_addnode(f, pn, flags);
-		pn = TAILQ_NEXT(pn, child);
+	while (nc != NULL) {
+		macro_addnode(f, nc, flags);
+		nc = TAILQ_NEXT(nc, child);
 		flags |= ARG_SPACE;
 	}
 	if (quote_now)
@@ -210,4 +211,41 @@ macro_nodeline(struct format *f, const char *name, str
 	macro_open(f, name);
 	macro_addnode(f, pn, ARG_SPACE | flags);
 	macro_close(f);
+}
+
+
+/*
+ * Print a word on the current text line if one is open, or on a new text
+ * line otherwise.  The flag ARG_SPACE inserts spaces between words.
+ */
+void
+print_text(struct format *f, const char *word, int flags) {
+	switch (f->linestate) {
+	case LINE_NEW:
+		break;
+	case LINE_TEXT:
+		if (flags & ARG_SPACE)
+			putchar(' ');
+		break;
+	case LINE_MACRO:
+		macro_close(f);
+		break;
+	}
+	fputs(word, stdout);
+	f->linestate = LINE_TEXT;
+}
+
+/*
+ * Recursively print the content of a node on a text line.
+ */
+void
+print_textnode(struct format *f, struct pnode *n)
+{
+	struct pnode	*nc;
+
+	if (n->node == NODE_TEXT || n->node == NODE_ESCAPE)
+		print_text(f, n->b, ARG_SPACE);
+	else
+		TAILQ_FOREACH(nc, &n->childq, child)
+			print_textnode(f, nc);
 }