version 1.36, 2015/01/30 04:11:50 |
version 1.39, 2015/03/06 11:03:03 |
Line 66 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 66 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
size_t rmargin, maxrmargin, tsz; |
size_t rmargin, maxrmargin, tsz; |
int ic, horiz, spans, vert; |
int ic, horiz, spans, vert; |
|
|
|
if (tp->tbl.cols == NULL) |
|
term_flushln(tp); |
|
|
rmargin = tp->rmargin; |
rmargin = tp->rmargin; |
maxrmargin = tp->maxrmargin; |
maxrmargin = tp->maxrmargin; |
|
|
Line 81 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 84 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 190 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 414 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
Line 415 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) |