version 1.9, 2011/01/04 13:21:45 |
version 1.60, 2018/08/19 23:10:28 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* 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 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
|
#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> |
|
|
#include "out.h" |
#include "out.h" |
#include "term.h" |
#include "term.h" |
|
|
/* FIXME: `n' modifier doesn't always do the right thing. */ |
#define IS_HORIZ(cp) ((cp)->pos == TBL_CELL_HORIZ || \ |
/* FIXME: `n' modifier doesn't use the cell-spacing buffer. */ |
(cp)->pos == TBL_CELL_DHORIZ) |
|
|
static inline void tbl_char(struct termp *, char, int); |
static size_t term_tbl_len(size_t, void *); |
static void tbl_hframe(struct termp *, |
static size_t term_tbl_strlen(const char *, void *); |
const struct tbl_span *); |
static size_t term_tbl_sulen(const struct roffsu *, void *); |
static void tbl_data_number(struct termp *, |
static void tbl_char(struct termp *, char, size_t); |
const struct tbl *, |
static void tbl_data(struct termp *, const struct tbl_opts *, |
const struct tbl_dat *, |
const struct tbl_cell *, |
const struct termp_tbl *); |
const struct tbl_dat *, |
static void tbl_data_literal(struct termp *, |
const struct roffcol *); |
const struct tbl_dat *, |
static void tbl_literal(struct termp *, const struct tbl_dat *, |
const struct termp_tbl *); |
const struct roffcol *); |
static void tbl_data(struct termp *, const struct tbl *, |
static void tbl_number(struct termp *, const struct tbl_opts *, |
const struct tbl_dat *, |
const struct tbl_dat *, |
const struct termp_tbl *); |
const struct roffcol *); |
static void tbl_spanner(struct termp *, |
static void tbl_hrule(struct termp *, const struct tbl_span *, int); |
const struct tbl_head *); |
static void tbl_word(struct termp *, const struct tbl_dat *); |
static void tbl_hrule(struct termp *, |
|
const struct tbl_span *); |
|
static void tbl_vframe(struct termp *, |
|
const struct tbl *); |
|
static void tbl_calc(struct termp *, |
|
const struct tbl_span *); |
|
static void tbl_calc_data(struct termp *, |
|
const struct tbl *, |
|
const struct tbl_dat *, |
|
struct termp_tbl *); |
|
static void tbl_calc_data_literal(struct termp *, |
|
const struct tbl_dat *, |
|
struct termp_tbl *); |
|
static void tbl_calc_data_number(struct termp *, |
|
const struct tbl *, |
|
const struct tbl_dat *, |
|
struct termp_tbl *); |
|
|
|
|
|
|
static size_t |
|
term_tbl_sulen(const struct roffsu *su, void *arg) |
|
{ |
|
int i; |
|
|
|
i = term_hen((const struct termp *)arg, su); |
|
return i > 0 ? i : 0; |
|
} |
|
|
|
static size_t |
|
term_tbl_strlen(const char *p, void *arg) |
|
{ |
|
return term_strlen((const struct termp *)arg, p); |
|
} |
|
|
|
static size_t |
|
term_tbl_len(size_t sz, void *arg) |
|
{ |
|
return term_len((const struct termp *)arg, sz); |
|
} |
|
|
void |
void |
term_tbl(struct termp *tp, const struct tbl_span *sp) |
term_tbl(struct termp *tp, const struct tbl_span *sp) |
{ |
{ |
const struct tbl_head *hp; |
const struct tbl_cell *cp, *cpn, *cpp; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
|
static size_t offset; |
|
size_t coloff, tsz; |
|
int ic, horiz, spans, vert, more; |
|
char fc; |
|
|
/* Inhibit printing of spaces: we do padding ourselves. */ |
/* Inhibit printing of spaces: we do padding ourselves. */ |
|
|
tp->flags |= TERMP_NONOSPACE; |
tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE; |
tp->flags |= TERMP_NOSPACE; |
|
|
|
/* |
/* |
* The first time we're invoked for a given table block, create |
* The first time we're invoked for a given table block, |
* the termp_tbl structure. This contains the column |
* calculate the table widths and decimal positions. |
* configuration for the entire table, e.g., table-wide column |
|
* width, decimal point, etc. |
|
*/ |
*/ |
|
|
if (TBL_SPAN_FIRST & sp->flags) { |
if (tp->tbl.cols == NULL) { |
assert(NULL == tp->tbl); |
tp->tbl.len = term_tbl_len; |
tp->tbl = calloc |
tp->tbl.slen = term_tbl_strlen; |
(sp->tbl->cols, sizeof(struct termp_tbl)); |
tp->tbl.sulen = term_tbl_sulen; |
if (NULL == tp->tbl) { |
tp->tbl.arg = tp; |
perror(NULL); |
|
exit(EXIT_FAILURE); |
|
} |
|
tbl_calc(tp, sp); |
|
|
|
/* Flush out any preceding data. */ |
tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin); |
term_flushln(tp); |
|
} |
|
|
|
/* Horizontal frame at the start of boxed tables. */ |
/* Tables leak .ta settings to subsequent text. */ |
|
|
if (TBL_SPAN_FIRST & sp->flags) |
term_tab_set(tp, NULL); |
tbl_hframe(tp, sp); |
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; |
|
} |
|
|
/* Vertical frame at the start of each row. */ |
/* Center the table as a whole. */ |
|
|
tbl_vframe(tp, sp->tbl); |
offset = tp->tcol->offset; |
|
if (sp->opts->opts & TBL_OPT_CENTRE) { |
|
tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) |
|
? 2 : !!sp->opts->lvert + !!sp->opts->rvert; |
|
for (ic = 0; ic + 1 < sp->opts->cols; ic++) |
|
tsz += tp->tbl.cols[ic].width + |
|
tp->tbl.cols[ic].spacing; |
|
if (sp->opts->cols) |
|
tsz += tp->tbl.cols[sp->opts->cols - 1].width; |
|
if (offset + tsz > tp->tcol->rmargin) |
|
tsz -= 1; |
|
tp->tcol->offset = offset + tp->tcol->rmargin > tsz ? |
|
(offset + tp->tcol->rmargin - tsz) / 2 : 0; |
|
} |
|
|
/* |
/* Horizontal frame at the start of boxed tables. */ |
* Now print the actual data itself depending on the span type. |
|
* Spanner spans get a horizontal rule; data spanners have their |
|
* data printed by matching data to header. |
|
*/ |
|
|
|
|
if (sp->opts->opts & TBL_OPT_DBOX) |
|
tbl_hrule(tp, sp, 3); |
|
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) |
|
tbl_hrule(tp, sp, 2); |
|
} |
|
|
|
/* Set up the columns. */ |
|
|
|
tp->flags |= TERMP_MULTICOL; |
|
horiz = 0; |
switch (sp->pos) { |
switch (sp->pos) { |
case (TBL_SPAN_HORIZ): |
case TBL_SPAN_HORIZ: |
/* FALLTHROUGH */ |
case TBL_SPAN_DHORIZ: |
case (TBL_SPAN_DHORIZ): |
horiz = 1; |
tbl_hrule(tp, sp); |
term_setcol(tp, 1); |
break; |
break; |
case (TBL_SPAN_DATA): |
case TBL_SPAN_DATA: |
/* Iterate over template headers. */ |
term_setcol(tp, sp->opts->cols + 2); |
|
coloff = tp->tcol->offset; |
|
|
|
/* Set up a column for a left vertical frame. */ |
|
|
|
if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || |
|
sp->opts->lvert) |
|
coloff++; |
|
tp->tcol->rmargin = coloff; |
|
|
|
/* Set up the data columns. */ |
|
|
dp = sp->first; |
dp = sp->first; |
for (hp = sp->head; hp; hp = hp->next) { |
spans = 0; |
switch (hp->pos) { |
for (ic = 0; ic < sp->opts->cols; ic++) { |
case (TBL_HEAD_VERT): |
if (spans == 0) { |
/* FALLTHROUGH */ |
tp->tcol++; |
case (TBL_HEAD_DVERT): |
tp->tcol->offset = coloff; |
tbl_spanner(tp, hp); |
} |
|
coloff += tp->tbl.cols[ic].width; |
|
tp->tcol->rmargin = coloff; |
|
if (ic + 1 < sp->opts->cols) |
|
coloff += tp->tbl.cols[ic].spacing; |
|
if (spans) { |
|
spans--; |
continue; |
continue; |
case (TBL_HEAD_DATA): |
|
break; |
|
} |
} |
tbl_data(tp, sp->tbl, dp, |
if (dp == NULL) |
&tp->tbl[hp->ident]); |
continue; |
|
spans = dp->spans; |
|
if (ic || sp->layout->first->pos != TBL_CELL_SPAN) |
|
dp = dp->next; |
|
} |
|
|
/* Go to the next data cell. */ |
/* Set up a column for a right vertical frame. */ |
if (dp) |
|
|
tp->tcol++; |
|
tp->tcol->offset = coloff + 1; |
|
tp->tcol->rmargin = tp->maxrmargin; |
|
|
|
/* Spans may have reduced the number of columns. */ |
|
|
|
tp->lasttcol = tp->tcol - tp->tcols; |
|
|
|
/* Fill the buffers for all data columns. */ |
|
|
|
tp->tcol = tp->tcols; |
|
cp = cpn = sp->layout->first; |
|
dp = sp->first; |
|
spans = 0; |
|
for (ic = 0; ic < sp->opts->cols; ic++) { |
|
if (cpn != NULL) { |
|
cp = cpn; |
|
cpn = cpn->next; |
|
} |
|
if (spans) { |
|
spans--; |
|
continue; |
|
} |
|
tp->tcol++; |
|
tp->col = 0; |
|
tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic); |
|
if (dp == NULL) |
|
continue; |
|
spans = dp->spans; |
|
if (cp->pos != TBL_CELL_SPAN) |
dp = dp->next; |
dp = dp->next; |
} |
} |
break; |
break; |
} |
} |
|
|
tbl_vframe(tp, sp->tbl); |
do { |
term_flushln(tp); |
/* Print the vertical frame at the start of each row. */ |
|
|
/* |
tp->tcol = tp->tcols; |
* If we're the last row, clean up after ourselves: clear the |
fc = '\0'; |
* existing table configuration and set it to NULL. |
if (sp->layout->vert || |
*/ |
(sp->next != NULL && sp->next->layout->vert && |
|
sp->next->pos == TBL_SPAN_DATA) || |
|
(sp->prev != NULL && sp->prev->layout->vert && |
|
(horiz || (IS_HORIZ(sp->layout->first) && |
|
!IS_HORIZ(sp->prev->layout->first)))) || |
|
sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)) |
|
fc = horiz || IS_HORIZ(sp->layout->first) ? '+' : '|'; |
|
else if (horiz && sp->opts->lvert) |
|
fc = '-'; |
|
if (fc != '\0') { |
|
(*tp->advance)(tp, tp->tcols->offset); |
|
(*tp->letter)(tp, fc); |
|
tp->viscol = tp->tcol->offset + 1; |
|
} |
|
|
if (TBL_SPAN_LAST & sp->flags) { |
/* Print the data cells. */ |
tbl_hframe(tp, sp); |
|
assert(tp->tbl); |
|
free(tp->tbl); |
|
tp->tbl = NULL; |
|
} |
|
|
|
tp->flags &= ~TERMP_NONOSPACE; |
more = 0; |
|
if (horiz) { |
|
tbl_hrule(tp, sp, 0); |
|
term_flushln(tp); |
|
} else { |
|
cp = sp->layout->first; |
|
cpn = sp->next == NULL ? NULL : |
|
sp->next->layout->first; |
|
cpp = sp->prev == NULL ? NULL : |
|
sp->prev->layout->first; |
|
dp = sp->first; |
|
spans = 0; |
|
for (ic = 0; ic < sp->opts->cols; ic++) { |
|
|
} |
/* |
|
* Figure out whether to print a |
|
* vertical line after this cell |
|
* and advance to next layout cell. |
|
*/ |
|
|
static void |
if (cp != NULL) { |
tbl_hrule(struct termp *tp, const struct tbl_span *sp) |
vert = cp->vert; |
{ |
switch (cp->pos) { |
const struct tbl_head *hp; |
case TBL_CELL_HORIZ: |
char c; |
fc = '-'; |
int width; |
break; |
|
case TBL_CELL_DHORIZ: |
|
fc = '='; |
|
break; |
|
default: |
|
fc = ' '; |
|
break; |
|
} |
|
} else { |
|
vert = 0; |
|
fc = ' '; |
|
} |
|
if (cpp != NULL) { |
|
if (vert == 0 && |
|
cp != NULL && |
|
((IS_HORIZ(cp) && |
|
!IS_HORIZ(cpp)) || |
|
(cp->next != NULL && |
|
cpp->next != NULL && |
|
IS_HORIZ(cp->next) && |
|
!IS_HORIZ(cpp->next)))) |
|
vert = cpp->vert; |
|
cpp = cpp->next; |
|
} |
|
if (vert == 0 && |
|
sp->opts->opts & TBL_OPT_ALLBOX) |
|
vert = 1; |
|
if (cpn != NULL) { |
|
if (vert == 0) |
|
vert = cpn->vert; |
|
cpn = cpn->next; |
|
} |
|
if (cp != NULL) |
|
cp = cp->next; |
|
|
/* |
/* |
* An hrule extends across the entire table and is demarked by a |
* Skip later cells in a span, |
* standalone `_' or whatnot in lieu of a table row. Spanning |
* figure out whether to start a span, |
* headers are marked by a `+', as are table boundaries. |
* and advance to next data cell. |
*/ |
*/ |
|
|
c = '-'; |
if (spans) { |
if (TBL_SPAN_DHORIZ == sp->pos) |
spans--; |
c = '='; |
continue; |
|
} |
|
if (dp != NULL) { |
|
spans = dp->spans; |
|
if (ic || sp->layout->first->pos |
|
!= TBL_CELL_SPAN) |
|
dp = dp->next; |
|
} |
|
|
/* FIXME: don't use `+' between data and a spanner! */ |
/* |
|
* Print one line of text in the cell |
|
* and remember whether there is more. |
|
*/ |
|
|
for (hp = sp->head; hp; hp = hp->next) { |
tp->tcol++; |
width = tp->tbl[hp->ident].width; |
if (tp->tcol->col < tp->tcol->lastcol) |
switch (hp->pos) { |
term_flushln(tp); |
case (TBL_HEAD_DATA): |
if (tp->tcol->col < tp->tcol->lastcol) |
tbl_char(tp, c, width); |
more = 1; |
break; |
|
case (TBL_HEAD_DVERT): |
/* |
tbl_char(tp, '+', width); |
* Vertical frames between data cells, |
/* FALLTHROUGH */ |
* but not after the last column. |
case (TBL_HEAD_VERT): |
*/ |
tbl_char(tp, '+', width); |
|
break; |
if (fc == ' ' && ((vert == 0 && |
default: |
(cp == NULL || !IS_HORIZ(cp))) || |
abort(); |
tp->tcol + 1 == tp->tcols + tp->lasttcol)) |
/* NOTREACHED */ |
continue; |
|
|
|
if (tp->viscol < tp->tcol->rmargin) { |
|
(*tp->advance)(tp, tp->tcol->rmargin |
|
- tp->viscol); |
|
tp->viscol = tp->tcol->rmargin; |
|
} |
|
while (tp->viscol < tp->tcol->rmargin + |
|
tp->tbl.cols[ic].spacing / 2) { |
|
(*tp->letter)(tp, fc); |
|
tp->viscol++; |
|
} |
|
|
|
if (tp->tcol + 1 == tp->tcols + tp->lasttcol) |
|
continue; |
|
|
|
if (fc == ' ' && cp != NULL) { |
|
switch (cp->pos) { |
|
case TBL_CELL_HORIZ: |
|
fc = '-'; |
|
break; |
|
case TBL_CELL_DHORIZ: |
|
fc = '='; |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
if (tp->tbl.cols[ic].spacing) { |
|
(*tp->letter)(tp, fc == ' ' ? '|' : |
|
vert ? '+' : fc); |
|
tp->viscol++; |
|
} |
|
|
|
if (fc != ' ') { |
|
if (cp != NULL && |
|
cp->pos == TBL_CELL_HORIZ) |
|
fc = '-'; |
|
else if (cp != NULL && |
|
cp->pos == TBL_CELL_DHORIZ) |
|
fc = '='; |
|
else |
|
fc = ' '; |
|
} |
|
if (tp->tbl.cols[ic].spacing > 2 && |
|
(vert > 1 || fc != ' ')) { |
|
(*tp->letter)(tp, fc == ' ' ? '|' : |
|
vert > 1 ? '+' : fc); |
|
tp->viscol++; |
|
} |
|
} |
} |
} |
} |
|
} |
|
|
|
static void |
/* Print the vertical frame at the end of each row. */ |
tbl_hframe(struct termp *tp, const struct tbl_span *sp) |
|
{ |
|
const struct tbl_head *hp; |
|
int width; |
|
|
|
if ( ! (TBL_OPT_BOX & sp->tbl->opts || |
fc = '\0'; |
TBL_OPT_DBOX & sp->tbl->opts)) |
if ((sp->layout->last->vert && |
return; |
sp->layout->last->col + 1 == sp->opts->cols) || |
|
(sp->next != NULL && |
|
sp->next->layout->last->vert && |
|
sp->next->layout->last->col + 1 == sp->opts->cols) || |
|
(sp->prev != NULL && |
|
sp->prev->layout->last->vert && |
|
sp->prev->layout->last->col + 1 == sp->opts->cols && |
|
(horiz || (IS_HORIZ(sp->layout->last) && |
|
!IS_HORIZ(sp->prev->layout->last)))) || |
|
(sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))) |
|
fc = horiz || IS_HORIZ(sp->layout->last) ? '+' : '|'; |
|
else if (horiz && sp->opts->rvert) |
|
fc = '-'; |
|
if (fc != '\0') { |
|
if (horiz == 0 && (IS_HORIZ(sp->layout->last) == 0 || |
|
sp->layout->last->col + 1 < sp->opts->cols)) { |
|
tp->tcol++; |
|
(*tp->advance)(tp, |
|
tp->tcol->offset > tp->viscol ? |
|
tp->tcol->offset - tp->viscol : 1); |
|
} |
|
(*tp->letter)(tp, fc); |
|
} |
|
(*tp->endline)(tp); |
|
tp->viscol = 0; |
|
} while (more); |
|
|
/* |
/* |
* Print out the horizontal part of a frame or double frame. A |
* Clean up after this row. If it is the last line |
* double frame has an unbroken `-' outer line the width of the |
* of the table, print the box line and clean up |
* table, bordered by `+'. The frame (or inner frame, in the |
* column data; otherwise, print the allbox line. |
* case of the double frame) is a `-' bordered by `+' and broken |
|
* by `+' whenever a span is encountered. |
|
*/ |
*/ |
|
|
if (TBL_OPT_DBOX & sp->tbl->opts) { |
term_setcol(tp, 1); |
term_word(tp, "+"); |
tp->flags &= ~TERMP_MULTICOL; |
for (hp = sp->head; hp; hp = hp->next) { |
tp->tcol->rmargin = tp->maxrmargin; |
width = tp->tbl[hp->ident].width; |
if (sp->next == NULL) { |
tbl_char(tp, '-', width); |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { |
|
tbl_hrule(tp, sp, 2); |
|
tp->skipvsp = 1; |
} |
} |
term_word(tp, "+"); |
if (sp->opts->opts & TBL_OPT_DBOX) { |
term_flushln(tp); |
tbl_hrule(tp, sp, 3); |
} |
tp->skipvsp = 2; |
|
} |
|
assert(tp->tbl.cols); |
|
free(tp->tbl.cols); |
|
tp->tbl.cols = NULL; |
|
tp->tcol->offset = offset; |
|
} else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX && |
|
(sp->next == NULL || sp->next->pos == TBL_SPAN_DATA || |
|
sp->next->next != NULL)) |
|
tbl_hrule(tp, sp, 1); |
|
|
term_word(tp, "+"); |
tp->flags &= ~TERMP_NONOSPACE; |
for (hp = sp->head; hp; hp = hp->next) { |
} |
width = tp->tbl[hp->ident].width; |
|
switch (hp->pos) { |
/* |
case (TBL_HEAD_DATA): |
* Kinds of horizontal rulers: |
tbl_char(tp, '-', width); |
* 0: inside the table (single or double line with crossings) |
break; |
* 1: inside the table (single or double line with crossings and ends) |
default: |
* 2: inner frame (single line with crossings and ends) |
tbl_char(tp, '+', width); |
* 3: outer frame (single line without crossings with ends) |
break; |
*/ |
|
static void |
|
tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind) |
|
{ |
|
const struct tbl_cell *cp, *cpn, *cpp; |
|
const struct roffcol *col; |
|
int vert; |
|
char cross, line, stdcross, stdline; |
|
|
|
stdline = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; |
|
stdcross = (kind < 3) ? '+' : '-'; |
|
|
|
cp = sp->layout->first; |
|
cpp = kind || sp->prev == NULL ? NULL : sp->prev->layout->first; |
|
if (cpp == cp) |
|
cpp = NULL; |
|
cpn = kind > 1 || sp->next == NULL ? NULL : sp->next->layout->first; |
|
if (cpn == cp) |
|
cpn = NULL; |
|
if (kind) |
|
term_word(tp, |
|
cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|"); |
|
for (;;) { |
|
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; |
|
if ((cp = cp->next) == NULL) |
|
break; |
|
if (cpp != NULL) { |
|
if (vert < cpp->vert) |
|
vert = cpp->vert; |
|
cpp = cpp->next; |
|
} |
|
if (cpn != NULL) { |
|
if (vert < cpn->vert) |
|
vert = cpn->vert; |
|
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) |
|
vert = 1; |
|
if (col->spacing) |
|
tbl_char(tp, vert ? cross : line, 1); |
|
if (col->spacing > 2) |
|
tbl_char(tp, vert > 1 ? cross : line, 1); |
|
if (col->spacing > 4) |
|
tbl_char(tp, line, (col->spacing - 3) / 2); |
} |
} |
term_word(tp, "+"); |
if (kind) { |
term_flushln(tp); |
term_word(tp, |
|
cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|"); |
|
term_flushln(tp); |
|
} |
} |
} |
|
|
static void |
static void |
tbl_data(struct termp *tp, const struct tbl *tbl, |
tbl_data(struct termp *tp, const struct tbl_opts *opts, |
const struct tbl_dat *dp, |
const struct tbl_cell *cp, const struct tbl_dat *dp, |
const struct termp_tbl *tbp) |
const struct roffcol *col) |
{ |
{ |
enum tbl_cellt pos; |
switch (cp->pos) { |
|
case TBL_CELL_HORIZ: |
if (NULL == dp) { |
tbl_char(tp, '-', col->width); |
tbl_char(tp, ASCII_NBRSP, tbp->width); |
|
return; |
return; |
|
case TBL_CELL_DHORIZ: |
|
tbl_char(tp, '=', col->width); |
|
return; |
|
default: |
|
break; |
} |
} |
|
|
|
if (dp == NULL) |
|
return; |
|
|
switch (dp->pos) { |
switch (dp->pos) { |
case (TBL_DATA_HORIZ): |
case TBL_DATA_NONE: |
/* FALLTHROUGH */ |
|
case (TBL_DATA_NHORIZ): |
|
tbl_char(tp, '-', tbp->width); |
|
return; |
return; |
case (TBL_DATA_NDHORIZ): |
case TBL_DATA_HORIZ: |
/* FALLTHROUGH */ |
case TBL_DATA_NHORIZ: |
case (TBL_DATA_DHORIZ): |
tbl_char(tp, '-', col->width); |
tbl_char(tp, '=', tbp->width); |
|
return; |
return; |
|
case TBL_DATA_NDHORIZ: |
|
case TBL_DATA_DHORIZ: |
|
tbl_char(tp, '=', col->width); |
|
return; |
default: |
default: |
break; |
break; |
} |
} |
|
|
pos = dp->layout ? dp->layout->pos : TBL_CELL_LEFT; |
|
|
|
switch (pos) { |
switch (cp->pos) { |
case (TBL_CELL_HORIZ): |
case TBL_CELL_LONG: |
tbl_char(tp, '-', tbp->width); |
case TBL_CELL_CENTRE: |
|
case TBL_CELL_LEFT: |
|
case TBL_CELL_RIGHT: |
|
tbl_literal(tp, dp, col); |
break; |
break; |
case (TBL_CELL_DHORIZ): |
case TBL_CELL_NUMBER: |
tbl_char(tp, '=', tbp->width); |
tbl_number(tp, opts, dp, col); |
break; |
break; |
case (TBL_CELL_LONG): |
case TBL_CELL_DOWN: |
/* FALLTHROUGH */ |
case TBL_CELL_SPAN: |
case (TBL_CELL_CENTRE): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_LEFT): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_RIGHT): |
|
tbl_data_literal(tp, dp, tbp); |
|
break; |
break; |
case (TBL_CELL_NUMBER): |
|
tbl_data_number(tp, tbl, dp, tbp); |
|
break; |
|
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
} |
} |
static void |
|
tbl_spanner(struct termp *tp, const struct tbl_head *hp) |
|
{ |
|
|
|
switch (hp->pos) { |
|
case (TBL_HEAD_VERT): |
|
term_word(tp, "|"); |
|
break; |
|
case (TBL_HEAD_DVERT): |
|
term_word(tp, "||"); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
static void |
static void |
tbl_vframe(struct termp *tp, const struct tbl *tbl) |
tbl_char(struct termp *tp, char c, size_t len) |
{ |
{ |
/* Always just a single vertical line. */ |
size_t i, sz; |
|
|
if (TBL_OPT_BOX & tbl->opts || TBL_OPT_DBOX & tbl->opts) |
|
term_word(tp, "|"); |
|
} |
|
|
|
static inline void |
|
tbl_char(struct termp *tp, char c, int len) |
|
{ |
|
int i, sz; |
|
char cp[2]; |
char cp[2]; |
|
|
cp[0] = c; |
cp[0] = c; |
Line 334 tbl_char(struct termp *tp, char c, int len) |
|
Line 588 tbl_char(struct termp *tp, char c, int len) |
|
} |
} |
|
|
static void |
static void |
tbl_data_literal(struct termp *tp, |
tbl_literal(struct termp *tp, const struct tbl_dat *dp, |
const struct tbl_dat *dp, |
const struct roffcol *col) |
const struct termp_tbl *tblp) |
|
{ |
{ |
int padl, padr, ssz; |
size_t len, padl, padr, width; |
enum tbl_cellt pos; |
int ic, spans; |
|
|
padl = padr = 0; |
assert(dp->string); |
|
len = term_strlen(tp, dp->string); |
|
width = col->width; |
|
ic = dp->layout->col; |
|
spans = dp->spans; |
|
while (spans--) |
|
width += tp->tbl.cols[++ic].width + 3; |
|
|
pos = dp->layout ? dp->layout->pos : TBL_CELL_LEFT; |
padr = width > len ? width - len : 0; |
ssz = term_len(tp, 1); |
padl = 0; |
|
|
switch (pos) { |
switch (dp->layout->pos) { |
case (TBL_CELL_LONG): |
case TBL_CELL_LONG: |
padl = ssz; |
padl = term_len(tp, 1); |
padr = tblp->width - term_strlen(tp, dp->string) - ssz; |
padr = padr > padl ? padr - padl : 0; |
break; |
break; |
case (TBL_CELL_CENTRE): |
case TBL_CELL_CENTRE: |
padl = tblp->width - term_strlen(tp, dp->string); |
if (2 > padr) |
if (padl % 2) |
break; |
padr++; |
padl = padr / 2; |
padl /= 2; |
padr -= padl; |
padr += padl; |
|
break; |
break; |
case (TBL_CELL_RIGHT): |
case TBL_CELL_RIGHT: |
padl = tblp->width - term_strlen(tp, dp->string); |
padl = padr; |
|
padr = 0; |
break; |
break; |
default: |
default: |
padr = tblp->width - term_strlen(tp, dp->string); |
|
break; |
break; |
} |
} |
|
|
tbl_char(tp, ASCII_NBRSP, padl); |
tbl_char(tp, ASCII_NBRSP, padl); |
term_word(tp, dp->string); |
tbl_word(tp, dp); |
tbl_char(tp, ASCII_NBRSP, padr); |
tbl_char(tp, ASCII_NBRSP, padr); |
} |
} |
|
|
static void |
static void |
tbl_data_number(struct termp *tp, const struct tbl *tbl, |
tbl_number(struct termp *tp, const struct tbl_opts *opts, |
const struct tbl_dat *dp, |
const struct tbl_dat *dp, |
const struct termp_tbl *tblp) |
const struct roffcol *col) |
{ |
{ |
char *decp, buf[2]; |
const char *cp, *lastdigit, *lastpoint; |
int d, padl, sz, psz, ssz, i; |
size_t intsz, padl, totsz; |
|
char buf[2]; |
|
|
/* |
/* |
* 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. |
*/ |
*/ |
|
|
sz = term_strlen(tp, dp->string); |
assert(dp->string); |
psz = term_strlen(tp, "."); |
lastdigit = lastpoint = NULL; |
|
for (cp = dp->string; cp[0] != '\0'; cp++) { |
if (NULL != (decp = strchr(dp->string, tbl->decimal))) { |
if (cp[0] == '\\' && cp[1] == '&') { |
buf[1] = '\0'; |
lastdigit = lastpoint = cp; |
for (ssz = i = 0; decp != &dp->string[i]; i++) { |
|
buf[0] = dp->string[i]; |
|
ssz += term_strlen(tp, buf); |
|
} |
|
d = ssz + psz; |
|
} else |
|
d = sz + psz; |
|
|
|
assert(d <= tblp->decimal); |
|
assert(sz - d <= tblp->width - tblp->decimal); |
|
|
|
padl = tblp->decimal - d + term_len(tp, 1); |
|
assert(tblp->width - sz - padl); |
|
|
|
tbl_char(tp, ASCII_NBRSP, padl); |
|
term_word(tp, dp->string); |
|
tbl_char(tp, ASCII_NBRSP, tblp->width - sz - padl); |
|
} |
|
|
|
static void |
|
tbl_calc(struct termp *tp, const struct tbl_span *sp) |
|
{ |
|
const struct tbl_dat *dp; |
|
const struct tbl_head *hp; |
|
struct termp_tbl *p; |
|
|
|
/* Calculate width as the max of column cells' widths. */ |
|
|
|
hp = sp->head; |
|
|
|
for ( ; sp; sp = sp->next) { |
|
switch (sp->pos) { |
|
case (TBL_DATA_HORIZ): |
|
/* FALLTHROUGH */ |
|
case (TBL_DATA_DHORIZ): |
|
continue; |
|
default: |
|
break; |
break; |
} |
} else if (cp[0] == opts->decimal && |
for (dp = sp->first; dp; dp = dp->next) { |
(isdigit((unsigned char)cp[1]) || |
if (NULL == dp->layout) |
(cp > dp->string && isdigit((unsigned char)cp[-1])))) |
continue; |
lastpoint = cp; |
p = &tp->tbl[dp->layout->head->ident]; |
else if (isdigit((unsigned char)cp[0])) |
tbl_calc_data(tp, sp->tbl, dp, p); |
lastdigit = cp; |
} |
|
} |
} |
|
|
/* Calculate width as the simple spanner value. */ |
/* Then measure both widths. */ |
|
|
for ( ; hp; hp = hp->next) |
padl = 0; |
switch (hp->pos) { |
totsz = term_strlen(tp, dp->string); |
case (TBL_HEAD_VERT): |
if (lastdigit != NULL) { |
tp->tbl[hp->ident].width = term_len(tp, 1); |
if (lastpoint == NULL) |
break; |
lastpoint = lastdigit + 1; |
case (TBL_HEAD_DVERT): |
intsz = 0; |
tp->tbl[hp->ident].width = term_len(tp, 2); |
buf[1] = '\0'; |
break; |
for (cp = dp->string; cp < lastpoint; cp++) { |
default: |
buf[0] = cp[0]; |
break; |
intsz += term_strlen(tp, buf); |
} |
} |
} |
|
|
|
static void |
/* |
tbl_calc_data(struct termp *tp, const struct tbl *tbl, |
* Pad left to match the decimal position, |
const struct tbl_dat *dp, struct termp_tbl *tblp) |
* but avoid exceeding the total column width. |
{ |
*/ |
int sz; |
|
|
|
/* Branch down into data sub-types. */ |
if (col->decimal > intsz && col->width > totsz) { |
|
padl = col->decimal - intsz; |
|
if (padl + totsz > col->width) |
|
padl = col->width - totsz; |
|
} |
|
|
switch (dp->layout->pos) { |
/* If it is not a number, simply center the string. */ |
case (TBL_CELL_HORIZ): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_DHORIZ): |
|
sz = term_len(tp, 1); |
|
if (tblp->width < sz) |
|
tblp->width = sz; |
|
break; |
|
case (TBL_CELL_LONG): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_CENTRE): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_LEFT): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_RIGHT): |
|
tbl_calc_data_literal(tp, dp, tblp); |
|
break; |
|
case (TBL_CELL_NUMBER): |
|
tbl_calc_data_number(tp, tbl, dp, tblp); |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
} |
|
|
|
static void |
} else if (col->width > totsz) |
tbl_calc_data_number(struct termp *tp, const struct tbl *tbl, |
padl = (col->width - totsz) / 2; |
const struct tbl_dat *dp, struct termp_tbl *tblp) |
|
{ |
|
int sz, d, psz, i, ssz; |
|
char *cp, buf[2]; |
|
|
|
/* |
tbl_char(tp, ASCII_NBRSP, padl); |
* First calculate number width and decimal place (last + 1 for |
tbl_word(tp, dp); |
* no-decimal numbers). If the stored decimal is subsequent |
|
* ours, make our size longer by that difference |
|
* (right-"shifting"); similarly, if ours is subsequent the |
|
* stored, then extend the stored size by the difference. |
|
* Finally, re-assign the stored values. |
|
*/ |
|
|
|
/* TODO: use spacing modifier. */ |
/* Pad right to fill the column. */ |
|
|
assert(dp->string); |
if (col->width > padl + totsz) |
sz = term_strlen(tp, dp->string); |
tbl_char(tp, ASCII_NBRSP, col->width - padl - totsz); |
psz = term_strlen(tp, "."); |
|
|
|
if (NULL != (cp = strchr(dp->string, tbl->decimal))) { |
|
buf[1] = '\0'; |
|
for (ssz = i = 0; cp != &dp->string[i]; i++) { |
|
buf[0] = dp->string[i]; |
|
ssz += term_strlen(tp, buf); |
|
} |
|
d = ssz + psz; |
|
} else |
|
d = sz + psz; |
|
|
|
sz += term_len(tp, 2); |
|
|
|
if (tblp->decimal > d) { |
|
sz += tblp->decimal - d; |
|
d = tblp->decimal; |
|
} else |
|
tblp->width += d - tblp->decimal; |
|
|
|
if (sz > tblp->width) |
|
tblp->width = sz; |
|
if (d > tblp->decimal) |
|
tblp->decimal = d; |
|
} |
} |
|
|
static void |
static void |
tbl_calc_data_literal(struct termp *tp, |
tbl_word(struct termp *tp, const struct tbl_dat *dp) |
const struct tbl_dat *dp, |
|
struct termp_tbl *tblp) |
|
{ |
{ |
int sz, bufsz, spsz; |
int prev_font; |
|
|
/* |
prev_font = tp->fonti; |
* Calculate our width and use the spacing, with a minimum |
if (dp->layout->flags & TBL_CELL_BOLD) |
* spacing dictated by position (centre, e.g,. gets a space on |
term_fontpush(tp, TERMFONT_BOLD); |
* either side, while right/left get a single adjacent space). |
else if (dp->layout->flags & TBL_CELL_ITALIC) |
*/ |
term_fontpush(tp, TERMFONT_UNDER); |
|
|
assert(dp->string); |
term_word(tp, dp->string); |
sz = term_strlen(tp, dp->string); |
|
|
|
switch (dp->layout->pos) { |
term_fontpopq(tp, prev_font); |
case (TBL_CELL_LONG): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_CENTRE): |
|
bufsz = term_len(tp, 2); |
|
break; |
|
default: |
|
bufsz = term_len(tp, 1); |
|
break; |
|
} |
|
|
|
spsz = 0; |
|
if (dp->layout->spacing) |
|
spsz = term_len(tp, dp->layout->spacing); |
|
|
|
if (spsz) |
|
bufsz = bufsz > spsz ? bufsz : spsz; |
|
|
|
sz += bufsz; |
|
if (tblp->width < sz) |
|
tblp->width = sz; |
|
} |
} |