===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.287
retrieving revision 1.290
diff -u -p -r1.287 -r1.290
--- mandoc/mdoc_html.c	2017/05/12 17:58:21	1.287
+++ mandoc/mdoc_html.c	2017/06/19 12:57:08	1.290
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.287 2017/05/12 17:58:21 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.290 2017/06/19 12:57:08 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -585,9 +585,6 @@ mdoc_nd_pre(MDOC_ARGS)
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
-	struct tag	*t;
-	int		 len;
-
 	switch (n->type) {
 	case ROFFT_HEAD:
 		print_otag(h, TAG_TD, "");
@@ -601,22 +598,8 @@ mdoc_nm_pre(MDOC_ARGS)
 	default:
 		break;
 	}
-
 	synopsis_pre(h, n);
 	print_otag(h, TAG_TABLE, "c", "Nm");
-
-	for (len = 0, n = n->head->child; n; n = n->next)
-		if (n->type == ROFFT_TEXT)
-			len += html_strlen(n->string);
-
-	if (len == 0 && meta->name != NULL)
-		len = html_strlen(meta->name);
-
-	t = print_otag(h, TAG_COLGROUP, "");
-	/* Increase width to make even bold text fit. */
-	print_otag(h, TAG_COL, "shw", len + 2);
-	print_otag(h, TAG_COL, "");
-	print_tagq(h, t);
 	print_otag(h, TAG_TR, "");
 	return 1;
 }
@@ -1326,24 +1309,36 @@ mdoc_pp_pre(MDOC_ARGS)
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
+	const struct roff_node *link, *descr, *punct;
 	struct tag	*t;
 
-	if ((n = n->child) == NULL)
+	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 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 != NULL && !(n->flags & NODE_DELIMC); n = n->next)
-		print_text(h, n->string);
+	descr = link->next;
+	if (descr == punct)
+		descr = link;  /* no text */
+	t = print_otag(h, TAG_A, "cTh", "Lk", link->string);
+	do {
+		if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
+			h->flags |= HTML_NOSPACE;
+		print_text(h, descr->string);
+		descr = descr->next;
+	} while (descr != punct);
 	print_tagq(h, t);
 
 	/* Trailing punctuation. */
-	while (n != NULL) {
+	while (punct != NULL) {
 		h->flags |= HTML_NOSPACE;
-		print_text(h, n->string);
-		n = n->next;
+		print_text(h, punct->string);
+		punct = punct->next;
 	}
 	return 0;
 }