In -Tman mode, support automatic word keeps in the SYNOPSIS

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 7aa0ba13f5c99838073dad66c314102422fed36f..3b4096487a9eb61f3f73dfd03c0d9940195a4873 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.23 2011/03/15 16:23:51 kristaps Exp $ */
+/*     $Id: tbl_data.c,v 1.25 2012/05/27 17:54:54 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -49,13 +49,11 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                cp = dp->layout->first;
 
        /* 
-        * Skip over spanners and vertical lines to data formats, since
+        * Skip over spanners, since
         * we want to match data with data layout cells in the header.
         */
 
-       while (cp && (TBL_CELL_VERT == cp->pos || 
-                               TBL_CELL_DVERT == cp->pos ||
-                               TBL_CELL_SPAN == cp->pos))
+       while (cp && TBL_CELL_SPAN == cp->pos)
                cp = cp->next;
 
        /*
@@ -64,7 +62,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
         */
 
        if (NULL == cp) {
-               TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos);
+               mandoc_msg(MANDOCERR_TBLEXTRADAT, 
+                               tbl->parse, ln, *pos, NULL);
                /* Skip to the end... */
                while (p[*pos])
                        (*pos)++;
@@ -130,7 +129,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                        TBL_CELL_DHORIZ == dat->layout->pos ||
                        TBL_CELL_DOWN == dat->layout->pos)
                if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
-                       TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv);
+                       mandoc_msg(MANDOCERR_TBLIGNDATA, 
+                                       tbl->parse, ln, sv, NULL);
 
        return(1);
 }
@@ -172,7 +172,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
                dat->string = mandoc_strdup(p);
 
        if (TBL_CELL_DOWN == dat->layout->pos) 
-               TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos);
+               mandoc_msg(MANDOCERR_TBLIGNDATA, 
+                               tbl->parse, ln, pos, NULL);
 
        return(0);
 }
@@ -210,7 +211,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
        pos = 0;
 
        if ('\0' == p[pos]) {
-               TBL_MSG(tbl, MANDOCERR_TBL, ln, pos);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL);
                return(0);
        }