=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.142 retrieving revision 1.148 diff -u -p -r1.142 -r1.148 --- docbook2mdoc/docbook2mdoc.c 2019/04/28 19:05:11 1.142 +++ docbook2mdoc/docbook2mdoc.c 2019/05/02 04:15:40 1.148 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.142 2019/04/28 19:05:11 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.148 2019/05/02 04:15:40 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -31,7 +31,6 @@ */ static void pnode_print(struct format *, struct pnode *); -static void pnode_printrefentry(struct format *, struct pnode *); static void @@ -41,6 +40,7 @@ pnode_printtext(struct format *f, struct pnode *n) char *cp; int accept_arg; + para_check(f); cp = n->b; accept_arg = f->flags & FMT_ARG; if (f->linestate == LINE_MACRO && !accept_arg && @@ -55,15 +55,18 @@ pnode_printtext(struct format *f, struct pnode *n) if (isspace((unsigned char)*cp)) { while (isspace((unsigned char)*cp)) cp++; - macro_close(f); + n->flags |= NFLAG_SPC; } else { - fputs(" Ns", stdout); - f->flags &= FMT_IMPL; + f->flags &= ~FMT_NOSPC; + f->flags |= FMT_CHILD; + macro_open(f, "Ns"); + f->flags &= ~FMT_ARG; + f->flags |= FMT_CHILD; accept_arg = 1; } } - if (f->linestate == LINE_MACRO && !accept_arg && - (f->flags & (FMT_CHILD | FMT_IMPL)) == 0) + if (f->linestate == LINE_MACRO && f->nofill == 0 && + !accept_arg && (f->flags & FMT_IMPL) == 0) macro_close(f); /* @@ -72,7 +75,7 @@ pnode_printtext(struct format *f, struct pnode *n) * Set the spacing flag to avoid a redundant .Ns macro. */ - if (f->linestate != LINE_MACRO && + if ((f->nofill || f->linestate != LINE_MACRO) && (nn = TAILQ_NEXT(n, child)) != NULL && (nn->flags & NFLAG_SPC) == 0) { switch (pnode_class(nn->node)) { @@ -101,9 +104,16 @@ pnode_printtext(struct format *f, struct pnode *n) } break; case LINE_MACRO: - if (accept_arg == 0) - macro_close(f); - else if (n->flags & NFLAG_SPC || + if (accept_arg == 0) { + if (f->nofill) { + f->flags &= ~FMT_NOSPC; + f->flags |= FMT_CHILD; + macro_open(f, "No "); + f->flags &= ~FMT_ARG; + f->flags |= FMT_CHILD; + } else + macro_close(f); + } else if (n->flags & NFLAG_SPC || (f->flags & FMT_ARG) == 0 || (nn = TAILQ_PREV(n, pnodeq, child)) == NULL || pnode_class(nn->node) != CLASS_TEXT) @@ -196,10 +206,8 @@ pnode_printsection(struct format *f, struct pnode *n) struct pnode *nc, *ncc; int flags, level; - if (n->parent == NULL) { - pnode_printrefentry(f, n); + if (n->parent == NULL) return; - } level = ++f->level; flags = ARG_SPACE; @@ -348,7 +356,7 @@ pnode_printmath(struct format *f, struct pnode *n) static void pnode_printfuncprototype(struct format *f, struct pnode *n) { - struct pnode *fdef, *ftype, *nc, *nn; + struct pnode *fdef, *fps, *ftype, *nc, *nn; /* * Extract child and ignore child. @@ -402,7 +410,16 @@ pnode_printfuncprototype(struct format *f, struct pnod return; while (nc != NULL) { - macro_nodeline(f, "Fa", nc, ARG_SINGLE); + if ((fps = pnode_takefirst(nc, NODE_FUNCPARAMS)) != NULL) { + macro_open(f, "Fa \""); + macro_addnode(f, nc, ARG_QUOTED); + macro_addarg(f, "(", ARG_QUOTED); + macro_addnode(f, fps, ARG_QUOTED); + macro_addarg(f, ")", ARG_QUOTED); + putchar('"'); + macro_close(f); + } else + macro_nodeline(f, "Fa", nc, ARG_SINGLE); pnode_unlink(nc); nc = TAILQ_FIRST(&n->childq); } @@ -726,123 +743,6 @@ pnode_printprologue(struct format *f, struct pnode *ro f->parastate = PARA_HAVE; } -static void -pnode_printrefentry(struct format *f, struct pnode *n) -{ - struct pnode *info, *meta, *nc, *title; - struct pnode *match, *later; - - /* Collect nodes that remained behind when writing the prologue. */ - - meta = NULL; - info = pnode_takefirst(n, NODE_BOOKINFO); - if (info != NULL && TAILQ_FIRST(&info->childq) == NULL) { - pnode_unlink(info); - info = NULL; - } - if (info == NULL) { - info = pnode_takefirst(n, NODE_REFENTRYINFO); - if (info != NULL && TAILQ_FIRST(&info->childq) == NULL) { - pnode_unlink(info); - info = NULL; - } - if (info == NULL) - info = pnode_takefirst(n, NODE_INFO); - meta = pnode_takefirst(n, NODE_REFMETA); - if (meta != NULL && TAILQ_FIRST(&meta->childq) == NULL) { - pnode_unlink(meta); - meta = NULL; - } - } - if (info == NULL && meta == NULL) - return; - - /* - * Find the best place to put this information. - * Use the last existing AUTHORS node, if any. - * Otherwise, put it behind all standard sections that - * conventionally precede AUTHORS, and also behind any - * non-standard sections that follow the last of these, - * but before the next standard section. - */ - - match = later = NULL; - TAILQ_FOREACH(nc, &n->childq, child) { - switch (nc->node) { - case NODE_REFENTRY: - case NODE_REFNAMEDIV: - case NODE_REFSYNOPSISDIV: - later = NULL; - continue; - case NODE_APPENDIX: - case NODE_INDEX: - if (later == NULL) - later = nc; - continue; - default: - break; - } - if ((title = pnode_findfirst(nc, NODE_TITLE)) == NULL || - (title = TAILQ_FIRST(&title->childq)) == NULL || - title->node != NODE_TEXT) - continue; - if (strcasecmp(title->b, "AUTHORS") == 0 || - strcasecmp(title->b, "AUTHOR") == 0) - match = nc; - else if (strcasecmp(title->b, "NAME") == 0 || - strcasecmp(title->b, "SYNOPSIS") == 0 || - strcasecmp(title->b, "DESCRIPTION") == 0 || - strcasecmp(title->b, "RETURN VALUES") == 0 || - strcasecmp(title->b, "ENVIRONMENT") == 0 || - strcasecmp(title->b, "FILES") == 0 || - strcasecmp(title->b, "EXIT STATUS") == 0 || - strcasecmp(title->b, "EXAMPLES") == 0 || - strcasecmp(title->b, "DIAGNOSTICS") == 0 || - strcasecmp(title->b, "ERRORS") == 0 || - strcasecmp(title->b, "SEE ALSO") == 0 || - strcasecmp(title->b, "STANDARDS") == 0 || - strcasecmp(title->b, "HISTORY") == 0) - later = NULL; - else if ((strcasecmp(title->b, "CAVEATS") == 0 || - strcasecmp(title->b, "BUGS") == 0) && - later == NULL) - later = nc; - } - - /* - * If no AUTHORS section was found, create one from scratch, - * and insert that at the place selected earlier. - */ - - if (match == NULL) { - match = xcalloc(1, sizeof(*match)); - match->node = NODE_SECTION; - match->flags |= NFLAG_SPC; - match->parent = n; - TAILQ_INIT(&match->childq); - TAILQ_INIT(&match->attrq); - nc = pnode_alloc(match); - nc->node = NODE_TITLE; - nc->flags |= NFLAG_SPC; - nc = pnode_alloc_text(nc, "AUTHORS"); - nc->flags |= NFLAG_SPC; - if (later == NULL) - TAILQ_INSERT_TAIL(&n->childq, match, child); - else - TAILQ_INSERT_BEFORE(later, match, child); - } - - /* - * Dump the stuff excised at the beginning - * into this AUTHORS section. - */ - - if (info != NULL) - TAILQ_INSERT_TAIL(&match->childq, info, child); - if (meta != NULL) - TAILQ_INSERT_TAIL(&match->childq, meta, child); -} - /* * We can have multiple elements within a , which * we should comma-separate as list headers. @@ -1041,6 +941,10 @@ pnode_print(struct format *f, struct pnode *n) if (n == NULL) return; + if (n->flags & NFLAG_LINE && + (f->nofill || (f->flags & (FMT_ARG | FMT_IMPL)) == 0)) + macro_close(f); + was_impl = f->flags & FMT_IMPL; if (n->flags & NFLAG_SPC) f->flags &= ~FMT_NOSPC; @@ -1226,9 +1130,6 @@ pnode_print(struct format *f, struct pnode *n) case NODE_SYSTEMITEM: pnode_printsystemitem(f, n); break; - case NODE_REFENTRY: - pnode_printrefentry(f, n); - break; case NODE_REFNAME: /* More often, these appear inside NODE_REFNAMEDIV. */ macro_open(f, "Nm"); @@ -1307,6 +1208,9 @@ pnode_print(struct format *f, struct pnode *n) break; } + if (pnode_class(n->node) == CLASS_NOFILL) + f->nofill++; + TAILQ_FOREACH(nc, &n->childq, child) pnode_print(f, nc); @@ -1391,7 +1295,8 @@ pnode_print(struct format *f, struct pnode *n) case NODE_SIMPLESECT: case NODE_APPENDIX: case NODE_NOTE: - f->level--; + if (n->parent != NULL) + f->level--; break; case NODE_BLOCKQUOTE: case NODE_LITERALLAYOUT: @@ -1406,10 +1311,21 @@ pnode_print(struct format *f, struct pnode *n) case NODE_SUBTITLE: f->parastate = PARA_WANT; break; + case NODE_YEAR: + if ((nn = TAILQ_NEXT(n, child)) != NULL && + nn->node == NODE_YEAR && + f->linestate == LINE_TEXT) { + print_text(f, ",", 0); + nn->flags |= NFLAG_SPC; + if ((nc = TAILQ_FIRST(&nn->childq)) != NULL) + nc->flags |= NFLAG_SPC; + } default: break; } f->flags &= ~FMT_ARG; + if (pnode_class(n->node) == CLASS_NOFILL) + f->nofill--; } void @@ -1417,7 +1333,7 @@ ptree_print_mdoc(struct ptree *tree) { struct format formatter; - formatter.level = 0; + formatter.level = formatter.nofill = 0; formatter.linestate = LINE_NEW; formatter.parastate = PARA_HAVE; pnode_printprologue(&formatter, tree->root);