=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- docbook2mdoc/docbook2mdoc.c 2019/03/22 17:28:59 1.61 +++ docbook2mdoc/docbook2mdoc.c 2019/03/22 17:42:53 1.62 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.61 2019/03/22 17:28:59 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.62 2019/03/22 17:42:53 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -771,10 +771,10 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) flags = 1 == level ? MACROLINE_UPPER : 0; if (3 > level) { switch (pn->node) { - case (NODE_CAUTION): - case (NODE_NOTE): - case (NODE_TIP): - case (NODE_WARNING): + case NODE_CAUTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_WARNING: level = 3; break; default: @@ -788,19 +788,19 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) if (NULL == pp) { switch (pn->node) { - case (NODE_PREFACE): + case NODE_PREFACE: title = "Preface"; break; - case (NODE_CAUTION): + case NODE_CAUTION: title = "Caution"; break; - case (NODE_NOTE): + case NODE_NOTE: title = "Note"; break; - case (NODE_TIP): + case NODE_TIP: title = "Tip"; break; - case (NODE_WARNING): + case NODE_WARNING: title = "Warning"; break; default: @@ -810,10 +810,10 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) } switch (level) { - case (1): + case 1: fputs(".Sh", stdout); break; - case (2): + case 2: fputs(".Ss", stdout); break; default: @@ -981,13 +981,13 @@ pnode_printmath(struct parse *p, struct pnode *pn) pnode_print(p, pp); switch (pn->node) { - case (NODE_MML_MSUP): + case NODE_MML_MSUP: fputs(" sup ", stdout); break; - case (NODE_MML_MFRAC): + case NODE_MML_MFRAC: fputs(" over ", stdout); break; - case (NODE_MML_MSUB): + case NODE_MML_MSUB: fputs(" sub ", stdout); break; default: @@ -1283,106 +1283,105 @@ 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): + 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_AUTHOR): + case NODE_AUTHOR: pnode_printmopen(p); fputs("An", stdout); break; - case (NODE_AUTHORGROUP): + case NODE_AUTHORGROUP: assert(p->newln); puts(".An -split"); break; - case (NODE_BOOKINFO): + case NODE_BOOKINFO: assert(p->newln); puts(".Sh NAME"); break; - case (NODE_CITEREFENTRY): + 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_EDITOR): + case NODE_EDITOR: puts("editor: "); pnode_printmopen(p); fputs("An", stdout); break; - case (NODE_EMPHASIS): - case (NODE_FIRSTTERM): + 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_INDEXTERM): + case NODE_INDEXTERM: return; - case (NODE_INFORMALEQUATION): + case NODE_INFORMALEQUATION: if ( ! p->newln) putchar('\n'); puts(".EQ"); p->newln = 0; break; - case (NODE_INLINEEQUATION): + case NODE_INLINEEQUATION: fputc('$', stdout); p->newln = 0; break; - case (NODE_ITEMIZEDLIST): + 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_LEGALNOTICE): + case NODE_LEGALNOTICE: assert(p->newln); puts(".Sh LEGAL NOTICE"); break; - case (NODE_LINK): + case NODE_LINK: ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL); if (NULL == ccp) break; @@ -1390,45 +1389,45 @@ pnode_print(struct parse *p, struct pnode *pn) printf("Sx %s\n", ccp); p->newln = 1; return; - case (NODE_LITERAL): + case NODE_LITERAL: pnode_printmopen(p); fputs("Li", stdout); break; - case (NODE_LITERALLAYOUT): + 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): + 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): + case NODE_PARA: pnode_printpara(p, pn); break; - case (NODE_PARAMETER): + case NODE_PARAMETER: /* Suppress non-text children... */ pnode_printmopen(p); fputs("Fa \"", stdout); @@ -1436,25 +1435,25 @@ 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): - case (NODE_SCREEN): + case NODE_PROGRAMLISTING: + case NODE_SCREEN: assert(p->newln); printf(".Bd %s\n", ATTRVAL_MONOSPACED == pnode_getattr(pn, ATTRKEY_CLASS) ? "-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); @@ -1462,53 +1461,52 @@ 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_PREFACE): - case (NODE_SECTION): - case (NODE_NOTE): - case (NODE_TIP): - case (NODE_CAUTION): - case (NODE_WARNING): + case NODE_PREFACE: + case NODE_SECTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_CAUTION: + case NODE_WARNING: 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): + case NODE_TEXT: if (0 == p->newln) putchar(' '); @@ -1555,30 +1553,30 @@ pnode_print(struct parse *p, struct pnode *pn) } p->newln = 0; break; - case (NODE_TITLE): + case NODE_TITLE: if (pn->parent->node == NODE_BOOKINFO) { pnode_printmopen(p); fputs("Nd", stdout); } break; - case (NODE_TYPE): + 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; @@ -1590,59 +1588,59 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_print(p, pp); switch (pn->node) { - case (NODE_INFORMALEQUATION): + case NODE_INFORMALEQUATION: if ( ! p->newln) putchar('\n'); puts(".EN"); p->newln = 1; break; - case (NODE_INLINEEQUATION): + 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): + 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): + 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 @@ -1655,24 +1653,22 @@ pnode_print(struct parse *p, struct pnode *pn) fputs(" ,", stdout); pnode_printmclose(p, sv); break; - case (NODE_PREFACE): - case (NODE_SECTION): - case (NODE_NOTE): - case (NODE_TIP): - case (NODE_CAUTION): - case (NODE_WARNING): + case NODE_PREFACE: + case NODE_SECTION: + case NODE_NOTE: + case NODE_TIP: + case NODE_CAUTION: + case NODE_WARNING: p->level--; break; - case (NODE_LITERALLAYOUT): - /* FALLTHROUGH */ - case (NODE_PROGRAMLISTING): - /* FALLTHROUGH */ - case (NODE_SCREEN): + case NODE_LITERALLAYOUT: + case NODE_PROGRAMLISTING: + case NODE_SCREEN: assert(p->newln); puts(".Ed"); p->newln = 1; break; - case (NODE_TITLE): + case NODE_TITLE: if (pn->parent->node == NODE_BOOKINFO) { pnode_printmclose(p, 1); puts(".Sh AUTHORS"); @@ -1755,7 +1751,7 @@ main(int argc, char *argv[]) while (-1 != (ch = getopt(argc, argv, "W"))) switch (ch) { - case ('W'): + case 'W': warn = 1; break; default: