===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.157
retrieving revision 1.161
diff -u -p -r1.157 -r1.161
--- mandoc/man_html.c	2018/10/23 17:18:01	1.157
+++ mandoc/man_html.c	2018/12/30 00:49:55	1.161
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.157 2018/10/23 17:18:01 schwarze Exp $ */
+/*	$Id: man_html.c,v 1.161 2018/12/30 00:49:55 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -63,6 +63,7 @@ static	int		  man_SM_pre(MAN_ARGS);
 static	int		  man_SS_pre(MAN_ARGS);
 static	int		  man_SY_pre(MAN_ARGS);
 static	int		  man_UR_pre(MAN_ARGS);
+static	int		  man_abort_pre(MAN_ARGS);
 static	int		  man_alt_pre(MAN_ARGS);
 static	int		  man_ign_pre(MAN_ARGS);
 static	int		  man_in_pre(MAN_ARGS);
@@ -77,9 +78,9 @@ static	const struct man_html_act man_html_acts[MAN_MAX
 	{ man_SS_pre, NULL }, /* SS */
 	{ man_IP_pre, NULL }, /* TP */
 	{ man_IP_pre, NULL }, /* TQ */
-	{ man_PP_pre, NULL }, /* LP */
+	{ man_abort_pre, NULL }, /* LP */
 	{ man_PP_pre, NULL }, /* PP */
-	{ man_PP_pre, NULL }, /* P */
+	{ man_abort_pre, NULL }, /* P */
 	{ man_IP_pre, NULL }, /* IP */
 	{ man_HP_pre, NULL }, /* HP */
 	{ man_SM_pre, NULL }, /* SM */
@@ -138,7 +139,7 @@ print_bvspace(struct html *h, const struct roff_node *
 }
 
 void
-html_man(void *arg, const struct roff_man *man)
+html_man(void *arg, const struct roff_meta *man)
 {
 	struct html		*h;
 	struct roff_node	*n;
@@ -153,16 +154,16 @@ html_man(void *arg, const struct roff_man *man)
 		if (n->type == ROFFT_COMMENT)
 			print_gen_comment(h, n);
 		t = print_otag(h, TAG_HEAD, "");
-		print_man_head(&man->meta, h);
+		print_man_head(man, h);
 		print_tagq(h, t);
 		print_otag(h, TAG_BODY, "");
 	}
 
-	man_root_pre(&man->meta, h);
+	man_root_pre(man, h);
 	t = print_otag(h, TAG_DIV, "c", "manual-text");
-	print_man_nodelist(&man->meta, n, h);
+	print_man_nodelist(man, n, h);
 	print_tagq(h, t);
-	man_root_post(&man->meta, h);
+	man_root_post(man, h);
 	print_tagq(h, NULL);
 }
 
@@ -234,10 +235,8 @@ print_man_node(MAN_ARGS)
 			want_fillmode = MAN_fi;
 			/* FALLTHROUGH */
 		case MAN_PP:  /* These have no head.		*/
-		case MAN_LP:  /* They will simply		*/
-		case MAN_P:   /* reopen .nf in the body.	*/
-		case MAN_RS:
-		case MAN_UR:
+		case MAN_RS:  /* They will simply		*/
+		case MAN_UR:  /* reopen .nf in the body.        */
 		case MAN_MT:
 			fillmode(h, MAN_fi);
 			break;
@@ -671,4 +670,10 @@ man_UR_pre(MAN_ARGS)
 	print_man_nodelist(man, n->child, h);
 
 	return 0;
+}
+
+static int
+man_abort_pre(MAN_ARGS)
+{
+	abort();
 }