version 1.62, 2018/11/28 04:47:51 |
version 1.71, 2019/06/11 16:04:36 |
|
|
/* $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 |
|
|
#include <string.h> |
#include <string.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "tbl.h" |
#include "out.h" |
#include "out.h" |
#include "term.h" |
#include "term.h" |
|
|
#define IS_HORIZ(cp) ((cp)->pos == TBL_CELL_HORIZ || \ |
#define IS_HORIZ(cp) ((cp)->pos == TBL_CELL_HORIZ || \ |
(cp)->pos == TBL_CELL_DHORIZ) |
(cp)->pos == TBL_CELL_DHORIZ) |
|
|
/* Flags for tbl_hrule(). */ |
|
#define HRULE_DBOX (1 << 0) /* Top and bottom, ASCII mode only. */ |
|
#define HRULE_DATA (1 << 1) /* In the middle of the table. */ |
|
#define HRULE_DOWN (1 << 2) /* Allow downward branches. */ |
|
#define HRULE_UP (1 << 3) /* Allow upward branches. */ |
|
#define HRULE_ENDS (1 << 4) /* Also generate left and right ends. */ |
|
|
|
|
|
static size_t term_tbl_len(size_t, void *); |
static size_t term_tbl_len(size_t, void *); |
static size_t term_tbl_strlen(const char *, void *); |
static size_t term_tbl_strlen(const char *, void *); |
static size_t term_tbl_sulen(const struct roffsu *, void *); |
static size_t term_tbl_sulen(const struct roffsu *, void *); |
Line 51 static void tbl_direct_border(struct termp *, int, siz |
|
Line 45 static void tbl_direct_border(struct termp *, int, siz |
|
static void tbl_fill_border(struct termp *, int, size_t); |
static void tbl_fill_border(struct termp *, int, size_t); |
static void tbl_fill_char(struct termp *, char, size_t); |
static void tbl_fill_char(struct termp *, char, size_t); |
static void tbl_fill_string(struct termp *, const char *, size_t); |
static void tbl_fill_string(struct termp *, const char *, size_t); |
static void tbl_hrule(struct termp *, const struct tbl_span *, int); |
static void tbl_hrule(struct termp *, const struct tbl_span *, |
|
const struct tbl_span *, const struct tbl_span *, |
|
int); |
static void tbl_literal(struct termp *, const struct tbl_dat *, |
static void tbl_literal(struct termp *, const struct tbl_dat *, |
const struct roffcol *); |
const struct roffcol *); |
static void tbl_number(struct termp *, const struct tbl_opts *, |
static void tbl_number(struct termp *, const struct tbl_opts *, |
Line 168 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 164 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, lhori, rhori, uvert; |
|
|
/* 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 216 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 214 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. */ |
|
|
if (tp->enc == TERMENC_ASCII && |
if (tp->enc == TERMENC_ASCII && |
sp->opts->opts & TBL_OPT_DBOX) |
sp->opts->opts & TBL_OPT_DBOX) |
tbl_hrule(tp, sp, HRULE_DBOX | HRULE_ENDS); |
tbl_hrule(tp, NULL, sp, sp, TBL_OPT_DBOX); |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) |
tbl_hrule(tp, sp, HRULE_DOWN | HRULE_ENDS); |
tbl_hrule(tp, NULL, sp, sp, TBL_OPT_BOX); |
} |
} |
|
|
/* 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 326 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 326 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
(horiz || (IS_HORIZ(sp->layout->first) && |
(horiz || (IS_HORIZ(sp->layout->first) && |
!IS_HORIZ(sp->prev->layout->first)))) |
!IS_HORIZ(sp->prev->layout->first)))) |
uvert = sp->prev->layout->vert; |
uvert = sp->prev->layout->vert; |
line = sp->pos == TBL_SPAN_DHORIZ || |
rhori = sp->pos == TBL_SPAN_DHORIZ || |
|
(sp->first != NULL && sp->first->pos == TBL_DATA_DHORIZ) || |
sp->layout->first->pos == TBL_CELL_DHORIZ ? 2 : |
sp->layout->first->pos == TBL_CELL_DHORIZ ? 2 : |
sp->pos == TBL_SPAN_HORIZ || |
sp->pos == TBL_SPAN_HORIZ || |
|
(sp->first != NULL && sp->first->pos == TBL_DATA_HORIZ) || |
sp->layout->first->pos == TBL_CELL_HORIZ ? 1 : 0; |
sp->layout->first->pos == TBL_CELL_HORIZ ? 1 : 0; |
fc = BUP * uvert + BDOWN * dvert + BRIGHT * line; |
fc = BUP * uvert + BDOWN * dvert + BRIGHT * rhori; |
if (uvert > 0 || dvert > 0 || (horiz && sp->opts->lvert)) { |
if (uvert > 0 || dvert > 0 || (horiz && sp->opts->lvert)) { |
(*tp->advance)(tp, tp->tcols->offset); |
(*tp->advance)(tp, tp->tcols->offset); |
tp->viscol = tp->tcol->offset; |
tp->viscol = tp->tcol->offset; |
Line 341 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 343 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
|
|
more = 0; |
more = 0; |
if (horiz) |
if (horiz) |
tbl_hrule(tp, sp, HRULE_DATA | HRULE_DOWN | HRULE_UP); |
tbl_hrule(tp, sp->prev, sp, sp->next, 0); |
else { |
else { |
cp = sp->layout->first; |
cp = sp->layout->first; |
cpn = sp->next == NULL ? NULL : |
cpn = sp->next == NULL ? NULL : |
Line 403 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 405 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
cpn = cpn->next; |
cpn = cpn->next; |
} |
} |
|
|
|
lhori = (cp != NULL && |
|
cp->pos == TBL_CELL_DHORIZ) || |
|
(dp != NULL && |
|
dp->pos == TBL_DATA_DHORIZ) ? 2 : |
|
(cp != NULL && |
|
cp->pos == TBL_CELL_HORIZ) || |
|
(dp != NULL && |
|
dp->pos == TBL_DATA_HORIZ) ? 1 : 0; |
|
|
/* |
/* |
* Skip later cells in a span, |
* Skip later cells in a span, |
* figure out whether to start a span, |
* figure out whether to start a span, |
Line 437 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 448 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
* but not after the last column. |
* but not after the last column. |
*/ |
*/ |
|
|
if (fc == 0 && ((uvert == 0 && dvert == 0 && |
if (fc == 0 && |
(cp->next == NULL || |
((uvert == 0 && dvert == 0 && |
|
cp != NULL && (cp->next == NULL || |
!IS_HORIZ(cp->next))) || |
!IS_HORIZ(cp->next))) || |
tp->tcol + 1 == tp->tcols + tp->lasttcol)) { |
tp->tcol + 1 == |
cp = cp->next; |
tp->tcols + tp->lasttcol)) { |
|
if (cp != NULL) |
|
cp = cp->next; |
continue; |
continue; |
} |
} |
|
|
Line 452 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 466 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
} |
} |
while (tp->viscol < tp->tcol->rmargin + |
while (tp->viscol < tp->tcol->rmargin + |
tp->tbl.cols[ic].spacing / 2) |
tp->tbl.cols[ic].spacing / 2) |
tbl_direct_border(tp, fc, 1); |
tbl_direct_border(tp, |
|
BHORIZ * lhori, 1); |
|
|
if (tp->tcol + 1 == tp->tcols + tp->lasttcol) |
if (tp->tcol + 1 == tp->tcols + tp->lasttcol) |
continue; |
continue; |
|
|
if (cp != NULL) { |
if (cp != NULL) |
switch (cp->pos) { |
|
case TBL_CELL_HORIZ: |
|
fc = BLEFT; |
|
break; |
|
case TBL_CELL_DHORIZ: |
|
fc = BLEFT * 2; |
|
break; |
|
default: |
|
fc = 0; |
|
break; |
|
} |
|
cp = cp->next; |
cp = cp->next; |
} |
|
if (cp != NULL) { |
rhori = (cp != NULL && |
switch (cp->pos) { |
cp->pos == TBL_CELL_DHORIZ) || |
case TBL_CELL_HORIZ: |
(dp != NULL && |
fc += BRIGHT; |
dp->pos == TBL_DATA_DHORIZ) ? 2 : |
break; |
(cp != NULL && |
case TBL_CELL_DHORIZ: |
cp->pos == TBL_CELL_HORIZ) || |
fc += BRIGHT * 2; |
(dp != NULL && |
break; |
dp->pos == TBL_DATA_HORIZ) ? 1 : 0; |
default: |
|
break; |
|
} |
|
} |
|
if (tp->tbl.cols[ic].spacing) |
if (tp->tbl.cols[ic].spacing) |
tbl_direct_border(tp, fc + |
tbl_direct_border(tp, |
|
BLEFT * lhori + BRIGHT * rhori + |
BUP * uvert + BDOWN * dvert, 1); |
BUP * uvert + BDOWN * dvert, 1); |
|
|
if (tp->enc == TERMENC_UTF8) |
if (tp->enc == TERMENC_UTF8) |
uvert = dvert = 0; |
uvert = dvert = 0; |
|
|
if (fc != 0) { |
|
if (cp != NULL && |
|
cp->pos == TBL_CELL_HORIZ) |
|
fc = BHORIZ; |
|
else if (cp != NULL && |
|
cp->pos == TBL_CELL_DHORIZ) |
|
fc = BHORIZ * 2; |
|
else |
|
fc = 0; |
|
} |
|
if (tp->tbl.cols[ic].spacing > 2 && |
if (tp->tbl.cols[ic].spacing > 2 && |
(uvert > 1 || dvert > 1 || fc != 0)) |
(uvert > 1 || dvert > 1 || rhori)) |
tbl_direct_border(tp, fc + |
tbl_direct_border(tp, |
|
BHORIZ * rhori + |
BUP * (uvert > 1) + |
BUP * (uvert > 1) + |
BDOWN * (dvert > 1), 1); |
BDOWN * (dvert > 1), 1); |
} |
} |
Line 526 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 519 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
(horiz || (IS_HORIZ(sp->layout->last) && |
(horiz || (IS_HORIZ(sp->layout->last) && |
!IS_HORIZ(sp->prev->layout->last)))) |
!IS_HORIZ(sp->prev->layout->last)))) |
uvert = sp->prev->layout->last->vert; |
uvert = sp->prev->layout->last->vert; |
line = sp->pos == TBL_SPAN_DHORIZ || |
lhori = sp->pos == TBL_SPAN_DHORIZ || |
|
(sp->last != NULL && |
|
sp->last->pos == TBL_DATA_DHORIZ && |
|
sp->last->layout->col + 1 == sp->opts->cols) || |
(sp->layout->last->pos == TBL_CELL_DHORIZ && |
(sp->layout->last->pos == TBL_CELL_DHORIZ && |
sp->layout->last->col + 1 == sp->opts->cols) ? 2 : |
sp->layout->last->col + 1 == sp->opts->cols) ? 2 : |
sp->pos == TBL_SPAN_HORIZ || |
sp->pos == TBL_SPAN_HORIZ || |
|
(sp->last != NULL && |
|
sp->last->pos == TBL_DATA_HORIZ && |
|
sp->last->layout->col + 1 == sp->opts->cols) || |
(sp->layout->last->pos == TBL_CELL_HORIZ && |
(sp->layout->last->pos == TBL_CELL_HORIZ && |
sp->layout->last->col + 1 == sp->opts->cols) ? 1 : 0; |
sp->layout->last->col + 1 == sp->opts->cols) ? 1 : 0; |
fc = BUP * uvert + BDOWN * dvert + BLEFT * line; |
fc = BUP * uvert + BDOWN * dvert + BLEFT * lhori; |
if (uvert > 0 || dvert > 0 || (horiz && sp->opts->rvert)) { |
if (uvert > 0 || dvert > 0 || (horiz && sp->opts->rvert)) { |
if (horiz == 0 && (IS_HORIZ(sp->layout->last) == 0 || |
if (horiz == 0 && (IS_HORIZ(sp->layout->last) == 0 || |
sp->layout->last->col + 1 < sp->opts->cols)) { |
sp->layout->last->col + 1 < sp->opts->cols)) { |
tp->tcol++; |
tp->tcol++; |
(*tp->advance)(tp, |
do { |
tp->tcol->offset > tp->viscol ? |
tbl_direct_border(tp, |
tp->tcol->offset - tp->viscol : 1); |
BHORIZ * lhori, 1); |
|
} while (tp->viscol < tp->tcol->offset); |
} |
} |
tbl_direct_border(tp, fc, 1); |
tbl_direct_border(tp, fc, 1); |
} |
} |
Line 558 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 558 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
tp->tcol->rmargin = tp->maxrmargin; |
tp->tcol->rmargin = tp->maxrmargin; |
if (sp->next == NULL) { |
if (sp->next == NULL) { |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { |
tbl_hrule(tp, sp, HRULE_UP | HRULE_ENDS); |
tbl_hrule(tp, sp, sp, NULL, TBL_OPT_BOX); |
tp->skipvsp = 1; |
tp->skipvsp = 1; |
} |
} |
if (tp->enc == TERMENC_ASCII && |
if (tp->enc == TERMENC_ASCII && |
sp->opts->opts & TBL_OPT_DBOX) { |
sp->opts->opts & TBL_OPT_DBOX) { |
tbl_hrule(tp, sp, HRULE_DBOX | HRULE_ENDS); |
tbl_hrule(tp, sp, sp, NULL, TBL_OPT_DBOX); |
tp->skipvsp = 2; |
tp->skipvsp = 2; |
} |
} |
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, |
tbl_hrule(tp, sp, sp, sp->next, TBL_OPT_ALLBOX); |
HRULE_DATA | HRULE_DOWN | HRULE_UP | HRULE_ENDS); |
|
|
|
|
tp->tcol->offset = save_offset; |
tp->flags &= ~TERMP_NONOSPACE; |
tp->flags &= ~TERMP_NONOSPACE; |
} |
} |
|
|
static void |
static void |
tbl_hrule(struct termp *tp, const struct tbl_span *sp, int flags) |
tbl_hrule(struct termp *tp, const struct tbl_span *spp, |
|
const struct tbl_span *sp, const struct tbl_span *spn, int flags) |
{ |
{ |
const struct tbl_cell *cp, *cpn, *cpp; |
const struct tbl_cell *cpp; /* Layout cell above this line. */ |
const struct roffcol *col; |
const struct tbl_cell *cp; /* Layout cell in this line. */ |
int cross, dvert, line, linewidth, uvert; |
const struct tbl_cell *cpn; /* Layout cell below this line. */ |
|
const struct tbl_dat *dpn; /* Data cell below this line. */ |
|
const struct roffcol *col; /* Contains width and spacing. */ |
|
int opts; /* For the table as a whole. */ |
|
int bw; /* Box line width. */ |
|
int hw; /* Horizontal line width. */ |
|
int lw, rw; /* Left and right line widths. */ |
|
int uw, dw; /* Vertical line widths. */ |
|
|
cp = sp->layout->first; |
cpp = spp == NULL ? NULL : spp->layout->first; |
cpn = cpp = NULL; |
cp = sp == NULL ? NULL : sp->layout->first; |
if (flags & HRULE_DATA) { |
cpn = spn == NULL ? NULL : spn->layout->first; |
linewidth = sp->pos == TBL_SPAN_DHORIZ ? 2 : 1; |
dpn = NULL; |
cpn = sp->next == NULL ? NULL : sp->next->layout->first; |
if (spn != NULL) { |
if (cpn == cp) |
if (spn->pos == TBL_SPAN_DATA) |
cpn = NULL; |
dpn = spn->first; |
} else |
else if (spn->next != NULL) |
linewidth = tp->enc == TERMENC_UTF8 && |
dpn = spn->next->first; |
sp->opts->opts & TBL_OPT_DBOX ? 2 : 1; |
} |
|
opts = sp->opts->opts; |
|
bw = opts & TBL_OPT_DBOX ? (tp->enc == TERMENC_UTF8 ? 2 : 1) : |
|
opts & (TBL_OPT_BOX | TBL_OPT_ALLBOX) ? 1 : 0; |
|
hw = flags == TBL_OPT_DBOX || flags == TBL_OPT_BOX ? bw : |
|
sp->pos == TBL_SPAN_DHORIZ ? 2 : 1; |
|
|
|
/* Print the left end of the line. */ |
|
|
if (tp->viscol == 0) { |
if (tp->viscol == 0) { |
(*tp->advance)(tp, tp->tcols->offset); |
(*tp->advance)(tp, tp->tcols->offset); |
tp->viscol = tp->tcols->offset; |
tp->viscol = tp->tcols->offset; |
} |
} |
if (flags & HRULE_ENDS) |
if (flags != 0) |
tbl_direct_border(tp, linewidth * (BRIGHT + |
tbl_direct_border(tp, |
(flags & (HRULE_UP | HRULE_DBOX) ? BUP : 0) + |
(spp == NULL ? 0 : BUP * bw) + |
(flags & (HRULE_DOWN | HRULE_DBOX) ? BDOWN : 0)), 1); |
(spn == NULL ? 0 : BDOWN * bw) + |
else { |
(spp == NULL || cpn == NULL || |
cpp = sp->prev == NULL ? NULL : sp->prev->layout->first; |
cpn->pos != TBL_CELL_DOWN ? BRIGHT * hw : 0), 1); |
if (cpp == cp) |
|
cpp = NULL; |
col = tp->tbl.cols; |
} |
|
for (;;) { |
for (;;) { |
col = tp->tbl.cols + cp->col; |
if (cp == NULL) |
line = cpn == NULL || cpn->pos != TBL_CELL_DOWN ? |
col++; |
BHORIZ * linewidth : 0; |
else |
tbl_direct_border(tp, line, col->width + col->spacing / 2); |
col = tp->tbl.cols + cp->col; |
uvert = dvert = 0; |
|
if (flags & HRULE_UP && |
/* Print the horizontal line inside this column. */ |
(tp->enc == TERMENC_ASCII || sp->pos == TBL_SPAN_DATA || |
|
(sp->prev != NULL && sp->prev->layout == sp->layout))) |
lw = cpp == NULL || cpn == NULL || |
uvert = cp->vert; |
(cpn->pos != TBL_CELL_DOWN && |
if (flags & HRULE_DOWN) |
(dpn == NULL || dpn->string == NULL || |
dvert = cp->vert; |
strcmp(dpn->string, "\\^") != 0)) |
if ((cp = cp->next) == NULL) |
? hw : 0; |
break; |
tbl_direct_border(tp, BHORIZ * lw, |
|
col->width + col->spacing / 2); |
|
|
|
/* |
|
* Figure out whether a vertical line is crossing |
|
* at the end of this column, |
|
* and advance to the next column. |
|
*/ |
|
|
|
uw = dw = 0; |
if (cpp != NULL) { |
if (cpp != NULL) { |
if (uvert < cpp->vert) |
if (flags != TBL_OPT_DBOX) { |
uvert = cpp->vert; |
uw = cpp->vert; |
|
if (uw == 0 && opts & TBL_OPT_ALLBOX) |
|
uw = 1; |
|
} |
cpp = cpp->next; |
cpp = cpp->next; |
} |
} else if (spp != NULL && opts & TBL_OPT_ALLBOX) |
|
uw = 1; |
|
if (cp != NULL) |
|
cp = cp->next; |
if (cpn != NULL) { |
if (cpn != NULL) { |
if (dvert < cpn->vert) |
if (flags != TBL_OPT_DBOX) { |
dvert = cpn->vert; |
dw = cpn->vert; |
|
if (dw == 0 && opts & TBL_OPT_ALLBOX) |
|
dw = 1; |
|
} |
cpn = cpn->next; |
cpn = cpn->next; |
} |
while (dpn != NULL && dpn->layout != cpn) |
if (sp->opts->opts & TBL_OPT_ALLBOX) { |
dpn = dpn->next; |
if (flags & HRULE_UP && uvert == 0) |
} else if (spn != NULL && opts & TBL_OPT_ALLBOX) |
uvert = 1; |
dw = 1; |
if (flags & HRULE_DOWN && dvert == 0) |
if (col + 1 == tp->tbl.cols + sp->opts->cols) |
dvert = 1; |
break; |
} |
|
cross = BHORIZ * linewidth + BUP * uvert + BDOWN * dvert; |
/* Vertical lines do not cross spanned cells. */ |
|
|
|
if (cpp != NULL && cpp->pos == TBL_CELL_SPAN) |
|
uw = 0; |
|
if (cpn != NULL && cpn->pos == TBL_CELL_SPAN) |
|
dw = 0; |
|
|
|
/* The horizontal line inside the next column. */ |
|
|
|
rw = cpp == NULL || cpn == NULL || |
|
(cpn->pos != TBL_CELL_DOWN && |
|
(dpn == NULL || dpn->string == NULL || |
|
strcmp(dpn->string, "\\^") != 0)) |
|
? hw : 0; |
|
|
|
/* The line crossing at the end of this column. */ |
|
|
if (col->spacing) |
if (col->spacing) |
tbl_direct_border(tp, cross, 1); |
tbl_direct_border(tp, BLEFT * lw + |
|
BRIGHT * rw + BUP * uw + BDOWN * dw, 1); |
|
|
|
/* |
|
* In ASCII output, a crossing may print two characters. |
|
*/ |
|
|
|
if (tp->enc != TERMENC_ASCII || (uw < 2 && dw < 2)) |
|
uw = dw = 0; |
if (col->spacing > 2) |
if (col->spacing > 2) |
tbl_direct_border(tp, tp->enc == TERMENC_ASCII && |
tbl_direct_border(tp, |
(uvert > 1 || dvert > 1) ? cross : line, 1); |
BHORIZ * rw + BUP * uw + BDOWN * dw, 1); |
|
|
|
/* Padding before the start of the next column. */ |
|
|
if (col->spacing > 4) |
if (col->spacing > 4) |
tbl_direct_border(tp, line, (col->spacing - 3) / 2); |
tbl_direct_border(tp, |
|
BHORIZ * rw, (col->spacing - 3) / 2); |
} |
} |
if (flags & HRULE_ENDS) { |
|
tbl_direct_border(tp, linewidth * (BLEFT + |
/* Print the right end of the line. */ |
(flags & (HRULE_UP | HRULE_DBOX) ? BUP : 0) + |
|
(flags & (HRULE_DOWN | HRULE_DBOX) ? BDOWN : 0)), 1); |
if (flags != 0) { |
|
tbl_direct_border(tp, |
|
(spp == NULL ? 0 : BUP * bw) + |
|
(spn == NULL ? 0 : BDOWN * bw) + |
|
(spp == NULL || spn == NULL || |
|
spn->layout->last->pos != TBL_CELL_DOWN ? |
|
BLEFT * hw : 0), 1); |
(*tp->endline)(tp); |
(*tp->endline)(tp); |
tp->viscol = 0; |
tp->viscol = 0; |
} |
} |