version 1.72, 2019/07/01 22:56:24 |
version 1.73, 2020/01/11 16:26:08 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011-2019 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011-2020 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 267 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 267 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
hspans--; |
hspans--; |
continue; |
continue; |
} |
} |
if (dp == NULL) |
if (dp != NULL && |
continue; |
(ic || sp->layout->first->pos != TBL_CELL_SPAN)) { |
hspans = dp->hspans; |
hspans = dp->hspans; |
if (ic || sp->layout->first->pos != TBL_CELL_SPAN) |
|
dp = dp->next; |
dp = dp->next; |
|
} |
} |
} |
|
|
/* Set up a column for a right vertical frame. */ |
/* Set up a column for a right vertical frame. */ |
Line 302 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 302 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
tp->tcol++; |
tp->tcol++; |
tp->col = 0; |
tp->col = 0; |
tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic); |
tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic); |
if (dp == NULL) |
if (dp != NULL && |
continue; |
(ic || sp->layout->first->pos != TBL_CELL_SPAN)) { |
hspans = dp->hspans; |
hspans = dp->hspans; |
if (cp->pos != TBL_CELL_SPAN) |
|
dp = dp->next; |
dp = dp->next; |
|
} |
} |
} |
break; |
break; |
} |
} |
Line 425 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 425 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
cp = cp->next; |
cp = cp->next; |
continue; |
continue; |
} |
} |
if (dp != NULL) { |
if (dp != NULL && (ic || |
|
sp->layout->first->pos != TBL_CELL_SPAN)) { |
hspans = dp->hspans; |
hspans = dp->hspans; |
if (ic || sp->layout->first->pos |
dp = dp->next; |
!= TBL_CELL_SPAN) |
|
dp = dp->next; |
|
} |
} |
|
|
/* |
/* |