===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.351
retrieving revision 1.354
diff -u -p -r1.351 -r1.354
--- mandoc/mdoc_term.c	2017/05/04 17:48:29	1.351
+++ mandoc/mdoc_term.c	2017/05/05 13:17:55	1.354
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.351 2017/05/04 17:48:29 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.354 2017/05/05 13:17:55 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -106,7 +106,6 @@ static	int	  termp_ft_pre(DECL_ARGS);
 static	int	  termp_in_pre(DECL_ARGS);
 static	int	  termp_it_pre(DECL_ARGS);
 static	int	  termp_li_pre(DECL_ARGS);
-static	int	  termp_ll_pre(DECL_ARGS);
 static	int	  termp_lk_pre(DECL_ARGS);
 static	int	  termp_nd_pre(DECL_ARGS);
 static	int	  termp_nm_pre(DECL_ARGS);
@@ -247,7 +246,6 @@ static	const struct termact __termacts[MDOC_MAX - MDOC
 	{ termp_sp_pre, NULL }, /* sp */
 	{ NULL, termp____post }, /* %U */
 	{ NULL, NULL }, /* Ta */
-	{ termp_ll_pre, NULL }, /* ll */
 };
 static	const struct termact *const termacts = __termacts - MDOC_Dd;
 
@@ -365,14 +363,8 @@ print_mdoc_node(DECL_ARGS)
 		break;
 	default:
 		if (n->tok < ROFF_MAX) {
-			switch (n->tok) {
-			case ROFF_br:
-				termp_sp_pre(p, &npair, meta, n);
-				break;
-			default:
-				abort();
-			}
-			break;
+			roff_term_pre(p, n);
+			return;
 		}
 		assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
 		if (termacts[n->tok].pre != NULL &&
@@ -396,9 +388,7 @@ print_mdoc_node(DECL_ARGS)
 	case ROFFT_EQN:
 		break;
 	default:
-		if (n->tok < ROFF_MAX ||
-		    termacts[n->tok].post == NULL ||
-		    n->flags & NODE_ENDED)
+		if (termacts[n->tok].post == NULL || n->flags & NODE_ENDED)
 			break;
 		(void)(*termacts[n->tok].post)(p, &npair, meta, n);
 
@@ -415,10 +405,8 @@ print_mdoc_node(DECL_ARGS)
 	if (NODE_EOS & n->flags)
 		p->flags |= TERMP_SENTENCE;
 
-	if (MDOC_ll != n->tok) {
-		p->offset = offset;
-		p->rmargin = rmargin;
-	}
+	p->offset = offset;
+	p->rmargin = rmargin;
 }
 
 static void
@@ -608,14 +596,6 @@ print_bvspace(struct termp *p,
 	term_vspace(p);
 }
 
-
-static int
-termp_ll_pre(DECL_ARGS)
-{
-
-	term_setwidth(p, n->child != NULL ? n->child->string : NULL);
-	return 0;
-}
 
 static int
 termp_it_pre(DECL_ARGS)