version 1.34, 2015/01/28 04:19:35 |
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 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> |
|
|
#include "out.h" |
#include "out.h" |
#include "term.h" |
#include "term.h" |
|
|
|
#define IS_HORIZ(cp) ((cp)->pos == TBL_CELL_HORIZ || \ |
|
(cp)->pos == TBL_CELL_DHORIZ) |
|
|
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 void tbl_char(struct termp *, char, size_t); |
static void tbl_char(struct termp *, char, size_t); |
static void tbl_data(struct termp *, const struct tbl_opts *, |
static void tbl_data(struct termp *, const struct tbl_opts *, |
|
const struct tbl_cell *, |
const struct tbl_dat *, |
const struct tbl_dat *, |
const struct roffcol *); |
const struct roffcol *); |
static void tbl_literal(struct termp *, const struct tbl_dat *, |
static void tbl_literal(struct termp *, const struct tbl_dat *, |
Line 44 static void tbl_word(struct termp *, const struct tbl_ |
|
Line 50 static void tbl_word(struct termp *, const struct tbl_ |
|
|
|
|
|
static size_t |
static size_t |
term_tbl_strlen(const char *p, void *arg) |
term_tbl_sulen(const struct roffsu *su, void *arg) |
{ |
{ |
|
int i; |
|
|
return(term_strlen((const struct termp *)arg, p)); |
i = term_hen((const struct termp *)arg, su); |
|
return i > 0 ? i : 0; |
} |
} |
|
|
static size_t |
static size_t |
term_tbl_len(size_t sz, void *arg) |
term_tbl_strlen(const char *p, void *arg) |
{ |
{ |
|
return term_strlen((const struct termp *)arg, p); |
|
} |
|
|
return(term_len((const struct termp *)arg, sz)); |
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_cell *cp; |
|
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
static size_t offset; |
static size_t offset; |
size_t rmargin, maxrmargin, tsz; |
size_t coloff, tsz; |
int horiz, spans, vert; |
int ic, horiz, spans, vert, more; |
|
char fc; |
|
|
rmargin = tp->rmargin; |
|
maxrmargin = tp->maxrmargin; |
|
|
|
tp->rmargin = tp->maxrmargin = TERM_MAXMARGIN; |
|
|
|
/* 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, |
* The first time we're invoked for a given table block, |
* calculate the table widths and decimal positions. |
* calculate the table widths and decimal positions. |
*/ |
*/ |
|
|
if (sp->flags & TBL_SPAN_FIRST) { |
if (tp->tbl.cols == NULL) { |
term_flushln(tp); |
|
|
|
tp->tbl.len = term_tbl_len; |
tp->tbl.len = term_tbl_len; |
tp->tbl.slen = term_tbl_strlen; |
tp->tbl.slen = term_tbl_strlen; |
|
tp->tbl.sulen = term_tbl_sulen; |
tp->tbl.arg = tp; |
tp->tbl.arg = tp; |
|
|
tblcalc(&tp->tbl, sp, rmargin - tp->offset); |
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->offset; |
offset = tp->tcol->offset; |
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 (hp = sp->head; hp != NULL; hp = hp->next) |
for (ic = 0; ic + 1 < sp->opts->cols; ic++) |
tsz += tp->tbl.cols[hp->ident].width + 3; |
tsz += tp->tbl.cols[ic].width + |
tsz -= 3; |
tp->tbl.cols[ic].spacing; |
if (offset + tsz > rmargin) |
if (sp->opts->cols) |
|
tsz += tp->tbl.cols[sp->opts->cols - 1].width; |
|
if (offset + tsz > tp->tcol->rmargin) |
tsz -= 1; |
tsz -= 1; |
tp->offset = (offset + rmargin > tsz) ? |
tp->tcol->offset = offset + tp->tcol->rmargin > tsz ? |
(offset + rmargin - tsz) / 2 : 0; |
(offset + tp->tcol->rmargin - tsz) / 2 : 0; |
} |
} |
|
|
/* Horizontal frame at the start of boxed tables. */ |
/* Horizontal frame at the start of boxed tables. */ |
|
|
if (sp->opts->opts & TBL_OPT_DBOX) |
if (sp->opts->opts & TBL_OPT_DBOX) |
tbl_hrule(tp, sp, 2); |
tbl_hrule(tp, sp, 3); |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) |
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) |
tbl_hrule(tp, sp, 1); |
tbl_hrule(tp, sp, 2); |
} |
} |
|
|
/* Vertical frame at the start of each row. */ |
/* Set up the columns. */ |
|
|
horiz = sp->pos == TBL_SPAN_HORIZ || sp->pos == TBL_SPAN_DHORIZ; |
tp->flags |= TERMP_MULTICOL; |
|
horiz = 0; |
|
switch (sp->pos) { |
|
case TBL_SPAN_HORIZ: |
|
case TBL_SPAN_DHORIZ: |
|
horiz = 1; |
|
term_setcol(tp, 1); |
|
break; |
|
case TBL_SPAN_DATA: |
|
term_setcol(tp, sp->opts->cols + 2); |
|
coloff = tp->tcol->offset; |
|
|
if (sp->layout->vert || |
/* Set up a column for a left vertical frame. */ |
(sp->prev != NULL && sp->prev->layout->vert) || |
|
sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)) |
|
term_word(tp, horiz ? "+" : "|"); |
|
else if (sp->opts->lvert) |
|
tbl_char(tp, horiz ? '-' : ASCII_NBRSP, 1); |
|
|
|
/* |
if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || |
* Now print the actual data itself depending on the span type. |
sp->opts->lvert) |
* Spanner spans get a horizontal rule; data spanners have their |
coloff++; |
* data printed by matching data to header. |
tp->tcol->rmargin = coloff; |
*/ |
|
|
|
if (sp->pos == TBL_SPAN_DATA) { |
/* Set up the data columns. */ |
/* Iterate over template headers. */ |
|
cp = sp->layout->first; |
|
dp = sp->first; |
dp = sp->first; |
spans = 0; |
spans = 0; |
for (hp = sp->head; hp != NULL; hp = hp->next) { |
for (ic = 0; ic < sp->opts->cols; ic++) { |
|
if (spans == 0) { |
|
tp->tcol++; |
|
tp->tcol->offset = coloff; |
|
} |
|
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; |
|
} |
|
if (dp == NULL) |
|
continue; |
|
spans = dp->spans; |
|
if (ic || sp->layout->first->pos != TBL_CELL_SPAN) |
|
dp = dp->next; |
|
} |
|
|
/* |
/* Set up a column for a right vertical frame. */ |
* Remeber whether we need a vertical bar |
|
* after this cell. |
|
*/ |
|
|
|
vert = cp == NULL ? 0 : cp->vert; |
tp->tcol++; |
|
tp->tcol->offset = coloff + 1; |
|
tp->tcol->rmargin = tp->maxrmargin; |
|
|
/* |
/* Spans may have reduced the number of columns. */ |
* Print the data and advance to the next cell. |
|
*/ |
|
|
|
if (spans == 0) { |
tp->lasttcol = tp->tcol - tp->tcols; |
tbl_data(tp, sp->opts, dp, |
|
tp->tbl.cols + hp->ident); |
/* 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; |
|
} |
|
break; |
|
} |
|
|
|
do { |
|
/* Print the vertical frame at the start of each row. */ |
|
|
|
tp->tcol = tp->tcols; |
|
fc = '\0'; |
|
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; |
|
} |
|
|
|
/* Print the data cells. */ |
|
|
|
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. |
|
*/ |
|
|
|
if (cp != NULL) { |
|
vert = cp->vert; |
|
switch (cp->pos) { |
|
case TBL_CELL_HORIZ: |
|
fc = '-'; |
|
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; |
|
|
|
/* |
|
* Skip later cells in a span, |
|
* figure out whether to start a span, |
|
* and advance to next data cell. |
|
*/ |
|
|
|
if (spans) { |
|
spans--; |
|
continue; |
|
} |
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; |
} |
} |
} else |
|
spans--; |
|
if (cp != NULL) |
|
cp = cp->next; |
|
|
|
/* |
/* |
* Separate columns, except in the middle |
* Print one line of text in the cell |
* of spans and after the last cell. |
* and remember whether there is more. |
*/ |
*/ |
|
|
if (hp->next == NULL || spans) |
tp->tcol++; |
continue; |
if (tp->tcol->col < tp->tcol->lastcol) |
|
term_flushln(tp); |
|
if (tp->tcol->col < tp->tcol->lastcol) |
|
more = 1; |
|
|
tbl_char(tp, ASCII_NBRSP, 1); |
/* |
if (vert > 0) |
* Vertical frames between data cells, |
tbl_char(tp, '|', vert); |
* but not after the last column. |
if (vert < 2 && hp->next != NULL) |
*/ |
tbl_char(tp, ASCII_NBRSP, 2 - vert); |
|
|
if (fc == ' ' && ((vert == 0 && |
|
(cp == NULL || !IS_HORIZ(cp))) || |
|
tp->tcol + 1 == tp->tcols + tp->lasttcol)) |
|
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++; |
|
} |
|
} |
} |
} |
} else if (horiz) |
|
tbl_hrule(tp, sp, 0); |
|
|
|
/* Vertical frame at the end of each row. */ |
/* Print the vertical frame at the end of each row. */ |
|
|
if (sp->layout->last->vert || |
fc = '\0'; |
(sp->prev != NULL && sp->prev->layout->last->vert) || |
if ((sp->layout->last->vert && |
(sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))) |
sp->layout->last->col + 1 == sp->opts->cols) || |
term_word(tp, horiz ? "+" : " |"); |
(sp->next != NULL && |
else if (sp->opts->rvert) |
sp->next->layout->last->vert && |
tbl_char(tp, horiz ? '-' : ASCII_NBRSP, 1); |
sp->next->layout->last->col + 1 == sp->opts->cols) || |
term_flushln(tp); |
(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); |
|
|
/* |
/* |
* If we're the last row, clean up after ourselves: clear the |
* Clean up after this row. If it is the last line |
* existing table configuration and set it to NULL. |
* of the table, print the box line and clean up |
|
* column data; otherwise, print the allbox line. |
*/ |
*/ |
|
|
if (sp->flags & TBL_SPAN_LAST) { |
term_setcol(tp, 1); |
|
tp->flags &= ~TERMP_MULTICOL; |
|
tp->tcol->rmargin = tp->maxrmargin; |
|
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, 1); |
tbl_hrule(tp, sp, 2); |
tp->skipvsp = 1; |
tp->skipvsp = 1; |
} |
} |
if (sp->opts->opts & TBL_OPT_DBOX) { |
if (sp->opts->opts & TBL_OPT_DBOX) { |
tbl_hrule(tp, sp, 2); |
tbl_hrule(tp, sp, 3); |
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->offset = offset; |
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); |
|
|
tp->flags &= ~TERMP_NONOSPACE; |
tp->flags &= ~TERMP_NONOSPACE; |
tp->rmargin = rmargin; |
|
tp->maxrmargin = maxrmargin; |
|
} |
} |
|
|
/* |
/* |
* Kinds of horizontal rulers: |
* Kinds of horizontal rulers: |
* 0: inside the table (single or double line with crossings) |
* 0: inside the table (single or double line with crossings) |
* 1: inner frame (single line with crossings and ends) |
* 1: inside the table (single or double line with crossings and ends) |
* 2: outer frame (single line without crossings with ends) |
* 2: inner frame (single line with crossings and ends) |
|
* 3: outer frame (single line without crossings with ends) |
*/ |
*/ |
static void |
static void |
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 *c1, *c2; |
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 == 0 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; |
stdline = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; |
cross = (kind < 2) ? '+' : '-'; |
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) |
if (kind) |
term_word(tp, "+"); |
term_word(tp, |
c1 = sp->layout->first; |
cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|"); |
c2 = sp->prev == NULL ? NULL : sp->prev->layout->first; |
|
if (c2 == c1) |
|
c2 = NULL; |
|
for (;;) { |
for (;;) { |
tbl_char(tp, line, tp->tbl.cols[c1->head->ident].width + 1); |
col = tp->tbl.cols + cp->col; |
vert = c1->vert; |
if (cpn == NULL || cpn->pos != TBL_CELL_DOWN) { |
if ((c1 = c1->next) == NULL) |
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; |
break; |
if (c2 != NULL) { |
if (cpp != NULL) { |
if (vert < c2->vert) |
if (vert < cpp->vert) |
vert = c2->vert; |
vert = cpp->vert; |
c2 = c2->next; |
cpp = cpp->next; |
} |
} |
if (vert) |
if (cpn != NULL) { |
tbl_char(tp, cross, vert); |
if (vert < cpn->vert) |
if (vert < 2) |
vert = cpn->vert; |
tbl_char(tp, line, 2 - 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); |
} |
} |
if (kind) { |
if (kind) { |
term_word(tp, "+"); |
term_word(tp, |
|
cpn == NULL || cpn->pos != TBL_CELL_DOWN ? "+" : "|"); |
term_flushln(tp); |
term_flushln(tp); |
} |
} |
} |
} |
|
|
static void |
static void |
tbl_data(struct termp *tp, const struct tbl_opts *opts, |
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 roffcol *col) |
const struct roffcol *col) |
{ |
{ |
|
switch (cp->pos) { |
if (NULL == dp) { |
case TBL_CELL_HORIZ: |
tbl_char(tp, ASCII_NBRSP, col->width); |
tbl_char(tp, '-', col->width); |
return; |
return; |
|
case TBL_CELL_DHORIZ: |
|
tbl_char(tp, '=', col->width); |
|
return; |
|
default: |
|
break; |
} |
} |
assert(dp->layout); |
|
|
|
|
if (dp == NULL) |
|
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: |
/* FALLTHROUGH */ |
|
case TBL_DATA_NHORIZ: |
case TBL_DATA_NHORIZ: |
tbl_char(tp, '-', col->width); |
tbl_char(tp, '-', col->width); |
return; |
return; |
case TBL_DATA_NDHORIZ: |
case TBL_DATA_NDHORIZ: |
/* FALLTHROUGH */ |
|
case TBL_DATA_DHORIZ: |
case TBL_DATA_DHORIZ: |
tbl_char(tp, '=', col->width); |
tbl_char(tp, '=', col->width); |
return; |
return; |
Line 286 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 554 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
break; |
break; |
} |
} |
|
|
switch (dp->layout->pos) { |
switch (cp->pos) { |
case TBL_CELL_HORIZ: |
|
tbl_char(tp, '-', col->width); |
|
break; |
|
case TBL_CELL_DHORIZ: |
|
tbl_char(tp, '=', col->width); |
|
break; |
|
case TBL_CELL_LONG: |
case TBL_CELL_LONG: |
/* FALLTHROUGH */ |
|
case TBL_CELL_CENTRE: |
case TBL_CELL_CENTRE: |
/* FALLTHROUGH */ |
|
case TBL_CELL_LEFT: |
case TBL_CELL_LEFT: |
/* FALLTHROUGH */ |
|
case TBL_CELL_RIGHT: |
case TBL_CELL_RIGHT: |
tbl_literal(tp, dp, col); |
tbl_literal(tp, dp, col); |
break; |
break; |
Line 306 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(); |
/* NOTREACHED */ |
|
} |
} |
} |
} |
|
|
|
|
tbl_literal(struct termp *tp, const struct tbl_dat *dp, |
tbl_literal(struct termp *tp, const struct tbl_dat *dp, |
const struct roffcol *col) |
const struct roffcol *col) |
{ |
{ |
struct tbl_head *hp; |
size_t len, padl, padr, width; |
size_t width, len, padl, padr; |
int ic, spans; |
int spans; |
|
|
|
assert(dp->string); |
assert(dp->string); |
len = term_strlen(tp, dp->string); |
len = term_strlen(tp, dp->string); |
|
|
hp = dp->layout->head->next; |
|
width = col->width; |
width = col->width; |
for (spans = dp->spans; spans--; hp = hp->next) |
ic = dp->layout->col; |
width += tp->tbl.cols[hp->ident].width + 3; |
spans = dp->spans; |
|
while (spans--) |
|
width += tp->tbl.cols[++ic].width + 3; |
|
|
padr = width > len ? width - len : 0; |
padr = width > len ? width - len : 0; |
padl = 0; |
padl = 0; |
Line 377 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 (NULL != (cp = strrchr(dp->string, opts->decimal))) { |
if (col->decimal > intsz && col->width > totsz) { |
buf[1] = '\0'; |
padl = col->decimal - intsz; |
for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { |
if (padl + totsz > col->width) |
buf[0] = dp->string[i]; |
padl = col->width - totsz; |
ssz += term_strlen(tp, buf); |
|
} |
} |
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 |
tbl_word(struct termp *tp, const struct tbl_dat *dp) |
tbl_word(struct termp *tp, const struct tbl_dat *dp) |
{ |
{ |
const void *prev_font; |
int prev_font; |
|
|
prev_font = term_fontq(tp); |
prev_font = tp->fonti; |
if (dp->layout->flags & TBL_CELL_BOLD) |
if (dp->layout->flags & TBL_CELL_BOLD) |
term_fontpush(tp, TERMFONT_BOLD); |
term_fontpush(tp, TERMFONT_BOLD); |
else if (dp->layout->flags & TBL_CELL_ITALIC) |
else if (dp->layout->flags & TBL_CELL_ITALIC) |