version 1.5, 2011/01/03 15:07:59 |
version 1.10, 2011/01/04 15:02:00 |
Line 40 static void tbl_data_number(struct termp *, |
|
Line 40 static void tbl_data_number(struct termp *, |
|
static void tbl_data_literal(struct termp *, |
static void tbl_data_literal(struct termp *, |
const struct tbl_dat *, |
const struct tbl_dat *, |
const struct termp_tbl *); |
const struct termp_tbl *); |
static void tbl_data_spanner(struct termp *, |
|
const struct tbl_dat *, |
|
const struct termp_tbl *); |
|
static void tbl_data(struct termp *, const struct tbl *, |
static void tbl_data(struct termp *, const struct tbl *, |
const struct tbl_dat *, |
const struct tbl_dat *, |
const struct termp_tbl *); |
const struct termp_tbl *); |
Line 209 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 259 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
Line 253 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
} |
} |
|
|
switch (dp->pos) { |
switch (dp->pos) { |
|
case (TBL_DATA_NONE): |
|
tbl_char(tp, ASCII_NBRSP, tbp->width); |
|
return; |
case (TBL_DATA_HORIZ): |
case (TBL_DATA_HORIZ): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (TBL_DATA_NHORIZ): |
|
tbl_char(tp, '-', tbp->width); |
|
return; |
|
case (TBL_DATA_NDHORIZ): |
|
/* FALLTHROUGH */ |
case (TBL_DATA_DHORIZ): |
case (TBL_DATA_DHORIZ): |
tbl_data_spanner(tp, dp, tbp); |
tbl_char(tp, '=', tbp->width); |
return; |
return; |
default: |
default: |
break; |
break; |
Line 272 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
Line 274 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
|
|
switch (pos) { |
switch (pos) { |
case (TBL_CELL_HORIZ): |
case (TBL_CELL_HORIZ): |
/* FALLTHROUGH */ |
tbl_char(tp, '-', tbp->width); |
|
break; |
case (TBL_CELL_DHORIZ): |
case (TBL_CELL_DHORIZ): |
tbl_data_spanner(tp, dp, tbp); |
tbl_char(tp, '=', tbp->width); |
break; |
break; |
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 318 tbl_vframe(struct termp *tp, const struct tbl *tbl) |
|
Line 321 tbl_vframe(struct termp *tp, const struct tbl *tbl) |
|
term_word(tp, "|"); |
term_word(tp, "|"); |
} |
} |
|
|
|
|
static inline void |
static inline void |
tbl_char(struct termp *tp, char c, int len) |
tbl_char(struct termp *tp, char c, int len) |
{ |
{ |
Line 335 tbl_char(struct termp *tp, char c, int len) |
|
Line 337 tbl_char(struct termp *tp, char c, int len) |
|
} |
} |
|
|
static void |
static void |
tbl_data_spanner(struct termp *tp, |
|
const struct tbl_dat *dp, |
|
const struct termp_tbl *tblp) |
|
{ |
|
|
|
switch (dp->pos) { |
|
case (TBL_DATA_HORIZ): |
|
case (TBL_DATA_NHORIZ): |
|
tbl_char(tp, '-', tblp->width); |
|
break; |
|
case (TBL_DATA_DHORIZ): |
|
case (TBL_DATA_NDHORIZ): |
|
tbl_char(tp, '=', tblp->width); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
static void |
|
tbl_data_literal(struct termp *tp, |
tbl_data_literal(struct termp *tp, |
const struct tbl_dat *dp, |
const struct tbl_dat *dp, |
const struct termp_tbl *tblp) |
const struct termp_tbl *tblp) |
Line 441 tbl_calc(struct termp *tp, const struct tbl_span *sp) |
|
Line 423 tbl_calc(struct termp *tp, const struct tbl_span *sp) |
|
hp = sp->head; |
hp = sp->head; |
|
|
for ( ; sp; sp = sp->next) { |
for ( ; sp; sp = sp->next) { |
switch (sp->pos) { |
if (TBL_SPAN_DATA != sp->pos) |
case (TBL_DATA_HORIZ): |
|
/* FALLTHROUGH */ |
|
case (TBL_DATA_DHORIZ): |
|
continue; |
continue; |
default: |
|
break; |
|
} |
|
for (dp = sp->first; dp; dp = dp->next) { |
for (dp = sp->first; dp; dp = dp->next) { |
if (NULL == dp->layout) |
if (NULL == dp->layout) |
continue; |
continue; |
|
|
tbl_calc_data(struct termp *tp, const struct tbl *tbl, |
tbl_calc_data(struct termp *tp, const struct tbl *tbl, |
const struct tbl_dat *dp, struct termp_tbl *tblp) |
const struct tbl_dat *dp, struct termp_tbl *tblp) |
{ |
{ |
|
int sz; |
|
|
/* Branch down into data sub-types. */ |
/* Branch down into data sub-types. */ |
|
|
Line 483 tbl_calc_data(struct termp *tp, const struct tbl *tbl, |
|
Line 461 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; |
sz = term_len(tp, 1); |
|
if (tblp->width < sz) |
|
tblp->width = sz; |
break; |
break; |
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 554 tbl_calc_data_literal(struct termp *tp, |
|
Line 534 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 569 tbl_calc_data_literal(struct termp *tp, |
|
Line 549 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) |