=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- docbook2mdoc/docbook2mdoc.c 2014/03/30 16:57:06 1.20 +++ docbook2mdoc/docbook2mdoc.c 2014/03/30 17:10:50 1.21 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.20 2014/03/30 16:57:06 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.21 2014/03/30 17:10:50 kristaps Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -87,6 +87,7 @@ static const char *attrvals[ATTRVAL__MAX] = { static const struct node nodes[NODE__MAX] = { { NULL, 0 }, + { "acronym", 0 }, { "arg", 0 }, { "citerefentry", NODE_IGNTEXT }, { "cmdsynopsis", NODE_IGNTEXT }, @@ -94,6 +95,7 @@ static const struct node nodes[NODE__MAX] = { { "command", 0 }, { "date", 0 }, { "emphasis", 0 }, + { "envar", 0 }, { "filename", 0 }, { "funcdef", 0 }, { "funcprototype", NODE_IGNTEXT }, @@ -106,6 +108,7 @@ static const struct node nodes[NODE__MAX] = { { "literal", 0 }, { "manvolnum", 0 }, { "option", 0 }, + { "orderedlist", NODE_IGNTEXT }, { "para", 0 }, { "paramdef", 0 }, { "parameter", 0 }, @@ -858,7 +861,12 @@ pnode_printitemizedlist(struct parse *p, struct pnode } assert(p->newln); - puts(".Bl -item"); + + if (NODE_ORDEREDLIST == pn->node) + puts(".Bl -enum"); + else + puts(".Bl -item"); + TAILQ_FOREACH(pp, &pn->childq, child) { assert(p->newln); puts(".It"); @@ -936,6 +944,10 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Em", stdout); break; + case (NODE_ENVAR): + pnode_printmopen(p); + fputs("Ev", stdout); + break; case (NODE_FILENAME): pnode_printmopen(p); fputs("Pa", stdout); @@ -954,6 +966,8 @@ pnode_print(struct parse *p, struct pnode *pn) fputs("Fd", stdout); break; case (NODE_ITEMIZEDLIST): + /* FALLTHROUGH */ + case (NODE_ORDEREDLIST): assert(p->newln); pnode_printitemizedlist(p, pn); break; @@ -1091,6 +1105,7 @@ pnode_print(struct parse *p, struct pnode *pn) case (NODE_CODE): case (NODE_COMMAND): case (NODE_EMPHASIS): + case (NODE_ENVAR): case (NODE_FILENAME): case (NODE_FUNCTION): case (NODE_FUNCSYNOPSISINFO):