From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s9CFmglg026317
	for <source@mdocml.bsd.lv>; Sun, 12 Oct 2014 11:48:42 -0400 (EDT)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s9CFmgpU022924;
	Sun, 12 Oct 2014 11:48:42 -0400 (EDT)
Date: Sun, 12 Oct 2014 11:48:42 -0400 (EDT)
Message-Id: <201410121548.s9CFmgpU022924@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: docbook2mdoc: Properly handle multiple <term> for a <varlistentry>.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Properly handle multiple <term> for a <varlistentry>.

Modified Files:
--------------
    docbook2mdoc:
        docbook2mdoc.c

Revision Data
-------------
Index: docbook2mdoc.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.41 -r1.42
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -917,13 +917,13 @@ pnode_printmath(struct parse *p, struct 
 
 	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;
@@ -1068,24 +1068,31 @@ pnode_printprologue(struct parse *p, str
 	}
 }
 
+/*
+ * 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;
 }
 
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv