===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.58
retrieving revision 1.62
diff -u -p -r1.58 -r1.62
--- docbook2mdoc/docbook2mdoc.c	2019/03/22 16:50:54	1.58
+++ docbook2mdoc/docbook2mdoc.c	2019/03/22 17:42:53	1.62
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.58 2019/03/22 16:50:54 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.62 2019/03/22 17:42:53 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -77,6 +77,7 @@ struct	pnode {
 
 static	const char *attrkeys[ATTRKEY__MAX] = {
 	"choice",
+	"class",
 	"close",
 	"id",
 	"linkend",
@@ -85,6 +86,7 @@ static	const char *attrkeys[ATTRKEY__MAX] = {
 };
 
 static	const char *attrvals[ATTRVAL__MAX] = {
+	"monospaced",
 	"norepeat",
 	"opt",
 	"plain",
@@ -491,6 +493,37 @@ pnode_unlinksub(struct pnode *pn)
 }
 
 /*
+ * Retrieve an enumeration attribute from a node.
+ * Return ATTRVAL__MAX if the node has no such attribute.
+ */
+enum attrval
+pnode_getattr(struct pnode *pn, enum attrkey key)
+{
+	struct pattr	*ap;
+
+	TAILQ_FOREACH(ap, &pn->attrq, child)
+		if (ap->key == key)
+			return ap->val;
+	return(ATTRVAL__MAX);
+}
+
+/*
+ * Retrieve an attribute string from a node.
+ * Return defval if the node has no such attribute.
+ */
+const char *
+pnode_getattr_raw(struct pnode *pn, enum attrkey key, const char *defval)
+{
+	struct pattr	*ap;
+
+	TAILQ_FOREACH(ap, &pn->attrq, child)
+		if (ap->key == key)
+			return ATTRVAL__MAX == ap->val ? ap->rawval :
+			    attrvals[ap->val];
+	return(defval);
+}
+
+/*
  * Reset the lookaside buffer.
  */
 static void
@@ -687,15 +720,23 @@ pnode_printpara(struct parse *p, struct pnode *pn)
 	struct pnode	*pp;
 
 	assert(p->newln);
-	if (NULL == pn->parent || NODE_LISTITEM == pn->parent->node)
+	if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL &&
+	    (pp = pn->parent) == NULL)
 		return;
 
-	pp = TAILQ_PREV(pn, pnodeq, child);
-	if (NULL == pp)
-		pp = pn->parent;
-	if ((NODE_SECTION != pp->node && NODE_PREFACE != pp->node) ||
-	    2 < p->level)
-		puts(".Pp");
+	switch (pp->node) {
+	case NODE_ENTRY:
+	case NODE_LISTITEM:
+		return;
+	case NODE_PREFACE:
+	case NODE_SECTION:
+		if (p->level < 3)
+			return;
+		break;
+	default:
+		break;
+	}
+	puts(".Pp");
 }
 
 /*
@@ -730,10 +771,10 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 	flags = 1 == level ? MACROLINE_UPPER : 0;
 	if (3 > level) {
 		switch (pn->node) {
-		case (NODE_CAUTION):
-		case (NODE_NOTE):
-		case (NODE_TIP):
-		case (NODE_WARNING):
+		case NODE_CAUTION:
+		case NODE_NOTE:
+		case NODE_TIP:
+		case NODE_WARNING:
 			level = 3;
 			break;
 		default:
@@ -747,19 +788,19 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 
 	if (NULL == pp) {
 		switch (pn->node) {
-		case (NODE_PREFACE):
+		case NODE_PREFACE:
 			title = "Preface";
 			break;
-		case (NODE_CAUTION):
+		case NODE_CAUTION:
 			title = "Caution";
 			break;
-		case (NODE_NOTE):
+		case NODE_NOTE:
 			title = "Note";
 			break;
-		case (NODE_TIP):
+		case NODE_TIP:
 			title = "Tip";
 			break;
-		case (NODE_WARNING):
+		case NODE_WARNING:
 			title = "Warning";
 			break;
 		default:
@@ -769,10 +810,10 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 	}
 
 	switch (level) {
-	case (1):
+	case 1:
 		fputs(".Sh", stdout);
 		break;
-	case (2):
+	case 2:
 		fputs(".Ss", stdout);
 		break;
 	default:
@@ -911,15 +952,8 @@ static void
 pnode_printmathfenced(struct parse *p, struct pnode *pn)
 {
 	struct pnode	*pp;
-	struct pattr	*ap;
 
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ATTRKEY_OPEN == ap->key) {
-			printf("left %s ", ap->rawval);
-			break;
-		}
-	if (NULL == ap)
-		printf("left ( ");
+	printf("left %s ", pnode_getattr_raw(pn, ATTRKEY_OPEN, "("));
 
 	pp = TAILQ_FIRST(&pn->childq);
 	pnode_print(p, pp);
@@ -929,13 +963,7 @@ pnode_printmathfenced(struct parse *p, struct pnode *p
 		pnode_print(p, pp);
 	}
 
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ATTRKEY_CLOSE == ap->key) {
-			printf("right %s ", ap->rawval);
-			break;
-		}
-	if (NULL == ap)
-		printf("right ) ");
+	printf("right %s ", pnode_getattr_raw(pn, ATTRKEY_CLOSE, ")"));
 }
 
 /*
@@ -953,13 +981,13 @@ pnode_printmath(struct parse *p, struct pnode *pn)
 	pnode_print(p, pp);
 
 	switch (pn->node) {
-	case (NODE_MML_MSUP):
+	case NODE_MML_MSUP:
 		fputs(" sup ", stdout);
 		break;
-	case (NODE_MML_MFRAC):
+	case NODE_MML_MFRAC:
 		fputs(" over ", stdout);
 		break;
-	case (NODE_MML_MSUB):
+	case NODE_MML_MSUB:
 		fputs(" sub ", stdout);
 		break;
 	default:
@@ -1090,8 +1118,6 @@ static void
 pnode_printprologue(struct parse *p, struct pnode *pn)
 {
 	struct pnode	*pp;
-	struct pattr	*ap;
-	const char	*name;
 
 	pp = NULL == p->root ? NULL :
 		pnode_findfirst(p->root, NODE_REFMETA);
@@ -1100,16 +1126,9 @@ pnode_printprologue(struct parse *p, struct pnode *pn)
 	if (NULL != pp) {
 		pnode_printrefmeta(p, pp);
 		pnode_unlink(pp);
-	} else {
-		name = "UNKNOWN";
-		TAILQ_FOREACH(ap, &p->root->attrq, child) {
-			if (ATTRKEY_ID == ap->key) {
-				name = ap->rawval;
-				break;
-			}
-		}
-		printf(".Dt %s 1\n", name);
-	}
+	} else
+		printf(".Dt %s 1\n",
+		    pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN"));
 	puts(".Os");
 
 	if (PARSE_EQN & p->flags) {
@@ -1255,7 +1274,7 @@ static void
 pnode_print(struct parse *p, struct pnode *pn)
 {
 	struct pnode	*pp;
-	struct pattr	*ap;
+	const char	*ccp;
 	char		*cp;
 	int		 last, sv;
 
@@ -1264,150 +1283,151 @@ pnode_print(struct parse *p, struct pnode *pn)
 
 	sv = p->newln;
 
-	/* XXX fprintf(stderr, "NODE %s\n", nodes[pn->node].name); */
 	switch (pn->node) {
-	case (NODE_APPLICATION):
+	case NODE_APPLICATION:
 		pnode_printmopen(p);
 		fputs("Nm", stdout);
 		break;
-	case (NODE_ANCHOR):
+	case NODE_ANCHOR:
 		/* Don't print anything! */
 		return;
-	case (NODE_ARG):
+	case NODE_ARG:
 		pnode_printarg(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_AUTHOR):
+	case NODE_AUTHOR:
 		pnode_printmopen(p);
 		fputs("An", stdout);
 		break;
-	case (NODE_AUTHORGROUP):
+	case NODE_AUTHORGROUP:
 		assert(p->newln);
 		puts(".An -split");
 		break;
-	case (NODE_BOOKINFO):
+	case NODE_BOOKINFO:
 		assert(p->newln);
 		puts(".Sh NAME");
 		break;
-	case (NODE_CITEREFENTRY):
+	case NODE_CITEREFENTRY:
 		pnode_printmopen(p);
 		fputs("Xr", stdout);
 		pnode_printciterefentry(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_CODE):
+	case NODE_CODE:
 		pnode_printmopen(p);
 		fputs("Li", stdout);
 		break;
-	case (NODE_COMMAND):
+	case NODE_COMMAND:
 		pnode_printmopen(p);
 		fputs("Nm", stdout);
 		break;
-	case (NODE_CONSTANT):
+	case NODE_CONSTANT:
 		pnode_printmopen(p);
 		fputs("Dv", stdout);
 		break;
-	case (NODE_EDITOR):
+	case NODE_EDITOR:
 		puts("editor: ");
 		pnode_printmopen(p);
 		fputs("An", stdout);
 		break;
-	case (NODE_EMPHASIS):
-	case (NODE_FIRSTTERM):
+	case NODE_EMPHASIS:
+	case NODE_FIRSTTERM:
 		pnode_printmopen(p);
 		fputs("Em", stdout);
 		break;
-	case (NODE_ENVAR):
+	case NODE_ENVAR:
 		pnode_printmopen(p);
 		fputs("Ev", stdout);
 		break;
-	case (NODE_FILENAME):
+	case NODE_FILENAME:
 		pnode_printmopen(p);
 		fputs("Pa", stdout);
 		break;
-	case (NODE_FUNCTION):
+	case NODE_FUNCTION:
 		pnode_printmopen(p);
 		fputs("Fn", stdout);
 		break;
-	case (NODE_FUNCPROTOTYPE):
+	case NODE_FUNCPROTOTYPE:
 		assert(p->newln);
 		pnode_printfuncprototype(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_FUNCSYNOPSISINFO):
+	case NODE_FUNCSYNOPSISINFO:
 		pnode_printmopen(p);
 		fputs("Fd", stdout);
 		break;
-	case (NODE_INDEXTERM):
+	case NODE_INDEXTERM:
 		return;
-	case (NODE_INFORMALEQUATION):
+	case NODE_INFORMALEQUATION:
 		if ( ! p->newln)
 			putchar('\n');
 		puts(".EQ");
 		p->newln = 0;
 		break;
-	case (NODE_INLINEEQUATION):
+	case NODE_INLINEEQUATION:
 		fputc('$', stdout);
 		p->newln = 0;
 		break;
-	case (NODE_ITEMIZEDLIST):
+	case NODE_ITEMIZEDLIST:
 		assert(p->newln);
 		pnode_printlist(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_GROUP):
+	case NODE_GROUP:
 		pnode_printgroup(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_LEGALNOTICE):
+	case NODE_LEGALNOTICE:
 		assert(p->newln);
 		puts(".Sh LEGAL NOTICE");
 		break;
-	case (NODE_LINK):
-		TAILQ_FOREACH(ap, &pn->attrq, child)
-			if (ATTRKEY_LINKEND == ap->key)
-				break;
-		if (ap == NULL)
+	case NODE_LINK:
+		ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL);
+		if (NULL == ccp)
 			break;
 		pnode_printmopen(p);
-		printf("Sx %s\n", ap->rawval);
+		printf("Sx %s\n", ccp);
 		p->newln = 1;
 		return;
-	case (NODE_LITERAL):
+	case NODE_LITERAL:
 		pnode_printmopen(p);
 		fputs("Li", stdout);
 		break;
-	case (NODE_MML_MFENCED):
+	case NODE_LITERALLAYOUT:
+		assert(p->newln);
+		puts(".Bd -literal");
+		break;
+	case NODE_MML_MFENCED:
 		pnode_printmathfenced(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_MML_MROW):
-	case (NODE_MML_MI):
-	case (NODE_MML_MN):
-	case (NODE_MML_MO):
+	case NODE_MML_MROW:
+	case NODE_MML_MI:
+	case NODE_MML_MN:
+	case NODE_MML_MO:
 		if (TAILQ_EMPTY(&pn->childq))
 			break;
 		fputs(" { ", stdout);
 		break;
-	case (NODE_MML_MFRAC):
-	case (NODE_MML_MSUB):
-	case (NODE_MML_MSUP):
+	case NODE_MML_MFRAC:
+	case NODE_MML_MSUB:
+	case NODE_MML_MSUP:
 		pnode_printmath(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_OPTION):
+	case NODE_OPTION:
 		pnode_printmopen(p);
 		fputs("Fl", stdout);
 		break;
-	case (NODE_ORDEREDLIST):
+	case NODE_ORDEREDLIST:
 		assert(p->newln);
 		pnode_printlist(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_PARA):
+	case NODE_PARA:
 		pnode_printpara(p, pn);
 		break;
-	case (NODE_PARAMETER):
+	case NODE_PARAMETER:
 		/* Suppress non-text children... */
 		pnode_printmopen(p);
 		fputs("Fa \"", stdout);
@@ -1415,26 +1435,25 @@ pnode_print(struct parse *p, struct pnode *pn)
 		fputs("\"", stdout);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_QUOTE):
+	case NODE_QUOTE:
 		pnode_printmopen(p);
 		fputs("Qo", stdout);
 		break;
-	case (NODE_LITERALLAYOUT):
-		/* FALLTHROUGH */
-	case (NODE_PROGRAMLISTING):
-		/* FALLTHROUGH */
-	case (NODE_SCREEN):
+	case NODE_PROGRAMLISTING:
+	case NODE_SCREEN:
 		assert(p->newln);
-		puts(".Bd -literal");
+		printf(".Bd %s\n", ATTRVAL_MONOSPACED ==
+		    pnode_getattr(pn, ATTRKEY_CLASS) ?
+		    "-literal" : "-unfilled");
 		break;
-	case (NODE_REFENTRYINFO):
+	case NODE_REFENTRYINFO:
 		/* Suppress. */
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_REFMETA):
+	case NODE_REFMETA:
 		abort();
 		break;
-	case (NODE_REFNAME):
+	case NODE_REFNAME:
 		/* Suppress non-text children... */
 		pnode_printmopen(p);
 		fputs("Nm", stdout);
@@ -1442,53 +1461,52 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmacrolinepart(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_REFNAMEDIV):
+	case NODE_REFNAMEDIV:
 		assert(p->newln);
 		puts(".Sh NAME");
 		break;
-	case (NODE_REFPURPOSE):
+	case NODE_REFPURPOSE:
 		assert(p->newln);
 		pnode_printmopen(p);
 		fputs("Nd", stdout);
 		break;
-	case (NODE_REFSYNOPSISDIV):
+	case NODE_REFSYNOPSISDIV:
 		assert(p->newln);
 		pnode_printrefsynopsisdiv(p, pn);
 		puts(".Sh SYNOPSIS");
 		break;
-	case (NODE_PREFACE):
-	case (NODE_SECTION):
-	case (NODE_NOTE):
-	case (NODE_TIP):
-	case (NODE_CAUTION):
-	case (NODE_WARNING):
+	case NODE_PREFACE:
+	case NODE_SECTION:
+	case NODE_NOTE:
+	case NODE_TIP:
+	case NODE_CAUTION:
+	case NODE_WARNING:
 		assert(p->newln);
 		pnode_printrefsect(p, pn);
 		break;
-	case (NODE_REPLACEABLE):
+	case NODE_REPLACEABLE:
 		pnode_printmopen(p);
 		fputs("Ar", stdout);
 		break;
-	case (NODE_SBR):
+	case NODE_SBR:
 		assert(p->newln);
 		puts(".br");
 		break;
-	case (NODE_SGMLTAG):
+	case NODE_SGMLTAG:
 		pnode_printmopen(p);
 		fputs("Li", stdout);
 		break;
-	case (NODE_STRUCTNAME):
+	case NODE_STRUCTNAME:
 		pnode_printmopen(p);
 		fputs("Vt", stdout);
 		break;
-	case (NODE_TABLE):
-		/* FALLTHROUGH */
-	case (NODE_INFORMALTABLE):
+	case NODE_TABLE:
+	case NODE_INFORMALTABLE:
 		assert(p->newln);
 		pnode_printtable(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_TEXT):
+	case NODE_TEXT:
 		if (0 == p->newln)
 			putchar(' ');
 
@@ -1535,30 +1553,30 @@ pnode_print(struct parse *p, struct pnode *pn)
 		}
 		p->newln = 0;
 		break;
-	case (NODE_TITLE):
+	case NODE_TITLE:
 		if (pn->parent->node == NODE_BOOKINFO) {
 			pnode_printmopen(p);
 			fputs("Nd", stdout);
 		}
 		break;
-	case (NODE_TYPE):
+	case NODE_TYPE:
 		pnode_printmopen(p);
 		fputs("Vt", stdout);
 		break;
-	case (NODE_USERINPUT):
+	case NODE_USERINPUT:
 		pnode_printmopen(p);
 		fputs("Li", stdout);
 		break;
-	case (NODE_VARIABLELIST):
+	case NODE_VARIABLELIST:
 		assert(p->newln);
 		pnode_printvariablelist(p, pn);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_VARLISTENTRY):
+	case NODE_VARLISTENTRY:
 		assert(p->newln);
 		pnode_printvarlistentry(p, pn);
 		break;
-	case (NODE_VARNAME):
+	case NODE_VARNAME:
 		pnode_printmopen(p);
 		fputs("Va", stdout);
 		break;
@@ -1570,59 +1588,59 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_print(p, pp);
 
 	switch (pn->node) {
-	case (NODE_INFORMALEQUATION):
+	case NODE_INFORMALEQUATION:
 		if ( ! p->newln)
 			putchar('\n');
 		puts(".EN");
 		p->newln = 1;
 		break;
-	case (NODE_INLINEEQUATION):
+	case NODE_INLINEEQUATION:
 		fputs("$ ", stdout);
 		p->newln = sv;
 		break;
-	case (NODE_MML_MROW):
-	case (NODE_MML_MI):
-	case (NODE_MML_MN):
-	case (NODE_MML_MO):
+	case NODE_MML_MROW:
+	case NODE_MML_MI:
+	case NODE_MML_MN:
+	case NODE_MML_MO:
 		if (TAILQ_EMPTY(&pn->childq))
 			break;
 		fputs(" } ", stdout);
 		break;
-	case (NODE_APPLICATION):
-	case (NODE_ARG):
-	case (NODE_AUTHOR):
-	case (NODE_CITEREFENTRY):
-	case (NODE_CODE):
-	case (NODE_COMMAND):
-	case (NODE_CONSTANT):
-	case (NODE_EDITOR):
-	case (NODE_EMPHASIS):
-	case (NODE_ENVAR):
-	case (NODE_FILENAME):
-	case (NODE_FIRSTTERM):
-	case (NODE_FUNCTION):
-	case (NODE_FUNCSYNOPSISINFO):
-	case (NODE_LITERAL):
-	case (NODE_OPTION):
-	case (NODE_PARAMETER):
-	case (NODE_REPLACEABLE):
-	case (NODE_REFPURPOSE):
-	case (NODE_SGMLTAG):
-	case (NODE_STRUCTNAME):
-	case (NODE_TEXT):
-	case (NODE_TYPE):
-	case (NODE_USERINPUT):
-	case (NODE_VARNAME):
+	case NODE_APPLICATION:
+	case NODE_ARG:
+	case NODE_AUTHOR:
+	case NODE_CITEREFENTRY:
+	case NODE_CODE:
+	case NODE_COMMAND:
+	case NODE_CONSTANT:
+	case NODE_EDITOR:
+	case NODE_EMPHASIS:
+	case NODE_ENVAR:
+	case NODE_FILENAME:
+	case NODE_FIRSTTERM:
+	case NODE_FUNCTION:
+	case NODE_FUNCSYNOPSISINFO:
+	case NODE_LITERAL:
+	case NODE_OPTION:
+	case NODE_PARAMETER:
+	case NODE_REPLACEABLE:
+	case NODE_REFPURPOSE:
+	case NODE_SGMLTAG:
+	case NODE_STRUCTNAME:
+	case NODE_TEXT:
+	case NODE_TYPE:
+	case NODE_USERINPUT:
+	case NODE_VARNAME:
 		pnode_printmclosepunct(p, pn, sv);
 		break;
-	case (NODE_QUOTE):
+	case NODE_QUOTE:
 		pnode_printmclose(p, sv);
 		sv = p->newln;
 		pnode_printmopen(p);
 		fputs("Qc", stdout);
 		pnode_printmclose(p, sv);
 		break;
-	case (NODE_REFNAME):
+	case NODE_REFNAME:
 		/*
 		 * If we're in the NAME macro and we have multiple
 		 * <refname> macros in sequence, then print out a
@@ -1635,24 +1653,22 @@ pnode_print(struct parse *p, struct pnode *pn)
 			fputs(" ,", stdout);
 		pnode_printmclose(p, sv);
 		break;
-	case (NODE_PREFACE):
-	case (NODE_SECTION):
-	case (NODE_NOTE):
-	case (NODE_TIP):
-	case (NODE_CAUTION):
-	case (NODE_WARNING):
+	case NODE_PREFACE:
+	case NODE_SECTION:
+	case NODE_NOTE:
+	case NODE_TIP:
+	case NODE_CAUTION:
+	case NODE_WARNING:
 		p->level--;
 		break;
-	case (NODE_LITERALLAYOUT):
-		/* FALLTHROUGH */
-	case (NODE_PROGRAMLISTING):
-		/* FALLTHROUGH */
-	case (NODE_SCREEN):
+	case NODE_LITERALLAYOUT:
+	case NODE_PROGRAMLISTING:
+	case NODE_SCREEN:
 		assert(p->newln);
 		puts(".Ed");
 		p->newln = 1;
 		break;
-	case (NODE_TITLE):
+	case NODE_TITLE:
 		if (pn->parent->node == NODE_BOOKINFO) {
 			pnode_printmclose(p, 1);
 			puts(".Sh AUTHORS");
@@ -1735,7 +1751,7 @@ main(int argc, char *argv[])
 
 	while (-1 != (ch = getopt(argc, argv, "W")))
 		switch (ch) {
-		case ('W'):
+		case 'W':
 			warn = 1;
 			break;
 		default: