===================================================================
RCS file: /cvs/docbook2mdoc/node.h,v
retrieving revision 1.2
retrieving revision 1.9
diff -u -p -r1.2 -r1.9
--- docbook2mdoc/node.h	2019/03/26 20:54:43	1.2
+++ docbook2mdoc/node.h	2019/04/03 17:53:02	1.9
@@ -1,4 +1,4 @@
-/* $Id: node.h,v 1.2 2019/03/26 20:54:43 schwarze Exp $ */
+/* $Id: node.h,v 1.9 2019/04/03 17:53:02 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,12 +26,11 @@
  * More DocBook XML elements are recognized, but remapped or discarded.
  */
 enum	nodeid {
-	NODE_IGNORE = 0,  /* Must come first. */
-	NODE_WARN,
+	NODE_DELETE_WARN,
+	NODE_DELETE,
+	NODE_IGNORE,
 	/* Alpha-ordered hereafter. */
-	NODE_ACRONYM,
 	NODE_AFFILIATION,
-	NODE_ANCHOR,
 	NODE_APPLICATION,
 	NODE_ARG,
 	NODE_AUTHOR,
@@ -43,10 +42,10 @@ enum	nodeid {
 	NODE_CITEREFENTRY,
 	NODE_CITETITLE,
 	NODE_CMDSYNOPSIS,
-	NODE_CODE,
 	NODE_COLSPEC,
 	NODE_COMMAND,
 	NODE_CONSTANT,
+	NODE_CONTRIB,
 	NODE_COPYRIGHT,
 	NODE_DATE,
 	NODE_EDITOR,
@@ -54,9 +53,10 @@ enum	nodeid {
 	NODE_EMPHASIS,
 	NODE_ENTRY,
 	NODE_ENVAR,
+	NODE_ERRORNAME,
+	NODE_ESCAPE,
 	NODE_FIELDSYNOPSIS,
 	NODE_FILENAME,
-	NODE_FIRSTNAME,
 	NODE_FIRSTTERM,
 	NODE_FOOTNOTE,
 	NODE_FUNCDEF,
@@ -68,10 +68,8 @@ enum	nodeid {
 	NODE_GROUP,
 	NODE_HOLDER,
 	NODE_INDEX,
-	NODE_INDEXTERM,
 	NODE_INFO,
 	NODE_INFORMALEQUATION,
-	NODE_INFORMALTABLE,
 	NODE_INLINEEQUATION,
 	NODE_ITEMIZEDLIST,
 	NODE_KEYSYM,
@@ -96,14 +94,11 @@ enum	nodeid {
 	NODE_OPTION,
 	NODE_ORDEREDLIST,
 	NODE_ORGNAME,
-	NODE_OTHERNAME,
 	NODE_PARA,
 	NODE_PARAMDEF,
 	NODE_PARAMETER,
 	NODE_PERSONNAME,
-	NODE_PHRASE,
 	NODE_PREFACE,
-	NODE_PRIMARY,
 	NODE_PROGRAMLISTING,
 	NODE_PROMPT,
 	NODE_QUOTE,
@@ -124,14 +119,11 @@ enum	nodeid {
 	NODE_ROW,
 	NODE_SBR,
 	NODE_SCREEN,
-	NODE_SECONDARY,
 	NODE_SECTION,
 	NODE_SGMLTAG,
 	NODE_SIMPLELIST,
 	NODE_SPANSPEC,
-	NODE_STRUCTNAME,
 	NODE_SUBTITLE,
-	NODE_SURNAME,
 	NODE_SYNOPSIS,
 	NODE_TABLE,
 	NODE_TBODY,
@@ -142,10 +134,8 @@ enum	nodeid {
 	NODE_THEAD,
 	NODE_TIP,
 	NODE_TITLE,
-	NODE_TRADEMARK,
 	NODE_TYPE,
 	NODE_ULINK,
-	NODE_USERINPUT,
 	NODE_VARIABLELIST,
 	NODE_VARLISTENTRY,
 	NODE_VARNAME,
@@ -164,6 +154,7 @@ enum	attrkey {
 	ATTRKEY_CHOICE = 0,
 	ATTRKEY_CLASS,
 	ATTRKEY_CLOSE,
+	ATTRKEY_COLS,
 	ATTRKEY_ID,
 	ATTRKEY_LINKEND,
 	ATTRKEY_OPEN,
@@ -221,6 +212,7 @@ struct	ptree {
 	int		 flags;
 #define	TREE_FAIL	 (1 << 0)  /* A fatal parse error occurred. */
 #define	TREE_EQN	 (1 << 1)  /* The document needs inline eqn(7). */
+#define	TREE_CLOSED	 (1 << 2)  /* The document element was closed. */
 };