===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.173
retrieving revision 1.176
diff -u -p -r1.173 -r1.176
--- mandoc/man_term.c	2015/04/02 23:48:19	1.173
+++ mandoc/man_term.c	2015/04/04 18:52:51	1.176
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.173 2015/04/02 23:48:19 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.176 2015/04/04 18:52:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -427,7 +427,7 @@ pre_in(DECL_ARGS)
 	if ( ! a2roffsu(++cp, &su, SCALE_EN))
 		return(0);
 
-	v = term_hspan(p, &su);
+	v = (term_hspan(p, &su) + 11) / 24;
 
 	if (less < 0)
 		p->offset -= p->offset > v ? v : p->offset;
@@ -512,7 +512,7 @@ pre_HP(DECL_ARGS)
 
 	if ((nn = n->parent->head->child) != NULL &&
 	    a2roffsu(nn->string, &su, SCALE_EN)) {
-		len = term_hspan(p, &su);
+		len = term_hspan(p, &su) / 24;
 		if (len < 0 && (size_t)(-len) > mt->offset)
 			len = -mt->offset;
 		else if (len > SHRT_MAX)
@@ -533,6 +533,17 @@ post_HP(DECL_ARGS)
 	switch (n->type) {
 	case ROFFT_BODY:
 		term_newln(p);
+
+		/*
+		 * Compatibility with a groff bug.
+		 * The .HP macro uses the undocumented .tag request
+		 * which causes a line break and cancels no-space
+		 * mode even if there isn't any output.
+		 */
+
+		if (n->child == NULL)
+			term_vspace(p);
+
 		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
 		p->trailspace = 0;
 		p->offset = mt->offset;
@@ -586,7 +597,7 @@ pre_IP(DECL_ARGS)
 	if ((nn = n->parent->head->child) != NULL &&
 	    (nn = nn->next) != NULL &&
 	    a2roffsu(nn->string, &su, SCALE_EN)) {
-		len = term_hspan(p, &su);
+		len = term_hspan(p, &su) / 24;
 		if (len < 0 && (size_t)(-len) > mt->offset)
 			len = -mt->offset;
 		else if (len > SHRT_MAX)
@@ -668,7 +679,7 @@ pre_TP(DECL_ARGS)
 	if ((nn = n->parent->head->child) != NULL &&
 	    nn->string != NULL && ! (MAN_LINE & nn->flags) &&
 	    a2roffsu(nn->string, &su, SCALE_EN)) {
-		len = term_hspan(p, &su);
+		len = term_hspan(p, &su) / 24;
 		if (len < 0 && (size_t)(-len) > mt->offset)
 			len = -mt->offset;
 		else if (len > SHRT_MAX)
@@ -757,9 +768,15 @@ pre_SS(DECL_ARGS)
 	case ROFFT_HEAD:
 		term_fontrepl(p, TERMFONT_BOLD);
 		p->offset = term_len(p, 3);
+		p->rmargin = mt->offset;
+		p->trailspace = mt->offset;
+		p->flags |= TERMP_NOBREAK | TERMP_BRIND;
 		break;
 	case ROFFT_BODY:
 		p->offset = mt->offset;
+		p->rmargin = p->maxrmargin;
+		p->trailspace = 0;
+		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
 		break;
 	default:
 		break;
@@ -812,9 +829,15 @@ pre_SH(DECL_ARGS)
 	case ROFFT_HEAD:
 		term_fontrepl(p, TERMFONT_BOLD);
 		p->offset = 0;
+		p->rmargin = mt->offset;
+		p->trailspace = mt->offset;
+		p->flags |= TERMP_NOBREAK | TERMP_BRIND;
 		break;
 	case ROFFT_BODY:
 		p->offset = mt->offset;
+		p->rmargin = p->maxrmargin;
+		p->trailspace = 0;
+		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
 		break;
 	default:
 		break;
@@ -857,7 +880,7 @@ pre_RS(DECL_ARGS)
 	n = n->parent->head;
 	n->aux = SHRT_MAX + 1;
 	if (n->child != NULL && a2roffsu(n->child->string, &su, SCALE_EN))
-		n->aux = term_hspan(p, &su);
+		n->aux = term_hspan(p, &su) / 24;
 	if (n->aux < 0 && (size_t)(-n->aux) > mt->offset)
 		n->aux = -mt->offset;
 	else if (n->aux > SHRT_MAX)