===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.84
retrieving revision 1.87
diff -u -p -r1.84 -r1.87
--- mandoc/man_term.c	2010/07/23 13:22:35	1.84
+++ mandoc/man_term.c	2010/12/06 13:53:07	1.87
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.84 2010/07/23 13:22:35 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.87 2010/12/06 13:53:07 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -137,9 +137,6 @@ static	const struct termact termacts[MAN_MAX] = {
 	{ pre_ign, NULL, 0 }, /* DT */
 	{ pre_ign, NULL, 0 }, /* UC */
 	{ pre_ign, NULL, 0 }, /* PD */
- 	{ pre_sp, NULL, MAN_NOTEXT }, /* Sp */
- 	{ pre_literal, NULL, 0 }, /* Vb */
- 	{ pre_literal, NULL, 0 }, /* Ve */
 	{ pre_ign, NULL, 0 }, /* AT */
 	{ pre_in, NULL, MAN_NOTEXT }, /* in */
 };
@@ -254,11 +251,9 @@ pre_literal(DECL_ARGS)
 
 	term_newln(p);
 	switch (n->tok) {
-	case (MAN_Vb):
-		/* FALLTHROUGH */
 	case (MAN_nf):
 		mt->fl |= MANT_LITERAL;
-		return(MAN_Vb != n->tok);
+		break;
 	default:
 		mt->fl &= ~MANT_LITERAL;
 		break;
@@ -497,7 +492,7 @@ pre_PP(DECL_ARGS)
 		break;
 	}
 
-	return(1);
+	return(MAN_HEAD != n->type);
 }
 
 
@@ -915,6 +910,10 @@ print_man_foot(struct termp *p, const void *arg)
 	p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 	p->rmargin = p->maxrmargin - term_strlen(p, buf);
 	p->offset = 0;
+
+	/* term_strlen() can return zero. */
+	if (p->rmargin == p->maxrmargin)
+		p->rmargin--;
 
 	if (meta->source)
 		term_word(p, meta->source);