===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.59
retrieving revision 1.63
diff -u -p -r1.59 -r1.63
--- mandoc/out.c	2015/01/30 04:11:50	1.59
+++ mandoc/out.c	2017/05/01 20:54:59	1.63
@@ -1,7 +1,7 @@
-/*	$Id: out.c,v 1.59 2015/01/30 04:11:50 schwarze Exp $ */
+/*	$Id: out.c,v 1.63 2017/05/01 20:54:59 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015, 2017 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,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 	dst->unit = def == SCALE_MAX ? SCALE_BU : def;
 	dst->scale = strtod(src, &endptr);
 	if (endptr == src)
-		return(0);
+		return 0;
 
 	switch (*endptr++) {
 	case 'c':
@@ -89,12 +89,12 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 		/* FALLTHROUGH */
 	default:
 		if (SCALE_MAX == def)
-			return(0);
+			return 0;
 		dst->unit = def;
 		break;
 	}
 
-	return(*endptr == '\0' ? 2 : 1);
+	return *endptr == '\0' ? 2 : 1;
 }
 
 /*
@@ -197,9 +197,12 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 	 */
 
 	if (nxcol && totalwidth) {
-		xwidth = totalwidth - xwidth - 3*maxcol -
+		xwidth += 3*maxcol +
 		    (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?
 		     2 : !!opts->lvert + !!opts->rvert);
+		if (xwidth >= totalwidth)
+			return;
+		xwidth = totalwidth - xwidth;
 
 		/*
 		 * Emulate a bug in GNU tbl width calculation that
@@ -240,18 +243,14 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
 
 	switch (dp->layout->pos) {
 	case TBL_CELL_HORIZ:
-		/* FALLTHROUGH */
 	case TBL_CELL_DHORIZ:
 		sz = (*tbl->len)(1, tbl->arg);
 		if (col->width < sz)
 			col->width = sz;
 		break;
 	case TBL_CELL_LONG:
-		/* FALLTHROUGH */
 	case TBL_CELL_CENTRE:
-		/* FALLTHROUGH */
 	case TBL_CELL_LEFT:
-		/* FALLTHROUGH */
 	case TBL_CELL_RIGHT:
 		tblcalc_literal(tbl, col, dp);
 		break;
@@ -262,7 +261,6 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 }