===================================================================
RCS file: /cvs/mandoc/tbl_layout.c,v
retrieving revision 1.38
retrieving revision 1.43
diff -u -p -r1.38 -r1.43
--- mandoc/tbl_layout.c	2015/02/10 11:03:13	1.38
+++ mandoc/tbl_layout.c	2017/06/13 16:12:01	1.43
@@ -1,7 +1,7 @@
-/*	$Id: tbl_layout.c,v 1.38 2015/02/10 11:03:13 schwarze Exp $ */
+/*	$Id: tbl_layout.c,v 1.43 2017/06/13 16:12:01 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012, 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
@@ -62,6 +62,7 @@ mods(struct tbl_node *tbl, struct tbl_cell *cp,
 		int ln, const char *p, int *pos)
 {
 	char		*endptr;
+	size_t		 sz;
 
 mod:
 	while (p[*pos] == ' ' || p[*pos] == '\t')
@@ -115,7 +116,6 @@ mod:
 		    ln, *pos, "m");
 		goto mod;
 	case 'p':
-		/* FALLTHROUGH */
 	case 'v':
 		if (p[*pos] == '-' || p[*pos] == '+')
 			(*pos)++;
@@ -128,7 +128,22 @@ mod:
 	case 'u':
 		cp->flags |= TBL_CELL_UP;
 		goto mod;
-	case 'w':  /* XXX for now, ignore minimal column width */
+	case 'w':
+		sz = 0;
+		if (p[*pos] == '(') {
+			(*pos)++;
+			while (p[*pos + sz] != '\0' && p[*pos + sz] != ')')
+				sz++;
+		} else
+			while (isdigit((unsigned char)p[*pos + sz]))
+				sz++;
+		if (sz) {
+			free(cp->wstr);
+			cp->wstr = mandoc_strndup(p + *pos, sz);
+			*pos += sz;
+			if (p[*pos] == ')')
+				(*pos)++;
+		}
 		goto mod;
 	case 'x':
 		cp->flags |= TBL_CELL_WMAX;
@@ -168,17 +183,14 @@ mod:
 
 	switch (p[(*pos)++]) {
 	case '3':
-		/* FALLTHROUGH */
 	case 'B':
 		cp->flags |= TBL_CELL_BOLD;
 		goto mod;
 	case '2':
-		/* FALLTHROUGH */
 	case 'I':
 		cp->flags |= TBL_CELL_ITALIC;
 		goto mod;
 	case '1':
-		/* FALLTHROUGH */
 	case 'R':
 		goto mod;
 	default:
@@ -286,6 +298,8 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p
 				    tbl->parse, ln, pos, NULL);
 				cell_alloc(tbl, tbl->first_row,
 				    TBL_CELL_LEFT);
+				if (tbl->opts.lvert < tbl->first_row->vert)
+					tbl->opts.lvert = tbl->first_row->vert;
 				return;
 			}
 
@@ -308,6 +322,7 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p
 				    rp->next->first == NULL) {
 					free(rp->next);
 					rp->next = NULL;
+					tbl->last_row = rp;
 				}
 			}
 			return;
@@ -354,5 +369,5 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e
 	if (tbl->opts.cols <= p->col)
 		tbl->opts.cols = p->col + 1;
 
-	return(p);
+	return p;
 }