===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.28
retrieving revision 1.33
diff -u -p -r1.28 -r1.33
--- docbook2mdoc/docbook2mdoc.c	2014/04/02 10:27:29	1.28
+++ docbook2mdoc/docbook2mdoc.c	2014/04/30 09:26:10	1.33
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.28 2014/04/02 10:27:29 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.33 2014/04/30 09:26:10 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -88,12 +88,16 @@ static	const char *attrvals[ATTRVAL__MAX] = {
 static	const struct node nodes[NODE__MAX] = {
 	{ NULL, 0 }, 
 	{ "acronym", 0 }, 
+	{ "anchor", NODE_IGNTEXT }, 
 	{ "application", 0 }, 
 	{ "arg", 0 }, 
+	{ "caution", NODE_IGNTEXT }, 
 	{ "citerefentry", NODE_IGNTEXT }, 
 	{ "cmdsynopsis", NODE_IGNTEXT }, 
 	{ "code", 0 }, 
 	{ "command", 0 }, 
+	{ "constant", 0 }, 
+	{ "copyright", NODE_IGNTEXT }, 
 	{ "date", 0 }, 
 	{ "emphasis", 0 },
 	{ "entry", 0 },
@@ -104,12 +108,15 @@ 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 },
+	{ "itemizedlist", NODE_IGNTEXT }, 
 	{ "link", 0 }, 
 	{ "listitem", NODE_IGNTEXT }, 
 	{ "literal", 0 }, 
 	{ "manvolnum", 0 }, 
+	{ "note", NODE_IGNTEXT }, 
 	{ "option", 0 }, 
 	{ "orderedlist", NODE_IGNTEXT }, 
 	{ "para", 0 }, 
@@ -130,11 +137,14 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "refpurpose", 0 }, 
 	{ "refsect1", NODE_IGNTEXT }, 
 	{ "refsect2", NODE_IGNTEXT }, 
+	{ "refsect3", NODE_IGNTEXT }, 
+	{ "refsection", NODE_IGNTEXT }, 
 	{ "refsynopsisdiv", NODE_IGNTEXT }, 
 	{ "replaceable", 0 }, 
 	{ "row", NODE_IGNTEXT }, 
 	{ "sbr", NODE_IGNTEXT }, 
 	{ "screen", NODE_IGNTEXT }, 
+	{ "sgmltag", 0 }, 
 	{ "structname", 0 }, 
 	{ "synopsis", 0 }, 
 	{ "table", NODE_IGNTEXT }, 
@@ -144,12 +154,17 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "tfoot", NODE_IGNTEXT }, 
 	{ "tgroup", NODE_IGNTEXT }, 
 	{ "thead", NODE_IGNTEXT }, 
+	{ "tip", NODE_IGNTEXT }, 
 	{ "title", 0 }, 
+	{ "trademark", 0 }, 
 	{ "ulink", 0 }, 
 	{ "userinput", 0 }, 
 	{ "variablelist", NODE_IGNTEXT }, 
 	{ "varlistentry", NODE_IGNTEXT }, 
 	{ "varname", 0 }, 
+	{ "warning", NODE_IGNTEXT }, 
+	{ "wordasword", 0 }, 
+	{ "year", NODE_IGNTEXT }, 
 };
 
 static void
@@ -326,15 +341,17 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 			if (0 == strcmp(*att, attrkeys[key]))
 				break;
 		if (ATTRKEY__MAX == key) {
-			fprintf(stderr, "%s:%zu:%zu: unknown "
-				"attribute \"%s\"\n", ps->fname, 
+			fprintf(stderr, "%s:%zu:%zu: warning: "
+				"unknown attribute \"%s\"\n", 
+				ps->fname, 
 				XML_GetCurrentLineNumber(ps->xml),
 				XML_GetCurrentColumnNumber(ps->xml), 
 				*att);
 			continue;
 		} else if ( ! isattrkey(node, key)) {
-			fprintf(stderr, "%s:%zu:%zu: bad "
-				"attribute \"%s\"\n", ps->fname, 
+			fprintf(stderr, "%s:%zu:%zu: warning: "
+				"bad attribute \"%s\"\n", 
+				ps->fname, 
 				XML_GetCurrentLineNumber(ps->xml),
 				XML_GetCurrentColumnNumber(ps->xml), 
 				*att);
@@ -344,8 +361,9 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 			if (0 == strcmp(*(att + 1), attrvals[val]))
 				break;
 		if (ATTRVAL__MAX != val && ! isattrval(key, val)) {
-			fprintf(stderr, "%s:%zu:%zu: bad "
-				"value \"%s\"\n", ps->fname, 
+			fprintf(stderr, "%s:%zu:%zu: warning: "
+				"bad attribute value \"%s\"\n", 
+				ps->fname, 
 				XML_GetCurrentLineNumber(ps->xml),
 				XML_GetCurrentColumnNumber(ps->xml), 
 				*(att + 1));
@@ -509,6 +527,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.
@@ -518,7 +537,7 @@ pnode_printmacrolinetext(struct parse *p, struct pnode
 {
 	char		*cp;
 
-	if (0 == p->newln)
+	if (0 == p->newln && ! (MACROLINE_NOWS & fl))
 		putchar(' ');
 
 	bufclear(p);
@@ -621,10 +640,34 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 		if (NODE_TITLE == pp->node)
 			break;
 
-	if (NODE_REFSECT1 == pn->node)
+	switch (pn->node) {
+	case (NODE_REFSECT1):
 		fputs(".Sh", stdout);
-	else
+		break;
+	case (NODE_REFSECT2):
 		fputs(".Ss", stdout);
+		break;
+	case (NODE_REFSECT3):
+		puts(".Pp");
+		fputs(".Sy", stdout);
+		break;
+	case (NODE_NOTE):
+		/* FALLTHROUGH */
+	case (NODE_REFSECTION):
+		/* FALLTHROUGH */
+	case (NODE_TIP):
+		/* FALLTHROUGH */
+	case (NODE_CAUTION):
+		/* FALLTHROUGH */
+	case (NODE_WARNING):
+		puts(".Pp");
+		if (NULL == pp)
+			return;
+		fputs(".Em", stdout);
+		break;
+	default:
+		break;
+	}
 
 	p->newln = 0;
 
@@ -635,7 +678,8 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 		pnode_printmclose(p, 1);
 		pnode_unlink(pp);
 	} else {
-		puts("UNKNOWN");
+		puts(NODE_REFSECT1 == pn->node ?
+			"UNKNOWN" : "unknown");
 		p->newln = 1;
 	}
 }
@@ -747,7 +791,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(' ');
 	}
 
@@ -901,6 +945,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);
@@ -1034,6 +1079,9 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_printmopen(p);
 		fputs("Nm", stdout);
 		break;
+	case (NODE_ANCHOR):
+		/* Don't print anything! */
+		return;
 	case (NODE_ARG):
 		pnode_printarg(p, pn);
 		pnode_unlinksub(pn);
@@ -1051,6 +1099,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);
@@ -1109,8 +1161,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):
@@ -1155,6 +1207,18 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_REFSECT1):
 		/* FALLTHROUGH */
 	case (NODE_REFSECT2):
+		/* FALLTHROUGH */
+	case (NODE_REFSECT3):
+		/* FALLTHROUGH */
+	case (NODE_REFSECTION):
+		/* FALLTHROUGH */
+	case (NODE_NOTE):
+		/* FALLTHROUGH */
+	case (NODE_TIP):
+		/* FALLTHROUGH */
+	case (NODE_CAUTION):
+		/* FALLTHROUGH */
+	case (NODE_WARNING):
 		assert(p->newln);
 		pnode_printrefsect(p, pn);
 		break;
@@ -1166,6 +1230,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		assert(p->newln);
 		puts(".br");
 		break;
+	case (NODE_SGMLTAG):
+		pnode_printmopen(p);
+		fputs("Li", stdout);
+		break;
 	case (NODE_STRUCTNAME):
 		pnode_printmopen(p);
 		fputs("Vt", stdout);
@@ -1243,6 +1311,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_ARG):
 	case (NODE_CODE):
 	case (NODE_COMMAND):
+	case (NODE_CONSTANT):
 	case (NODE_EMPHASIS):
 	case (NODE_ENVAR):
 	case (NODE_FILENAME):
@@ -1253,6 +1322,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case (NODE_PARAMETER):
 	case (NODE_REPLACEABLE):
 	case (NODE_REFPURPOSE):
+	case (NODE_SGMLTAG):
 	case (NODE_STRUCTNAME):
 	case (NODE_TEXT):
 	case (NODE_USERINPUT):
@@ -1315,7 +1385,9 @@ readfile(XML_Parser xp, int fd, 
 
 	while ((ssz = read(fd, b, bsz)) >= 0) {
 		if (0 == (rc = XML_Parse(xp, b, ssz, 0 == ssz)))
-			fprintf(stderr, "%s: %s\n", fn,
+			fprintf(stderr, "%s:%zu:%zu: %s\n", fn,
+				XML_GetCurrentLineNumber(xp),
+				XML_GetCurrentColumnNumber(xp), 
 				XML_ErrorString
 				(XML_GetErrorCode(xp)));
 		else if ( ! p.stop && ssz > 0)