version 1.37, 2015/01/30 17:32:16 |
version 1.44, 2017/06/04 22:44:15 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
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 63 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 63 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
const struct tbl_cell *cp; |
const struct tbl_cell *cp; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
static size_t offset; |
static size_t offset; |
size_t rmargin, maxrmargin, tsz; |
size_t tsz; |
int ic, horiz, spans, vert; |
int ic, horiz, spans, vert; |
|
|
rmargin = tp->rmargin; |
|
maxrmargin = tp->maxrmargin; |
|
|
|
tp->rmargin = tp->maxrmargin = TERM_MAXMARGIN; |
|
|
|
/* Inhibit printing of spaces: we do padding ourselves. */ |
/* Inhibit printing of spaces: we do padding ourselves. */ |
|
|
tp->flags |= TERMP_NONOSPACE; |
tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE | TERMP_BRNEVER; |
tp->flags |= TERMP_NOSPACE; |
|
|
|
/* |
/* |
* The first time we're invoked for a given table block, |
* The first time we're invoked for a given table block, |
Line 82 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 76 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
*/ |
*/ |
|
|
if (tp->tbl.cols == NULL) { |
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; |
|
|
tblcalc(&tp->tbl, sp, rmargin - tp->offset); |
tblcalc(&tp->tbl, sp, tp->rmargin - tp->offset); |
|
|
/* Center the table as a whole. */ |
/* Center the table as a whole. */ |
|
|
Line 99 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 91 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
for (ic = 0; ic < sp->opts->cols; ic++) |
for (ic = 0; ic < sp->opts->cols; ic++) |
tsz += tp->tbl.cols[ic].width + 3; |
tsz += tp->tbl.cols[ic].width + 3; |
tsz -= 3; |
tsz -= 3; |
if (offset + tsz > rmargin) |
if (offset + tsz > tp->rmargin) |
tsz -= 1; |
tsz -= 1; |
tp->offset = (offset + rmargin > tsz) ? |
tp->offset = (offset + tp->rmargin > tsz) ? |
(offset + rmargin - tsz) / 2 : 0; |
(offset + tp->rmargin - tsz) / 2 : 0; |
} |
} |
|
|
/* Horizontal frame at the start of boxed tables. */ |
/* Horizontal frame at the start of boxed tables. */ |
Line 203 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 195 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
tp->tbl.cols = NULL; |
tp->tbl.cols = NULL; |
tp->offset = offset; |
tp->offset = offset; |
} |
} |
|
tp->flags &= ~(TERMP_NONOSPACE | TERMP_BRNEVER); |
tp->flags &= ~TERMP_NONOSPACE; |
|
tp->rmargin = rmargin; |
|
tp->maxrmargin = maxrmargin; |
|
} |
} |
|
|
/* |
/* |
Line 268 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 257 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 276 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 289 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 397 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) |