aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mdoc_macro.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-04-17 12:53:29 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-04-17 12:53:29 +0000
commit9e5c82b05c242c2e827a6f1079b168fe918e499e (patch)
tree5d0be198ffe528590ed8a6b5568a11ca43d714ec /mdoc_macro.c
parent1c62f42ca2f43ac9f721ae986079d2bb30403fd3 (diff)
downloadmandoc-9e5c82b05c242c2e827a6f1079b168fe918e499e.tar.gz
mandoc-9e5c82b05c242c2e827a6f1079b168fe918e499e.tar.zst
mandoc-9e5c82b05c242c2e827a6f1079b168fe918e499e.zip
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_macro.c')
-rw-r--r--mdoc_macro.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c
index 5ab9c412..fd34a7ac 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_macro.c,v 1.217 2017/02/16 09:47:31 schwarze Exp $ */
+/* $Id: mdoc_macro.c,v 1.218 2017/04/17 12:53:29 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -903,8 +903,10 @@ in_line(MACRO_PROT_ARGS)
}
}
- if (scope)
+ if (scope && tok != MDOC_Lk) {
rew_elem(mdoc, tok);
+ scope = 0;
+ }
/*
* If no elements have been collected and we're allowed to have
@@ -924,6 +926,8 @@ in_line(MACRO_PROT_ARGS)
}
if (nl)
append_delims(mdoc, line, pos, buf);
+ if (scope)
+ rew_elem(mdoc, tok);
}
static void