===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.37
retrieving revision 1.86
diff -u -p -r1.37 -r1.86
--- mandoc/man_term.c	2009/10/18 11:14:04	1.37
+++ mandoc/man_term.c	2010/12/05 16:14:16	1.86
@@ -1,6 +1,6 @@
-/*	$Id: man_term.c,v 1.37 2009/10/18 11:14:04 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.86 2010/12/05 16:14:16 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,24 +14,30 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "out.h"
 #include "man.h"
 #include "term.h"
 #include "chars.h"
 #include "main.h"
-#include "out.h"
 
 #define	INDENT		  7
 #define	HALFINDENT	  3
 
+/* FIXME: have PD set the default vspace width. */
+
 struct	mtermp {
 	int		  fl;
 #define	MANT_LITERAL	 (1 << 0)
@@ -60,14 +66,25 @@ struct	mtermp {
 struct	termact {
 	int		(*pre)(DECL_ARGS);
 	void		(*post)(DECL_ARGS);
+	int		  flags;
+#define	MAN_NOTEXT	 (1 << 0) /* Never has text children. */
 };
 
+static	int		  a2width(const struct termp *, const char *);
+static	size_t		  a2height(const struct termp *, const char *);
+
+static	void		  print_man_nodelist(DECL_ARGS);
+static	void		  print_man_node(DECL_ARGS);
+static	void		  print_man_head(struct termp *, const void *);
+static	void		  print_man_foot(struct termp *, const void *);
+static	void		  print_bvspace(struct termp *, 
+				const struct man_node *);
+
 static	int		  pre_B(DECL_ARGS);
 static	int		  pre_BI(DECL_ARGS);
 static	int		  pre_HP(DECL_ARGS);
 static	int		  pre_I(DECL_ARGS);
 static	int		  pre_IP(DECL_ARGS);
-static	int		  pre_IR(DECL_ARGS);
 static	int		  pre_PP(DECL_ARGS);
 static	int		  pre_RB(DECL_ARGS);
 static	int		  pre_RI(DECL_ARGS);
@@ -75,73 +92,57 @@ static	int		  pre_RS(DECL_ARGS);
 static	int		  pre_SH(DECL_ARGS);
 static	int		  pre_SS(DECL_ARGS);
 static	int		  pre_TP(DECL_ARGS);
-static	int		  pre_br(DECL_ARGS);
-static	int		  pre_fi(DECL_ARGS);
 static	int		  pre_ign(DECL_ARGS);
-static	int		  pre_nf(DECL_ARGS);
-static	int		  pre_r(DECL_ARGS);
+static	int		  pre_in(DECL_ARGS);
+static	int		  pre_literal(DECL_ARGS);
 static	int		  pre_sp(DECL_ARGS);
 
-static	void		  post_B(DECL_ARGS);
-static	void		  post_I(DECL_ARGS);
 static	void		  post_IP(DECL_ARGS);
 static	void		  post_HP(DECL_ARGS);
 static	void		  post_RS(DECL_ARGS);
 static	void		  post_SH(DECL_ARGS);
 static	void		  post_SS(DECL_ARGS);
 static	void		  post_TP(DECL_ARGS);
-static	void		  post_i(DECL_ARGS);
 
 static	const struct termact termacts[MAN_MAX] = {
-	{ pre_br, NULL }, /* br */
-	{ NULL, NULL }, /* TH */
-	{ pre_SH, post_SH }, /* SH */
-	{ pre_SS, post_SS }, /* SS */
-	{ pre_TP, post_TP }, /* TP */
-	{ pre_PP, NULL }, /* LP */
-	{ pre_PP, NULL }, /* PP */
-	{ pre_PP, NULL }, /* P */
-	{ pre_IP, post_IP }, /* IP */
-	{ pre_HP, post_HP }, /* HP */ 
-	{ NULL, NULL }, /* SM */
-	{ pre_B, post_B }, /* SB */
-	{ pre_BI, NULL }, /* BI */
-	{ pre_BI, NULL }, /* IB */
-	{ pre_RB, NULL }, /* BR */
-	{ pre_RB, NULL }, /* RB */
-	{ NULL, NULL }, /* R */
-	{ pre_B, post_B }, /* B */
-	{ pre_I, post_I }, /* I */
-	{ pre_IR, NULL }, /* IR */
-	{ pre_RI, NULL }, /* RI */
-	{ NULL, NULL }, /* na */
-	{ pre_I, post_i }, /* i */
-	{ pre_sp, NULL }, /* sp */
-	{ pre_nf, NULL }, /* nf */
-	{ pre_fi, NULL }, /* fi */
-	{ pre_r, NULL }, /* r */
-	{ NULL, NULL }, /* RE */
-	{ pre_RS, post_RS }, /* RS */
-	{ pre_ign, NULL }, /* DT */
-	{ pre_ign, NULL }, /* UC */
+	{ pre_sp, NULL, MAN_NOTEXT }, /* br */
+	{ NULL, NULL, 0 }, /* TH */
+	{ pre_SH, post_SH, 0 }, /* SH */
+	{ pre_SS, post_SS, 0 }, /* SS */
+	{ pre_TP, post_TP, 0 }, /* TP */
+	{ pre_PP, NULL, 0 }, /* LP */
+	{ pre_PP, NULL, 0 }, /* PP */
+	{ pre_PP, NULL, 0 }, /* P */
+	{ pre_IP, post_IP, 0 }, /* IP */
+	{ pre_HP, post_HP, 0 }, /* HP */ 
+	{ NULL, NULL, 0 }, /* SM */
+	{ pre_B, NULL, 0 }, /* SB */
+	{ pre_BI, NULL, 0 }, /* BI */
+	{ pre_BI, NULL, 0 }, /* IB */
+	{ pre_RB, NULL, 0 }, /* BR */
+	{ pre_RB, NULL, 0 }, /* RB */
+	{ NULL, NULL, 0 }, /* R */
+	{ pre_B, NULL, 0 }, /* B */
+	{ pre_I, NULL, 0 }, /* I */
+	{ pre_RI, NULL, 0 }, /* IR */
+	{ pre_RI, NULL, 0 }, /* RI */
+	{ NULL, NULL, MAN_NOTEXT }, /* na */
+	{ pre_I, NULL, 0 }, /* i */
+	{ pre_sp, NULL, MAN_NOTEXT }, /* sp */
+	{ pre_literal, NULL, 0 }, /* nf */
+	{ pre_literal, NULL, 0 }, /* fi */
+	{ NULL, NULL, 0 }, /* r */
+	{ NULL, NULL, 0 }, /* RE */
+	{ pre_RS, post_RS, 0 }, /* RS */
+	{ pre_ign, NULL, 0 }, /* DT */
+	{ pre_ign, NULL, 0 }, /* UC */
+	{ pre_ign, NULL, 0 }, /* PD */
+	{ pre_ign, NULL, 0 }, /* AT */
+	{ pre_in, NULL, MAN_NOTEXT }, /* in */
 };
 
-#ifdef __linux__
-extern	size_t		  strlcpy(char *, const char *, size_t);
-extern	size_t		  strlcat(char *, const char *, size_t);
-#endif
 
-static	void		  print_head(struct termp *, 
-				const struct man_meta *);
-static	void		  print_body(DECL_ARGS);
-static	void		  print_node(DECL_ARGS);
-static	void		  print_foot(struct termp *, 
-				const struct man_meta *);
-static	void		  fmt_block_vspace(struct termp *, 
-				const struct man_node *);
-static	int		  a2width(const char *);
 
-
 void
 terminal_man(void *arg, const struct man *man)
 {
@@ -152,6 +153,10 @@ terminal_man(void *arg, const struct man *man)
 
 	p = (struct termp *)arg;
 
+	p->overstep = 0;
+	p->maxrmargin = p->defrmargin;
+	p->tabwidth = term_len(p, 5);
+
 	if (NULL == p->symtab)
 		switch (p->enc) {
 		case (TERMENC_ASCII):
@@ -165,165 +170,100 @@ terminal_man(void *arg, const struct man *man)
 	n = man_node(man);
 	m = man_meta(man);
 
-	print_head(p, m);
+	term_begin(p, print_man_head, print_man_foot, m);
 	p->flags |= TERMP_NOSPACE;
 
 	mt.fl = 0;
-	mt.lmargin = INDENT;
-	mt.offset = INDENT;
+	mt.lmargin = term_len(p, INDENT);
+	mt.offset = term_len(p, INDENT);
 
 	if (n->child)
-		print_body(p, &mt, n->child, m);
-	print_foot(p, m);
+		print_man_nodelist(p, &mt, n->child, m);
+
+	term_end(p);
 }
 
 
-static void
-fmt_block_vspace(struct termp *p, const struct man_node *n)
+static size_t
+a2height(const struct termp *p, const char *cp)
 {
-	term_newln(p);
+	struct roffsu	 su;
 
-	if (NULL == n->prev)
-		return;
+	if ( ! a2roffsu(cp, &su, SCALE_VS))
+		SCALE_VS_INIT(&su, term_strlen(p, cp));
 
-	if (MAN_SS == n->prev->tok)
-		return;
-	if (MAN_SH == n->prev->tok)
-		return;
-
-	term_vspace(p);
+	return(term_vspan(p, &su));
 }
 
 
 static int
-a2width(const char *p)
+a2width(const struct termp *p, const char *cp)
 {
 	struct roffsu	 su;
-	double		 r;
 
-	if ( ! a2roffsu(p, &su)) 
+	if ( ! a2roffsu(cp, &su, SCALE_BU))
 		return(-1);
 
-	switch (su.unit) {
-	case (SCALE_CM):
-		r = 4 * su.scale;
-		break;
-	case (SCALE_IN):
-		r = 10 * su.scale;
-		break;
-	case (SCALE_PC):
-		r = 2 * su.scale;
-		break;
-	case (SCALE_PT):
-		r = (su.scale / 10) + 1;
-		break;
-	case (SCALE_MM):
-		r = su.scale / 1000;
-		break;
-	case (SCALE_VS):
-		r = su.scale * 2 - 1;
-		break;
-	default:
-		r = su.scale + 1;
-		break;
-	}
-
-	if (r < 0.0)
-		r = 0.0;
-	return((int)/* LINTED */
-			r);
+	return((int)term_hspan(p, &su));
 }
 
 
-/* ARGSUSED */
-static int
-pre_ign(DECL_ARGS)
+static void
+print_bvspace(struct termp *p, const struct man_node *n)
 {
+	term_newln(p);
 
-	return(0);
-}
+	if (NULL == n->prev)
+		return;
 
+	if (MAN_SS == n->prev->tok)
+		return;
+	if (MAN_SH == n->prev->tok)
+		return;
 
-/* ARGSUSED */
-static int
-pre_I(DECL_ARGS)
-{
-
-	p->under++;
-	return(1);
+	term_vspace(p);
 }
 
 
 /* ARGSUSED */
 static int
-pre_r(DECL_ARGS)
+pre_ign(DECL_ARGS)
 {
 
-	p->bold = p->under = 0;
-	return(1);
+	return(0);
 }
 
 
 /* ARGSUSED */
-static void
-post_i(DECL_ARGS)
-{
-
-	if (n->nchild)
-		p->under--;
-}
-
-
-/* ARGSUSED */
-static void
-post_I(DECL_ARGS)
-{
-
-	p->under--;
-}
-
-
-/* ARGSUSED */
 static int
-pre_fi(DECL_ARGS)
+pre_I(DECL_ARGS)
 {
 
-	mt->fl &= ~MANT_LITERAL;
+	term_fontrepl(p, TERMFONT_UNDER);
 	return(1);
 }
 
 
 /* ARGSUSED */
 static int
-pre_nf(DECL_ARGS)
+pre_literal(DECL_ARGS)
 {
 
 	term_newln(p);
-	mt->fl |= MANT_LITERAL;
+	switch (n->tok) {
+	case (MAN_nf):
+		mt->fl |= MANT_LITERAL;
+		break;
+	default:
+		mt->fl &= ~MANT_LITERAL;
+		break;
+	}
+
 	return(1);
 }
 
 
-/* ARGSUSED */
-static int
-pre_IR(DECL_ARGS)
-{
-	const struct man_node *nn;
-	int		 i;
 
-	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if ( ! (i % 2))
-			p->under++;
-		if (i > 0)
-			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
-		if ( ! (i % 2))
-			p->under--;
-	}
-	return(0);
-}
-
-
 /* ARGSUSED */
 static int
 pre_RB(DECL_ARGS)
@@ -333,19 +273,16 @@ pre_RB(DECL_ARGS)
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
 		if (i % 2 && MAN_RB == n->tok)
-			p->bold++;
+			term_fontrepl(p, TERMFONT_BOLD);
 		else if ( ! (i % 2) && MAN_RB != n->tok)
-			p->bold++;
+			term_fontrepl(p, TERMFONT_BOLD);
+		else
+			term_fontrepl(p, TERMFONT_NONE);
 
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
 
-		print_node(p, mt, nn, m);
-
-		if (i % 2 && MAN_RB == n->tok)
-			p->bold--;
-		else if ( ! (i % 2) && MAN_RB != n->tok)
-			p->bold--;
+		print_man_node(p, mt, nn, m);
 	}
 	return(0);
 }
@@ -359,13 +296,17 @@ pre_RI(DECL_ARGS)
 	int		 i;
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if ( ! (i % 2))
-			p->under++;
+		if (i % 2 && MAN_RI == n->tok)
+			term_fontrepl(p, TERMFONT_UNDER);
+		else if ( ! (i % 2) && MAN_RI != n->tok)
+			term_fontrepl(p, TERMFONT_UNDER);
+		else
+			term_fontrepl(p, TERMFONT_NONE);
+
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
-		if ( ! (i % 2))
-			p->under--;
+
+		print_man_node(p, mt, nn, m);
 	}
 	return(0);
 }
@@ -380,26 +321,18 @@ pre_BI(DECL_ARGS)
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
 		if (i % 2 && MAN_BI == n->tok)
-			p->under++;
+			term_fontrepl(p, TERMFONT_UNDER);
 		else if (i % 2)
-			p->bold++;
+			term_fontrepl(p, TERMFONT_BOLD);
 		else if (MAN_BI == n->tok)
-			p->bold++;
+			term_fontrepl(p, TERMFONT_BOLD);
 		else
-			p->under++;
+			term_fontrepl(p, TERMFONT_UNDER);
 
 		if (i)
 			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
 
-		if (i % 2 && MAN_BI == n->tok)
-			p->under--;
-		else if (i % 2)
-			p->bold--;
-		else if (MAN_BI == n->tok)
-			p->bold--;
-		else
-			p->under--;
+		print_man_node(p, mt, nn, m);
 	}
 	return(0);
 }
@@ -410,17 +343,49 @@ static int
 pre_B(DECL_ARGS)
 {
 
-	p->bold++;
+	term_fontrepl(p, TERMFONT_BOLD);
 	return(1);
 }
 
 
 /* ARGSUSED */
-static void
-post_B(DECL_ARGS)
+static int
+pre_in(DECL_ARGS)
 {
+	int		 len, less;
+	size_t		 v;
+	const char	*cp;
 
-	p->bold--;
+	term_newln(p);
+
+	if (NULL == n->child) {
+		p->offset = mt->offset;
+		return(0);
+	}
+
+	cp = n->child->string;
+	less = 0;
+
+	if ('-' == *cp)
+		less = -1;
+	else if ('+' == *cp)
+		less = 1;
+	else
+		cp--;
+
+	if ((len = a2width(p, ++cp)) < 0)
+		return(0);
+
+	v = (size_t)len;
+
+	if (less < 0)
+		p->offset -= p->offset > v ? v : p->offset;
+	else if (less > 0)
+		p->offset += v;
+	else 
+		p->offset = v;
+
+	return(0);
 }
 
 
@@ -428,14 +393,17 @@ post_B(DECL_ARGS)
 static int
 pre_sp(DECL_ARGS)
 {
-	int		 i, len;
+	size_t		 i, len;
 
-	if (NULL == n->child) {
-		term_vspace(p);
-		return(0);
+	switch (n->tok) {
+	case (MAN_br):
+		len = 0;
+		break;
+	default:
+		len = n->child ? a2height(p, n->child->string) : 1;
+		break;
 	}
 
-	len = atoi(n->child->string);
 	if (0 == len)
 		term_newln(p);
 	for (i = 0; i < len; i++)
@@ -447,16 +415,6 @@ pre_sp(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-pre_br(DECL_ARGS)
-{
-
-	term_newln(p);
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 pre_HP(DECL_ARGS)
 {
 	size_t			 len;
@@ -465,7 +423,7 @@ pre_HP(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		return(1);
 	case (MAN_BODY):
 		p->flags |= TERMP_NOBREAK;
@@ -480,14 +438,12 @@ pre_HP(DECL_ARGS)
 
 	/* Calculate offset. */
 
-	if (NULL != (nn = n->parent->head->child)) {
-		assert(MAN_TEXT == nn->type);
-		if ((ival = a2width(nn->string)) >= 0)
+	if (NULL != (nn = n->parent->head->child))
+		if ((ival = a2width(p, nn->string)) >= 0)
 			len = (size_t)ival;
-	}
 
 	if (0 == len)
-		len = 1;
+		len = term_len(p, 1);
 
 	p->offset = mt->offset;
 	p->rmargin = mt->offset + len;
@@ -528,8 +484,8 @@ pre_PP(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
-		mt->lmargin = INDENT;
-		fmt_block_vspace(p, n);
+		mt->lmargin = term_len(p, INDENT);
+		print_bvspace(p, n);
 		break;
 	default:
 		p->offset = mt->offset;
@@ -555,10 +511,9 @@ pre_IP(DECL_ARGS)
 		break;
 	case (MAN_HEAD):
 		p->flags |= TERMP_NOBREAK;
-		p->flags |= TERMP_TWOSPACE;
 		break;
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		/* FALLTHROUGH */
 	default:
 		return(1);
@@ -573,8 +528,7 @@ pre_IP(DECL_ARGS)
 		if (NULL != (nn = nn->next)) {
 			for ( ; nn->next; nn = nn->next)
 				/* Do nothing. */ ;
-			assert(MAN_TEXT == nn->type);
-			if ((ival = a2width(nn->string)) >= 0)
+			if ((ival = a2width(p, nn->string)) >= 0)
 				len = (size_t)ival;
 		}
 
@@ -582,7 +536,7 @@ pre_IP(DECL_ARGS)
 	case (MAN_HEAD):
 		/* Handle zero-width lengths. */
 		if (0 == len)
-			len = 1;
+			len = term_len(p, 1);
 
 		p->offset = mt->offset;
 		p->rmargin = mt->offset + len;
@@ -594,7 +548,7 @@ pre_IP(DECL_ARGS)
 
 		/* Don't print the length value. */
 		for (nn = n->child; nn->next; nn = nn->next)
-			print_node(p, mt, nn, m);
+			print_man_node(p, mt, nn, m);
 		return(0);
 	case (MAN_BODY):
 		p->offset = mt->offset + len;
@@ -617,7 +571,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):
@@ -648,7 +601,7 @@ pre_TP(DECL_ARGS)
 		p->flags |= TERMP_NOSPACE;
 		break;
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		/* FALLTHROUGH */
 	default:
 		return(1);
@@ -659,18 +612,19 @@ pre_TP(DECL_ARGS)
 
 	/* Calculate offset. */
 
-	if (NULL != (nn = n->parent->head->child))
-		if (NULL != nn->next) {
-			assert(MAN_TEXT == nn->type);
-			if ((ival = a2width(nn->string)) >= 0)
+	if (NULL != (nn = n->parent->head->child)) {
+		while (nn && MAN_TEXT != nn->type)
+			nn = nn->next;
+		if (nn && nn->next)
+			if ((ival = a2width(p, nn->string)) >= 0)
 				len = (size_t)ival;
-		}
+	}
 
 	switch (n->type) {
 	case (MAN_HEAD):
 		/* Handle zero-length properly. */
 		if (0 == len)
-			len = 1;
+			len = term_len(p, 1);
 
 		p->offset = mt->offset;
 		p->rmargin = mt->offset + len;
@@ -678,7 +632,7 @@ pre_TP(DECL_ARGS)
 		/* Don't print same-line elements. */
 		for (nn = n->child; nn; nn = nn->next) 
 			if (nn->line > n->line)
-				print_node(p, mt, nn, m);
+				print_man_node(p, mt, nn, m);
 
 		if (ival >= 0)
 			mt->lmargin = (size_t)ival;
@@ -725,8 +679,8 @@ pre_SS(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
-		mt->lmargin = INDENT;
-		mt->offset = INDENT;
+		mt->lmargin = term_len(p, INDENT);
+		mt->offset = term_len(p, INDENT);
 		/* If following a prior empty `SS', no vspace. */
 		if (n->prev && MAN_SS == n->prev->tok)
 			if (NULL == n->prev->body->child)
@@ -736,8 +690,8 @@ pre_SS(DECL_ARGS)
 		term_vspace(p);
 		break;
 	case (MAN_HEAD):
-		p->bold++;
-		p->offset = HALFINDENT;
+		term_fontrepl(p, TERMFONT_BOLD);
+		p->offset = term_len(p, HALFINDENT);
 		break;
 	case (MAN_BODY):
 		p->offset = mt->offset;
@@ -758,7 +712,6 @@ post_SS(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_HEAD):
 		term_newln(p);
-		p->bold--;
 		break;
 	case (MAN_BODY):
 		term_newln(p);
@@ -776,16 +729,19 @@ pre_SH(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
-		mt->lmargin = INDENT;
-		mt->offset = INDENT;
+		mt->lmargin = term_len(p, INDENT);
+		mt->offset = term_len(p, INDENT);
 		/* If following a prior empty `SH', no vspace. */
 		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):
-		p->bold++;
+		term_fontrepl(p, TERMFONT_BOLD);
 		p->offset = 0;
 		break;
 	case (MAN_BODY):
@@ -807,7 +763,6 @@ post_SH(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_HEAD):
 		term_newln(p);
-		p->bold--;
 		break;
 	case (MAN_BODY):
 		term_newln(p);
@@ -836,16 +791,15 @@ pre_RS(DECL_ARGS)
 	}
 
 	if (NULL == (nn = n->parent->head->child)) {
-		mt->offset = mt->lmargin + INDENT;
+		mt->offset = mt->lmargin + term_len(p, INDENT);
 		p->offset = mt->offset;
 		return(1);
 	}
 
-	assert(MAN_TEXT == nn->type);
-	if ((ival = a2width(nn->string)) < 0)
+	if ((ival = a2width(p, nn->string)) < 0)
 		return(1);
 
-	mt->offset = INDENT + (size_t)ival;
+	mt->offset = term_len(p, INDENT) + (size_t)ival;
 	p->offset = mt->offset;
 
 	return(1);
@@ -859,20 +813,23 @@ post_RS(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
-		mt->offset = mt->lmargin = INDENT;
+		mt->offset = mt->lmargin = term_len(p, INDENT);
 		break;
+	case (MAN_HEAD):
+		break;
 	default:
 		term_newln(p);
-		p->offset = INDENT;
+		p->offset = term_len(p, INDENT);
 		break;
 	}
 }
 
 
 static void
-print_node(DECL_ARGS)
+print_man_node(DECL_ARGS)
 {
-	int		 c, sz;
+	size_t		 rm, rmax;
+	int		 c;
 
 	c = 1;
 
@@ -882,66 +839,82 @@ print_node(DECL_ARGS)
 			term_vspace(p);
 			break;
 		}
-		/*
-		 * Note!  This is hacky.  Here, we recognise the `\c'
-		 * escape embedded in so many -man pages.  It's supposed
-		 * to remove the subsequent space, so we mark NOSPACE if
-		 * it's encountered in the string.
-		 */
-		sz = (int)strlen(n->string);
+
 		term_word(p, n->string);
-		if (sz >= 2 && n->string[sz - 1] == 'c' &&
-				n->string[sz - 2] == '\\')
-			p->flags |= TERMP_NOSPACE;
+
 		/* 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:
+		if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
+			term_fontrepl(p, TERMFONT_NONE);
 		if (termacts[n->tok].pre)
 			c = (*termacts[n->tok].pre)(p, mt, n, m);
 		break;
 	}
 
 	if (c && n->child)
-		print_body(p, mt, n->child, m);
+		print_man_nodelist(p, mt, n->child, m);
 
-	if (MAN_TEXT != n->type)
+	if (MAN_TEXT != n->type) {
 		if (termacts[n->tok].post)
 			(*termacts[n->tok].post)(p, mt, n, m);
+		if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
+			term_fontrepl(p, TERMFONT_NONE);
+	}
+
+	if (MAN_EOS & n->flags)
+		p->flags |= TERMP_SENTENCE;
 }
 
 
 static void
-print_body(DECL_ARGS)
+print_man_nodelist(DECL_ARGS)
 {
 
-	print_node(p, mt, n, m);
+	print_man_node(p, mt, n, m);
 	if ( ! n->next)
 		return;
-	print_body(p, mt, n->next, m);
+	print_man_nodelist(p, mt, n->next, m);
 }
 
 
 static void
-print_foot(struct termp *p, const struct man_meta *meta)
+print_man_foot(struct termp *p, const void *arg)
 {
-	struct tm	*tm;
-	char		 buf[BUFSIZ];
+	char		buf[DATESIZ];
+	const struct man_meta *meta;
 
-	tm = localtime(&meta->date);
+	meta = (const struct man_meta *)arg;
 
-	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-		(void)strlcpy(buf, "(invalid date)", BUFSIZ);
+	term_fontrepl(p, TERMFONT_NONE);
 
+	if (meta->rawdate)
+		strlcpy(buf, meta->rawdate, DATESIZ);
+	else
+		time2a(meta->date, buf, DATESIZ);
+
 	term_vspace(p);
+	term_vspace(p);
+	term_vspace(p);
 
 	p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
-	p->rmargin = p->maxrmargin - strlen(buf);
+	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);
 	if (meta->source)
@@ -959,28 +932,37 @@ print_foot(struct termp *p, const struct man_meta *met
 
 
 static void
-print_head(struct termp *p, const struct man_meta *meta)
+print_man_head(struct termp *p, const void *arg)
 {
-	char		*buf, *title;
+	char		buf[BUFSIZ], title[BUFSIZ];
+	size_t		buflen, titlen;
+	const struct man_meta *m;
 
+	m = (const struct man_meta *)arg;
+
+	/*
+	 * 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;
+	buf[0] = title[0] = '\0';
 
-	if (NULL == (buf = malloc(p->rmargin)))
-		err(EXIT_FAILURE, "malloc");
-	if (NULL == (title = malloc(p->rmargin)))
-		err(EXIT_FAILURE, "malloc");
+	if (m->vol)
+		strlcpy(buf, m->vol, BUFSIZ);
+	buflen = term_strlen(p, buf);
 
-	if (meta->vol)
-		(void)strlcpy(buf, meta->vol, p->rmargin);
-	else
-		*buf = 0;
+	snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
+	titlen = term_strlen(p, title);
 
-	(void)snprintf(title, p->rmargin, "%s(%d)", 
-			meta->title, meta->msec);
-
 	p->offset = 0;
-	p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
+	p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
+	    (p->maxrmargin - 
+	     term_strlen(p, buf) + term_len(p, 1)) / 2 :
+	    p->maxrmargin - buflen;
 	p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
 	term_word(p, title);
@@ -988,24 +970,31 @@ print_head(struct termp *p, const struct man_meta *met
 
 	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
 	p->offset = p->rmargin;
-	p->rmargin = p->maxrmargin - strlen(title);
+	p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
+	    p->maxrmargin - titlen : p->maxrmargin;
 
 	term_word(p, buf);
 	term_flushln(p);
 
-	p->offset = p->rmargin;
-	p->rmargin = p->maxrmargin;
 	p->flags &= ~TERMP_NOBREAK;
-	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+	if (p->rmargin + titlen <= p->maxrmargin) {
+		p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+		p->offset = p->rmargin;
+		p->rmargin = p->maxrmargin;
+		term_word(p, title);
+		term_flushln(p);
+	}
 
-	term_word(p, title);
-	term_flushln(p);
-
 	p->rmargin = p->maxrmargin;
 	p->offset = 0;
 	p->flags &= ~TERMP_NOSPACE;
 
-	free(title);
-	free(buf);
-}
+	/* 
+	 * Groff likes to have some leading spaces before content.  Well
+	 * that's fine by me.
+	 */
 
+	term_vspace(p);
+	term_vspace(p);
+	term_vspace(p);
+}