=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.22 retrieving revision 1.26 diff -u -p -r1.22 -r1.26 --- docbook2mdoc/docbook2mdoc.c 2014/03/30 17:22:01 1.22 +++ docbook2mdoc/docbook2mdoc.c 2014/04/02 07:52:14 1.26 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.22 2014/03/30 17:22:01 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.26 2014/04/02 07:52:14 kristaps Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -95,6 +95,7 @@ static const struct node nodes[NODE__MAX] = { { "command", 0 }, { "date", 0 }, { "emphasis", 0 }, + { "entry", 0 }, { "envar", 0 }, { "filename", 0 }, { "funcdef", 0 }, @@ -103,6 +104,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 }, @@ -128,16 +130,24 @@ static const struct node nodes[NODE__MAX] = { { "refsect2", NODE_IGNTEXT }, { "refsynopsisdiv", NODE_IGNTEXT }, { "replaceable", 0 }, + { "row", NODE_IGNTEXT }, { "sbr", NODE_IGNTEXT }, { "screen", NODE_IGNTEXT }, { "structname", 0 }, { "synopsis", 0 }, + { "table", NODE_IGNTEXT }, + { "tbody", NODE_IGNTEXT }, { "term", 0 }, { NULL, 0 }, + { "tfoot", NODE_IGNTEXT }, + { "tgroup", NODE_IGNTEXT }, + { "thead", NODE_IGNTEXT }, { "title", 0 }, { "ulink", 0 }, + { "userinput", 0 }, { "variablelist", NODE_IGNTEXT }, { "varlistentry", NODE_IGNTEXT }, + { "varname", 0 }, }; static void @@ -476,6 +486,25 @@ bufappend_r(struct parse *p, struct pnode *pn) bufappend_r(p, pp); } +/* + * Recursively search and return the first instance of "node". + */ +static struct pnode * +pnode_findfirst(struct pnode *pn, enum nodeid node) +{ + struct pnode *pp, *res; + + res = NULL; + TAILQ_FOREACH(pp, &pn->childq, child) { + res = pp->node == node ? pp : + pnode_findfirst(pp, node); + if (NULL != res) + break; + } + + return(res); +} + #define MACROLINE_NORM 0 #define MACROLINE_UPPER 1 /* @@ -791,23 +820,56 @@ pnode_printarg(struct parse *p, struct pnode *pn) } } -/* - * Recursively search and return the first instance of "node". - */ -static struct pnode * -pnode_findfirst(struct pnode *pn, enum nodeid node) +static void +pnode_printgroup(struct parse *p, struct pnode *pn) { - struct pnode *pp, *res; + struct pnode *pp, *np; + struct pattr *ap; + int isop, sv; - res = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) { - res = pp->node == node ? pp : - pnode_findfirst(pp, node); - if (NULL != res) + 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); + } } - return(res); + pnode_printmclose(p, sv); } static void @@ -850,19 +912,59 @@ pnode_printvarlistentry(struct parse *p, struct pnode } static void -pnode_printitemizedlist(struct parse *p, struct pnode *pn) +pnode_printrow(struct parse *p, struct pnode *pn) { struct pnode *pp; + puts(".Bl -dash -compact"); + + TAILQ_FOREACH(pp, &pn->childq, child) { + assert(p->newln); + puts(".It"); + pnode_print(p, pp); + pnode_printmclose(p, 1); + } assert(p->newln); + puts(".El"); +} + +static void +pnode_printtable(struct parse *p, struct pnode *pn) +{ + struct pnode *pp; + + assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_TITLE == pp->node) { puts(".Pp"); pnode_print(p, pp); pnode_unlink(pp); } + assert(p->newln); + puts(".Bl -ohang"); + while (NULL != (pp = pnode_findfirst(pn, NODE_ROW))) { + puts(".It Table Row"); + pnode_printrow(p, pp); + pnode_printmclose(p, 1); + pnode_unlink(pp); + } + assert(p->newln); + puts(".El"); +} +static void +pnode_printlist(struct parse *p, struct pnode *pn) +{ + struct pnode *pp; + assert(p->newln); + TAILQ_FOREACH(pp, &pn->childq, child) + if (NODE_TITLE == pp->node) { + puts(".Pp"); + pnode_print(p, pp); + pnode_unlink(pp); + } + assert(p->newln); if (NODE_ORDEREDLIST == pn->node) puts(".Bl -enum"); @@ -910,7 +1012,8 @@ pnode_printvariablelist(struct parse *p, struct pnode /* * Print a parsed node (or ignore it--whatever). * This is a recursive function. - * FIXME: macro line continuation? + * FIXME: if we're in a literal context ( or or + * whatever), don't print inline macros. */ static void pnode_print(struct parse *p, struct pnode *pn) @@ -968,11 +1071,14 @@ 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); + pnode_printlist(p, pn); + pnode_unlinksub(pn); break; + case (NODE_GROUP): + pnode_printgroup(p, pn); + pnode_unlinksub(pn); + break; case (NODE_LITERAL): pnode_printmopen(p); fputs("Li", stdout); @@ -981,6 +1087,11 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Fl", stdout); break; + case (NODE_ORDEREDLIST): + assert(p->newln); + pnode_printlist(p, pn); + pnode_unlinksub(pn); + break; case (NODE_PARA): assert(p->newln); if (NULL != pn->parent && @@ -1049,6 +1160,11 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Vt", stdout); break; + case (NODE_TABLE): + assert(p->newln); + pnode_printtable(p, pn); + pnode_unlinksub(pn); + break; case (NODE_TEXT): if (0 == p->newln) putchar(' '); @@ -1088,6 +1204,10 @@ pnode_print(struct parse *p, struct pnode *pn) } p->newln = 0; break; + case (NODE_USERINPUT): + pnode_printmopen(p); + fputs("Li", stdout); + break; case (NODE_VARIABLELIST): assert(p->newln); pnode_printvariablelist(p, pn); @@ -1097,6 +1217,10 @@ pnode_print(struct parse *p, struct pnode *pn) assert(p->newln); pnode_printvarlistentry(p, pn); break; + case (NODE_VARNAME): + pnode_printmopen(p); + fputs("Va", stdout); + break; default: break; } @@ -1120,6 +1244,8 @@ pnode_print(struct parse *p, struct pnode *pn) case (NODE_REFPURPOSE): case (NODE_STRUCTNAME): case (NODE_TEXT): + case (NODE_USERINPUT): + case (NODE_VARNAME): pnode_printmclose(p, sv); break; case (NODE_REFNAME):