===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.219
retrieving revision 1.221
diff -u -p -r1.219 -r1.221
--- mandoc/man_term.c	2018/08/18 17:07:23	1.219
+++ mandoc/man_term.c	2018/12/03 21:00:10	1.221
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.219 2018/08/18 17:07:23 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.221 2018/12/03 21:00:10 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -81,6 +81,7 @@ static	int		  pre_SS(DECL_ARGS);
 static	int		  pre_SY(DECL_ARGS);
 static	int		  pre_TP(DECL_ARGS);
 static	int		  pre_UR(DECL_ARGS);
+static	int		  pre_abort(DECL_ARGS);
 static	int		  pre_alternate(DECL_ARGS);
 static	int		  pre_ign(DECL_ARGS);
 static	int		  pre_in(DECL_ARGS);
@@ -101,9 +102,9 @@ static const struct man_term_act man_term_acts[MAN_MAX
 	{ pre_SS, post_SS, 0 }, /* SS */
 	{ pre_TP, post_TP, 0 }, /* TP */
 	{ pre_TP, post_TP, 0 }, /* TQ */
-	{ pre_PP, NULL, 0 }, /* LP */
+	{ pre_abort, NULL, 0 }, /* LP */
 	{ pre_PP, NULL, 0 }, /* PP */
-	{ pre_PP, NULL, 0 }, /* P */
+	{ pre_abort, NULL, 0 }, /* P */
 	{ pre_IP, post_IP, 0 }, /* IP */
 	{ pre_HP, post_HP, 0 }, /* HP */
 	{ NULL, NULL, 0 }, /* SM */
@@ -222,6 +223,12 @@ print_bvspace(struct termp *p, const struct roff_node 
 
 
 static int
+pre_abort(DECL_ARGS)
+{
+	abort();
+}
+
+static int
 pre_ign(DECL_ARGS)
 {
 
@@ -985,7 +992,7 @@ print_man_node(DECL_ARGS)
 	}
 
 	act = man_term_act(n->tok);
-	if ((act->flags & MAN_NOTEXT) == 0)
+	if ((act->flags & MAN_NOTEXT) == 0 && n->tok != MAN_SM)
 		term_fontrepl(p, TERMFONT_NONE);
 
 	c = 1;
@@ -997,7 +1004,7 @@ print_man_node(DECL_ARGS)
 
 	if (act->post != NULL)
 		(*act->post)(p, mt, n, meta);
-	if ((act->flags & MAN_NOTEXT) == 0)
+	if ((act->flags & MAN_NOTEXT) == 0 && n->tok != MAN_SM)
 		term_fontrepl(p, TERMFONT_NONE);
 
 out: