version 1.36, 2015/01/30 04:11:50 |
version 1.43, 2015/10/12 00:08:16 |
|
|
term_tbl_strlen(const char *p, void *arg) |
term_tbl_strlen(const char *p, void *arg) |
{ |
{ |
|
|
return(term_strlen((const struct termp *)arg, p)); |
return term_strlen((const struct termp *)arg, p); |
} |
} |
|
|
static size_t |
static size_t |
term_tbl_len(size_t sz, void *arg) |
term_tbl_len(size_t sz, void *arg) |
{ |
{ |
|
|
return(term_len((const struct termp *)arg, sz)); |
return term_len((const struct termp *)arg, sz); |
} |
} |
|
|
void |
void |
Line 81 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 81 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
* calculate the table widths and decimal positions. |
* calculate the table widths and decimal positions. |
*/ |
*/ |
|
|
if (sp->flags & TBL_SPAN_FIRST) { |
if (tp->tbl.cols == NULL) { |
term_flushln(tp); |
|
|
|
tp->tbl.len = term_tbl_len; |
tp->tbl.len = term_tbl_len; |
tp->tbl.slen = term_tbl_strlen; |
tp->tbl.slen = term_tbl_strlen; |
tp->tbl.arg = tp; |
tp->tbl.arg = tp; |
Line 189 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 187 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
* existing table configuration and set it to NULL. |
* existing table configuration and set it to NULL. |
*/ |
*/ |
|
|
if (sp->flags & TBL_SPAN_LAST) { |
if (sp->next == NULL) { |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { |
tbl_hrule(tp, sp, 1); |
tbl_hrule(tp, sp, 1); |
tp->skipvsp = 1; |
tp->skipvsp = 1; |
Line 268 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 266 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
tbl_char(tp, ASCII_NBRSP, col->width); |
tbl_char(tp, ASCII_NBRSP, col->width); |
return; |
return; |
case TBL_DATA_HORIZ: |
case TBL_DATA_HORIZ: |
/* FALLTHROUGH */ |
|
case TBL_DATA_NHORIZ: |
case TBL_DATA_NHORIZ: |
tbl_char(tp, '-', col->width); |
tbl_char(tp, '-', col->width); |
return; |
return; |
case TBL_DATA_NDHORIZ: |
case TBL_DATA_NDHORIZ: |
/* FALLTHROUGH */ |
|
case TBL_DATA_DHORIZ: |
case TBL_DATA_DHORIZ: |
tbl_char(tp, '=', col->width); |
tbl_char(tp, '=', col->width); |
return; |
return; |
Line 289 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 285 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
tbl_char(tp, '=', col->width); |
tbl_char(tp, '=', col->width); |
break; |
break; |
case TBL_CELL_LONG: |
case TBL_CELL_LONG: |
/* FALLTHROUGH */ |
|
case TBL_CELL_CENTRE: |
case TBL_CELL_CENTRE: |
/* FALLTHROUGH */ |
|
case TBL_CELL_LEFT: |
case TBL_CELL_LEFT: |
/* FALLTHROUGH */ |
|
case TBL_CELL_RIGHT: |
case TBL_CELL_RIGHT: |
tbl_literal(tp, dp, col); |
tbl_literal(tp, dp, col); |
break; |
break; |
Line 305 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 298 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
} |
} |
|
|
Line 414 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
Line 406 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
static void |
static void |
tbl_word(struct termp *tp, const struct tbl_dat *dp) |
tbl_word(struct termp *tp, const struct tbl_dat *dp) |
{ |
{ |
const void *prev_font; |
int prev_font; |
|
|
prev_font = term_fontq(tp); |
prev_font = tp->fonti; |
if (dp->layout->flags & TBL_CELL_BOLD) |
if (dp->layout->flags & TBL_CELL_BOLD) |
term_fontpush(tp, TERMFONT_BOLD); |
term_fontpush(tp, TERMFONT_BOLD); |
else if (dp->layout->flags & TBL_CELL_ITALIC) |
else if (dp->layout->flags & TBL_CELL_ITALIC) |