version 1.66, 2018/12/12 21:54:35 |
version 1.67, 2019/01/31 16:06:22 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011-2019 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 |
Line 163 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 163 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
const struct tbl_cell *cp, *cpn, *cpp, *cps; |
const struct tbl_cell *cp, *cpn, *cpp, *cps; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
static size_t offset; |
static size_t offset; |
|
size_t save_offset; |
size_t coloff, tsz; |
size_t coloff, tsz; |
int hspans, ic, more; |
int hspans, ic, more; |
int dvert, fc, horiz, line, uvert; |
int dvert, fc, horiz, line, uvert; |
Line 170 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 171 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
/* Inhibit printing of spaces: we do padding ourselves. */ |
/* Inhibit printing of spaces: we do padding ourselves. */ |
|
|
tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE; |
tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE; |
|
save_offset = tp->tcol->offset; |
|
|
/* |
/* |
* The first time we're invoked for a given table block, |
* The first time we're invoked for a given table block, |
Line 211 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 213 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
tsz += tp->tbl.cols[sp->opts->cols - 1].width; |
tsz += tp->tbl.cols[sp->opts->cols - 1].width; |
if (offset + tsz > tp->tcol->rmargin) |
if (offset + tsz > tp->tcol->rmargin) |
tsz -= 1; |
tsz -= 1; |
tp->tcol->offset = offset + tp->tcol->rmargin > tsz ? |
offset = offset + tp->tcol->rmargin > tsz ? |
(offset + tp->tcol->rmargin - tsz) / 2 : 0; |
(offset + tp->tcol->rmargin - tsz) / 2 : 0; |
|
tp->tcol->offset = offset; |
} |
} |
|
|
/* Horizontal frame at the start of boxed tables. */ |
/* Horizontal frame at the start of boxed tables. */ |
Line 227 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 230 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
/* Set up the columns. */ |
/* Set up the columns. */ |
|
|
tp->flags |= TERMP_MULTICOL; |
tp->flags |= TERMP_MULTICOL; |
|
tp->tcol->offset = offset; |
horiz = 0; |
horiz = 0; |
switch (sp->pos) { |
switch (sp->pos) { |
case TBL_SPAN_HORIZ: |
case TBL_SPAN_HORIZ: |
Line 567 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 571 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
assert(tp->tbl.cols); |
assert(tp->tbl.cols); |
free(tp->tbl.cols); |
free(tp->tbl.cols); |
tp->tbl.cols = NULL; |
tp->tbl.cols = NULL; |
tp->tcol->offset = offset; |
|
} else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX && |
} else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX && |
(sp->next == NULL || sp->next->pos == TBL_SPAN_DATA || |
(sp->next == NULL || sp->next->pos == TBL_SPAN_DATA || |
sp->next->next != NULL)) |
sp->next->next != NULL)) |
tbl_hrule(tp, sp, sp->next, TBL_OPT_ALLBOX); |
tbl_hrule(tp, sp, sp->next, TBL_OPT_ALLBOX); |
|
|
|
tp->tcol->offset = save_offset; |
tp->flags &= ~TERMP_NONOSPACE; |
tp->flags &= ~TERMP_NONOSPACE; |
} |
} |
|
|