===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.55
retrieving revision 1.62
diff -u -p -r1.55 -r1.62
--- mandoc/out.c	2014/12/23 03:28:01	1.55
+++ mandoc/out.c	2015/10/12 00:08:16	1.62
@@ -1,7 +1,7 @@
-/*	$Id: out.c,v 1.55 2014/12/23 03:28:01 schwarze Exp $ */
+/*	$Id: out.c,v 1.62 2015/10/12 00:08:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015 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,65 +40,61 @@ 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 1 on success and 0 on failure.
+ * Return 2 on complete success, 1 when a conversion was done,
+ * but there was trailing garbage, and 0 on total failure.
  */
 int
 a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {
 	char		*endptr;
-	double		 scale;
-	enum roffscale	 unit;
 
-	scale = strtod(src, &endptr);
-	if (endptr == src || (endptr[0] != '\0' && endptr[1] != '\0'))
-		return(0);
+	dst->unit = def == SCALE_MAX ? SCALE_BU : def;
+	dst->scale = strtod(src, &endptr);
+	if (endptr == src)
+		return 0;
 
-	switch (*endptr) {
+	switch (*endptr++) {
 	case 'c':
-		unit = SCALE_CM;
+		dst->unit = SCALE_CM;
 		break;
 	case 'i':
-		unit = SCALE_IN;
+		dst->unit = SCALE_IN;
 		break;
-	case 'P':
-		unit = SCALE_PC;
-		break;
-	case 'p':
-		unit = SCALE_PT;
-		break;
 	case 'f':
-		unit = SCALE_FS;
+		dst->unit = SCALE_FS;
 		break;
-	case 'v':
-		unit = SCALE_VS;
+	case 'M':
+		dst->unit = SCALE_MM;
 		break;
 	case 'm':
-		unit = SCALE_EM;
+		dst->unit = SCALE_EM;
 		break;
-	case '\0':
-		if (SCALE_MAX == def)
-			return(0);
-		unit = def;
+	case 'n':
+		dst->unit = SCALE_EN;
 		break;
-	case 'u':
-		unit = SCALE_BU;
+	case 'P':
+		dst->unit = SCALE_PC;
 		break;
-	case 'M':
-		unit = SCALE_MM;
+	case 'p':
+		dst->unit = SCALE_PT;
 		break;
-	case 'n':
-		unit = SCALE_EN;
+	case 'u':
+		dst->unit = SCALE_BU;
 		break;
+	case 'v':
+		dst->unit = SCALE_VS;
+		break;
+	case '\0':
+		endptr--;
+		/* FALLTHROUGH */
 	default:
-		return(0);
+		if (SCALE_MAX == def)
+			return 0;
+		dst->unit = def;
+		break;
 	}
 
-	/* FIXME: do this in the caller. */
-	if (scale < 0.0)
-		scale = 0.0;
-	dst->scale = scale;
-	dst->unit = unit;
-	return(1);
+	return *endptr == '\0' ? 2 : 1;
 }
 
 /*
@@ -111,11 +107,12 @@ void
 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
 	size_t totalwidth)
 {
+	const struct tbl_opts	*opts;
 	const struct tbl_dat	*dp;
 	struct roffcol		*col;
 	size_t			 ewidth, xwidth;
 	int			 spans;
-	int			 icol, maxcol, necol, nxcol;
+	int			 icol, maxcol, necol, nxcol, quirkcol;
 
 	/*
 	 * Allocate the master column specifiers.  These will hold the
@@ -126,6 +123,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 	assert(NULL == tbl->cols);
 	tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
 	    sizeof(struct roffcol));
+	opts = sp->opts;
 
 	for (maxcol = -1; sp; sp = sp->next) {
 		if (TBL_SPAN_DATA != sp->pos)
@@ -142,14 +140,14 @@ 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;
 			col->flags |= dp->layout->flags;
 			if (dp->layout->flags & TBL_CELL_WIGN)
 				continue;
-			tblcalc_data(tbl, col, sp->opts, dp);
+			tblcalc_data(tbl, col, opts, dp);
 		}
 	}
 
@@ -199,13 +197,35 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 	 */
 
 	if (nxcol && totalwidth) {
-		xwidth = totalwidth - 3*maxcol - xwidth;
+		xwidth = totalwidth - xwidth - 3*maxcol -
+		    (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?
+		     2 : !!opts->lvert + !!opts->rvert);
+
+		/*
+		 * Emulate a bug in GNU tbl width calculation that
+		 * manifests itself for large numbers of x-columns.
+		 * Emulating it for 5 x-columns gives identical
+		 * behaviour for up to 6 x-columns.
+		 */
+
+		if (nxcol == 5) {
+			quirkcol = xwidth % nxcol + 2;
+			if (quirkcol != 3 && quirkcol != 4)
+				quirkcol = -1;
+		} else
+			quirkcol = -1;
+
+		necol = 0;
+		ewidth = 0;
 		for (icol = 0; icol <= maxcol; icol++) {
 			col = tbl->cols + icol;
 			if ( ! (col->flags & TBL_CELL_WMAX))
 				continue;
-			col->width = xwidth / nxcol--;
-			xwidth -= col->width;
+			col->width = (double)xwidth * ++necol / nxcol
+			    - ewidth + 0.4995;
+			if (necol == quirkcol)
+				col->width--;
+			ewidth += col->width;
 		}
 	}
 }
@@ -220,18 +240,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;
@@ -242,7 +258,6 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 }