=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.57 retrieving revision 1.72 diff -u -p -r1.57 -r1.72 --- docbook2mdoc/docbook2mdoc.c 2019/03/22 16:47:29 1.57 +++ docbook2mdoc/docbook2mdoc.c 2019/03/25 17:28:32 1.72 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.57 2019/03/22 16:47:29 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.72 2019/03/25 17:28:32 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -29,6 +29,12 @@ #include "extern.h" +enum linestate { + LINE_NEW = 0, + LINE_TEXT, + LINE_MACRO +}; + /* * Global parse state. * Keep this as simple and small as possible. @@ -42,11 +48,8 @@ struct parse { unsigned int flags; /* document-wide flags */ struct pnode *root; /* root of parse tree */ struct pnode *cur; /* current node in tree */ - char *b; /* NUL-terminated buffer for pre-print */ - size_t bsz; /* current length of b */ - size_t mbsz; /* max bsz allocation */ int level; /* header level, starting at 1 */ - int newln; /* output: are we on a fresh line */ + enum linestate linestate; }; struct node { @@ -77,13 +80,16 @@ struct pnode { static const char *attrkeys[ATTRKEY__MAX] = { "choice", + "class", "close", "id", + "linkend", "open", "rep" }; static const char *attrvals[ATTRVAL__MAX] = { + "monospaced", "norepeat", "opt", "plain", @@ -114,6 +120,7 @@ static const struct node nodes[] = { { "copyright", NODE_COPYRIGHT }, { "date", NODE_DATE }, { "editor", NODE_EDITOR }, + { "email", NODE_EMAIL }, { "emphasis", NODE_EMPHASIS }, { "entry", NODE_ENTRY }, { "envar", NODE_ENVAR }, @@ -164,6 +171,7 @@ static const struct node nodes[] = { { "paramdef", NODE_PARAMDEF }, { "parameter", NODE_PARAMETER }, { "part", NODE_SECTION }, + { "personname", NODE_PERSONNAME }, { "phrase", NODE_PHRASE }, { "preface", NODE_PREFACE }, { "primary", NODE_PRIMARY }, @@ -242,10 +250,10 @@ xml_char(void *arg, const XML_Char *p, int sz) int i; /* Stopped or no tree yet. */ - if (ps->stop || NODE_ROOT == ps->node) + if (ps->stop || ps->node == NODE_ROOT) return; - assert(NULL != ps->cur); + assert(ps->cur != NULL); /* * Are we in the midst of processing text? @@ -254,7 +262,7 @@ xml_char(void *arg, const XML_Char *p, int sz) * 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) { + if (ps->node != NODE_TEXT) { for (i = 0; i < sz; i++) if ( ! isspace((unsigned char)p[i])) break; @@ -262,10 +270,10 @@ xml_char(void *arg, const XML_Char *p, int sz) return; p += i; sz -= i; - dat = calloc(1, sizeof(struct pnode)); - if (NULL == dat) { + dat = calloc(1, sizeof(*dat)); + if (dat == NULL) { perror(NULL); - exit(EXIT_FAILURE); + exit(1); } dat->node = ps->node = NODE_TEXT; @@ -274,28 +282,27 @@ xml_char(void *arg, const XML_Char *p, int sz) TAILQ_INIT(&dat->attrq); TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child); ps->cur = dat; - assert(NULL != ps->root); + assert(ps->root != NULL); } /* 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) { + ps->cur->b = realloc(ps->cur->b, ps->cur->bsz + sz + 1); + if (ps->cur->b == NULL) { perror(NULL); - exit(EXIT_FAILURE); + exit(1); } memcpy(ps->cur->b + ps->cur->bsz, p, sz); - ps->cur->bsz += (size_t)sz; + ps->cur->bsz += sz; + ps->cur->b[ps->cur->bsz] = '\0'; ps->cur->real = ps->cur->b; } static void pnode_trim(struct pnode *pn) { - - assert(NODE_TEXT == pn->node); - for ( ; pn->bsz > 0; pn->bsz--) + assert(pn->node == NODE_TEXT); + for (; pn->bsz > 0; pn->b[--pn->bsz] = '\0') if ( ! isspace((unsigned char)pn->b[pn->bsz - 1])) break; } @@ -326,31 +333,29 @@ xml_elem_start(void *arg, const XML_Char *name, const const XML_Char **att; /* FIXME: find a better way to ditch other namespaces. */ - if (ps->stop || 0 == strcmp(name, "xi:include")) + if (ps->stop || strcmp(name, "xi:include") == 0) return; /* Close out text node, if applicable... */ - if (NODE_TEXT == ps->node) { - assert(NULL != ps->cur); + if (ps->node == NODE_TEXT) { pnode_trim(ps->cur); ps->cur = ps->cur->parent; - assert(NULL != ps->cur); ps->node = ps->cur->node; } - for (node = nodes; NULL != node->name; node++) - if (0 == strcmp(node->name, name)) + for (node = nodes; node->name != NULL; node++) + if (strcmp(node->name, name) == 0) break; - if (NULL == node->name) { - if (NODE_ROOT == ps->node) + if (node->name == NULL) { + if (ps->node == NODE_ROOT) return; 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) { + } else if (ps->node == NODE_ROOT && ps->root != NULL) { fprintf(stderr, "%s:%zu:%zu: multiple refentries\n", ps->fname, XML_GetCurrentLineNumber(ps->xml), XML_GetCurrentColumnNumber(ps->xml)); @@ -358,12 +363,12 @@ xml_elem_start(void *arg, const XML_Char *name, const return; } - if (NODE_INLINEEQUATION == node->node) + if (node->node == NODE_INLINEEQUATION) ps->flags |= PARSE_EQN; - if (NULL == (dat = calloc(1, sizeof(struct pnode)))) { + if ((dat = calloc(1, sizeof(*dat))) == NULL) { perror(NULL); - exit(EXIT_FAILURE); + exit(1); } dat->node = ps->node = node->node; @@ -371,21 +376,21 @@ xml_elem_start(void *arg, const XML_Char *name, const TAILQ_INIT(&dat->childq); TAILQ_INIT(&dat->attrq); - if (NULL != ps->cur) + if (ps->cur != NULL) TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child); ps->cur = dat; - if (NULL == ps->root) + if (ps->root == NULL) ps->root = dat; /* * Process attributes. */ - for (att = atts; NULL != *att; att += 2) { + for (att = atts; *att != NULL; att += 2) { for (key = 0; key < ATTRKEY__MAX; key++) - if (0 == strcmp(*att, attrkeys[key])) + if (strcmp(*att, attrkeys[key]) == 0) break; - if (ATTRKEY__MAX == key) { + if (key == ATTRKEY__MAX) { if (warn) fprintf(stderr, "%s:%zu:%zu: warning: " "unknown attribute \"%s\"\n", @@ -396,13 +401,13 @@ xml_elem_start(void *arg, const XML_Char *name, const continue; } for (val = 0; val < ATTRVAL__MAX; val++) - if (0 == strcmp(*(att + 1), attrvals[val])) + if (strcmp(att[1], attrvals[val]) == 0) break; - pattr = calloc(1, sizeof(struct pattr)); + pattr = calloc(1, sizeof(*pattr)); pattr->key = key; pattr->val = val; - if (ATTRVAL__MAX == val) - pattr->rawval = strdup(*(att + 1)); + if (val == ATTRVAL__MAX) + pattr->rawval = strdup(att[1]); TAILQ_INSERT_TAIL(&dat->attrq, pattr, child); } @@ -419,21 +424,19 @@ 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) + if (ps->stop || ps->node == NODE_ROOT) return; - else if (0 == strcmp(name, "xi:include")) + else if (strcmp(name, "xi:include") == 0) return; /* Close out text node, if applicable... */ - if (NODE_TEXT == ps->node) { - assert(NULL != ps->cur); + if (ps->node == NODE_TEXT) { 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)) + if ((ps->cur = ps->cur->parent) == NULL) ps->node = NODE_ROOT; else ps->node = ps->cur->node; @@ -448,15 +451,15 @@ pnode_free(struct pnode *pn) struct pnode *pp; struct pattr *ap; - if (NULL == pn) + if (pn == NULL) return; - while (NULL != (pp = TAILQ_FIRST(&pn->childq))) { + while ((pp = TAILQ_FIRST(&pn->childq)) != NULL) { TAILQ_REMOVE(&pn->childq, pp, child); pnode_free(pp); } - while (NULL != (ap = TAILQ_FIRST(&pn->attrq))) { + while ((ap = TAILQ_FIRST(&pn->attrq)) != NULL) { TAILQ_REMOVE(&pn->attrq, ap, child); free(ap->rawval); free(ap); @@ -472,8 +475,7 @@ pnode_free(struct pnode *pn) static void pnode_unlink(struct pnode *pn) { - - if (NULL != pn->parent) + if (pn->parent != NULL) TAILQ_REMOVE(&pn->parent->childq, pn, child); pnode_free(pn); } @@ -490,55 +492,37 @@ pnode_unlinksub(struct pnode *pn) } /* - * Reset the lookaside buffer. + * Retrieve an enumeration attribute from a node. + * Return ATTRVAL__MAX if the node has no such attribute. */ -static void -bufclear(struct parse *p) +enum attrval +pnode_getattr(struct pnode *pn, enum attrkey key) { + struct pattr *ap; - p->b[p->bsz = 0] = '\0'; + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ap->key == key) + return ap->val; + return ATTRVAL__MAX; } /* - * Append NODE_TEXT contents to the current buffer, reallocating its - * size if necessary. - * The buffer is ALWAYS NUL-terminated. + * Retrieve an attribute string from a node. + * Return defval if the node has no such attribute. */ -static void -bufappend(struct parse *p, struct pnode *pn) +const char * +pnode_getattr_raw(struct pnode *pn, enum attrkey key, const char *defval) { + struct pattr *ap; - 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); - } - } - memcpy(p->b + p->bsz, pn->b, pn->bsz); - p->bsz += pn->bsz; - p->b[p->bsz] = '\0'; + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ap->key == key) + return ap->val == ATTRVAL__MAX ? ap->rawval : + attrvals[ap->val]; + return defval; } /* - * 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); -} - -/* * Recursively search and return the first instance of "node". */ static struct pnode * @@ -550,134 +534,218 @@ pnode_findfirst(struct pnode *pn, enum nodeid node) TAILQ_FOREACH(pp, &pn->childq, child) { res = pp->node == node ? pp : pnode_findfirst(pp, node); - if (NULL != res) + if (res != NULL) break; } - return(res); + return res; } -#define MACROLINE_NORM 0 -#define MACROLINE_UPPER 1 -#define MACROLINE_NOWS 2 +static void +macro_open(struct parse *p, const char *name) +{ + switch (p->linestate) { + case LINE_TEXT: + putchar('\n'); + /* FALLTHROUGH */ + case LINE_NEW: + putchar('.'); + p->linestate = LINE_MACRO; + break; + case LINE_MACRO: + putchar(' '); + break; + } + fputs(name, stdout); +} + +static void +macro_close(struct parse *p) +{ + assert(p->linestate == LINE_MACRO); + putchar('\n'); + p->linestate = LINE_NEW; +} + +static void +macro_line(struct parse *p, const char *name) +{ + macro_open(p, name); + macro_close(p); +} + +#define ARG_SPACE 1 /* Insert whitespace before this argument. */ +#define ARG_SINGLE 2 /* Quote argument if it contains whitespace. */ +#define ARG_QUOTED 4 /* We are already in a quoted argument. */ +#define ARG_UPPER 8 /* Covert argument to upper case. */ /* - * Recursively print text presumably on a macro line. - * Convert all whitespace to regular spaces. + * Print an argument string on a macro line, collapsing whitespace. */ static void -pnode_printmacrolinetext(struct parse *p, struct pnode *pn, int fl) +macro_addarg(struct parse *p, const char *arg, int flags) { - char *cp; + const char *cp; - if (0 == p->newln && ! (MACROLINE_NOWS & fl)) - putchar(' '); + assert(p->linestate == LINE_MACRO); - bufclear(p); - bufappend_r(p, pn); + /* Quote if requested and necessary. */ - /* Convert all space to spaces. */ - for (cp = p->b; '\0' != *cp; cp++) - if (isspace((unsigned char)*cp)) - *cp = ' '; + if ((flags & (ARG_SINGLE | ARG_QUOTED)) == ARG_SINGLE) { + for (cp = arg; *cp != '\0'; cp++) + if (isspace((unsigned char)*cp)) + break; + if (*cp != '\0') { + if (flags & ARG_SPACE) { + putchar(' '); + flags &= ~ ARG_SPACE; + } + putchar('"'); + flags = ARG_QUOTED; + } + } - for (cp = p->b; isspace((unsigned char)*cp); cp++) - /* Spin past whitespace (XXX: necessary?) */ ; - for ( ; '\0' != *cp; cp++) { + for (cp = arg; *cp != '\0'; cp++) { + + /* Collapse whitespace. */ + + if (isspace((unsigned char)*cp)) { + flags |= ARG_SPACE; + continue; + } else if (flags & ARG_SPACE) { + putchar(' '); + flags &= ~ ARG_SPACE; + } + /* Escape us if we look like a macro. */ - if ((cp == p->b || ' ' == *(cp - 1)) && - isupper((unsigned char)*cp) && - '\0' != *(cp + 1) && - islower((unsigned char)*(cp + 1)) && - ('\0' == *(cp + 2) || - ' ' == *(cp + 2) || - (islower((unsigned char)*(cp + 2)) && - ('\0' == *(cp + 3) || - ' ' == *(cp + 3))))) + + if ((flags & ARG_QUOTED) == 0 && + (cp == arg || isspace((unsigned char)cp[-1])) && + isupper((unsigned char)cp[0]) && + islower((unsigned char)cp[1]) && + (cp[2] == '\0' || cp[2] == ' ' || + (islower((unsigned char)cp[2]) && + (cp[3] == '\0' || cp[3] == ' ')))) fputs("\\&", stdout); - if (MACROLINE_UPPER & fl) + + if (*cp == '"') + fputs("\\(dq", stdout); + else if (flags & ARG_UPPER) putchar(toupper((unsigned char)*cp)); else putchar(*cp); - /* If we're a character escape, escape us. */ - if ('\\' == *cp) + if (*cp == '\\') putchar('e'); } } static void -pnode_printmacrolinepart(struct parse *p, struct pnode *pn) +macro_argline(struct parse *p, const char *name, const char *arg) { - - pnode_printmacrolinetext(p, pn, 0); + macro_open(p, name); + macro_addarg(p, arg, ARG_SPACE); + macro_close(p); } /* - * Just pnode_printmacrolinepart() but with a newline. - * If no text, just the newline. + * Recursively append text from the children of a node to a macro line. */ static void -pnode_printmacroline(struct parse *p, struct pnode *pn) +macro_addnode(struct parse *p, struct pnode *pn, int flags) { + int quote_now; - assert(0 == p->newln); - pnode_printmacrolinetext(p, pn, 0); - putchar('\n'); - p->newln = 1; -} + assert(p->linestate == LINE_MACRO); -static void -pnode_printmopen(struct parse *p) -{ - if (p->newln) { - putchar('.'); - p->newln = 0; - } else - putchar(' '); + /* + * If the only child is a text node, just add that text, + * letting macro_addarg() decide about quoting. + */ + + pn = TAILQ_FIRST(&pn->childq); + if (pn != NULL && pn->node == NODE_TEXT && + TAILQ_NEXT(pn, child) == NULL) { + macro_addarg(p, pn->b, flags); + return; + } + + /* + * If we want the argument quoted and are not already + * in a quoted context, quote now. + */ + + quote_now = 0; + if (flags & ARG_SINGLE) { + if ((flags & ARG_QUOTED) == 0) { + if (flags & ARG_SPACE) { + putchar(' '); + flags &= ~ARG_SPACE; + } + putchar('"'); + flags |= ARG_QUOTED; + quote_now = 1; + } + flags &= ~ARG_SINGLE; + } + + /* + * Iterate to child and sibling nodes, + * inserting whitespace between nodes. + */ + + while (pn != NULL) { + if (pn->node == NODE_TEXT) + macro_addarg(p, pn->b, flags); + else + macro_addnode(p, pn, flags); + pn = TAILQ_NEXT(pn, child); + flags |= ARG_SPACE; + } + if (quote_now) + putchar('"'); } static void -pnode_printmclose(struct parse *p, int sv) +macro_nodeline(struct parse *p, const char *name, struct pnode *pn, int flags) { - - if (sv && ! p->newln) { - putchar('\n'); - p->newln = 1; - } + macro_open(p, name); + macro_addnode(p, pn, ARG_SPACE | flags); + macro_close(p); } /* - * 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. + * If the next node is a text node starting with closing punctuation, + * emit the closing punctuation as a trailing macro argument. */ static void -pnode_printmclosepunct(struct parse *p, struct pnode *pn, int sv) +macro_closepunct(struct parse *p, struct pnode *pn) { - /* 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((unsigned char)pn->b[1]))) { + if ((pn = TAILQ_NEXT(pn, child)) != NULL && + pn->node == NODE_TEXT && pn->bsz > 0 && + (pn->b[0] == ',' || pn->b[0] == '.') && + (pn->bsz == 1 || isspace((unsigned char)pn->b[1]))) { putchar(' '); putchar(pn->b[0]); pn->b++; pn->bsz--; } + macro_close(p); +} - putchar('\n'); - p->newln = 1; +static void +print_text(struct parse *p, const char *word) +{ + switch (p->linestate) { + case LINE_NEW: + break; + case LINE_TEXT: + putchar(' '); + break; + case LINE_MACRO: + macro_close(p); + break; + } + fputs(word, stdout); + p->linestate = LINE_TEXT; } static void @@ -685,16 +753,23 @@ pnode_printpara(struct parse *p, struct pnode *pn) { struct pnode *pp; - assert(p->newln); - if (NULL == pn->parent || NODE_LISTITEM == pn->parent->node) + if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL && + (pp = pn->parent) == NULL) return; - pp = TAILQ_PREV(pn, pnodeq, child); - if (NULL == pp) - pp = pn->parent; - if ((NODE_SECTION != pp->node && NODE_PREFACE != pp->node) || - 2 < p->level) - puts(".Pp"); + switch (pp->node) { + case NODE_ENTRY: + case NODE_LISTITEM: + return; + case NODE_PREFACE: + case NODE_SECTION: + if (p->level < 3) + return; + break; + default: + break; + } + macro_line(p, "Pp"); } /* @@ -703,13 +778,13 @@ pnode_printpara(struct parse *p, struct pnode *pn) static void pnode_printrefsynopsisdiv(struct parse *p, struct pnode *pn) { - struct pnode *pp; + struct pnode *pp, *pq; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { + TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) + if (pp->node == NODE_TITLE) pnode_unlink(pp); - return; - } + + macro_line(p, "Sh SYNOPSIS"); } /* @@ -722,17 +797,19 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) const char *title; int flags, level; - if (NULL == pn->parent) + if (pn->parent == NULL) return; level = ++p->level; - flags = 1 == level ? MACROLINE_UPPER : 0; - if (3 > 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): + case NODE_CAUTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_WARNING: level = 3; break; default: @@ -741,24 +818,24 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) } TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) + if (pp->node == NODE_TITLE) break; - if (NULL == pp) { + if (pp == NULL) { switch (pn->node) { - case (NODE_PREFACE): + case NODE_PREFACE: title = "Preface"; break; - case (NODE_CAUTION): + case NODE_CAUTION: title = "Caution"; break; - case (NODE_NOTE): + case NODE_NOTE: title = "Note"; break; - case (NODE_TIP): + case NODE_TIP: title = "Tip"; break; - case (NODE_WARNING): + case NODE_WARNING: title = "Warning"; break; default: @@ -768,25 +845,24 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) } switch (level) { - case (1): - fputs(".Sh", stdout); + case 1: + macro_open(p, "Sh"); break; - case (2): - fputs(".Ss", stdout); + case 2: + macro_open(p, "Ss"); break; default: pnode_printpara(p, pn); - fputs(".Sy", stdout); + macro_open(p, "Sy"); break; } - if (NULL != pp) { - p->newln = 0; - pnode_printmacrolinetext(p, pp, flags); - pnode_printmclose(p, 1); + if (pp != NULL) { + macro_addnode(p, pp, flags); pnode_unlink(pp); } else - printf(" %s\n", title); + macro_addarg(p, title, ARG_SPACE | ARG_QUOTED); + macro_close(p); } /* @@ -798,22 +874,23 @@ pnode_printciterefentry(struct parse *p, struct pnode struct pnode *pp, *title, *manvol; title = manvol = NULL; - 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; - - if (NULL != title) { - pnode_printmacrolinepart(p, title); - } else - fputs(" unknown ", stdout); - - if (NULL == manvol) { - puts(" 1"); - p->newln = 1; - } else - pnode_printmacrolinepart(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); + macro_close(p); + pnode_unlinksub(pn); } static void @@ -822,26 +899,23 @@ pnode_printrefmeta(struct parse *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(".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); - - if (NULL == manvol) { - puts(" 1"); - p->newln = 1; - } else - pnode_printmacroline(p, manvol); + 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); } static void @@ -849,57 +923,23 @@ pnode_printfuncdef(struct parse *p, struct pnode *pn) { struct pnode *pp, *ftype, *func; - assert(p->newln); ftype = func = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TEXT == pp->node) + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_TEXT) ftype = pp; - else if (NODE_FUNCTION == pp->node) + else if (pp->node == NODE_FUNCTION) func = pp; - - if (NULL != ftype) { - fputs(".Ft", stdout); - p->newln = 0; - pnode_printmacroline(p, ftype); } - - if (NULL != func) { - fputs(".Fo", stdout); - p->newln = 0; - pnode_printmacroline(p, func); - } else { - puts(".Fo UNKNOWN"); - p->newln = 1; - } + if (ftype != NULL) + macro_argline(p, "Ft", ftype->b); + macro_open(p, "Fo"); + if (func == NULL) + macro_addarg(p, "UNKNOWN", ARG_SPACE); + else + macro_addnode(p, func, ARG_SPACE | ARG_SINGLE); + macro_close(p); } -static void -pnode_printparamdef(struct parse *p, struct pnode *pn) -{ - struct pnode *pp, *ptype, *param; - - 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; - - fputs(".Fa \"", stdout); - p->newln = 0; - if (NULL != ptype) { - pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS); - putchar(' '); - } - - if (NULL != param) - pnode_printmacrolinepart(p, param); - - puts("\""); - p->newln = 1; -} - /* * The node is a little peculiar. * First, it can have arbitrary open and closing tokens, which default @@ -910,31 +950,18 @@ 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 ( "); + printf("left %s ", pnode_getattr_raw(pn, ATTRKEY_OPEN, "(")); pp = TAILQ_FIRST(&pn->childq); pnode_print(p, pp); - while (NULL != (pp = TAILQ_NEXT(pp, child))) { + while ((pp = TAILQ_NEXT(pp, child)) != NULL) { 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 ) "); + printf("right %s ", pnode_getattr_raw(pn, ATTRKEY_CLOSE, ")")); + pnode_unlinksub(pn); } /* @@ -952,13 +979,13 @@ pnode_printmath(struct parse *p, struct pnode *pn) pnode_print(p, pp); switch (pn->node) { - case (NODE_MML_MSUP): + case NODE_MML_MSUP: fputs(" sup ", stdout); break; - case (NODE_MML_MFRAC): + case NODE_MML_MFRAC: fputs(" over ", stdout); break; - case (NODE_MML_MSUB): + case NODE_MML_MSUB: fputs(" sub ", stdout); break; default: @@ -967,6 +994,7 @@ pnode_printmath(struct parse *p, struct pnode *pn) pp = TAILQ_NEXT(pp, child); pnode_print(p, pp); + pnode_unlinksub(pn); } static void @@ -974,22 +1002,21 @@ pnode_printfuncprototype(struct parse *p, struct pnode { 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"); + macro_line(p, "Fo UNKNOWN"); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_PARAMDEF == pp->node) - pnode_printparamdef(p, pp); + if (pp->node == NODE_PARAMDEF) + macro_nodeline(p, "Fa", pp, ARG_SINGLE); - puts(".Fc"); - p->newln = 1; + macro_line(p, "Fc"); + pnode_unlinksub(pn); } /* @@ -1008,29 +1035,24 @@ 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 @@ -1042,9 +1064,8 @@ pnode_printgroup(struct parse *p, struct pnode *pn) isop = 1; TAILQ_FOREACH(ap, &pn->attrq, child) - if (ATTRKEY_CHOICE == ap->key && - (ATTRVAL_PLAIN == ap->val || - ATTRVAL_REQ == ap->val)) { + if (ap->key == ATTRKEY_CHOICE && + (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) { isop = 0; break; } @@ -1054,12 +1075,11 @@ pnode_printgroup(struct parse *p, struct pnode *pn) * This will prevent pnode_print() for putting us on a * subsequent line. */ - sv = p->newln; - pnode_printmopen(p); + sv = p->linestate == LINE_NEW; if (isop) - fputs("Op", stdout); + 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 @@ -1072,49 +1092,45 @@ 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) { struct pnode *pp; - struct pattr *ap; - const char *name; - pp = NULL == p->root ? NULL : + pp = p->root == NULL ? NULL : pnode_findfirst(p->root, NODE_REFMETA); - puts(".Dd $Mdocdate" "$"); - if (NULL != pp) { + macro_line(p, "Dd $Mdocdate" "$"); + if (pp != NULL) pnode_printrefmeta(p, pp); - pnode_unlink(pp); - } else { - name = "UNKNOWN"; - TAILQ_FOREACH(ap, &p->root->attrq, child) { - if (ATTRKEY_ID == ap->key) { - name = ap->rawval; - break; - } - } - printf(".Dt %s 1\n", name); + else { + macro_open(p, "Dt"); + macro_addarg(p, + pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN"), + ARG_SPACE | ARG_SINGLE | ARG_UPPER); + macro_addarg(p, "1", ARG_SPACE); + macro_close(p); } - puts(".Os"); + macro_line(p, "Os"); - if (PARSE_EQN & p->flags) { - puts(".EQ"); - puts("delim $$"); - puts(".EN"); + if (p->flags & PARSE_EQN) { + macro_line(p, "EQ"); + print_text(p, "delim $$"); + macro_line(p, "EN"); } } @@ -1128,22 +1144,34 @@ pnode_printvarlistentry(struct parse *p, struct pnode struct pnode *pp; int first = 1; - assert(p->newln); - fputs(".It", stdout); - p->newln = 0; - + macro_open(p, "It"); + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node != NODE_TERM) + continue; + if ( ! first) + macro_addarg(p, ",", 0); + pnode_print(p, pp); + first = 0; + } + macro_close(p); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TERM == pp->node) { - if ( ! first) - putchar(','); + if (pp->node != NODE_TERM) pnode_print(p, pp); - pnode_unlink(pp); - first = 0; - } else - break; + pnode_unlinksub(pn); +} - putchar('\n'); - p->newln = 1; +static void +pnode_printtitle(struct parse *p, struct pnode *pn) +{ + struct pnode *pp, *pq; + + TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) { + if (pp->node == NODE_TITLE) { + pnode_printpara(p, pp); + pnode_print(p, pp); + pnode_unlink(pp); + } + } } static void @@ -1151,16 +1179,13 @@ pnode_printrow(struct parse *p, struct pnode *pn) { struct pnode *pp; - puts(".Bl -dash -compact"); - + macro_line(p, "Bl -dash -compact"); 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_unlink(pn); } static void @@ -1168,23 +1193,14 @@ 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) { - 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_printtitle(p, pn); + macro_line(p, "Bl -ohang"); + while ((pp = pnode_findfirst(pn, NODE_ROW)) != NULL) { + macro_line(p, "It Table Row"); pnode_printrow(p, pp); - pnode_printmclose(p, 1); - pnode_unlink(pp); } - assert(p->newln); - puts(".El"); + macro_line(p, "El"); + pnode_unlinksub(pn); } static void @@ -1192,28 +1208,15 @@ 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) { - pnode_printpara(p, pp); - pnode_print(p, pp); - pnode_unlink(pp); - } - assert(p->newln); - - if (NODE_ORDEREDLIST == pn->node) - puts(".Bl -enum"); - else - puts(".Bl -bullet"); - + 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 @@ -1221,27 +1224,16 @@ pnode_printvariablelist(struct parse *p, struct pnode { struct pnode *pp; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - pnode_printpara(p, pp); + pnode_printtitle(p, pn); + macro_line(p, "Bl -tag -width Ds"); + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_VARLISTENTRY) 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"); + else + macro_nodeline(p, "It", pp, 0); + } + macro_line(p, "El"); + pnode_unlinksub(pn); } /* @@ -1254,239 +1246,202 @@ static void pnode_print(struct parse *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; - /* XXX fprintf(stderr, "NODE %s\n", nodes[pn->node].name); */ switch (pn->node) { - case (NODE_APPLICATION): - pnode_printmopen(p); - fputs("Nm", stdout); + case NODE_APPLICATION: + macro_open(p, "Nm"); break; - case (NODE_ANCHOR): + case NODE_ANCHOR: /* Don't print anything! */ return; - case (NODE_ARG): + case NODE_ARG: pnode_printarg(p, pn); - pnode_unlinksub(pn); break; - case (NODE_AUTHOR): - pnode_printmopen(p); - fputs("An", stdout); + case NODE_AUTHOR: + macro_open(p, "An"); break; - case (NODE_AUTHORGROUP): - assert(p->newln); - puts(".An -split"); + case NODE_AUTHORGROUP: + macro_line(p, "An -split"); break; - case (NODE_BOOKINFO): - assert(p->newln); - puts(".Sh NAME"); + case NODE_BOOKINFO: + macro_line(p, "Sh NAME"); break; - case (NODE_CITEREFENTRY): - pnode_printmopen(p); - fputs("Xr", stdout); + 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_CONSTANT): - pnode_printmopen(p); - fputs("Dv", stdout); + case NODE_COMMAND: + macro_open(p, "Nm"); break; - case (NODE_EDITOR): - puts("editor: "); - pnode_printmopen(p); - fputs("An", stdout); + case NODE_CONSTANT: + macro_open(p, "Dv"); break; - case (NODE_EMPHASIS): - case (NODE_FIRSTTERM): - pnode_printmopen(p); - fputs("Em", stdout); + case NODE_EDITOR: + print_text(p, "editor:"); + macro_open(p, "An"); break; - case (NODE_ENVAR): - pnode_printmopen(p); - fputs("Ev", stdout); + case NODE_EMAIL: + macro_open(p, "Aq Mt"); break; - case (NODE_FILENAME): - pnode_printmopen(p); - fputs("Pa", stdout); + case NODE_EMPHASIS: + case NODE_FIRSTTERM: + macro_open(p, "Em"); break; - case (NODE_FUNCTION): - pnode_printmopen(p); - fputs("Fn", stdout); + case NODE_ENVAR: + macro_open(p, "Ev"); break; - case (NODE_FUNCPROTOTYPE): - assert(p->newln); + 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_INDEXTERM): + case NODE_INDEXTERM: return; - case (NODE_INFORMALEQUATION): - if ( ! p->newln) - putchar('\n'); - puts(".EQ"); - p->newln = 0; + case NODE_INFORMALEQUATION: + macro_line(p, "EQ"); break; - case (NODE_INLINEEQUATION): - fputc('$', stdout); - p->newln = 0; + case NODE_INLINEEQUATION: + if (p->linestate == LINE_NEW) + p->linestate = LINE_TEXT; + putchar('$'); break; - case (NODE_ITEMIZEDLIST): - assert(p->newln); + 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_LEGALNOTICE): - assert(p->newln); - puts(".Sh LEGAL NOTICE"); + case NODE_KEYSYM: + macro_open(p, "Sy"); break; - case (NODE_LITERAL): - pnode_printmopen(p); - fputs("Li", stdout); + case NODE_LEGALNOTICE: + macro_line(p, "Sh LEGAL NOTICE"); break; - case (NODE_MML_MFENCED): + 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_LITERALLAYOUT: + macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) == + ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); + 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): + 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): + 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); + case NODE_OPTION: + macro_open(p, "Fl"); break; - case (NODE_ORDEREDLIST): - assert(p->newln); + case NODE_ORDEREDLIST: pnode_printlist(p, pn); - pnode_unlinksub(pn); break; - case (NODE_PARA): + case NODE_PARA: pnode_printpara(p, pn); break; - case (NODE_PARAMETER): - /* Suppress non-text children... */ - pnode_printmopen(p); - fputs("Fa \"", stdout); - pnode_printmacrolinetext(p, pn, MACROLINE_NOWS); - fputs("\"", stdout); + 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_LITERALLAYOUT): - /* FALLTHROUGH */ - case (NODE_PROGRAMLISTING): - /* FALLTHROUGH */ - case (NODE_SCREEN): - assert(p->newln); - puts(".Bd -literal"); + case NODE_PROGRAMLISTING: + case NODE_SCREEN: + macro_line(p, "Bd -literal"); break; - case (NODE_REFENTRYINFO): + case NODE_REFENTRYINFO: /* Suppress. */ pnode_unlinksub(pn); break; - case (NODE_REFMETA): + 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_PREFACE): - case (NODE_SECTION): - case (NODE_NOTE): - case (NODE_TIP): - case (NODE_CAUTION): - 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_SGMLTAG): - pnode_printmopen(p); - fputs("Li", stdout); + case NODE_SGMLTAG: + macro_open(p, "Li"); break; - case (NODE_STRUCTNAME): - pnode_printmopen(p); - fputs("Vt", stdout); + case NODE_STRUCTNAME: + macro_open(p, "Vt"); break; - case (NODE_TABLE): - /* FALLTHROUGH */ - case (NODE_INFORMALTABLE): - assert(p->newln); + case NODE_TABLE: + case NODE_INFORMALTABLE: 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) { + case NODE_TEXT: + if (pn->bsz == 0) { assert(pn->real != pn->b); break; } + if (p->linestate == LINE_NEW) + p->linestate = LINE_TEXT; + else + putchar(' '); /* * Output all characters, squeezing out whitespace @@ -1494,61 +1449,51 @@ pnode_print(struct parse *p, struct pnode *pn) * 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