===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- mandoc/mdoc_html.c	2017/03/17 12:10:16	1.278
+++ mandoc/mdoc_html.c	2017/04/17 12:53:29	1.279
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.278 2017/03/17 12:10:16 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.279 2017/04/17 12:53:29 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -1346,19 +1346,25 @@ mdoc_sp_pre(MDOC_ARGS)
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
-	if (NULL == (n = n->child))
+	struct tag	*t;
+
+	if ((n = n->child) == NULL)
 		return 0;
 
-	assert(n->type == ROFFT_TEXT);
-
-	print_otag(h, TAG_A, "cTh", "Lk", n->string);
-
-	if (NULL == n->next)
+	/* Link target and link text. */
+	t = print_otag(h, TAG_A, "cTh", "Lk", n->string);
+	if (n->next == NULL || n->next->flags & NODE_DELIMC)
 		print_text(h, n->string);
-
-	for (n = n->next; n; n = n->next)
+	for (n = n->next; n != NULL && !(n->flags & NODE_DELIMC); n = n->next)
 		print_text(h, n->string);
+	print_tagq(h, t);
 
+	/* Trailing punctuation. */
+	while (n != NULL) {
+		h->flags |= HTML_NOSPACE;
+		print_text(h, n->string);
+		n = n->next;
+	}
 	return 0;
 }