===================================================================
RCS file: /cvs/docbook2mdoc/node.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- docbook2mdoc/node.c	2019/03/26 18:32:07	1.1
+++ docbook2mdoc/node.c	2019/04/09 01:39:09	1.6
@@ -1,4 +1,4 @@
-/* $Id: node.c,v 1.1 2019/03/26 18:32:07 schwarze Exp $ */
+/* $Id: node.c,v 1.6 2019/04/09 01:39:09 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,10 +28,19 @@ static	const char *const attrkeys[ATTRKEY__MAX] = {
 	"choice",
 	"class",
 	"close",
+	"cols",
+	"DEFINITION",
+	"endterm",
+	"href",
 	"id",
 	"linkend",
+	"NAME",
 	"open",
-	"rep"
+	"PUBLIC",
+	"rep",
+	"SYSTEM",
+	"url",
+	"xlink:href"
 };
 
 static	const char *const attrvals[ATTRVAL__MAX] = {
@@ -143,8 +152,8 @@ pnode_getattr_raw(struct pnode *pn, enum attrkey key, 
 		return defval;
 	TAILQ_FOREACH(ap, &pn->attrq, child)
 		if (ap->key == key)
-			return ap->val == ATTRVAL__MAX ? ap->rawval :
-			    attrvals[ap->val];
+			return ap->val != ATTRVAL__MAX ? attrvals[ap->val] :
+			    ap->rawval != NULL ? ap->rawval : defval;
 	return defval;
 }