===================================================================
RCS file: /cvs/docbook2mdoc/node.h,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -p -r1.7 -r1.11
--- docbook2mdoc/node.h	2019/04/02 15:53:02	1.7
+++ docbook2mdoc/node.h	2019/04/07 17:00:56	1.11
@@ -1,4 +1,4 @@
-/* $Id: node.h,v 1.7 2019/04/02 15:53:02 schwarze Exp $ */
+/* $Id: node.h,v 1.11 2019/04/07 17:00:56 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -42,7 +42,6 @@ enum	nodeid {
 	NODE_CITEREFENTRY,
 	NODE_CITETITLE,
 	NODE_CMDSYNOPSIS,
-	NODE_CODE,
 	NODE_COLSPEC,
 	NODE_COMMAND,
 	NODE_CONSTANT,
@@ -54,6 +53,7 @@ enum	nodeid {
 	NODE_EMPHASIS,
 	NODE_ENTRY,
 	NODE_ENVAR,
+	NODE_ERRORNAME,
 	NODE_ESCAPE,
 	NODE_FIELDSYNOPSIS,
 	NODE_FILENAME,
@@ -70,7 +70,6 @@ enum	nodeid {
 	NODE_INDEX,
 	NODE_INFO,
 	NODE_INFORMALEQUATION,
-	NODE_INFORMALTABLE,
 	NODE_INLINEEQUATION,
 	NODE_ITEMIZEDLIST,
 	NODE_KEYSYM,
@@ -124,7 +123,6 @@ enum	nodeid {
 	NODE_SGMLTAG,
 	NODE_SIMPLELIST,
 	NODE_SPANSPEC,
-	NODE_STRUCTNAME,
 	NODE_SUBTITLE,
 	NODE_SYNOPSIS,
 	NODE_TABLE,
@@ -138,7 +136,6 @@ enum	nodeid {
 	NODE_TITLE,
 	NODE_TYPE,
 	NODE_ULINK,
-	NODE_USERINPUT,
 	NODE_VARIABLELIST,
 	NODE_VARLISTENTRY,
 	NODE_VARNAME,
@@ -157,10 +154,14 @@ enum	attrkey {
 	ATTRKEY_CHOICE = 0,
 	ATTRKEY_CLASS,
 	ATTRKEY_CLOSE,
+	ATTRKEY_COLS,
+	ATTRKEY_ENDTERM,
 	ATTRKEY_ID,
 	ATTRKEY_LINKEND,
 	ATTRKEY_OPEN,
 	ATTRKEY_REP,
+	ATTRKEY_URL,
+	ATTRKEY_XLINK_HREF,
 	ATTRKEY__MAX
 };
 
@@ -200,6 +201,7 @@ struct	pnode {
 	char		*b;        /* String value. */
 	char		*real;     /* Storage for "b". */
 	size_t		 bsz;      /* strlen(b) */
+	int		 spc;      /* Whitespace before this node. */
 	struct pnode	*parent;   /* Parent node or NULL. */
 	struct pnodeq	 childq;   /* Queue of children. */
 	struct pattrq	 attrq;    /* Attributes of the node. */