===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.79
retrieving revision 1.81
diff -u -p -r1.79 -r1.81
--- docbook2mdoc/docbook2mdoc.c	2019/04/02 15:53:02	1.79
+++ docbook2mdoc/docbook2mdoc.c	2019/04/02 17:06:50	1.81
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.79 2019/04/02 15:53:02 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.81 2019/04/02 17:06:50 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -172,7 +172,6 @@ pnode_printciterefentry(struct format *p, struct pnode
 		macro_addarg(p, "1", ARG_SPACE);
 	else
 		macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE);
-	macro_close(p);
 	pnode_unlinksub(pn);
 }
 
@@ -435,6 +434,16 @@ pnode_printauthor(struct format *f, struct pnode *n)
 			macro_addnode(f, nc, ARG_SPACE);
 			pnode_unlink(nc);
 		}
+	}
+
+	/*
+	 * 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);
 	}
 
 	/*