=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- docbook2mdoc/docbook2mdoc.c 2014/04/02 10:27:29 1.28 +++ docbook2mdoc/docbook2mdoc.c 2014/04/02 10:59:07 1.29 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.28 2014/04/02 10:27:29 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.29 2014/04/02 10:59:07 kristaps Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -90,6 +90,7 @@ static const struct node nodes[NODE__MAX] = { { "acronym", 0 }, { "application", 0 }, { "arg", 0 }, + { "caution", NODE_IGNTEXT }, { "citerefentry", NODE_IGNTEXT }, { "cmdsynopsis", NODE_IGNTEXT }, { "code", 0 }, @@ -110,6 +111,7 @@ static const struct node nodes[NODE__MAX] = { { "listitem", NODE_IGNTEXT }, { "literal", 0 }, { "manvolnum", 0 }, + { "note", NODE_IGNTEXT }, { "option", 0 }, { "orderedlist", NODE_IGNTEXT }, { "para", 0 }, @@ -130,6 +132,8 @@ static const struct node nodes[NODE__MAX] = { { "refpurpose", 0 }, { "refsect1", NODE_IGNTEXT }, { "refsect2", NODE_IGNTEXT }, + { "refsect3", NODE_IGNTEXT }, + { "refsection", NODE_IGNTEXT }, { "refsynopsisdiv", NODE_IGNTEXT }, { "replaceable", 0 }, { "row", NODE_IGNTEXT }, @@ -144,12 +148,14 @@ static const struct node nodes[NODE__MAX] = { { "tfoot", NODE_IGNTEXT }, { "tgroup", NODE_IGNTEXT }, { "thead", NODE_IGNTEXT }, + { "tip", NODE_IGNTEXT }, { "title", 0 }, { "ulink", 0 }, { "userinput", 0 }, { "variablelist", NODE_IGNTEXT }, { "varlistentry", NODE_IGNTEXT }, { "varname", 0 }, + { "warning", NODE_IGNTEXT }, }; static void @@ -621,10 +627,34 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) if (NODE_TITLE == pp->node) break; - if (NODE_REFSECT1 == pn->node) + switch (pn->node) { + case (NODE_REFSECT1): fputs(".Sh", stdout); - else + break; + case (NODE_REFSECT2): fputs(".Ss", stdout); + break; + case (NODE_REFSECT3): + 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; @@ -635,7 +665,8 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) pnode_printmclose(p, 1); pnode_unlink(pp); } else { - puts("UNKNOWN"); + puts(NODE_REFSECT1 == pn->node ? + "UNKNOWN" : "unknown"); p->newln = 1; } } @@ -1155,6 +1186,18 @@ pnode_print(struct parse *p, struct pnode *pn) 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): assert(p->newln); pnode_printrefsect(p, pn); break;