version 1.58, 2018/08/18 16:44:55 |
version 1.59, 2018/08/19 19:32:21 |
Line 460 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
Line 460 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
const struct tbl_cell *cp, *cpn, *cpp; |
const struct tbl_cell *cp, *cpn, *cpp; |
const struct roffcol *col; |
const struct roffcol *col; |
int vert; |
int vert; |
char line, cross; |
char cross, line, stdcross, stdline; |
|
|
line = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; |
stdline = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; |
cross = (kind < 3) ? '+' : '-'; |
stdcross = (kind < 3) ? '+' : '-'; |
|
|
if (kind) |
|
term_word(tp, "+"); |
|
cp = sp->layout->first; |
cp = sp->layout->first; |
cpp = kind || sp->prev == NULL ? NULL : sp->prev->layout->first; |
cpp = kind || sp->prev == NULL ? NULL : sp->prev->layout->first; |
if (cpp == cp) |
if (cpp == cp) |
Line 474 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
Line 472 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
cpn = kind > 1 || sp->next == NULL ? NULL : sp->next->layout->first; |
cpn = kind > 1 || sp->next == NULL ? NULL : sp->next->layout->first; |
if (cpn == cp) |
if (cpn == cp) |
cpn = NULL; |
cpn = NULL; |
|
if (kind) |
|
term_word(tp, |
|
cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|"); |
for (;;) { |
for (;;) { |
col = tp->tbl.cols + cp->col; |
col = tp->tbl.cols + cp->col; |
|
if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) { |
|
line = stdline; |
|
cross = stdcross; |
|
} else { |
|
line = ' '; |
|
cross = (kind < 3) ? '|' : ' '; |
|
} |
tbl_char(tp, line, col->width + col->spacing / 2); |
tbl_char(tp, line, col->width + col->spacing / 2); |
vert = cp->vert; |
vert = cp->vert; |
if ((cp = cp->next) == NULL) |
if ((cp = cp->next) == NULL) |
Line 490 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
Line 498 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
vert = cpn->vert; |
vert = cpn->vert; |
cpn = cpn->next; |
cpn = cpn->next; |
} |
} |
|
if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) { |
|
line = stdline; |
|
cross = stdcross; |
|
} else |
|
line = ' '; |
if (sp->opts->opts & TBL_OPT_ALLBOX && !vert) |
if (sp->opts->opts & TBL_OPT_ALLBOX && !vert) |
vert = 1; |
vert = 1; |
if (col->spacing) |
if (col->spacing) |
Line 500 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
Line 513 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
tbl_char(tp, line, (col->spacing - 3) / 2); |
tbl_char(tp, line, (col->spacing - 3) / 2); |
} |
} |
if (kind) { |
if (kind) { |
term_word(tp, "+"); |
term_word(tp, |
|
cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|"); |
term_flushln(tp); |
term_flushln(tp); |
} |
} |
} |
} |