=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.41 retrieving revision 1.54 diff -u -p -r1.41 -r1.54 --- docbook2mdoc/docbook2mdoc.c 2014/10/12 15:34:44 1.41 +++ docbook2mdoc/docbook2mdoc.c 2019/03/22 16:32:34 1.54 @@ -1,6 +1,7 @@ -/* $Id: docbook2mdoc.c,v 1.41 2014/10/12 15:34:44 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.54 2019/03/22 16:32:34 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,11 +38,14 @@ 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 */ }; @@ -89,102 +93,136 @@ static const char *attrvals[ATTRVAL__MAX] = { }; 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 }, + { NULL, 0 }, + { "acronym", 0 }, + { "affiliation", NODE_IGNTEXT }, + { "anchor", NODE_IGNTEXT }, + { "application", 0 }, + { "arg", 0 }, + { "author", NODE_IGNTEXT }, + { "authorgroup", NODE_IGNTEXT }, + { "blockquote", NODE_IGNTEXT }, + { "book", NODE_IGNTEXT }, + { "bookinfo", NODE_IGNTEXT }, + { "caution", NODE_IGNTEXT }, + { "chapter", NODE_IGNTEXT }, + { "citerefentry", NODE_IGNTEXT }, + { "citetitle", 0 }, + { "cmdsynopsis", NODE_IGNTEXT }, + { "code", 0 }, { "colspec", NODE_IGNTEXT }, - { "command", 0 }, - { "constant", 0 }, - { "copyright", NODE_IGNTEXT }, - { "date", 0 }, + { "command", 0 }, + { "constant", 0 }, + { "copyright", NODE_IGNTEXT }, + { "date", 0 }, + { "editor", NODE_IGNTEXT }, { "emphasis", 0 }, { "entry", 0 }, { "envar", 0 }, { "fieldsynopsis", NODE_IGNTEXT }, { "filename", 0 }, + { "firstname", 0 }, + { "firstterm", 0 }, + { "footnote", 0 }, { "funcdef", 0 }, - { "funcprototype", NODE_IGNTEXT }, - { "funcsynopsis", NODE_IGNTEXT }, - { "funcsynopsisinfo", 0 }, - { "function", 0 }, - { "group", NODE_IGNTEXT }, + { "funcprototype", NODE_IGNTEXT }, + { "funcsynopsis", NODE_IGNTEXT }, + { "funcsynopsisinfo", 0 }, + { "function", 0 }, + { "glossterm", 0 }, + { "group", NODE_IGNTEXT }, { "holder", NODE_IGNTEXT }, + { "index", NODE_IGNTEXT }, + { "indexterm", 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 }, + { "informalequation", NODE_IGNTEXT }, + { "informaltable", NODE_IGNTEXT }, + { "inlineequation", NODE_IGNTEXT }, + { "itemizedlist", NODE_IGNTEXT }, + { "keysym", 0 }, + { "legalnotice", NODE_IGNTEXT }, + { "link", 0 }, + { "listitem", NODE_IGNTEXT }, + { "literal", 0 }, + { "literallayout", 0 }, + { "manvolnum", 0 }, + { "member", 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 }, + { "orgname", 0 }, + { "othername", 0 }, + { "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 }, + { "parameter", 0 }, + { "part", NODE_IGNTEXT }, + { "phrase", 0 }, + { "preface", NODE_IGNTEXT }, + { "primary", 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 }, + { "releaseinfo", 0 }, + { "replaceable", 0 }, + { "row", NODE_IGNTEXT }, + { "sbr", NODE_IGNTEXT }, + { "screen", NODE_IGNTEXT }, + { "secondary", 0 }, + { "sect1", NODE_IGNTEXT }, + { "sect2", NODE_IGNTEXT }, + { "section", NODE_IGNTEXT }, + { "sgmltag", 0 }, + { "simplelist", NODE_IGNTEXT }, + { "spanspec", NODE_IGNTEXT }, + { "structname", 0 }, + { "subtitle", 0 }, + { "surname", 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 int warn = 0; @@ -223,7 +261,7 @@ xml_char(void *arg, const XML_Char *p, int sz) */ if (NODE_TEXT != ps->node) { for (i = 0; i < sz; i++) - if ( ! isspace((int)p[i])) + if ( ! isspace((unsigned char)p[i])) break; if (i == sz) return; @@ -246,7 +284,7 @@ xml_char(void *arg, const XML_Char *p, int sz) /* Append to current buffer. */ assert(sz >= 0); - ps->cur->b = realloc(ps->cur->b, + ps->cur->b = realloc(ps->cur->b, ps->cur->bsz + (size_t)sz); if (NULL == ps->cur->b) { perror(NULL); @@ -263,7 +301,7 @@ pnode_trim(struct pnode *pn) assert(NODE_TEXT == pn->node); for ( ; pn->bsz > 0; pn->bsz--) - if ( ! isspace((int)pn->b[pn->bsz - 1])) + if ( ! isspace((unsigned char)pn->b[pn->bsz - 1])) break; } @@ -305,7 +343,6 @@ xml_elem_start(void *arg, const XML_Char *name, const ps->node = ps->cur->node; } - for (node = 0; node < NODE__MAX; node++) if (NULL == nodes[node].name) continue; @@ -315,7 +352,7 @@ xml_elem_start(void *arg, const XML_Char *name, const if (NODE__MAX == node && NODE_ROOT == ps->node) { return; } else if (NODE__MAX == node) { - fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n", + fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n", ps->fname, XML_GetCurrentLineNumber(ps->xml), XML_GetCurrentColumnNumber(ps->xml), name); ps->stop = 1; @@ -326,21 +363,14 @@ xml_elem_start(void *arg, const XML_Char *name, const XML_GetCurrentColumnNumber(ps->xml)); ps->stop = 1; return; - } else if (NODE_ROOT == ps->node && NODE_REFENTRY != node) { + } else if (NODE_ROOT == ps->node && NODE_REFENTRY != node && + NODE_PART != node && NODE_BOOK != 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 (NODE_INLINEEQUATION == node) + ps->flags |= PARSE_EQN; + if (NULL == (dat = calloc(1, sizeof(struct pnode)))) { perror(NULL); exit(EXIT_FAILURE); @@ -366,37 +396,18 @@ xml_elem_start(void *arg, const XML_Char *name, const 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; - } else if ( ! isattrkey(node, key)) { 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])) 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; @@ -501,7 +512,7 @@ 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) @@ -537,7 +548,7 @@ bufappend_r(struct parse *p, struct pnode *pn) bufappend_r(p, pp); } -/* +/* * Recursively search and return the first instance of "node". */ static struct pnode * @@ -576,27 +587,27 @@ pnode_printmacrolinetext(struct parse *p, struct pnode /* Convert all space to spaces. */ for (cp = p->b; '\0' != *cp; cp++) - if (isspace((int)*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++) { /* 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) || + isupper((unsigned char)*cp) && + '\0' != *(cp + 1) && + islower((unsigned char)*(cp + 1)) && + ('\0' == *(cp + 2) || ' ' == *(cp + 2) || - (islower((int)*(cp + 2)) && - ('\0' == *(cp + 3) || + (islower((unsigned char)*(cp + 2)) && + ('\0' == *(cp + 3) || ' ' == *(cp + 3))))) fputs("\\&", stdout); if (MACROLINE_UPPER & fl) - putchar(toupper((int)*cp)); + putchar(toupper((unsigned char)*cp)); else - putchar((int)*cp); + putchar(*cp); /* If we're a character escape, escape us. */ if ('\\' == *cp) putchar('e'); @@ -653,7 +664,7 @@ 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. */ @@ -663,22 +674,53 @@ pnode_printmclosepunct(struct parse *p, struct pnode * } 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((int)pn->b[1]))) { + (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 (NULL == pn->parent || NODE_LISTITEM == pn->parent->node) + return; + + pp = TAILQ_PREV(pn, pnodeq, child); + if (NULL == pp) + pp = pn->parent; + switch (pp->node) { + case (NODE_CHAPTER): + case (NODE_PREFACE): + case (NODE_REFSECT1): + case (NODE_REFSECT2): + case (NODE_REFSECT3): + case (NODE_REFSECTION): + case (NODE_SECT1): + case (NODE_SECT2): + case (NODE_SECTION): + if (2 > p->level) + return; + break; + default: + break; + } + puts(".Pp"); +} + /* * If the SYNOPSIS macro has a superfluous title, kill it. */ @@ -687,7 +729,7 @@ pnode_printrefsynopsisdiv(struct parse *p, struct pnod { struct pnode *pp; - TAILQ_FOREACH(pp, &pn->childq, child) + TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_TITLE == pp->node) { pnode_unlink(pp); return; @@ -701,53 +743,71 @@ static void pnode_printrefsect(struct parse *p, struct pnode *pn) { struct pnode *pp; + const char *title; + int flags, level; + level = ++p->level; + flags = 1 == level ? MACROLINE_UPPER : 0; + if (3 > level) { + 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) break; - switch (pn->node) { - case (NODE_REFSECT1): + if (NULL == pp) { + 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); + 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); } /* @@ -790,7 +850,6 @@ pnode_printrefmeta(struct parse *p, struct pnode *pn) else if (NODE_REFENTRYTITLE == pp->node) title = pp; - puts(".Dd $Mdocdate" "$"); fputs(".Dt", stdout); p->newln = 0; @@ -804,8 +863,6 @@ pnode_printrefmeta(struct parse *p, struct pnode *pn) p->newln = 1; } else pnode_printmacroline(p, manvol); - - puts(".Os"); } static void @@ -917,13 +974,13 @@ pnode_printmath(struct parse *p, struct pnode *pn) switch (pn->node) { case (NODE_MML_MSUP): - printf(" sup "); + fputs(" sup ", stdout); break; case (NODE_MML_MFRAC): - printf(" over "); + fputs(" over ", stdout); break; case (NODE_MML_MSUB): - printf(" sub "); + fputs(" sub ", stdout); break; default: break; @@ -940,7 +997,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode assert(p->newln); TAILQ_FOREACH(fdef, &pn->childq, child) - if (NODE_FUNCDEF == fdef->node) + if (NODE_FUNCDEF == fdef->node) break; if (NULL != fdef) @@ -948,7 +1005,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode else puts(".Fo UNKNOWN"); - TAILQ_FOREACH(pp, &pn->childq, child) + TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_PARAMDEF == pp->node) pnode_printparamdef(p, pp); @@ -956,7 +1013,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode 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,10 +1029,10 @@ pnode_printarg(struct parse *p, struct pnode *pn) isop = 1; isrep = 0; - TAILQ_FOREACH(ap, &pn->attrq, child) + TAILQ_FOREACH(ap, &pn->attrq, child) if (ATTRKEY_CHOICE == ap->key && (ATTRVAL_PLAIN == ap->val || - ATTRVAL_REQ == ap->val)) + ATTRVAL_REQ == ap->val)) isop = 0; else if (ATTRKEY_REP == ap->key && (ATTRVAL_REPEAT == ap->val)) @@ -990,9 +1047,9 @@ pnode_printarg(struct parse *p, struct pnode *pn) if (NODE_TEXT == pp->node) { pnode_printmopen(p); fputs("Ar", stdout); - } + } pnode_print(p, pp); - if (NODE_TEXT == pp->node && isrep) + if (NODE_TEXT == pp->node && isrep) fputs("...", stdout); } } @@ -1005,7 +1062,7 @@ pnode_printgroup(struct parse *p, struct pnode *pn) int isop, sv; isop = 1; - TAILQ_FOREACH(ap, &pn->attrq, child) + TAILQ_FOREACH(ap, &pn->attrq, child) if (ATTRKEY_CHOICE == ap->key && (ATTRVAL_PLAIN == ap->val || ATTRVAL_REQ == ap->val)) { @@ -1013,14 +1070,14 @@ pnode_printgroup(struct parse *p, struct pnode *pn) 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); @@ -1053,39 +1110,60 @@ static void pnode_printprologue(struct parse *p, struct pnode *pn) { struct pnode *pp; + struct pattr *ap; + const char *name; pp = NULL == p->root ? NULL : pnode_findfirst(p->root, NODE_REFMETA); + puts(".Dd $Mdocdate" "$"); if (NULL != pp) { pnode_printrefmeta(p, pp); pnode_unlink(pp); } else { - puts(".\\\" Supplying bogus prologue..."); - puts(".Dd $Mdocdate" "$"); - puts(".Dt UNKNOWN 1"); - puts(".Os"); + name = "UNKNOWN"; + TAILQ_FOREACH(ap, &p->root->attrq, child) { + if (ATTRKEY_ID == ap->key) { + name = ap->rawval; + break; + } + } + printf(".Dt %s 1\n", name); } + puts(".Os"); + + if (PARSE_EQN & p->flags) { + 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 ( ! 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; } @@ -1114,7 +1192,7 @@ pnode_printtable(struct parse *p, struct pnode *pn) assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_TITLE == pp->node) { - puts(".Pp"); + pnode_printpara(p, pp); pnode_print(p, pp); pnode_unlink(pp); } @@ -1138,7 +1216,7 @@ pnode_printlist(struct parse *p, struct pnode *pn) assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_TITLE == pp->node) { - puts(".Pp"); + pnode_printpara(p, pp); pnode_print(p, pp); pnode_unlink(pp); } @@ -1147,7 +1225,7 @@ pnode_printlist(struct parse *p, struct pnode *pn) if (NODE_ORDEREDLIST == pn->node) puts(".Bl -enum"); else - puts(".Bl -item"); + puts(".Bl -bullet"); TAILQ_FOREACH(pp, &pn->childq, child) { assert(p->newln); @@ -1167,7 +1245,7 @@ pnode_printvariablelist(struct parse *p, struct pnode assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_TITLE == pp->node) { - puts(".Pp"); + pnode_printpara(p, pp); pnode_print(p, pp); pnode_unlink(pp); } @@ -1205,6 +1283,7 @@ pnode_print(struct parse *p, struct pnode *pn) sv = p->newln; + /* XXX fprintf(stderr, "NODE %s\n", nodes[pn->node].name); */ switch (pn->node) { case (NODE_APPLICATION): pnode_printmopen(p); @@ -1217,6 +1296,18 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printarg(p, pn); pnode_unlinksub(pn); break; + 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); @@ -1235,6 +1326,11 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Dv", stdout); break; + case (NODE_EDITOR): + puts("editor: "); + pnode_printmopen(p); + fputs("An", stdout); + break; case (NODE_EMPHASIS): pnode_printmopen(p); fputs("Em", stdout); @@ -1260,6 +1356,16 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Fd", stdout); break; + 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); @@ -1269,16 +1375,14 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printgroup(p, pn); pnode_unlinksub(pn); break; + case (NODE_LEGALNOTICE): + assert(p->newln); + puts(".Sh LEGAL NOTICE"); + break; case (NODE_LITERAL): pnode_printmopen(p); fputs("Li", stdout); break; - case (NODE_MML_MATH): - if ( ! p->newln) - putchar('\n'); - puts(".EQ"); - p->newln = 0; - break; case (NODE_MML_MFENCED): pnode_printmathfenced(p, pn); pnode_unlinksub(pn); @@ -1287,7 +1391,9 @@ pnode_print(struct parse *p, struct pnode *pn) case (NODE_MML_MI): case (NODE_MML_MN): case (NODE_MML_MO): - putchar('{'); + if (TAILQ_EMPTY(&pn->childq)) + break; + fputs(" { ", stdout); break; case (NODE_MML_MFRAC): case (NODE_MML_MSUB): @@ -1305,11 +1411,7 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_unlinksub(pn); break; case (NODE_PARA): - assert(p->newln); - if (NULL != pn->parent && - NODE_LISTITEM == pn->parent->node) - break; - puts(".Pp"); + pnode_printpara(p, pn); break; case (NODE_PARAMETER): /* Suppress non-text children... */ @@ -1323,6 +1425,8 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Qo", stdout); break; + case (NODE_LITERALLAYOUT): + /* FALLTHROUGH */ case (NODE_PROGRAMLISTING): /* FALLTHROUGH */ case (NODE_SCREEN): @@ -1358,20 +1462,18 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printrefsynopsisdiv(p, pn); puts(".Sh SYNOPSIS"); break; + case (NODE_PREFACE): case (NODE_REFSECT1): - /* FALLTHROUGH */ case (NODE_REFSECT2): - /* FALLTHROUGH */ case (NODE_REFSECT3): - /* FALLTHROUGH */ case (NODE_REFSECTION): - /* FALLTHROUGH */ + case (NODE_CHAPTER): + case (NODE_SECT1): + case (NODE_SECT2): + case (NODE_SECTION): case (NODE_NOTE): - /* FALLTHROUGH */ case (NODE_TIP): - /* FALLTHROUGH */ case (NODE_CAUTION): - /* FALLTHROUGH */ case (NODE_WARNING): assert(p->newln); pnode_printrefsect(p, pn); @@ -1413,7 +1515,7 @@ pnode_print(struct parse *p, struct pnode *pn) /* * Output all characters, squeezing out whitespace - * between newlines. + * between newlines. * XXX: all whitespace, including tabs (?). * Remember to escape control characters and escapes. */ @@ -1432,8 +1534,8 @@ pnode_print(struct parse *p, struct pnode *pn) for (last = '\n'; '\0' != *cp; ) { if ('\n' == last) { /* 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) @@ -1446,6 +1548,12 @@ pnode_print(struct parse *p, struct pnode *pn) } p->newln = 0; break; + 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); @@ -1475,24 +1583,32 @@ 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_INLINEEQUATION): + fputs("$ ", stdout); + p->newln = sv; + break; case (NODE_MML_MROW): case (NODE_MML_MI): case (NODE_MML_MN): case (NODE_MML_MO): - putchar('}'); + 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): @@ -1524,13 +1640,30 @@ pnode_print(struct parse *p, struct pnode *pn) * macros in sequence, then print out a * trailing comma before the newline. */ - if (NULL != pn->parent && + if (NULL != pn->parent && NODE_REFNAMEDIV == pn->parent->node && NULL != TAILQ_NEXT(pn, child) && - NODE_REFNAME == TAILQ_NEXT(pn, child)->node) + NODE_REFNAME == TAILQ_NEXT(pn, child)->node) fputs(" ,", stdout); pnode_printmclose(p, sv); break; + case (NODE_PREFACE): + case (NODE_REFSECT1): + case (NODE_REFSECT2): + case (NODE_REFSECT3): + case (NODE_REFSECTION): + case (NODE_CHAPTER): + case (NODE_SECT1): + case (NODE_SECT2): + 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): @@ -1538,6 +1671,12 @@ pnode_print(struct parse *p, struct pnode *pn) 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 +1687,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; @@ -1569,12 +1708,12 @@ readfile(XML_Parser xp, int fd, if (0 == (rc = XML_Parse(xp, b, ssz, 0 == ssz))) 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. */ @@ -1625,13 +1764,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 = 0 == strcmp(fname, "-") ? STDIN_FILENO : open(fname, O_RDONLY, 0); /* @@ -1656,6 +1796,6 @@ main(int argc, char *argv[]) return(rc ? EXIT_SUCCESS : EXIT_FAILURE); usage: - fprintf(stderr, "usage: %s [-W]\n", progname); + fprintf(stderr, "usage: %s [-W] [input_filename]\n", progname); return(EXIT_FAILURE); }