===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.25
retrieving revision 1.31
diff -u -p -r1.25 -r1.31
--- docbook2mdoc/docbook2mdoc.c	2014/04/02 07:48:34	1.25
+++ docbook2mdoc/docbook2mdoc.c	2014/04/02 12:27:05	1.31
@@ -1,4 +1,4 @@
-/*	$Id: docbook2mdoc.c,v 1.25 2014/04/02 07:48:34 kristaps Exp $ */
+/*	$Id: docbook2mdoc.c,v 1.31 2014/04/02 12:27:05 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -88,7 +88,10 @@ 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 }, 
@@ -109,6 +112,7 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "listitem", NODE_IGNTEXT }, 
 	{ "literal", 0 }, 
 	{ "manvolnum", 0 }, 
+	{ "note", NODE_IGNTEXT }, 
 	{ "option", 0 }, 
 	{ "orderedlist", NODE_IGNTEXT }, 
 	{ "para", 0 }, 
@@ -116,6 +120,7 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "parameter", 0 }, 
 	{ "programlisting", 0 }, 
 	{ "prompt", 0 }, 
+	{ "quote", 0 }, 
 	{ "refclass", NODE_IGNTEXT }, 
 	{ "refdescriptor", NODE_IGNTEXT }, 
 	{ "refentry", NODE_IGNTEXT }, 
@@ -128,11 +133,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 }, 
@@ -142,11 +150,15 @@ static	const struct node nodes[NODE__MAX] = {
 	{ "tfoot", NODE_IGNTEXT }, 
 	{ "tgroup", NODE_IGNTEXT }, 
 	{ "thead", NODE_IGNTEXT }, 
+	{ "tip", NODE_IGNTEXT }, 
 	{ "title", 0 }, 
 	{ "ulink", 0 }, 
 	{ "userinput", 0 }, 
 	{ "variablelist", NODE_IGNTEXT }, 
 	{ "varlistentry", NODE_IGNTEXT }, 
+	{ "varname", 0 }, 
+	{ "warning", NODE_IGNTEXT }, 
+	{ "wordasword", 0 }, 
 };
 
 static void
@@ -323,15 +335,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);
@@ -341,8 +355,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));
@@ -618,10 +633,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;
 
@@ -632,7 +671,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;
 	}
 }
@@ -1027,6 +1067,13 @@ pnode_print(struct parse *p, struct pnode *pn)
 	sv = p->newln;
 
 	switch (pn->node) {
+	case (NODE_APPLICATION):
+		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);
@@ -1106,6 +1153,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		puts("\"");
 		pnode_unlinksub(pn);
 		break;
+	case (NODE_QUOTE):
+		pnode_printmopen(p);
+		fputs("Qo", stdout);
+		break;
 	case (NODE_PROGRAMLISTING):
 		/* FALLTHROUGH */
 	case (NODE_SCREEN):
@@ -1144,6 +1195,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;
@@ -1155,6 +1218,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);
@@ -1203,6 +1270,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		}
 		p->newln = 0;
 		break;
+	case (NODE_USERINPUT):
+		pnode_printmopen(p);
+		fputs("Li", stdout);
+		break;
 	case (NODE_VARIABLELIST):
 		assert(p->newln);
 		pnode_printvariablelist(p, pn);
@@ -1212,9 +1283,9 @@ pnode_print(struct parse *p, struct pnode *pn)
 		assert(p->newln);
 		pnode_printvarlistentry(p, pn);
 		break;
-	case (NODE_USERINPUT):
+	case (NODE_VARNAME):
 		pnode_printmopen(p);
-		fputs("Li", stdout);
+		fputs("Va", stdout);
 		break;
 	default:
 		break;
@@ -1224,6 +1295,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_print(p, pp);
 
 	switch (pn->node) {
+	case (NODE_APPLICATION):
 	case (NODE_ARG):
 	case (NODE_CODE):
 	case (NODE_COMMAND):
@@ -1237,11 +1309,20 @@ 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):
+	case (NODE_VARNAME):
 		pnode_printmclose(p, sv);
 		break;
+	case (NODE_QUOTE):
+		pnode_printmclose(p, sv);
+		sv = p->newln;
+		pnode_printmopen(p);
+		fputs("Qc", stdout);
+		pnode_printmclose(p, sv);
+		break;
 	case (NODE_REFNAME):
 		/*
 		 * If we're in the NAME macro and we have multiple
@@ -1291,7 +1372,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)