=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.41 retrieving revision 1.64 diff -u -p -r1.41 -r1.64 --- docbook2mdoc/docbook2mdoc.c 2014/10/12 15:34:44 1.41 +++ docbook2mdoc/docbook2mdoc.c 2019/03/22 19:07:07 1.64 @@ -1,6 +1,7 @@ -/* $Id: docbook2mdoc.c,v 1.41 2014/10/12 15:34:44 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.64 2019/03/22 19:07:07 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons + * Copyright (c) 2019 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -37,18 +38,20 @@ struct parse { enum nodeid node; /* current (NODE_ROOT if pre-tree) */ const char *fname; /* filename */ int stop; /* should we stop now? */ +#define PARSE_EQN 1 + unsigned int flags; /* document-wide flags */ struct pnode *root; /* root of parse tree */ struct pnode *cur; /* current node in tree */ - char *b; /* nil-terminated buffer for pre-print */ + 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 */ }; struct node { const char *name; /* docbook element name */ - unsigned int flags; -#define NODE_IGNTEXT 1 /* ignore all contained text */ + enum nodeid node; /* docbook element to generate */ }; TAILQ_HEAD(pnodeq, pnode); @@ -74,13 +77,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", @@ -88,103 +94,136 @@ static const char *attrvals[ATTRVAL__MAX] = { "req" }; -static const struct node nodes[NODE__MAX] = { - { NULL, 0 }, - { "acronym", 0 }, - { "anchor", NODE_IGNTEXT }, - { "application", 0 }, - { "arg", 0 }, - { "caution", NODE_IGNTEXT }, - { "citerefentry", NODE_IGNTEXT }, - { "cmdsynopsis", NODE_IGNTEXT }, - { "code", 0 }, - { "colspec", NODE_IGNTEXT }, - { "command", 0 }, - { "constant", 0 }, - { "copyright", NODE_IGNTEXT }, - { "date", 0 }, - { "emphasis", 0 }, - { "entry", 0 }, - { "envar", 0 }, - { "fieldsynopsis", NODE_IGNTEXT }, - { "filename", 0 }, - { "funcdef", 0 }, - { "funcprototype", NODE_IGNTEXT }, - { "funcsynopsis", NODE_IGNTEXT }, - { "funcsynopsisinfo", 0 }, - { "function", 0 }, - { "group", NODE_IGNTEXT }, - { "holder", NODE_IGNTEXT }, - { "info", NODE_IGNTEXT }, - { "informalequation", NODE_IGNTEXT }, - { "informaltable", NODE_IGNTEXT }, - { "inlineequation", NODE_IGNTEXT }, - { "itemizedlist", NODE_IGNTEXT }, - { "link", 0 }, - { "listitem", NODE_IGNTEXT }, - { "literal", 0 }, - { "manvolnum", 0 }, - { "mml:math", NODE_IGNTEXT }, - { "mml:mfenced", 0 }, - { "mml:mfrac", 0 }, - { "mml:mi", 0 }, - { "mml:mn", 0 }, - { "mml:mo", 0 }, - { "mml:mrow", 0 }, - { "mml:msub", 0 }, - { "mml:msup", 0 }, - { "modifier", 0 }, - { "note", NODE_IGNTEXT }, - { "option", 0 }, - { "orderedlist", NODE_IGNTEXT }, - { "para", 0 }, - { "paramdef", 0 }, - { "parameter", 0 }, - { "programlisting", 0 }, - { "prompt", 0 }, - { "quote", 0 }, - { "refclass", NODE_IGNTEXT }, - { "refdescriptor", NODE_IGNTEXT }, - { "refentry", NODE_IGNTEXT }, - { "refentryinfo", NODE_IGNTEXT }, - { "refentrytitle", 0 }, - { "refmeta", NODE_IGNTEXT }, - { "refmetainfo", NODE_IGNTEXT }, - { "refmiscinfo", NODE_IGNTEXT }, - { "refname", 0 }, - { "refnamediv", NODE_IGNTEXT }, - { "refpurpose", 0 }, - { "refsect1", NODE_IGNTEXT }, - { "refsect2", NODE_IGNTEXT }, - { "refsect3", NODE_IGNTEXT }, - { "refsection", NODE_IGNTEXT }, - { "refsynopsisdiv", NODE_IGNTEXT }, - { "replaceable", 0 }, - { "row", NODE_IGNTEXT }, - { "sbr", NODE_IGNTEXT }, - { "screen", NODE_IGNTEXT }, - { "sgmltag", 0 }, - { "structname", 0 }, - { "synopsis", 0 }, - { "table", NODE_IGNTEXT }, - { "tbody", NODE_IGNTEXT }, - { "term", 0 }, - { NULL, 0 }, - { "tfoot", NODE_IGNTEXT }, - { "tgroup", NODE_IGNTEXT }, - { "thead", NODE_IGNTEXT }, - { "tip", NODE_IGNTEXT }, - { "title", 0 }, - { "trademark", 0 }, - { "type", 0 }, - { "ulink", 0 }, - { "userinput", 0 }, - { "variablelist", NODE_IGNTEXT }, - { "varlistentry", NODE_IGNTEXT }, - { "varname", 0 }, - { "warning", NODE_IGNTEXT }, - { "wordasword", 0 }, - { "year", NODE_IGNTEXT }, +static const struct node nodes[] = { + { "acronym", NODE_ACRONYM }, + { "affiliation", NODE_AFFILIATION }, + { "anchor", NODE_ANCHOR }, + { "application", NODE_APPLICATION }, + { "arg", NODE_ARG }, + { "author", NODE_AUTHOR }, + { "authorgroup", NODE_AUTHORGROUP }, + { "blockquote", NODE_BLOCKQUOTE }, + { "book", NODE_BOOK }, + { "bookinfo", NODE_BOOKINFO }, + { "caution", NODE_CAUTION }, + { "chapter", NODE_SECTION }, + { "citerefentry", NODE_CITEREFENTRY }, + { "citetitle", NODE_CITETITLE }, + { "cmdsynopsis", NODE_CMDSYNOPSIS }, + { "code", NODE_CODE }, + { "colspec", NODE_COLSPEC }, + { "command", NODE_COMMAND }, + { "constant", NODE_CONSTANT }, + { "copyright", NODE_COPYRIGHT }, + { "date", NODE_DATE }, + { "editor", NODE_EDITOR }, + { "emphasis", NODE_EMPHASIS }, + { "entry", NODE_ENTRY }, + { "envar", NODE_ENVAR }, + { "fieldsynopsis", NODE_FIELDSYNOPSIS }, + { "filename", NODE_FILENAME }, + { "firstname", NODE_FIRSTNAME }, + { "firstterm", NODE_FIRSTTERM }, + { "footnote", NODE_FOOTNOTE }, + { "funcdef", NODE_FUNCDEF }, + { "funcprototype", NODE_FUNCPROTOTYPE }, + { "funcsynopsis", NODE_FUNCSYNOPSIS }, + { "funcsynopsisinfo", NODE_FUNCSYNOPSISINFO }, + { "function", NODE_FUNCTION }, + { "glossterm", NODE_GLOSSTERM }, + { "group", NODE_GROUP }, + { "holder", NODE_HOLDER }, + { "index", NODE_INDEX }, + { "indexterm", NODE_INDEXTERM }, + { "info", NODE_INFO }, + { "informalequation", NODE_INFORMALEQUATION }, + { "informaltable", NODE_INFORMALTABLE }, + { "inlineequation", NODE_INLINEEQUATION }, + { "itemizedlist", NODE_ITEMIZEDLIST }, + { "keysym", NODE_KEYSYM }, + { "legalnotice", NODE_LEGALNOTICE }, + { "link", NODE_LINK }, + { "listitem", NODE_LISTITEM }, + { "literal", NODE_LITERAL }, + { "literallayout", NODE_LITERALLAYOUT }, + { "manvolnum", NODE_MANVOLNUM }, + { "member", NODE_MEMBER }, + { "mml:math", NODE_MML_MATH }, + { "mml:mfenced", NODE_MML_MFENCED }, + { "mml:mfrac", NODE_MML_MFRAC }, + { "mml:mi", NODE_MML_MI }, + { "mml:mn", NODE_MML_MN }, + { "mml:mo", NODE_MML_MO }, + { "mml:mrow", NODE_MML_MROW }, + { "mml:msub", NODE_MML_MSUB }, + { "mml:msup", NODE_MML_MSUP }, + { "modifier", NODE_MODIFIER }, + { "note", NODE_NOTE }, + { "option", NODE_OPTION }, + { "orderedlist", NODE_ORDEREDLIST }, + { "orgname", NODE_ORGNAME }, + { "othername", NODE_OTHERNAME }, + { "para", NODE_PARA }, + { "paramdef", NODE_PARAMDEF }, + { "parameter", NODE_PARAMETER }, + { "part", NODE_SECTION }, + { "phrase", NODE_PHRASE }, + { "preface", NODE_PREFACE }, + { "primary", NODE_PRIMARY }, + { "programlisting", NODE_PROGRAMLISTING }, + { "prompt", NODE_PROMPT }, + { "quote", NODE_QUOTE }, + { "refclass", NODE_REFCLASS }, + { "refdescriptor", NODE_REFDESCRIPTOR }, + { "refentry", NODE_REFENTRY }, + { "refentryinfo", NODE_REFENTRYINFO }, + { "refentrytitle", NODE_REFENTRYTITLE }, + { "refmeta", NODE_REFMETA }, + { "refmetainfo", NODE_REFMETAINFO }, + { "refmiscinfo", NODE_REFMISCINFO }, + { "refname", NODE_REFNAME }, + { "refnamediv", NODE_REFNAMEDIV }, + { "refpurpose", NODE_REFPURPOSE }, + { "refsect1", NODE_SECTION }, + { "refsect2", NODE_SECTION }, + { "refsect3", NODE_SECTION }, + { "refsection", NODE_SECTION }, + { "refsynopsisdiv", NODE_REFSYNOPSISDIV }, + { "releaseinfo", NODE_RELEASEINFO }, + { "replaceable", NODE_REPLACEABLE }, + { "row", NODE_ROW }, + { "sbr", NODE_SBR }, + { "screen", NODE_SCREEN }, + { "secondary", NODE_SECONDARY }, + { "sect1", NODE_SECTION }, + { "sect2", NODE_SECTION }, + { "section", NODE_SECTION }, + { "sgmltag", NODE_SGMLTAG }, + { "simplelist", NODE_SIMPLELIST }, + { "spanspec", NODE_SPANSPEC }, + { "structname", NODE_STRUCTNAME }, + { "subtitle", NODE_SUBTITLE }, + { "surname", NODE_SURNAME }, + { "synopsis", NODE_SYNOPSIS }, + { "table", NODE_TABLE }, + { "tbody", NODE_TBODY }, + { "term", NODE_TERM }, + { "tfoot", NODE_TFOOT }, + { "tgroup", NODE_TGROUP }, + { "thead", NODE_THEAD }, + { "tip", NODE_TIP }, + { "title", NODE_TITLE }, + { "trademark", NODE_TRADEMARK }, + { "type", NODE_TYPE }, + { "ulink", NODE_ULINK }, + { "userinput", NODE_USERINPUT }, + { "variablelist", NODE_VARIABLELIST }, + { "varlistentry", NODE_VARLISTENTRY }, + { "varname", NODE_VARNAME }, + { "warning", NODE_WARNING }, + { "wordasword", NODE_WORDASWORD }, + { "year", NODE_YEAR }, + { NULL, NODE__MAX } }; static int warn = 0; @@ -206,13 +245,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; - /* Not supposed to be collecting text. */ - assert(NULL != ps->cur); - if (NODE_IGNTEXT & nodes[ps->node].flags) - return; + assert(ps->cur != NULL); /* * Are we in the midst of processing text? @@ -221,18 +257,18 @@ 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((int)p[i])) + if ( ! isspace((unsigned char)p[i])) break; if (i == sz) return; 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; @@ -241,16 +277,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->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; @@ -260,10 +296,9 @@ 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((int)pn->b[pn->bsz - 1])) + if ( ! isspace((unsigned char)pn->b[pn->bsz - 1])) break; } @@ -285,7 +320,7 @@ static void xml_elem_start(void *arg, const XML_Char *name, const XML_Char **atts) { struct parse *ps = arg; - enum nodeid node; + const struct node *node; enum attrkey key; enum attrval val; struct pnode *dat; @@ -293,115 +328,81 @@ 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 = 0; node < NODE__MAX; node++) - if (NULL == nodes[node].name) - continue; - else if (0 == strcmp(nodes[node].name, name)) + for (node = nodes; node->name != NULL; node++) + if (strcmp(node->name, name) == 0) break; - if (NODE__MAX == node && NODE_ROOT == ps->node) { - return; - } else if (NODE__MAX == node) { - fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n", + 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)); ps->stop = 1; return; - } else if (NODE_ROOT == ps->node && NODE_REFENTRY != node) { - return; - } else if ( ! isparent(node, ps->node)) { - fprintf(stderr, "%s:%zu:%zu: bad parent \"%s\" " - "of node \"%s\"\n", - ps->fname, XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - NULL == nodes[ps->node].name ? - "(none)" : nodes[ps->node].name, - NULL == nodes[node].name ? - "(none)" : nodes[node].name); - ps->stop = 1; - return; } - if (NULL == (dat = calloc(1, sizeof(struct pnode)))) { + if (node->node == NODE_INLINEEQUATION) + ps->flags |= PARSE_EQN; + + if ((dat = calloc(1, sizeof(struct pnode))) == NULL) { perror(NULL); - exit(EXIT_FAILURE); + exit(1); } - dat->node = ps->node = node; + dat->node = ps->node = node->node; dat->parent = ps->cur; 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 (warn) - fprintf(stderr, "%s:%zu:%zu: warning: " - "unknown attribute \"%s\"\n", - ps->fname, - XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - *att); - continue; - } else if ( ! isattrkey(node, key)) { + if (key == ATTRKEY__MAX) { if (warn) fprintf(stderr, "%s:%zu:%zu: warning: " - "bad attribute \"%s\"\n", - ps->fname, + "unknown attribute \"%s\"\n", + ps->fname, XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), + XML_GetCurrentColumnNumber(ps->xml), *att); continue; } for (val = 0; val < ATTRVAL__MAX; val++) - if (0 == strcmp(*(att + 1), attrvals[val])) + if (strcmp(att[1], attrvals[val]) == 0) break; - if (ATTRVAL__MAX != val && ! isattrval(key, val)) { - if (warn) - fprintf(stderr, "%s:%zu:%zu: warning: " - "bad attribute value \"%s\"\n", - ps->fname, - XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - *(att + 1)); - continue; - } pattr = calloc(1, sizeof(struct pattr)); 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); } @@ -418,21 +419,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; @@ -447,15 +446,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); @@ -471,8 +470,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); } @@ -489,6 +487,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 @@ -501,18 +530,18 @@ bufclear(struct parse *p) /* * Append NODE_TEXT contents to the current buffer, reallocating its * size if necessary. - * The buffer is ALWAYS nil-terminated. + * The buffer is ALWAYS NUL-terminated. */ 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); @@ -531,13 +560,13 @@ 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); } -/* +/* * Recursively search and return the first instance of "node". */ static struct pnode * @@ -549,11 +578,11 @@ 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 @@ -568,37 +597,34 @@ pnode_printmacrolinetext(struct parse *p, struct pnode { char *cp; - if (0 == p->newln && ! (MACROLINE_NOWS & fl)) + if (p->newln == 0 && (fl & MACROLINE_NOWS) == 0) putchar(' '); bufclear(p); bufappend_r(p, pn); /* Convert all space to spaces. */ - for (cp = p->b; '\0' != *cp; cp++) - if (isspace((int)*cp)) + for (cp = p->b; *cp != '\0'; cp++) + if (isspace((unsigned char)*cp)) *cp = ' '; - for (cp = p->b; isspace((int)*cp); cp++) + for (cp = p->b; isspace((unsigned char)*cp); cp++) /* Spin past whitespace (XXX: necessary?) */ ; - for ( ; '\0' != *cp; cp++) { + for ( ; *cp != '\0'; cp++) { /* Escape us if we look like a macro. */ - if ((cp == p->b || ' ' == *(cp - 1)) && - isupper((int)*cp) && - '\0' != *(cp + 1) && - islower((int)*(cp + 1)) && - ('\0' == *(cp + 2) || - ' ' == *(cp + 2) || - (islower((int)*(cp + 2)) && - ('\0' == *(cp + 3) || - ' ' == *(cp + 3))))) + if ((cp == p->b || 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) - putchar(toupper((int)*cp)); + if (fl & MACROLINE_UPPER) + putchar(toupper((unsigned char)*cp)); else - putchar((int)*cp); + putchar(*cp); /* If we're a character escape, escape us. */ - if ('\\' == *cp) + if (*cp == '\\') putchar('e'); } } @@ -617,8 +643,7 @@ pnode_printmacrolinepart(struct parse *p, struct pnode static void pnode_printmacroline(struct parse *p, struct pnode *pn) { - - assert(0 == p->newln); + assert(p->newln == 0); pnode_printmacrolinetext(p, pn, 0); putchar('\n'); p->newln = 1; @@ -653,32 +678,57 @@ static void pnode_printmclosepunct(struct parse *p, struct pnode *pn, int sv) { /* We wouldn't have done anything anyway. */ - if ( ! (sv && ! p->newln)) + if ( ! (sv && ! p->newln)) return; /* No next node or it's not text. */ - if (NULL == (pn = TAILQ_NEXT(pn, child))) { + if ((pn = TAILQ_NEXT(pn, child)) == NULL) { pnode_printmclose(p, sv); return; - } else if (NODE_TEXT != pn->node) { + } else if (pn->node != NODE_TEXT) { pnode_printmclose(p, sv); return; - } + } /* Only do this for the comma/period. */ if (pn->bsz > 0 && - (',' == pn->b[0] || '.' == pn->b[0]) && - (1 == pn->bsz || isspace((int)pn->b[1]))) { + (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; } +static void +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; + + switch (pp->node) { + case NODE_ENTRY: + case NODE_LISTITEM: + return; + case NODE_PREFACE: + case NODE_SECTION: + if (p->level < 3) + return; + break; + default: + break; + } + puts(".Pp"); +} + /* * If the SYNOPSIS macro has a superfluous title, kill it. */ @@ -687,8 +737,8 @@ pnode_printrefsynopsisdiv(struct parse *p, struct pnod { struct pnode *pp; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { + TAILQ_FOREACH(pp, &pn->childq, child) + if (pp->node == NODE_TITLE) { pnode_unlink(pp); return; } @@ -701,53 +751,74 @@ static void pnode_printrefsect(struct parse *p, struct pnode *pn) { struct pnode *pp; + const char *title; + int flags, level; + if (pn->parent == NULL) + return; + + level = ++p->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: + level = 3; + break; + default: + break; + } + } + TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) + if (pp->node == NODE_TITLE) break; - switch (pn->node) { - case (NODE_REFSECT1): + if (pp == NULL) { + switch (pn->node) { + case NODE_PREFACE: + title = "Preface"; + break; + case NODE_CAUTION: + title = "Caution"; + break; + case NODE_NOTE: + title = "Note"; + break; + case NODE_TIP: + title = "Tip"; + break; + case NODE_WARNING: + title = "Warning"; + break; + default: + title = "Unknown"; + break; + } + } + + switch (level) { + case 1: fputs(".Sh", stdout); break; - case (NODE_REFSECT2): + case 2: fputs(".Ss", stdout); break; - case (NODE_REFSECT3): - puts(".Pp"); + default: + pnode_printpara(p, pn); fputs(".Sy", stdout); break; - case (NODE_NOTE): - /* FALLTHROUGH */ - case (NODE_REFSECTION): - /* FALLTHROUGH */ - case (NODE_TIP): - /* FALLTHROUGH */ - case (NODE_CAUTION): - /* FALLTHROUGH */ - case (NODE_WARNING): - puts(".Pp"); - if (NULL == pp) - return; - fputs(".Em", stdout); - break; - default: - break; } - p->newln = 0; - - if (NULL != pp) { - pnode_printmacrolinetext(p, pp, - NODE_REFSECT1 == pn->node ? - MACROLINE_UPPER : 0); + if (pp != NULL) { + p->newln = 0; + pnode_printmacrolinetext(p, pp, flags); pnode_printmclose(p, 1); pnode_unlink(pp); - } else { - puts(NODE_REFSECT1 == pn->node ? - "UNKNOWN" : "unknown"); - p->newln = 1; - } + } else + printf(" %s\n", title); } /* @@ -760,17 +831,17 @@ pnode_printciterefentry(struct parse *p, struct pnode title = manvol = NULL; TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_MANVOLNUM == pp->node) + if (pp->node == NODE_MANVOLNUM) manvol = pp; - else if (NODE_REFENTRYTITLE == pp->node) + else if (pp->node == NODE_REFENTRYTITLE) title = pp; - if (NULL != title) { + if (title != NULL) pnode_printmacrolinepart(p, title); - } else + else fputs(" unknown ", stdout); - if (NULL == manvol) { + if (manvol == NULL) { puts(" 1"); p->newln = 1; } else @@ -785,27 +856,24 @@ pnode_printrefmeta(struct parse *p, struct pnode *pn) title = manvol = NULL; assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_MANVOLNUM == pp->node) + if (pp->node == NODE_MANVOLNUM) manvol = pp; - else if (NODE_REFENTRYTITLE == pp->node) + else if (pp->node == NODE_REFENTRYTITLE) title = pp; - puts(".Dd $Mdocdate" "$"); fputs(".Dt", stdout); p->newln = 0; - if (NULL != title) + if (title != NULL) pnode_printmacrolinetext(p, title, MACROLINE_UPPER); else fputs(" UNKNOWN ", stdout); - if (NULL == manvol) { + if (manvol == NULL) { puts(" 1"); p->newln = 1; } else pnode_printmacroline(p, manvol); - - puts(".Os"); } static void @@ -816,18 +884,18 @@ pnode_printfuncdef(struct parse *p, struct pnode *pn) assert(p->newln); ftype = func = NULL; TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TEXT == pp->node) + if (pp->node == NODE_TEXT) ftype = pp; - else if (NODE_FUNCTION == pp->node) + else if (pp->node == NODE_FUNCTION) func = pp; - if (NULL != ftype) { + if (ftype != NULL) { fputs(".Ft", stdout); p->newln = 0; pnode_printmacroline(p, ftype); } - if (NULL != func) { + if (func != NULL) { fputs(".Fo", stdout); p->newln = 0; pnode_printmacroline(p, func); @@ -845,19 +913,19 @@ pnode_printparamdef(struct parse *p, struct pnode *pn) assert(p->newln); ptype = param = NULL; TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TEXT == pp->node) + 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) { + if (ptype != NULL) { pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS); putchar(' '); } - if (NULL != param) + if (param != NULL) pnode_printmacrolinepart(p, param); puts("\""); @@ -874,31 +942,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, ")")); } /* @@ -916,14 +971,14 @@ pnode_printmath(struct parse *p, struct pnode *pn) pnode_print(p, pp); switch (pn->node) { - case (NODE_MML_MSUP): - printf(" sup "); + case NODE_MML_MSUP: + fputs(" sup ", stdout); break; - case (NODE_MML_MFRAC): - printf(" over "); + case NODE_MML_MFRAC: + fputs(" over ", stdout); break; - case (NODE_MML_MSUB): - printf(" sub "); + case NODE_MML_MSUB: + fputs(" sub ", stdout); break; default: break; @@ -940,23 +995,23 @@ pnode_printfuncprototype(struct parse *p, struct pnode 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"); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_PARAMDEF == pp->node) + TAILQ_FOREACH(pp, &pn->childq, child) + if (pp->node == NODE_PARAMDEF) pnode_printparamdef(p, pp); puts(".Fc"); p->newln = 1; } -/* +/* * The element is more complicated than it should be because text * nodes are treated like ".Ar foo", but non-text nodes need to be * re-sent into the printer (i.e., without the preceding ".Ar"). @@ -972,13 +1027,11 @@ 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) { @@ -987,12 +1040,12 @@ pnode_printarg(struct parse *p, struct pnode *pn) } TAILQ_FOREACH(pp, &pn->childq, child) { - if (NODE_TEXT == pp->node) { + if (pp->node == NODE_TEXT) { pnode_printmopen(p); fputs("Ar", stdout); - } + } pnode_print(p, pp); - if (NODE_TEXT == pp->node && isrep) + if (isrep && pp->node == NODE_TEXT) fputs("...", stdout); } } @@ -1005,22 +1058,21 @@ pnode_printgroup(struct parse *p, struct pnode *pn) int isop, sv; isop = 1; - TAILQ_FOREACH(ap, &pn->attrq, child) - if (ATTRKEY_CHOICE == ap->key && - (ATTRVAL_PLAIN == ap->val || - ATTRVAL_REQ == ap->val)) { + TAILQ_FOREACH(ap, &pn->attrq, child) + if (ap->key == ATTRKEY_CHOICE && + (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) { isop = 0; break; } - /* + /* * Make sure we're on a macro line. * This will prevent pnode_print() for putting us on a * subsequent line. */ sv = p->newln; pnode_printmopen(p); - if (isop) + if (isop) fputs("Op", stdout); else if (sv) fputs("No", stdout); @@ -1036,7 +1088,7 @@ 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); @@ -1054,38 +1106,50 @@ pnode_printprologue(struct parse *p, struct pnode *pn) { struct pnode *pp; - pp = NULL == p->root ? NULL : + pp = p->root == NULL ? NULL : pnode_findfirst(p->root, NODE_REFMETA); - if (NULL != pp) { + puts(".Dd $Mdocdate" "$"); + if (pp != NULL) { pnode_printrefmeta(p, pp); pnode_unlink(pp); - } else { - puts(".\\\" Supplying bogus prologue..."); - puts(".Dd $Mdocdate" "$"); - puts(".Dt UNKNOWN 1"); - puts(".Os"); + } else + printf(".Dt %s 1\n", + pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN")); + puts(".Os"); + + if (p->flags & PARSE_EQN) { + puts(".EQ"); + puts("delim $$"); + puts(".EN"); } } +/* + * We can have multiple elements within a , which + * we should comma-separate as list headers. + */ static void pnode_printvarlistentry(struct parse *p, struct pnode *pn) { struct pnode *pp; + int first = 1; assert(p->newln); + fputs(".It", stdout); + p->newln = 0; + TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TERM == pp->node) { - assert(p->newln); - fputs(".It", stdout); - p->newln = 0; + if (pp->node == NODE_TERM) { + if ( ! first) + putchar(','); pnode_print(p, pp); pnode_unlink(pp); - pnode_printmclose(p, 1); - return; - } + first = 0; + } else + break; - puts(".It"); + putchar('\n'); p->newln = 1; } @@ -1113,14 +1177,14 @@ pnode_printtable(struct parse *p, struct pnode *pn) assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - puts(".Pp"); + 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))) { + while ((pp = pnode_findfirst(pn, NODE_ROW)) != NULL) { puts(".It Table Row"); pnode_printrow(p, pp); pnode_printmclose(p, 1); @@ -1137,17 +1201,17 @@ pnode_printlist(struct parse *p, struct pnode *pn) assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - puts(".Pp"); + if (pp->node == NODE_TITLE) { + pnode_printpara(p, pp); pnode_print(p, pp); pnode_unlink(pp); } assert(p->newln); - if (NODE_ORDEREDLIST == pn->node) + if (pn->node == NODE_ORDEREDLIST) puts(".Bl -enum"); else - puts(".Bl -item"); + puts(".Bl -bullet"); TAILQ_FOREACH(pp, &pn->childq, child) { assert(p->newln); @@ -1166,8 +1230,8 @@ pnode_printvariablelist(struct parse *p, struct pnode assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - puts(".Pp"); + if (pp->node == NODE_TITLE) { + pnode_printpara(p, pp); pnode_print(p, pp); pnode_unlink(pp); } @@ -1175,7 +1239,7 @@ pnode_printvariablelist(struct parse *p, struct pnode assert(p->newln); puts(".Bl -tag -width Ds"); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_VARLISTENTRY != pp->node) { + if (pp->node != NODE_VARLISTENTRY) { assert(p->newln); fputs(".It", stdout); pnode_printmacroline(p, pp); @@ -1197,121 +1261,160 @@ static void pnode_print(struct parse *p, struct pnode *pn) { struct pnode *pp; + const char *ccp; char *cp; int last, sv; - if (NULL == pn) + if (pn == NULL) return; sv = p->newln; switch (pn->node) { - case (NODE_APPLICATION): + case NODE_APPLICATION: pnode_printmopen(p); fputs("Nm", stdout); 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_CITEREFENTRY): + case NODE_AUTHOR: pnode_printmopen(p); + fputs("An", stdout); + break; + case NODE_AUTHORGROUP: + assert(p->newln); + puts(".An -split"); + break; + case NODE_BOOKINFO: + assert(p->newln); + puts(".Sh NAME"); + break; + case NODE_CITEREFENTRY: + pnode_printmopen(p); fputs("Xr", stdout); pnode_printciterefentry(p, pn); pnode_unlinksub(pn); break; - case (NODE_CODE): + case NODE_CODE: pnode_printmopen(p); fputs("Li", stdout); break; - case (NODE_COMMAND): + case NODE_COMMAND: pnode_printmopen(p); fputs("Nm", stdout); break; - case (NODE_CONSTANT): + case NODE_CONSTANT: pnode_printmopen(p); fputs("Dv", stdout); break; - case (NODE_EMPHASIS): + case NODE_EDITOR: + puts("editor: "); pnode_printmopen(p); + fputs("An", stdout); + break; + case NODE_EMPHASIS: + case NODE_FIRSTTERM: + pnode_printmopen(p); fputs("Em", stdout); break; - case (NODE_ENVAR): + case NODE_ENVAR: pnode_printmopen(p); fputs("Ev", stdout); break; - case (NODE_FILENAME): + case NODE_FILENAME: pnode_printmopen(p); fputs("Pa", stdout); break; - case (NODE_FUNCTION): + case NODE_FUNCTION: pnode_printmopen(p); fputs("Fn", stdout); break; - case (NODE_FUNCPROTOTYPE): + case NODE_FUNCPROTOTYPE: assert(p->newln); pnode_printfuncprototype(p, pn); pnode_unlinksub(pn); break; - case (NODE_FUNCSYNOPSISINFO): + case NODE_FUNCSYNOPSISINFO: pnode_printmopen(p); fputs("Fd", stdout); break; - case (NODE_ITEMIZEDLIST): + case NODE_INDEXTERM: + return; + case NODE_INFORMALEQUATION: + if ( ! p->newln) + putchar('\n'); + puts(".EQ"); + p->newln = 0; + break; + case NODE_INLINEEQUATION: + fputc('$', stdout); + p->newln = 0; + break; + case NODE_ITEMIZEDLIST: assert(p->newln); pnode_printlist(p, pn); pnode_unlinksub(pn); break; - case (NODE_GROUP): + case NODE_GROUP: pnode_printgroup(p, pn); pnode_unlinksub(pn); break; - case (NODE_LITERAL): + case NODE_LEGALNOTICE: + assert(p->newln); + puts(".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; + return; + case NODE_LITERAL: + pnode_printmopen(p); fputs("Li", stdout); break; - case (NODE_MML_MATH): - if ( ! p->newln) - putchar('\n'); - puts(".EQ"); - p->newln = 0; + case NODE_LITERALLAYOUT: + assert(p->newln); + puts(".Bd -literal"); break; - case (NODE_MML_MFENCED): + 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): - putchar('{'); + 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): + case NODE_OPTION: pnode_printmopen(p); fputs("Fl", stdout); break; - case (NODE_ORDEREDLIST): + case NODE_ORDEREDLIST: assert(p->newln); pnode_printlist(p, pn); pnode_unlinksub(pn); break; - case (NODE_PARA): - assert(p->newln); - if (NULL != pn->parent && - NODE_LISTITEM == pn->parent->node) - break; - puts(".Pp"); + case NODE_PARA: + pnode_printpara(p, pn); break; - case (NODE_PARAMETER): + case NODE_PARAMETER: /* Suppress non-text children... */ pnode_printmopen(p); fputs("Fa \"", stdout); @@ -1319,24 +1422,24 @@ pnode_print(struct parse *p, struct pnode *pn) fputs("\"", stdout); pnode_unlinksub(pn); break; - case (NODE_QUOTE): + case NODE_QUOTE: pnode_printmopen(p); fputs("Qo", stdout); break; - case (NODE_PROGRAMLISTING): - /* FALLTHROUGH */ - case (NODE_SCREEN): + case NODE_PROGRAMLISTING: + case NODE_SCREEN: assert(p->newln); - puts(".Bd -literal"); + printf(".Bd %s\n", pnode_getattr(pn, ATTRKEY_CLASS) == + ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); 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); @@ -1344,76 +1447,66 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmacrolinepart(p, pn); pnode_unlinksub(pn); break; - case (NODE_REFNAMEDIV): + case NODE_REFNAMEDIV: assert(p->newln); puts(".Sh NAME"); break; - case (NODE_REFPURPOSE): + case NODE_REFPURPOSE: assert(p->newln); pnode_printmopen(p); fputs("Nd", stdout); break; - case (NODE_REFSYNOPSISDIV): + case NODE_REFSYNOPSISDIV: assert(p->newln); pnode_printrefsynopsisdiv(p, pn); puts(".Sh SYNOPSIS"); break; - case (NODE_REFSECT1): - /* FALLTHROUGH */ - case (NODE_REFSECT2): - /* FALLTHROUGH */ - case (NODE_REFSECT3): - /* FALLTHROUGH */ - case (NODE_REFSECTION): - /* FALLTHROUGH */ - case (NODE_NOTE): - /* FALLTHROUGH */ - case (NODE_TIP): - /* FALLTHROUGH */ - case (NODE_CAUTION): - /* FALLTHROUGH */ - case (NODE_WARNING): + case NODE_PREFACE: + case NODE_SECTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_CAUTION: + case NODE_WARNING: assert(p->newln); pnode_printrefsect(p, pn); break; - case (NODE_REPLACEABLE): + case NODE_REPLACEABLE: pnode_printmopen(p); fputs("Ar", stdout); break; - case (NODE_SBR): + case NODE_SBR: assert(p->newln); puts(".br"); break; - case (NODE_SGMLTAG): + case NODE_SGMLTAG: pnode_printmopen(p); fputs("Li", stdout); break; - case (NODE_STRUCTNAME): + case NODE_STRUCTNAME: pnode_printmopen(p); fputs("Vt", stdout); break; - case (NODE_TABLE): - /* FALLTHROUGH */ - case (NODE_INFORMALTABLE): + case NODE_TABLE: + case NODE_INFORMALTABLE: assert(p->newln); pnode_printtable(p, pn); pnode_unlinksub(pn); break; - case (NODE_TEXT): - if (0 == p->newln) + case NODE_TEXT: + if (p->newln == 0) putchar(' '); bufclear(p); bufappend(p, pn); - if (0 == p->bsz) { + if (p->bsz == 0) { assert(pn->real != pn->b); break; } /* * Output all characters, squeezing out whitespace - * between newlines. + * between newlines. * XXX: all whitespace, including tabs (?). * Remember to escape control characters and escapes. */ @@ -1425,45 +1518,51 @@ 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((int)*cp)) { - while (isspace((int)*cp)) + 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_TYPE): + case NODE_TITLE: + if (pn->parent->node == NODE_BOOKINFO) { + pnode_printmopen(p); + fputs("Nd", stdout); + } + break; + case NODE_TYPE: pnode_printmopen(p); fputs("Vt", stdout); break; - case (NODE_USERINPUT): + case NODE_USERINPUT: pnode_printmopen(p); fputs("Li", stdout); break; - case (NODE_VARIABLELIST): + case NODE_VARIABLELIST: assert(p->newln); pnode_printvariablelist(p, pn); pnode_unlinksub(pn); break; - case (NODE_VARLISTENTRY): + case NODE_VARLISTENTRY: assert(p->newln); pnode_printvarlistentry(p, pn); break; - case (NODE_VARNAME): + case NODE_VARNAME: pnode_printmopen(p); fputs("Va", stdout); break; @@ -1475,69 +1574,92 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_print(p, pp); switch (pn->node) { - case (NODE_MML_MATH): + case NODE_INFORMALEQUATION: if ( ! p->newln) putchar('\n'); puts(".EN"); p->newln = 1; break; - case (NODE_MML_MROW): - case (NODE_MML_MI): - case (NODE_MML_MN): - case (NODE_MML_MO): - putchar('}'); + case NODE_INLINEEQUATION: + fputs("$ ", stdout); + p->newln = sv; break; - case (NODE_APPLICATION): - case (NODE_ARG): - case (NODE_CITEREFENTRY): - case (NODE_CODE): - case (NODE_COMMAND): - case (NODE_CONSTANT): - case (NODE_EMPHASIS): - case (NODE_ENVAR): - case (NODE_FILENAME): - 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): + 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); break; - case (NODE_QUOTE): + case NODE_QUOTE: pnode_printmclose(p, sv); sv = p->newln; pnode_printmopen(p); fputs("Qc", stdout); pnode_printmclose(p, sv); 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); break; - case (NODE_PROGRAMLISTING): - /* FALLTHROUGH */ - case (NODE_SCREEN): + case NODE_PREFACE: + case NODE_SECTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_CAUTION: + case NODE_WARNING: + p->level--; + break; + case NODE_LITERALLAYOUT: + case NODE_PROGRAMLISTING: + case NODE_SCREEN: assert(p->newln); puts(".Ed"); p->newln = 1; break; + case NODE_TITLE: + if (pn->parent->node == NODE_BOOKINFO) { + pnode_printmclose(p, 1); + puts(".Sh AUTHORS"); + } + break; default: break; } @@ -1548,7 +1670,7 @@ pnode_print(struct parse *p, struct pnode *pn) * Invoke the parser context with each buffer fill. */ static int -readfile(XML_Parser xp, int fd, +readfile(XML_Parser xp, int fd, char *b, size_t bsz, const char *fn) { struct parse p; @@ -1566,15 +1688,15 @@ 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), + XML_GetCurrentColumnNumber(xp), XML_ErrorString (XML_GetErrorCode(xp))); else if ( ! p.stop && ssz > 0) continue; - /* + /* * Exit when we've read all or errors have occured * during the parse sequence. */ @@ -1583,14 +1705,14 @@ readfile(XML_Parser xp, int fd, pnode_print(&p, p.root); 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 @@ -1611,11 +1733,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: @@ -1625,13 +1747,14 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (argc > 1) - return(EXIT_FAILURE); - else if (argc > 0) + if (argc > 1) { + fprintf(stderr, "%s: Too many arguments\n", argv[1]); + goto usage; + } else if (argc > 0) fname = argv[0]; /* Read from stdin or a file. */ - fd = 0 == strcmp(fname, "-") ? + fd = strcmp(fname, "-") == 0 ? STDIN_FILENO : open(fname, O_RDONLY, 0); /* @@ -1640,22 +1763,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]\n", progname); - return(EXIT_FAILURE); + fprintf(stderr, "usage: %s [-W] [input_filename]\n", progname); + return 1; }