===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.115
retrieving revision 1.118
diff -u -p -r1.115 -r1.118
--- docbook2mdoc/docbook2mdoc.c	2019/04/12 21:37:07	1.115
+++ docbook2mdoc/docbook2mdoc.c	2019/04/13 15:54:45	1.118
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.115 2019/04/12 21:37:07 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.118 2019/04/13 15:54:45 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -318,32 +318,6 @@ pnode_printciterefentry(struct format *f, struct pnode
 }
 
 static void
-pnode_printrefmeta(struct format *f, struct pnode *n)
-{
-	struct pnode	*nc, *title, *manvol;
-
-	title = manvol = NULL;
-	TAILQ_FOREACH(nc, &n->childq, child) {
-		if (nc->node == NODE_MANVOLNUM)
-			manvol = nc;
-		else if (nc->node == NODE_REFENTRYTITLE)
-			title = nc;
-	}
-	macro_close(f);
-	macro_open(f, "Dt");
-	if (title == NULL)
-		macro_addarg(f, "UNKNOWN", ARG_SPACE);
-	else
-		macro_addnode(f, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER);
-	if (manvol == NULL)
-		macro_addarg(f, "1", ARG_SPACE);
-	else
-		macro_addnode(f, manvol, ARG_SPACE | ARG_SINGLE);
-	macro_close(f);
-	pnode_unlink(n);
-}
-
-static void
 pnode_printfuncdef(struct format *f, struct pnode *n)
 {
 	struct pnode	*nc;
@@ -468,14 +442,13 @@ pnode_printarg(struct format *f, struct pnode *n)
 			f->flags |= FMT_IMPL;
 		}
 	}
-
 	TAILQ_FOREACH(nc, &n->childq, child) {
 		if (nc->node == NODE_TEXT)
 			macro_open(f, "Ar");
 		pnode_print(f, nc);
-		if (isrep && nc->node == NODE_TEXT)
-			macro_addarg(f, "...", ARG_SPACE);
 	}
+	if (isrep && f->linestate == LINE_MACRO)
+		macro_addarg(f, "...", ARG_SPACE);
 	if (isop) {
 		if (was_impl)
 			macro_open(f, "Oc");
@@ -488,57 +461,76 @@ pnode_printarg(struct format *f, struct pnode *n)
 static void
 pnode_printgroup(struct format *f, struct pnode *n)
 {
-	struct pnode	*nc, *nn;
+	struct pnode	*nc;
 	struct pattr	*a;
-	int		 isop, sv;
+	int		 bar, isop, isrep, was_impl;
 
 	isop = 1;
-	TAILQ_FOREACH(a, &n->attrq, child)
+	isrep = was_impl = 0;
+	TAILQ_FOREACH(a, &n->attrq, child) {
 		if (a->key == ATTRKEY_CHOICE &&
-		    (a->val == ATTRVAL_PLAIN || a->val == ATTRVAL_REQ)) {
+		    (a->val == ATTRVAL_PLAIN || a->val == ATTRVAL_REQ))
 			isop = 0;
-			break;
+		else if (a->key == ATTRKEY_REP && a->val == ATTRVAL_REPEAT)
+			isrep = 1;
+	}
+	if (isop) {
+		if (f->flags & FMT_IMPL) {
+			was_impl = 1;
+			macro_open(f, "Oo");
+		} else {
+			macro_open(f, "Op");
+			f->flags |= FMT_IMPL;
 		}
-
-	/*
-	 * Make sure we're on a macro line.
-	 * This will prevent pnode_print() for putting us on a
-	 * subsequent line.
-	 */
-	sv = f->linestate == LINE_NEW;
-	if (isop)
-		macro_open(f, "Op");
-	else if (sv)
-		macro_open(f, "No");
-	f->flags |= FMT_IMPL;
-
-	/*
-	 * Keep on printing text separated by the vertical bar as long
-	 * as we're within the same origin node as the group.
-	 * This is kind of a nightmare.
-	 * Eh, DocBook...
-	 * FIXME: if there's a "Fl", we don't cut off the leading "-"
-	 * like we do in pnode_print().
-	 */
+	} else if (isrep) {
+		if (f->flags & FMT_IMPL) {
+			was_impl = 1;
+			macro_open(f, "Bro");
+		} else {
+			macro_open(f, "Brq");
+			f->flags |= FMT_IMPL;
+		}
+	}
+	bar = 0;
 	TAILQ_FOREACH(nc, &n->childq, child) {
-		pnode_print(f, nc);
-		nn = TAILQ_NEXT(nc, child);
-		while (nn != NULL) {
-			if (nc->node != nn->node)
-				break;
+		if (bar && f->linestate == LINE_MACRO)
 			macro_addarg(f, "|", ARG_SPACE);
-			macro_addnode(f, nn, ARG_SPACE);
-			nc = nn;
-			nn = TAILQ_NEXT(nn, child);
-		}
+		pnode_print(f, nc);
+		bar = 1;
 	}
-	if (sv)
-		macro_close(f);
-	f->flags &= ~FMT_IMPL;
+	if (isop) {
+		if (was_impl)
+			macro_open(f, "Oc");
+		else
+			f->flags &= ~FMT_IMPL;
+	} else if (isrep) {
+		if (was_impl)
+			macro_open(f, "Brc");
+		else
+			f->flags &= ~FMT_IMPL;
+	}
+	if (isrep && f->linestate == LINE_MACRO)
+		macro_addarg(f, "...", ARG_SPACE);
 	pnode_unlinksub(n);
 }
 
 static void
+pnode_printsystemitem(struct format *f, struct pnode *n)
+{
+	switch (pnode_getattr(n, ATTRKEY_CLASS)) {
+	case ATTRVAL_IPADDRESS:
+		break;
+	case ATTRVAL_SYSTEMNAME:
+		macro_open(f, "Pa");
+		break;
+	case ATTRVAL_EVENT:
+	default:
+		macro_open(f, "Sy");
+		break;
+	}
+}
+
+static void
 pnode_printauthor(struct format *f, struct pnode *n)
 {
 	struct pnode	*nc, *nn;
@@ -658,24 +650,73 @@ pnode_printlink(struct format *f, struct pnode *n)
 }
 
 static void
-pnode_printprologue(struct format *f, struct ptree *tree)
+pnode_printprologue(struct format *f, struct pnode *root)
 {
-	struct pnode	*refmeta;
+	struct pnode	*date, *refmeta, *name, *vol, *descr, *nc;
+	const char	*sname;
 
-	refmeta = tree->root == NULL ? NULL :
-	    pnode_findfirst(tree->root, NODE_REFMETA);
+	/* Collect information. */
 
-	macro_line(f, "Dd $Mdocdate" "$");
-	if (refmeta == NULL) {
-		macro_open(f, "Dt");
-		macro_addarg(f,
-		    pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"),
-		    ARG_SPACE | ARG_SINGLE | ARG_UPPER);
-		macro_addarg(f, "1", ARG_SPACE);
-		macro_close(f);
+	if ((date = pnode_takefirst(root, NODE_PUBDATE)) == NULL)
+		date = pnode_takefirst(root, NODE_DATE);
+
+	name = vol = NULL;
+	if ((refmeta = pnode_takefirst(root, NODE_REFMETA)) != NULL) {
+		TAILQ_FOREACH(nc, &refmeta->childq, child) {
+			switch (nc->node) {
+			case NODE_REFENTRYTITLE:
+				name = nc;
+				break;
+			case NODE_MANVOLNUM:
+				vol = nc;
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
+	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
-		pnode_printrefmeta(f, refmeta);
+		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);
+
 	macro_line(f, "Os");
+
+	if (descr != NULL) {
+		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);
+	}
+
+	/* Clean up. */
+
+	pnode_unlink(date);
+	pnode_unlink(refmeta);
+	pnode_unlink(descr);
 }
 
 /*
@@ -876,9 +917,6 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_BLOCKQUOTE:
 		macro_line(f, "Bd -ragged -offset indent");
 		break;
-	case NODE_BOOKINFO:
-		macro_line(f, "Sh NAME");
-		break;
 	case NODE_CITEREFENTRY:
 		pnode_printciterefentry(f, n);
 		break;
@@ -1005,6 +1043,9 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_SYNOPSIS:
 		macro_line(f, "Bd -literal");
 		break;
+	case NODE_SYSTEMITEM:
+		pnode_printsystemitem(f, n);
+		break;
 	case NODE_REFENTRYINFO:
 		/* Suppress. */
 		pnode_unlinksub(n);
@@ -1046,11 +1087,6 @@ pnode_print(struct format *f, struct pnode *n)
 		pnode_printtgroup(f, n);
 		break;
 	case NODE_TITLE:
-		if (n->parent != NULL &&
-		    n->parent->node == NODE_BOOKINFO) {
-			macro_open(f, "Nd");
-			break;
-		}
 		pnode_printpara(f, n);
 		macro_nodeline(f, "Sy", n, 0);
 		pnode_unlinksub(n);
@@ -1148,11 +1184,6 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_SYNOPSIS:
 		macro_line(f, "Ed");
 		break;
-	case NODE_TITLE:
-		if (n->parent != NULL &&
-		    n->parent->node == NODE_BOOKINFO)
-			macro_line(f, "Sh AUTHORS");
-		break;
 	default:
 		break;
 	}
@@ -1166,7 +1197,7 @@ ptree_print_mdoc(struct ptree *tree)
 
 	formatter.level = 0;
 	formatter.linestate = LINE_NEW;
-	pnode_printprologue(&formatter, tree);
+	pnode_printprologue(&formatter, tree->root);
 	pnode_print(&formatter, tree->root);
 	if (formatter.linestate != LINE_NEW)
 		putchar('\n');