=================================================================== RCS file: /cvs/docbook2mdoc/node.h,v retrieving revision 1.15 retrieving revision 1.19 diff -u -p -r1.15 -r1.19 --- docbook2mdoc/node.h 2019/04/09 15:23:51 1.15 +++ docbook2mdoc/node.h 2019/04/12 11:37:09 1.19 @@ -1,4 +1,4 @@ -/* $Id: node.h,v 1.15 2019/04/09 15:23:51 schwarze Exp $ */ +/* $Id: node.h,v 1.19 2019/04/12 11:37:09 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -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. */ @@ -224,13 +222,13 @@ struct ptree { int flags; #define TREE_ERROR (1 << 0) /* A parse error occurred. */ #define TREE_WARN (1 << 1) /* A parser warning occurred. */ -#define TREE_EQN (1 << 2) /* The document needs inline eqn(7). */ #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);