===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.183
retrieving revision 1.187
diff -u -p -r1.183 -r1.187
--- mandoc/man_term.c	2015/04/19 19:44:21	1.183
+++ mandoc/man_term.c	2016/01/08 17:48:09	1.187
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.183 2015/04/19 19:44:21 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.187 2016/01/08 17:48:09 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -212,15 +212,15 @@ static int
 pre_ign(DECL_ARGS)
 {
 
-	return(0);
+	return 0;
 }
 
 static int
 pre_ll(DECL_ARGS)
 {
 
-	term_setwidth(p, n->nchild ? n->child->string : NULL);
-	return(0);
+	term_setwidth(p, n->child != NULL ? n->child->string : NULL);
+	return 0;
 }
 
 static int
@@ -228,7 +228,7 @@ pre_I(DECL_ARGS)
 {
 
 	term_fontrepl(p, TERMFONT_UNDER);
-	return(1);
+	return 1;
 }
 
 static int
@@ -255,7 +255,7 @@ pre_literal(DECL_ARGS)
 		p->flags |= TERMP_NOSPACE;
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -266,12 +266,12 @@ pre_PD(DECL_ARGS)
 	n = n->child;
 	if (n == NULL) {
 		mt->pardist = 1;
-		return(0);
+		return 0;
 	}
 	assert(n->type == ROFFT_TEXT);
 	if (a2roffsu(n->string, &su, SCALE_VS))
 		mt->pardist = term_vspan(p, &su);
-	return(0);
+	return 0;
 }
 
 static int
@@ -325,7 +325,7 @@ pre_alternate(DECL_ARGS)
 			p->flags |= TERMP_NOSPACE;
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -333,7 +333,7 @@ pre_B(DECL_ARGS)
 {
 
 	term_fontrepl(p, TERMFONT_BOLD);
-	return(1);
+	return 1;
 }
 
 static int
@@ -355,7 +355,7 @@ pre_OP(DECL_ARGS)
 	term_fontrepl(p, TERMFONT_NONE);
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "]");
-	return(0);
+	return 0;
 }
 
 static int
@@ -365,20 +365,17 @@ pre_ft(DECL_ARGS)
 
 	if (NULL == n->child) {
 		term_fontlast(p);
-		return(0);
+		return 0;
 	}
 
 	cp = n->child->string;
 	switch (*cp) {
 	case '4':
-		/* FALLTHROUGH */
 	case '3':
-		/* FALLTHROUGH */
 	case 'B':
 		term_fontrepl(p, TERMFONT_BOLD);
 		break;
 	case '2':
-		/* FALLTHROUGH */
 	case 'I':
 		term_fontrepl(p, TERMFONT_UNDER);
 		break;
@@ -386,16 +383,14 @@ pre_ft(DECL_ARGS)
 		term_fontlast(p);
 		break;
 	case '1':
-		/* FALLTHROUGH */
 	case 'C':
-		/* FALLTHROUGH */
 	case 'R':
 		term_fontrepl(p, TERMFONT_NONE);
 		break;
 	default:
 		break;
 	}
-	return(0);
+	return 0;
 }
 
 static int
@@ -410,7 +405,7 @@ pre_in(DECL_ARGS)
 
 	if (NULL == n->child) {
 		p->offset = mt->offset;
-		return(0);
+		return 0;
 	}
 
 	cp = n->child->string;
@@ -424,7 +419,7 @@ pre_in(DECL_ARGS)
 		cp--;
 
 	if ( ! a2roffsu(++cp, &su, SCALE_EN))
-		return(0);
+		return 0;
 
 	v = (term_hspan(p, &su) + 11) / 24;
 
@@ -437,7 +432,7 @@ pre_in(DECL_ARGS)
 	if (p->offset > SHRT_MAX)
 		p->offset = term_len(p, p->defindent);
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -449,16 +444,11 @@ pre_sp(DECL_ARGS)
 	if ((NULL == n->prev && n->parent)) {
 		switch (n->parent->tok) {
 		case MAN_SH:
-			/* FALLTHROUGH */
 		case MAN_SS:
-			/* FALLTHROUGH */
 		case MAN_PP:
-			/* FALLTHROUGH */
 		case MAN_LP:
-			/* FALLTHROUGH */
 		case MAN_P:
-			/* FALLTHROUGH */
-			return(0);
+			return 0;
 		default:
 			break;
 		}
@@ -493,7 +483,7 @@ pre_sp(DECL_ARGS)
 		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -506,11 +496,11 @@ pre_HP(DECL_ARGS)
 	switch (n->type) {
 	case ROFFT_BLOCK:
 		print_bvspace(p, n, mt->pardist);
-		return(1);
+		return 1;
 	case ROFFT_BODY:
 		break;
 	default:
-		return(0);
+		return 0;
 	}
 
 	if ( ! (MANT_LITERAL & mt->fl)) {
@@ -533,7 +523,7 @@ pre_HP(DECL_ARGS)
 
 	p->offset = mt->offset;
 	p->rmargin = mt->offset + len;
-	return(1);
+	return 1;
 }
 
 static void
@@ -578,7 +568,7 @@ pre_PP(DECL_ARGS)
 		break;
 	}
 
-	return(n->type != ROFFT_HEAD);
+	return n->type != ROFFT_HEAD;
 }
 
 static int
@@ -600,7 +590,7 @@ pre_IP(DECL_ARGS)
 		print_bvspace(p, n, mt->pardist);
 		/* FALLTHROUGH */
 	default:
-		return(1);
+		return 1;
 	}
 
 	/* Calculate the offset from the optional second argument. */
@@ -630,7 +620,7 @@ pre_IP(DECL_ARGS)
 		if (savelit)
 			mt->fl |= MANT_LITERAL;
 
-		return(0);
+		return 0;
 	case ROFFT_BODY:
 		p->offset = mt->offset + len;
 		p->rmargin = p->maxrmargin;
@@ -639,7 +629,7 @@ pre_IP(DECL_ARGS)
 		break;
 	}
 
-	return(1);
+	return 1;
 }
 
 static void
@@ -671,7 +661,7 @@ pre_TP(DECL_ARGS)
 
 	switch (n->type) {
 	case ROFFT_HEAD:
-		p->flags |= TERMP_NOBREAK;
+		p->flags |= TERMP_NOBREAK | TERMP_BRTRSP;
 		p->trailspace = 1;
 		break;
 	case ROFFT_BODY:
@@ -681,7 +671,7 @@ pre_TP(DECL_ARGS)
 		print_bvspace(p, n, mt->pardist);
 		/* FALLTHROUGH */
 	default:
-		return(1);
+		return 1;
 	}
 
 	/* Calculate offset. */
@@ -718,18 +708,18 @@ pre_TP(DECL_ARGS)
 
 		if (savelit)
 			mt->fl |= MANT_LITERAL;
-		return(0);
+		return 0;
 	case ROFFT_BODY:
 		p->offset = mt->offset + len;
 		p->rmargin = p->maxrmargin;
 		p->trailspace = 0;
-		p->flags &= ~TERMP_NOBREAK;
+		p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP);
 		break;
 	default:
 		break;
 	}
 
-	return(1);
+	return 1;
 }
 
 static void
@@ -792,7 +782,7 @@ pre_SS(DECL_ARGS)
 		break;
 	}
 
-	return(1);
+	return 1;
 }
 
 static void
@@ -853,7 +843,7 @@ pre_SH(DECL_ARGS)
 		break;
 	}
 
-	return(1);
+	return 1;
 }
 
 static void
@@ -880,9 +870,9 @@ pre_RS(DECL_ARGS)
 	switch (n->type) {
 	case ROFFT_BLOCK:
 		term_newln(p);
-		return(1);
+		return 1;
 	case ROFFT_HEAD:
-		return(0);
+		return 0;
 	default:
 		break;
 	}
@@ -906,7 +896,7 @@ pre_RS(DECL_ARGS)
 		mt->lmargincur = mt->lmarginsz;
 
 	mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
-	return(1);
+	return 1;
 }
 
 static void
@@ -934,7 +924,7 @@ static int
 pre_UR(DECL_ARGS)
 {
 
-	return (n->type != ROFFT_HEAD);
+	return n->type != ROFFT_HEAD;
 }
 
 static void