===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.23
retrieving revision 1.29
diff -u -p -r1.23 -r1.29
--- docbook2mdoc/docbook2mdoc.c	2014/03/30 17:46:17	1.23
+++ docbook2mdoc/docbook2mdoc.c	2014/04/02 10:59:07	1.29
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.23 2014/03/30 17:46:17 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.29 2014/04/02 10:59:07 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -88,13 +88,16 @@ static	const char *attrvals[ATTRVAL__MAX] = {
 static	const struct node nodes[NODE__MAX] = {
 	{ NULL, 0 }, 
 	{ "acronym", 0 }, 
+	{ "application", 0 }, 
 	{ "arg", 0 }, 
+	{ "caution", NODE_IGNTEXT }, 
 	{ "citerefentry", NODE_IGNTEXT }, 
 	{ "cmdsynopsis", NODE_IGNTEXT }, 
 	{ "code", 0 }, 
 	{ "command", 0 }, 
 	{ "date", 0 }, 
 	{ "emphasis", 0 },
+	{ "entry", 0 },
 	{ "envar", 0 },
 	{ "filename", 0 },
 	{ "funcdef", 0 },
@@ -103,10 +106,12 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "funcsynopsisinfo", 0 }, 
 	{ "function", 0 }, 
 	{ "itemizedlist", NODE_IGNTEXT }, 
+	{ "group", NODE_IGNTEXT }, 
 	{ "link", 0 }, 
 	{ "listitem", NODE_IGNTEXT }, 
 	{ "literal", 0 }, 
 	{ "manvolnum", 0 }, 
+	{ "note", NODE_IGNTEXT }, 
 	{ "option", 0 }, 
 	{ "orderedlist", NODE_IGNTEXT }, 
 	{ "para", 0 }, 
@@ -114,6 +119,7 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "parameter", 0 }, 
 	{ "programlisting", 0 }, 
 	{ "prompt", 0 }, 
+	{ "quote", 0 }, 
 	{ "refclass", NODE_IGNTEXT }, 
 	{ "refdescriptor", NODE_IGNTEXT }, 
 	{ "refentry", NODE_IGNTEXT }, 
@@ -126,19 +132,30 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "refpurpose", 0 }, 
 	{ "refsect1", NODE_IGNTEXT }, 
 	{ "refsect2", NODE_IGNTEXT }, 
+	{ "refsect3", NODE_IGNTEXT }, 
+	{ "refsection", 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 }, 
+	{ "tip", NODE_IGNTEXT }, 
 	{ "title", 0 }, 
 	{ "ulink", 0 }, 
 	{ "userinput", 0 }, 
 	{ "variablelist", NODE_IGNTEXT }, 
 	{ "varlistentry", NODE_IGNTEXT }, 
+	{ "varname", 0 }, 
+	{ "warning", NODE_IGNTEXT }, 
 };
 
 static void
@@ -477,6 +494,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
 /*
@@ -591,10 +627,34 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 		if (NODE_TITLE == pp->node)
 			break;
 
-	if (NODE_REFSECT1 == pn->node)
+	switch (pn->node) {
+	case (NODE_REFSECT1):
 		fputs(".Sh", stdout);
-	else
+		break;
+	case (NODE_REFSECT2):
 		fputs(".Ss", stdout);
+		break;
+	case (NODE_REFSECT3):
+		puts(".Pp");
+		fputs(".Sy", stdout);
+		break;
+	case (NODE_NOTE):
+		/* FALLTHROUGH */
+	case (NODE_REFSECTION):
+		/* FALLTHROUGH */
+	case (NODE_TIP):
+		/* FALLTHROUGH */
+	case (NODE_CAUTION):
+		/* FALLTHROUGH */
+	case (NODE_WARNING):
+		puts(".Pp");
+		if (NULL == pp)
+			return;
+		fputs(".Em", stdout);
+		break;
+	default:
+		break;
+	}
 
 	p->newln = 0;
 
@@ -605,7 +665,8 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 		pnode_printmclose(p, 1);
 		pnode_unlink(pp);
 	} else {
-		puts("UNKNOWN");
+		puts(NODE_REFSECT1 == pn->node ?
+			"UNKNOWN" : "unknown");
 		p->newln = 1;
 	}
 }
@@ -792,23 +853,56 @@ pnode_printarg(struct parse *p, struct pnode *pn)
 	}
 }
 
-/* 
- * Recursively search and return the first instance of "node".
- */
-static struct pnode *
-pnode_findfirst(struct pnode *pn, enum nodeid node)
+static void
+pnode_printgroup(struct parse *p, struct pnode *pn)
 {
-	struct pnode	*pp, *res;
+	struct pnode	*pp, *np;
+	struct pattr	*ap;
+	int		 isop, sv;
 
-	res = NULL;
-	TAILQ_FOREACH(pp, &pn->childq, child) {
-		res = pp->node == node ? pp :
-			pnode_findfirst(pp, node);
-		if (NULL != res)
+	isop = 1;
+	TAILQ_FOREACH(ap, &pn->attrq, child) 
+		if (ATTRKEY_CHOICE == ap->key &&
+			(ATTRVAL_PLAIN == ap->val ||
+			 ATTRVAL_REQ == ap->val)) {
+			isop = 0;
 			break;
+		}
+
+	/* 
+	 * Make sure we're on a macro line.
+	 * This will prevent pnode_print() for putting us on a
+	 * subsequent line.
+	 */
+	sv = p->newln;
+	pnode_printmopen(p);
+	if (isop) 
+		fputs("Op", stdout);
+	else if (sv)
+		fputs("No", stdout);
+
+	/*
+	 * Keep on printing text separated by the vertical bar as long
+	 * as we're within the same origin node as the group.
+	 * This is kind of a nightmare.
+	 * Eh, DocBook...
+	 * FIXME: if there's a "Fl", we don't cut off the leading "-"
+	 * like we do in pnode_print().
+	 */
+	TAILQ_FOREACH(pp, &pn->childq, child) {
+		pnode_print(p, pp);
+		np = TAILQ_NEXT(pp, child);
+		while (NULL != np) {
+			if (pp->node != np->node)
+				break;
+			fputs(" |", stdout);
+			pnode_printmacrolinepart(p, np);
+			pp = np;
+			np = TAILQ_NEXT(np, child);
+		}
 	}
 
-	return(res);
+	pnode_printmclose(p, sv);
 }
 
 static void
@@ -851,19 +945,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");
@@ -927,6 +1061,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 	sv = p->newln;
 
 	switch (pn->node) {
+	case (NODE_APPLICATION):
+		pnode_printmopen(p);
+		fputs("Nm", stdout);
+		break;
 	case (NODE_ARG):
 		pnode_printarg(p, pn);
 		pnode_unlinksub(pn);
@@ -970,11 +1108,14 @@ 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);
+		pnode_unlinksub(pn);
+		break;
 	case (NODE_LITERAL):
 		pnode_printmopen(p);
 		fputs("Li", stdout);
@@ -983,6 +1124,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 && 
@@ -998,6 +1144,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		puts("\"");
 		pnode_unlinksub(pn);
 		break;
+	case (NODE_QUOTE):
+		pnode_printmopen(p);
+		fputs("Qo", stdout);
+		break;
 	case (NODE_PROGRAMLISTING):
 		/* FALLTHROUGH */
 	case (NODE_SCREEN):
@@ -1036,6 +1186,18 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_REFSECT1):
 		/* FALLTHROUGH */
 	case (NODE_REFSECT2):
+		/* FALLTHROUGH */
+	case (NODE_REFSECT3):
+		/* FALLTHROUGH */
+	case (NODE_REFSECTION):
+		/* FALLTHROUGH */
+	case (NODE_NOTE):
+		/* FALLTHROUGH */
+	case (NODE_TIP):
+		/* FALLTHROUGH */
+	case (NODE_CAUTION):
+		/* FALLTHROUGH */
+	case (NODE_WARNING):
 		assert(p->newln);
 		pnode_printrefsect(p, pn);
 		break;
@@ -1051,6 +1213,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(' ');
@@ -1090,6 +1257,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);
@@ -1099,9 +1270,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;
@@ -1111,6 +1282,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_print(p, pp);
 
 	switch (pn->node) {
+	case (NODE_APPLICATION):
 	case (NODE_ARG):
 	case (NODE_CODE):
 	case (NODE_COMMAND):
@@ -1127,6 +1299,14 @@ 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_QUOTE):
+		pnode_printmclose(p, sv);
+		sv = p->newln;
+		pnode_printmopen(p);
+		fputs("Qc", stdout);
 		pnode_printmclose(p, sv);
 		break;
 	case (NODE_REFNAME):