===================================================================
RCS file: /cvs/docbook2mdoc/node.h,v
retrieving revision 1.20
retrieving revision 1.25
diff -u -p -r1.20 -r1.25
--- docbook2mdoc/node.h	2019/04/12 16:40:53	1.20
+++ docbook2mdoc/node.h	2019/04/14 18:07:35	1.25
@@ -1,4 +1,4 @@
-/* $Id: node.h,v 1.20 2019/04/12 16:40:53 schwarze Exp $ */
+/* $Id: node.h,v 1.25 2019/04/14 18:07:35 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -39,9 +39,7 @@ enum	nodeclass {
  * More DocBook XML elements are recognized, but remapped or discarded.
  */
 enum	nodeid {
-	NODE_AFFILIATION,
 	NODE_APPENDIX,
-	NODE_APPLICATION,
 	NODE_ARG,
 	NODE_AUTHOR,
 	NODE_AUTHORGROUP,
@@ -76,7 +74,6 @@ enum	nodeid {
 	NODE_FUNCTION,
 	NODE_GLOSSTERM,
 	NODE_GROUP,
-	NODE_HOLDER,
 	NODE_INCLUDE,
 	NODE_INDEX,
 	NODE_INFO,
@@ -105,7 +102,6 @@ enum	nodeid {
 	NODE_NOTE,
 	NODE_OPTION,
 	NODE_ORDEREDLIST,
-	NODE_ORGNAME,
 	NODE_PARA,
 	NODE_PARAMDEF,
 	NODE_PARAMETER,
@@ -113,6 +109,7 @@ enum	nodeid {
 	NODE_PREFACE,
 	NODE_PROGRAMLISTING,
 	NODE_PROMPT,
+	NODE_PUBDATE,
 	NODE_QUOTE,
 	NODE_REFCLASS,
 	NODE_REFDESCRIPTOR,
@@ -126,16 +123,17 @@ enum	nodeid {
 	NODE_REFNAMEDIV,
 	NODE_REFPURPOSE,
 	NODE_REFSYNOPSISDIV,
-	NODE_RELEASEINFO,
 	NODE_REPLACEABLE,
 	NODE_ROW,
 	NODE_SBR,
 	NODE_SCREEN,
 	NODE_SECTION,
 	NODE_SIMPLELIST,
+	NODE_SIMPLESECT,
 	NODE_SPANSPEC,
 	NODE_SUBTITLE,
 	NODE_SYNOPSIS,
+	NODE_SYSTEMITEM,
 	NODE_TABLE,
 	NODE_TBODY,
 	NODE_TERM,
@@ -150,7 +148,6 @@ enum	nodeid {
 	NODE_VARNAME,
 	NODE_WARNING,
 	NODE_WORDASWORD,
-	NODE_YEAR,
 	NODE_UNKNOWN,
 	NODE_TEXT,
 	NODE_ESCAPE,
@@ -190,12 +187,15 @@ enum	attrkey {
  */
 enum	attrval {
 	/* Alpha-order... */
+	ATTRVAL_EVENT,
+	ATTRVAL_IPADDRESS,
 	ATTRVAL_MONOSPACED,
 	ATTRVAL_NOREPEAT,
 	ATTRVAL_OPT,
 	ATTRVAL_PLAIN,
 	ATTRVAL_REPEAT,
 	ATTRVAL_REQ,
+	ATTRVAL_SYSTEMNAME,
 	ATTRVAL__MAX
 };
 
@@ -238,7 +238,9 @@ struct	ptree {
 
 
 enum attrkey	 attrkey_parse(const char *);
+const char	*attrkey_name(enum attrkey);
 enum attrval	 attrval_parse(const char *);
+const char	*attr_getval(const struct pattr *a);
 enum nodeid	 pnode_parse(const char *name);
 const char	*pnode_name(enum nodeid);
 enum nodeclass	 pnode_class(enum nodeid);
@@ -249,3 +251,4 @@ void		 pnode_unlinksub(struct pnode *);
 enum attrval	 pnode_getattr(struct pnode *, enum attrkey);
 const char	*pnode_getattr_raw(struct pnode *, enum attrkey, const char *);
 struct pnode	*pnode_findfirst(struct pnode *, enum nodeid);
+struct pnode	*pnode_takefirst(struct pnode *, enum nodeid);