=================================================================== RCS file: /cvs/mandoc/tbl.c,v retrieving revision 1.10 retrieving revision 1.13 diff -u -p -r1.10 -r1.13 --- mandoc/tbl.c 2010/12/31 14:52:41 1.10 +++ mandoc/tbl.c 2011/01/01 15:45:18 1.13 @@ -1,4 +1,4 @@ -/* $Id: tbl.c,v 1.10 2010/12/31 14:52:41 kristaps Exp $ */ +/* $Id: tbl.c,v 1.13 2011/01/01 15:45:18 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * @@ -56,19 +56,21 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int o break; } - /* - * FIXME: allow the original string to slip through for the time - * being. + /* + * This only returns zero if the line is empty, so we ignore it + * and continue on. */ - return(tbl_data(tbl, ln, p) ? ROFF_CONT : ROFF_ERR); + return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN); } struct tbl * -tbl_alloc(void *data, const mandocmsg msg) +tbl_alloc(int pos, int line, void *data, const mandocmsg msg) { struct tbl *p; p = mandoc_calloc(1, sizeof(struct tbl)); + p->line = line; + p->pos = pos; p->data = data; p->msg = msg; p->part = TBL_PART_OPTS; @@ -120,3 +122,18 @@ tbl_restart(struct tbl *tbl) tbl->part = TBL_PART_LAYOUT; } +const struct tbl_span * +tbl_span(const struct tbl *tbl) +{ + + assert(tbl); + return(tbl->last_span); +} + +void +tbl_end(struct tbl *tbl) +{ + + if (NULL == tbl->first_span || NULL == tbl->first_span->first) + TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos); +}