=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- docbook2mdoc/docbook2mdoc.c 2014/04/30 09:26:10 1.33 +++ docbook2mdoc/docbook2mdoc.c 2014/04/30 09:37:26 1.34 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.33 2014/04/30 09:26:10 kristaps Exp $ */ +/* $Id: docbook2mdoc.c,v 1.34 2014/04/30 09:37:26 kristaps Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -693,16 +693,12 @@ pnode_printciterefentry(struct parse *p, struct pnode struct pnode *pp, *title, *manvol; title = manvol = NULL; - assert(p->newln); TAILQ_FOREACH(pp, &pn->childq, child) if (NODE_MANVOLNUM == pp->node) manvol = pp; else if (NODE_REFENTRYTITLE == pp->node) title = pp; - fputs(".Xr", stdout); - p->newln = 0; - if (NULL != title) { pnode_printmacrolinepart(p, title); } else @@ -712,7 +708,7 @@ pnode_printciterefentry(struct parse *p, struct pnode puts(" 1"); p->newln = 1; } else - pnode_printmacroline(p, manvol); + pnode_printmacrolinepart(p, manvol); } static void @@ -1087,7 +1083,8 @@ pnode_print(struct parse *p, struct pnode *pn) pnode_unlinksub(pn); break; case (NODE_CITEREFENTRY): - assert(p->newln); + pnode_printmopen(p); + fputs("Xr", stdout); pnode_printciterefentry(p, pn); pnode_unlinksub(pn); break; @@ -1309,6 +1306,7 @@ pnode_print(struct parse *p, struct pnode *pn) switch (pn->node) { case (NODE_APPLICATION): case (NODE_ARG): + case (NODE_CITEREFENTRY): case (NODE_CODE): case (NODE_COMMAND): case (NODE_CONSTANT):