===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.225
retrieving revision 1.227
diff -u -p -r1.225 -r1.227
--- mandoc/mandoc.h	2017/06/08 00:23:30	1.225
+++ mandoc/mandoc.h	2017/06/10 01:48:53	1.227
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.225 2017/06/08 00:23:30 schwarze Exp $ */
+/*	$Id: mandoc.h,v 1.227 2017/06/10 01:48:53 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -51,6 +51,7 @@ enum	mandocerr {
 	MANDOCERR_ER_ORDER, /* errnos out of order: Er ... */
 	MANDOCERR_ER_REP, /* duplicate errno: Er ... */
 	MANDOCERR_ND_DOT, /* description line ends with a full stop */
+	MANDOCERR_DELIM, /* no blank before trailing delimiter: macro ... */
 
 	MANDOCERR_WARNING, /* ===== start of warnings ===== */
 
@@ -246,9 +247,10 @@ enum	tbl_cellt {
  */
 struct	tbl_cell {
 	struct tbl_cell	 *next;
+	char		 *wstr; /* min width represented as a string */
+	size_t		  width; /* minimum column width */
+	size_t		  spacing; /* to the right of the column */
 	int		  vert; /* width of subsequent vertical line */
-	enum tbl_cellt	  pos;
-	size_t		  spacing;
 	int		  col; /* column number, starting from 0 */
 	int		  flags;
 #define	TBL_CELL_TALIGN	 (1 << 0) /* t, T */
@@ -259,6 +261,7 @@ struct	tbl_cell {
 #define	TBL_CELL_UP	 (1 << 5) /* u, U */
 #define	TBL_CELL_WIGN	 (1 << 6) /* z, Z */
 #define	TBL_CELL_WMAX	 (1 << 7) /* x, X */
+	enum tbl_cellt	  pos;
 };
 
 /*
@@ -286,9 +289,10 @@ enum	tbl_datt {
  */
 struct	tbl_dat {
 	struct tbl_cell	 *layout; /* layout cell */
-	int		  spans; /* how many spans follow */
 	struct tbl_dat	 *next;
 	char		 *string; /* data (NULL if not TBL_DATA_DATA) */
+	int		  spans; /* how many spans follow */
+	int		  block; /* T{ text block T} */
 	enum tbl_datt	  pos;
 };