=================================================================== RCS file: /cvs/docbook2mdoc/node.c,v retrieving revision 1.22 retrieving revision 1.27 diff -u -p -r1.22 -r1.27 --- docbook2mdoc/node.c 2019/04/16 21:21:27 1.22 +++ docbook2mdoc/node.c 2019/05/01 11:34:20 1.27 @@ -1,4 +1,4 @@ -/* $Id: node.c,v 1.22 2019/04/16 21:21:27 schwarze Exp $ */ +/* $Id: node.c,v 1.27 2019/05/01 11:34:20 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -19,6 +19,7 @@ #include #include +#include "xmalloc.h" #include "node.h" /* @@ -31,6 +32,7 @@ struct nodeprop { }; static const struct nodeprop properties[] = { + { "abstract", CLASS_BLOCK }, { "appendix", CLASS_BLOCK }, { "arg", CLASS_ENCL }, { "author", CLASS_LINE }, @@ -143,9 +145,11 @@ static const struct nodeprop properties[] = { { "variablelist", CLASS_BLOCK }, { "varlistentry", CLASS_BLOCK }, { "varname", CLASS_LINE }, + { "void", CLASS_TEXT }, { "warning", CLASS_BLOCK }, { "wordasword", CLASS_TRANS }, { "xref", CLASS_LINE }, + { "year", CLASS_TRANS }, { "[UNKNOWN]", CLASS_VOID }, { "(t)", CLASS_TEXT }, { "(e)", CLASS_TEXT } @@ -251,12 +255,22 @@ pnode_alloc(struct pnode *np) { struct pnode *n; - if ((n = calloc(1, sizeof(*n))) != NULL) { - TAILQ_INIT(&n->childq); - TAILQ_INIT(&n->attrq); - if ((n->parent = np) != NULL) - TAILQ_INSERT_TAIL(&np->childq, n, child); - } + n = xcalloc(1, sizeof(*n)); + TAILQ_INIT(&n->childq); + TAILQ_INIT(&n->attrq); + if ((n->parent = np) != NULL) + TAILQ_INSERT_TAIL(&np->childq, n, child); + return n; +} + +struct pnode * +pnode_alloc_text(struct pnode *np, const char *text) +{ + struct pnode *n; + + n = pnode_alloc(np); + n->node = NODE_TEXT; + n->b = xstrdup(text); return n; }