From: schwarze <schwarze@openbsd.org>
Date: Mon, 12 Jun 2017 22:05:41 +0000 (+0000)
Subject: If a tbl(7) layout contains a 'w' (minimum width) modifier for a
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=238123d06544a930744cad13b60ec919fd25bdc8;p=openbsd

If a tbl(7) layout contains a 'w' (minimum width) modifier for a
given column, that column contains no literal or numeric cell of
larger width, and all text block cells in that column can be line
wrapped to fit into that minimum width, groff does not increase
that column width beyond the specified minimum: so do the same.
---

diff --git a/usr.bin/mandoc/out.c b/usr.bin/mandoc/out.c
index 6c67d777884..684d6ecb527 100644
--- a/usr.bin/mandoc/out.c
+++ b/usr.bin/mandoc/out.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: out.c,v 1.38 2017/06/12 20:14:03 schwarze Exp $ */
+/*	$OpenBSD: out.c,v 1.39 2017/06/12 22:05:41 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -155,8 +155,9 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
 			if (col->width < dp->layout->width)
 				col->width = dp->layout->width;
 			tblcalc_data(tbl, col, opts, dp,
-			    rmargin && dp->block ?
-			    rmargin / (sp->opts->cols + 1) : 0);
+			    dp->block == 0 ? 0 :
+			    dp->layout->width ? dp->layout->width :
+			    rmargin ? rmargin / (sp->opts->cols + 1) : 0);
 		}
 	}