version 1.127, 2019/04/14 23:07:05 |
version 1.128, 2019/04/15 00:34:15 |
Line 667 pnode_printlink(struct format *f, struct pnode *n) |
|
Line 667 pnode_printlink(struct format *f, struct pnode *n) |
|
if (TAILQ_FIRST(&n->childq) != NULL) |
if (TAILQ_FIRST(&n->childq) != NULL) |
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
pnode_unlinksub(n); |
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; |
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 |
static void |
Line 1178 pnode_print(struct format *f, struct pnode *n) |
|
Line 1210 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_MML_MSUB: |
case NODE_MML_MSUB: |
case NODE_MML_MSUP: |
case NODE_MML_MSUP: |
pnode_printmath(f, n); |
pnode_printmath(f, n); |
|
break; |
|
case NODE_OLINK: |
|
pnode_printolink(f, n); |
break; |
break; |
case NODE_OPTION: |
case NODE_OPTION: |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |