diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2017-04-17 12:53:29 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-04-17 12:53:29 +0000 |
| commit | cb9be671cf6346f9dd06b4901b4a89e2f6c67934 (patch) | |
| tree | 2ae762cef23f1d7bb316700ef15054a019cd5683 /mdoc_markdown.c | |
| parent | 9fa2ec46cdd419a9476abc763c485548e4d59d66 (diff) | |
| download | mandoc-cb9be671cf6346f9dd06b4901b4a89e2f6c67934.tar.gz | |
Fix handling of trailing punctuation in .Lk.
This macro is unusual in so far as trailing punction needs to remain
inside the scope because it must be inside, not after the display
of long URIs in terminal output mode.
Improves formatting of fw_update(1), help(1), less(1), sendbug(1),
acx(4), inet6(4), ipsec(4), oce(4), isakmpd.conf(5), afterboot(8),
release(8), traceroute(8).
Diffstat (limited to 'mdoc_markdown.c')
| -rw-r--r-- | mdoc_markdown.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/mdoc_markdown.c b/mdoc_markdown.c index 84e75a12..a9fba790 100644 --- a/mdoc_markdown.c +++ b/mdoc_markdown.c @@ -1304,18 +1304,29 @@ md_pre_Lk(struct roff_node *n) if ((link = n->child) == NULL) return 0; - descr = link->next == NULL ? link : link->next; + /* Link text. */ + descr = link->next; + if (descr == NULL || descr->flags & NODE_DELIMC) + descr = link; /* no text */ md_rawword("["); outflags &= ~MD_spc; do { md_word(descr->string); - descr = link->next == NULL ? NULL : descr->next; - } while (descr != NULL); + descr = descr->next; + } while (descr != NULL && !(descr->flags & NODE_DELIMC)); outflags &= ~MD_spc; + + /* Link target. */ md_rawword("]("); md_uri(link->string); outflags &= ~MD_spc; md_rawword(")"); + + /* Trailing punctuation. */ + while (descr != NULL) { + md_word(descr->string); + descr = descr->next; + } return 0; } |