=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- docbook2mdoc/docbook2mdoc.c 2014/03/30 17:46:17 1.23 +++ docbook2mdoc/docbook2mdoc.c 2014/03/30 18:15:55 1.24 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.23 2014/03/30 17:46:17 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.24 2014/03/30 18:15:55 kristaps Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -103,6 +103,7 @@ static const struct node nodes[NODE__MAX] = { { "funcsynopsisinfo", 0 }, { "function", 0 }, { "itemizedlist", NODE_IGNTEXT }, + { "group", NODE_IGNTEXT }, { "link", 0 }, { "listitem", NODE_IGNTEXT }, { "literal", 0 }, @@ -792,6 +793,58 @@ pnode_printarg(struct parse *p, struct pnode *pn) } } +static void +pnode_printgroup(struct parse *p, struct pnode *pn) +{ + struct pnode *pp, *np; + struct pattr *ap; + int isop, sv; + + isop = 1; + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ATTRKEY_CHOICE == ap->key && + (ATTRVAL_PLAIN == ap->val || + ATTRVAL_REQ == ap->val)) { + isop = 0; + break; + } + + /* + * Make sure we're on a macro line. + * This will prevent pnode_print() for putting us on a + * subsequent line. + */ + sv = p->newln; + pnode_printmopen(p); + if (isop) + fputs("Op", stdout); + else if (sv) + fputs("No", stdout); + + /* + * Keep on printing text separated by the vertical bar as long + * as we're within the same origin node as the group. + * This is kind of a nightmare. + * Eh, DocBook... + * FIXME: if there's a "Fl", we don't cut off the leading "-" + * like we do in pnode_print(). + */ + TAILQ_FOREACH(pp, &pn->childq, child) { + pnode_print(p, pp); + np = TAILQ_NEXT(pp, child); + while (NULL != np) { + if (pp->node != np->node) + break; + fputs(" |", stdout); + pnode_printmacrolinepart(p, np); + pp = np; + np = TAILQ_NEXT(np, child); + } + } + + pnode_printmclose(p, sv); +} + /* * Recursively search and return the first instance of "node". */ @@ -974,6 +1027,10 @@ pnode_print(struct parse *p, struct pnode *pn) case (NODE_ORDEREDLIST): assert(p->newln); pnode_printitemizedlist(p, pn); + break; + case (NODE_GROUP): + pnode_printgroup(p, pn); + pnode_unlinksub(pn); break; case (NODE_LITERAL): pnode_printmopen(p);