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 65e1d87e2f897fe5897d18581cb0fff15d47bd4d..6ef2f735b3fa786469117ecf530f51341523cc30 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.12 2011/01/01 13:37:40 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,12 +26,11 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

-#include "roff.h"

 #include "libmandoc.h"
 #include "libroff.h"
 
 enum rofferr
 #include "libmandoc.h"
 #include "libroff.h"
 
 enum rofferr

-tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
+tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)

 {
        int              len;
        const char      *cp;
 {
        int              len;
        const char      *cp;


@@ -52,7 +56,9 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
                return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
        case (TBL_PART_LAYOUT):
                return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
                return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
        case (TBL_PART_LAYOUT):
                return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);

-       case (TBL_PART_DATA):
+       case (TBL_PART_CDATA):
+               return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+       default:

                break;
        }
 
                break;
        }
 


@@ -63,31 +69,32 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
        return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
 }
 
        return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
 }
 

-struct tbl *
-tbl_alloc(void *data, const mandocmsg msg)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct mparse *parse)

 {
 {

-       struct tbl      *p;
+       struct tbl_node *p;

 
 

-       p = mandoc_calloc(1, sizeof(struct tbl));
-       p->data = data;
-       p->msg = msg;
+       p = mandoc_calloc(1, sizeof(struct tbl_node));
+       p->line = line;
+       p->pos = pos;
+       p->parse = parse;

        p->part = TBL_PART_OPTS;
        p->part = TBL_PART_OPTS;

-       p->tab = '\t';
-       p->linesize = 12;
-       p->decimal = '.';
+       p->opts.tab = '\t';
+       p->opts.linesize = 12;
+       p->opts.decimal = '.';

        return(p);
 }
 
 void
        return(p);
 }
 
 void

-tbl_free(struct tbl *p)
+tbl_free(struct tbl_node *p)

 {
        struct tbl_row  *rp;
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;
 {
        struct tbl_row  *rp;
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;

+       struct tbl_head *hp;

 
 

-       while (p->first_row) {
-               rp = p->first_row;
+       while (NULL != (rp = p->first_row)) {

                p->first_row = rp->next;
                while (rp->first) {
                        cp = rp->first;
                p->first_row = rp->next;
                while (rp->first) {
                        cp = rp->first;


@@ -97,8 +104,7 @@ tbl_free(struct tbl *p)
                free(rp);
        }
 
                free(rp);
        }
 

-       while (p->first_span) {
-               sp = p->first_span;
+       while (NULL != (sp = p->first_span)) {

                p->first_span = sp->next;
                while (sp->first) {
                        dp = sp->first;
                p->first_span = sp->next;
                while (sp->first) {
                        dp = sp->first;


@@ -110,20 +116,56 @@ tbl_free(struct tbl *p)
                free(sp);
        }
 
                free(sp);
        }
 

+       while (NULL != (hp = p->first_head)) {
+               p->first_head = hp->next;
+               free(hp);
+       }
+

        free(p);
 }
 
 void
        free(p);
 }
 
 void

-tbl_restart(struct tbl *tbl)
+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);

 
        tbl->part = TBL_PART_LAYOUT;
 
        tbl->part = TBL_PART_LAYOUT;

+       tbl->line = line;
+       tbl->pos = pos;
+
+       if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+                               tbl->line, tbl->pos, NULL);

 }
 
 const struct tbl_span *
 }
 
 const struct tbl_span *

-tbl_span(const struct tbl *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
+tbl_end(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);
+
+       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);

 }
 }

+