Some release notes (this isn't signalling an impending release; I just

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index ba591ceb6ec5ddb082e5679c7fa49648f722dc76..6ef2f735b3fa786469117ecf530f51341523cc30 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.21 2011/01/04 15:02:00 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.25 2011/04/04 23:04:38 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,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.
  */
  * 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>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -21,7 +26,6 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

-#include "roff.h"

 #include "libmandoc.h"
 #include "libroff.h"
 
 #include "libmandoc.h"
 #include "libroff.h"
 


@@ -66,15 +70,14 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
 }
 
 struct tbl_node *
 }
 
 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;
 {
        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;
        p->part = TBL_PART_OPTS;
        p->opts.tab = '\t';
        p->opts.linesize = 12;


@@ -125,22 +128,29 @@ void
 tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
        if (TBL_PART_CDATA == tbl->part)
 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->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 *
 }
 
 const struct tbl_span *

-tbl_span(const struct tbl_node *tbl)
+tbl_span(struct tbl_node *tbl)

 {
 {

+       struct tbl_span  *span;

 
        assert(tbl);
 
        assert(tbl);

-       return(tbl->last_span);
+       span = tbl->current_span ? tbl->current_span->next
+                                : tbl->first_span;
+       if (span)
+               tbl->current_span = span;
+       return(span);

 }
 
 void
 }
 
 void


@@ -148,12 +158,14 @@ tbl_end(struct tbl_node *tbl)
 {
 
        if (NULL == tbl->first_span || NULL == tbl->first_span->first)
 {
 
        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)
 
        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);

 }
 
 }