diff options
Diffstat (limited to 'contrib/mdocml/tbl.c')
| -rw-r--r-- | contrib/mdocml/tbl.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/contrib/mdocml/tbl.c b/contrib/mdocml/tbl.c index b244ac8..3c94d7e 100644 --- a/contrib/mdocml/tbl.c +++ b/contrib/mdocml/tbl.c @@ -1,4 +1,4 @@ -/* $Id: tbl.c,v 1.27 2013/05/31 22:08:09 schwarze Exp $ */ +/* $Id: tbl.c,v 1.29 2014/04/20 16:46:05 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -26,9 +26,11 @@ #include <time.h> #include "mandoc.h" +#include "mandoc_aux.h" #include "libmandoc.h" #include "libroff.h" + enum rofferr tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs) { @@ -52,11 +54,11 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs) /* Now process each logical section of the table. */ switch (tbl->part) { - case (TBL_PART_OPTS): + case TBL_PART_OPTS: return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); - case (TBL_PART_LAYOUT): + case TBL_PART_LAYOUT: return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); - case (TBL_PART_CDATA): + case TBL_PART_CDATA: return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN); default: break; @@ -128,8 +130,8 @@ void tbl_restart(int line, int pos, struct tbl_node *tbl) { if (TBL_PART_CDATA == tbl->part) - mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, - tbl->line, tbl->pos, NULL); + mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, + tbl->line, tbl->pos, NULL); tbl->part = TBL_PART_LAYOUT; tbl->line = line; @@ -137,7 +139,7 @@ tbl_restart(int line, int pos, struct tbl_node *tbl) if (NULL == tbl->first_span || NULL == tbl->first_span->first) mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, - tbl->line, tbl->pos, NULL); + tbl->line, tbl->pos, NULL); } const struct tbl_span * @@ -162,14 +164,13 @@ tbl_end(struct tbl_node **tblp) *tblp = NULL; if (NULL == tbl->first_span || NULL == tbl->first_span->first) - mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, - tbl->line, tbl->pos, NULL); + mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, + tbl->line, tbl->pos, NULL); if (tbl->last_span) tbl->last_span->flags |= TBL_SPAN_LAST; if (TBL_PART_CDATA == tbl->part) - mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, - tbl->line, tbl->pos, NULL); + mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, + tbl->line, tbl->pos, NULL); } - |
