===================================================================
RCS file: /cvs/mandoc/tbl_layout.c,v
retrieving revision 1.27
retrieving revision 1.29
diff -u -p -r1.27 -r1.29
--- mandoc/tbl_layout.c	2014/08/10 23:54:41	1.27
+++ mandoc/tbl_layout.c	2014/10/14 02:16:06	1.29
@@ -1,4 +1,4 @@
-/*	$Id: tbl_layout.c,v 1.27 2014/08/10 23:54:41 schwarze Exp $ */
+/*	$Id: tbl_layout.c,v 1.29 2014/10/14 02:16:06 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -168,6 +168,9 @@ mod:
 		goto mod;
 	case 'w':  /* XXX for now, ignore minimal column width */
 		goto mod;
+	case 'x':
+		cp->flags |= TBL_CELL_WMAX;
+		goto mod;
 	case 'f':
 		break;
 	case 'r':
@@ -200,6 +203,11 @@ mod:
 		goto mod;
 	default:
 		break;
+	}
+	if (isalnum((unsigned char)p[*pos - 1])) {
+		mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,
+		    ln, *pos - 1, "TS f%c", p[*pos - 1]);
+		goto mod;
 	}
 
 	mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse,