===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_html.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -c -r1.129 -r1.130
*** src/usr.bin/mandoc/man_html.c	2020/02/27 01:25:57	1.129
--- src/usr.bin/mandoc/man_html.c	2020/03/13 00:31:05	1.130
***************
*** 1,7 ****
! /*	$OpenBSD: man_html.c,v 1.129 2020/02/27 01:25:57 schwarze Exp $ */
  /*
-  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,7 ----
! /* $OpenBSD: man_html.c,v 1.130 2020/03/13 00:31:05 schwarze Exp $ */
  /*
   * 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,19 ****
--- 14,21 ----
   * 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 <sys/types.h>
  
***************
*** 308,314 ****
  man_SH_pre(MAN_ARGS)
  {
  	const char	*class;
- 	char		*id;
  	enum htmltag	 tag;
  
  	if (n->tok == MAN_SH) {
--- 310,315 ----
***************
*** 324,333 ****
  		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);
  		break;
  	case ROFFT_BODY:
  		break;
--- 325,332 ----
  		print_otag(h, TAG_SECTION, "c", class);
  		break;
  	case ROFFT_HEAD:
! 		n->flags |= NODE_ID;
! 		print_otag_id(h, tag, class, n);
  		break;
  	case ROFFT_BODY:
  		break;
***************
*** 487,493 ****
  	case ROFFT_HEAD:
  		if (body_elem == TAG_LI)
  			return 0;
! 		print_otag(h, TAG_DT, "");
  		break;
  	case ROFFT_BODY:
  		print_otag(h, body_elem, "");
--- 486,492 ----
  	case ROFFT_HEAD:
  		if (body_elem == TAG_LI)
  			return 0;
! 		print_otag_id(h, TAG_DT, NULL, n);
  		break;
  	case ROFFT_BODY:
  		print_otag(h, body_elem, "");
***************
*** 495,501 ****
  	default:
  		abort();
  	}
- 
  	switch(n->tok) {
  	case MAN_IP:  /* Only print the first header element. */
  		if (n->child != NULL)
--- 494,499 ----