=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.58 retrieving revision 1.69 diff -u -p -r1.58 -r1.69 --- docbook2mdoc/docbook2mdoc.c 2019/03/22 16:50:54 1.58 +++ docbook2mdoc/docbook2mdoc.c 2019/03/24 16:45:46 1.69 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.58 2019/03/22 16:50:54 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.69 2019/03/24 16:45:46 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. @@ -46,7 +52,7 @@ struct parse { 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,6 +83,7 @@ struct pnode { static const char *attrkeys[ATTRKEY__MAX] = { "choice", + "class", "close", "id", "linkend", @@ -85,6 +92,7 @@ static const char *attrkeys[ATTRKEY__MAX] = { }; static const char *attrvals[ATTRVAL__MAX] = { + "monospaced", "norepeat", "opt", "plain", @@ -115,6 +123,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 }, @@ -165,6 +174,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 }, @@ -243,10 +253,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? @@ -255,7 +265,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; @@ -264,9 +274,9 @@ xml_char(void *arg, const XML_Char *p, int sz) p += i; sz -= i; dat = calloc(1, sizeof(struct pnode)); - if (NULL == dat) { + if (dat == NULL) { perror(NULL); - exit(EXIT_FAILURE); + exit(1); } dat->node = ps->node = NODE_TEXT; @@ -275,16 +285,16 @@ 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) { + 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; @@ -294,8 +304,7 @@ xml_char(void *arg, const XML_Char *p, int sz) static void pnode_trim(struct pnode *pn) { - - assert(NODE_TEXT == pn->node); + assert(pn->node == NODE_TEXT); for ( ; pn->bsz > 0; pn->bsz--) if ( ! isspace((unsigned char)pn->b[pn->bsz - 1])) break; @@ -327,31 +336,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)); @@ -359,12 +366,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(struct pnode))) == NULL) { perror(NULL); - exit(EXIT_FAILURE); + exit(1); } dat->node = ps->node = node->node; @@ -372,21 +379,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", @@ -397,13 +404,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->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); } @@ -420,21 +427,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; @@ -449,15 +454,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); @@ -473,8 +478,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); } @@ -491,6 +495,37 @@ pnode_unlinksub(struct pnode *pn) } /* + * Retrieve an enumeration attribute from a node. + * Return ATTRVAL__MAX if the node has no such attribute. + */ +enum attrval +pnode_getattr(struct pnode *pn, enum attrkey key) +{ + struct pattr *ap; + + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ap->key == key) + return ap->val; + return ATTRVAL__MAX; +} + +/* + * Retrieve an attribute string from a node. + * Return defval if the node has no such attribute. + */ +const char * +pnode_getattr_raw(struct pnode *pn, enum attrkey key, const char *defval) +{ + struct pattr *ap; + + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ap->key == key) + return ap->val == ATTRVAL__MAX ? ap->rawval : + attrvals[ap->val]; + return defval; +} + +/* * Reset the lookaside buffer. */ static void @@ -509,12 +544,12 @@ static void bufappend(struct parse *p, struct pnode *pn) { - assert(NODE_TEXT == pn->node); + assert(pn->node == NODE_TEXT); if (p->bsz + pn->bsz + 1 > p->mbsz) { p->mbsz = p->bsz + pn->bsz + 1; - if (NULL == (p->b = realloc(p->b, p->mbsz))) { + if ((p->b = realloc(p->b, p->mbsz)) == NULL) { perror(NULL); - exit(EXIT_FAILURE); + exit(1); } } memcpy(p->b + p->bsz, pn->b, pn->bsz); @@ -533,7 +568,7 @@ bufappend_r(struct parse *p, struct pnode *pn) { struct pnode *pp; - if (NODE_TEXT == pn->node) + if (pn->node == NODE_TEXT) bufappend(p, pn); TAILQ_FOREACH(pp, &pn->childq, child) bufappend_r(p, pp); @@ -551,134 +586,128 @@ 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 -/* - * 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) +macro_open(struct parse *p, const char *name) { - char *cp; - - if (0 == p->newln && ! (MACROLINE_NOWS & fl)) + 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); +} - bufclear(p); - bufappend_r(p, pn); +static void +macro_close(struct parse *p) +{ + assert(p->linestate == LINE_MACRO); + putchar('\n'); + p->linestate = LINE_NEW; +} - /* Convert all space to spaces. */ - for (cp = p->b; '\0' != *cp; cp++) - if (isspace((unsigned char)*cp)) - *cp = ' '; +static void +macro_line(struct parse *p, const char *name) +{ + macro_open(p, name); + macro_close(p); +} - for (cp = p->b; isspace((unsigned char)*cp); cp++) - /* Spin past whitespace (XXX: necessary?) */ ; - for ( ; '\0' != *cp; cp++) { +#define MACROLINE_UPPER 1 +#define MACROLINE_NOWS 2 +/* + * Print an argument string on a macro line, collapsing whitespace. + */ +static void +macro_addarg(struct parse *p, const char *arg, int fl) +{ + const char *cp; + int wantspace; + + assert(p->linestate == LINE_MACRO); + wantspace = !(fl & MACROLINE_NOWS); + for (cp = arg; *cp != '\0'; cp++) { + if (isspace((unsigned char)*cp)) { + wantspace = 1; + continue; + } else if (wantspace) { + putchar(' '); + wantspace = 0; + } /* 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 ((cp == arg || 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 (fl & MACROLINE_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, 0); + macro_close(p); } /* - * Just pnode_printmacrolinepart() but with a newline. - * If no text, just the newline. + * Recurse nodes to print arguments on a macro line. */ static void -pnode_printmacroline(struct parse *p, struct pnode *pn) +macro_addnode(struct parse *p, struct pnode *pn, int fl) { - - assert(0 == p->newln); - pnode_printmacrolinetext(p, pn, 0); - putchar('\n'); - p->newln = 1; + bufclear(p); + bufappend_r(p, pn); + macro_addarg(p, p->b, fl); } static void -pnode_printmopen(struct parse *p) +macro_nodeline(struct parse *p, const char *name, struct pnode *pn) { - if (p->newln) { - putchar('.'); - p->newln = 0; - } else - putchar(' '); + macro_open(p, name); + macro_addnode(p, pn, 0); + macro_close(p); } -static void -pnode_printmclose(struct parse *p, int sv) -{ - - if (sv && ! p->newln) { - putchar('\n'); - p->newln = 1; - } -} - /* - * 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--; } - - putchar('\n'); - p->newln = 1; + macro_close(p); } static void @@ -686,16 +715,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"); } /* @@ -707,7 +743,7 @@ pnode_printrefsynopsisdiv(struct parse *p, struct pnod struct pnode *pp; TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { + if (pp->node == NODE_TITLE) { pnode_unlink(pp); return; } @@ -723,17 +759,17 @@ 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 = level == 1 ? MACROLINE_UPPER : 0; + 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: @@ -742,24 +778,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: @@ -769,25 +805,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, 0); + macro_close(p); } /* @@ -799,22 +834,22 @@ 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", 0); + else + macro_addnode(p, title, 0); + if (manvol == NULL) + macro_addarg(p, "1", 0); + else + macro_addnode(p, manvol, 0); + macro_close(p); } static void @@ -823,26 +858,22 @@ 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", 0); else - fputs(" UNKNOWN ", stdout); - - if (NULL == manvol) { - puts(" 1"); - p->newln = 1; - } else - pnode_printmacroline(p, manvol); + macro_addnode(p, title, MACROLINE_UPPER); + if (manvol == NULL) + macro_addarg(p, "1", 0); + else + macro_addnode(p, manvol, 0); + macro_close(p); } static void @@ -850,55 +881,47 @@ 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_nodeline(p, "Ft", ftype); + macro_open(p, "Fo"); + if (func == NULL) + macro_addarg(p, "UNKNOWN", 0); + else + macro_addnode(p, func, 0); + macro_close(p); } static void pnode_printparamdef(struct parse *p, struct pnode *pn) { struct pnode *pp, *ptype, *param; + int flags; - assert(p->newln); ptype = param = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TEXT == pp->node) + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_TEXT) ptype = pp; - else if (NODE_PARAMETER == pp->node) + else if (pp->node == NODE_PARAMETER) 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; + macro_open(p, "Fa \""); + flags = MACROLINE_NOWS; + if (ptype != NULL) { + macro_addnode(p, ptype, flags); + flags = 0; + } + if (param != NULL) + macro_addnode(p, param, flags); + flags = MACROLINE_NOWS; + macro_addarg(p, "\"", flags); + macro_close(p); } /* @@ -911,31 +934,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, ")")); } /* @@ -953,13 +963,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: @@ -975,22 +985,20 @@ 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) + if (pp->node == NODE_PARAMDEF) pnode_printparamdef(p, pp); - puts(".Fc"); - p->newln = 1; + macro_line(p, "Fc"); } /* @@ -1009,28 +1017,22 @@ 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, "...", 0); } } @@ -1043,9 +1045,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; } @@ -1055,12 +1056,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 @@ -1073,49 +1073,44 @@ 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, "|", 0); + macro_addnode(p, np, 0); pp = np; np = TAILQ_NEXT(np, child); } } - - pnode_printmclose(p, sv); + if (sv) + macro_close(p); } 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); + macro_open(p, "Dt"); + macro_addarg(p, + pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN"), 0); + macro_addarg(p, "1", 0); + macro_close(p); } - puts(".Os"); + macro_line(p, "Os"); - if (PARSE_EQN & p->flags) { - puts(".EQ"); + if (p->flags & PARSE_EQN) { + macro_line(p, "EQ"); puts("delim $$"); - puts(".EN"); + macro_line(p, "EN"); } } @@ -1129,22 +1124,19 @@ 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) + putchar(','); + 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; - - putchar('\n'); - p->newln = 1; } static void @@ -1152,16 +1144,12 @@ 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"); } static void @@ -1169,23 +1157,20 @@ 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) { + 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"); - while (NULL != (pp = pnode_findfirst(pn, NODE_ROW))) { - puts(".It Table Row"); + } + 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"); } static void @@ -1193,28 +1178,20 @@ 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) { + 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 (NODE_ORDEREDLIST == pn->node) - puts(".Bl -enum"); - else - puts(".Bl -bullet"); - + } + 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"); } static void @@ -1222,27 +1199,21 @@ pnode_printvariablelist(struct parse *p, struct pnode { struct pnode *pp; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { + 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 -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); + } + macro_line(p, "Bl -tag -width Ds"); + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_VARLISTENTRY) pnode_print(p, pp); - } - assert(p->newln); - puts(".El"); + else + macro_nodeline(p, "It", pp); + } + macro_line(p, "El"); } /* @@ -1255,250 +1226,220 @@ static void pnode_print(struct parse *p, struct pnode *pn) { struct pnode *pp; - struct pattr *ap; + 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: + if (p->linestate != LINE_NEW) + putchar('\n'); + puts("editor:"); + p->linestate = LINE_TEXT; + 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_LINK): - TAILQ_FOREACH(ap, &pn->attrq, child) - if (ATTRKEY_LINKEND == ap->key) - break; - if (ap == NULL) + case NODE_LEGALNOTICE: + 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", ap->rawval); - p->newln = 1; + macro_argline(p, "Sx", ccp); return; - case (NODE_LITERAL): - pnode_printmopen(p); - fputs("Li", stdout); + case NODE_LITERAL: + macro_open(p, "Li"); break; - case (NODE_MML_MFENCED): + 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): + case NODE_PARAMETER: /* Suppress non-text children... */ - pnode_printmopen(p); - fputs("Fa \"", stdout); - pnode_printmacrolinetext(p, pn, MACROLINE_NOWS); - fputs("\"", stdout); + macro_open(p, "Fa \""); + macro_addnode(p, pn, MACROLINE_NOWS); + macro_addarg(p, "\"", MACROLINE_NOWS); + macro_close(p); 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_nodeline(p, "Nm", pn); 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"); + macro_line(p, "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(' '); - + case NODE_TEXT: bufclear(p); bufappend(p, pn); - - if (0 == p->bsz) { + if (p->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 @@ -1506,7 +1447,6 @@ 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; /* @@ -1514,53 +1454,46 @@ pnode_print(struct parse *p, struct pnode *pn) * before the actual flags themselves. * "Fl" does this for us, so remove it. */ - if (NULL != pn->parent && - NODE_OPTION == pn->parent->node && - '-' == *cp) + if (pn->parent != NULL && + pn->parent->node == NODE_OPTION && + *cp == '-') cp++; - for (last = '\n'; '\0' != *cp; ) { - if ('\n' == last) { + for (last = '\n'; *cp != '\0'; ) { + if (last == '\n') { /* Consume all whitespace. */ if (isspace((unsigned char)*cp)) { while (isspace((unsigned char)*cp)) cp++; continue; - } else if ('\'' == *cp || '.' == *cp) + } else if (*cp == '\'' || *cp == '.') fputs("\\&", stdout); } putchar(last = *cp++); /* If we're a character escape, escape us. */ - if ('\\' == last) + if (last == '\\') putchar('e'); } - p->newln = 0; break; - case (NODE_TITLE): - if (pn->parent->node == NODE_BOOKINFO) { - pnode_printmopen(p); - fputs("Nd", stdout); - } + case NODE_TITLE: + if (pn->parent->node == NODE_BOOKINFO) + macro_open(p, "Nd"); break; - case (NODE_TYPE): - pnode_printmopen(p); - fputs("Vt", stdout); + case NODE_TYPE: + macro_open(p, "Vt"); break; - case (NODE_USERINPUT): - pnode_printmopen(p); - fputs("Li", stdout); + case NODE_USERINPUT: + macro_open(p, "Li"); break; - case (NODE_VARIABLELIST): - assert(p->newln); + case NODE_VARIABLELIST: pnode_printvariablelist(p, pn); pnode_unlinksub(pn); break; - case (NODE_VARLISTENTRY): - assert(p->newln); + case NODE_VARLISTENTRY: pnode_printvarlistentry(p, pn); + pnode_unlinksub(pn); break; - case (NODE_VARNAME): - pnode_printmopen(p); - fputs("Va", stdout); + case NODE_VARNAME: + macro_open(p, "Va"); break; default: break; @@ -1570,93 +1503,89 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_print(p, pp); switch (pn->node) { - case (NODE_INFORMALEQUATION): - if ( ! p->newln) - putchar('\n'); - puts(".EN"); - p->newln = 1; + case NODE_INFORMALEQUATION: + macro_line(p, "EN"); break; - case (NODE_INLINEEQUATION): + case NODE_INLINEEQUATION: fputs("$ ", stdout); - p->newln = sv; + p->linestate = sv; 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_APPLICATION): - case (NODE_ARG): - case (NODE_AUTHOR): - case (NODE_CITEREFENTRY): - case (NODE_CODE): - case (NODE_COMMAND): - case (NODE_CONSTANT): - case (NODE_EDITOR): - case (NODE_EMPHASIS): - case (NODE_ENVAR): - case (NODE_FILENAME): - case (NODE_FIRSTTERM): - case (NODE_FUNCTION): - case (NODE_FUNCSYNOPSISINFO): - case (NODE_LITERAL): - case (NODE_OPTION): - case (NODE_PARAMETER): - case (NODE_REPLACEABLE): - case (NODE_REFPURPOSE): - case (NODE_SGMLTAG): - case (NODE_STRUCTNAME): - case (NODE_TEXT): - case (NODE_TYPE): - case (NODE_USERINPUT): - case (NODE_VARNAME): - pnode_printmclosepunct(p, pn, sv); + case NODE_APPLICATION: + case NODE_ARG: + case NODE_AUTHOR: + case NODE_CITEREFENTRY: + case NODE_CITETITLE: + case NODE_CODE: + case NODE_COMMAND: + case NODE_CONSTANT: + case NODE_EDITOR: + case NODE_EMAIL: + case NODE_EMPHASIS: + case NODE_ENVAR: + case NODE_FILENAME: + case NODE_FIRSTTERM: + case NODE_FUNCTION: + case NODE_FUNCSYNOPSISINFO: + case NODE_KEYSYM: + case NODE_LITERAL: + case NODE_OPTION: + case NODE_PARAMETER: + case NODE_REPLACEABLE: + case NODE_REFPURPOSE: + case NODE_SGMLTAG: + case NODE_STRUCTNAME: + case NODE_TYPE: + case NODE_USERINPUT: + case NODE_VARNAME: + if (sv != LINE_MACRO && p->linestate == LINE_MACRO) + macro_closepunct(p, pn); break; - case (NODE_QUOTE): - pnode_printmclose(p, sv); - sv = p->newln; - pnode_printmopen(p); - fputs("Qc", stdout); - pnode_printmclose(p, sv); + case NODE_QUOTE: + if (sv == LINE_NEW) + macro_close(p); + sv = p->linestate; + macro_open(p, "Qc"); + if (sv == LINE_NEW) + macro_close(p); break; - case (NODE_REFNAME): + case NODE_REFNAME: /* * If we're in the NAME macro and we have multiple * macros in sequence, then print out a * trailing comma before the newline. */ - if (NULL != pn->parent && - NODE_REFNAMEDIV == pn->parent->node && - NULL != TAILQ_NEXT(pn, child) && - NODE_REFNAME == TAILQ_NEXT(pn, child)->node) + if (pn->parent != NULL && + pn->parent->node == NODE_REFNAMEDIV && + TAILQ_NEXT(pn, child) != NULL && + TAILQ_NEXT(pn, child)->node == NODE_REFNAME) fputs(" ,", stdout); - pnode_printmclose(p, sv); + if (sv == LINE_NEW) + macro_close(p); break; - case (NODE_PREFACE): - case (NODE_SECTION): - case (NODE_NOTE): - case (NODE_TIP): - case (NODE_CAUTION): - case (NODE_WARNING): + case NODE_PREFACE: + case NODE_SECTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_CAUTION: + case NODE_WARNING: p->level--; break; - case (NODE_LITERALLAYOUT): - /* FALLTHROUGH */ - case (NODE_PROGRAMLISTING): - /* FALLTHROUGH */ - case (NODE_SCREEN): - assert(p->newln); - puts(".Ed"); - p->newln = 1; + case NODE_LITERALLAYOUT: + case NODE_PROGRAMLISTING: + case NODE_SCREEN: + macro_line(p, "Ed"); break; - case (NODE_TITLE): - if (pn->parent->node == NODE_BOOKINFO) { - pnode_printmclose(p, 1); - puts(".Sh AUTHORS"); - } + case NODE_TITLE: + if (pn->parent->node == NODE_BOOKINFO) + macro_line(p, "Sh AUTHORS"); break; default: break; @@ -1686,7 +1615,7 @@ readfile(XML_Parser xp, int fd, XML_SetUserData(xp, &p); while ((ssz = read(fd, b, bsz)) >= 0) { - if (0 == (rc = XML_Parse(xp, b, ssz, 0 == ssz))) + if ((rc = XML_Parse(xp, b, ssz, 0 == ssz)) == 0) fprintf(stderr, "%s:%zu:%zu: %s\n", fn, XML_GetCurrentLineNumber(xp), XML_GetCurrentColumnNumber(xp), @@ -1698,19 +1627,21 @@ readfile(XML_Parser xp, int fd, * Exit when we've read all or errors have occured * during the parse sequence. */ - p.newln = 1; + p.linestate = LINE_NEW; pnode_printprologue(&p, p.root); pnode_print(&p, p.root); + if (p.linestate != LINE_NEW) + putchar('\n'); pnode_free(p.root); free(p.b); - return(0 != rc && ! p.stop); + return rc != 0 && p.stop == 0; } /* Read error has occured. */ perror(fn); pnode_free(p.root); free(p.b); - return(0); + return 0; } int @@ -1731,11 +1662,11 @@ main(int argc, char *argv[]) fname = "-"; xp = NULL; buf = NULL; - rc = 0; + rc = 1; - while (-1 != (ch = getopt(argc, argv, "W"))) + while ((ch = getopt(argc, argv, "W")) != -1) switch (ch) { - case ('W'): + case 'W': warn = 1; break; default: @@ -1752,7 +1683,7 @@ main(int argc, char *argv[]) fname = argv[0]; /* Read from stdin or a file. */ - fd = 0 == strcmp(fname, "-") ? + fd = strcmp(fname, "-") == 0 ? STDIN_FILENO : open(fname, O_RDONLY, 0); /* @@ -1761,22 +1692,22 @@ main(int argc, char *argv[]) * Create the parser context. * Dive directly into the parse. */ - if (-1 == fd) + if (fd == -1) perror(fname); - else if (NULL == (buf = malloc(4096))) + else if ((buf = malloc(4096)) == NULL) perror(NULL); - else if (NULL == (xp = XML_ParserCreate(NULL))) + else if ((xp = XML_ParserCreate(NULL)) == NULL) perror(NULL); - else if ( ! readfile(xp, fd, buf, 4096, fname)) - rc = 1; + else if (readfile(xp, fd, buf, 4096, fname)) + rc = 0; XML_ParserFree(xp); free(buf); - if (STDIN_FILENO != fd) + if (fd != STDIN_FILENO) close(fd); - return(rc ? EXIT_SUCCESS : EXIT_FAILURE); + return rc; usage: fprintf(stderr, "usage: %s [-W] [input_filename]\n", progname); - return(EXIT_FAILURE); + return 1; }