version 1.73, 2020/01/11 16:26:08 |
version 1.76, 2022/04/08 16:53:45 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011-2020 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011-2021 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 190 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 190 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
|
|
tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin); |
tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin); |
|
|
/* Tables leak .ta settings to subsequent text. */ |
|
|
|
term_tab_set(tp, NULL); |
|
coloff = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || |
|
sp->opts->lvert; |
|
for (ic = 0; ic < sp->opts->cols; ic++) { |
|
coloff += tp->tbl.cols[ic].width; |
|
term_tab_iset(coloff); |
|
coloff += tp->tbl.cols[ic].spacing; |
|
} |
|
|
|
/* Center the table as a whole. */ |
/* Center the table as a whole. */ |
|
|
offset = tp->tcol->offset; |
offset = tp->tcol->offset; |
Line 831 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
Line 820 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
width = col->width; |
width = col->width; |
ic = dp->layout->col; |
ic = dp->layout->col; |
hspans = dp->hspans; |
hspans = dp->hspans; |
while (hspans--) |
while (hspans--) { |
width += tp->tbl.cols[++ic].width + 3; |
width += tp->tbl.cols[ic].spacing; |
|
ic++; |
|
width += tp->tbl.cols[ic].width; |
|
} |
|
|
padr = width > len ? width - len : 0; |
padr = width > len ? width - len : 0; |
padl = 0; |
padl = 0; |
Line 934 tbl_word(struct termp *tp, const struct tbl_dat *dp) |
|
Line 926 tbl_word(struct termp *tp, const struct tbl_dat *dp) |
|
int prev_font; |
int prev_font; |
|
|
prev_font = tp->fonti; |
prev_font = tp->fonti; |
if (dp->layout->flags & TBL_CELL_BOLD) |
switch (dp->layout->font) { |
term_fontpush(tp, TERMFONT_BOLD); |
case ESCAPE_FONTBI: |
else if (dp->layout->flags & TBL_CELL_ITALIC) |
term_fontpush(tp, TERMFONT_BI); |
term_fontpush(tp, TERMFONT_UNDER); |
break; |
|
case ESCAPE_FONTBOLD: |
|
case ESCAPE_FONTCB: |
|
term_fontpush(tp, TERMFONT_BOLD); |
|
break; |
|
case ESCAPE_FONTITALIC: |
|
case ESCAPE_FONTCI: |
|
term_fontpush(tp, TERMFONT_UNDER); |
|
break; |
|
case ESCAPE_FONTROMAN: |
|
case ESCAPE_FONTCR: |
|
break; |
|
default: |
|
abort(); |
|
} |
|
|
term_word(tp, dp->string); |
term_word(tp, dp->string); |
|
|