===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.59
retrieving revision 1.66
diff -u -p -r1.59 -r1.66
--- mandoc/man_term.c	2010/03/24 20:10:53	1.59
+++ mandoc/man_term.c	2010/05/15 17:25:21	1.66
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.59 2010/03/24 20:10:53 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.66 2010/05/15 17:25:21 joerg Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -163,7 +163,7 @@ terminal_man(void *arg, const struct man *man)
 	p = (struct termp *)arg;
 
 	p->overstep = 0;
-	p->maxrmargin = 65;
+	p->maxrmargin = p->defrmargin;
 
 	if (NULL == p->symtab)
 		switch (p->enc) {
@@ -260,7 +260,6 @@ static int
 pre_fi(DECL_ARGS)
 {
 
-	p->rmargin = p->maxrmargin = 65;
 	mt->fl &= ~MANT_LITERAL;
 	return(1);
 }
@@ -271,10 +270,7 @@ static int
 pre_nf(DECL_ARGS)
 {
 
-	p->rmargin = p->maxrmargin = 78;
-	term_newln(p);
 	mt->fl |= MANT_LITERAL;
-
 	return(MAN_Vb != n->tok);
 }
 
@@ -373,7 +369,7 @@ pre_sp(DECL_ARGS)
 
 	if (0 == len)
 		term_newln(p);
-	for (i = 0; i < len; i++)
+	for (i = 0; i <= len; i++)
 		term_vspace(p);
 
 	return(0);
@@ -488,7 +484,6 @@ pre_IP(DECL_ARGS)
 		break;
 	case (MAN_HEAD):
 		p->flags |= TERMP_NOBREAK;
-		p->flags |= TERMP_TWOSPACE;
 		break;
 	case (MAN_BLOCK):
 		print_bvspace(p, n);
@@ -549,7 +544,6 @@ post_IP(DECL_ARGS)
 	case (MAN_HEAD):
 		term_flushln(p);
 		p->flags &= ~TERMP_NOBREAK;
-		p->flags &= ~TERMP_TWOSPACE;
 		p->rmargin = p->maxrmargin;
 		break;
 	case (MAN_BODY):
@@ -714,6 +708,9 @@ pre_SH(DECL_ARGS)
 		if (n->prev && MAN_SH == n->prev->tok)
 			if (NULL == n->prev->body->child)
 				break;
+		/* If the first macro, no vspae. */
+		if (NULL == n->prev)
+			break;
 		term_vspace(p);
 		break;
 	case (MAN_HEAD):
@@ -804,6 +801,7 @@ post_RS(DECL_ARGS)
 static void
 print_man_node(DECL_ARGS)
 {
+	size_t		 rm, rmax;
 	int		 c;
 
 	c = 1;
@@ -820,8 +818,13 @@ print_man_node(DECL_ARGS)
 		/* FIXME: this means that macro lines are munged!  */
 
 		if (MANT_LITERAL & mt->fl) {
+			rm = p->rmargin;
+			rmax = p->maxrmargin;
+			p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 			p->flags |= TERMP_NOSPACE;
 			term_flushln(p);
+			p->rmargin = rm;
+			p->maxrmargin = rmax;
 		}
 		break;
 	default:
@@ -841,6 +844,9 @@ print_man_node(DECL_ARGS)
 		if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
 			term_fontrepl(p, TERMFONT_NONE);
 	}
+
+	if (MAN_EOS & n->flags)
+		p->flags |= TERMP_SENTENCE;
 }
 
 
@@ -892,6 +898,12 @@ print_man_head(struct termp *p, const struct man_meta 
 	char		buf[BUFSIZ], title[BUFSIZ];
 	size_t		buflen, titlen;
 
+	/*
+	 * Note that old groff would spit out some spaces before the
+	 * header.  We discontinue this strange behaviour, but at one
+	 * point we did so here.
+	 */
+
 	p->rmargin = p->maxrmargin;
 
 	p->offset = 0;
@@ -901,7 +913,7 @@ print_man_head(struct termp *p, const struct man_meta 
 		strlcpy(buf, m->vol, BUFSIZ);
 	buflen = strlen(buf);
 
-	snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
+	snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
 	titlen = strlen(title);
 
 	p->offset = 0;
@@ -933,4 +945,13 @@ print_man_head(struct termp *p, const struct man_meta 
 	p->rmargin = p->maxrmargin;
 	p->offset = 0;
 	p->flags &= ~TERMP_NOSPACE;
+
+	/* 
+	 * Groff likes to have some leading spaces before content.  Well
+	 * that's fine by me.
+	 */
+
+	term_vspace(p);
+	term_vspace(p);
+	term_vspace(p);
 }