diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-11 14:12:01 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-11 14:12:01 +0000 |
commit | c55312cd12a98b785c3fcb600c21a78c6704d667 (patch) | |
tree | 3f7f805be1f9e69f5b33a685c67268c5c0b1eec4 /tbl_layout.c | |
parent | 5e6fd78525e0976e02b4fe2de55f0064a648cefe (diff) | |
download | mandoc-c55312cd12a98b785c3fcb600c21a78c6704d667.tar.gz mandoc-c55312cd12a98b785c3fcb600c21a78c6704d667.tar.zst mandoc-c55312cd12a98b785c3fcb600c21a78c6704d667.zip |
Add support for "^" vertical spanners. Unlike GNU tbl, raise
error-class messages when data is being ignored by specifying it in "^"
cells (either as-is or in blocks).
Also note again that horizontal spanners aren't really supported...
Diffstat (limited to 'tbl_layout.c')
-rw-r--r-- | tbl_layout.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tbl_layout.c b/tbl_layout.c index b3e81467..dd30e5ea 100644 --- a/tbl_layout.c +++ b/tbl_layout.c @@ -1,4 +1,4 @@ -/* $Id: tbl_layout.c,v 1.15 2011/01/10 15:31:00 kristaps Exp $ */ +/* $Id: tbl_layout.c,v 1.16 2011/01/11 14:12:01 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -220,6 +220,16 @@ cell(struct tbl_node *tbl, struct tbl_row *rp, } } + /* + * If a vertical spanner is found, we may not be in the first + * row. + */ + + if (TBL_CELL_DOWN == c && rp == tbl->first_row) { + TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); + return(0); + } + (*pos)++; /* Extra check for the double-vertical. */ |