=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.25 retrieving revision 1.28 diff -u -p -r1.25 -r1.28 --- docbook2mdoc/docbook2mdoc.c 2014/04/02 07:48:34 1.25 +++ docbook2mdoc/docbook2mdoc.c 2014/04/02 10:27:29 1.28 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.25 2014/04/02 07:48:34 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.28 2014/04/02 10:27:29 kristaps Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -88,6 +88,7 @@ static const char *attrvals[ATTRVAL__MAX] = { static const struct node nodes[NODE__MAX] = { { NULL, 0 }, { "acronym", 0 }, + { "application", 0 }, { "arg", 0 }, { "citerefentry", NODE_IGNTEXT }, { "cmdsynopsis", NODE_IGNTEXT }, @@ -116,6 +117,7 @@ static const struct node nodes[NODE__MAX] = { { "parameter", 0 }, { "programlisting", 0 }, { "prompt", 0 }, + { "quote", 0 }, { "refclass", NODE_IGNTEXT }, { "refdescriptor", NODE_IGNTEXT }, { "refentry", NODE_IGNTEXT }, @@ -147,6 +149,7 @@ static const struct node nodes[NODE__MAX] = { { "userinput", 0 }, { "variablelist", NODE_IGNTEXT }, { "varlistentry", NODE_IGNTEXT }, + { "varname", 0 }, }; static void @@ -1027,6 +1030,10 @@ pnode_print(struct parse *p, struct pnode *pn) sv = p->newln; switch (pn->node) { + case (NODE_APPLICATION): + pnode_printmopen(p); + fputs("Nm", stdout); + break; case (NODE_ARG): pnode_printarg(p, pn); pnode_unlinksub(pn); @@ -1106,6 +1113,10 @@ pnode_print(struct parse *p, struct pnode *pn) puts("\""); pnode_unlinksub(pn); break; + case (NODE_QUOTE): + pnode_printmopen(p); + fputs("Qo", stdout); + break; case (NODE_PROGRAMLISTING): /* FALLTHROUGH */ case (NODE_SCREEN): @@ -1203,6 +1214,10 @@ pnode_print(struct parse *p, struct pnode *pn) } p->newln = 0; break; + case (NODE_USERINPUT): + pnode_printmopen(p); + fputs("Li", stdout); + break; case (NODE_VARIABLELIST): assert(p->newln); pnode_printvariablelist(p, pn); @@ -1212,9 +1227,9 @@ pnode_print(struct parse *p, struct pnode *pn) assert(p->newln); pnode_printvarlistentry(p, pn); break; - case (NODE_USERINPUT): + case (NODE_VARNAME): pnode_printmopen(p); - fputs("Li", stdout); + fputs("Va", stdout); break; default: break; @@ -1224,6 +1239,7 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_print(p, pp); switch (pn->node) { + case (NODE_APPLICATION): case (NODE_ARG): case (NODE_CODE): case (NODE_COMMAND): @@ -1240,6 +1256,14 @@ pnode_print(struct parse *p, struct pnode *pn) case (NODE_STRUCTNAME): case (NODE_TEXT): case (NODE_USERINPUT): + case (NODE_VARNAME): + pnode_printmclose(p, sv); + break; + case (NODE_QUOTE): + pnode_printmclose(p, sv); + sv = p->newln; + pnode_printmopen(p); + fputs("Qc", stdout); pnode_printmclose(p, sv); break; case (NODE_REFNAME):