implement -Tman .Bk; OpenBSD rev. 1.10

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 771dd9b46f9170aa1897a400dcb82806da336743..b3d651be07ad513db48954238e0b1ec62af362b4 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.22 2011/01/25 12:24:27 schwarze Exp $ */
+/*     $Id: tbl.c,v 1.26 2011/07/25 15:37:00 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,6 +15,10 @@
  * 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 <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,7 +26,6 @@
 #include <time.h>
 
 #include "mandoc.h"
-#include "roff.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
@@ -67,15 +70,14 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
 }
 
 struct tbl_node *
-tbl_alloc(int pos, int line, void *data, const mandocmsg msg)
+tbl_alloc(int pos, int line, struct mparse *parse)
 {
        struct tbl_node *p;
 
        p = mandoc_calloc(1, sizeof(struct tbl_node));
        p->line = line;
        p->pos = pos;
-       p->data = data;
-       p->msg = msg;
+       p->parse = parse;
        p->part = TBL_PART_OPTS;
        p->opts.tab = '\t';
        p->opts.linesize = 12;
@@ -126,14 +128,16 @@ void
 tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
        if (TBL_PART_CDATA == tbl->part)
-               TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, 
+                               tbl->line, tbl->pos, NULL);
 
        tbl->part = TBL_PART_LAYOUT;
        tbl->line = line;
        tbl->pos = pos;
 
        if (NULL == tbl->first_span || NULL == tbl->first_span->first)
-               TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+                               tbl->line, tbl->pos, NULL);
 }
 
 const struct tbl_span *
@@ -150,16 +154,22 @@ tbl_span(struct tbl_node *tbl)
 }
 
 void
-tbl_end(struct tbl_node *tbl)
+tbl_end(struct tbl_node **tblp)
 {
+       struct tbl_node *tbl;
+
+       tbl = *tblp;
+       *tblp = NULL;
 
        if (NULL == tbl->first_span || NULL == tbl->first_span->first)
-               TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
+               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)
-               TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, 
+                               tbl->line, tbl->pos, NULL);
 }