version 1.54, 2017/06/17 14:55:30 |
version 1.60, 2018/08/19 23:10:28 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011-2018 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 <sys/types.h> |
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
|
#include <ctype.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
Line 51 static void tbl_word(struct termp *, const struct tbl_ |
|
Line 52 static void tbl_word(struct termp *, const struct tbl_ |
|
static size_t |
static size_t |
term_tbl_sulen(const struct roffsu *su, void *arg) |
term_tbl_sulen(const struct roffsu *su, void *arg) |
{ |
{ |
return term_hen((const struct termp *)arg, su); |
int i; |
|
|
|
i = term_hen((const struct termp *)arg, su); |
|
return i > 0 ? i : 0; |
} |
} |
|
|
static size_t |
static size_t |
Line 101 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 105 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
for (ic = 0; ic < sp->opts->cols; ic++) { |
for (ic = 0; ic < sp->opts->cols; ic++) { |
coloff += tp->tbl.cols[ic].width; |
coloff += tp->tbl.cols[ic].width; |
term_tab_iset(coloff); |
term_tab_iset(coloff); |
coloff += 3; |
coloff += tp->tbl.cols[ic].spacing; |
} |
} |
|
|
/* Center the table as a whole. */ |
/* Center the table as a whole. */ |
Line 110 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 114 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
if (sp->opts->opts & TBL_OPT_CENTRE) { |
if (sp->opts->opts & TBL_OPT_CENTRE) { |
tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) |
tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) |
? 2 : !!sp->opts->lvert + !!sp->opts->rvert; |
? 2 : !!sp->opts->lvert + !!sp->opts->rvert; |
for (ic = 0; ic < sp->opts->cols; ic++) |
for (ic = 0; ic + 1 < sp->opts->cols; ic++) |
tsz += tp->tbl.cols[ic].width + 3; |
tsz += tp->tbl.cols[ic].width + |
tsz -= 3; |
tp->tbl.cols[ic].spacing; |
|
if (sp->opts->cols) |
|
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 ? |
tp->tcol->offset = offset + tp->tcol->rmargin > tsz ? |
Line 159 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 165 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
} |
} |
coloff += tp->tbl.cols[ic].width; |
coloff += tp->tbl.cols[ic].width; |
tp->tcol->rmargin = coloff; |
tp->tcol->rmargin = coloff; |
coloff++; |
|
if (ic + 1 < sp->opts->cols) |
if (ic + 1 < sp->opts->cols) |
coloff += 2; |
coloff += tp->tbl.cols[ic].spacing; |
if (spans) { |
if (spans) { |
spans--; |
spans--; |
continue; |
continue; |
Line 169 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 174 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
if (dp == NULL) |
if (dp == NULL) |
continue; |
continue; |
spans = dp->spans; |
spans = dp->spans; |
dp = dp->next; |
if (ic || sp->layout->first->pos != TBL_CELL_SPAN) |
|
dp = dp->next; |
} |
} |
|
|
/* Set up a column for a right vertical frame. */ |
/* Set up a column for a right vertical frame. */ |
|
|
tp->tcol++; |
tp->tcol++; |
tp->tcol->offset = coloff; |
tp->tcol->offset = coloff + 1; |
tp->tcol->rmargin = tp->maxrmargin; |
tp->tcol->rmargin = tp->maxrmargin; |
|
|
/* Spans may have reduced the number of columns. */ |
/* Spans may have reduced the number of columns. */ |
Line 203 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 209 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
if (dp == NULL) |
if (dp == NULL) |
continue; |
continue; |
spans = dp->spans; |
spans = dp->spans; |
dp = dp->next; |
if (cp->pos != TBL_CELL_SPAN) |
|
dp = dp->next; |
} |
} |
break; |
break; |
} |
} |
Line 303 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 310 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
} |
} |
if (dp != NULL) { |
if (dp != NULL) { |
spans = dp->spans; |
spans = dp->spans; |
dp = dp->next; |
if (ic || sp->layout->first->pos |
|
!= TBL_CELL_SPAN) |
|
dp = dp->next; |
} |
} |
|
|
/* |
/* |
Line 327 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 336 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
tp->tcol + 1 == tp->tcols + tp->lasttcol)) |
tp->tcol + 1 == tp->tcols + tp->lasttcol)) |
continue; |
continue; |
|
|
if (tp->tcol->rmargin > tp->viscol) { |
if (tp->viscol < tp->tcol->rmargin) { |
(*tp->advance)(tp, tp->tcol->rmargin |
(*tp->advance)(tp, tp->tcol->rmargin |
- tp->viscol); |
- tp->viscol); |
tp->viscol = tp->tcol->rmargin; |
tp->viscol = tp->tcol->rmargin; |
} |
} |
|
while (tp->viscol < tp->tcol->rmargin + |
if (tp->tcol->rmargin + 1 > tp->viscol) { |
tp->tbl.cols[ic].spacing / 2) { |
(*tp->letter)(tp, fc); |
(*tp->letter)(tp, fc); |
tp->viscol++; |
tp->viscol++; |
} |
} |
Line 353 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 362 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
break; |
break; |
} |
} |
} |
} |
|
if (tp->tbl.cols[ic].spacing) { |
|
(*tp->letter)(tp, fc == ' ' ? '|' : |
|
vert ? '+' : fc); |
|
tp->viscol++; |
|
} |
|
|
(*tp->letter)(tp, |
|
fc == ' ' ? '|' : vert ? '+' : fc); |
|
tp->viscol++; |
|
|
|
if (fc != ' ') { |
if (fc != ' ') { |
if (cp != NULL && |
if (cp != NULL && |
cp->pos == TBL_CELL_HORIZ) |
cp->pos == TBL_CELL_HORIZ) |
Line 368 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 378 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
else |
else |
fc = ' '; |
fc = ' '; |
} |
} |
if (vert > 1 || fc != ' ') { |
if (tp->tbl.cols[ic].spacing > 2 && |
|
(vert > 1 || fc != ' ')) { |
(*tp->letter)(tp, fc == ' ' ? '|' : |
(*tp->letter)(tp, fc == ' ' ? '|' : |
vert > 1 ? '+' : fc); |
vert > 1 ? '+' : fc); |
tp->viscol++; |
tp->viscol++; |
|
|
tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind) |
tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind) |
{ |
{ |
const struct tbl_cell *cp, *cpn, *cpp; |
const struct tbl_cell *cp, *cpn, *cpp; |
|
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 463 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
Line 473 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 (;;) { |
tbl_char(tp, line, tp->tbl.cols[cp->col].width + 1); |
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); |
vert = cp->vert; |
vert = cp->vert; |
if ((cp = cp->next) == NULL) |
if ((cp = cp->next) == NULL) |
break; |
break; |
Line 478 tbl_hrule(struct termp *tp, const struct tbl_span *sp, |
|
Line 499 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 (vert) |
if (col->spacing) |
tbl_char(tp, cross, vert); |
tbl_char(tp, vert ? cross : line, 1); |
if (vert < 2) |
if (col->spacing > 2) |
tbl_char(tp, line, 2 - vert); |
tbl_char(tp, vert > 1 ? cross : line, 1); |
|
if (col->spacing > 4) |
|
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); |
} |
} |
} |
} |
Line 507 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 536 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
break; |
break; |
} |
} |
|
|
if (dp == NULL) { |
if (dp == NULL) |
tbl_char(tp, ASCII_NBRSP, col->width); |
|
return; |
return; |
} |
|
|
|
switch (dp->pos) { |
switch (dp->pos) { |
case TBL_DATA_NONE: |
case TBL_DATA_NONE: |
tbl_char(tp, ASCII_NBRSP, col->width); |
|
return; |
return; |
case TBL_DATA_HORIZ: |
case TBL_DATA_HORIZ: |
case TBL_DATA_NHORIZ: |
case TBL_DATA_NHORIZ: |
Line 539 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 565 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
tbl_number(tp, opts, dp, col); |
tbl_number(tp, opts, dp, col); |
break; |
break; |
case TBL_CELL_DOWN: |
case TBL_CELL_DOWN: |
tbl_char(tp, ASCII_NBRSP, col->width); |
case TBL_CELL_SPAN: |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 608 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
Line 634 tbl_number(struct termp *tp, const struct tbl_opts *op |
|
const struct tbl_dat *dp, |
const struct tbl_dat *dp, |
const struct roffcol *col) |
const struct roffcol *col) |
{ |
{ |
char *cp; |
const char *cp, *lastdigit, *lastpoint; |
|
size_t intsz, padl, totsz; |
char buf[2]; |
char buf[2]; |
size_t sz, psz, ssz, d, padl; |
|
int i; |
|
|
|
/* |
/* |
* See calc_data_number(). Left-pad by taking the offset of our |
* Almost the same code as in tblcalc_number(): |
* and the maximum decimal; right-pad by the remaining amount. |
* First find the position of the decimal point. |
*/ |
*/ |
|
|
assert(dp->string); |
assert(dp->string); |
|
lastdigit = lastpoint = NULL; |
|
for (cp = dp->string; cp[0] != '\0'; cp++) { |
|
if (cp[0] == '\\' && cp[1] == '&') { |
|
lastdigit = lastpoint = cp; |
|
break; |
|
} else if (cp[0] == opts->decimal && |
|
(isdigit((unsigned char)cp[1]) || |
|
(cp > dp->string && isdigit((unsigned char)cp[-1])))) |
|
lastpoint = cp; |
|
else if (isdigit((unsigned char)cp[0])) |
|
lastdigit = cp; |
|
} |
|
|
sz = term_strlen(tp, dp->string); |
/* Then measure both widths. */ |
|
|
buf[0] = opts->decimal; |
padl = 0; |
buf[1] = '\0'; |
totsz = term_strlen(tp, dp->string); |
|
if (lastdigit != NULL) { |
|
if (lastpoint == NULL) |
|
lastpoint = lastdigit + 1; |
|
intsz = 0; |
|
buf[1] = '\0'; |
|
for (cp = dp->string; cp < lastpoint; cp++) { |
|
buf[0] = cp[0]; |
|
intsz += term_strlen(tp, buf); |
|
} |
|
|
psz = term_strlen(tp, buf); |
/* |
|
* Pad left to match the decimal position, |
|
* but avoid exceeding the total column width. |
|
*/ |
|
|
if ((cp = strrchr(dp->string, opts->decimal)) != NULL) { |
if (col->decimal > intsz && col->width > totsz) { |
for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { |
padl = col->decimal - intsz; |
buf[0] = dp->string[i]; |
if (padl + totsz > col->width) |
ssz += term_strlen(tp, buf); |
padl = col->width - totsz; |
} |
} |
d = ssz + psz; |
|
} else |
|
d = sz + psz; |
|
|
|
if (col->decimal > d && col->width > sz) { |
/* If it is not a number, simply center the string. */ |
padl = col->decimal - d; |
|
if (padl + sz > col->width) |
} else if (col->width > totsz) |
padl = col->width - sz; |
padl = (col->width - totsz) / 2; |
tbl_char(tp, ASCII_NBRSP, padl); |
|
} else |
tbl_char(tp, ASCII_NBRSP, padl); |
padl = 0; |
|
tbl_word(tp, dp); |
tbl_word(tp, dp); |
if (col->width > sz + padl) |
|
tbl_char(tp, ASCII_NBRSP, col->width - sz - padl); |
/* Pad right to fill the column. */ |
|
|
|
if (col->width > padl + totsz) |
|
tbl_char(tp, ASCII_NBRSP, col->width - padl - totsz); |
} |
} |
|
|
static void |
static void |