=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.93 retrieving revision 1.99 diff -u -p -r1.93 -r1.99 --- docbook2mdoc/docbook2mdoc.c 2019/04/07 13:16:21 1.93 +++ docbook2mdoc/docbook2mdoc.c 2019/04/07 18:51:53 1.99 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.93 2019/04/07 13:16:21 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.99 2019/04/07 18:51:53 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -34,6 +34,7 @@ static void pnode_print(struct format *, struct pnode static void pnode_printtext(struct format *f, struct pnode *n) { + struct pnode *nn; char *cp; char last; @@ -42,6 +43,19 @@ pnode_printtext(struct format *f, struct pnode *n) return; } + /* + * Text preceding a macro without intervening whitespace + * requires a .Pf macro. + * Set the spacing flag to avoid a redundant .Ns macro. + */ + + 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"); + nn->spc = 1; + } + if (f->linestate == LINE_NEW) { last = '\n'; f->linestate = LINE_TEXT; @@ -89,13 +103,17 @@ 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_GLOSSTERM: case NODE_LISTITEM: + case NODE_TERM: return; case NODE_PREFACE: case NODE_SECTION: @@ -182,9 +200,11 @@ pnode_printrefsect(struct format *p, struct pnode *pn) switch (level) { case 1: + macro_close(p); macro_open(p, "Sh"); break; case 2: + macro_close(p); macro_open(p, "Ss"); break; default: @@ -240,6 +260,7 @@ pnode_printrefmeta(struct format *p, struct pnode *pn) else if (pp->node == NODE_REFENTRYTITLE) title = pp; } + macro_close(p); macro_open(p, "Dt"); if (title == NULL) macro_addarg(p, "UNKNOWN", ARG_SPACE); @@ -504,6 +525,41 @@ pnode_printauthor(struct format *f, struct pnode *n) } static void +pnode_printlink(struct format *f, struct pnode *n) +{ + const char *uri, *text; + + uri = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL); + if (uri != NULL) { + if (TAILQ_FIRST(&n->childq) != NULL) { + print_textnode(f, n); + text = ""; + } else { + text = pnode_getattr_raw(n, ATTRKEY_ENDTERM, NULL); + if (text != NULL) + print_text(f, text, ARG_SPACE); + } + if (text != NULL) + macro_open(f, "Pq"); + macro_open(f, "Sx"); + macro_addarg(f, uri, ARG_SPACE); + pnode_unlinksub(n); + return; + } + uri = pnode_getattr_raw(n, ATTRKEY_XLINK_HREF, NULL); + if (uri == NULL) + uri = pnode_getattr_raw(n, ATTRKEY_URL, NULL); + if (uri != NULL) { + macro_open(f, "Lk"); + macro_addarg(f, uri, ARG_SPACE | ARG_SINGLE); + if (TAILQ_FIRST(&n->childq) != NULL) + macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); + pnode_unlinksub(n); + return; + } +} + +static void pnode_printprologue(struct format *p, struct ptree *tree) { struct pnode *refmeta; @@ -540,9 +596,10 @@ pnode_printvarlistentry(struct format *p, struct pnode struct pnode *pp; int first = 1; + macro_close(p); macro_open(p, "It"); TAILQ_FOREACH(pp, &pn->childq, child) { - if (pp->node != NODE_TERM) + if (pp->node != NODE_TERM && pp->node != NODE_GLOSSTERM) continue; if ( ! first) macro_addarg(p, ",", 0); @@ -551,7 +608,7 @@ pnode_printvarlistentry(struct format *p, struct pnode } macro_close(p); TAILQ_FOREACH(pp, &pn->childq, child) - if (pp->node != NODE_TERM) + if (pp->node != NODE_TERM && pp->node != NODE_GLOSSTERM) pnode_print(p, pp); pnode_unlinksub(pn); } @@ -608,6 +665,7 @@ pnode_printtgroup2(struct format *f, struct pnode *n) while ((nr = pnode_findfirst(n, NODE_ROW)) != NULL) { if ((ne = pnode_findfirst(n, NODE_ENTRY)) == NULL) break; + macro_close(f); macro_open(f, "It"); pnode_print(f, ne); macro_close(f); @@ -687,7 +745,6 @@ static void pnode_print(struct format *p, struct pnode *pn) { struct pnode *pp; - const char *ccp; enum linestate sv; if (pn == NULL) @@ -709,6 +766,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; @@ -734,6 +794,7 @@ pnode_print(struct format *p, struct pnode *pn) break; case NODE_EMPHASIS: case NODE_FIRSTTERM: + case NODE_GLOSSTERM: macro_open(p, "Em"); break; case NODE_ENVAR: @@ -775,15 +836,13 @@ pnode_print(struct format *p, struct pnode *pn) macro_line(p, "Sh LEGAL NOTICE"); break; case NODE_LINK: - ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL); - if (ccp == NULL) - break; - macro_argline(p, "Sx", ccp); - return; + pnode_printlink(p, pn); + break; case NODE_LITERAL: macro_open(p, "Ql"); break; case NODE_LITERALLAYOUT: + macro_close(p); macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) == ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); break; @@ -869,7 +928,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; } @@ -944,6 +1004,7 @@ pnode_print(struct format *p, struct pnode *pn) case NODE_FUNCTION: case NODE_FUNCSYNOPSISINFO: case NODE_KEYSYM: + case NODE_LINK: case NODE_LITERAL: case NODE_OPTION: case NODE_PARAMETER: @@ -986,6 +1047,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: @@ -993,7 +1055,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: