===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.24
retrieving revision 1.26
diff -u -p -r1.24 -r1.26
--- docbook2mdoc/docbook2mdoc.c	2014/03/30 18:15:55	1.24
+++ docbook2mdoc/docbook2mdoc.c	2014/04/02 07:52:14	1.26
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.24 2014/03/30 18:15:55 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.26 2014/04/02 07:52:14 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -95,6 +95,7 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "command", 0 }, 
 	{ "date", 0 }, 
 	{ "emphasis", 0 },
+	{ "entry", 0 },
 	{ "envar", 0 },
 	{ "filename", 0 },
 	{ "funcdef", 0 },
@@ -129,17 +130,24 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "refsect2", NODE_IGNTEXT }, 
 	{ "refsynopsisdiv", NODE_IGNTEXT }, 
 	{ "replaceable", 0 }, 
+	{ "row", NODE_IGNTEXT }, 
 	{ "sbr", NODE_IGNTEXT }, 
 	{ "screen", NODE_IGNTEXT }, 
 	{ "structname", 0 }, 
 	{ "synopsis", 0 }, 
+	{ "table", NODE_IGNTEXT }, 
+	{ "tbody", NODE_IGNTEXT }, 
 	{ "term", 0 }, 
 	{ NULL, 0 }, 
+	{ "tfoot", NODE_IGNTEXT }, 
+	{ "tgroup", NODE_IGNTEXT }, 
+	{ "thead", NODE_IGNTEXT }, 
 	{ "title", 0 }, 
 	{ "ulink", 0 }, 
 	{ "userinput", 0 }, 
 	{ "variablelist", NODE_IGNTEXT }, 
 	{ "varlistentry", NODE_IGNTEXT }, 
+	{ "varname", 0 }, 
 };
 
 static void
@@ -478,6 +486,25 @@ bufappend_r(struct parse *p, struct pnode *pn)
 		bufappend_r(p, pp);
 }
 
+/* 
+ * Recursively search and return the first instance of "node".
+ */
+static struct pnode *
+pnode_findfirst(struct pnode *pn, enum nodeid node)
+{
+	struct pnode	*pp, *res;
+
+	res = NULL;
+	TAILQ_FOREACH(pp, &pn->childq, child) {
+		res = pp->node == node ? pp :
+			pnode_findfirst(pp, node);
+		if (NULL != res)
+			break;
+	}
+
+	return(res);
+}
+
 #define MACROLINE_NORM	0
 #define MACROLINE_UPPER	1
 /*
@@ -845,25 +872,6 @@ pnode_printgroup(struct parse *p, struct pnode *pn)
 	pnode_printmclose(p, sv);
 }
 
-/* 
- * Recursively search and return the first instance of "node".
- */
-static struct pnode *
-pnode_findfirst(struct pnode *pn, enum nodeid node)
-{
-	struct pnode	*pp, *res;
-
-	res = NULL;
-	TAILQ_FOREACH(pp, &pn->childq, child) {
-		res = pp->node == node ? pp :
-			pnode_findfirst(pp, node);
-		if (NULL != res)
-			break;
-	}
-
-	return(res);
-}
-
 static void
 pnode_printprologue(struct parse *p, struct pnode *pn)
 {
@@ -904,19 +912,59 @@ pnode_printvarlistentry(struct parse *p, struct pnode 
 }
 
 static void
-pnode_printitemizedlist(struct parse *p, struct pnode *pn)
+pnode_printrow(struct parse *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 
+	puts(".Bl -dash -compact");
+
+	TAILQ_FOREACH(pp, &pn->childq, child) {
+		assert(p->newln);
+		puts(".It");
+		pnode_print(p, pp);
+		pnode_printmclose(p, 1);
+	}
 	assert(p->newln);
+	puts(".El");
+}
+
+static void
+pnode_printtable(struct parse *p, struct pnode *pn)
+{
+	struct pnode	*pp;
+
+	assert(p->newln);
 	TAILQ_FOREACH(pp, &pn->childq, child)
 		if (NODE_TITLE == pp->node) {
 			puts(".Pp");
 			pnode_print(p, pp);
 			pnode_unlink(pp);
 		}
+	assert(p->newln);
+	puts(".Bl -ohang");
+	while (NULL != (pp = pnode_findfirst(pn, NODE_ROW))) {
+		puts(".It Table Row");
+		pnode_printrow(p, pp);
+		pnode_printmclose(p, 1);
+		pnode_unlink(pp);
+	}
+	assert(p->newln);
+	puts(".El");
+}
 
+static void
+pnode_printlist(struct parse *p, struct pnode *pn)
+{
+	struct pnode	*pp;
+
 	assert(p->newln);
+	TAILQ_FOREACH(pp, &pn->childq, child)
+		if (NODE_TITLE == pp->node) {
+			puts(".Pp");
+			pnode_print(p, pp);
+			pnode_unlink(pp);
+		}
+	assert(p->newln);
 
 	if (NODE_ORDEREDLIST == pn->node)
 		puts(".Bl -enum");
@@ -1023,10 +1071,9 @@ pnode_print(struct parse *p, struct pnode *pn)
 		fputs("Fd", stdout);
 		break;
 	case (NODE_ITEMIZEDLIST):
-		/* FALLTHROUGH */
-	case (NODE_ORDEREDLIST):
 		assert(p->newln);
-		pnode_printitemizedlist(p, pn);
+		pnode_printlist(p, pn);
+		pnode_unlinksub(pn);
 		break;
 	case (NODE_GROUP):
 		pnode_printgroup(p, pn);
@@ -1040,6 +1087,11 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmopen(p);
 		fputs("Fl", stdout);
 		break;
+	case (NODE_ORDEREDLIST):
+		assert(p->newln);
+		pnode_printlist(p, pn);
+		pnode_unlinksub(pn);
+		break;
 	case (NODE_PARA):
 		assert(p->newln);
 		if (NULL != pn->parent && 
@@ -1108,6 +1160,11 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmopen(p);
 		fputs("Vt", stdout);
 		break;
+	case (NODE_TABLE):
+		assert(p->newln);
+		pnode_printtable(p, pn);
+		pnode_unlinksub(pn);
+		break;
 	case (NODE_TEXT):
 		if (0 == p->newln)
 			putchar(' ');
@@ -1147,6 +1204,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		}
 		p->newln = 0;
 		break;
+	case (NODE_USERINPUT):
+		pnode_printmopen(p);
+		fputs("Li", stdout);
+		break;
 	case (NODE_VARIABLELIST):
 		assert(p->newln);
 		pnode_printvariablelist(p, pn);
@@ -1156,9 +1217,9 @@ pnode_print(struct parse *p, struct pnode *pn)
 		assert(p->newln);
 		pnode_printvarlistentry(p, pn);
 		break;
-	case (NODE_USERINPUT):
+	case (NODE_VARNAME):
 		pnode_printmopen(p);
-		fputs("Li", stdout);
+		fputs("Va", stdout);
 		break;
 	default:
 		break;
@@ -1184,6 +1245,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_STRUCTNAME):
 	case (NODE_TEXT):
 	case (NODE_USERINPUT):
+	case (NODE_VARNAME):
 		pnode_printmclose(p, sv);
 		break;
 	case (NODE_REFNAME):