===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.118
retrieving revision 1.132
diff -u -p -r1.118 -r1.132
--- docbook2mdoc/docbook2mdoc.c	2019/04/13 15:54:45	1.118
+++ docbook2mdoc/docbook2mdoc.c	2019/04/21 14:48:11	1.132
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.118 2019/04/13 15:54:45 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.132 2019/04/21 14:48:11 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -30,6 +30,7 @@
  */
 
 static void	 pnode_print(struct format *, struct pnode *);
+static void	 pnode_printrefentry(struct format *, struct pnode *);
 
 
 static void
@@ -125,35 +126,18 @@ pnode_printtext(struct format *f, struct pnode *n)
 }
 
 static void
-pnode_printpara(struct format *f, struct pnode *n)
+pnode_printimagedata(struct format *f, struct pnode *n)
 {
-	struct pnode	*np;
+	const char	*cp;
 
-	if (n->parent == NULL)
-		return;
-
-	if ((np = TAILQ_PREV(n, pnodeq, child)) == NULL)
-	    np = n->parent;
-
-	f->flags = 0;
-
-	switch (np->node) {
-	case NODE_ENTRY:
-	case NODE_GLOSSTERM:
-	case NODE_LISTITEM:
-	case NODE_TERM:
-		return;
-	case NODE_APPENDIX:
-	case NODE_LEGALNOTICE:
-	case NODE_PREFACE:
-	case NODE_SECTION:
-		if (f->level < 3)
-			return;
-		break;
-	default:
-		break;
-	}
-	macro_line(f, "Pp");
+	if ((cp = pnode_getattr_raw(n, ATTRKEY_FILEREF, NULL)) == NULL)
+		cp = pnode_getattr_raw(n, ATTRKEY_ENTITYREF, NULL);
+	if (cp != NULL) {
+		print_text(f, "[image:", ARG_SPACE);
+		print_text(f, cp, ARG_SPACE);
+		print_text(f, "]", 0);
+	} else
+		print_text(f, "[image]", ARG_SPACE);
 }
 
 static void
@@ -162,7 +146,9 @@ pnode_printrefnamediv(struct format *f, struct pnode *
 	struct pnode	*nc, *nn;
 	int		 comma;
 
+	f->parastate = PARA_HAVE;
 	macro_line(f, "Sh NAME");
+	f->parastate = PARA_HAVE;
 	comma = 0;
 	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
 		if (nc->node != NODE_REFNAME)
@@ -189,37 +175,44 @@ pnode_printrefsynopsisdiv(struct format *f, struct pno
 		if (nc->node == NODE_TITLE)
 			pnode_unlink(nc);
 
+	f->parastate = PARA_HAVE;
 	macro_line(f, "Sh SYNOPSIS");
+	f->parastate = PARA_HAVE;
 }
 
 /*
  * Start a hopefully-named `Sh' section.
  */
 static void
-pnode_printrefsect(struct format *f, struct pnode *n)
+pnode_printsection(struct format *f, struct pnode *n)
 {
 	struct pnode	*nc, *ncc;
 	const char	*title;
 	int		 flags, level;
 
-	if (n->parent == NULL)
+	if (n->parent == NULL) {
+		pnode_printrefentry(f, n);
 		return;
+	}
 
 	level = ++f->level;
 	flags = ARG_SPACE;
-	if (level == 1)
-		flags |= ARG_UPPER;
-	if (level < 3) {
-		switch (n->node) {
-		case NODE_CAUTION:
-		case NODE_NOTE:
-		case NODE_TIP:
-		case NODE_WARNING:
+	switch (n->node) {
+	case NODE_PREFACE:
+	case NODE_SECTION:
+	case NODE_APPENDIX:
+		if (level == 1)
+			flags |= ARG_UPPER;
+		break;
+	case NODE_SIMPLESECT:
+	case NODE_LEGALNOTICE:
+		if (level < 2)
+			level = 2;
+		break;
+	default:
+		if (level < 3)
 			level = 3;
-			break;
-		default:
-			break;
-		}
+		break;
 	}
 
 	TAILQ_FOREACH(nc, &n->childq, child)
@@ -258,14 +251,17 @@ pnode_printrefsect(struct format *f, struct pnode *n)
 	switch (level) {
 	case 1:
 		macro_close(f);
+		f->parastate = PARA_HAVE;
 		macro_open(f, "Sh");
 		break;
 	case 2:
 		macro_close(f);
+		f->parastate = PARA_HAVE;
 		macro_open(f, "Ss");
 		break;
 	default:
-		pnode_printpara(f, n);
+		if (f->parastate == PARA_MID)
+			f->parastate = PARA_WANT;
 		macro_open(f, "Sy");
 		break;
 	}
@@ -282,12 +278,14 @@ pnode_printrefsect(struct format *f, struct pnode *n)
 	 */
 
 	if (nc != NULL) {
-		ncc = TAILQ_FIRST(&nc->childq);
-		if (ncc != NULL && ncc->node == NODE_TEXT &&
+		if (level == 1 &&
+		    (ncc = TAILQ_FIRST(&nc->childq)) != NULL &&
+		    ncc->node == NODE_TEXT &&
 		    strcasecmp(ncc->b, "AUTHORS") == 0)
 			macro_line(f, "An -nosplit");
 		pnode_unlink(nc);
 	}
+	f->parastate = level > 2 ? PARA_WANT : PARA_HAVE;
 }
 
 /*
@@ -317,20 +315,6 @@ pnode_printciterefentry(struct format *f, struct pnode
 	pnode_unlinksub(n);
 }
 
-static void
-pnode_printfuncdef(struct format *f, struct pnode *n)
-{
-	struct pnode	*nc;
-
-	nc = TAILQ_FIRST(&n->childq);
-	if (nc != NULL && nc->node == NODE_TEXT) {
-		macro_argline(f, "Ft", nc->b);
-		pnode_unlink(nc);
-	}
-	macro_nodeline(f, "Fo", n, ARG_SINGLE);
-	pnode_unlinksub(n);
-}
-
 /*
  * The <mml:mfenced> node is a little peculiar.
  * First, it can have arbitrary open and closing tokens, which default
@@ -391,23 +375,65 @@ pnode_printmath(struct format *f, struct pnode *n)
 static void
 pnode_printfuncprototype(struct format *f, struct pnode *n)
 {
-	struct pnode	*nc, *fdef;
+	struct pnode	*fdef, *ftype, *nc, *nn;
 
-	TAILQ_FOREACH(fdef, &n->childq, child)
-		if (fdef->node == NODE_FUNCDEF)
+	/*
+	 * Extract <funcdef> child and ignore <void> child.
+	 * Leave other children in place, to be treated as parameters.
+	 */
+
+	fdef = NULL;
+	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
+		switch (nc->node) {
+		case NODE_FUNCDEF:
+			if (fdef == NULL) {
+				fdef = nc;
+				TAILQ_REMOVE(&n->childq, nc, child);
+				nc->parent = NULL;
+			}
 			break;
+		case NODE_VOID:
+			pnode_unlink(nc);
+			break;
+		default:
+			break;
+		}
+	}
 
+	/*
+	 * If no children are left, the function is void; use .Fn.
+	 * Otherwise, use .Fo.
+	 */
+
+	nc = TAILQ_FIRST(&n->childq);
 	if (fdef != NULL) {
-		pnode_printfuncdef(f, fdef);
+		ftype = TAILQ_FIRST(&fdef->childq);
+		if (ftype != NULL && ftype->node == NODE_TEXT) {
+			macro_argline(f, "Ft", ftype->b);
+			pnode_unlink(ftype);
+		}
+		if (nc == NULL) {
+			macro_open(f, "Fn");
+			macro_addnode(f, fdef, ARG_SPACE | ARG_SINGLE);
+			macro_addarg(f, "void", ARG_SPACE);
+			macro_close(f);
+		} else
+			macro_nodeline(f, "Fo", fdef, ARG_SINGLE);
 		pnode_unlink(fdef);
-	} else
+	} else if (nc == NULL)
+		macro_line(f, "Fn UNKNOWN void");
+	else
 		macro_line(f, "Fo UNKNOWN");
 
-	TAILQ_FOREACH(nc, &n->childq, child)
-		macro_nodeline(f, "Fa", nc, ARG_SINGLE);
+	if (nc == NULL)
+		return;
 
+	while (nc != NULL) {
+		macro_nodeline(f, "Fa", nc, ARG_SINGLE);
+		pnode_unlink(nc);
+		nc = TAILQ_FIRST(&n->childq);
+	}
 	macro_line(f, "Fc");
-	pnode_unlinksub(n);
 }
 
 /*
@@ -603,6 +629,18 @@ pnode_printauthor(struct format *f, struct pnode *n)
 }
 
 static void
+pnode_printxref(struct format *f, struct pnode *n)
+{
+	const char	*linkend;
+
+	linkend = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL);
+	if (linkend != NULL) {
+		macro_open(f, "Sx");
+		macro_addarg(f, linkend, ARG_SPACE);
+	}
+}
+
+static void
 pnode_printlink(struct format *f, struct pnode *n)
 {
 	struct pnode	*nc;
@@ -645,14 +683,46 @@ pnode_printlink(struct format *f, struct pnode *n)
 		if (TAILQ_FIRST(&n->childq) != NULL)
 			macro_addnode(f, n, ARG_SPACE | ARG_SINGLE);
 		pnode_unlinksub(n);
+	}
+}
+
+static void
+pnode_printolink(struct format *f, struct pnode *n)
+{
+	const char	*uri, *ptr, *local;
+
+	uri = pnode_getattr_raw(n, ATTRKEY_TARGETDOC, NULL);
+	ptr = pnode_getattr_raw(n, ATTRKEY_TARGETPTR, NULL);
+	local = pnode_getattr_raw(n, ATTRKEY_LOCALINFO, NULL);
+	if (uri == NULL) {
+		uri = ptr;
+		ptr = NULL;
+	}
+	if (uri == NULL) {
+		uri = local;
+		local = NULL;
+	}
+	if (uri == NULL)
 		return;
+
+	macro_open(f, "Lk");
+	macro_addarg(f, uri, ARG_SPACE | ARG_SINGLE);
+	macro_addnode(f, n, ARG_SPACE | ARG_SINGLE);
+	if (ptr != NULL || local != NULL) {
+		macro_close(f);
+		macro_open(f, "Pq");
+		if (ptr != NULL)
+			macro_addarg(f, ptr, ARG_SPACE);
+		if (local != NULL)
+			macro_addarg(f, local, ARG_SPACE);
 	}
+	pnode_unlinksub(n);
 }
 
 static void
 pnode_printprologue(struct format *f, struct pnode *root)
 {
-	struct pnode	*date, *refmeta, *name, *vol, *descr, *nc;
+	struct pnode	*date, *refmeta, *name, *vol, *descr, *nc, *nn;
 	const char	*sname;
 
 	/* Collect information. */
@@ -661,8 +731,8 @@ pnode_printprologue(struct format *f, struct pnode *ro
 		date = pnode_takefirst(root, NODE_DATE);
 
 	name = vol = NULL;
-	if ((refmeta = pnode_takefirst(root, NODE_REFMETA)) != NULL) {
-		TAILQ_FOREACH(nc, &refmeta->childq, child) {
+	if ((refmeta = pnode_findfirst(root, NODE_REFMETA)) != NULL) {
+		TAILQ_FOREACH_SAFE(nc, &refmeta->childq, child, nn) {
 			switch (nc->node) {
 			case NODE_REFENTRYTITLE:
 				name = nc;
@@ -671,8 +741,9 @@ pnode_printprologue(struct format *f, struct pnode *ro
 				vol = nc;
 				break;
 			default:
-				break;
+				continue;
 			}
+			TAILQ_REMOVE(&refmeta->childq, nc, child);
 		}
 	}
 
@@ -715,10 +786,142 @@ pnode_printprologue(struct format *f, struct pnode *ro
 	/* Clean up. */
 
 	pnode_unlink(date);
-	pnode_unlink(refmeta);
+	pnode_unlink(name);
+	pnode_unlink(vol);
 	pnode_unlink(descr);
+	f->parastate = PARA_HAVE;
 }
 
+static void
+pnode_printrefentry(struct format *f, struct pnode *n)
+{
+	struct pnode	*info, *meta, *nc, *title;
+	struct pnode	*match, *later;
+
+	/* Collect nodes that remained behind when writing the prologue. */
+
+	meta = NULL;
+	info = pnode_takefirst(n, NODE_BOOKINFO);
+	if (info != NULL && TAILQ_FIRST(&info->childq) == NULL) {
+		pnode_unlink(info);
+		info = NULL;
+	}
+	if (info == NULL) {
+		info = pnode_takefirst(n, NODE_REFENTRYINFO);
+		if (info != NULL && TAILQ_FIRST(&info->childq) == NULL) {
+			pnode_unlink(info);
+			info = NULL;
+		}
+		meta = pnode_takefirst(n, NODE_REFMETA);
+		if (meta != NULL && TAILQ_FIRST(&meta->childq) == NULL) {
+			pnode_unlink(meta);
+			meta = NULL;
+		}
+	}
+	if (info == NULL && meta == NULL)
+		return;
+
+	/*
+	 * Find the best place to put this information.
+	 * Use the last existing AUTHORS node, if any.
+	 * Otherwise, put it behind all standard sections that
+	 * conventionally precede AUTHORS, and also behind any
+	 * non-standard sections that follow the last of these,
+	 * but before the next standard section.
+	 */
+
+	match = later = NULL;
+	TAILQ_FOREACH(nc, &n->childq, child) {
+		switch (nc->node) {
+		case NODE_REFENTRY:
+		case NODE_REFNAMEDIV:
+		case NODE_REFSYNOPSISDIV:
+		case NODE_PREFACE:
+			later = NULL;
+			continue;
+		case NODE_APPENDIX:
+		case NODE_INDEX:
+			if (later == NULL)
+				later = nc;
+			continue;
+		default:
+			break;
+		}
+		if ((title = pnode_findfirst(nc, NODE_TITLE)) == NULL ||
+		    (title = TAILQ_FIRST(&title->childq)) == NULL ||
+		    title->node != NODE_TEXT)
+			continue;
+		if (strcasecmp(title->b, "AUTHORS") == 0 ||
+		    strcasecmp(title->b, "AUTHOR") == 0)
+			match = nc;
+		else if (strcasecmp(title->b, "NAME") == 0 ||
+		    strcasecmp(title->b, "SYNOPSIS") == 0 ||
+		    strcasecmp(title->b, "DESCRIPTION") == 0 ||
+		    strcasecmp(title->b, "RETURN VALUES") == 0 ||
+		    strcasecmp(title->b, "ENVIRONMENT") == 0 ||
+		    strcasecmp(title->b, "FILES") == 0 ||
+		    strcasecmp(title->b, "EXIT STATUS") == 0 ||
+		    strcasecmp(title->b, "EXAMPLES") == 0 ||
+		    strcasecmp(title->b, "DIAGNOSTICS") == 0 ||
+		    strcasecmp(title->b, "ERRORS") == 0 ||
+		    strcasecmp(title->b, "SEE ALSO") == 0 ||
+		    strcasecmp(title->b, "STANDARDS") == 0 ||
+		    strcasecmp(title->b, "HISTORY") == 0)
+			later = NULL;
+		else if ((strcasecmp(title->b, "CAVEATS") == 0 ||
+		    strcasecmp(title->b, "BUGS") == 0) &&
+		    later == NULL)
+			later = nc;
+	}
+
+	/*
+	 * If no AUTHORS section was found, create one from scratch,
+	 * and insert that at the place selected earlier.
+	 */
+
+	if (match == NULL) {
+		if ((match = calloc(1, sizeof(*match))) == NULL) {
+			perror(NULL);
+			exit(1);
+		}
+		match->node = NODE_SECTION;
+		match->spc = 1;
+		match->parent = n;
+		TAILQ_INIT(&match->childq);
+		TAILQ_INIT(&match->attrq);
+		if ((nc = pnode_alloc(match)) == NULL) {
+			perror(NULL);
+			exit(1);
+		}
+		nc->node = NODE_TITLE;
+		nc->spc = 1;
+		if ((nc = pnode_alloc(nc)) == NULL) {
+			perror(NULL);
+			exit(1);
+		}
+		nc->node = NODE_TEXT;
+		if ((nc->b = strdup("AUTHORS")) == NULL) {
+			perror(NULL);
+			exit(1);
+		}
+		nc->spc = 1;
+		if (later == NULL)
+			TAILQ_INSERT_TAIL(&n->childq, match, child);
+		else
+			TAILQ_INSERT_BEFORE(later, match, child);
+	}
+
+	/*
+	 * Dump the stuff excised at the beginning
+	 * into this AUTHORS section.
+	 */
+
+	if (info != NULL)
+		TAILQ_INSERT_TAIL(&match->childq, info, child);
+	if (meta != NULL)
+		TAILQ_INSERT_TAIL(&match->childq, meta, child);
+}
+
 /*
  * We can have multiple <term> elements within a <varlistentry>, which
  * we should comma-separate as list headers.
@@ -730,6 +933,7 @@ pnode_printvarlistentry(struct format *f, struct pnode
 	int		 first = 1;
 
 	macro_open(f, "It");
+	f->parastate = PARA_HAVE;
 	f->flags |= FMT_IMPL;
 	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
 		if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM)
@@ -746,16 +950,19 @@ pnode_printvarlistentry(struct format *f, struct pnode
 				break;
 			}
 		}
+		f->parastate = PARA_HAVE;
 		pnode_print(f, nc);
 		pnode_unlink(nc);
 		first = 0;
 	}
 	macro_close(f);
+	f->parastate = PARA_HAVE;
 	while ((nc = TAILQ_FIRST(&n->childq)) != NULL) {
 		pnode_print(f, nc);
 		pnode_unlink(nc);
 	}
 	macro_close(f);
+	f->parastate = PARA_HAVE;
 }
 
 static void
@@ -765,8 +972,9 @@ pnode_printtitle(struct format *f, struct pnode *n)
 
 	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
 		if (nc->node == NODE_TITLE) {
-			pnode_printpara(f, nc);
-			pnode_print(f, nc);
+			if (f->parastate == PARA_MID)
+				f->parastate = PARA_WANT;
+			macro_nodeline(f, "Sy", nc, 0);
 			pnode_unlink(nc);
 		}
 	}
@@ -794,7 +1002,9 @@ pnode_printtgroup1(struct format *f, struct pnode *n)
 	macro_line(f, "Bl -bullet -compact");
 	while ((nc = pnode_findfirst(n, NODE_ENTRY)) != NULL) {
 		macro_line(f, "It");
+		f->parastate = PARA_HAVE;
 		pnode_print(f, nc);
+		f->parastate = PARA_HAVE;
 		pnode_unlink(nc);
 	}
 	macro_line(f, "El");
@@ -806,16 +1016,20 @@ pnode_printtgroup2(struct format *f, struct pnode *n)
 {
 	struct pnode	*nr, *ne;
 
+	f->parastate = PARA_HAVE;
 	macro_line(f, "Bl -tag -width Ds");
 	while ((nr = pnode_findfirst(n, NODE_ROW)) != NULL) {
 		if ((ne = pnode_findfirst(n, NODE_ENTRY)) == NULL)
 			break;
 		macro_open(f, "It");
 		f->flags |= FMT_IMPL;
+		f->parastate = PARA_HAVE;
 		pnode_print(f, ne);
 		macro_close(f);
 		pnode_unlink(ne);
+		f->parastate = PARA_HAVE;
 		pnode_print(f, nr);
+		f->parastate = PARA_HAVE;
 		pnode_unlink(nr);
 	}
 	macro_line(f, "El");
@@ -838,6 +1052,7 @@ pnode_printtgroup(struct format *f, struct pnode *n)
 		break;
 	}
 
+	f->parastate = PARA_HAVE;
 	macro_line(f, "Bl -ohang");
 	while ((nc = pnode_findfirst(n, NODE_ROW)) != NULL) {
 		macro_line(f, "It Table Row");
@@ -853,11 +1068,14 @@ pnode_printlist(struct format *f, struct pnode *n)
 	struct pnode	*nc;
 
 	pnode_printtitle(f, n);
+	f->parastate = PARA_HAVE;
 	macro_argline(f, "Bl",
 	    n->node == NODE_ORDEREDLIST ? "-enum" : "-bullet");
 	TAILQ_FOREACH(nc, &n->childq, child) {
 		macro_line(f, "It");
+		f->parastate = PARA_HAVE;
 		pnode_print(f, nc);
+		f->parastate = PARA_HAVE;
 	}
 	macro_line(f, "El");
 	pnode_unlinksub(n);
@@ -869,6 +1087,7 @@ pnode_printvariablelist(struct format *f, struct pnode
 	struct pnode	*nc;
 
 	pnode_printtitle(f, n);
+	f->parastate = PARA_HAVE;
 	macro_line(f, "Bl -tag -width Ds");
 	TAILQ_FOREACH(nc, &n->childq, child) {
 		if (nc->node == NODE_VARLISTENTRY)
@@ -902,9 +1121,6 @@ pnode_print(struct format *f, struct pnode *n)
 		f->flags |= FMT_NOSPC;
 
 	switch (n->node) {
-	case NODE_APPLICATION:
-		macro_open(f, "Nm");
-		break;
 	case NODE_ARG:
 		pnode_printarg(f, n);
 		break;
@@ -915,7 +1131,9 @@ pnode_print(struct format *f, struct pnode *n)
 		macro_line(f, "An -split");
 		break;
 	case NODE_BLOCKQUOTE:
+		f->parastate = PARA_HAVE;
 		macro_line(f, "Bd -ragged -offset indent");
+		f->parastate = PARA_HAVE;
 		break;
 	case NODE_CITEREFENTRY:
 		pnode_printciterefentry(f, n);
@@ -929,9 +1147,13 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_CONSTANT:
 		macro_open(f, "Dv");
 		break;
+	case NODE_COPYRIGHT:
+		print_text(f, "Copyright", ARG_SPACE);
+		fputs(" \\(co", stdout);
+		break;
 	case NODE_EDITOR:
 		print_text(f, "editor:", ARG_SPACE);
-		macro_open(f, "An");
+		pnode_printauthor(f, n);
 		break;
 	case NODE_EMAIL:
 		if (was_impl)
@@ -944,7 +1166,11 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_EMPHASIS:
 	case NODE_FIRSTTERM:
 	case NODE_GLOSSTERM:
-		macro_open(f, "Em");
+		if ((nc = TAILQ_FIRST(&n->childq)) != NULL &&
+		    pnode_class(nc->node) < CLASS_LINE)
+			macro_open(f, "Em");
+		if (n->node == NODE_GLOSSTERM)
+			f->parastate = PARA_HAVE;
 		break;
 	case NODE_ENVAR:
 		macro_open(f, "Ev");
@@ -955,6 +1181,10 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_FILENAME:
 		macro_open(f, "Pa");
 		break;
+	case NODE_FOOTNOTE:
+		macro_line(f, "Bo");
+		f->parastate = PARA_HAVE;
+		break;
 	case NODE_FUNCTION:
 		macro_open(f, "Fn");
 		break;
@@ -964,8 +1194,13 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_FUNCSYNOPSISINFO:
 		macro_open(f, "Fd");
 		break;
+	case NODE_IMAGEDATA:
+		pnode_printimagedata(f, n);
+		break;
 	case NODE_INFORMALEQUATION:
+		f->parastate = PARA_HAVE;
 		macro_line(f, "Bd -ragged -offset indent");
+		f->parastate = PARA_HAVE;
 		/* FALLTHROUGH */
 	case NODE_INLINEEQUATION:
 		macro_line(f, "EQ");
@@ -977,14 +1212,17 @@ pnode_print(struct format *f, struct pnode *n)
 		pnode_printgroup(f, n);
 		break;
 	case NODE_KEYSYM:
+	case NODE_PRODUCTNAME:
 		macro_open(f, "Sy");
 		break;
 	case NODE_LINK:
 		pnode_printlink(f, n);
 		break;
 	case NODE_LITERAL:
-		if (was_impl)
-			macro_open(f, "So");
+		if (n->parent != NULL && n->parent->node == NODE_QUOTE)
+			macro_open(f, "Li");
+		else if (was_impl)
+			macro_open(f, "So Li");
 		else {
 			macro_open(f, "Ql");
 			f->flags |= FMT_IMPL;
@@ -992,8 +1230,10 @@ pnode_print(struct format *f, struct pnode *n)
 		break;
 	case NODE_LITERALLAYOUT:
 		macro_close(f);
+		f->parastate = PARA_HAVE;
 		macro_argline(f, "Bd", pnode_getattr(n, ATTRKEY_CLASS) ==
 		    ATTRVAL_MONOSPACED ? "-literal" : "-unfilled");
+		f->parastate = PARA_HAVE;
 		break;
 	case NODE_MARKUP:
 		macro_open(f, "Ic");
@@ -1014,14 +1254,20 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_MML_MSUP:
 		pnode_printmath(f, n);
 		break;
+	case NODE_OLINK:
+		pnode_printolink(f, n);
+		break;
 	case NODE_OPTION:
-		macro_open(f, "Fl");
+		if ((nc = TAILQ_FIRST(&n->childq)) != NULL &&
+		    pnode_class(nc->node) < CLASS_LINE)
+			macro_open(f, "Fl");
 		break;
 	case NODE_ORDEREDLIST:
 		pnode_printlist(f, n);
 		break;
 	case NODE_PARA:
-		pnode_printpara(f, n);
+		if (f->parastate == PARA_MID)
+			f->parastate = PARA_WANT;
 		break;
 	case NODE_PARAMDEF:
 	case NODE_PARAMETER:
@@ -1031,7 +1277,12 @@ pnode_print(struct format *f, struct pnode *n)
 		pnode_unlinksub(n);
 		break;
 	case NODE_QUOTE:
-		if (was_impl)
+		if ((nc = TAILQ_FIRST(&n->childq)) != NULL &&
+		    nc->node == NODE_FILENAME &&
+		    TAILQ_NEXT(nc, child) == NULL) {
+			if (n->spc)
+				nc->spc = 1;
+		} else if (was_impl)
 			macro_open(f, "Do");
 		else {
 			macro_open(f, "Dq");
@@ -1041,14 +1292,15 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_PROGRAMLISTING:
 	case NODE_SCREEN:
 	case NODE_SYNOPSIS:
+		f->parastate = PARA_HAVE;
 		macro_line(f, "Bd -literal");
+		f->parastate = PARA_HAVE;
 		break;
 	case NODE_SYSTEMITEM:
 		pnode_printsystemitem(f, n);
 		break;
-	case NODE_REFENTRYINFO:
-		/* Suppress. */
-		pnode_unlinksub(n);
+	case NODE_REFENTRY:
+		pnode_printrefentry(f, n);
 		break;
 	case NODE_REFNAME:
 		/* More often, these appear inside NODE_REFNAMEDIV. */
@@ -1065,20 +1317,35 @@ pnode_print(struct format *f, struct pnode *n)
 		break;
 	case NODE_PREFACE:
 	case NODE_SECTION:
+	case NODE_SIMPLESECT:
 	case NODE_APPENDIX:
 	case NODE_LEGALNOTICE:
 	case NODE_NOTE:
 	case NODE_TIP:
 	case NODE_CAUTION:
 	case NODE_WARNING:
-		pnode_printrefsect(f, n);
+		pnode_printsection(f, n);
 		break;
 	case NODE_REPLACEABLE:
 		macro_open(f, "Ar");
 		break;
 	case NODE_SBR:
-		macro_line(f, "br");
+		if (f->parastate == PARA_MID)
+			macro_line(f, "br");
 		break;
+	case NODE_SUBSCRIPT:
+		if (f->linestate == LINE_MACRO)
+			macro_addarg(f, "_", 0);
+		else
+			print_text(f, "_", 0);
+		if ((nc = TAILQ_FIRST(&n->childq)) != NULL)
+			nc->spc = 0;
+		break;
+	case NODE_SUPERSCRIPT:
+		fputs("\\(ha", stdout);
+		if ((nc = TAILQ_FIRST(&n->childq)) != NULL)
+			nc->spc = 0;
+		break;
 	case NODE_TEXT:
 	case NODE_ESCAPE:
 		pnode_printtext(f, n);
@@ -1087,7 +1354,9 @@ pnode_print(struct format *f, struct pnode *n)
 		pnode_printtgroup(f, n);
 		break;
 	case NODE_TITLE:
-		pnode_printpara(f, n);
+	case NODE_SUBTITLE:
+		if (f->parastate == PARA_MID)
+			f->parastate = PARA_WANT;
 		macro_nodeline(f, "Sy", n, 0);
 		pnode_unlinksub(n);
 		break;
@@ -1100,6 +1369,12 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_VARNAME:
 		macro_open(f, "Va");
 		break;
+	case NODE_VOID:
+		print_text(f, "void", ARG_SPACE);
+		break;
+	case NODE_XREF:
+		pnode_printxref(f, n);
+		break;
 	default:
 		break;
 	}
@@ -1120,6 +1395,13 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_TEXT:
 		/* Accept more arguments to the previous macro. */
 		return;
+	case NODE_FOOTNOTE:
+		f->parastate = PARA_HAVE;
+		macro_line(f, "Bc");
+		break;
+	case NODE_GLOSSTERM:
+		f->parastate = PARA_HAVE;
+		break;
 	case NODE_INFORMALEQUATION:
 		macro_line(f, "EN");
 		macro_line(f, "Ed");
@@ -1128,7 +1410,9 @@ pnode_print(struct format *f, struct pnode *n)
 		macro_line(f, "EN");
 		break;
 	case NODE_LITERAL:
-		if (was_impl) {
+		if (n->parent != NULL && n->parent->node == NODE_QUOTE)
+			/* nothing */;
+		else if (was_impl) {
 			f->flags &= ~FMT_NOSPC;
 			macro_open(f, "Sc");
 		} else
@@ -1160,8 +1444,16 @@ pnode_print(struct format *f, struct pnode *n)
 			break;
 		fputs(" } ", stdout);
 		break;
+	case NODE_PARA:
+		if (f->parastate == PARA_MID)
+			f->parastate = PARA_WANT;
+		break;
 	case NODE_QUOTE:
-		if (was_impl) {
+		if ((nc = TAILQ_FIRST(&n->childq)) != NULL &&
+		    nc->node == NODE_FILENAME &&
+		    TAILQ_NEXT(nc, child) == NULL)
+			/* nothing */;
+		else if (was_impl) {
 			f->flags &= ~FMT_NOSPC;
 			macro_open(f, "Dc");
 		} else
@@ -1182,8 +1474,13 @@ pnode_print(struct format *f, struct pnode *n)
 	case NODE_PROGRAMLISTING:
 	case NODE_SCREEN:
 	case NODE_SYNOPSIS:
+		f->parastate = PARA_HAVE;
 		macro_line(f, "Ed");
 		break;
+	case NODE_TITLE:
+	case NODE_SUBTITLE:
+		f->parastate = PARA_WANT;
+		break;
 	default:
 		break;
 	}
@@ -1197,6 +1494,7 @@ ptree_print_mdoc(struct ptree *tree)
 
 	formatter.level = 0;
 	formatter.linestate = LINE_NEW;
+	formatter.parastate = PARA_HAVE;
 	pnode_printprologue(&formatter, tree->root);
 	pnode_print(&formatter, tree->root);
 	if (formatter.linestate != LINE_NEW)