=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.29 retrieving revision 1.89 diff -u -p -r1.29 -r1.89 --- docbook2mdoc/docbook2mdoc.c 2014/04/02 10:59:07 1.29 +++ docbook2mdoc/docbook2mdoc.c 2019/04/03 16:52:51 1.89 @@ -1,6 +1,7 @@ -/* $Id: docbook2mdoc.c,v 1.29 2014/04/02 10:59:07 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.89 2019/04/03 16:52:51 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons + * Copyright (c) 2019 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,805 +15,285 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include - #include #include -#include -#include -#include #include #include -#include -#include -#include "extern.h" +#include "node.h" +#include "macro.h" +#include "format.h" /* - * Global parse state. - * Keep this as simple and small as possible. + * The implementation of the mdoc(7) formatter. */ -struct parse { - XML_Parser xml; - enum nodeid node; /* current (NODE_ROOT if pre-tree) */ - const char *fname; /* filename */ - int stop; /* should we stop now? */ - struct pnode *root; /* root of parse tree */ - struct pnode *cur; /* current node in tree */ - char *b; /* nil-terminated buffer for pre-print */ - size_t bsz; /* current length of b */ - size_t mbsz; /* max bsz allocation */ - int newln; /* output: are we on a fresh line */ -}; -struct node { - const char *name; /* docbook element name */ - unsigned int flags; -#define NODE_IGNTEXT 1 /* ignore all contained text */ -}; +static void pnode_print(struct format *, struct pnode *); -TAILQ_HEAD(pnodeq, pnode); -TAILQ_HEAD(pattrq, pattr); -struct pattr { - enum attrkey key; - enum attrval val; - char *rawval; - TAILQ_ENTRY(pattr) child; -}; - -struct pnode { - enum nodeid node; /* node type */ - char *b; /* binary data buffer */ - size_t bsz; /* data buffer size */ - struct pnode *parent; /* parent (or NULL if top) */ - struct pnodeq childq; /* queue of children */ - struct pattrq attrq; /* attributes of node */ - TAILQ_ENTRY(pnode) child; -}; - -static const char *attrkeys[ATTRKEY__MAX] = { - "choice", - "id", - "rep" -}; - -static const char *attrvals[ATTRVAL__MAX] = { - "norepeat", - "opt", - "plain", - "repeat", - "req" -}; - -static const struct node nodes[NODE__MAX] = { - { NULL, 0 }, - { "acronym", 0 }, - { "application", 0 }, - { "arg", 0 }, - { "caution", NODE_IGNTEXT }, - { "citerefentry", NODE_IGNTEXT }, - { "cmdsynopsis", NODE_IGNTEXT }, - { "code", 0 }, - { "command", 0 }, - { "date", 0 }, - { "emphasis", 0 }, - { "entry", 0 }, - { "envar", 0 }, - { "filename", 0 }, - { "funcdef", 0 }, - { "funcprototype", NODE_IGNTEXT }, - { "funcsynopsis", NODE_IGNTEXT }, - { "funcsynopsisinfo", 0 }, - { "function", 0 }, - { "itemizedlist", NODE_IGNTEXT }, - { "group", NODE_IGNTEXT }, - { "link", 0 }, - { "listitem", NODE_IGNTEXT }, - { "literal", 0 }, - { "manvolnum", 0 }, - { "note", NODE_IGNTEXT }, - { "option", 0 }, - { "orderedlist", NODE_IGNTEXT }, - { "para", 0 }, - { "paramdef", 0 }, - { "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 }, - { "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 }, - { "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 }, - { "ulink", 0 }, - { "userinput", 0 }, - { "variablelist", NODE_IGNTEXT }, - { "varlistentry", NODE_IGNTEXT }, - { "varname", 0 }, - { "warning", NODE_IGNTEXT }, -}; - static void -pnode_print(struct parse *p, struct pnode *pn); - -/* - * Process a stream of characters. - * We store text as nodes in and of themselves. - * If a text node is already open, append to it. - * If it's not open, open one under the current context. - */ -static void -xml_char(void *arg, const XML_Char *p, int sz) +pnode_printpara(struct format *p, struct pnode *pn) { - struct parse *ps = arg; - struct pnode *dat; - int i; + struct pnode *pp; - /* Stopped or no tree yet. */ - if (ps->stop || NODE_ROOT == ps->node) + if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL && + (pp = pn->parent) == NULL) return; - /* Not supposed to be collecting text. */ - assert(NULL != ps->cur); - if (NODE_IGNTEXT & nodes[ps->node].flags) + switch (pp->node) { + case NODE_ENTRY: + case NODE_LISTITEM: return; - - /* - * 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: strip out all leading whitespace to be sure. - */ - if (NODE_TEXT != ps->node) { - for (i = 0; i < sz; i++) - if ( ! isspace((int)p[i])) - break; - if (i == sz) + case NODE_PREFACE: + case NODE_SECTION: + if (p->level < 3) return; - p += i; - sz -= i; - dat = calloc(1, sizeof(struct pnode)); - if (NULL == dat) { - perror(NULL); - exit(EXIT_FAILURE); - } - - dat->node = ps->node = NODE_TEXT; - dat->parent = ps->cur; - TAILQ_INIT(&dat->childq); - TAILQ_INIT(&dat->attrq); - TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child); - ps->cur = dat; - assert(NULL != ps->root); + break; + default: + break; } - - /* Append to current buffer. */ - assert(sz >= 0); - ps->cur->b = realloc(ps->cur->b, - ps->cur->bsz + (size_t)sz); - if (NULL == ps->cur->b) { - perror(NULL); - exit(EXIT_FAILURE); - } - memcpy(ps->cur->b + ps->cur->bsz, p, sz); - ps->cur->bsz += (size_t)sz; + macro_line(p, "Pp"); } -static void -pnode_trim(struct pnode *pn) -{ - - assert(NODE_TEXT == pn->node); - for ( ; pn->bsz > 0; pn->bsz--) - if ( ! isspace((int)pn->b[pn->bsz - 1])) - break; -} - /* - * Begin an element. - * First, look for the element. - * If we don't find it and we're not parsing, keep going. - * If we don't find it and we're parsing, puke and exit. - * If we find it but we're not parsing yet (i.e., it's not a refentry - * and thus out of context), keep going. - * If we find it and we're at the root and already have a tree, puke and - * exit (FIXME: I don't think this is right?). - * If we find it but we're parsing a text node, close out the text node, - * return to its parent, and keep going. - * Make sure that the element is in the right context. - * Lastly, put the node onto our parse tree and continue. + * If the SYNOPSIS macro has a superfluous title, kill it. */ static void -xml_elem_start(void *arg, const XML_Char *name, const XML_Char **atts) +pnode_printrefsynopsisdiv(struct format *p, struct pnode *pn) { - struct parse *ps = arg; - enum nodeid node; - enum attrkey key; - enum attrval val; - struct pnode *dat; - struct pattr *pattr; - const XML_Char **att; + struct pnode *pp, *pq; - if (ps->stop) - return; + TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) + if (pp->node == NODE_TITLE) + pnode_unlink(pp); - /* Close out text node, if applicable... */ - if (NODE_TEXT == ps->node) { - assert(NULL != ps->cur); - pnode_trim(ps->cur); - ps->cur = ps->cur->parent; - assert(NULL != ps->cur); - ps->node = ps->cur->node; - } - - for (node = 0; node < NODE__MAX; node++) - if (NULL == nodes[node].name) - continue; - else if (0 == strcmp(nodes[node].name, name)) - break; - - if (NODE__MAX == node && NODE_ROOT == ps->node) { - return; - } else if (NODE__MAX == node) { - fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n", - ps->fname, XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), name); - ps->stop = 1; - return; - } else if (NODE_ROOT == ps->node && NULL != ps->root) { - fprintf(stderr, "%s:%zu:%zu: multiple refentries\n", - ps->fname, XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml)); - ps->stop = 1; - return; - } else if (NODE_ROOT == ps->node && NODE_REFENTRY != node) { - return; - } else if ( ! isparent(node, ps->node)) { - fprintf(stderr, "%s:%zu:%zu: bad parent \"%s\" " - "of node \"%s\"\n", - ps->fname, XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - NULL == nodes[ps->node].name ? - "(none)" : nodes[ps->node].name, - NULL == nodes[node].name ? - "(none)" : nodes[node].name); - ps->stop = 1; - return; - } - - if (NULL == (dat = calloc(1, sizeof(struct pnode)))) { - perror(NULL); - exit(EXIT_FAILURE); - } - - dat->node = ps->node = node; - dat->parent = ps->cur; - TAILQ_INIT(&dat->childq); - TAILQ_INIT(&dat->attrq); - - if (NULL != ps->cur) - TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child); - - ps->cur = dat; - if (NULL == ps->root) - ps->root = dat; - - /* - * Process attributes. - */ - for (att = atts; NULL != *att; att += 2) { - for (key = 0; key < ATTRKEY__MAX; key++) - 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); - 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); - 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)); - continue; - } - pattr = calloc(1, sizeof(struct pattr)); - pattr->key = key; - pattr->val = val; - if (ATTRVAL__MAX == val) - pattr->rawval = strdup(*(att + 1)); - TAILQ_INSERT_TAIL(&dat->attrq, pattr, child); - } - + macro_line(p, "Sh SYNOPSIS"); } /* - * Roll up the parse tree. - * If we're at a text node, roll that one up first. - * If we hit the root, then assign ourselves as the NODE_ROOT. + * Start a hopefully-named `Sh' section. */ static void -xml_elem_end(void *arg, const XML_Char *name) +pnode_printrefsect(struct format *p, struct pnode *pn) { - struct parse *ps = arg; - - if (ps->stop || NODE_ROOT == ps->node) - return; - - /* Close out text node, if applicable... */ - if (NODE_TEXT == ps->node) { - assert(NULL != ps->cur); - pnode_trim(ps->cur); - ps->cur = ps->cur->parent; - assert(NULL != ps->cur); - ps->node = ps->cur->node; - } - - if (NULL == (ps->cur = ps->cur->parent)) - ps->node = NODE_ROOT; - else - ps->node = ps->cur->node; -} - -/* - * Recursively free a node (NULL is ok). - */ -static void -pnode_free(struct pnode *pn) -{ struct pnode *pp; - struct pattr *ap; + const char *title; + int flags, level; - if (NULL == pn) + if (pn->parent == NULL) return; - while (NULL != (pp = TAILQ_FIRST(&pn->childq))) { - TAILQ_REMOVE(&pn->childq, pp, child); - pnode_free(pp); - } - - while (NULL != (ap = TAILQ_FIRST(&pn->attrq))) { - TAILQ_REMOVE(&pn->attrq, ap, child); - free(ap->rawval); - free(ap); - } - - free(pn->b); - free(pn); -} - -/* - * Unlink a node from its parent and pnode_free() it. - */ -static void -pnode_unlink(struct pnode *pn) -{ - - if (NULL != pn->parent) - TAILQ_REMOVE(&pn->parent->childq, pn, child); - pnode_free(pn); -} - -/* - * Unlink all children of a node and pnode_free() them. - */ -static void -pnode_unlinksub(struct pnode *pn) -{ - - while ( ! TAILQ_EMPTY(&pn->childq)) - pnode_unlink(TAILQ_FIRST(&pn->childq)); -} - -/* - * Reset the lookaside buffer. - */ -static void -bufclear(struct parse *p) -{ - - p->b[p->bsz = 0] = '\0'; -} - -/* - * Append NODE_TEXT contents to the current buffer, reallocating its - * size if necessary. - * The buffer is ALWAYS nil-terminated. - */ -static void -bufappend(struct parse *p, struct pnode *pn) -{ - - assert(NODE_TEXT == pn->node); - if (p->bsz + pn->bsz + 1 > p->mbsz) { - p->mbsz = p->bsz + pn->bsz + 1; - if (NULL == (p->b = realloc(p->b, p->mbsz))) { - perror(NULL); - exit(EXIT_FAILURE); + level = ++p->level; + flags = ARG_SPACE; + if (level == 1) + flags |= ARG_UPPER; + if (level < 3) { + switch (pn->node) { + case NODE_CAUTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_WARNING: + level = 3; + break; + default: + break; } } - memcpy(p->b + p->bsz, pn->b, pn->bsz); - p->bsz += pn->bsz; - p->b[p->bsz] = '\0'; -} -/* - * Recursively append all NODE_TEXT nodes to the buffer. - * This descends into non-text nodes, but doesn't do anything beyond - * them. - * In other words, this is a recursive text grok. - */ -static void -bufappend_r(struct parse *p, struct pnode *pn) -{ - struct pnode *pp; - - if (NODE_TEXT == pn->node) - bufappend(p, pn); TAILQ_FOREACH(pp, &pn->childq, child) - bufappend_r(p, pp); -} + if (pp->node == NODE_TITLE) + break; -/* - * 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) + if (pp == NULL) { + switch (pn->node) { + case NODE_PREFACE: + title = "Preface"; break; + case NODE_CAUTION: + title = "Caution"; + break; + case NODE_NOTE: + title = "Note"; + break; + case NODE_TIP: + title = "Tip"; + break; + case NODE_WARNING: + title = "Warning"; + break; + default: + title = "Unknown"; + break; + } } - return(res); -} - -#define MACROLINE_NORM 0 -#define MACROLINE_UPPER 1 -/* - * Recursively print text presumably on a macro line. - * Convert all whitespace to regular spaces. - */ -static void -pnode_printmacrolinetext(struct parse *p, struct pnode *pn, int fl) -{ - char *cp; - - if (0 == p->newln) - putchar(' '); - - bufclear(p); - bufappend_r(p, pn); - - /* Convert all space to spaces. */ - for (cp = p->b; '\0' != *cp; cp++) - if (isspace((int)*cp)) - *cp = ' '; - - for (cp = p->b; isspace((int)*cp); cp++) - /* Spin past whitespace (XXX: necessary?) */ ; - for ( ; '\0' != *cp; cp++) { - /* Escape us if we look like a macro. */ - if ((cp == p->b || ' ' == *(cp - 1)) && - isupper((int)*cp) && - '\0' != *(cp + 1) && - islower((int)*(cp + 1)) && - ('\0' == *(cp + 2) || - ' ' == *(cp + 2) || - (islower((int)*(cp + 2)) && - ('\0' == *(cp + 3) || - ' ' == *(cp + 3))))) - fputs("\\&", stdout); - if (MACROLINE_UPPER & fl) - putchar(toupper((int)*cp)); - else - putchar((int)*cp); - /* If we're a character escape, escape us. */ - if ('\\' == *cp) - putchar('e'); - } -} - -static void -pnode_printmacrolinepart(struct parse *p, struct pnode *pn) -{ - - pnode_printmacrolinetext(p, pn, 0); -} - -/* - * Just pnode_printmacrolinepart() but with a newline. - * If no text, just the newline. - */ -static void -pnode_printmacroline(struct parse *p, struct pnode *pn) -{ - - assert(0 == p->newln); - pnode_printmacrolinetext(p, pn, 0); - putchar('\n'); - p->newln = 1; -} - -static void -pnode_printmopen(struct parse *p) -{ - if (p->newln) { - putchar('.'); - p->newln = 0; - } else - putchar(' '); -} - -static void -pnode_printmclose(struct parse *p, int sv) -{ - - if (sv && ! p->newln) { - putchar('\n'); - p->newln = 1; - } -} - -/* - * If the SYNOPSIS macro has a superfluous title, kill it. - */ -static void -pnode_printrefsynopsisdiv(struct parse *p, struct pnode *pn) -{ - struct pnode *pp; - - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - pnode_unlink(pp); - return; - } -} - -/* - * Start a hopefully-named `Sh' section. - */ -static void -pnode_printrefsect(struct parse *p, struct pnode *pn) -{ - struct pnode *pp; - - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) - break; - - switch (pn->node) { - case (NODE_REFSECT1): - fputs(".Sh", stdout); + switch (level) { + case 1: + macro_open(p, "Sh"); break; - case (NODE_REFSECT2): - fputs(".Ss", stdout); + case 2: + macro_open(p, "Ss"); 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: + pnode_printpara(p, pn); + macro_open(p, "Sy"); break; } - p->newln = 0; - - if (NULL != pp) { - pnode_printmacrolinetext(p, pp, - NODE_REFSECT1 == pn->node ? - MACROLINE_UPPER : 0); - pnode_printmclose(p, 1); + if (pp != NULL) { + macro_addnode(p, pp, flags); pnode_unlink(pp); - } else { - puts(NODE_REFSECT1 == pn->node ? - "UNKNOWN" : "unknown"); - p->newln = 1; - } + } else + macro_addarg(p, title, ARG_SPACE | ARG_QUOTED); + macro_close(p); } /* * Start a reference, extracting the title and volume. */ static void -pnode_printciterefentry(struct parse *p, struct pnode *pn) +pnode_printciterefentry(struct format *p, struct pnode *pn) { struct pnode *pp, *title, *manvol; title = manvol = NULL; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_MANVOLNUM == pp->node) + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_MANVOLNUM) manvol = pp; - else if (NODE_REFENTRYTITLE == pp->node) + else if (pp->node == NODE_REFENTRYTITLE) title = pp; - - fputs(".Xr", stdout); - p->newln = 0; - - if (NULL != title) { - pnode_printmacrolinepart(p, title); - } else - fputs(" unknown ", stdout); - - if (NULL == manvol) { - puts(" 1"); - p->newln = 1; - } else - pnode_printmacroline(p, manvol); + } + macro_open(p, "Xr"); + if (title == NULL) + macro_addarg(p, "unknown", ARG_SPACE); + else + macro_addnode(p, title, ARG_SPACE | ARG_SINGLE); + if (manvol == NULL) + macro_addarg(p, "1", ARG_SPACE); + else + macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE); + pnode_unlinksub(pn); } static void -pnode_printrefmeta(struct parse *p, struct pnode *pn) +pnode_printrefmeta(struct format *p, struct pnode *pn) { struct pnode *pp, *title, *manvol; title = manvol = NULL; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_MANVOLNUM == pp->node) + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_MANVOLNUM) manvol = pp; - else if (NODE_REFENTRYTITLE == pp->node) + else if (pp->node == NODE_REFENTRYTITLE) title = pp; - - puts(".Dd $Mdocdate" "$"); - fputs(".Dt", stdout); - p->newln = 0; - - if (NULL != title) - pnode_printmacrolinetext(p, title, MACROLINE_UPPER); + } + macro_open(p, "Dt"); + if (title == NULL) + macro_addarg(p, "UNKNOWN", ARG_SPACE); else - fputs(" UNKNOWN ", stdout); + macro_addnode(p, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER); + if (manvol == NULL) + macro_addarg(p, "1", ARG_SPACE); + else + macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE); + macro_close(p); + pnode_unlink(pn); +} - if (NULL == manvol) { - puts(" 1"); - p->newln = 1; - } else - pnode_printmacroline(p, manvol); +static void +pnode_printfuncdef(struct format *f, struct pnode *n) +{ + struct pnode *nc; - puts(".Os"); + nc = TAILQ_FIRST(&n->childq); + if (nc != NULL && nc->node == NODE_TEXT) { + macro_argline(f, "Ft", nc->b); + pnode_unlink(nc); + } + macro_nodeline(f, "Fo", n, ARG_SINGLE); + pnode_unlinksub(n); } +/* + * 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_printfuncdef(struct parse *p, struct pnode *pn) +pnode_printmathfenced(struct format *p, struct pnode *pn) { - struct pnode *pp, *ftype, *func; + struct pnode *pp; - assert(p->newln); - ftype = func = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TEXT == pp->node) - ftype = pp; - else if (NODE_FUNCTION == pp->node) - func = pp; + printf("left %s ", pnode_getattr_raw(pn, ATTRKEY_OPEN, "(")); - if (NULL != ftype) { - fputs(".Ft", stdout); - p->newln = 0; - pnode_printmacroline(p, ftype); - } + pp = TAILQ_FIRST(&pn->childq); + pnode_print(p, pp); - if (NULL != func) { - fputs(".Fo", stdout); - p->newln = 0; - pnode_printmacroline(p, func); - } else { - puts(".Fo UNKNOWN"); - p->newln = 1; + while ((pp = TAILQ_NEXT(pp, child)) != NULL) { + putchar(','); + pnode_print(p, pp); } + printf("right %s ", pnode_getattr_raw(pn, ATTRKEY_CLOSE, ")")); + pnode_unlinksub(pn); } +/* + * 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_printparamdef(struct parse *p, struct pnode *pn) +pnode_printmath(struct format *p, struct pnode *pn) { - struct pnode *pp, *ptype, *param; + struct pnode *pp; - assert(p->newln); - ptype = param = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TEXT == pp->node) - ptype = pp; - else if (NODE_PARAMETER == pp->node) - param = pp; + pp = TAILQ_FIRST(&pn->childq); + pnode_print(p, pp); - fputs(".Fa \"", stdout); - p->newln = 0; - if (NULL != ptype) { - pnode_printmacrolinepart(p, ptype); - putchar(' '); + 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; } - if (NULL != param) - pnode_printmacrolinepart(p, param); - - puts("\""); - p->newln = 1; + pp = TAILQ_NEXT(pp, child); + pnode_print(p, pp); + pnode_unlinksub(pn); } static void -pnode_printfuncprototype(struct parse *p, struct pnode *pn) +pnode_printfuncprototype(struct format *p, struct pnode *pn) { struct pnode *pp, *fdef; - assert(p->newln); TAILQ_FOREACH(fdef, &pn->childq, child) - if (NODE_FUNCDEF == fdef->node) + if (fdef->node == NODE_FUNCDEF) break; - if (NULL != fdef) + if (fdef != NULL) { pnode_printfuncdef(p, fdef); - else - puts(".Fo UNKNOWN"); + pnode_unlink(fdef); + } else + macro_line(p, "Fo UNKNOWN"); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_PARAMDEF == pp->node) - pnode_printparamdef(p, pp); + TAILQ_FOREACH(pp, &pn->childq, child) + macro_nodeline(p, "Fa", pp, ARG_SINGLE); - puts(".Fc"); - p->newln = 1; + macro_line(p, "Fc"); + pnode_unlinksub(pn); } -/* +/* * 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"). @@ -820,7 +301,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode * ellipsis following an argument) and optionality. */ static void -pnode_printarg(struct parse *p, struct pnode *pn) +pnode_printarg(struct format *p, struct pnode *pn) { struct pnode *pp; struct pattr *ap; @@ -828,58 +309,51 @@ pnode_printarg(struct parse *p, struct pnode *pn) isop = 1; isrep = 0; - TAILQ_FOREACH(ap, &pn->attrq, child) - if (ATTRKEY_CHOICE == ap->key && - (ATTRVAL_PLAIN == ap->val || - ATTRVAL_REQ == ap->val)) + TAILQ_FOREACH(ap, &pn->attrq, child) { + if (ap->key == ATTRKEY_CHOICE && + (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) isop = 0; - else if (ATTRKEY_REP == ap->key && - (ATTRVAL_REPEAT == ap->val)) + else if (ap->key == ATTRKEY_REP && ap->val == ATTRVAL_REPEAT) isrep = 1; - - if (isop) { - pnode_printmopen(p); - fputs("Op", stdout); } + if (isop) + macro_open(p, "Op"); TAILQ_FOREACH(pp, &pn->childq, child) { - if (NODE_TEXT == pp->node) { - pnode_printmopen(p); - fputs("Ar", stdout); - } + if (pp->node == NODE_TEXT) + macro_open(p, "Ar"); pnode_print(p, pp); - if (NODE_TEXT == pp->node && isrep) - fputs("...", stdout); + if (isrep && pp->node == NODE_TEXT) + macro_addarg(p, "...", ARG_SPACE); } + pnode_unlinksub(pn); } static void -pnode_printgroup(struct parse *p, struct pnode *pn) +pnode_printgroup(struct format *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)) { + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ap->key == ATTRKEY_CHOICE && + (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) { 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); + sv = p->linestate == LINE_NEW; + if (isop) + macro_open(p, "Op"); else if (sv) - fputs("No", stdout); + macro_open(p, "No"); /* * Keep on printing text separated by the vertical bar as long @@ -892,154 +366,262 @@ pnode_printgroup(struct parse *p, struct pnode *pn) TAILQ_FOREACH(pp, &pn->childq, child) { pnode_print(p, pp); np = TAILQ_NEXT(pp, child); - while (NULL != np) { + while (np != NULL) { if (pp->node != np->node) break; - fputs(" |", stdout); - pnode_printmacrolinepart(p, np); + macro_addarg(p, "|", ARG_SPACE); + macro_addnode(p, np, ARG_SPACE); pp = np; np = TAILQ_NEXT(np, child); } } - - pnode_printmclose(p, sv); + if (sv) + macro_close(p); + pnode_unlinksub(pn); } static void -pnode_printprologue(struct parse *p, struct pnode *pn) +pnode_printauthor(struct format *f, struct pnode *n) { - struct pnode *pp; + struct pnode *nc, *ncn; + int have_contrib, have_name; - pp = NULL == p->root ? NULL : - pnode_findfirst(p->root, NODE_REFMETA); + /* + * Print children up front, before the .An scope, + * and figure out whether we a name of a person. + */ - if (NULL != pp) { - pnode_printrefmeta(p, pp); - pnode_unlink(pp); - } else { - puts(".\\\" Supplying bogus prologue..."); - puts(".Dd $Mdocdate" "$"); - puts(".Dt UNKNOWN 1"); - puts(".Os"); + have_contrib = have_name = 0; + TAILQ_FOREACH_SAFE(nc, &n->childq, child, ncn) { + switch (nc->node) { + case NODE_CONTRIB: + if (have_contrib) + print_text(f, ",", 0); + print_textnode(f, nc); + pnode_unlink(nc); + have_contrib = 1; + break; + case NODE_PERSONNAME: + have_name = 1; + break; + default: + break; + } } + if (TAILQ_FIRST(&n->childq) == NULL) + return; + + if (have_contrib) + print_text(f, ":", 0); + + /* + * If we have a name, print it in the .An scope and leave + * all other content for child handlers, to print after the + * scope. Otherwise, print everything in the scope. + */ + + macro_open(f, "An"); + TAILQ_FOREACH_SAFE(nc, &n->childq, child, ncn) { + if (nc->node == NODE_PERSONNAME || have_name == 0) { + macro_addnode(f, nc, ARG_SPACE); + pnode_unlink(nc); + } + } + + /* + * If there is an email address, + * print it on the same macro line. + */ + + if ((nc = pnode_findfirst(n, NODE_EMAIL)) != NULL) { + pnode_print(f, nc); + pnode_unlink(nc); + } + + /* + * If there are still unprinted children, end the scope + * with a comma. Otherwise, leave the scope open in case + * a text node follows that starts with closing punctuation. + */ + + if (TAILQ_FIRST(&n->childq) != NULL) { + macro_addarg(f, ",", ARG_SPACE); + macro_close(f); + } } static void -pnode_printvarlistentry(struct parse *p, struct pnode *pn) +pnode_printprologue(struct format *p, struct ptree *tree) { - struct pnode *pp; + struct pnode *refmeta; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TERM == pp->node) { - fputs(".It", stdout); - p->newln = 0; - pnode_print(p, pp); - pnode_unlink(pp); - pnode_printmclose(p, 1); - return; - } + refmeta = tree->root == NULL ? NULL : + pnode_findfirst(tree->root, NODE_REFMETA); - puts(".It"); - p->newln = 1; + macro_line(p, "Dd $Mdocdate" "$"); + if (refmeta == NULL) { + macro_open(p, "Dt"); + macro_addarg(p, + pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"), + ARG_SPACE | ARG_SINGLE | ARG_UPPER); + macro_addarg(p, "1", ARG_SPACE); + macro_close(p); + } else + pnode_printrefmeta(p, refmeta); + macro_line(p, "Os"); + + if (tree->flags & TREE_EQN) { + macro_line(p, "EQ"); + print_text(p, "delim $$", 0); + macro_line(p, "EN"); + } } +/* + * We can have multiple elements within a , which + * we should comma-separate as list headers. + */ static void -pnode_printrow(struct parse *p, struct pnode *pn) +pnode_printvarlistentry(struct format *p, struct pnode *pn) { struct pnode *pp; + int first = 1; - puts(".Bl -dash -compact"); - + macro_open(p, "It"); TAILQ_FOREACH(pp, &pn->childq, child) { - assert(p->newln); - puts(".It"); + if (pp->node != NODE_TERM) + continue; + if ( ! first) + macro_addarg(p, ",", 0); pnode_print(p, pp); - pnode_printmclose(p, 1); + first = 0; } - assert(p->newln); - puts(".El"); + macro_close(p); + TAILQ_FOREACH(pp, &pn->childq, child) + if (pp->node != NODE_TERM) + pnode_print(p, pp); + pnode_unlinksub(pn); } static void -pnode_printtable(struct parse *p, struct pnode *pn) +pnode_printtitle(struct format *p, struct pnode *pn) { - struct pnode *pp; + struct pnode *pp, *pq; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - puts(".Pp"); + TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) { + if (pp->node == NODE_TITLE) { + pnode_printpara(p, 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) +pnode_printrow(struct format *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); + macro_line(p, "Bl -dash -compact"); + TAILQ_FOREACH(pp, &pn->childq, child) { + macro_line(p, "It"); + pnode_print(p, pp); + } + macro_line(p, "El"); + pnode_unlink(pn); +} - if (NODE_ORDEREDLIST == pn->node) - puts(".Bl -enum"); - else - puts(".Bl -item"); +static void +pnode_printtgroup1(struct format *f, struct pnode *n) +{ + struct pnode *nc; + macro_line(f, "Bl -bullet -compact"); + while ((nc = pnode_findfirst(n, NODE_ENTRY)) != NULL) { + macro_line(f, "It"); + pnode_print(f, nc); + pnode_unlink(nc); + } + macro_line(f, "El"); + pnode_unlinksub(n); +} + +static void +pnode_printtgroup2(struct format *f, struct pnode *n) +{ + struct pnode *nr, *ne; + + macro_line(f, "Bl -tag -width Ds"); + while ((nr = pnode_findfirst(n, NODE_ROW)) != NULL) { + if ((ne = pnode_findfirst(n, NODE_ENTRY)) == NULL) + break; + macro_open(f, "It"); + pnode_print(f, ne); + macro_close(f); + pnode_unlink(ne); + pnode_print(f, nr); + pnode_unlink(nr); + } + macro_line(f, "El"); + pnode_unlinksub(n); +} + +static void +pnode_printtgroup(struct format *f, struct pnode *n) +{ + struct pnode *nc; + + switch (atoi(pnode_getattr_raw(n, ATTRKEY_COLS, "0"))) { + case 1: + pnode_printtgroup1(f, n); + return; + case 2: + pnode_printtgroup2(f, n); + return; + default: + break; + } + + macro_line(f, "Bl -ohang"); + while ((nc = pnode_findfirst(n, NODE_ROW)) != NULL) { + macro_line(f, "It Table Row"); + pnode_printrow(f, nc); + } + macro_line(f, "El"); + pnode_unlinksub(n); +} + +static void +pnode_printlist(struct format *p, struct pnode *pn) +{ + struct pnode *pp; + + pnode_printtitle(p, pn); + macro_argline(p, "Bl", + pn->node == NODE_ORDEREDLIST ? "-enum" : "-bullet"); TAILQ_FOREACH(pp, &pn->childq, child) { - assert(p->newln); - puts(".It"); + macro_line(p, "It"); pnode_print(p, pp); - pnode_printmclose(p, 1); } - assert(p->newln); - puts(".El"); + macro_line(p, "El"); + pnode_unlinksub(pn); } static void -pnode_printvariablelist(struct parse *p, struct pnode *pn) +pnode_printvariablelist(struct format *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 -tag -width Ds"); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_VARLISTENTRY != pp->node) { - assert(p->newln); - fputs(".It", stdout); - pnode_printmacroline(p, pp); - } else { - assert(p->newln); - pnode_print(p, pp); - } - assert(p->newln); - puts(".El"); + pnode_printtitle(p, pn); + macro_line(p, "Bl -tag -width Ds"); + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_VARLISTENTRY) + pnode_printvarlistentry(p, pp); + else + macro_nodeline(p, "It", pp, 0); + } + macro_line(p, "El"); + pnode_unlinksub(pn); } /* @@ -1049,231 +631,260 @@ pnode_printvariablelist(struct parse *p, struct pnode * whatever), don't print inline macros. */ static void -pnode_print(struct parse *p, struct pnode *pn) +pnode_print(struct format *p, struct pnode *pn) { struct pnode *pp; + const char *ccp; char *cp; - int last, sv; + int last; + enum linestate sv; - if (NULL == pn) + if (pn == NULL) return; - sv = p->newln; + sv = p->linestate; switch (pn->node) { - case (NODE_APPLICATION): - pnode_printmopen(p); - fputs("Nm", stdout); + case NODE_APPLICATION: + macro_open(p, "Nm"); break; - case (NODE_ARG): + case NODE_ARG: pnode_printarg(p, pn); - pnode_unlinksub(pn); break; - case (NODE_CITEREFENTRY): - assert(p->newln); + case NODE_AUTHOR: + pnode_printauthor(p, pn); + break; + case NODE_AUTHORGROUP: + macro_line(p, "An -split"); + break; + case NODE_BOOKINFO: + macro_line(p, "Sh NAME"); + break; + case NODE_CITEREFENTRY: pnode_printciterefentry(p, pn); - pnode_unlinksub(pn); break; - case (NODE_CODE): - pnode_printmopen(p); - fputs("Li", stdout); + case NODE_CITETITLE: + macro_open(p, "%T"); break; - case (NODE_COMMAND): - pnode_printmopen(p); - fputs("Nm", stdout); + case NODE_CODE: + macro_open(p, "Li"); break; - case (NODE_EMPHASIS): - pnode_printmopen(p); - fputs("Em", stdout); + case NODE_COMMAND: + macro_open(p, "Nm"); break; - case (NODE_ENVAR): - pnode_printmopen(p); - fputs("Ev", stdout); + case NODE_CONSTANT: + macro_open(p, "Dv"); break; - case (NODE_FILENAME): - pnode_printmopen(p); - fputs("Pa", stdout); + case NODE_EDITOR: + print_text(p, "editor:", ARG_SPACE); + macro_open(p, "An"); break; - case (NODE_FUNCTION): - pnode_printmopen(p); - fputs("Fn", stdout); + case NODE_EMAIL: + macro_open(p, "Aq Mt"); break; - case (NODE_FUNCPROTOTYPE): - assert(p->newln); + case NODE_EMPHASIS: + case NODE_FIRSTTERM: + macro_open(p, "Em"); + break; + case NODE_ENVAR: + macro_open(p, "Ev"); + break; + case NODE_ESCAPE: + if (p->linestate == LINE_NEW) + p->linestate = LINE_TEXT; + else + putchar(' '); + fputs(pn->b, stdout); + break; + case NODE_FILENAME: + macro_open(p, "Pa"); + break; + case NODE_FUNCTION: + macro_open(p, "Fn"); + break; + case NODE_FUNCPROTOTYPE: pnode_printfuncprototype(p, pn); - pnode_unlinksub(pn); break; - case (NODE_FUNCSYNOPSISINFO): - pnode_printmopen(p); - fputs("Fd", stdout); + case NODE_FUNCSYNOPSISINFO: + macro_open(p, "Fd"); break; - case (NODE_ITEMIZEDLIST): - assert(p->newln); + case NODE_INFORMALEQUATION: + macro_line(p, "EQ"); + break; + case NODE_INLINEEQUATION: + if (p->linestate == LINE_NEW) + p->linestate = LINE_TEXT; + putchar('$'); + break; + case NODE_ITEMIZEDLIST: pnode_printlist(p, pn); - pnode_unlinksub(pn); break; - case (NODE_GROUP): + case NODE_GROUP: pnode_printgroup(p, pn); - pnode_unlinksub(pn); break; - case (NODE_LITERAL): - pnode_printmopen(p); - fputs("Li", stdout); + case NODE_KEYSYM: + macro_open(p, "Sy"); break; - case (NODE_OPTION): - pnode_printmopen(p); - fputs("Fl", stdout); + case NODE_LEGALNOTICE: + macro_line(p, "Sh LEGAL NOTICE"); break; - case (NODE_ORDEREDLIST): - assert(p->newln); - pnode_printlist(p, pn); - pnode_unlinksub(pn); + case NODE_LINK: + ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL); + if (ccp == NULL) + break; + macro_argline(p, "Sx", ccp); + return; + case NODE_LITERAL: + macro_open(p, "Li"); break; - case (NODE_PARA): - assert(p->newln); - if (NULL != pn->parent && - NODE_LISTITEM == pn->parent->node) + case NODE_LITERALLAYOUT: + macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) == + ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); + break; + case NODE_MML_MFENCED: + pnode_printmathfenced(p, pn); + break; + case NODE_MML_MROW: + case NODE_MML_MI: + case NODE_MML_MN: + case NODE_MML_MO: + if (TAILQ_EMPTY(&pn->childq)) break; - puts(".Pp"); + fputs(" { ", stdout); break; - case (NODE_PARAMETER): - /* Suppress non-text children... */ - pnode_printmopen(p); - fputs("Fa \"", stdout); - pnode_printmacrolinepart(p, pn); - puts("\""); + case NODE_MML_MFRAC: + case NODE_MML_MSUB: + case NODE_MML_MSUP: + pnode_printmath(p, pn); + break; + case NODE_OPTION: + macro_open(p, "Fl"); + break; + case NODE_ORDEREDLIST: + pnode_printlist(p, pn); + break; + case NODE_PARA: + pnode_printpara(p, pn); + break; + case NODE_PARAMDEF: + case NODE_PARAMETER: + macro_nodeline(p, "Fa", pn, ARG_SINGLE); pnode_unlinksub(pn); break; - case (NODE_QUOTE): - pnode_printmopen(p); - fputs("Qo", stdout); + case NODE_QUOTE: + macro_open(p, "Qo"); break; - case (NODE_PROGRAMLISTING): - /* FALLTHROUGH */ - case (NODE_SCREEN): - assert(p->newln); - puts(".Bd -literal"); + case NODE_PROGRAMLISTING: + case NODE_SCREEN: + case NODE_SYNOPSIS: + macro_line(p, "Bd -literal"); break; - case (NODE_REFENTRYINFO): + case NODE_REFENTRYINFO: /* Suppress. */ pnode_unlinksub(pn); break; - case (NODE_REFMETA): - abort(); - break; - case (NODE_REFNAME): + case NODE_REFNAME: /* Suppress non-text children... */ - pnode_printmopen(p); - fputs("Nm", stdout); - p->newln = 0; - pnode_printmacrolinepart(p, pn); + macro_open(p, "Nm"); + macro_addnode(p, pn, ARG_SPACE | ARG_SINGLE); pnode_unlinksub(pn); break; - case (NODE_REFNAMEDIV): - assert(p->newln); - puts(".Sh NAME"); + case NODE_REFNAMEDIV: + macro_line(p, "Sh NAME"); break; - case (NODE_REFPURPOSE): - assert(p->newln); - pnode_printmopen(p); - fputs("Nd", stdout); + case NODE_REFPURPOSE: + macro_open(p, "Nd"); break; - case (NODE_REFSYNOPSISDIV): - assert(p->newln); + case NODE_REFSYNOPSISDIV: pnode_printrefsynopsisdiv(p, 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); + case NODE_PREFACE: + case NODE_SECTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_CAUTION: + case NODE_WARNING: pnode_printrefsect(p, pn); break; - case (NODE_REPLACEABLE): - pnode_printmopen(p); - fputs("Ar", stdout); + case NODE_REPLACEABLE: + macro_open(p, "Ar"); break; - case (NODE_SBR): - assert(p->newln); - puts(".br"); + case NODE_SBR: + macro_line(p, "br"); break; - case (NODE_STRUCTNAME): - pnode_printmopen(p); - fputs("Vt", stdout); + case NODE_SGMLTAG: + macro_open(p, "Li"); break; - case (NODE_TABLE): - assert(p->newln); - pnode_printtable(p, pn); - pnode_unlinksub(pn); + case NODE_STRUCTNAME: + macro_open(p, "Vt"); break; - case (NODE_TEXT): - if (0 == p->newln) + case NODE_TEXT: + if (pn->bsz == 0) { + assert(pn->real != pn->b); + break; + } + if (p->linestate == LINE_NEW) + p->linestate = LINE_TEXT; + else putchar(' '); - bufclear(p); - bufappend(p, pn); + /* * 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); - cp = p->b; + cp = pn->b; + /* * There's often a superfluous "-" in its