===================================================================
RCS file: /cvs/docbook2mdoc/node.c,v
retrieving revision 1.13
retrieving revision 1.21
diff -u -p -r1.13 -r1.21
--- docbook2mdoc/node.c	2019/04/13 15:54:45	1.13
+++ docbook2mdoc/node.c	2019/04/16 14:58:19	1.21
@@ -1,4 +1,4 @@
-/* $Id: node.c,v 1.13 2019/04/13 15:54:45 schwarze Exp $ */
+/* $Id: node.c,v 1.21 2019/04/16 14:58:19 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,9 +31,7 @@ struct	nodeprop {
 };
 
 static	const struct nodeprop properties[] = {
-	{ "affiliation",	CLASS_TRANS },
 	{ "appendix",		CLASS_BLOCK },
-	{ "application",	CLASS_LINE },
 	{ "arg",		CLASS_ENCL },
 	{ "author",		CLASS_LINE },
 	{ "authorgroup",	CLASS_BLOCK },
@@ -47,7 +45,7 @@ static	const struct nodeprop properties[] = {
 	{ "command",		CLASS_LINE },
 	{ "constant",		CLASS_LINE },
 	{ "contrib",		CLASS_TRANS },
-	{ "copyright",		CLASS_TRANS },
+	{ "copyright",		CLASS_LINE },
 	{ "date",		CLASS_TRANS },
 	{ "!DOCTYPE",		CLASS_VOID },
 	{ "editor",		CLASS_LINE },
@@ -60,7 +58,7 @@ static	const struct nodeprop properties[] = {
 	{ "fieldsynopsis",	CLASS_TRANS },
 	{ "filename",		CLASS_LINE },
 	{ "firstterm",		CLASS_LINE },
-	{ "footnote",		CLASS_TRANS },
+	{ "footnote",		CLASS_BLOCK },
 	{ "funcdef",		CLASS_BLOCK },
 	{ "funcprototype",	CLASS_BLOCK },
 	{ "funcsynopsis",	CLASS_TRANS },
@@ -68,7 +66,7 @@ static	const struct nodeprop properties[] = {
 	{ "function",		CLASS_LINE },
 	{ "glossterm",		CLASS_LINE },
 	{ "group",		CLASS_ENCL },
-	{ "holder",		CLASS_TRANS },
+	{ "imagedata",		CLASS_TEXT },
 	{ "xi:include",		CLASS_VOID },
 	{ "index",		CLASS_TRANS },
 	{ "info",		CLASS_TRANS },
@@ -80,7 +78,7 @@ static	const struct nodeprop properties[] = {
 	{ "link",		CLASS_ENCL },
 	{ "listitem",		CLASS_TRANS },
 	{ "literal",		CLASS_ENCL },
-	{ "literallayout",	CLASS_BLOCK },
+	{ "literallayout",	CLASS_NOFILL },
 	{ "manvolnum",		CLASS_TRANS },
 	{ "markup",		CLASS_LINE },
 	{ "member",		CLASS_LINE },
@@ -95,15 +93,15 @@ static	const struct nodeprop properties[] = {
 	{ "mml:msup",		CLASS_LINE },
 	{ "modifier",		CLASS_LINE },
 	{ "note",		CLASS_BLOCK },
+	{ "olink",		CLASS_ENCL },
 	{ "option",		CLASS_LINE },
 	{ "orderedlist",	CLASS_BLOCK },
-	{ "orgname",		CLASS_TRANS },
 	{ "para",		CLASS_BLOCK },
 	{ "paramdef",		CLASS_LINE },
 	{ "parameter",		CLASS_LINE },
 	{ "personname",		CLASS_TRANS },
 	{ "preface",		CLASS_BLOCK },
-	{ "programlisting",	CLASS_BLOCK },
+	{ "programlisting",	CLASS_NOFILL },
 	{ "prompt",		CLASS_TRANS },
 	{ "pubdate",		CLASS_TRANS },
 	{ "quote",		CLASS_ENCL },
@@ -119,16 +117,18 @@ static	const struct nodeprop properties[] = {
 	{ "refnamediv",		CLASS_BLOCK },
 	{ "refpurpose",		CLASS_LINE },
 	{ "refsynopsisdiv",	CLASS_BLOCK },
-	{ "releaseinfo",	CLASS_TRANS },
 	{ "replaceable",	CLASS_LINE },
 	{ "row",		CLASS_BLOCK },
 	{ "sbr",		CLASS_BLOCK },
-	{ "screen",		CLASS_BLOCK },
+	{ "screen",		CLASS_NOFILL },
 	{ "section",		CLASS_BLOCK },
 	{ "simplelist",		CLASS_TRANS },
+	{ "simplesect",		CLASS_BLOCK },
 	{ "spanspec",		CLASS_TRANS },
-	{ "subtitle",		CLASS_TRANS },
-	{ "synopsis",		CLASS_BLOCK },
+	{ "subscript",		CLASS_TEXT },
+	{ "subtitle",		CLASS_BLOCK },
+	{ "superscript",	CLASS_TEXT },
+	{ "synopsis",		CLASS_NOFILL },
 	{ "systemitem",		CLASS_LINE },
 	{ "table",		CLASS_TRANS },
 	{ "tbody",		CLASS_TRANS },
@@ -144,7 +144,7 @@ static	const struct nodeprop properties[] = {
 	{ "varname",		CLASS_LINE },
 	{ "warning",		CLASS_BLOCK },
 	{ "wordasword",		CLASS_TRANS },
-	{ "year",		CLASS_TRANS },
+	{ "xref",		CLASS_LINE },
 	{ "[UNKNOWN]",		CLASS_VOID },
 	{ "(t)",		CLASS_TEXT },
 	{ "(e)",		CLASS_TEXT }
@@ -157,14 +157,19 @@ static	const char *const attrkeys[ATTRKEY__MAX] = {
 	"cols",
 	"DEFINITION",
 	"endterm",
+	"entityref",
+	"fileref",
 	"href",
 	"id",
 	"linkend",
+	"localinfo",
 	"NAME",
 	"open",
 	"PUBLIC",
 	"rep",
 	"SYSTEM",
+	"targetdoc",
+	"targetptr",
 	"url",
 	"xlink:href"
 };