=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.62 retrieving revision 1.79 diff -u -p -r1.62 -r1.79 --- docbook2mdoc/docbook2mdoc.c 2019/03/22 17:42:53 1.62 +++ docbook2mdoc/docbook2mdoc.c 2019/04/02 15:53:02 1.79 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.62 2019/03/22 17:42:53 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.79 2019/04/02 15:53:02 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -15,711 +15,27 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include - #include #include -#include -#include -#include #include #include -#include -#include -#include "extern.h" +#include "node.h" +#include "macro.h" +#include "format.h" /* - * Global parse state. - * Keep this as simple and small as possible. + * The implementation of the mdoc(7) formatter. */ -struct parse { - XML_Parser xml; - enum nodeid node; /* current (NODE_ROOT if pre-tree) */ - const char *fname; /* filename */ - int stop; /* should we stop now? */ -#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; /* 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 */ - enum nodeid node; /* docbook element to generate */ -}; +static void pnode_print(struct format *, struct pnode *); -TAILQ_HEAD(pnodeq, pnode); -TAILQ_HEAD(pattrq, pattr); -struct pattr { - enum attrkey key; - enum attrval val; - char *rawval; - TAILQ_ENTRY(pattr) child; -}; - -struct pnode { - enum nodeid node; /* node type */ - char *b; /* binary data buffer */ - char *real; /* store for "b" */ - size_t bsz; /* data buffer size */ - struct pnode *parent; /* parent (or NULL if top) */ - struct pnodeq childq; /* queue of children */ - struct pattrq attrq; /* attributes of node */ - TAILQ_ENTRY(pnode) child; -}; - -static const char *attrkeys[ATTRKEY__MAX] = { - "choice", - "class", - "close", - "id", - "linkend", - "open", - "rep" -}; - -static const char *attrvals[ATTRVAL__MAX] = { - "monospaced", - "norepeat", - "opt", - "plain", - "repeat", - "req" -}; - -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; - static void -pnode_print(struct parse *p, struct pnode *pn); - -/* - * Process a stream of characters. - * We store text as nodes in and of themselves. - * If a text node is already open, append to it. - * If it's not open, open one under the current context. - */ -static void -xml_char(void *arg, const XML_Char *p, int sz) +pnode_printpara(struct format *p, struct pnode *pn) { - struct parse *ps = arg; - struct pnode *dat; - int i; - - /* Stopped or no tree yet. */ - if (ps->stop || NODE_ROOT == ps->node) - return; - - assert(NULL != ps->cur); - - /* - * Are we in the midst of processing text? - * If we're not processing text right now, then create a text - * node for doing so. - * However, don't do so unless we have some non-whitespace to - * process: strip out all leading whitespace to be sure. - */ - if (NODE_TEXT != ps->node) { - for (i = 0; i < sz; i++) - if ( ! isspace((unsigned char)p[i])) - break; - if (i == sz) - return; - p += i; - sz -= i; - dat = calloc(1, sizeof(struct pnode)); - if (NULL == dat) { - perror(NULL); - exit(EXIT_FAILURE); - } - - dat->node = ps->node = NODE_TEXT; - dat->parent = ps->cur; - TAILQ_INIT(&dat->childq); - TAILQ_INIT(&dat->attrq); - TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child); - ps->cur = dat; - assert(NULL != ps->root); - } - - /* Append to current buffer. */ - assert(sz >= 0); - ps->cur->b = realloc(ps->cur->b, - ps->cur->bsz + (size_t)sz); - if (NULL == ps->cur->b) { - perror(NULL); - exit(EXIT_FAILURE); - } - memcpy(ps->cur->b + ps->cur->bsz, p, sz); - ps->cur->bsz += (size_t)sz; - ps->cur->real = ps->cur->b; -} - -static void -pnode_trim(struct pnode *pn) -{ - - assert(NODE_TEXT == pn->node); - for ( ; pn->bsz > 0; pn->bsz--) - if ( ! isspace((unsigned char)pn->b[pn->bsz - 1])) - break; -} - -/* - * Begin an element. - * First, look for the element. - * If we don't find it and we're not parsing, keep going. - * If we don't find it and we're parsing, puke and exit. - * If we find it but we're not parsing yet (i.e., it's not a refentry - * and thus out of context), keep going. - * If we find it and we're at the root and already have a tree, puke and - * exit (FIXME: I don't think this is right?). - * If we find it but we're parsing a text node, close out the text node, - * return to its parent, and keep going. - * Make sure that the element is in the right context. - * Lastly, put the node onto our parse tree and continue. - */ -static void -xml_elem_start(void *arg, const XML_Char *name, const XML_Char **atts) -{ - struct parse *ps = arg; - const struct node *node; - enum attrkey key; - enum attrval val; - struct pnode *dat; - struct pattr *pattr; - const XML_Char **att; - - /* FIXME: find a better way to ditch other namespaces. */ - if (ps->stop || 0 == strcmp(name, "xi:include")) - return; - - /* Close out text node, if applicable... */ - if (NODE_TEXT == ps->node) { - assert(NULL != ps->cur); - pnode_trim(ps->cur); - ps->cur = ps->cur->parent; - assert(NULL != ps->cur); - ps->node = ps->cur->node; - } - - for (node = nodes; NULL != node->name; node++) - if (0 == strcmp(node->name, name)) - break; - - if (NULL == node->name) { - if (NODE_ROOT == ps->node) - 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) { - fprintf(stderr, "%s:%zu:%zu: multiple refentries\n", - ps->fname, XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml)); - ps->stop = 1; - return; - } - - if (NODE_INLINEEQUATION == node->node) - ps->flags |= PARSE_EQN; - - if (NULL == (dat = calloc(1, sizeof(struct pnode)))) { - perror(NULL); - exit(EXIT_FAILURE); - } - - dat->node = ps->node = node->node; - dat->parent = ps->cur; - TAILQ_INIT(&dat->childq); - TAILQ_INIT(&dat->attrq); - - if (NULL != ps->cur) - TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child); - - ps->cur = dat; - if (NULL == ps->root) - ps->root = dat; - - /* - * Process attributes. - */ - for (att = atts; NULL != *att; att += 2) { - for (key = 0; key < ATTRKEY__MAX; key++) - if (0 == strcmp(*att, attrkeys[key])) - break; - if (ATTRKEY__MAX == key) { - if (warn) - fprintf(stderr, "%s:%zu:%zu: warning: " - "unknown attribute \"%s\"\n", - ps->fname, - XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - *att); - continue; - } - for (val = 0; val < ATTRVAL__MAX; val++) - if (0 == strcmp(*(att + 1), attrvals[val])) - break; - pattr = calloc(1, sizeof(struct pattr)); - pattr->key = key; - pattr->val = val; - if (ATTRVAL__MAX == val) - pattr->rawval = strdup(*(att + 1)); - TAILQ_INSERT_TAIL(&dat->attrq, pattr, child); - } - -} - -/* - * Roll up the parse tree. - * If we're at a text node, roll that one up first. - * If we hit the root, then assign ourselves as the NODE_ROOT. - */ -static void -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) - return; - else if (0 == strcmp(name, "xi:include")) - return; - - /* Close out text node, if applicable... */ - if (NODE_TEXT == ps->node) { - assert(NULL != ps->cur); - pnode_trim(ps->cur); - ps->cur = ps->cur->parent; - assert(NULL != ps->cur); - ps->node = ps->cur->node; - } - - if (NULL == (ps->cur = ps->cur->parent)) - ps->node = NODE_ROOT; - else - ps->node = ps->cur->node; -} - -/* - * Recursively free a node (NULL is ok). - */ -static void -pnode_free(struct pnode *pn) -{ struct pnode *pp; - struct pattr *ap; - if (NULL == pn) - return; - - while (NULL != (pp = TAILQ_FIRST(&pn->childq))) { - TAILQ_REMOVE(&pn->childq, pp, child); - pnode_free(pp); - } - - while (NULL != (ap = TAILQ_FIRST(&pn->attrq))) { - TAILQ_REMOVE(&pn->attrq, ap, child); - free(ap->rawval); - free(ap); - } - - free(pn->real); - free(pn); -} - -/* - * Unlink a node from its parent and pnode_free() it. - */ -static void -pnode_unlink(struct pnode *pn) -{ - - if (NULL != pn->parent) - TAILQ_REMOVE(&pn->parent->childq, pn, child); - pnode_free(pn); -} - -/* - * Unlink all children of a node and pnode_free() them. - */ -static void -pnode_unlinksub(struct pnode *pn) -{ - - while ( ! TAILQ_EMPTY(&pn->childq)) - pnode_unlink(TAILQ_FIRST(&pn->childq)); -} - -/* - * 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 ATTRVAL__MAX == ap->val ? ap->rawval : - attrvals[ap->val]; - return(defval); -} - -/* - * 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(NODE_TEXT == pn->node); - if (p->bsz + pn->bsz + 1 > p->mbsz) { - p->mbsz = p->bsz + pn->bsz + 1; - if (NULL == (p->b = realloc(p->b, p->mbsz))) { - perror(NULL); - exit(EXIT_FAILURE); - } - } - memcpy(p->b + p->bsz, pn->b, pn->bsz); - p->bsz += pn->bsz; - p->b[p->bsz] = '\0'; -} - -/* - * Recursively append all NODE_TEXT nodes to the buffer. - * This descends into non-text nodes, but doesn't do anything beyond - * them. - * In other words, this is a recursive text grok. - */ -static void -bufappend_r(struct parse *p, struct pnode *pn) -{ - struct pnode *pp; - - if (NODE_TEXT == pn->node) - bufappend(p, pn); - TAILQ_FOREACH(pp, &pn->childq, child) - bufappend_r(p, pp); -} - -/* - * Recursively search and return the first instance of "node". - */ -static struct pnode * -pnode_findfirst(struct pnode *pn, enum nodeid node) -{ - struct pnode *pp, *res; - - res = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) { - res = pp->node == node ? pp : - pnode_findfirst(pp, node); - if (NULL != res) - break; - } - - 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) -{ - char *cp; - - if (0 == p->newln && ! (MACROLINE_NOWS & fl)) - putchar(' '); - - bufclear(p); - bufappend_r(p, pn); - - /* Convert all space to spaces. */ - for (cp = p->b; '\0' != *cp; cp++) - if (isspace((unsigned char)*cp)) - *cp = ' '; - - for (cp = p->b; isspace((unsigned char)*cp); cp++) - /* Spin past whitespace (XXX: necessary?) */ ; - for ( ; '\0' != *cp; cp++) { - /* Escape us if we look like a macro. */ - if ((cp == p->b || ' ' == *(cp - 1)) && - isupper((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))))) - fputs("\\&", stdout); - if (MACROLINE_UPPER & fl) - 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) -{ - - pnode_printmacrolinetext(p, pn, 0); -} - -/* - * Just pnode_printmacrolinepart() but with a newline. - * If no text, just the newline. - */ -static void -pnode_printmacroline(struct parse *p, struct pnode *pn) -{ - - assert(0 == p->newln); - pnode_printmacrolinetext(p, pn, 0); - putchar('\n'); - p->newln = 1; -} - -static void -pnode_printmopen(struct parse *p) -{ - if (p->newln) { - putchar('.'); - p->newln = 0; - } else - putchar(' '); -} - -static void -pnode_printmclose(struct parse *p, int sv) -{ - - if (sv && ! p->newln) { - putchar('\n'); - p->newln = 1; - } -} - -/* - * 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. - */ -static void -pnode_printmclosepunct(struct parse *p, struct pnode *pn, int sv) -{ - /* 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]))) { - 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; @@ -736,40 +52,42 @@ pnode_printpara(struct parse *p, struct pnode *pn) default: break; } - puts(".Pp"); + macro_line(p, "Pp"); } /* * If the SYNOPSIS macro has a superfluous title, kill it. */ static void -pnode_printrefsynopsisdiv(struct parse *p, struct pnode *pn) +pnode_printrefsynopsisdiv(struct format *p, struct pnode *pn) { - struct pnode *pp; + struct pnode *pp, *pq; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { + TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) + if (pp->node == NODE_TITLE) pnode_unlink(pp); - return; - } + + macro_line(p, "Sh SYNOPSIS"); } /* * Start a hopefully-named `Sh' section. */ static void -pnode_printrefsect(struct parse *p, struct pnode *pn) +pnode_printrefsect(struct format *p, struct pnode *pn) { struct pnode *pp; const char *title; int flags, level; - if (NULL == pn->parent) + if (pn->parent == NULL) return; level = ++p->level; - flags = 1 == level ? MACROLINE_UPPER : 0; - if (3 > level) { + flags = ARG_SPACE; + if (level == 1) + flags |= ARG_UPPER; + if (level < 3) { switch (pn->node) { case NODE_CAUTION: case NODE_NOTE: @@ -783,10 +101,10 @@ 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: title = "Preface"; @@ -811,137 +129,100 @@ 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 (NULL != pp) { - p->newln = 0; - pnode_printmacrolinetext(p, pp, flags); - pnode_printmclose(p, 1); + if (pp != NULL) { + macro_addnode(p, pp, flags); pnode_unlink(pp); } else - printf(" %s\n", title); + macro_addarg(p, title, ARG_SPACE | ARG_QUOTED); + macro_close(p); } /* * Start a reference, extracting the title and volume. */ static void -pnode_printciterefentry(struct parse *p, struct pnode *pn) +pnode_printciterefentry(struct format *p, struct pnode *pn) { struct pnode *pp, *title, *manvol; title = manvol = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_MANVOLNUM == pp->node) + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_MANVOLNUM) manvol = pp; - else if (NODE_REFENTRYTITLE == pp->node) + else if (pp->node == NODE_REFENTRYTITLE) title = pp; - - if (NULL != title) { - pnode_printmacrolinepart(p, title); - } else - fputs(" unknown ", stdout); - - if (NULL == manvol) { - puts(" 1"); - p->newln = 1; - } else - pnode_printmacrolinepart(p, manvol); + } + macro_open(p, "Xr"); + if (title == NULL) + macro_addarg(p, "unknown", ARG_SPACE); + else + macro_addnode(p, title, ARG_SPACE | ARG_SINGLE); + if (manvol == NULL) + macro_addarg(p, "1", ARG_SPACE); + else + macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE); + macro_close(p); + pnode_unlinksub(pn); } static void -pnode_printrefmeta(struct parse *p, struct pnode *pn) +pnode_printrefmeta(struct format *p, struct pnode *pn) { struct pnode *pp, *title, *manvol; title = manvol = NULL; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_MANVOLNUM == pp->node) + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_MANVOLNUM) manvol = pp; - else if (NODE_REFENTRYTITLE == pp->node) + else if (pp->node == NODE_REFENTRYTITLE) title = pp; - - fputs(".Dt", stdout); - p->newln = 0; - - if (NULL != title) - pnode_printmacrolinetext(p, title, MACROLINE_UPPER); + } + macro_open(p, "Dt"); + if (title == NULL) + macro_addarg(p, "UNKNOWN", ARG_SPACE); else - fputs(" UNKNOWN ", stdout); - - if (NULL == manvol) { - puts(" 1"); - p->newln = 1; - } else - pnode_printmacroline(p, manvol); + macro_addnode(p, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER); + if (manvol == NULL) + macro_addarg(p, "1", ARG_SPACE); + else + macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE); + macro_close(p); + pnode_unlink(pn); } static void -pnode_printfuncdef(struct parse *p, struct pnode *pn) +pnode_printfuncdef(struct format *p, struct pnode *pn) { struct pnode *pp, *ftype, *func; - assert(p->newln); ftype = func = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TEXT == pp->node) + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_TEXT) ftype = pp; - else if (NODE_FUNCTION == pp->node) + else if (pp->node == NODE_FUNCTION) func = pp; - - if (NULL != ftype) { - fputs(".Ft", stdout); - p->newln = 0; - pnode_printmacroline(p, ftype); } - - if (NULL != func) { - fputs(".Fo", stdout); - p->newln = 0; - pnode_printmacroline(p, func); - } else { - puts(".Fo UNKNOWN"); - p->newln = 1; - } + if (ftype != NULL) + macro_argline(p, "Ft", ftype->b); + macro_open(p, "Fo"); + if (func == NULL) + macro_addarg(p, "UNKNOWN", ARG_SPACE); + else + macro_addnode(p, func, ARG_SPACE | ARG_SINGLE); + macro_close(p); } -static void -pnode_printparamdef(struct parse *p, struct pnode *pn) -{ - struct pnode *pp, *ptype, *param; - - assert(p->newln); - ptype = param = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TEXT == pp->node) - ptype = pp; - else if (NODE_PARAMETER == pp->node) - param = pp; - - fputs(".Fa \"", stdout); - p->newln = 0; - if (NULL != ptype) { - pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS); - putchar(' '); - } - - if (NULL != param) - pnode_printmacrolinepart(p, param); - - puts("\""); - p->newln = 1; -} - /* * The node is a little peculiar. * First, it can have arbitrary open and closing tokens, which default @@ -949,7 +230,7 @@ pnode_printparamdef(struct parse *p, struct pnode *pn) * Second, >1 arguments are separated by commas. */ static void -pnode_printmathfenced(struct parse *p, struct pnode *pn) +pnode_printmathfenced(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -958,12 +239,12 @@ pnode_printmathfenced(struct parse *p, struct pnode *p 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); } - printf("right %s ", pnode_getattr_raw(pn, ATTRKEY_CLOSE, ")")); + pnode_unlinksub(pn); } /* @@ -973,7 +254,7 @@ pnode_printmathfenced(struct parse *p, struct pnode *p * particular eqn(7) word. */ static void -pnode_printmath(struct parse *p, struct pnode *pn) +pnode_printmath(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -996,29 +277,29 @@ pnode_printmath(struct parse *p, struct pnode *pn) pp = TAILQ_NEXT(pp, child); pnode_print(p, pp); + pnode_unlinksub(pn); } static void -pnode_printfuncprototype(struct parse *p, struct pnode *pn) +pnode_printfuncprototype(struct format *p, struct pnode *pn) { struct pnode *pp, *fdef; - assert(p->newln); TAILQ_FOREACH(fdef, &pn->childq, child) - if (NODE_FUNCDEF == fdef->node) + if (fdef->node == NODE_FUNCDEF) break; - if (NULL != fdef) + if (fdef != NULL) pnode_printfuncdef(p, fdef); else - puts(".Fo UNKNOWN"); + macro_line(p, "Fo UNKNOWN"); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_PARAMDEF == pp->node) - pnode_printparamdef(p, pp); + if (pp->node == NODE_PARAMDEF) + macro_nodeline(p, "Fa", pp, ARG_SINGLE); - puts(".Fc"); - p->newln = 1; + macro_line(p, "Fc"); + pnode_unlinksub(pn); } /* @@ -1029,7 +310,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode * ellipsis following an argument) and optionality. */ static void -pnode_printarg(struct parse *p, struct pnode *pn) +pnode_printarg(struct format *p, struct pnode *pn) { struct pnode *pp; struct pattr *ap; @@ -1037,33 +318,28 @@ pnode_printarg(struct parse *p, struct pnode *pn) isop = 1; isrep = 0; - TAILQ_FOREACH(ap, &pn->attrq, child) - if (ATTRKEY_CHOICE == ap->key && - (ATTRVAL_PLAIN == ap->val || - ATTRVAL_REQ == ap->val)) + TAILQ_FOREACH(ap, &pn->attrq, child) { + if (ap->key == ATTRKEY_CHOICE && + (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) isop = 0; - else if (ATTRKEY_REP == ap->key && - (ATTRVAL_REPEAT == ap->val)) + else if (ap->key == ATTRKEY_REP && ap->val == ATTRVAL_REPEAT) isrep = 1; - - if (isop) { - pnode_printmopen(p); - fputs("Op", stdout); } + if (isop) + macro_open(p, "Op"); TAILQ_FOREACH(pp, &pn->childq, child) { - if (NODE_TEXT == pp->node) { - pnode_printmopen(p); - fputs("Ar", stdout); - } + if (pp->node == NODE_TEXT) + macro_open(p, "Ar"); pnode_print(p, pp); - if (NODE_TEXT == pp->node && isrep) - fputs("...", stdout); + if (isrep && pp->node == NODE_TEXT) + macro_addarg(p, "...", ARG_SPACE); } + pnode_unlinksub(pn); } static void -pnode_printgroup(struct parse *p, struct pnode *pn) +pnode_printgroup(struct format *p, struct pnode *pn) { struct pnode *pp, *np; struct pattr *ap; @@ -1071,9 +347,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; } @@ -1083,12 +358,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 @@ -1101,40 +375,104 @@ pnode_printgroup(struct parse *p, struct pnode *pn) TAILQ_FOREACH(pp, &pn->childq, child) { pnode_print(p, pp); np = TAILQ_NEXT(pp, child); - while (NULL != np) { + while (np != NULL) { if (pp->node != np->node) break; - fputs(" |", stdout); - pnode_printmacrolinepart(p, np); + macro_addarg(p, "|", ARG_SPACE); + macro_addnode(p, np, ARG_SPACE); pp = np; np = TAILQ_NEXT(np, child); } } + if (sv) + macro_close(p); + pnode_unlinksub(pn); +} - pnode_printmclose(p, sv); +static void +pnode_printauthor(struct format *f, struct pnode *n) +{ + struct pnode *nc, *ncn; + int have_contrib, have_name; + + /* + * Print children up front, before the .An scope, + * and figure out whether we a name of a person. + */ + + have_contrib = have_name = 0; + TAILQ_FOREACH_SAFE(nc, &n->childq, child, ncn) { + switch (nc->node) { + case NODE_CONTRIB: + if (have_contrib) + print_text(f, ",", 0); + print_textnode(f, nc); + pnode_unlink(nc); + have_contrib = 1; + break; + case NODE_PERSONNAME: + have_name = 1; + break; + default: + break; + } + } + if (TAILQ_FIRST(&n->childq) == NULL) + return; + + if (have_contrib) + print_text(f, ":", 0); + + /* + * If we have a name, print it in the .An scope and leave + * all other content for child handlers, to print after the + * scope. Otherwise, print everything in the scope. + */ + + macro_open(f, "An"); + TAILQ_FOREACH_SAFE(nc, &n->childq, child, ncn) { + if (nc->node == NODE_PERSONNAME || have_name == 0) { + macro_addnode(f, nc, ARG_SPACE); + pnode_unlink(nc); + } + } + + /* + * If there are still unprinted children, end the scope + * with a comma. Otherwise, leave the scope open in case + * a text node follows that starts with closing punctuation. + */ + + if (TAILQ_FIRST(&n->childq) != NULL) { + macro_addarg(f, ",", ARG_SPACE); + macro_close(f); + } } static void -pnode_printprologue(struct parse *p, struct pnode *pn) +pnode_printprologue(struct format *p, struct ptree *tree) { - struct pnode *pp; + struct pnode *refmeta; - pp = NULL == p->root ? NULL : - pnode_findfirst(p->root, NODE_REFMETA); + refmeta = tree->root == NULL ? NULL : + pnode_findfirst(tree->root, NODE_REFMETA); - puts(".Dd $Mdocdate" "$"); - if (NULL != pp) { - pnode_printrefmeta(p, pp); - pnode_unlink(pp); + macro_line(p, "Dd $Mdocdate" "$"); + if (refmeta == NULL) { + macro_open(p, "Dt"); + macro_addarg(p, + pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"), + ARG_SPACE | ARG_SINGLE | ARG_UPPER); + macro_addarg(p, "1", ARG_SPACE); + macro_close(p); } else - printf(".Dt %s 1\n", - pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN")); - puts(".Os"); + pnode_printrefmeta(p, refmeta); + macro_line(p, "Os"); - if (PARSE_EQN & p->flags) { - puts(".EQ"); - puts("delim $$"); - puts(".EN"); + if (tree->flags & TREE_EQN) { + macro_line(p, "EQ"); + print_text(p, "delim $$", 0); + macro_line(p, "EN"); } } @@ -1143,125 +481,101 @@ pnode_printprologue(struct parse *p, struct pnode *pn) * we should comma-separate as list headers. */ static void -pnode_printvarlistentry(struct parse *p, struct pnode *pn) +pnode_printvarlistentry(struct format *p, struct pnode *pn) { struct pnode *pp; int first = 1; - assert(p->newln); - fputs(".It", stdout); - p->newln = 0; - + macro_open(p, "It"); + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node != NODE_TERM) + continue; + if ( ! first) + macro_addarg(p, ",", 0); + pnode_print(p, pp); + first = 0; + } + macro_close(p); TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TERM == pp->node) { - if ( ! first) - putchar(','); + if (pp->node != NODE_TERM) pnode_print(p, pp); - pnode_unlink(pp); - first = 0; - } else - break; + pnode_unlinksub(pn); +} - putchar('\n'); - p->newln = 1; +static void +pnode_printtitle(struct format *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 -pnode_printrow(struct parse *p, struct pnode *pn) +pnode_printrow(struct format *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 -pnode_printtable(struct parse *p, struct pnode *pn) +pnode_printtable(struct format *p, struct pnode *pn) { struct pnode *pp; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - pnode_printpara(p, pp); - pnode_print(p, pp); - pnode_unlink(pp); - } - assert(p->newln); - puts(".Bl -ohang"); - while (NULL != (pp = pnode_findfirst(pn, NODE_ROW))) { - puts(".It Table Row"); + pnode_printtitle(p, pn); + macro_line(p, "Bl -ohang"); + while ((pp = pnode_findfirst(pn, NODE_ROW)) != NULL) { + macro_line(p, "It Table Row"); pnode_printrow(p, pp); - pnode_printmclose(p, 1); - pnode_unlink(pp); } - assert(p->newln); - puts(".El"); + macro_line(p, "El"); + pnode_unlinksub(pn); } static void -pnode_printlist(struct parse *p, struct pnode *pn) +pnode_printlist(struct format *p, struct pnode *pn) { struct pnode *pp; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - pnode_printpara(p, pp); - pnode_print(p, pp); - pnode_unlink(pp); - } - assert(p->newln); - - if (NODE_ORDEREDLIST == pn->node) - puts(".Bl -enum"); - else - puts(".Bl -bullet"); - + pnode_printtitle(p, pn); + macro_argline(p, "Bl", + pn->node == NODE_ORDEREDLIST ? "-enum" : "-bullet"); TAILQ_FOREACH(pp, &pn->childq, child) { - assert(p->newln); - puts(".It"); + macro_line(p, "It"); pnode_print(p, pp); - pnode_printmclose(p, 1); } - assert(p->newln); - puts(".El"); + macro_line(p, "El"); + pnode_unlinksub(pn); } static void -pnode_printvariablelist(struct parse *p, struct pnode *pn) +pnode_printvariablelist(struct format *p, struct pnode *pn) { struct pnode *pp; - assert(p->newln); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_TITLE == pp->node) { - pnode_printpara(p, pp); + pnode_printtitle(p, pn); + macro_line(p, "Bl -tag -width Ds"); + TAILQ_FOREACH(pp, &pn->childq, child) { + if (pp->node == NODE_VARLISTENTRY) pnode_print(p, pp); - pnode_unlink(pp); - } - - assert(p->newln); - puts(".Bl -tag -width Ds"); - TAILQ_FOREACH(pp, &pn->childq, child) - if (NODE_VARLISTENTRY != pp->node) { - assert(p->newln); - fputs(".It", stdout); - pnode_printmacroline(p, pp); - } else { - assert(p->newln); - pnode_print(p, pp); - } - assert(p->newln); - puts(".El"); + else + macro_nodeline(p, "It", pp, 0); + } + macro_line(p, "El"); + pnode_unlinksub(pn); } /* @@ -1271,135 +585,118 @@ pnode_printvariablelist(struct parse *p, struct pnode * whatever), don't print inline macros. */ static void -pnode_print(struct parse *p, struct pnode *pn) +pnode_print(struct format *p, struct pnode *pn) { struct pnode *pp; const char *ccp; char *cp; - int last, sv; + int last; + enum linestate sv; - if (NULL == pn) + if (pn == NULL) return; - sv = p->newln; + sv = p->linestate; switch (pn->node) { case NODE_APPLICATION: - pnode_printmopen(p); - fputs("Nm", stdout); + 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); + pnode_printauthor(p, pn); 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:", ARG_SPACE); + macro_open(p, "An"); break; + case NODE_EMAIL: + 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_ESCAPE: + if (p->linestate == LINE_NEW) + p->linestate = LINE_TEXT; + else + putchar(' '); + fputs(pn->b, stdout); + 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: + 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 (NULL == ccp) + 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); - puts(".Bd -literal"); + 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: @@ -1413,38 +710,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); - printf(".Bd %s\n", ATTRVAL_MONOSPACED == - pnode_getattr(pn, ATTRKEY_CLASS) ? - "-literal" : "-unfilled"); + macro_line(p, "Bd -literal"); break; case NODE_REFENTRYINFO: /* Suppress. */ @@ -1455,25 +740,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: @@ -1481,42 +759,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 (0 == p->newln) - putchar(' '); - - bufclear(p); - bufappend(p, pn); - - if (0 == p->bsz) { + 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 @@ -1524,61 +793,51 @@ pnode_print(struct parse *p, struct pnode *pn) * XXX: all whitespace, including tabs (?). * Remember to escape control characters and escapes. */ - assert(p->bsz); - cp = p->b; + cp = pn->b; /* * There's often a superfluous "-" in its