===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.111
retrieving revision 1.114
diff -u -p -r1.111 -r1.114
--- mandoc/man_term.c	2011/06/18 17:58:48	1.111
+++ mandoc/man_term.c	2011/07/21 11:34:53	1.114
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.111 2011/06/18 17:58:48 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.114 2011/07/21 11:34:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -181,7 +181,7 @@ a2height(const struct termp *p, const char *cp)
 	struct roffsu	 su;
 
 	if ( ! a2roffsu(cp, &su, SCALE_VS))
-		SCALE_VS_INIT(&su, term_strlen(p, cp));
+		SCALE_VS_INIT(&su, atoi(cp));
 
 	return(term_vspan(p, &su));
 }
@@ -411,6 +411,13 @@ pre_sp(DECL_ARGS)
 {
 	size_t		 i, len;
 
+	if ((NULL == n->prev && n->parent)) {
+		if (MAN_SS == n->parent->tok)
+			return(0);
+		if (MAN_SH == n->parent->tok)
+			return(0);
+	}
+
 	switch (n->tok) {
 	case (MAN_br):
 		len = 0;
@@ -702,6 +709,7 @@ pre_SS(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
+		mt->fl &= ~MANT_LITERAL;
 		mt->lmargin = term_len(p, INDENT);
 		mt->offset = term_len(p, INDENT);
 		/* If following a prior empty `SS', no vspace. */
@@ -752,6 +760,7 @@ pre_SH(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
+		mt->fl &= ~MANT_LITERAL;
 		mt->lmargin = term_len(p, INDENT);
 		mt->offset = term_len(p, INDENT);
 		/* If following a prior empty `SH', no vspace. */
@@ -896,7 +905,7 @@ print_man_node(DECL_ARGS)
 			p->flags |= TERMP_SENTENCE;
 		return;
 	case (MAN_EQN):
-		term_word(p, n->eqn->data);
+		/*term_word(p, n->eqn->data);*/
 		return;
 	case (MAN_TBL):
 		/*