=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.19 retrieving revision 1.24 diff -u -p -r1.19 -r1.24 --- docbook2mdoc/docbook2mdoc.c 2014/03/30 16:44:13 1.19 +++ docbook2mdoc/docbook2mdoc.c 2014/03/30 18:15:55 1.24 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.19 2014/03/30 16:44:13 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.24 2014/03/30 18:15:55 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 }, @@ -101,15 +103,18 @@ static const struct node nodes[NODE__MAX] = { { "funcsynopsisinfo", 0 }, { "function", 0 }, { "itemizedlist", NODE_IGNTEXT }, + { "group", NODE_IGNTEXT }, { "link", 0 }, { "listitem", NODE_IGNTEXT }, { "literal", 0 }, { "manvolnum", 0 }, { "option", 0 }, + { "orderedlist", NODE_IGNTEXT }, { "para", 0 }, { "paramdef", 0 }, { "parameter", 0 }, { "programlisting", 0 }, + { "prompt", 0 }, { "refclass", NODE_IGNTEXT }, { "refdescriptor", NODE_IGNTEXT }, { "refentry", NODE_IGNTEXT }, @@ -120,16 +125,19 @@ static const struct node nodes[NODE__MAX] = { { "refname", 0 }, { "refnamediv", NODE_IGNTEXT }, { "refpurpose", 0 }, - { "refsect1", 0 }, + { "refsect1", NODE_IGNTEXT }, + { "refsect2", NODE_IGNTEXT }, { "refsynopsisdiv", NODE_IGNTEXT }, { "replaceable", 0 }, { "sbr", NODE_IGNTEXT }, + { "screen", NODE_IGNTEXT }, { "structname", 0 }, { "synopsis", 0 }, { "term", 0 }, { NULL, 0 }, { "title", 0 }, { "ulink", 0 }, + { "userinput", 0 }, { "variablelist", NODE_IGNTEXT }, { "varlistentry", NODE_IGNTEXT }, }; @@ -584,11 +592,17 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) if (NODE_TITLE == pp->node) break; - fputs(".Sh", stdout); + if (NODE_REFSECT1 == pn->node) + fputs(".Sh", stdout); + else + fputs(".Ss", stdout); + p->newln = 0; if (NULL != pp) { - pnode_printmacrolinetext(p, pp, MACROLINE_UPPER); + pnode_printmacrolinetext(p, pp, + NODE_REFSECT1 == pn->node ? + MACROLINE_UPPER : 0); pnode_printmclose(p, 1); pnode_unlink(pp); } else { @@ -779,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". */ @@ -851,7 +917,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"); @@ -893,7 +964,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) @@ -929,6 +1001,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); @@ -947,9 +1023,15 @@ 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; + case (NODE_GROUP): + pnode_printgroup(p, pn); + pnode_unlinksub(pn); + break; case (NODE_LITERAL): pnode_printmopen(p); fputs("Li", stdout); @@ -957,7 +1039,6 @@ pnode_print(struct parse *p, struct pnode *pn) case (NODE_OPTION): pnode_printmopen(p); fputs("Fl", stdout); - /* FIXME: bogus leading '-'? */ break; case (NODE_PARA): assert(p->newln); @@ -975,6 +1056,8 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_unlinksub(pn); break; case (NODE_PROGRAMLISTING): + /* FALLTHROUGH */ + case (NODE_SCREEN): assert(p->newln); puts(".Bd -literal"); break; @@ -1008,6 +1091,8 @@ pnode_print(struct parse *p, struct pnode *pn) puts(".Sh SYNOPSIS"); break; case (NODE_REFSECT1): + /* FALLTHROUGH */ + case (NODE_REFSECT2): assert(p->newln); pnode_printrefsect(p, pn); break; @@ -1035,7 +1120,17 @@ pnode_print(struct parse *p, struct pnode *pn) * Remember to escape control characters and escapes. */ assert(p->bsz); - for (last = '\n', cp = p->b; '\0' != *cp; ) { + cp = p->b; + /* + * There's often a superfluous "-" in its