===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.20
retrieving revision 1.23
diff -u -p -r1.20 -r1.23
--- docbook2mdoc/docbook2mdoc.c	2014/03/30 16:57:06	1.20
+++ docbook2mdoc/docbook2mdoc.c	2014/03/30 17:46:17	1.23
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.20 2014/03/30 16:57:06 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 }, 
@@ -125,12 +129,14 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "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 }, 
 };
@@ -858,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");
@@ -900,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)
@@ -936,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);
@@ -954,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;
@@ -981,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;
@@ -1079,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;
 	}
@@ -1091,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):
@@ -1101,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):
@@ -1117,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;