===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.78
retrieving revision 1.80
diff -u -p -r1.78 -r1.80
--- docbook2mdoc/docbook2mdoc.c	2019/03/28 20:41:33	1.78
+++ docbook2mdoc/docbook2mdoc.c	2019/04/02 16:24:23	1.80
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.78 2019/03/28 20:41:33 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.80 2019/04/02 16:24:23 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -438,6 +438,16 @@ pnode_printauthor(struct format *f, struct pnode *n)
 	}
 
 	/*
+	 * If there is an email address,
+	 * print it on the same macro line.
+	 */
+
+	if ((nc = pnode_findfirst(n, NODE_EMAIL)) != NULL) {
+		pnode_print(f, nc);
+		pnode_unlink(nc);
+	}
+
+	/*
 	 * If there are still unprinted children, end the scope
 	 * with a comma.  Otherwise, leave the scope open in case
 	 * a text node follows that starts with closing punctuation.
@@ -642,6 +652,13 @@ pnode_print(struct format *p, struct pnode *pn)
 		break;
 	case NODE_ENVAR:
 		macro_open(p, "Ev");
+		break;
+	case NODE_ESCAPE:
+		if (p->linestate == LINE_NEW)
+			p->linestate = LINE_TEXT;
+		else
+			putchar(' ');
+		fputs(pn->b, stdout);
 		break;
 	case NODE_FILENAME:
 		macro_open(p, "Pa");