=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.112 retrieving revision 1.114 diff -u -p -r1.112 -r1.114 --- docbook2mdoc/docbook2mdoc.c 2019/04/12 12:07:26 1.112 +++ docbook2mdoc/docbook2mdoc.c 2019/04/12 19:14:50 1.114 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.112 2019/04/12 12:07:26 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.114 2019/04/12 19:14:50 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -70,12 +70,18 @@ pnode_printtext(struct format *f, struct pnode *n) */ if (f->linestate != LINE_MACRO && - (nn = TAILQ_NEXT(n, child)) != NULL && nn->spc == 0 && - (nn->node != NODE_TEXT && nn->node != NODE_ESCAPE)) { - macro_open(f, "Pf"); - accept_arg = 1; - f->flags |= FMT_CHILD; - nn->spc = 1; + (nn = TAILQ_NEXT(n, child)) != NULL && nn->spc == 0) { + switch (pnode_class(nn->node)) { + case CLASS_LINE: + case CLASS_ENCL: + macro_open(f, "Pf"); + accept_arg = 1; + f->flags |= FMT_CHILD; + nn->spc = 1; + break; + default: + break; + } } switch (f->linestate) { @@ -1127,7 +1133,7 @@ pnode_print(struct format *f, struct pnode *n) } void -ptree_print(struct ptree *tree) +ptree_print_mdoc(struct ptree *tree) { struct format formatter;