Fix a regression caused by mdoc_term.c 1.214 / mdoc_html.c 1.148:

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 55ea0f342af6992565146cec97f42796de176224..771dd9b46f9170aa1897a400dcb82806da336743 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.15 2011/01/01 22:19:15 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.22 2011/01/25 12:24:27 schwarze 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
@@ -26,7 +27,7 @@
 #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;
@@ -52,7 +53,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);
-       case (TBL_PART_DATA):
+       case (TBL_PART_CDATA):
+               return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+       default:
                break;
        }
 
@@ -63,25 +66,25 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
        return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
 }
 
-struct tbl *
+struct tbl_node *
 tbl_alloc(int pos, int line, void *data, const mandocmsg msg)
 {
-       struct tbl      *p;
+       struct tbl_node *p;
 
-       p = mandoc_calloc(1, sizeof(struct tbl));
+       p = mandoc_calloc(1, sizeof(struct tbl_node));
        p->line = line;
        p->pos = pos;
        p->data = data;
        p->msg = msg;
        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
-tbl_free(struct tbl *p)
+tbl_free(struct tbl_node *p)
 {
        struct tbl_row  *rp;
        struct tbl_cell *cp;
@@ -120,8 +123,10 @@ tbl_free(struct tbl *p)
 }
 
 void
-tbl_restart(int line, int pos, struct tbl *tbl)
+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);
 
        tbl->part = TBL_PART_LAYOUT;
        tbl->line = line;
@@ -132,18 +137,29 @@ tbl_restart(int line, int pos, struct tbl *tbl)
 }
 
 const struct tbl_span *
-tbl_span(const struct tbl *tbl)
+tbl_span(struct tbl_node *tbl)
 {
+       struct tbl_span  *span;
 
        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 *tbl)
+tbl_end(struct tbl_node *tbl)
 {
 
        if (NULL == tbl->first_span || NULL == tbl->first_span->first)
                TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
+
+       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);
 }