=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.46 retrieving revision 1.52 diff -u -p -r1.46 -r1.52 --- docbook2mdoc/docbook2mdoc.c 2019/03/08 15:09:54 1.46 +++ docbook2mdoc/docbook2mdoc.c 2019/03/22 16:21:23 1.52 @@ -1,6 +1,7 @@ -/* $Id: docbook2mdoc.c,v 1.46 2019/03/08 15:09:54 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.52 2019/03/22 16:21:23 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 @@ -41,9 +42,10 @@ struct parse { 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 */ }; @@ -93,11 +95,19 @@ static const char *attrvals[ATTRVAL__MAX] = { static const struct node nodes[NODE__MAX] = { { 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 }, @@ -105,27 +115,38 @@ static const struct node nodes[NODE__MAX] = { { "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 }, + { "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 }, + { "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 }, @@ -139,9 +160,15 @@ static const struct node nodes[NODE__MAX] = { { "note", NODE_IGNTEXT }, { "option", 0 }, { "orderedlist", NODE_IGNTEXT }, + { "orgname", 0 }, + { "othername", 0 }, { "para", 0 }, { "paramdef", 0 }, { "parameter", 0 }, + { "part", NODE_IGNTEXT }, + { "phrase", 0 }, + { "preface", NODE_IGNTEXT }, + { "primary", 0 }, { "programlisting", 0 }, { "prompt", 0 }, { "quote", 0 }, @@ -161,12 +188,21 @@ static const struct node nodes[NODE__MAX] = { { "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 }, @@ -327,19 +363,9 @@ 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) @@ -378,29 +404,10 @@ xml_elem_start(void *arg, const XML_Char *name, const 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, - 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; - 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; @@ -505,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) @@ -705,53 +712,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): + default: puts(".Pp"); 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); } /* @@ -794,7 +819,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; @@ -808,8 +832,6 @@ pnode_printrefmeta(struct parse *p, struct pnode *pn) p->newln = 1; } else pnode_printmacroline(p, manvol); - - puts(".Os"); } static void @@ -1057,19 +1079,27 @@ 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"); @@ -1222,6 +1252,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); @@ -1234,6 +1265,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); @@ -1252,6 +1295,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); @@ -1296,6 +1344,10 @@ 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); @@ -1346,6 +1398,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): @@ -1381,20 +1435,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); @@ -1469,6 +1521,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); @@ -1518,10 +1576,12 @@ pnode_print(struct parse *p, struct pnode *pn) 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): @@ -1560,12 +1620,35 @@ pnode_print(struct parse *p, struct pnode *pn) 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): 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;