=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.67 retrieving revision 1.72 diff -u -p -r1.67 -r1.72 --- docbook2mdoc/docbook2mdoc.c 2019/03/23 10:53:52 1.67 +++ docbook2mdoc/docbook2mdoc.c 2019/03/25 17:28:32 1.72 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.67 2019/03/23 10:53:52 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 { @@ -267,7 +270,7 @@ xml_char(void *arg, const XML_Char *p, int sz) return; p += i; sz -= i; - dat = calloc(1, sizeof(struct pnode)); + dat = calloc(1, sizeof(*dat)); if (dat == NULL) { perror(NULL); exit(1); @@ -284,14 +287,14 @@ 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->bsz + (size_t)sz); + ps->cur->b = realloc(ps->cur->b, ps->cur->bsz + sz + 1); if (ps->cur->b == NULL) { perror(NULL); 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; } @@ -299,7 +302,7 @@ static void pnode_trim(struct pnode *pn) { assert(pn->node == NODE_TEXT); - for ( ; pn->bsz > 0; pn->bsz--) + for (; pn->bsz > 0; pn->b[--pn->bsz] = '\0') if ( ! isspace((unsigned char)pn->b[pn->bsz - 1])) break; } @@ -363,7 +366,7 @@ xml_elem_start(void *arg, const XML_Char *name, const if (node->node == NODE_INLINEEQUATION) ps->flags |= PARSE_EQN; - if ((dat = calloc(1, sizeof(struct pnode))) == NULL) { + if ((dat = calloc(1, sizeof(*dat))) == NULL) { perror(NULL); exit(1); } @@ -400,7 +403,7 @@ xml_elem_start(void *arg, const XML_Char *name, const for (val = 0; val < ATTRVAL__MAX; 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 (val == ATTRVAL__MAX) @@ -520,55 +523,6 @@ pnode_getattr_raw(struct pnode *pn, enum attrkey key, } /* - * 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 NUL-terminated. - */ -static void -bufappend(struct parse *p, struct pnode *pn) -{ - - assert(pn->node == NODE_TEXT); - if (p->bsz + pn->bsz + 1 > p->mbsz) { - p->mbsz = p->bsz + pn->bsz + 1; - if ((p->b = realloc(p->b, p->mbsz)) == NULL) { - perror(NULL); - exit(1); - } - } - 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 (pn->node == NODE_TEXT) - 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 * @@ -587,113 +541,186 @@ pnode_findfirst(struct pnode *pn, enum nodeid node) 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 (p->newln == 0 && (fl & MACROLINE_NOWS) == 0) - 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; *cp != '\0'; 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 ( ; *cp != '\0'; 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] == ' ') && + + 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 (fl & MACROLINE_UPPER) + + 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 == '\\') 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) { - assert(p->newln == 0); - pnode_printmacrolinetext(p, pn, 0); - putchar('\n'); - p->newln = 1; -} + int quote_now; -static void -pnode_printmopen(struct parse *p) -{ - if (p->newln) { - putchar('.'); - p->newln = 0; - } else - putchar(' '); + assert(p->linestate == LINE_MACRO); + + /* + * 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 ((pn = TAILQ_NEXT(pn, child)) == NULL) { - pnode_printmclose(p, sv); - return; - } else if (pn->node != NODE_TEXT) { - pnode_printmclose(p, sv); - return; - } - - /* Only do this for the comma/period. */ - if (pn->bsz > 0 && + 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(' '); @@ -701,9 +728,24 @@ pnode_printmclosepunct(struct parse *p, struct pnode * 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 @@ -711,7 +753,6 @@ pnode_printpara(struct parse *p, struct pnode *pn) { struct pnode *pp; - assert(p->newln); if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL && (pp = pn->parent) == NULL) return; @@ -728,7 +769,7 @@ pnode_printpara(struct parse *p, struct pnode *pn) default: break; } - puts(".Pp"); + macro_line(p, "Pp"); } /* @@ -737,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 (pp->node == NODE_TITLE) { + TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) + if (pp->node == NODE_TITLE) pnode_unlink(pp); - return; - } + + macro_line(p, "Sh SYNOPSIS"); } /* @@ -760,7 +801,9 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) return; level = ++p->level; - flags = level == 1 ? MACROLINE_UPPER : 0; + flags = ARG_SPACE; + if (level == 1) + flags |= ARG_UPPER; if (level < 3) { switch (pn->node) { case NODE_CAUTION: @@ -803,24 +846,23 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) switch (level) { case 1: - fputs(".Sh", stdout); + macro_open(p, "Sh"); break; case 2: - fputs(".Ss", stdout); + macro_open(p, "Ss"); break; default: pnode_printpara(p, pn); - fputs(".Sy", stdout); + macro_open(p, "Sy"); break; } if (pp != NULL) { - p->newln = 0; - pnode_printmacrolinetext(p, pp, flags); - pnode_printmclose(p, 1); + macro_addnode(p, pp, flags); pnode_unlink(pp); } else - printf(" %s\n", title); + macro_addarg(p, title, ARG_SPACE | ARG_QUOTED); + macro_close(p); } /* @@ -832,22 +874,23 @@ pnode_printciterefentry(struct parse *p, struct pnode struct pnode *pp, *title, *manvol; title = manvol = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) + TAILQ_FOREACH(pp, &pn->childq, child) { if (pp->node == NODE_MANVOLNUM) manvol = pp; else if (pp->node == NODE_REFENTRYTITLE) title = pp; - - if (title != NULL) - pnode_printmacrolinepart(p, title); + } + macro_open(p, "Xr"); + if (title == NULL) + macro_addarg(p, "unknown", ARG_SPACE); else - fputs(" unknown ", stdout); - - if (manvol == NULL) { - puts(" 1"); - p->newln = 1; - } else - pnode_printmacrolinepart(p, manvol); + 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 @@ -856,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) + TAILQ_FOREACH(pp, &pn->childq, child) { if (pp->node == NODE_MANVOLNUM) manvol = pp; else if (pp->node == NODE_REFENTRYTITLE) title = pp; - - fputs(".Dt", stdout); - p->newln = 0; - - if (title != NULL) - pnode_printmacrolinetext(p, title, MACROLINE_UPPER); + } + macro_open(p, "Dt"); + if (title == NULL) + macro_addarg(p, "UNKNOWN", ARG_SPACE); else - fputs(" UNKNOWN ", stdout); - - if (manvol == NULL) { - 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 @@ -883,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) + TAILQ_FOREACH(pp, &pn->childq, child) { if (pp->node == NODE_TEXT) ftype = pp; else if (pp->node == NODE_FUNCTION) func = pp; - - if (ftype != NULL) { - fputs(".Ft", stdout); - p->newln = 0; - pnode_printmacroline(p, ftype); } - - if (func != NULL) { - 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 (pp->node == NODE_TEXT) - ptype = pp; - else if (pp->node == NODE_PARAMETER) - param = pp; - - fputs(".Fa \"", stdout); - p->newln = 0; - if (ptype != NULL) { - pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS); - putchar(' '); - } - - if (param != NULL) - 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 @@ -954,8 +960,8 @@ pnode_printmathfenced(struct parse *p, struct pnode *p putchar(','); pnode_print(p, pp); } - printf("right %s ", pnode_getattr_raw(pn, ATTRKEY_CLOSE, ")")); + pnode_unlinksub(pn); } /* @@ -988,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 @@ -995,7 +1002,6 @@ pnode_printfuncprototype(struct parse *p, struct pnode { struct pnode *pp, *fdef; - assert(p->newln); TAILQ_FOREACH(fdef, &pn->childq, child) if (fdef->node == NODE_FUNCDEF) break; @@ -1003,14 +1009,14 @@ pnode_printfuncprototype(struct parse *p, struct pnode if (fdef != NULL) pnode_printfuncdef(p, fdef); else - puts(".Fo UNKNOWN"); + macro_line(p, "Fo UNKNOWN"); TAILQ_FOREACH(pp, &pn->childq, child) if (pp->node == NODE_PARAMDEF) - pnode_printparamdef(p, pp); + macro_nodeline(p, "Fa", pp, ARG_SINGLE); - puts(".Fc"); - p->newln = 1; + macro_line(p, "Fc"); + pnode_unlinksub(pn); } /* @@ -1029,27 +1035,24 @@ 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 (ap->key == ATTRKEY_CHOICE && (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) isop = 0; 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 (pp->node == NODE_TEXT) { - pnode_printmopen(p); - fputs("Ar", stdout); - } + if (pp->node == NODE_TEXT) + macro_open(p, "Ar"); pnode_print(p, pp); if (isrep && pp->node == NODE_TEXT) - fputs("...", stdout); + macro_addarg(p, "...", ARG_SPACE); } + pnode_unlinksub(pn); } static void @@ -1072,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 @@ -1093,14 +1095,15 @@ pnode_printgroup(struct parse *p, struct pnode *pn) 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 @@ -1111,19 +1114,23 @@ pnode_printprologue(struct parse *p, struct pnode *pn) pp = p->root == NULL ? NULL : pnode_findfirst(p->root, NODE_REFMETA); - puts(".Dd $Mdocdate" "$"); - if (pp != NULL) { + macro_line(p, "Dd $Mdocdate" "$"); + if (pp != NULL) pnode_printrefmeta(p, pp); - pnode_unlink(pp); - } else - printf(".Dt %s 1\n", - pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN")); - puts(".Os"); + 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); + } + macro_line(p, "Os"); if (p->flags & PARSE_EQN) { - puts(".EQ"); - puts("delim $$"); - puts(".EN"); + macro_line(p, "EQ"); + print_text(p, "delim $$"); + macro_line(p, "EN"); } } @@ -1137,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 (pp->node == NODE_TERM) { - 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 @@ -1160,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 @@ -1177,23 +1193,14 @@ pnode_printtable(struct parse *p, struct pnode *pn) { struct pnode *pp; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (pp->node == NODE_TITLE) { - pnode_printpara(p, pp); - pnode_print(p, pp); - pnode_unlink(pp); - } - assert(p->newln); - puts(".Bl -ohang"); + pnode_printtitle(p, pn); + macro_line(p, "Bl -ohang"); while ((pp = pnode_findfirst(pn, NODE_ROW)) != NULL) { - puts(".It Table Row"); + 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 @@ -1201,28 +1208,15 @@ pnode_printlist(struct parse *p, struct pnode *pn) { struct pnode *pp; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (pp->node == NODE_TITLE) { - pnode_printpara(p, pp); - pnode_print(p, pp); - pnode_unlink(pp); - } - assert(p->newln); - - if (pn->node == NODE_ORDEREDLIST) - 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 @@ -1230,27 +1224,16 @@ pnode_printvariablelist(struct parse *p, struct pnode { struct pnode *pp; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (pp->node == NODE_TITLE) { - 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 (pp->node != NODE_VARLISTENTRY) { - 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); } /* @@ -1265,139 +1248,111 @@ 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 (pn == NULL) return; - sv = p->newln; + sv = p->linestate; switch (pn->node) { case NODE_APPLICATION: - pnode_printmopen(p); - fputs("Nm", stdout); + macro_open(p, "Nm"); break; case NODE_ANCHOR: /* Don't print anything! */ return; case NODE_ARG: pnode_printarg(p, pn); - pnode_unlinksub(pn); break; case NODE_AUTHOR: - pnode_printmopen(p); - fputs("An", stdout); + macro_open(p, "An"); break; case NODE_AUTHORGROUP: - assert(p->newln); - puts(".An -split"); + macro_line(p, "An -split"); break; case NODE_BOOKINFO: - assert(p->newln); - puts(".Sh NAME"); + macro_line(p, "Sh NAME"); break; case NODE_CITEREFENTRY: - pnode_printmopen(p); - fputs("Xr", stdout); pnode_printciterefentry(p, pn); - pnode_unlinksub(pn); break; + case NODE_CITETITLE: + macro_open(p, "%T"); + break; case NODE_CODE: - pnode_printmopen(p); - fputs("Li", stdout); + macro_open(p, "Li"); break; case NODE_COMMAND: - pnode_printmopen(p); - fputs("Nm", stdout); + macro_open(p, "Nm"); break; case NODE_CONSTANT: - pnode_printmopen(p); - fputs("Dv", stdout); + macro_open(p, "Dv"); break; case NODE_EDITOR: - puts("editor: "); - pnode_printmopen(p); - fputs("An", stdout); + print_text(p, "editor:"); + macro_open(p, "An"); break; case NODE_EMAIL: - pnode_printmopen(p); - fputs("Aq Mt", stdout); + macro_open(p, "Aq Mt"); break; case NODE_EMPHASIS: case NODE_FIRSTTERM: - pnode_printmopen(p); - fputs("Em", stdout); + macro_open(p, "Em"); break; case NODE_ENVAR: - pnode_printmopen(p); - fputs("Ev", stdout); + macro_open(p, "Ev"); break; case NODE_FILENAME: - pnode_printmopen(p); - fputs("Pa", stdout); + macro_open(p, "Pa"); break; case NODE_FUNCTION: - pnode_printmopen(p); - fputs("Fn", stdout); + macro_open(p, "Fn"); break; case NODE_FUNCPROTOTYPE: - assert(p->newln); pnode_printfuncprototype(p, pn); - pnode_unlinksub(pn); break; case NODE_FUNCSYNOPSISINFO: - pnode_printmopen(p); - fputs("Fd", stdout); + macro_open(p, "Fd"); break; case NODE_INDEXTERM: return; case NODE_INFORMALEQUATION: - if ( ! p->newln) - putchar('\n'); - puts(".EQ"); - p->newln = 0; + macro_line(p, "EQ"); break; case NODE_INLINEEQUATION: - fputc('$', stdout); - p->newln = 0; + if (p->linestate == LINE_NEW) + p->linestate = LINE_TEXT; + putchar('$'); 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_KEYSYM: - pnode_printmopen(p); - fputs("Sy", stdout); + macro_open(p, "Sy"); break; case NODE_LEGALNOTICE: - assert(p->newln); - puts(".Sh LEGAL NOTICE"); + macro_line(p, "Sh LEGAL NOTICE"); break; case NODE_LINK: ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL); if (ccp == NULL) break; - pnode_printmopen(p); - printf("Sx %s\n", ccp); - p->newln = 1; + macro_argline(p, "Sx", ccp); return; case NODE_LITERAL: - pnode_printmopen(p); - fputs("Li", stdout); + macro_open(p, "Li"); break; case NODE_LITERALLAYOUT: - assert(p->newln); - printf(".Bd %s\n", pnode_getattr(pn, ATTRKEY_CLASS) == + 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: @@ -1411,36 +1366,26 @@ pnode_print(struct parse *p, struct pnode *pn) 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); + macro_open(p, "Fl"); break; case NODE_ORDEREDLIST: - assert(p->newln); pnode_printlist(p, pn); - pnode_unlinksub(pn); break; 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); + macro_nodeline(p, "Fa", pn, ARG_SINGLE); pnode_unlinksub(pn); break; case NODE_QUOTE: - pnode_printmopen(p); - fputs("Qo", stdout); + macro_open(p, "Qo"); break; case NODE_PROGRAMLISTING: case NODE_SCREEN: - assert(p->newln); - puts(".Bd -literal"); + macro_line(p, "Bd -literal"); break; case NODE_REFENTRYINFO: /* Suppress. */ @@ -1451,25 +1396,18 @@ pnode_print(struct parse *p, struct pnode *pn) break; 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"); + macro_line(p, "Sh NAME"); break; case NODE_REFPURPOSE: - assert(p->newln); - pnode_printmopen(p); - fputs("Nd", stdout); + macro_open(p, "Nd"); break; case NODE_REFSYNOPSISDIV: - assert(p->newln); pnode_printrefsynopsisdiv(p, pn); - puts(".Sh SYNOPSIS"); break; case NODE_PREFACE: case NODE_SECTION: @@ -1477,42 +1415,33 @@ pnode_print(struct parse *p, struct pnode *pn) case NODE_TIP: case NODE_CAUTION: case NODE_WARNING: - assert(p->newln); pnode_printrefsect(p, pn); break; case NODE_REPLACEABLE: - pnode_printmopen(p); - fputs("Ar", stdout); + macro_open(p, "Ar"); break; case NODE_SBR: - assert(p->newln); - puts(".br"); + macro_line(p, "br"); break; case NODE_SGMLTAG: - pnode_printmopen(p); - fputs("Li", stdout); + macro_open(p, "Li"); break; case NODE_STRUCTNAME: - pnode_printmopen(p); - fputs("Vt", stdout); + macro_open(p, "Vt"); break; case NODE_TABLE: case NODE_INFORMALTABLE: - assert(p->newln); pnode_printtable(p, pn); - pnode_unlinksub(pn); break; case NODE_TEXT: - if (p->newln == 0) - putchar(' '); - - bufclear(p); - bufappend(p, pn); - - if (p->bsz == 0) { + 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 @@ -1520,8 +1449,7 @@ 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