===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.19
retrieving revision 1.23
diff -u -p -r1.19 -r1.23
--- docbook2mdoc/docbook2mdoc.c	2014/03/30 16:44:13	1.19
+++ docbook2mdoc/docbook2mdoc.c	2014/03/30 17:46:17	1.23
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.19 2014/03/30 16:44:13 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.23 2014/03/30 17:46:17 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -87,6 +87,7 @@ static	const char *attrvals[ATTRVAL__MAX] = {
 
 static	const struct node nodes[NODE__MAX] = {
 	{ NULL, 0 }, 
+	{ "acronym", 0 }, 
 	{ "arg", 0 }, 
 	{ "citerefentry", NODE_IGNTEXT }, 
 	{ "cmdsynopsis", NODE_IGNTEXT }, 
@@ -94,6 +95,7 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "command", 0 }, 
 	{ "date", 0 }, 
 	{ "emphasis", 0 },
+	{ "envar", 0 },
 	{ "filename", 0 },
 	{ "funcdef", 0 },
 	{ "funcprototype", NODE_IGNTEXT }, 
@@ -106,10 +108,12 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "literal", 0 }, 
 	{ "manvolnum", 0 }, 
 	{ "option", 0 }, 
+	{ "orderedlist", NODE_IGNTEXT }, 
 	{ "para", 0 }, 
 	{ "paramdef", 0 },
 	{ "parameter", 0 }, 
 	{ "programlisting", 0 }, 
+	{ "prompt", 0 }, 
 	{ "refclass", NODE_IGNTEXT }, 
 	{ "refdescriptor", NODE_IGNTEXT }, 
 	{ "refentry", NODE_IGNTEXT }, 
@@ -120,16 +124,19 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "refname", 0 }, 
 	{ "refnamediv", NODE_IGNTEXT }, 
 	{ "refpurpose", 0 }, 
-	{ "refsect1", 0 }, 
+	{ "refsect1", NODE_IGNTEXT }, 
+	{ "refsect2", NODE_IGNTEXT }, 
 	{ "refsynopsisdiv", NODE_IGNTEXT }, 
 	{ "replaceable", 0 }, 
 	{ "sbr", NODE_IGNTEXT }, 
+	{ "screen", NODE_IGNTEXT }, 
 	{ "structname", 0 }, 
 	{ "synopsis", 0 }, 
 	{ "term", 0 }, 
 	{ NULL, 0 }, 
 	{ "title", 0 }, 
 	{ "ulink", 0 }, 
+	{ "userinput", 0 }, 
 	{ "variablelist", NODE_IGNTEXT }, 
 	{ "varlistentry", NODE_IGNTEXT }, 
 };
@@ -584,11 +591,17 @@ 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_printmacrolinetext(p, pp, MACROLINE_UPPER);
+		pnode_printmacrolinetext(p, pp, 
+			NODE_REFSECT1 == pn->node ?
+			MACROLINE_UPPER : 0);
 		pnode_printmclose(p, 1);
 		pnode_unlink(pp);
 	} else {
@@ -851,7 +864,12 @@ pnode_printitemizedlist(struct parse *p, struct pnode 
 		}
 
 	assert(p->newln);
-	puts(".Bl -item");
+
+	if (NODE_ORDEREDLIST == pn->node)
+		puts(".Bl -enum");
+	else
+		puts(".Bl -item");
+
 	TAILQ_FOREACH(pp, &pn->childq, child) {
 		assert(p->newln);
 		puts(".It");
@@ -893,7 +911,8 @@ pnode_printvariablelist(struct parse *p, struct pnode 
 /*
  * Print a parsed node (or ignore it--whatever).
  * This is a recursive function.
- * FIXME: macro line continuation?
+ * FIXME: if we're in a literal context (<screen> or <programlisting> or
+ * whatever), don't print inline macros.
  */
 static void
 pnode_print(struct parse *p, struct pnode *pn)
@@ -929,6 +948,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmopen(p);
 		fputs("Em", stdout);
 		break;
+	case (NODE_ENVAR):
+		pnode_printmopen(p);
+		fputs("Ev", stdout);
+		break;
 	case (NODE_FILENAME):
 		pnode_printmopen(p);
 		fputs("Pa", stdout);
@@ -947,6 +970,8 @@ 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);
 		break;
@@ -957,7 +982,6 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_OPTION):
 		pnode_printmopen(p);
 		fputs("Fl", stdout);
-		/* FIXME: bogus leading '-'? */
 		break;
 	case (NODE_PARA):
 		assert(p->newln);
@@ -975,6 +999,8 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_unlinksub(pn);
 		break;
 	case (NODE_PROGRAMLISTING):
+		/* FALLTHROUGH */
+	case (NODE_SCREEN):
 		assert(p->newln);
 		puts(".Bd -literal");
 		break;
@@ -1008,6 +1034,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;
@@ -1035,7 +1063,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)) {
@@ -1061,6 +1099,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		assert(p->newln);
 		pnode_printvarlistentry(p, pn);
 		break;
+	case (NODE_USERINPUT):
+		pnode_printmopen(p);
+		fputs("Li", stdout);
+		break;
 	default:
 		break;
 	}
@@ -1073,6 +1115,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_CODE):
 	case (NODE_COMMAND):
 	case (NODE_EMPHASIS):
+	case (NODE_ENVAR):
 	case (NODE_FILENAME):
 	case (NODE_FUNCTION):
 	case (NODE_FUNCSYNOPSISINFO):
@@ -1083,6 +1126,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_REFPURPOSE):
 	case (NODE_STRUCTNAME):
 	case (NODE_TEXT):
+	case (NODE_USERINPUT):
 		pnode_printmclose(p, sv);
 		break;
 	case (NODE_REFNAME):
@@ -1099,6 +1143,8 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmclose(p, sv);
 		break;
 	case (NODE_PROGRAMLISTING):
+		/* FALLTHROUGH */
+	case (NODE_SCREEN):
 		assert(p->newln);
 		puts(".Ed");
 		p->newln = 1;