diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-03 13:59:21 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-03 13:59:21 +0000 |
| commit | 49e1f5cf487fd2c297036e1873f357463817c13d (patch) | |
| tree | 8bd125a7db62c2cc35df8279db30975d7bdd6963 /tbl_layout.c | |
| parent | e9da8c425b7c3bd1fb093fe12c25801c223ac95c (diff) | |
| download | mandoc-49e1f5cf487fd2c297036e1873f357463817c13d.tar.gz mandoc-49e1f5cf487fd2c297036e1873f357463817c13d.tar.zst mandoc-49e1f5cf487fd2c297036e1873f357463817c13d.zip | |
Make width calculations occur within tbl_term.c, not tbl.c. This allows
for front-ends to make decisions about widths, not the back-end.
To pull this off, first make each tbl_head contain a unique index value
(0 <= index < total tbl_head elements) and remove the tbl_calc() routine
from the back-end.
Then, when encountering the first tbl_span in the front-end, dynamically
create an array of configurations (termp_tbl) keyed on each tbl_head's
unique index value. Construct the decimals and widths at this time,
then continue parsing as before.
The termp_tbl and indexes are required because we pass a const tbl AST
into the front-end.
Diffstat (limited to 'tbl_layout.c')
| -rw-r--r-- | tbl_layout.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tbl_layout.c b/tbl_layout.c index 30e6b01a..be893b1b 100644 --- a/tbl_layout.c +++ b/tbl_layout.c @@ -1,4 +1,4 @@ -/* $Id: tbl_layout.c,v 1.8 2011/01/02 20:34:05 kristaps Exp $ */ +/* $Id: tbl_layout.c,v 1.9 2011/01/03 13:59:21 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -319,6 +319,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) (TBL_CELL_VERT == p->pos || TBL_CELL_DVERT == p->pos)) { hp = mandoc_calloc(1, sizeof(struct tbl_head)); + hp->ident = tbl->opts.cols++; hp->prev = h->prev; if (h->prev) h->prev->next = hp; @@ -341,6 +342,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) } hp = mandoc_calloc(1, sizeof(struct tbl_head)); + hp->ident = tbl->opts.cols++; if (tbl->last_head) { hp->prev = tbl->last_head; |