version 1.32, 2011/01/08 17:16:48 |
version 1.34, 2011/01/10 15:31:00 |
Line 399 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 399 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
* to data cells in the data section. |
* to data cells in the data section. |
*/ |
*/ |
for (dp = sp->first; dp; dp = dp->next) { |
for (dp = sp->first; dp; dp = dp->next) { |
if (NULL == dp->layout) |
assert(dp->layout); |
continue; |
|
col = &tbl->cols[dp->layout->head->ident]; |
col = &tbl->cols[dp->layout->head->ident]; |
tblcalc_data(tbl, col, sp->tbl, dp); |
tblcalc_data(tbl, col, sp->tbl, dp); |
} |
} |
Line 465 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
Line 464 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
const struct tbl_dat *dp) |
const struct tbl_dat *dp) |
{ |
{ |
size_t sz, bufsz, spsz; |
size_t sz, bufsz, spsz; |
|
const char *str; |
|
|
/* |
/* |
* Calculate our width and use the spacing, with a minimum |
* Calculate our width and use the spacing, with a minimum |
Line 472 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
Line 472 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
* either side, while right/left get a single adjacent space). |
* either side, while right/left get a single adjacent space). |
*/ |
*/ |
|
|
sz = bufsz = spsz = 0; |
bufsz = spsz = 0; |
if (dp->string) |
str = dp->string ? dp->string : ""; |
sz = (*tbl->slen)(dp->string, tbl->arg); |
sz = (*tbl->slen)(str, tbl->arg); |
|
|
|
/* FIXME: TBL_DATA_HORIZ et al.? */ |
|
|
assert(dp->layout); |
assert(dp->layout); |
switch (dp->layout->pos) { |
switch (dp->layout->pos) { |
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
Line 503 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 505 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
const struct tbl *tp, const struct tbl_dat *dp) |
const struct tbl *tp, const struct tbl_dat *dp) |
{ |
{ |
int i; |
int i; |
size_t sz, psz, ssz, d, max; |
size_t sz, psz, ssz, d; |
char *cp; |
|
const char *str; |
const char *str; |
|
char *cp; |
char buf[2]; |
char buf[2]; |
|
|
/* |
/* |
Line 517 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 519 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
* Finally, re-assign the stored values. |
* Finally, re-assign the stored values. |
*/ |
*/ |
|
|
str = dp && dp->string ? dp->string : ""; |
str = dp->string ? dp->string : ""; |
max = dp && dp->layout ? dp->layout->spacing : 0; |
|
|
|
sz = (*tbl->slen)(str, tbl->arg); |
sz = (*tbl->slen)(str, tbl->arg); |
|
|
|
/* FIXME: TBL_DATA_HORIZ et al.? */ |
|
|
buf[0] = tp->decimal; |
buf[0] = tp->decimal; |
buf[1] = '\0'; |
buf[1] = '\0'; |
|
|
Line 557 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 559 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
|
|
/* Adjust for stipulated width. */ |
/* Adjust for stipulated width. */ |
|
|
if (col->width < max) |
if (col->width < dp->layout->spacing) |
col->width = max; |
col->width = dp->layout->spacing; |
} |
} |
|
|
|
|