=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.13 retrieving revision 1.16 diff -u -p -r1.13 -r1.16 --- docbook2mdoc/docbook2mdoc.c 2014/03/30 11:48:10 1.13 +++ docbook2mdoc/docbook2mdoc.c 2014/03/30 16:25:26 1.16 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.13 2014/03/30 11:48:10 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.16 2014/03/30 16:25:26 kristaps Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -92,12 +92,15 @@ static const struct node nodes[NODE__MAX] = { { "cmdsynopsis", NODE_IGNTEXT }, { "code", 0 }, { "command", 0 }, + { "date", 0 }, { "emphasis", 0 }, { "funcdef", 0 }, { "funcprototype", NODE_IGNTEXT }, { "funcsynopsis", NODE_IGNTEXT }, { "funcsynopsisinfo", 0 }, { "function", 0 }, + { "itemizedlist", NODE_IGNTEXT }, + { "link", 0 }, { "listitem", NODE_IGNTEXT }, { "manvolnum", 0 }, { "option", 0 }, @@ -108,6 +111,7 @@ static const struct node nodes[NODE__MAX] = { { "refclass", NODE_IGNTEXT }, { "refdescriptor", NODE_IGNTEXT }, { "refentry", NODE_IGNTEXT }, + { "refentryinfo", NODE_IGNTEXT }, { "refentrytitle", 0 }, { "refmeta", NODE_IGNTEXT }, { "refmiscinfo", NODE_IGNTEXT }, @@ -122,6 +126,7 @@ static const struct node nodes[NODE__MAX] = { { "term", 0 }, { NULL, 0 }, { "title", 0 }, + { "ulink", 0 }, { "variablelist", NODE_IGNTEXT }, { "varlistentry", NODE_IGNTEXT }, }; @@ -820,8 +825,7 @@ pnode_printvarlistentry(struct parse *p, struct pnode p->newln = 0; pnode_print(p, pp); pnode_unlink(pp); - putchar('\n'); - p->newln = 1; + pnode_printmclose(p, 1); return; } @@ -830,6 +834,31 @@ pnode_printvarlistentry(struct parse *p, struct pnode } static void +pnode_printitemizedlist(struct parse *p, struct pnode *pn) +{ + struct pnode *pp; + + assert(p->newln); + TAILQ_FOREACH(pp, &pn->childq, child) + if (NODE_TITLE == pp->node) { + puts(".Pp"); + pnode_print(p, pp); + pnode_unlink(pp); + } + + assert(p->newln); + puts(".Bl -item"); + TAILQ_FOREACH(pp, &pn->childq, child) { + assert(p->newln); + puts(".It"); + pnode_print(p, pp); + pnode_printmclose(p, 1); + } + assert(p->newln); + puts(".El"); +} + +static void pnode_printvariablelist(struct parse *p, struct pnode *pn) { struct pnode *pp; @@ -909,6 +938,10 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_printmopen(p); fputs("Fd", stdout); break; + case (NODE_ITEMIZEDLIST): + assert(p->newln); + pnode_printitemizedlist(p, pn); + break; case (NODE_OPTION): pnode_printmopen(p); fputs("Fl", stdout); @@ -932,6 +965,10 @@ pnode_print(struct parse *p, struct pnode *pn) case (NODE_PROGRAMLISTING): assert(p->newln); puts(".Bd -literal"); + break; + case (NODE_REFENTRYINFO): + /* Suppress. */ + pnode_unlinksub(pn); break; case (NODE_REFMETA): abort();