===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.31
retrieving revision 1.36
diff -u -p -r1.31 -r1.36
--- docbook2mdoc/docbook2mdoc.c	2014/04/02 12:27:05	1.31
+++ docbook2mdoc/docbook2mdoc.c	2014/04/30 10:11:24	1.36
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.31 2014/04/02 12:27:05 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.36 2014/04/30 10:11:24 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -96,6 +96,8 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "cmdsynopsis", NODE_IGNTEXT }, 
 	{ "code", 0 }, 
 	{ "command", 0 }, 
+	{ "constant", 0 }, 
+	{ "copyright", NODE_IGNTEXT }, 
 	{ "date", 0 }, 
 	{ "emphasis", 0 },
 	{ "entry", 0 },
@@ -106,8 +108,11 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "funcsynopsis", NODE_IGNTEXT }, 
 	{ "funcsynopsisinfo", 0 }, 
 	{ "function", 0 }, 
-	{ "itemizedlist", NODE_IGNTEXT }, 
 	{ "group", NODE_IGNTEXT }, 
+	{ "holder", NODE_IGNTEXT },
+	{ "info", NODE_IGNTEXT },
+	{ "informaltable", NODE_IGNTEXT }, 
+	{ "itemizedlist", NODE_IGNTEXT }, 
 	{ "link", 0 }, 
 	{ "listitem", NODE_IGNTEXT }, 
 	{ "literal", 0 }, 
@@ -152,6 +157,7 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "thead", NODE_IGNTEXT }, 
 	{ "tip", NODE_IGNTEXT }, 
 	{ "title", 0 }, 
+	{ "trademark", 0 }, 
 	{ "ulink", 0 }, 
 	{ "userinput", 0 }, 
 	{ "variablelist", NODE_IGNTEXT }, 
@@ -159,6 +165,7 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "varname", 0 }, 
 	{ "warning", NODE_IGNTEXT }, 
 	{ "wordasword", 0 }, 
+	{ "year", NODE_IGNTEXT }, 
 };
 
 static void
@@ -263,7 +270,8 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 	struct pattr	 *pattr;
 	const XML_Char	**att;
 
-	if (ps->stop)
+	/* FIXME: find a better way to ditch other namespaces. */
+	if (ps->stop || 0 == strcmp(name, "xi:include"))
 		return;
 
 	/* Close out text node, if applicable... */
@@ -275,6 +283,7 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 		ps->node = ps->cur->node;
 	}
 
+
 	for (node = 0; node < NODE__MAX; node++)
 		if (NULL == nodes[node].name)
 			continue;
@@ -383,8 +392,11 @@ xml_elem_end(void *arg, const XML_Char *name)
 {
 	struct parse	*ps = arg;
 
+	/* FIXME: find a better way to ditch other namespaces. */
 	if (ps->stop || NODE_ROOT == ps->node)
 		return;
+	else if (0 == strcmp(name, "xi:include"))
+		return;
 
 	/* Close out text node, if applicable... */
 	if (NODE_TEXT == ps->node) {
@@ -521,6 +533,7 @@ pnode_findfirst(struct pnode *pn, enum nodeid node)
 
 #define MACROLINE_NORM	0
 #define MACROLINE_UPPER	1
+#define	MACROLINE_NOWS 2
 /*
  * Recursively print text presumably on a macro line.
  * Convert all whitespace to regular spaces.
@@ -530,7 +543,7 @@ pnode_printmacrolinetext(struct parse *p, struct pnode
 {
 	char		*cp;
 
-	if (0 == p->newln)
+	if (0 == p->newln && ! (MACROLINE_NOWS & fl))
 		putchar(' ');
 
 	bufclear(p);
@@ -686,16 +699,12 @@ pnode_printciterefentry(struct parse *p, struct pnode 
 	struct pnode	*pp, *title, *manvol;
 
 	title = manvol = NULL;
-	assert(p->newln);
 	TAILQ_FOREACH(pp, &pn->childq, child)
 		if (NODE_MANVOLNUM == pp->node)
 			manvol = pp;
 		else if (NODE_REFENTRYTITLE == pp->node)
 			title = pp;
 
-	fputs(".Xr", stdout);
-	p->newln = 0;
-
 	if (NULL != title) {
 		pnode_printmacrolinepart(p, title);
 	} else
@@ -705,7 +714,7 @@ pnode_printciterefentry(struct parse *p, struct pnode 
 		puts(" 1");
 		p->newln = 1;
 	} else
-		pnode_printmacroline(p, manvol);
+		pnode_printmacrolinepart(p, manvol);
 }
 
 static void
@@ -784,7 +793,7 @@ pnode_printparamdef(struct parse *p, struct pnode *pn)
 	fputs(".Fa \"", stdout);
 	p->newln = 0;
 	if (NULL != ptype) {
-		pnode_printmacrolinepart(p, ptype);
+		pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS);
 		putchar(' ');
 	}
 
@@ -938,6 +947,7 @@ pnode_printvarlistentry(struct parse *p, struct pnode 
 	assert(p->newln);
 	TAILQ_FOREACH(pp, &pn->childq, child)
 		if (NODE_TERM == pp->node) {
+			assert(p->newln);
 			fputs(".It", stdout);
 			p->newln = 0;
 			pnode_print(p, pp);
@@ -1079,7 +1089,8 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_unlinksub(pn);
 		break;
 	case (NODE_CITEREFENTRY):
-		assert(p->newln);
+		pnode_printmopen(p);
+		fputs("Xr", stdout);
 		pnode_printciterefentry(p, pn);
 		pnode_unlinksub(pn);
 		break;
@@ -1091,6 +1102,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmopen(p);
 		fputs("Nm", stdout);
 		break;
+	case (NODE_CONSTANT):
+		pnode_printmopen(p);
+		fputs("Dv", stdout);
+		break;
 	case (NODE_EMPHASIS):
 		pnode_printmopen(p);
 		fputs("Em", stdout);
@@ -1149,8 +1164,8 @@ pnode_print(struct parse *p, struct pnode *pn)
 		/* Suppress non-text children... */
 		pnode_printmopen(p);
 		fputs("Fa \"", stdout);
-		pnode_printmacrolinepart(p, pn);
-		puts("\"");
+		pnode_printmacrolinetext(p, pn, MACROLINE_NOWS);
+		fputs("\"", stdout);
 		pnode_unlinksub(pn);
 		break;
 	case (NODE_QUOTE):
@@ -1227,6 +1242,8 @@ pnode_print(struct parse *p, struct pnode *pn)
 		fputs("Vt", stdout);
 		break;
 	case (NODE_TABLE):
+		/* FALLTHROUGH */
+	case (NODE_INFORMALTABLE):
 		assert(p->newln);
 		pnode_printtable(p, pn);
 		pnode_unlinksub(pn);
@@ -1297,8 +1314,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 	switch (pn->node) {
 	case (NODE_APPLICATION):
 	case (NODE_ARG):
+	case (NODE_CITEREFENTRY):
 	case (NODE_CODE):
 	case (NODE_COMMAND):
+	case (NODE_CONSTANT):
 	case (NODE_EMPHASIS):
 	case (NODE_ENVAR):
 	case (NODE_FILENAME):