diff options
| author |   schwarze <schwarze@openbsd.org> | 2017-05-30 16:31:25 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2017-05-30 16:31:25 +0000 |
| commit | eb4d0f3030a3b30bde6e6a8786cf32fc2af1a8fb (patch) | |
| tree | e81bd0148ee64a4531b6ea2c0a3fd2d497946929 /usr.bin/mandoc/mdoc_man.c | |
| parent | Don't call TAILQ_REMOVE twice. This caused radiusd crash if it has a (diff) | |
| download | wireguard-openbsd-eb4d0f3030a3b30bde6e6a8786cf32fc2af1a8fb.tar.xz wireguard-openbsd-eb4d0f3030a3b30bde6e6a8786cf32fc2af1a8fb.zip | |
fix formatting of intermediate punctuation in .Lk
Diffstat (limited to 'usr.bin/mandoc/mdoc_man.c')
| -rw-r--r-- | usr.bin/mandoc/mdoc_man.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/usr.bin/mandoc/mdoc_man.c b/usr.bin/mandoc/mdoc_man.c index 027af713485..0267d88a2f2 100644 --- a/usr.bin/mandoc/mdoc_man.c +++ b/usr.bin/mandoc/mdoc_man.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_man.c,v 1.113 2017/05/08 15:33:43 schwarze Exp $ */ +/* $OpenBSD: mdoc_man.c,v 1.114 2017/05/30 16:31:25 schwarze Exp $ */ /* * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org> * @@ -1525,16 +1525,22 @@ post_lb(DECL_ARGS) static int pre_lk(DECL_ARGS) { - const struct roff_node *link, *descr; + const struct roff_node *link, *descr, *punct; int display; if ((link = n->child) == NULL) return 0; + /* Find beginning of trailing punctuation. */ + punct = n->last; + while (punct != link && punct->flags & NODE_DELIMC) + punct = punct->prev; + punct = punct->next; + /* Link text. */ - if ((descr = link->next) != NULL && !(descr->flags & NODE_DELIMC)) { + if ((descr = link->next) != NULL && descr != punct) { font_push('I'); - while (descr != NULL && !(descr->flags & NODE_DELIMC)) { + while (descr != punct) { print_word(descr->string); descr = descr->next; } @@ -1554,9 +1560,9 @@ pre_lk(DECL_ARGS) font_pop(); /* Trailing punctuation. */ - while (descr != NULL) { - print_word(descr->string); - descr = descr->next; + while (punct != NULL) { + print_word(punct->string); + punct = punct->next; } if (display) print_line(".RE", MMAN_nl); |