Grrr, patch(1) merged the new function to the wrong place in this file.

[mandoc.git] / tbl_layout.c

diff --git a/tbl_layout.c b/tbl_layout.c
index f0258237356ef4c9e8e8319856dd3c7bac4d8e3c..71078a9d6f0bdb7aef146ae45aab5abdb7d00df8 100644 (file)
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_layout.c,v 1.26 2014/04/20 16:46:05 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>
@@ -15,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -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':
@@ -201,6 +204,11 @@ 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,
            ln, *pos - 1, NULL);