===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.58
retrieving revision 1.64
diff -u -p -r1.58 -r1.64
--- mandoc/out.c	2015/01/28 02:23:49	1.58
+++ mandoc/out.c	2017/06/08 12:54:58	1.64
@@ -1,7 +1,7 @@
-/*	$Id: out.c,v 1.58 2015/01/28 02:23:49 schwarze Exp $ */
+/*	$Id: out.c,v 1.64 2017/06/08 12:54:58 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
@@ -40,10 +40,10 @@ static	void	tblcalc_number(struct rofftbl *, struct ro
  * Parse the *src string and store a scaling unit into *dst.
  * If the string doesn't specify the unit, use the default.
  * If no default is specified, fail.
- * Return 2 on complete success, 1 when a conversion was done,
- * but there was trailing garbage, and 0 on total failure.
+ * Return a pointer to the byte after the last byte used,
+ * or NULL on total failure.
  */
-int
+const char *
 a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {
 	char		*endptr;
@@ -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 NULL;
 
 	switch (*endptr++) {
 	case 'c':
@@ -89,12 +89,11 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 		/* FALLTHROUGH */
 	default:
 		if (SCALE_MAX == def)
-			return(0);
+			return NULL;
 		dst->unit = def;
 		break;
 	}
-
-	return(*endptr == '\0' ? 2 : 1);
+	return endptr;
 }
 
 /*
@@ -140,7 +139,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 			spans = dp->spans;
 			if (1 < spans)
 				continue;
-			icol = dp->layout->head->ident;
+			icol = dp->layout->col;
 			if (maxcol < icol)
 				maxcol = icol;
 			col = tbl->cols + icol;
@@ -197,9 +196,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 +242,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 +260,6 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 }