===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.40
retrieving revision 1.42
diff -u -p -r1.40 -r1.42
--- docbook2mdoc/docbook2mdoc.c	2014/10/12 15:08:45	1.40
+++ docbook2mdoc/docbook2mdoc.c	2014/10/12 15:48:42	1.42
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.40 2014/10/12 15:08:45 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.42 2014/10/12 15:48:42 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -74,7 +74,9 @@ struct	pnode {
 
 static	const char *attrkeys[ATTRKEY__MAX] = {
 	"choice",
+	"close",
 	"id",
+	"open",
 	"rep"
 };
 
@@ -863,6 +865,43 @@ pnode_printparamdef(struct parse *p, struct pnode *pn)
 }
 
 /*
+ * The <mml:mfenced> node is a little peculiar.
+ * First, it can have arbitrary open and closing tokens, which default
+ * to parentheses.
+ * Second, >1 arguments are separated by commas.
+ */
+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 ( ");
+
+	pp = TAILQ_FIRST(&pn->childq);
+	pnode_print(p, pp);
+
+	while (NULL != (pp = TAILQ_NEXT(pp, child))) {
+		putchar(',');
+		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 ) ");
+}
+
+/*
  * These math nodes require special handling because they have infix
  * syntax, instead of the usual prefix or prefix.
  * So we need to break up the first and second child node with a
@@ -878,13 +917,13 @@ pnode_printmath(struct parse *p, struct pnode *pn)
 
 	switch (pn->node) {
 	case (NODE_MML_MSUP):
-		printf(" sup ");
+		fputs(" sup ", stdout);
 		break;
 	case (NODE_MML_MFRAC):
-		printf(" over ");
+		fputs(" over ", stdout);
 		break;
 	case (NODE_MML_MSUB):
-		printf(" sub ");
+		fputs(" sub ", stdout);
 		break;
 	default:
 		break;
@@ -1029,24 +1068,31 @@ pnode_printprologue(struct parse *p, struct pnode *pn)
 	}
 }
 
+/*
+ * We can have multiple <term> elements within a <varlistentry>, which
+ * we should comma-separate as list headers.
+ */
 static void
 pnode_printvarlistentry(struct parse *p, struct pnode *pn)
 {
 	struct pnode	*pp;
+	int		 first = 1;
 
 	assert(p->newln);
+	fputs(".It", stdout);
+	p->newln = 0;
+
 	TAILQ_FOREACH(pp, &pn->childq, child)
 		if (NODE_TERM == pp->node) {
-			assert(p->newln);
-			fputs(".It", stdout);
-			p->newln = 0;
+			if ( ! first)
+				putchar(',');
 			pnode_print(p, pp);
 			pnode_unlink(pp);
-			pnode_printmclose(p, 1);
-			return;
-		} 
+			first = 0;
+		} else
+			break;
 
-	puts(".It");
+	putchar('\n');
 	p->newln = 1;
 }
 
@@ -1241,7 +1287,8 @@ pnode_print(struct parse *p, struct pnode *pn)
 		p->newln = 0;
 		break;
 	case (NODE_MML_MFENCED):
-		printf("left {");
+		pnode_printmathfenced(p, pn);
+		pnode_unlinksub(pn);
 		break;
 	case (NODE_MML_MROW):
 	case (NODE_MML_MI):
@@ -1440,9 +1487,6 @@ pnode_print(struct parse *p, struct pnode *pn)
 			putchar('\n');
 		puts(".EN");
 		p->newln = 1;
-		break;
-	case (NODE_MML_MFENCED):
-		printf("right }");
 		break;
 	case (NODE_MML_MROW):
 	case (NODE_MML_MI):