===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- docbook2mdoc/docbook2mdoc.c	2019/04/28 15:32:05	1.140
+++ docbook2mdoc/docbook2mdoc.c	2019/04/28 17:10:06	1.141
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.140 2019/04/28 15:32:05 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.141 2019/04/28 17:10:06 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -729,73 +729,34 @@ pnode_printolink(struct format *f, struct pnode *n)
 static void
 pnode_printprologue(struct format *f, struct pnode *root)
 {
-	struct pnode	*date, *refmeta, *name, *vol, *descr, *nc, *nn;
-	const char	*sname;
+	struct pnode	*name, *nc;
 
-	/* Collect information. */
+	nc = TAILQ_FIRST(&root->childq);
+	assert(nc->node == NODE_DATE);
+	macro_nodeline(f, "Dd", nc, 0);
+	pnode_unlink(nc);
 
-	if ((date = pnode_takefirst(root, NODE_PUBDATE)) == NULL)
-		date = pnode_takefirst(root, NODE_DATE);
-
-	name = vol = NULL;
-	if ((refmeta = pnode_findfirst(root, NODE_REFMETA)) != NULL) {
-		TAILQ_FOREACH_SAFE(nc, &refmeta->childq, child, nn) {
-			switch (nc->node) {
-			case NODE_REFENTRYTITLE:
-				name = nc;
-				break;
-			case NODE_MANVOLNUM:
-				vol = nc;
-				break;
-			default:
-				continue;
-			}
-			TAILQ_REMOVE(&refmeta->childq, nc, child);
-		}
-	}
-
-	if (pnode_findfirst(root, NODE_REFNAMEDIV) == NULL &&
-	    ((nc = pnode_findfirst(root, NODE_BOOKINFO)) != NULL ||
-	     (nc = pnode_findfirst(root, NODE_REFENTRYINFO)) != NULL))
-		descr = pnode_takefirst(nc, NODE_TITLE);
-	else
-		descr = NULL;
-
-	/* Print prologue. */
-
-	if (date == NULL)
-		macro_line(f, "Dd $Mdocdate" "$");
-	else
-		macro_nodeline(f, "Dd", date, 0);
-
 	macro_open(f, "Dt");
-	if (name == NULL) {
-		sname = pnode_getattr_raw(root, ATTRKEY_ID, "UNKNOWN");
-		macro_addarg(f, sname, ARG_SPACE | ARG_SINGLE | ARG_UPPER);
-	} else
-		macro_addnode(f, name, ARG_SPACE | ARG_SINGLE | ARG_UPPER);
-	if (vol == NULL)
-		macro_addarg(f, "1", ARG_SPACE);
-	else
-		macro_addnode(f, vol, ARG_SPACE | ARG_SINGLE);
+	name = TAILQ_FIRST(&root->childq);
+	assert(name->node == NODE_REFENTRYTITLE);
+	macro_addnode(f, name, ARG_SPACE | ARG_SINGLE | ARG_UPPER);
+	TAILQ_REMOVE(&root->childq, name, child);
+	name->parent = NULL;
+	nc = TAILQ_FIRST(&root->childq);
+	assert (nc->node == NODE_MANVOLNUM);
+	macro_addnode(f, nc, ARG_SPACE | ARG_SINGLE);
+	pnode_unlink(nc);
 
 	macro_line(f, "Os");
 
-	if (descr != NULL) {
+	nc = TAILQ_FIRST(&root->childq);
+	if (nc != NULL && nc->node == NODE_TITLE) {
 		macro_line(f, "Sh NAME");
-		if (name == NULL)
-			macro_argline(f, "Nm", sname);
-		else
-			macro_nodeline(f, "Nm", name, ARG_SINGLE);
-		macro_nodeline(f, "Nd", descr, 0);
+		macro_nodeline(f, "Nm", name, ARG_SINGLE);
+		macro_nodeline(f, "Nd", nc, 0);
+		pnode_unlink(nc);
 	}
-
-	/* Clean up. */
-
-	pnode_unlink(date);
 	pnode_unlink(name);
-	pnode_unlink(vol);
-	pnode_unlink(descr);
 	f->parastate = PARA_HAVE;
 }