version 1.15, 2011/01/08 17:16:48 |
version 1.16, 2011/01/10 14:40:30 |
Line 64 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 64 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
const struct tbl_head *hp; |
const struct tbl_head *hp; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
struct roffcol *col; |
struct roffcol *col; |
|
int spans; |
size_t rmargin, maxrmargin; |
size_t rmargin, maxrmargin; |
|
|
rmargin = tp->rmargin; |
rmargin = tp->rmargin; |
Line 115 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 116 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
case (TBL_SPAN_DATA): |
case (TBL_SPAN_DATA): |
/* Iterate over template headers. */ |
/* Iterate over template headers. */ |
dp = sp->first; |
dp = sp->first; |
|
spans = 0; |
for (hp = sp->head; hp; hp = hp->next) { |
for (hp = sp->head; hp; hp = hp->next) { |
|
/* |
|
* If the current data header is invoked during |
|
* a spanner ("spans" > 0), don't emit anything |
|
* at all. |
|
*/ |
switch (hp->pos) { |
switch (hp->pos) { |
case (TBL_HEAD_VERT): |
case (TBL_HEAD_VERT): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_HEAD_DVERT): |
case (TBL_HEAD_DVERT): |
tbl_vrule(tp, hp); |
if (spans <= 0) |
|
tbl_vrule(tp, hp); |
continue; |
continue; |
case (TBL_HEAD_DATA): |
case (TBL_HEAD_DATA): |
break; |
break; |
} |
} |
|
|
|
if (--spans >= 0) |
|
continue; |
|
|
col = &tp->tbl.cols[hp->ident]; |
col = &tp->tbl.cols[hp->ident]; |
tbl_data(tp, sp->tbl, dp, col); |
tbl_data(tp, sp->tbl, dp, col); |
|
|
/* Go to the next data cell. */ |
/* |
if (dp) |
* Go to the next data cell and assign the |
|
* number of subsequent spans, if applicable. |
|
*/ |
|
|
|
if (dp) { |
|
spans = dp->spans; |
dp = dp->next; |
dp = dp->next; |
|
} |
} |
} |
break; |
break; |
} |
} |
Line 244 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
Line 261 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
const struct tbl_dat *dp, |
const struct tbl_dat *dp, |
const struct roffcol *col) |
const struct roffcol *col) |
{ |
{ |
enum tbl_cellt pos; |
|
|
|
if (NULL == dp) { |
if (NULL == dp) { |
tbl_char(tp, ASCII_NBRSP, col->width); |
tbl_char(tp, ASCII_NBRSP, col->width); |
return; |
return; |
} |
} |
|
assert(dp->layout); |
|
|
switch (dp->pos) { |
switch (dp->pos) { |
case (TBL_DATA_NONE): |
case (TBL_DATA_NONE): |
Line 269 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
Line 286 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
break; |
break; |
} |
} |
|
|
pos = dp && dp->layout ? dp->layout->pos : TBL_CELL_LEFT; |
switch (dp->layout->pos) { |
|
|
switch (pos) { |
|
case (TBL_CELL_HORIZ): |
case (TBL_CELL_HORIZ): |
tbl_char(tp, '-', col->width); |
tbl_char(tp, '-', col->width); |
break; |
break; |
Line 340 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
Line 355 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
const struct roffcol *col) |
const struct roffcol *col) |
{ |
{ |
size_t padl, padr, ssz; |
size_t padl, padr, ssz; |
enum tbl_cellt pos; |
|
const char *str; |
const char *str; |
|
|
padl = padr = 0; |
padl = padr = 0; |
|
|
pos = dp && dp->layout ? dp->layout->pos : TBL_CELL_LEFT; |
str = dp->string ? dp->string : ""; |
str = dp && dp->string ? dp->string : ""; |
|
|
|
ssz = term_len(tp, 1); |
ssz = term_len(tp, 1); |
|
|
switch (pos) { |
switch (dp->layout->pos) { |
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
padl = ssz; |
padl = ssz; |
padr = col->width - term_strlen(tp, str) - ssz; |
padr = col->width - term_strlen(tp, str) - ssz; |
Line 391 tbl_number(struct termp *tp, const struct tbl *tbl, |
|
Line 404 tbl_number(struct termp *tp, const struct tbl *tbl, |
|
* and the maximum decimal; right-pad by the remaining amount. |
* and the maximum decimal; right-pad by the remaining amount. |
*/ |
*/ |
|
|
str = dp && dp->string ? dp->string : ""; |
str = dp->string ? dp->string : ""; |
|
|
sz = term_strlen(tp, str); |
sz = term_strlen(tp, str); |
|
|