=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- docbook2mdoc/docbook2mdoc.c 2014/03/28 02:46:40 1.3 +++ docbook2mdoc/docbook2mdoc.c 2014/03/28 10:00:40 1.4 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.3 2014/03/28 02:46:40 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.4 2014/03/28 10:00:40 kristaps Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -31,14 +31,18 @@ enum nodeid { NODE_ROOT = 0, /* Must comes first. */ /* Alpha-ordered hereafter. */ + NODE_ARG, NODE_CITEREFENTRY, + NODE_CMDSYNOPSIS, NODE_CODE, + NODE_COMMAND, NODE_FUNCDEF, NODE_FUNCPROTOTYPE, NODE_FUNCSYNOPSIS, NODE_FUNCSYNOPSISINFO, NODE_FUNCTION, NODE_MANVOLNUM, + NODE_OPTION, NODE_PARA, NODE_PARAMDEF, NODE_PARAMETER, @@ -93,14 +97,18 @@ struct pnode { static const struct node nodes[NODE__MAX] = { { NULL, 0 }, + { "arg", 0 }, { "citerefentry", NODE_IGNTEXT }, + { "cmdsynopsis", NODE_IGNTEXT }, { "code", 0 }, + { "command", 0 }, { "funcdef", 0 }, { "funcprototype", NODE_IGNTEXT }, { "funcsynopsis", NODE_IGNTEXT }, { "funcsynopsisinfo", 0 }, { "function", 0 }, { "manvolnum", 0 }, + { "option", 0 }, { "para", 0 }, { "paramdef", 0 }, { "parameter", 0 }, @@ -131,6 +139,15 @@ isparent(enum nodeid node, enum nodeid parent) switch (node) { case (NODE_ROOT): return(0); + case (NODE_ARG): + switch (parent) { + case (NODE_ARG): + case (NODE_CMDSYNOPSIS): + return(1); + default: + break; + } + return(0); case (NODE_CITEREFENTRY): switch (parent) { case (NODE_FUNCSYNOPSISINFO): @@ -147,6 +164,16 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); + case (NODE_CMDSYNOPSIS): + switch (parent) { + case (NODE_PARA): + case (NODE_REFSECT1): + case (NODE_REFSYNOPSISDIV): + return(1); + default: + break; + } + return(0); case (NODE_CODE): switch (parent) { case (NODE_FUNCSYNOPSISINFO): @@ -163,6 +190,23 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); + case (NODE_COMMAND): + switch (parent) { + case (NODE_CMDSYNOPSIS): + case (NODE_FUNCSYNOPSISINFO): + case (NODE_PARA): + case (NODE_PROGRAMLISTING): + case (NODE_REFDESCRIPTOR): + case (NODE_REFENTRYTITLE): + case (NODE_REFNAME): + case (NODE_REFPURPOSE): + case (NODE_SYNOPSIS): + case (NODE_TITLE): + return(1); + default: + break; + } + return(0); case (NODE_FUNCDEF): return(NODE_FUNCPROTOTYPE == parent); case (NODE_FUNCPROTOTYPE): @@ -185,6 +229,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_FUNCDEF): case (NODE_FUNCSYNOPSISINFO): case (NODE_PARA): + case (NODE_PROGRAMLISTING): case (NODE_REFDESCRIPTOR): case (NODE_REFENTRYTITLE): case (NODE_REFNAME): @@ -205,6 +250,23 @@ isparent(enum nodeid node, enum nodeid parent) break; } return(0); + case (NODE_OPTION): + switch (parent) { + case (NODE_ARG): + case (NODE_FUNCSYNOPSISINFO): + case (NODE_PARA): + case (NODE_PROGRAMLISTING): + case (NODE_REFDESCRIPTOR): + case (NODE_REFENTRYTITLE): + case (NODE_REFNAME): + case (NODE_REFPURPOSE): + case (NODE_SYNOPSIS): + case (NODE_TITLE): + return(1); + default: + break; + } + return(0); case (NODE_PARA): switch (parent) { case (NODE_REFSECT1): @@ -222,6 +284,7 @@ isparent(enum nodeid node, enum nodeid parent) case (NODE_FUNCSYNOPSISINFO): case (NODE_PARA): case (NODE_PARAMDEF): + case (NODE_PROGRAMLISTING): case (NODE_REFDESCRIPTOR): case (NODE_REFENTRYTITLE): case (NODE_REFNAME): @@ -304,6 +367,7 @@ xml_char(void *arg, const XML_Char *p, int sz) { struct parse *ps = arg; struct pnode *dat; + int i; /* Stopped or no tree yet. */ if (ps->stop || NODE_ROOT == ps->node) @@ -318,8 +382,15 @@ xml_char(void *arg, const XML_Char *p, int sz) * Are we in the midst of processing text? * If we're not processing text right now, then create a text * node for doing so. + * However, don't do so unless we have some non-whitespace to + * process! */ if (NODE_TEXT != ps->node) { + for (i = 0; i < sz; i++) + if ( ! isspace((int)p[i])) + break; + if (i == sz) + return; dat = calloc(1, sizeof(struct pnode)); if (NULL == dat) { perror(NULL); @@ -473,6 +544,14 @@ pnode_unlink(struct pnode *pn) } static void +pnode_unlinksub(struct pnode *pn) +{ + + while ( ! TAILQ_EMPTY(&pn->childq)) + pnode_unlink(TAILQ_FIRST(&pn->childq)); +} + +static void bufclear(struct parse *p) { @@ -526,8 +605,7 @@ pnode_printmacrolinepart(struct parse *p, struct pnode *cp = ' '; for (cp = p->b; isspace((int)*cp); cp++) - /* Spin. */ ; - + /* Spin past whitespace (XXX: necessary?) */ ; for ( ; '\0' != *cp; cp++) { /* Escape us if we look like a macro. */ if ((cp == p->b || ' ' == *(cp - 1)) && @@ -568,12 +646,12 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) if (NODE_TITLE == pp->node) break; - if (NULL != pp) { - fputs(".Sh ", stdout); + fputs(".Sh ", stdout); + + if (NULL != pp) pnode_printmacroline(p, pp); - pnode_unlink(pp); - } else - puts(".Sh UNKNOWN"); + else + puts("UNKNOWN"); } static void @@ -589,16 +667,16 @@ pnode_printciterefentry(struct parse *p, struct pnode title = pp; fputs(".Xr ", stdout); + if (NULL != title) { pnode_printmacrolinepart(p, title); - pnode_unlink(title); + putchar(' '); } else - fputs("unknown", stdout); - putchar(' '); - if (NULL != manvol) { + fputs("unknown ", stdout); + + if (NULL != manvol) pnode_printmacroline(p, manvol); - pnode_unlink(manvol); - } else + else puts("1"); } @@ -619,14 +697,13 @@ pnode_printrefmeta(struct parse *p, struct pnode *pn) if (NULL != title) { pnode_printmacrolinepart(p, title); - pnode_unlink(title); + putchar(' '); } else - fputs("UNKNOWN", stdout); - putchar(' '); - if (NULL != manvol) { + fputs("UNKNOWN ", stdout); + + if (NULL != manvol) pnode_printmacroline(p, manvol); - pnode_unlink(manvol); - } else + else puts("1"); puts(".Os"); @@ -691,21 +768,42 @@ pnode_printfuncprototype(struct parse *p, struct pnode if (NODE_FUNCDEF == fdef->node) break; - if (NULL != fdef) { + if (NULL != fdef) pnode_printfuncdef(p, fdef); - pnode_unlink(fdef); - } else + else puts(".Fo UNKNOWN"); - TAILQ_FOREACH(pp, &pn->childq, child) { + TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_PARAMDEF == pp->node) pnode_printparamdef(p, pp); - pnode_unlink(pp); - } puts(".Fc"); } +/* TODO: handle "optional" values. */ +static void +pnode_printarg(struct parse *p, struct pnode *pn, int nested) +{ + struct pnode *pp; + int sv = nested; + + if ( ! nested) + fputs(".", stdout); + nested = 1; + TAILQ_FOREACH(pp, &pn->childq, child) + if (NODE_OPTION == pp->node) { + fputs("Fl ", stdout); + pnode_printmacrolinepart(p, pp); + } else if (NODE_TEXT == pp->node) { + fputs("Ar ", stdout); + pnode_printmacrolinepart(p, pp); + } else if (NODE_ARG == pp->node) + pnode_printarg(p, pp, nested); + + if ( ! sv) + puts(""); +} + /* * Print a parsed node (or ignore it--whatever). * This is a recursive function. @@ -725,23 +823,37 @@ pnode_print(struct parse *p, struct pnode *pn) printf(".\\\" %s\n", nodes[pn->node].name); switch (pn->node) { + case (NODE_ARG): + pnode_printarg(p, pn, 0); + pnode_unlinksub(pn); + break; case (NODE_CITEREFENTRY): pnode_printciterefentry(p, pn); + pnode_unlinksub(pn); break; case (NODE_CODE): fputs(".Li ", stdout); pnode_printmacroline(p, pn); + pnode_unlinksub(pn); break; + case (NODE_COMMAND): + fputs(".Nm ", stdout); + pnode_printmacroline(p, pn); + pnode_unlinksub(pn); + break; case (NODE_FUNCTION): fputs(".Fn ", stdout); pnode_printmacroline(p, pn); + pnode_unlinksub(pn); break; case (NODE_FUNCPROTOTYPE): pnode_printfuncprototype(p, pn); + pnode_unlinksub(pn); break; case (NODE_FUNCSYNOPSISINFO): fputs(".Fd ", stdout); pnode_printmacroline(p, pn); + pnode_unlinksub(pn); break; case (NODE_PARA): /* FIXME: not always. */ @@ -751,16 +863,19 @@ pnode_print(struct parse *p, struct pnode *pn) fputs(".Fa \"", stdout); pnode_printmacrolinepart(p, pn); puts("\""); + pnode_unlinksub(pn); break; case (NODE_PROGRAMLISTING): puts(".Bd -literal"); break; case (NODE_REFMETA): pnode_printrefmeta(p, pn); + pnode_unlinksub(pn); break; case (NODE_REFNAME): fputs(".Nm ", stdout); pnode_printmacroline(p, pn); + pnode_unlinksub(pn); return; case (NODE_REFNAMEDIV): puts(".Sh NAME"); @@ -768,12 +883,14 @@ pnode_print(struct parse *p, struct pnode *pn) case (NODE_REFPURPOSE): fputs(".Nd ", stdout); pnode_printmacroline(p, pn); + pnode_unlinksub(pn); return; case (NODE_REFSYNOPSISDIV): puts(".Sh SYNOPSIS"); break; case (NODE_REFSECT1): pnode_printrefsect(p, pn); + pnode_unlinksub(pn); break; case (NODE_TEXT): bufclear(p);