=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -p -r1.127 -r1.128 --- docbook2mdoc/docbook2mdoc.c 2019/04/14 23:07:05 1.127 +++ docbook2mdoc/docbook2mdoc.c 2019/04/15 00:34:15 1.128 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.127 2019/04/14 23:07:05 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.128 2019/04/15 00:34:15 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -667,8 +667,40 @@ pnode_printlink(struct format *f, struct pnode *n) if (TAILQ_FIRST(&n->childq) != NULL) macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); pnode_unlinksub(n); + } +} + +static void +pnode_printolink(struct format *f, struct pnode *n) +{ + const char *uri, *ptr, *local; + + uri = pnode_getattr_raw(n, ATTRKEY_TARGETDOC, NULL); + ptr = pnode_getattr_raw(n, ATTRKEY_TARGETPTR, NULL); + local = pnode_getattr_raw(n, ATTRKEY_LOCALINFO, NULL); + if (uri == NULL) { + uri = ptr; + ptr = NULL; + } + if (uri == NULL) { + uri = local; + local = NULL; + } + if (uri == NULL) return; + + macro_open(f, "Lk"); + macro_addarg(f, uri, ARG_SPACE | ARG_SINGLE); + macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); + if (ptr != NULL || local != NULL) { + macro_close(f); + macro_open(f, "Pq"); + if (ptr != NULL) + macro_addarg(f, ptr, ARG_SPACE); + if (local != NULL) + macro_addarg(f, local, ARG_SPACE); } + pnode_unlinksub(n); } static void @@ -1178,6 +1210,9 @@ pnode_print(struct format *f, struct pnode *n) case NODE_MML_MSUB: case NODE_MML_MSUP: pnode_printmath(f, n); + break; + case NODE_OLINK: + pnode_printolink(f, n); break; case NODE_OPTION: if ((nc = TAILQ_FIRST(&n->childq)) != NULL &&