=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.109 retrieving revision 1.116 diff -u -p -r1.109 -r1.116 --- docbook2mdoc/docbook2mdoc.c 2019/04/12 10:34:48 1.109 +++ docbook2mdoc/docbook2mdoc.c 2019/04/13 13:06:35 1.116 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.109 2019/04/12 10:34:48 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.116 2019/04/13 13:06:35 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) { @@ -150,6 +156,27 @@ pnode_printpara(struct format *f, struct pnode *n) macro_line(f, "Pp"); } +static void +pnode_printrefnamediv(struct format *f, struct pnode *n) +{ + struct pnode *nc, *nn; + int comma; + + macro_line(f, "Sh NAME"); + comma = 0; + TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { + if (nc->node != NODE_REFNAME) + continue; + if (comma) + macro_addarg(f, ",", ARG_SPACE); + macro_open(f, "Nm"); + macro_addnode(f, nc, ARG_SPACE); + pnode_unlink(nc); + comma = 1; + } + macro_close(f); +} + /* * If the SYNOPSIS macro has a superfluous title, kill it. */ @@ -171,7 +198,7 @@ pnode_printrefsynopsisdiv(struct format *f, struct pno static void pnode_printrefsect(struct format *f, struct pnode *n) { - struct pnode *nc; + struct pnode *nc, *ncc; const char *title; int flags, level; @@ -243,12 +270,24 @@ pnode_printrefsect(struct format *f, struct pnode *n) break; } - if (nc != NULL) { + if (nc != NULL) macro_addnode(f, nc, flags); - pnode_unlink(nc); - } else + else macro_addarg(f, title, flags | ARG_QUOTED); macro_close(f); + + /* + * DocBook has no equivalent for -split mode, + * so just switch the default in the AUTHORS section. + */ + + if (nc != NULL) { + ncc = TAILQ_FIRST(&nc->childq); + if (ncc != NULL && ncc->node == NODE_TEXT && + strcasecmp(ncc->b, "AUTHORS") == 0) + macro_line(f, "An -nosplit"); + pnode_unlink(nc); + } } /* @@ -279,32 +318,6 @@ pnode_printciterefentry(struct format *f, struct pnode } static void -pnode_printrefmeta(struct format *f, struct pnode *n) -{ - struct pnode *nc, *title, *manvol; - - title = manvol = NULL; - TAILQ_FOREACH(nc, &n->childq, child) { - if (nc->node == NODE_MANVOLNUM) - manvol = nc; - else if (nc->node == NODE_REFENTRYTITLE) - title = nc; - } - macro_close(f); - macro_open(f, "Dt"); - if (title == NULL) - macro_addarg(f, "UNKNOWN", ARG_SPACE); - else - macro_addnode(f, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER); - if (manvol == NULL) - macro_addarg(f, "1", ARG_SPACE); - else - macro_addnode(f, manvol, ARG_SPACE | ARG_SINGLE); - macro_close(f); - pnode_unlink(n); -} - -static void pnode_printfuncdef(struct format *f, struct pnode *n) { struct pnode *nc; @@ -554,7 +567,8 @@ pnode_printauthor(struct format *f, struct pnode *n) if ((nc = pnode_findfirst(n, NODE_EMAIL)) != NULL) { f->flags |= FMT_CHILD; - pnode_print(f, nc); + macro_open(f, "Aq Mt"); + macro_addnode(f, nc, ARG_SPACE); pnode_unlink(nc); } @@ -618,30 +632,73 @@ pnode_printlink(struct format *f, struct pnode *n) } static void -pnode_printprologue(struct format *f, struct ptree *tree) +pnode_printprologue(struct format *f, struct pnode *root) { - struct pnode *refmeta; + struct pnode *date, *refmeta, *name, *vol, *descr, *nc; + const char *sname; - refmeta = tree->root == NULL ? NULL : - pnode_findfirst(tree->root, NODE_REFMETA); + /* Collect information. */ - macro_line(f, "Dd $Mdocdate" "$"); - if (refmeta == NULL) { - macro_open(f, "Dt"); - macro_addarg(f, - pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"), - ARG_SPACE | ARG_SINGLE | ARG_UPPER); - macro_addarg(f, "1", ARG_SPACE); - macro_close(f); + if ((date = pnode_takefirst(root, NODE_PUBDATE)) == NULL) + date = pnode_takefirst(root, NODE_DATE); + + name = vol = NULL; + if ((refmeta = pnode_takefirst(root, NODE_REFMETA)) != NULL) { + TAILQ_FOREACH(nc, &refmeta->childq, child) { + switch (nc->node) { + case NODE_REFENTRYTITLE: + name = nc; + break; + case NODE_MANVOLNUM: + vol = nc; + break; + default: + break; + } + } + } + + if (pnode_findfirst(root, NODE_REFNAMEDIV) == NULL && + ((nc = pnode_findfirst(root, NODE_BOOKINFO)) != NULL || + (nc = pnode_findfirst(root, NODE_REFENTRYINFO)) != NULL)) + descr = pnode_takefirst(nc, NODE_TITLE); + else + descr = NULL; + + /* Print prologue. */ + + if (date == NULL) + macro_line(f, "Dd $Mdocdate" "$"); + else + macro_nodeline(f, "Dd", date, 0); + + macro_open(f, "Dt"); + if (name == NULL) { + sname = pnode_getattr_raw(root, ATTRKEY_ID, "UNKNOWN"); + macro_addarg(f, sname, ARG_SPACE | ARG_SINGLE | ARG_UPPER); } else - pnode_printrefmeta(f, refmeta); + macro_addnode(f, name, ARG_SPACE | ARG_SINGLE | ARG_UPPER); + if (vol == NULL) + macro_addarg(f, "1", ARG_SPACE); + else + macro_addnode(f, vol, ARG_SPACE | ARG_SINGLE); + macro_line(f, "Os"); - if (tree->flags & TREE_EQN) { - macro_line(f, "EQ"); - print_text(f, "delim $$", 0); - macro_line(f, "EN"); + if (descr != NULL) { + macro_line(f, "Sh NAME"); + if (name == NULL) + macro_argline(f, "Nm", sname); + else + macro_nodeline(f, "Nm", name, ARG_SINGLE); + macro_nodeline(f, "Nd", descr, 0); } + + /* Clean up. */ + + pnode_unlink(date); + pnode_unlink(refmeta); + pnode_unlink(descr); } /* @@ -815,12 +872,12 @@ static void pnode_print(struct format *f, struct pnode *n) { struct pnode *nc, *nn; - enum linestate sv; + int was_impl; if (n == NULL) return; - sv = f->linestate; + was_impl = f->flags & FMT_IMPL; if (n->spc) f->flags &= ~FMT_NOSPC; else @@ -842,9 +899,6 @@ pnode_print(struct format *f, struct pnode *n) case NODE_BLOCKQUOTE: macro_line(f, "Bd -ragged -offset indent"); break; - case NODE_BOOKINFO: - macro_line(f, "Sh NAME"); - break; case NODE_CITEREFENTRY: pnode_printciterefentry(f, n); break; @@ -859,11 +913,15 @@ pnode_print(struct format *f, struct pnode *n) break; case NODE_EDITOR: print_text(f, "editor:", ARG_SPACE); - sv = LINE_TEXT; macro_open(f, "An"); break; case NODE_EMAIL: - macro_open(f, "Aq Mt"); + if (was_impl) + macro_open(f, "Ao Mt"); + else { + macro_open(f, "Aq Mt"); + f->flags |= FMT_IMPL; + } break; case NODE_EMPHASIS: case NODE_FIRSTTERM: @@ -889,13 +947,11 @@ pnode_print(struct format *f, struct pnode *n) macro_open(f, "Fd"); break; case NODE_INFORMALEQUATION: + macro_line(f, "Bd -ragged -offset indent"); + /* FALLTHROUGH */ + case NODE_INLINEEQUATION: macro_line(f, "EQ"); break; - case NODE_INLINEEQUATION: - if (f->linestate == LINE_NEW) - f->linestate = LINE_TEXT; - putchar('$'); - break; case NODE_ITEMIZEDLIST: pnode_printlist(f, n); break; @@ -909,7 +965,12 @@ pnode_print(struct format *f, struct pnode *n) pnode_printlink(f, n); break; case NODE_LITERAL: - macro_open(f, "Ql"); + if (was_impl) + macro_open(f, "So"); + else { + macro_open(f, "Ql"); + f->flags |= FMT_IMPL; + } break; case NODE_LITERALLAYOUT: macro_close(f); @@ -952,7 +1013,12 @@ pnode_print(struct format *f, struct pnode *n) pnode_unlinksub(n); break; case NODE_QUOTE: - macro_open(f, "Qo"); + if (was_impl) + macro_open(f, "Do"); + else { + macro_open(f, "Dq"); + f->flags |= FMT_IMPL; + } break; case NODE_PROGRAMLISTING: case NODE_SCREEN: @@ -964,13 +1030,11 @@ pnode_print(struct format *f, struct pnode *n) pnode_unlinksub(n); break; case NODE_REFNAME: - /* Suppress non-text children... */ + /* More often, these appear inside NODE_REFNAMEDIV. */ macro_open(f, "Nm"); - macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); - pnode_unlinksub(n); break; case NODE_REFNAMEDIV: - macro_line(f, "Sh NAME"); + pnode_printrefnamediv(f, n); break; case NODE_REFPURPOSE: macro_open(f, "Nd"); @@ -1002,11 +1066,6 @@ pnode_print(struct format *f, struct pnode *n) pnode_printtgroup(f, n); break; case NODE_TITLE: - if (n->parent != NULL && - n->parent->node == NODE_BOOKINFO) { - macro_open(f, "Nd"); - break; - } pnode_printpara(f, n); macro_nodeline(f, "Sy", n, 0); pnode_unlinksub(n); @@ -1028,6 +1087,13 @@ pnode_print(struct format *f, struct pnode *n) pnode_print(f, nc); switch (n->node) { + case NODE_EMAIL: + if (was_impl) { + f->flags &= ~FMT_NOSPC; + macro_open(f, "Ac"); + } else + f->flags &= ~FMT_IMPL; + break; case NODE_ESCAPE: case NODE_TERM: case NODE_TEXT: @@ -1035,11 +1101,18 @@ pnode_print(struct format *f, struct pnode *n) return; case NODE_INFORMALEQUATION: macro_line(f, "EN"); + macro_line(f, "Ed"); break; case NODE_INLINEEQUATION: - fputs("$ ", stdout); - f->linestate = sv; + macro_line(f, "EN"); break; + case NODE_LITERAL: + if (was_impl) { + f->flags &= ~FMT_NOSPC; + macro_open(f, "Sc"); + } else + f->flags &= ~FMT_IMPL; + break; case NODE_MEMBER: if ((nn = TAILQ_NEXT(n, child)) != NULL && nn->node != NODE_MEMBER) @@ -1067,27 +1140,12 @@ pnode_print(struct format *f, struct pnode *n) fputs(" } ", stdout); break; case NODE_QUOTE: - if (sv == LINE_NEW) - macro_close(f); - sv = f->linestate; - macro_open(f, "Qc"); - if (sv == LINE_NEW) - macro_close(f); + if (was_impl) { + f->flags &= ~FMT_NOSPC; + macro_open(f, "Dc"); + } else + f->flags &= ~FMT_IMPL; break; - case NODE_REFNAME: - /* - * If we're in the NAME macro and we have multiple - * macros in sequence, then print out a - * trailing comma before the newline. - */ - if (n->parent != NULL && - n->parent->node == NODE_REFNAMEDIV && - TAILQ_NEXT(n, child) != NULL && - TAILQ_NEXT(n, child)->node == NODE_REFNAME) - macro_addarg(f, ",", ARG_SPACE); - if (sv == LINE_NEW) - macro_close(f); - break; case NODE_PREFACE: case NODE_SECTION: case NODE_APPENDIX: @@ -1105,11 +1163,6 @@ pnode_print(struct format *f, struct pnode *n) case NODE_SYNOPSIS: macro_line(f, "Ed"); break; - case NODE_TITLE: - if (n->parent != NULL && - n->parent->node == NODE_BOOKINFO) - macro_line(f, "Sh AUTHORS"); - break; default: break; } @@ -1117,13 +1170,13 @@ pnode_print(struct format *f, struct pnode *n) } void -ptree_print(struct ptree *tree) +ptree_print_mdoc(struct ptree *tree) { struct format formatter; formatter.level = 0; formatter.linestate = LINE_NEW; - pnode_printprologue(&formatter, tree); + pnode_printprologue(&formatter, tree->root); pnode_print(&formatter, tree->root); if (formatter.linestate != LINE_NEW) putchar('\n');