=================================================================== RCS file: /cvs/docbook2mdoc/node.c,v retrieving revision 1.1 retrieving revision 1.4 diff -u -p -r1.1 -r1.4 --- docbook2mdoc/node.c 2019/03/26 18:32:07 1.1 +++ docbook2mdoc/node.c 2019/04/07 17:00:56 1.4 @@ -1,4 +1,4 @@ -/* $Id: node.c,v 1.1 2019/03/26 18:32:07 schwarze Exp $ */ +/* $Id: node.c,v 1.4 2019/04/07 17:00:56 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -28,10 +28,14 @@ static const char *const attrkeys[ATTRKEY__MAX] = { "choice", "class", "close", + "cols", + "endterm", "id", "linkend", "open", - "rep" + "rep", + "url", + "xlink:href" }; static const char *const attrvals[ATTRVAL__MAX] = { @@ -143,8 +147,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; }