===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.14
retrieving revision 1.20
diff -u -p -r1.14 -r1.20
--- docbook2mdoc/docbook2mdoc.c	2014/03/30 13:18:49	1.14
+++ docbook2mdoc/docbook2mdoc.c	2014/03/30 16:57:06	1.20
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.14 2014/03/30 13:18:49 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.20 2014/03/30 16:57:06 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -92,14 +92,18 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "cmdsynopsis", NODE_IGNTEXT }, 
 	{ "code", 0 }, 
 	{ "command", 0 }, 
+	{ "date", 0 }, 
 	{ "emphasis", 0 },
+	{ "filename", 0 },
 	{ "funcdef", 0 },
 	{ "funcprototype", NODE_IGNTEXT }, 
 	{ "funcsynopsis", NODE_IGNTEXT }, 
 	{ "funcsynopsisinfo", 0 }, 
 	{ "function", 0 }, 
+	{ "itemizedlist", NODE_IGNTEXT }, 
 	{ "link", 0 }, 
 	{ "listitem", NODE_IGNTEXT }, 
+	{ "literal", 0 }, 
 	{ "manvolnum", 0 }, 
 	{ "option", 0 }, 
 	{ "para", 0 }, 
@@ -109,15 +113,18 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "refclass", NODE_IGNTEXT }, 
 	{ "refdescriptor", NODE_IGNTEXT }, 
 	{ "refentry", NODE_IGNTEXT }, 
+	{ "refentryinfo", NODE_IGNTEXT }, 
 	{ "refentrytitle", 0 }, 
 	{ "refmeta", NODE_IGNTEXT }, 
 	{ "refmiscinfo", NODE_IGNTEXT }, 
 	{ "refname", 0 }, 
 	{ "refnamediv", NODE_IGNTEXT }, 
 	{ "refpurpose", 0 }, 
-	{ "refsect1", 0 }, 
+	{ "refsect1", NODE_IGNTEXT }, 
+	{ "refsect2", NODE_IGNTEXT }, 
 	{ "refsynopsisdiv", NODE_IGNTEXT }, 
 	{ "replaceable", 0 }, 
+	{ "sbr", NODE_IGNTEXT }, 
 	{ "structname", 0 }, 
 	{ "synopsis", 0 }, 
 	{ "term", 0 }, 
@@ -578,11 +585,18 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 		if (NODE_TITLE == pp->node)
 			break;
 
-	fputs(".Sh", stdout);
+	if (NODE_REFSECT1 == pn->node)
+		fputs(".Sh", stdout);
+	else
+		fputs(".Ss", stdout);
+
 	p->newln = 0;
 
 	if (NULL != pp) {
-		pnode_printmacroline(p, pp);
+		pnode_printmacrolinetext(p, pp, 
+			NODE_REFSECT1 == pn->node ?
+			MACROLINE_UPPER : 0);
+		pnode_printmclose(p, 1);
 		pnode_unlink(pp);
 	} else {
 		puts("UNKNOWN");
@@ -822,8 +836,7 @@ pnode_printvarlistentry(struct parse *p, struct pnode 
 			p->newln = 0;
 			pnode_print(p, pp);
 			pnode_unlink(pp);
-			putchar('\n');
-			p->newln = 1;
+			pnode_printmclose(p, 1);
 			return;
 		} 
 
@@ -832,6 +845,31 @@ pnode_printvarlistentry(struct parse *p, struct pnode 
 }
 
 static void
+pnode_printitemizedlist(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 -item");
+	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_printvariablelist(struct parse *p, struct pnode *pn)
 {
 	struct pnode	*pp;
@@ -898,6 +936,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmopen(p);
 		fputs("Em", stdout);
 		break;
+	case (NODE_FILENAME):
+		pnode_printmopen(p);
+		fputs("Pa", stdout);
+		break;
 	case (NODE_FUNCTION):
 		pnode_printmopen(p);
 		fputs("Fn", stdout);
@@ -911,10 +953,17 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmopen(p);
 		fputs("Fd", stdout);
 		break;
+	case (NODE_ITEMIZEDLIST):
+		assert(p->newln);
+		pnode_printitemizedlist(p, pn);
+		break;
+	case (NODE_LITERAL):
+		pnode_printmopen(p);
+		fputs("Li", stdout);
+		break;
 	case (NODE_OPTION):
 		pnode_printmopen(p);
 		fputs("Fl", stdout);
-		/* FIXME: bogus leading '-'? */
 		break;
 	case (NODE_PARA):
 		assert(p->newln);
@@ -935,6 +984,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		assert(p->newln);
 		puts(".Bd -literal");
 		break;
+	case (NODE_REFENTRYINFO):
+		/* Suppress. */
+		pnode_unlinksub(pn);
+		break;
 	case (NODE_REFMETA):
 		abort();
 		break;
@@ -961,6 +1014,8 @@ pnode_print(struct parse *p, struct pnode *pn)
 		puts(".Sh SYNOPSIS");
 		break;
 	case (NODE_REFSECT1):
+		/* FALLTHROUGH */
+	case (NODE_REFSECT2):
 		assert(p->newln);
 		pnode_printrefsect(p, pn);
 		break;
@@ -968,6 +1023,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmopen(p);
 		fputs("Ar", stdout);
 		break;
+	case (NODE_SBR):
+		assert(p->newln);
+		puts(".br");
+		break;
 	case (NODE_STRUCTNAME):
 		pnode_printmopen(p);
 		fputs("Vt", stdout);
@@ -984,7 +1043,17 @@ pnode_print(struct parse *p, struct pnode *pn)
 		 * Remember to escape control characters and escapes.
 		 */
 		assert(p->bsz);
-		for (last = '\n', cp = p->b; '\0' != *cp; ) {
+		cp = p->b;
+		/*
+		 * There's often a superfluous "-" in its <option> tags
+		 * before the actual flags themselves.
+		 * "Fl" does this for us, so remove it.
+		 */
+		if (NULL != pn->parent &&
+			NODE_OPTION == pn->parent->node &&
+			'-' == *cp)
+			cp++;
+		for (last = '\n'; '\0' != *cp; ) {
 			if ('\n' == last) {
 				/* Consume all whitespace. */
 				if (isspace((int)*cp)) {
@@ -1022,8 +1091,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_CODE):
 	case (NODE_COMMAND):
 	case (NODE_EMPHASIS):
+	case (NODE_FILENAME):
 	case (NODE_FUNCTION):
 	case (NODE_FUNCSYNOPSISINFO):
+	case (NODE_LITERAL):
 	case (NODE_OPTION):
 	case (NODE_PARAMETER):
 	case (NODE_REPLACEABLE):