===================================================================
RCS file: /cvs/mandoc/tbl_term.c,v
retrieving revision 1.57
retrieving revision 1.59
diff -u -p -r1.57 -r1.59
--- mandoc/tbl_term.c	2017/07/31 16:14:10	1.57
+++ mandoc/tbl_term.c	2018/08/19 19:32:21	1.59
@@ -1,7 +1,7 @@
-/*	$Id: tbl_term.c,v 1.57 2017/07/31 16:14:10 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
@@ -460,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)
@@ -474,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)
@@ -490,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)
@@ -500,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);
 	}
 }
@@ -621,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;
 
 	/*
@@ -636,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;