version 1.7, 2011/01/04 12:06:21 |
version 1.8, 2011/01/04 13:14:26 |
Line 206 tbl_hframe(struct termp *tp, const struct tbl_span *sp |
|
Line 206 tbl_hframe(struct termp *tp, const struct tbl_span *sp |
|
TBL_OPT_DBOX & sp->tbl->opts)) |
TBL_OPT_DBOX & sp->tbl->opts)) |
return; |
return; |
|
|
tp->flags |= TERMP_NONOSPACE; |
|
tp->flags |= TERMP_NOSPACE; |
|
|
|
/* |
/* |
* Print out the horizontal part of a frame or double frame. A |
* Print out the horizontal part of a frame or double frame. A |
* double frame has an unbroken `-' outer line the width of the |
* double frame has an unbroken `-' outer line the width of the |
Line 465 tbl_calc_data(struct termp *tp, const struct tbl *tbl, |
|
Line 462 tbl_calc_data(struct termp *tp, const struct tbl *tbl, |
|
case (TBL_CELL_HORIZ): |
case (TBL_CELL_HORIZ): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_CELL_DHORIZ): |
case (TBL_CELL_DHORIZ): |
tblp->width = 1; |
tblp->width = term_len(tp, 1); |
break; |
break; |
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 536 tbl_calc_data_literal(struct termp *tp, |
|
Line 533 tbl_calc_data_literal(struct termp *tp, |
|
const struct tbl_dat *dp, |
const struct tbl_dat *dp, |
struct termp_tbl *tblp) |
struct termp_tbl *tblp) |
{ |
{ |
int sz, bufsz; |
int sz, bufsz, spsz; |
|
|
/* |
/* |
* Calculate our width and use the spacing, with a minimum |
* Calculate our width and use the spacing, with a minimum |
Line 551 tbl_calc_data_literal(struct termp *tp, |
|
Line 548 tbl_calc_data_literal(struct termp *tp, |
|
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_CELL_CENTRE): |
case (TBL_CELL_CENTRE): |
bufsz = 2; |
bufsz = term_len(tp, 2); |
break; |
break; |
default: |
default: |
bufsz = 1; |
bufsz = term_len(tp, 1); |
break; |
break; |
} |
} |
|
|
|
spsz = 0; |
if (dp->layout->spacing) |
if (dp->layout->spacing) |
bufsz = bufsz > dp->layout->spacing ? |
spsz = term_len(tp, dp->layout->spacing); |
bufsz : dp->layout->spacing; |
|
|
if (spsz) |
|
bufsz = bufsz > spsz ? bufsz : spsz; |
|
|
sz += bufsz; |
sz += bufsz; |
if (tblp->width < sz) |
if (tblp->width < sz) |