===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- mandoc/mdoc_html.c	2017/01/19 15:27:34	1.253
+++ mandoc/mdoc_html.c	2017/01/19 15:48:39	1.254
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.253 2017/01/19 15:27:34 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.254 2017/01/19 15:48:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -48,6 +48,7 @@ struct	htmlmdoc {
 	void		(*post)(MDOC_ARGS);
 };
 
+static	char		 *make_id(const struct roff_node *);
 static	void		  print_mdoc_head(MDOC_ARGS);
 static	void		  print_mdoc_node(MDOC_ARGS);
 static	void		  print_mdoc_nodelist(MDOC_ARGS);
@@ -492,7 +493,7 @@ mdoc_root_pre(MDOC_ARGS)
 	return 1;
 }
 
-char *
+static char *
 make_id(const struct roff_node *n)
 {
 	const struct roff_node	*nch;
@@ -635,11 +636,11 @@ mdoc_xr_pre(MDOC_ARGS)
 		return 0;
 
 	if (h->base_man)
-		print_otag(h, TAG_A, "chM", "link-man",
+		print_otag(h, TAG_A, "chM", "Xr",
 		    n->child->string, n->child->next == NULL ?
 		    NULL : n->child->next->string);
 	else
-		print_otag(h, TAG_A, "c", "link-man");
+		print_otag(h, TAG_A, "c", "Xr");
 
 	n = n->child;
 	print_text(h, n->string);
@@ -862,12 +863,11 @@ mdoc_sx_pre(MDOC_ARGS)
 {
 	char	*id;
 
-	print_otag(h, TAG_I, "c", "link-sec");
 	if ((id = make_id(n)) != NULL) {
-		print_otag(h, TAG_A, "chR", "link-sec", id);
+		print_otag(h, TAG_A, "chR", "Sx", id);
 		free(id);
 	} else
-		print_otag(h, TAG_A, "c", "link-sec");
+		print_otag(h, TAG_A, "c", "Sx");
 
 	return 1;
 }