===================================================================
RCS file: /cvs/mandoc/tbl_term.c,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -p -r1.6 -r1.10
--- mandoc/tbl_term.c	2011/01/03 16:04:41	1.6
+++ mandoc/tbl_term.c	2011/01/04 15:02:00	1.10
@@ -1,4 +1,4 @@
-/*	$Id: tbl_term.c,v 1.6 2011/01/03 16:04:41 kristaps Exp $ */
+/*	$Id: tbl_term.c,v 1.10 2011/01/04 15:02:00 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -40,9 +40,6 @@ static	void		 tbl_data_number(struct termp *, 
 static	void		 tbl_data_literal(struct termp *, 
 				const struct tbl_dat *, 
 				const struct termp_tbl *);
-static	void		 tbl_data_spanner(struct termp *, 
-				const struct tbl_dat *, 
-				const struct termp_tbl *);
 static	void		 tbl_data(struct termp *, const struct tbl *,
 				const struct tbl_dat *, 
 				const struct termp_tbl *);
@@ -209,9 +206,6 @@ tbl_hframe(struct termp *tp, const struct tbl_span *sp
 			TBL_OPT_DBOX & sp->tbl->opts))
 		return;
 
-	tp->flags |= TERMP_NONOSPACE;
-	tp->flags |= TERMP_NOSPACE;
-
 	/* 
 	 * Print out the horizontal part of a frame or double frame.  A
 	 * double frame has an unbroken `-' outer line the width of the
@@ -259,10 +253,18 @@ tbl_data(struct termp *tp, const struct tbl *tbl,
 	}
 
 	switch (dp->pos) {
+	case (TBL_DATA_NONE):
+		tbl_char(tp, ASCII_NBRSP, tbp->width);
+		return;
 	case (TBL_DATA_HORIZ):
 		/* FALLTHROUGH */
+	case (TBL_DATA_NHORIZ):
+		tbl_char(tp, '-', tbp->width);
+		return;
+	case (TBL_DATA_NDHORIZ):
+		/* FALLTHROUGH */
 	case (TBL_DATA_DHORIZ):
-		tbl_data_spanner(tp, dp, tbp);
+		tbl_char(tp, '=', tbp->width);
 		return;
 	default:
 		break;
@@ -272,10 +274,10 @@ tbl_data(struct termp *tp, const struct tbl *tbl,
 
 	switch (pos) {
 	case (TBL_CELL_HORIZ):
-		/* FALLTHROUGH */
+		tbl_char(tp, '-', tbp->width);
+		break;
 	case (TBL_CELL_DHORIZ):
-		/* FIXME: THIS IS WRONG. */
-		tbl_data_spanner(tp, dp, tbp);
+		tbl_char(tp, '=', tbp->width);
 		break;
 	case (TBL_CELL_LONG):
 		/* FALLTHROUGH */
@@ -319,7 +321,6 @@ tbl_vframe(struct termp *tp, const struct tbl *tbl)
 		term_word(tp, "|");
 }
 
-
 static inline void
 tbl_char(struct termp *tp, char c, int len)
 {
@@ -336,26 +337,6 @@ tbl_char(struct termp *tp, char c, int len)
 }
 
 static void
-tbl_data_spanner(struct termp *tp, 
-		const struct tbl_dat *dp, 
-		const struct termp_tbl *tblp)
-{
-
-	switch (dp->pos) {
-	case (TBL_DATA_HORIZ):
-	case (TBL_DATA_NHORIZ):
-		tbl_char(tp, '-', tblp->width);
-		break;
-	case (TBL_DATA_DHORIZ):
-	case (TBL_DATA_NDHORIZ):
-		tbl_char(tp, '=', tblp->width);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
 tbl_data_literal(struct termp *tp, 
 		const struct tbl_dat *dp, 
 		const struct termp_tbl *tblp)
@@ -442,14 +423,9 @@ tbl_calc(struct termp *tp, const struct tbl_span *sp)
 	hp = sp->head;
 
 	for ( ; sp; sp = sp->next) {
-		switch (sp->pos) {
-		case (TBL_DATA_HORIZ):
-			/* FALLTHROUGH */
-		case (TBL_DATA_DHORIZ):
+		if (TBL_SPAN_DATA != sp->pos)
 			continue;
-		default:
-			break;
-		}
+
 		for (dp = sp->first; dp; dp = dp->next) {
 			if (NULL == dp->layout)
 				continue;
@@ -477,6 +453,7 @@ static void
 tbl_calc_data(struct termp *tp, const struct tbl *tbl, 
 		const struct tbl_dat *dp, struct termp_tbl *tblp)
 {
+	int		 sz;
 
 	/* Branch down into data sub-types. */
 
@@ -484,7 +461,9 @@ tbl_calc_data(struct termp *tp, const struct tbl *tbl,
 	case (TBL_CELL_HORIZ):
 		/* FALLTHROUGH */
 	case (TBL_CELL_DHORIZ):
-		tblp->width = 1;
+		sz = term_len(tp, 1);
+		if (tblp->width < sz)
+			tblp->width = sz;
 		break;
 	case (TBL_CELL_LONG):
 		/* FALLTHROUGH */
@@ -555,7 +534,7 @@ tbl_calc_data_literal(struct termp *tp, 
 		const struct tbl_dat *dp, 
 		struct termp_tbl *tblp)
 {
-	int		 sz, bufsz;
+	int		 sz, bufsz, spsz;
 
 	/* 
 	 * Calculate our width and use the spacing, with a minimum
@@ -570,16 +549,19 @@ tbl_calc_data_literal(struct termp *tp, 
 	case (TBL_CELL_LONG):
 		/* FALLTHROUGH */
 	case (TBL_CELL_CENTRE):
-		bufsz = 2;
+		bufsz = term_len(tp, 2);
 		break;
 	default:
-		bufsz = 1;
+		bufsz = term_len(tp, 1);
 		break;
 	}
 
+	spsz = 0;
 	if (dp->layout->spacing)
-		bufsz = bufsz > dp->layout->spacing ? 
-			bufsz : dp->layout->spacing;
+		spsz = term_len(tp, dp->layout->spacing);
+
+	if (spsz)
+		bufsz = bufsz > spsz ?  bufsz : spsz;
 
 	sz += bufsz;
 	if (tblp->width < sz)