===================================================================
RCS file: /cvs/mandoc/tbl_term.c,v
retrieving revision 1.55
retrieving revision 1.59
diff -u -p -r1.55 -r1.59
--- mandoc/tbl_term.c	2017/06/27 18:25:02	1.55
+++ mandoc/tbl_term.c	2018/08/19 19:32:21	1.59
@@ -1,7 +1,7 @@
-/*	$Id: tbl_term.c,v 1.55 2017/06/27 18:25:02 schwarze Exp $ */
+/*	$Id: tbl_term.c,v 1.59 2018/08/19 19:32:21 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -51,7 +51,10 @@ static	void	tbl_word(struct termp *, const struct tbl_
 static size_t
 term_tbl_sulen(const struct roffsu *su, void *arg)
 {
-	return term_hen((const struct termp *)arg, su);
+	int	 i;
+
+	i = term_hen((const struct termp *)arg, su);
+	return i > 0 ? i : 0;
 }
 
 static size_t
@@ -170,7 +173,8 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 			if (dp == NULL)
 				continue;
 			spans = dp->spans;
-			dp = dp->next;
+			if (ic || sp->layout->first->pos != TBL_CELL_SPAN)
+				dp = dp->next;
 		}
 
 		/* Set up a column for a right vertical frame. */
@@ -204,7 +208,8 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 			if (dp == NULL)
 				continue;
 			spans = dp->spans;
-			dp = dp->next;
+			if (cp->pos != TBL_CELL_SPAN)
+				dp = dp->next;
 		}
 		break;
 	}
@@ -304,7 +309,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 				}
 				if (dp != NULL) {
 					spans = dp->spans;
-					dp = dp->next;
+					if (ic || sp->layout->first->pos
+					    != TBL_CELL_SPAN)
+						dp = dp->next;
 				}
 
 				/*
@@ -453,13 +460,11 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp,
 	const struct tbl_cell *cp, *cpn, *cpp;
 	const struct roffcol *col;
 	int	 vert;
-	char	 line, cross;
+	char	 cross, line, stdcross, stdline;
 
-	line = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-';
-	cross = (kind < 3) ? '+' : '-';
+	stdline = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-';
+	stdcross = (kind < 3) ? '+' : '-';
 
-	if (kind)
-		term_word(tp, "+");
 	cp = sp->layout->first;
 	cpp = kind || sp->prev == NULL ? NULL : sp->prev->layout->first;
 	if (cpp == cp)
@@ -467,8 +472,18 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp,
 	cpn = kind > 1 || sp->next == NULL ? NULL : sp->next->layout->first;
 	if (cpn == cp)
 		cpn = NULL;
+	if (kind)
+		term_word(tp,
+		    cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|");
 	for (;;) {
 		col = tp->tbl.cols + cp->col;
+		if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) {
+			line = stdline;
+			cross = stdcross;
+		} else {
+			line = ' ';
+			cross = (kind < 3) ? '|' : ' ';
+		}
 		tbl_char(tp, line, col->width + col->spacing / 2);
 		vert = cp->vert;
 		if ((cp = cp->next) == NULL)
@@ -483,6 +498,11 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp,
 				vert = cpn->vert;
 			cpn = cpn->next;
 		}
+		if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) {
+			line = stdline;
+			cross = stdcross;
+		} else
+			line = ' ';
 		if (sp->opts->opts & TBL_OPT_ALLBOX && !vert)
 			vert = 1;
 		if (col->spacing)
@@ -493,7 +513,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp,
 			tbl_char(tp, line, (col->spacing - 3) / 2);
 	}
 	if (kind) {
-		term_word(tp, "+");
+		term_word(tp,
+		    cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|");
 		term_flushln(tp);
 	}
 }
@@ -514,14 +535,11 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts
 		break;
 	}
 
-	if (dp == NULL) {
-		tbl_char(tp, ASCII_NBRSP, col->width);
+	if (dp == NULL)
 		return;
-	}
 
 	switch (dp->pos) {
 	case TBL_DATA_NONE:
-		tbl_char(tp, ASCII_NBRSP, col->width);
 		return;
 	case TBL_DATA_HORIZ:
 	case TBL_DATA_NHORIZ:
@@ -546,7 +564,7 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts
 		tbl_number(tp, opts, dp, col);
 		break;
 	case TBL_CELL_DOWN:
-		tbl_char(tp, ASCII_NBRSP, col->width);
+	case TBL_CELL_SPAN:
 		break;
 	default:
 		abort();
@@ -617,7 +635,7 @@ tbl_number(struct termp *tp, const struct tbl_opts *op
 {
 	char		*cp;
 	char		 buf[2];
-	size_t		 sz, psz, ssz, d, padl;
+	size_t		 sz, ssz, d, padl;
 	int		 i;
 
 	/*
@@ -632,16 +650,14 @@ tbl_number(struct termp *tp, const struct tbl_opts *op
 	buf[0] = opts->decimal;
 	buf[1] = '\0';
 
-	psz = term_strlen(tp, buf);
-
 	if ((cp = strrchr(dp->string, opts->decimal)) != NULL) {
 		for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
 			buf[0] = dp->string[i];
 			ssz += term_strlen(tp, buf);
 		}
-		d = ssz + psz;
+		d = ssz;
 	} else
-		d = sz + psz;
+		d = sz;
 
 	if (col->decimal > d && col->width > sz) {
 		padl = col->decimal - d;