=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.14 retrieving revision 1.45 diff -u -p -r1.14 -r1.45 --- docbook2mdoc/docbook2mdoc.c 2014/03/30 13:18:49 1.14 +++ docbook2mdoc/docbook2mdoc.c 2019/03/08 10:04:01 1.45 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.14 2014/03/30 13:18:49 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.45 2019/03/08 10:04:01 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -37,6 +37,8 @@ struct parse { enum nodeid node; /* current (NODE_ROOT if pre-tree) */ const char *fname; /* filename */ int stop; /* should we stop now? */ +#define PARSE_EQN 1 + unsigned int flags; /* document-wide flags */ struct pnode *root; /* root of parse tree */ struct pnode *cur; /* current node in tree */ char *b; /* nil-terminated buffer for pre-print */ @@ -64,6 +66,7 @@ struct pattr { struct pnode { enum nodeid node; /* node type */ char *b; /* binary data buffer */ + char *real; /* store for "b" */ size_t bsz; /* data buffer size */ struct pnode *parent; /* parent (or NULL if top) */ struct pnodeq childq; /* queue of children */ @@ -73,7 +76,9 @@ struct pnode { static const char *attrkeys[ATTRKEY__MAX] = { "choice", + "close", "id", + "open", "rep" }; @@ -86,48 +91,106 @@ static const char *attrvals[ATTRVAL__MAX] = { }; static const struct node nodes[NODE__MAX] = { - { NULL, 0 }, - { "arg", 0 }, - { "citerefentry", NODE_IGNTEXT }, - { "cmdsynopsis", NODE_IGNTEXT }, - { "code", 0 }, - { "command", 0 }, + { NULL, 0 }, + { "acronym", 0 }, + { "anchor", NODE_IGNTEXT }, + { "application", 0 }, + { "arg", 0 }, + { "caution", NODE_IGNTEXT }, + { "citerefentry", NODE_IGNTEXT }, + { "cmdsynopsis", NODE_IGNTEXT }, + { "code", 0 }, + { "colspec", NODE_IGNTEXT }, + { "command", 0 }, + { "constant", 0 }, + { "copyright", NODE_IGNTEXT }, + { "date", 0 }, { "emphasis", 0 }, + { "entry", 0 }, + { "envar", 0 }, + { "fieldsynopsis", NODE_IGNTEXT }, + { "filename", 0 }, { "funcdef", 0 }, - { "funcprototype", NODE_IGNTEXT }, - { "funcsynopsis", NODE_IGNTEXT }, - { "funcsynopsisinfo", 0 }, - { "function", 0 }, - { "link", 0 }, - { "listitem", NODE_IGNTEXT }, - { "manvolnum", 0 }, - { "option", 0 }, - { "para", 0 }, + { "funcprototype", NODE_IGNTEXT }, + { "funcsynopsis", NODE_IGNTEXT }, + { "funcsynopsisinfo", 0 }, + { "function", 0 }, + { "group", NODE_IGNTEXT }, + { "holder", NODE_IGNTEXT }, + { "info", NODE_IGNTEXT }, + { "informalequation", NODE_IGNTEXT }, + { "informaltable", NODE_IGNTEXT }, + { "inlineequation", NODE_IGNTEXT }, + { "itemizedlist", NODE_IGNTEXT }, + { "link", 0 }, + { "listitem", NODE_IGNTEXT }, + { "literal", 0 }, + { "manvolnum", 0 }, + { "mml:math", NODE_IGNTEXT }, + { "mml:mfenced", 0 }, + { "mml:mfrac", 0 }, + { "mml:mi", 0 }, + { "mml:mn", 0 }, + { "mml:mo", 0 }, + { "mml:mrow", 0 }, + { "mml:msub", 0 }, + { "mml:msup", 0 }, + { "modifier", 0 }, + { "note", NODE_IGNTEXT }, + { "option", 0 }, + { "orderedlist", NODE_IGNTEXT }, + { "para", 0 }, { "paramdef", 0 }, - { "parameter", 0 }, - { "programlisting", 0 }, - { "refclass", NODE_IGNTEXT }, - { "refdescriptor", NODE_IGNTEXT }, - { "refentry", NODE_IGNTEXT }, - { "refentrytitle", 0 }, - { "refmeta", NODE_IGNTEXT }, - { "refmiscinfo", NODE_IGNTEXT }, - { "refname", 0 }, - { "refnamediv", NODE_IGNTEXT }, - { "refpurpose", 0 }, - { "refsect1", 0 }, - { "refsynopsisdiv", NODE_IGNTEXT }, - { "replaceable", 0 }, - { "structname", 0 }, - { "synopsis", 0 }, - { "term", 0 }, - { NULL, 0 }, - { "title", 0 }, - { "ulink", 0 }, - { "variablelist", NODE_IGNTEXT }, - { "varlistentry", NODE_IGNTEXT }, + { "parameter", 0 }, + { "programlisting", 0 }, + { "prompt", 0 }, + { "quote", 0 }, + { "refclass", NODE_IGNTEXT }, + { "refdescriptor", NODE_IGNTEXT }, + { "refentry", NODE_IGNTEXT }, + { "refentryinfo", NODE_IGNTEXT }, + { "refentrytitle", 0 }, + { "refmeta", NODE_IGNTEXT }, + { "refmetainfo", NODE_IGNTEXT }, + { "refmiscinfo", NODE_IGNTEXT }, + { "refname", 0 }, + { "refnamediv", NODE_IGNTEXT }, + { "refpurpose", 0 }, + { "refsect1", NODE_IGNTEXT }, + { "refsect2", NODE_IGNTEXT }, + { "refsect3", NODE_IGNTEXT }, + { "refsection", NODE_IGNTEXT }, + { "refsynopsisdiv", NODE_IGNTEXT }, + { "replaceable", 0 }, + { "row", NODE_IGNTEXT }, + { "sbr", NODE_IGNTEXT }, + { "screen", NODE_IGNTEXT }, + { "sgmltag", 0 }, + { "structname", 0 }, + { "synopsis", 0 }, + { "table", NODE_IGNTEXT }, + { "tbody", NODE_IGNTEXT }, + { "term", 0 }, + { NULL, 0 }, + { "tfoot", NODE_IGNTEXT }, + { "tgroup", NODE_IGNTEXT }, + { "thead", NODE_IGNTEXT }, + { "tip", NODE_IGNTEXT }, + { "title", 0 }, + { "trademark", 0 }, + { "type", 0 }, + { "ulink", 0 }, + { "userinput", 0 }, + { "variablelist", NODE_IGNTEXT }, + { "varlistentry", NODE_IGNTEXT }, + { "varname", 0 }, + { "warning", NODE_IGNTEXT }, + { "wordasword", 0 }, + { "year", NODE_IGNTEXT }, }; +static int warn = 0; + static void pnode_print(struct parse *p, struct pnode *pn); @@ -185,7 +248,7 @@ xml_char(void *arg, const XML_Char *p, int sz) /* Append to current buffer. */ assert(sz >= 0); - ps->cur->b = realloc(ps->cur->b, + ps->cur->b = realloc(ps->cur->b, ps->cur->bsz + (size_t)sz); if (NULL == ps->cur->b) { perror(NULL); @@ -193,6 +256,7 @@ xml_char(void *arg, const XML_Char *p, int sz) } memcpy(ps->cur->b + ps->cur->bsz, p, sz); ps->cur->bsz += (size_t)sz; + ps->cur->real = ps->cur->b; } static void @@ -230,7 +294,8 @@ xml_elem_start(void *arg, const XML_Char *name, const struct pattr *pattr; const XML_Char **att; - if (ps->stop) + /* FIXME: find a better way to ditch other namespaces. */ + if (ps->stop || 0 == strcmp(name, "xi:include")) return; /* Close out text node, if applicable... */ @@ -251,7 +316,7 @@ xml_elem_start(void *arg, const XML_Char *name, const if (NODE__MAX == node && NODE_ROOT == ps->node) { return; } else if (NODE__MAX == node) { - fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n", + fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n", ps->fname, XML_GetCurrentLineNumber(ps->xml), XML_GetCurrentColumnNumber(ps->xml), name); ps->stop = 1; @@ -277,6 +342,9 @@ xml_elem_start(void *arg, const XML_Char *name, const return; } + if (NODE_INLINEEQUATION == node) + ps->flags |= PARSE_EQN; + if (NULL == (dat = calloc(1, sizeof(struct pnode)))) { perror(NULL); exit(EXIT_FAILURE); @@ -302,29 +370,35 @@ xml_elem_start(void *arg, const XML_Char *name, const if (0 == strcmp(*att, attrkeys[key])) break; if (ATTRKEY__MAX == key) { - fprintf(stderr, "%s:%zu:%zu: unknown " - "attribute \"%s\"\n", ps->fname, - XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - *att); + if (warn) + fprintf(stderr, "%s:%zu:%zu: warning: " + "unknown attribute \"%s\"\n", + ps->fname, + XML_GetCurrentLineNumber(ps->xml), + XML_GetCurrentColumnNumber(ps->xml), + *att); continue; } else if ( ! isattrkey(node, key)) { - fprintf(stderr, "%s:%zu:%zu: bad " - "attribute \"%s\"\n", ps->fname, - XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - *att); + if (warn) + fprintf(stderr, "%s:%zu:%zu: warning: " + "bad attribute \"%s\"\n", + ps->fname, + XML_GetCurrentLineNumber(ps->xml), + XML_GetCurrentColumnNumber(ps->xml), + *att); continue; } for (val = 0; val < ATTRVAL__MAX; val++) if (0 == strcmp(*(att + 1), attrvals[val])) break; if (ATTRVAL__MAX != val && ! isattrval(key, val)) { - fprintf(stderr, "%s:%zu:%zu: bad " - "value \"%s\"\n", ps->fname, - XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - *(att + 1)); + if (warn) + fprintf(stderr, "%s:%zu:%zu: warning: " + "bad attribute value \"%s\"\n", + ps->fname, + XML_GetCurrentLineNumber(ps->xml), + XML_GetCurrentColumnNumber(ps->xml), + *(att + 1)); continue; } pattr = calloc(1, sizeof(struct pattr)); @@ -347,8 +421,11 @@ xml_elem_end(void *arg, const XML_Char *name) { struct parse *ps = arg; + /* FIXME: find a better way to ditch other namespaces. */ if (ps->stop || NODE_ROOT == ps->node) return; + else if (0 == strcmp(name, "xi:include")) + return; /* Close out text node, if applicable... */ if (NODE_TEXT == ps->node) { @@ -388,7 +465,7 @@ pnode_free(struct pnode *pn) free(ap); } - free(pn->b); + free(pn->real); free(pn); } @@ -464,8 +541,28 @@ 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 +#define MACROLINE_NOWS 2 /* * Recursively print text presumably on a macro line. * Convert all whitespace to regular spaces. @@ -475,7 +572,7 @@ pnode_printmacrolinetext(struct parse *p, struct pnode { char *cp; - if (0 == p->newln) + if (0 == p->newln && ! (MACROLINE_NOWS & fl)) putchar(' '); bufclear(p); @@ -492,12 +589,12 @@ pnode_printmacrolinetext(struct parse *p, struct pnode /* Escape us if we look like a macro. */ if ((cp == p->b || ' ' == *(cp - 1)) && isupper((int)*cp) && - '\0' != *(cp + 1) && + '\0' != *(cp + 1) && islower((int)*(cp + 1)) && - ('\0' == *(cp + 2) || + ('\0' == *(cp + 2) || ' ' == *(cp + 2) || (islower((int)*(cp + 2)) && - ('\0' == *(cp + 3) || + ('\0' == *(cp + 3) || ' ' == *(cp + 3))))) fputs("\\&", stdout); if (MACROLINE_UPPER & fl) @@ -552,6 +649,41 @@ pnode_printmclose(struct parse *p, int sv) } /* + * Like pnode_printmclose() except we look to the next node, and, if + * found, see if it starts with punctuation. + * If it does, then we print that punctuation before the newline. + */ +static void +pnode_printmclosepunct(struct parse *p, struct pnode *pn, int sv) +{ + /* We wouldn't have done anything anyway. */ + if ( ! (sv && ! p->newln)) + return; + + /* No next node or it's not text. */ + if (NULL == (pn = TAILQ_NEXT(pn, child))) { + pnode_printmclose(p, sv); + return; + } else if (NODE_TEXT != pn->node) { + pnode_printmclose(p, sv); + return; + } + + /* Only do this for the comma/period. */ + if (pn->bsz > 0 && + (',' == pn->b[0] || '.' == pn->b[0]) && + (1 == pn->bsz || isspace((int)pn->b[1]))) { + putchar(' '); + putchar(pn->b[0]); + pn->b++; + pn->bsz--; + } + + putchar('\n'); + p->newln = 1; +} + +/* * If the SYNOPSIS macro has a superfluous title, kill it. */ static void @@ -559,7 +691,7 @@ pnode_printrefsynopsisdiv(struct parse *p, struct pnod { struct pnode *pp; - TAILQ_FOREACH(pp, &pn->childq, child) + TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_TITLE == pp->node) { pnode_unlink(pp); return; @@ -578,14 +710,46 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) if (NODE_TITLE == pp->node) break; - fputs(".Sh", stdout); + switch (pn->node) { + case (NODE_REFSECT1): + fputs(".Sh", stdout); + break; + case (NODE_REFSECT2): + fputs(".Ss", stdout); + break; + case (NODE_REFSECT3): + puts(".Pp"); + fputs(".Sy", stdout); + break; + case (NODE_NOTE): + /* FALLTHROUGH */ + case (NODE_REFSECTION): + /* FALLTHROUGH */ + case (NODE_TIP): + /* FALLTHROUGH */ + case (NODE_CAUTION): + /* FALLTHROUGH */ + case (NODE_WARNING): + puts(".Pp"); + if (NULL == pp) + return; + fputs(".Em", stdout); + break; + default: + break; + } + p->newln = 0; if (NULL != pp) { - pnode_printmacroline(p, pp); + pnode_printmacrolinetext(p, pp, + NODE_REFSECT1 == pn->node ? + MACROLINE_UPPER : 0); + pnode_printmclose(p, 1); pnode_unlink(pp); } else { - puts("UNKNOWN"); + puts(NODE_REFSECT1 == pn->node ? + "UNKNOWN" : "unknown"); p->newln = 1; } } @@ -599,16 +763,12 @@ pnode_printciterefentry(struct parse *p, struct pnode struct pnode *pp, *title, *manvol; title = manvol = NULL; - assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_MANVOLNUM == pp->node) manvol = pp; else if (NODE_REFENTRYTITLE == pp->node) title = pp; - fputs(".Xr", stdout); - p->newln = 0; - if (NULL != title) { pnode_printmacrolinepart(p, title); } else @@ -618,7 +778,7 @@ pnode_printciterefentry(struct parse *p, struct pnode puts(" 1"); p->newln = 1; } else - pnode_printmacroline(p, manvol); + pnode_printmacrolinepart(p, manvol); } static void @@ -697,7 +857,7 @@ pnode_printparamdef(struct parse *p, struct pnode *pn) fputs(".Fa \"", stdout); p->newln = 0; if (NULL != ptype) { - pnode_printmacrolinepart(p, ptype); + pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS); putchar(' '); } @@ -708,14 +868,83 @@ pnode_printparamdef(struct parse *p, struct pnode *pn) p->newln = 1; } +/* + * The node is a little peculiar. + * First, it can have arbitrary open and closing tokens, which default + * to parentheses. + * Second, >1 arguments are separated by commas. + */ static void +pnode_printmathfenced(struct parse *p, struct pnode *pn) +{ + struct pnode *pp; + struct pattr *ap; + + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ATTRKEY_OPEN == ap->key) { + printf("left %s ", ap->rawval); + break; + } + if (NULL == ap) + printf("left ( "); + + pp = TAILQ_FIRST(&pn->childq); + pnode_print(p, pp); + + while (NULL != (pp = TAILQ_NEXT(pp, child))) { + putchar(','); + pnode_print(p, pp); + } + + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ATTRKEY_CLOSE == ap->key) { + printf("right %s ", ap->rawval); + break; + } + if (NULL == ap) + printf("right ) "); +} + +/* + * These math nodes require special handling because they have infix + * syntax, instead of the usual prefix or prefix. + * So we need to break up the first and second child node with a + * particular eqn(7) word. + */ +static void +pnode_printmath(struct parse *p, struct pnode *pn) +{ + struct pnode *pp; + + pp = TAILQ_FIRST(&pn->childq); + pnode_print(p, pp); + + switch (pn->node) { + case (NODE_MML_MSUP): + fputs(" sup ", stdout); + break; + case (NODE_MML_MFRAC): + fputs(" over ", stdout); + break; + case (NODE_MML_MSUB): + fputs(" sub ", stdout); + break; + default: + break; + } + + pp = TAILQ_NEXT(pp, child); + pnode_print(p, pp); +} + +static void pnode_printfuncprototype(struct parse *p, struct pnode *pn) { struct pnode *pp, *fdef; assert(p->newln); TAILQ_FOREACH(fdef, &pn->childq, child) - if (NODE_FUNCDEF == fdef->node) + if (NODE_FUNCDEF == fdef->node) break; if (NULL != fdef) @@ -723,7 +952,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode 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); @@ -731,7 +960,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode p->newln = 1; } -/* +/* * The element is more complicated than it should be because text * nodes are treated like ".Ar foo", but non-text nodes need to be * re-sent into the printer (i.e., without the preceding ".Ar"). @@ -747,10 +976,10 @@ pnode_printarg(struct parse *p, struct pnode *pn) isop = 1; isrep = 0; - TAILQ_FOREACH(ap, &pn->attrq, child) + TAILQ_FOREACH(ap, &pn->attrq, child) if (ATTRKEY_CHOICE == ap->key && (ATTRVAL_PLAIN == ap->val || - ATTRVAL_REQ == ap->val)) + ATTRVAL_REQ == ap->val)) isop = 0; else if (ATTRKEY_REP == ap->key && (ATTRVAL_REPEAT == ap->val)) @@ -765,30 +994,63 @@ pnode_printarg(struct parse *p, struct pnode *pn) if (NODE_TEXT == pp->node) { pnode_printmopen(p); fputs("Ar", stdout); - } + } pnode_print(p, pp); - if (NODE_TEXT == pp->node && isrep) + if (NODE_TEXT == pp->node && isrep) fputs("...", stdout); } } -/* - * 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 @@ -808,30 +1070,113 @@ pnode_printprologue(struct parse *p, struct pnode *pn) puts(".Dt UNKNOWN 1"); puts(".Os"); } + + if (PARSE_EQN & p->flags) { + puts(".EQ"); + puts("delim $$"); + puts(".EN"); + } } +/* + * We can have multiple elements within a , which + * we should comma-separate as list headers. + */ static void pnode_printvarlistentry(struct parse *p, struct pnode *pn) { struct pnode *pp; + int first = 1; assert(p->newln); + fputs(".It", stdout); + p->newln = 0; + TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_TERM == pp->node) { - fputs(".It", stdout); - p->newln = 0; + if ( ! first) + putchar(','); pnode_print(p, pp); pnode_unlink(pp); - putchar('\n'); - p->newln = 1; - return; - } + first = 0; + } else + break; - puts(".It"); + putchar('\n'); p->newln = 1; } static void +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"); + else + puts(".Bl -item"); + + 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_printvariablelist(struct parse *p, struct pnode *pn) { struct pnode *pp; @@ -862,7 +1207,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) @@ -877,12 +1223,20 @@ pnode_print(struct parse *p, struct pnode *pn) sv = p->newln; switch (pn->node) { + case (NODE_APPLICATION): + pnode_printmopen(p); + fputs("Nm", stdout); + break; + case (NODE_ANCHOR): + /* Don't print anything! */ + return; case (NODE_ARG): pnode_printarg(p, pn); pnode_unlinksub(pn); break; case (NODE_CITEREFENTRY): - assert(p->newln); + pnode_printmopen(p); + fputs("Xr", stdout); pnode_printciterefentry(p, pn); pnode_unlinksub(pn); break; @@ -894,10 +1248,22 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Nm", stdout); break; + case (NODE_CONSTANT): + pnode_printmopen(p); + fputs("Dv", stdout); + break; case (NODE_EMPHASIS): 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); + break; case (NODE_FUNCTION): pnode_printmopen(p); fputs("Fn", stdout); @@ -911,15 +1277,60 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Fd", stdout); break; + case (NODE_INFORMALEQUATION): + if ( ! p->newln) + putchar('\n'); + puts(".EQ"); + p->newln = 0; + break; + case (NODE_INLINEEQUATION): + fputc('$', stdout); + p->newln = 0; + break; + case (NODE_ITEMIZEDLIST): + assert(p->newln); + 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); + break; + case (NODE_MML_MFENCED): + pnode_printmathfenced(p, pn); + pnode_unlinksub(pn); + break; + case (NODE_MML_MROW): + case (NODE_MML_MI): + case (NODE_MML_MN): + case (NODE_MML_MO): + if (TAILQ_EMPTY(&pn->childq)) + break; + fputs(" { ", stdout); + break; + case (NODE_MML_MFRAC): + case (NODE_MML_MSUB): + case (NODE_MML_MSUP): + pnode_printmath(p, pn); + pnode_unlinksub(pn); + break; case (NODE_OPTION): pnode_printmopen(p); fputs("Fl", stdout); - /* FIXME: bogus leading '-'? */ 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 && - NODE_LISTITEM == pn->parent->node) + if (NULL != pn->parent && + NODE_LISTITEM == pn->parent->node) break; puts(".Pp"); break; @@ -927,14 +1338,24 @@ pnode_print(struct parse *p, struct pnode *pn) /* Suppress non-text children... */ pnode_printmopen(p); fputs("Fa \"", stdout); - pnode_printmacrolinepart(p, pn); - puts("\""); + pnode_printmacrolinetext(p, pn, MACROLINE_NOWS); + fputs("\"", stdout); pnode_unlinksub(pn); break; + case (NODE_QUOTE): + pnode_printmopen(p); + fputs("Qo", stdout); + break; case (NODE_PROGRAMLISTING): + /* FALLTHROUGH */ + case (NODE_SCREEN): assert(p->newln); puts(".Bd -literal"); break; + case (NODE_REFENTRYINFO): + /* Suppress. */ + pnode_unlinksub(pn); + break; case (NODE_REFMETA): abort(); break; @@ -961,6 +1382,20 @@ pnode_print(struct parse *p, struct pnode *pn) puts(".Sh SYNOPSIS"); break; case (NODE_REFSECT1): + /* FALLTHROUGH */ + case (NODE_REFSECT2): + /* FALLTHROUGH */ + case (NODE_REFSECT3): + /* FALLTHROUGH */ + case (NODE_REFSECTION): + /* FALLTHROUGH */ + case (NODE_NOTE): + /* FALLTHROUGH */ + case (NODE_TIP): + /* FALLTHROUGH */ + case (NODE_CAUTION): + /* FALLTHROUGH */ + case (NODE_WARNING): assert(p->newln); pnode_printrefsect(p, pn); break; @@ -968,23 +1403,56 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Ar", stdout); break; + case (NODE_SBR): + assert(p->newln); + puts(".br"); + break; + case (NODE_SGMLTAG): + pnode_printmopen(p); + fputs("Li", stdout); + break; case (NODE_STRUCTNAME): pnode_printmopen(p); fputs("Vt", stdout); break; + case (NODE_TABLE): + /* FALLTHROUGH */ + case (NODE_INFORMALTABLE): + assert(p->newln); + pnode_printtable(p, pn); + pnode_unlinksub(pn); + break; case (NODE_TEXT): if (0 == p->newln) putchar(' '); + bufclear(p); bufappend(p, pn); + + if (0 == p->bsz) { + assert(pn->real != pn->b); + break; + } + /* * Output all characters, squeezing out whitespace - * between newlines. + * between newlines. * XXX: all whitespace, including tabs (?). * 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