=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.96 retrieving revision 1.98 diff -u -p -r1.96 -r1.98 --- docbook2mdoc/docbook2mdoc.c 2019/04/07 17:00:56 1.96 +++ docbook2mdoc/docbook2mdoc.c 2019/04/07 17:55:18 1.98 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.96 2019/04/07 17:00:56 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.98 2019/04/07 17:55:18 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -103,10 +103,12 @@ pnode_printpara(struct format *p, struct pnode *pn) { struct pnode *pp; - if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL && - (pp = pn->parent) == NULL) + if (pn->parent == NULL) return; + if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL) + pp = pn->parent; + switch (pp->node) { case NODE_ENTRY: case NODE_LISTITEM: @@ -762,6 +764,9 @@ pnode_print(struct format *p, struct pnode *pn) case NODE_AUTHORGROUP: macro_line(p, "An -split"); break; + case NODE_BLOCKQUOTE: + macro_line(p, "Bd -ragged -offset indent"); + break; case NODE_BOOKINFO: macro_line(p, "Sh NAME"); break; @@ -920,7 +925,8 @@ pnode_print(struct format *p, struct pnode *pn) pnode_printtgroup(p, pn); break; case NODE_TITLE: - if (pn->parent->node == NODE_BOOKINFO) { + if (pn->parent != NULL && + pn->parent->node == NODE_BOOKINFO) { macro_open(p, "Nd"); break; } @@ -1038,6 +1044,7 @@ pnode_print(struct format *p, struct pnode *pn) case NODE_WARNING: p->level--; break; + case NODE_BLOCKQUOTE: case NODE_LITERALLAYOUT: case NODE_PROGRAMLISTING: case NODE_SCREEN: @@ -1045,7 +1052,8 @@ pnode_print(struct format *p, struct pnode *pn) macro_line(p, "Ed"); break; case NODE_TITLE: - if (pn->parent->node == NODE_BOOKINFO) + if (pn->parent != NULL && + pn->parent->node == NODE_BOOKINFO) macro_line(p, "Sh AUTHORS"); break; default: