===================================================================
RCS file: /cvs/docbook2mdoc/node.h,v
retrieving revision 1.14
retrieving revision 1.19
diff -u -p -r1.14 -r1.19
--- docbook2mdoc/node.h	2019/04/09 01:39:09	1.14
+++ docbook2mdoc/node.h	2019/04/12 11:37:09	1.19
@@ -1,4 +1,4 @@
-/* $Id: node.h,v 1.14 2019/04/09 01:39:09 schwarze Exp $ */
+/* $Id: node.h,v 1.19 2019/04/12 11:37:09 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -82,6 +82,7 @@ enum	nodeid {
 	NODE_LITERAL,
 	NODE_LITERALLAYOUT,
 	NODE_MANVOLNUM,
+	NODE_MARKUP,
 	NODE_MEMBER,
 	NODE_MML_MATH,
 	NODE_MML_MFENCED,
@@ -123,7 +124,6 @@ enum	nodeid {
 	NODE_SBR,
 	NODE_SCREEN,
 	NODE_SECTION,
-	NODE_SGMLTAG,
 	NODE_SIMPLELIST,
 	NODE_SPANSPEC,
 	NODE_SUBTITLE,
@@ -207,8 +207,6 @@ struct	pattr {
 struct	pnode {
 	enum nodeid	 node;     /* Node type. */
 	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. */
@@ -222,14 +220,15 @@ struct	pnode {
 struct	ptree {
 	struct pnode	*root;     /* The document element. */
 	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. */
+#define	TREE_ERROR	 (1 << 0)  /* A parse error occurred. */
+#define	TREE_WARN	 (1 << 1)  /* A parser warning occurred. */
+#define	TREE_CLOSED	 (1 << 3)  /* The document element was closed. */
 };
 
 
 enum attrkey	 attrkey_parse(const char *);
 enum attrval	 attrval_parse(const char *);
+struct pnode	*pnode_alloc(struct pnode *);
 void		 pnode_unlink(struct pnode *);
 void		 pnode_unlinksub(struct pnode *);
 enum attrval	 pnode_getattr(struct pnode *, enum attrkey);