version 1.68, 2019/02/09 21:02:47 |
version 1.78, 2022/04/26 14:52:05 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
|
* Copyright (c) 2011-2022 Ingo Schwarze <schwarze@openbsd.org> |
* 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> |
|
* |
* |
* 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 <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#if DEBUG_MEMORY |
|
#include "mandoc_dbg.h" |
|
#endif |
#include "mandoc.h" |
#include "mandoc.h" |
#include "tbl.h" |
#include "tbl.h" |
#include "out.h" |
#include "out.h" |
Line 46 static void tbl_fill_border(struct termp *, int, size_ |
|
Line 49 static void tbl_fill_border(struct termp *, int, size_ |
|
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 *, |
static void tbl_hrule(struct termp *, const struct tbl_span *, |
const struct tbl_span *, int); |
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 163 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 167 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 save_offset; |
size_t coloff, tsz; |
size_t coloff, tsz; |
int hspans, ic, more; |
int hspans, ic, more; |
int dvert, fc, horiz, lhori, rhori, uvert; |
int dvert, fc, horiz, lhori, rhori, uvert; |
Line 189 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 193 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 222 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 215 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
|
|
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, NULL, sp, TBL_OPT_DBOX); |
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, NULL, sp, TBL_OPT_BOX); |
tbl_hrule(tp, NULL, sp, sp, TBL_OPT_BOX); |
} |
} |
|
|
/* Set up the columns. */ |
/* Set up the columns. */ |
Line 266 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 259 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 300 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 293 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
} |
} |
tp->tcol++; |
tp->tcol++; |
tp->col = 0; |
tp->col = 0; |
|
tp->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE); |
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 342 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 336 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
|
|
more = 0; |
more = 0; |
if (horiz) |
if (horiz) |
tbl_hrule(tp, sp->prev, sp, 0); |
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 424 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 418 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; |
|
} |
} |
|
|
/* |
/* |
Line 557 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 550 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, NULL, TBL_OPT_BOX); |
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, NULL, TBL_OPT_DBOX); |
tbl_hrule(tp, sp, sp, NULL, TBL_OPT_DBOX); |
tp->skipvsp = 2; |
tp->skipvsp = 2; |
} |
} |
assert(tp->tbl.cols); |
assert(tp->tbl.cols); |
Line 571 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 564 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
} 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, sp->next, TBL_OPT_ALLBOX); |
|
|
tp->tcol->offset = save_offset; |
tp->tcol->offset = save_offset; |
tp->flags &= ~TERMP_NONOSPACE; |
tp->flags &= ~TERMP_NONOSPACE; |
Line 579 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 572 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
|
|
static void |
static void |
tbl_hrule(struct termp *tp, const struct tbl_span *spp, |
tbl_hrule(struct termp *tp, const struct tbl_span *spp, |
const struct tbl_span *spn, int flags) |
const struct tbl_span *sp, const struct tbl_span *spn, int flags) |
{ |
{ |
const struct tbl_cell *cpp; /* Layout cell above this line. */ |
const struct tbl_cell *cpp; /* Layout cell above this line. */ |
|
const struct tbl_cell *cp; /* Layout cell in this line. */ |
const struct tbl_cell *cpn; /* Layout cell below this line. */ |
const struct tbl_cell *cpn; /* Layout cell below this line. */ |
const struct tbl_dat *dpn; /* Data cell below this line. */ |
const struct tbl_dat *dpn; /* Data cell below this line. */ |
const struct roffcol *col; /* Contains width and spacing. */ |
const struct roffcol *col; /* Contains width and spacing. */ |
Line 592 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
Line 586 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
int uw, dw; /* Vertical line widths. */ |
int uw, dw; /* Vertical line widths. */ |
|
|
cpp = spp == NULL ? NULL : spp->layout->first; |
cpp = spp == NULL ? NULL : spp->layout->first; |
|
cp = sp == NULL ? NULL : sp->layout->first; |
cpn = spn == NULL ? NULL : spn->layout->first; |
cpn = spn == NULL ? NULL : spn->layout->first; |
dpn = NULL; |
dpn = NULL; |
if (spn != NULL) { |
if (spn != NULL) { |
Line 600 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
Line 595 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
else if (spn->next != NULL) |
else if (spn->next != NULL) |
dpn = spn->next->first; |
dpn = spn->next->first; |
} |
} |
opts = spn == NULL ? spp->opts->opts : spn->opts->opts; |
opts = sp->opts->opts; |
bw = opts & TBL_OPT_DBOX ? (tp->enc == TERMENC_UTF8 ? 2 : 1) : |
bw = opts & TBL_OPT_DBOX ? (tp->enc == TERMENC_UTF8 ? 2 : 1) : |
opts & (TBL_OPT_BOX | TBL_OPT_ALLBOX) ? 1 : 0; |
opts & (TBL_OPT_BOX | TBL_OPT_ALLBOX) ? 1 : 0; |
hw = flags == TBL_OPT_DBOX || flags == TBL_OPT_BOX ? bw : |
hw = flags == TBL_OPT_DBOX || flags == TBL_OPT_BOX ? bw : |
spn->pos == TBL_SPAN_DHORIZ ? 2 : 1; |
sp->pos == TBL_SPAN_DHORIZ ? 2 : 1; |
|
|
/* Print the left end of the line. */ |
/* Print the left end of the line. */ |
|
|
Line 619 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
Line 614 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
(spp == NULL || cpn == NULL || |
(spp == NULL || cpn == NULL || |
cpn->pos != TBL_CELL_DOWN ? BRIGHT * hw : 0), 1); |
cpn->pos != TBL_CELL_DOWN ? BRIGHT * hw : 0), 1); |
|
|
|
col = tp->tbl.cols; |
for (;;) { |
for (;;) { |
col = tp->tbl.cols + (cpn == NULL ? cpp->col : cpn->col); |
if (cp == NULL) |
|
col++; |
|
else |
|
col = tp->tbl.cols + cp->col; |
|
|
/* Print the horizontal line inside this column. */ |
/* Print the horizontal line inside this column. */ |
|
|
lw = cpp == NULL || cpn == NULL || |
lw = cpp == NULL || cpn == NULL || |
(cpn->pos != TBL_CELL_DOWN && |
(cpn->pos != TBL_CELL_DOWN && |
(dpn == NULL || strcmp(dpn->string, "\\^") != 0)) |
(dpn == NULL || dpn->string == NULL || |
|
strcmp(dpn->string, "\\^") != 0)) |
? hw : 0; |
? hw : 0; |
tbl_direct_border(tp, BHORIZ * lw, |
tbl_direct_border(tp, BHORIZ * lw, |
col->width + col->spacing / 2); |
col->width + col->spacing / 2); |
Line 645 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
Line 645 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
uw = 1; |
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 (flags != TBL_OPT_DBOX) { |
if (flags != TBL_OPT_DBOX) { |
dw = cpn->vert; |
dw = cpn->vert; |
Line 655 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
Line 658 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
cpn = cpn->next; |
cpn = cpn->next; |
while (dpn != NULL && dpn->layout != cpn) |
while (dpn != NULL && dpn->layout != cpn) |
dpn = dpn->next; |
dpn = dpn->next; |
} |
} else if (spn != NULL && opts & TBL_OPT_ALLBOX) |
if (cpp == NULL && cpn == NULL) |
dw = 1; |
|
if (col + 1 == tp->tbl.cols + sp->opts->cols) |
break; |
break; |
|
|
/* Vertical lines do not cross spanned cells. */ |
/* Vertical lines do not cross spanned cells. */ |
Line 670 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
Line 674 tbl_hrule(struct termp *tp, const struct tbl_span *spp |
|
|
|
rw = cpp == NULL || cpn == NULL || |
rw = cpp == NULL || cpn == NULL || |
(cpn->pos != TBL_CELL_DOWN && |
(cpn->pos != TBL_CELL_DOWN && |
(dpn == NULL || strcmp(dpn->string, "\\^") != 0)) |
(dpn == NULL || dpn->string == NULL || |
|
strcmp(dpn->string, "\\^") != 0)) |
? hw : 0; |
? hw : 0; |
|
|
/* The line crossing at the end of this column. */ |
/* The line crossing at the end of this column. */ |
Line 819 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
Line 824 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 922 tbl_word(struct termp *tp, const struct tbl_dat *dp) |
|
Line 930 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); |
|
|