===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- mandoc/man_html.c	2020/02/27 01:43:52	1.176
+++ mandoc/man_html.c	2020/03/13 15:32:28	1.177
@@ -1,7 +1,7 @@
-/*	$Id: man_html.c,v 1.176 2020/02/27 01:43:52 schwarze Exp $ */
+/* $Id: man_html.c,v 1.177 2020/03/13 15:32:28 schwarze Exp $ */
 /*
- * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * HTML formatter for man(7) used by mandoc(1).
  */
 #include "config.h"
 
@@ -310,7 +312,6 @@ static int
 man_SH_pre(MAN_ARGS)
 {
 	const char	*class;
-	char		*id;
 	enum htmltag	 tag;
 
 	if (n->tok == MAN_SH) {
@@ -326,10 +327,8 @@ man_SH_pre(MAN_ARGS)
 		print_otag(h, TAG_SECTION, "c", class);
 		break;
 	case ROFFT_HEAD:
-		id = html_make_id(n, 1);
-		print_otag(h, tag, "ci", class, id);
-		if (id != NULL)
-			print_otag(h, TAG_A, "chR", "permalink", id);
+		n->flags |= NODE_ID;
+		print_otag_id(h, tag, class, n);
 		break;
 	case ROFFT_BODY:
 		break;
@@ -489,7 +488,7 @@ man_IP_pre(MAN_ARGS)
 	case ROFFT_HEAD:
 		if (body_elem == TAG_LI)
 			return 0;
-		print_otag(h, TAG_DT, "");
+		print_otag_id(h, TAG_DT, NULL, n);
 		break;
 	case ROFFT_BODY:
 		print_otag(h, body_elem, "");
@@ -497,7 +496,6 @@ man_IP_pre(MAN_ARGS)
 	default:
 		abort();
 	}
-
 	switch(n->tok) {
 	case MAN_IP:  /* Only print the first header element. */
 		if (n->child != NULL)