===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.21
retrieving revision 1.23
diff -u -p -r1.21 -r1.23
--- docbook2mdoc/docbook2mdoc.c	2014/03/30 17:10:50	1.21
+++ docbook2mdoc/docbook2mdoc.c	2014/03/30 17:46:17	1.23
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.21 2014/03/30 17:10:50 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.23 2014/03/30 17:46:17 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -113,6 +113,7 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "paramdef", 0 },
 	{ "parameter", 0 }, 
 	{ "programlisting", 0 }, 
+	{ "prompt", 0 }, 
 	{ "refclass", NODE_IGNTEXT }, 
 	{ "refdescriptor", NODE_IGNTEXT }, 
 	{ "refentry", NODE_IGNTEXT }, 
@@ -128,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 }, 
 };
@@ -908,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)
@@ -995,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;
@@ -1093,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;
 	}
@@ -1116,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):
@@ -1132,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;