Add support for "^" vertical spanners. Unlike GNU tbl, raise

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 1ea37f5a3539467f50cd1d9a325f4c1bd6469224..ba591ceb6ec5ddb082e5679c7fa49648f722dc76 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.20 2011/01/03 13:59:21 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.21 2011/01/04 15:02:00 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -52,7 +52,9 @@ tbl_read(struct tbl_node *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;
        }
 
@@ -122,6 +124,8 @@ tbl_free(struct tbl_node *p)
 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);
 
        tbl->part = TBL_PART_LAYOUT;
        tbl->line = line;
@@ -148,5 +152,8 @@ tbl_end(struct tbl_node *tbl)
 
        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);
 }