Return to tbl_term.c CVS log | Up to [cvsweb.bsd.lv] / mandoc |
version 1.27, 2014/04/20 16:46:05 | version 1.49, 2017/06/12 20:45:18 | ||
---|---|---|---|
|
|
||
/* $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 Ingo Schwarze <schwarze@openbsd.org> | * Copyright (c) 2011,2012,2014,2015,2017 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 <stdio.h> | #include <stdio.h> | ||
#include <stdlib.h> | #include <stdlib.h> | ||
|
|
||
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_dat *, | const struct tbl_dat *, | ||
const struct roffcol *); | const struct roffcol *); | ||
static size_t tbl_rulewidth(struct termp *, const struct tbl_head *); | |||
static void tbl_hframe(struct termp *, 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 *, | ||
const struct tbl_dat *, | const struct tbl_dat *, | ||
const struct roffcol *); | const struct roffcol *); | ||
static void tbl_hrule(struct termp *, const struct tbl_span *); | static void tbl_hrule(struct termp *, const struct tbl_span *, int); | ||
static void tbl_vrule(struct termp *, const struct tbl_head *); | static void tbl_word(struct termp *, const struct tbl_dat *); | ||
static size_t | static size_t | ||
term_tbl_strlen(const char *p, void *arg) | term_tbl_sulen(const struct roffsu *su, void *arg) | ||
{ | { | ||
return term_hspan((const struct termp *)arg, su) / 24; | |||
} | |||
return(term_strlen((const struct termp *)arg, p)); | static size_t | ||
term_tbl_strlen(const char *p, void *arg) | |||
{ | |||
return term_strlen((const struct termp *)arg, p); | |||
} | } | ||
static size_t | static size_t | ||
term_tbl_len(size_t sz, void *arg) | term_tbl_len(size_t sz, void *arg) | ||
{ | { | ||
return term_len((const struct termp *)arg, sz); | |||
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; | ||
const struct tbl_dat *dp; | const struct tbl_dat *dp; | ||
struct roffcol *col; | static size_t offset; | ||
int spans; | size_t coloff, tsz; | ||
size_t rmargin, maxrmargin; | 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 (TBL_SPAN_FIRST & sp->flags) { | 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); | tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin); | ||
} | |||
/* Horizontal frame at the start of boxed tables. */ | /* Center the table as a whole. */ | ||
if (TBL_SPAN_FIRST & sp->flags) { | offset = tp->tcol->offset; | ||
if (TBL_OPT_DBOX & sp->opts->opts) | if (sp->opts->opts & TBL_OPT_CENTRE) { | ||
tbl_hframe(tp, sp, 1); | tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) | ||
if (TBL_OPT_DBOX & sp->opts->opts || | ? 2 : !!sp->opts->lvert + !!sp->opts->rvert; | ||
TBL_OPT_BOX & sp->opts->opts) | for (ic = 0; ic < sp->opts->cols; ic++) | ||
tbl_hframe(tp, sp, 0); | tsz += tp->tbl.cols[ic].width + 3; | ||
} | tsz -= 3; | ||
if (offset + tsz > tp->tcol->rmargin) | |||
tsz -= 1; | |||
tp->tcol->offset = offset + tp->tcol->rmargin > tsz ? | |||
(offset + tp->tcol->rmargin - tsz) / 2 : 0; | |||
} | |||
/* Vertical frame at the start of each row. */ | /* Horizontal frame at the start of boxed tables. */ | ||
if ((TBL_OPT_BOX | TBL_OPT_DBOX) & sp->opts->opts || | if (sp->opts->opts & TBL_OPT_DBOX) | ||
sp->head->vert) | tbl_hrule(tp, sp, 2); | ||
term_word(tp, TBL_SPAN_HORIZ == sp->pos || | if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) | ||
TBL_SPAN_DHORIZ == sp->pos ? "+" : "|"); | tbl_hrule(tp, sp, 1); | ||
} | |||
/* | /* Set up the columns. */ | ||
* 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. | |||
*/ | |||
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: | ||
tbl_hrule(tp, sp); | horiz = 1; | ||
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); | ||
dp = sp->first; | coloff = tp->tcol->offset; | ||
spans = 0; | |||
for (hp = sp->head; hp; hp = hp->next) { | |||
/* | /* Set up a column for a left vertical frame. */ | ||
* If the current data header is invoked during | |||
* a spanner ("spans" > 0), don't emit anything | |||
* at all. | |||
*/ | |||
if (--spans >= 0) | 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; | |||
spans = 0; | |||
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; | |||
coloff++; | |||
if (ic + 1 < sp->opts->cols) | |||
coloff += 2; | |||
if (spans) { | |||
spans--; | |||
continue; | continue; | ||
} | |||
if (dp == NULL) | |||
continue; | |||
spans = dp->spans; | |||
dp = dp->next; | |||
} | |||
/* Separate columns. */ | /* Set up a column for a right vertical frame. */ | ||
if (NULL != hp->prev) | tp->tcol++; | ||
tbl_vrule(tp, hp); | tp->tcol->offset = coloff; | ||
if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || | |||
sp->opts->rvert) | |||
coloff++; | |||
tp->tcol->rmargin = coloff; | |||
col = &tp->tbl.cols[hp->ident]; | /* Spans may have reduced the number of columns. */ | ||
tbl_data(tp, sp->opts, dp, col); | |||
/* | tp->lasttcol = tp->tcol - tp->tcols; | ||
* Go to the next data cell and assign the | |||
* number of subsequent spans, if applicable. | |||
*/ | |||
if (dp) { | /* Fill the buffers for all data columns. */ | ||
spans = dp->spans; | |||
dp = dp->next; | tp->tcol = tp->tcols; | ||
dp = sp->first; | |||
spans = 0; | |||
for (ic = 0; ic < sp->opts->cols; ic++) { | |||
if (spans) { | |||
spans--; | |||
continue; | |||
} | } | ||
tp->tcol++; | |||
tp->col = 0; | |||
tbl_data(tp, sp->opts, dp, tp->tbl.cols + ic); | |||
if (dp == NULL) | |||
continue; | |||
spans = dp->spans; | |||
dp = dp->next; | |||
} | } | ||
break; | break; | ||
} | } | ||
/* Vertical frame at the end of each row. */ | do { | ||
/* Print the vertical frame at the start of each row. */ | |||
if ((TBL_OPT_BOX | TBL_OPT_DBOX) & sp->opts->opts || | tp->tcol = tp->tcols; | ||
sp->layout->vert) | fc = '\0'; | ||
term_word(tp, TBL_SPAN_HORIZ == sp->pos || | if (sp->layout->vert || | ||
TBL_SPAN_DHORIZ == sp->pos ? "+" : " |"); | (sp->prev != NULL && sp->prev->layout->vert) || | ||
term_flushln(tp); | sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)) | ||
fc = horiz ? '+' : '|'; | |||
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; | |||
dp = sp->first; | |||
spans = 0; | |||
for (ic = 0; ic < sp->opts->cols; ic++) { | |||
if (spans == 0) { | |||
tp->tcol++; | |||
if (dp != NULL) { | |||
spans = dp->spans; | |||
dp = dp->next; | |||
} | |||
if (tp->tcol->col < tp->tcol->lastcol) | |||
term_flushln(tp); | |||
if (tp->tcol->col < tp->tcol->lastcol) | |||
more = 1; | |||
if (tp->tcol + 1 == | |||
tp->tcols + tp->lasttcol) | |||
continue; | |||
} else | |||
spans--; | |||
/* Vertical frames between data cells. */ | |||
if (cp != NULL) { | |||
vert = cp->vert; | |||
cp = cp->next; | |||
} else | |||
vert = 0; | |||
if (sp->opts->opts & TBL_OPT_ALLBOX) | |||
vert = 1; | |||
if (vert == 0) | |||
continue; | |||
if (tp->tcol->rmargin + 1 > tp->viscol) { | |||
(*tp->advance)(tp, tp->tcol->rmargin | |||
+ 1 - tp->viscol); | |||
tp->viscol = tp->tcol->rmargin + 1; | |||
} | |||
while (vert--) { | |||
(*tp->letter)(tp, '|'); | |||
tp->viscol++; | |||
} | |||
} | |||
} | |||
/* Print the vertical frame at the end of each row. */ | |||
fc = '\0'; | |||
if (sp->layout->last->vert || | |||
(sp->prev != NULL && sp->prev->layout->last->vert) || | |||
(sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))) | |||
fc = horiz ? '+' : '|'; | |||
else if (horiz && sp->opts->rvert) | |||
fc = '-'; | |||
if (fc != '\0') { | |||
if (horiz == 0) { | |||
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 | * If we're the last row, clean up after ourselves: clear the | ||
* existing table configuration and set it to NULL. | * existing table configuration and set it to NULL. | ||
*/ | */ | ||
if (TBL_SPAN_LAST & sp->flags) { | term_setcol(tp, 1); | ||
if (TBL_OPT_DBOX & sp->opts->opts || | tp->flags &= ~TERMP_MULTICOL; | ||
TBL_OPT_BOX & sp->opts->opts) { | tp->tcol->rmargin = tp->maxrmargin; | ||
tbl_hframe(tp, sp, 0); | if (sp->next == NULL) { | ||
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { | |||
tbl_hrule(tp, sp, 1); | |||
tp->skipvsp = 1; | tp->skipvsp = 1; | ||
} | } | ||
if (TBL_OPT_DBOX & sp->opts->opts) { | if (sp->opts->opts & TBL_OPT_DBOX) { | ||
tbl_hframe(tp, sp, 1); | tbl_hrule(tp, sp, 2); | ||
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) | |||
tbl_hrule(tp, sp, 1); | |||
tp->flags &= ~TERMP_NONOSPACE; | tp->flags &= ~TERMP_NONOSPACE; | ||
tp->rmargin = rmargin; | |||
tp->maxrmargin = maxrmargin; | |||
} | } | ||
/* | /* | ||
* Horizontal rules extend across the entire table. | * Kinds of horizontal rulers: | ||
* Calculate the width by iterating over columns. | * 0: inside the table (single or double line with crossings) | ||
* 1: inner frame (single line with crossings and ends) | |||
* 2: outer frame (single line without crossings with ends) | |||
*/ | */ | ||
static size_t | |||
tbl_rulewidth(struct termp *tp, const struct tbl_head *hp) | |||
{ | |||
size_t width; | |||
width = tp->tbl.cols[hp->ident].width; | |||
/* Account for leading blanks. */ | |||
if (hp->prev) | |||
width += 2 - hp->vert; | |||
/* Account for trailing blank. */ | |||
width++; | |||
return(width); | |||
} | |||
/* | |||
* Rules inside the table can be single or double | |||
* and have crossings with vertical rules marked with pluses. | |||
*/ | |||
static void | static void | ||
tbl_hrule(struct termp *tp, const struct tbl_span *sp) | tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind) | ||
{ | { | ||
const struct tbl_head *hp; | const struct tbl_cell *c1, *c2; | ||
char c; | int vert; | ||
char line, cross; | |||
c = '-'; | line = (kind == 0 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; | ||
if (TBL_SPAN_DHORIZ == sp->pos) | cross = (kind < 2) ? '+' : '-'; | ||
c = '='; | |||
for (hp = sp->head; hp; hp = hp->next) { | if (kind) | ||
if (hp->prev && hp->vert) | term_word(tp, "+"); | ||
tbl_char(tp, '+', hp->vert); | c1 = sp->layout->first; | ||
tbl_char(tp, c, tbl_rulewidth(tp, hp)); | c2 = sp->prev == NULL ? NULL : sp->prev->layout->first; | ||
if (c2 == c1) | |||
c2 = NULL; | |||
for (;;) { | |||
tbl_char(tp, line, tp->tbl.cols[c1->col].width + 1); | |||
vert = c1->vert; | |||
if ((c1 = c1->next) == NULL) | |||
break; | |||
if (c2 != NULL) { | |||
if (vert < c2->vert) | |||
vert = c2->vert; | |||
c2 = c2->next; | |||
} | |||
if (sp->opts->opts & TBL_OPT_ALLBOX && !vert) | |||
vert = 1; | |||
if (vert) | |||
tbl_char(tp, cross, vert); | |||
if (vert < 2) | |||
tbl_char(tp, line, 2 - vert); | |||
} | } | ||
} | if (kind) { | ||
term_word(tp, "+"); | |||
/* | term_flushln(tp); | ||
* Rules above and below the table are always single | |||
* and have an additional plus at the beginning and end. | |||
* For double frames, this function is called twice, | |||
* and the outer one does not have crossings. | |||
*/ | |||
static void | |||
tbl_hframe(struct termp *tp, const struct tbl_span *sp, int outer) | |||
{ | |||
const struct tbl_head *hp; | |||
term_word(tp, "+"); | |||
for (hp = sp->head; hp; hp = hp->next) { | |||
if (hp->prev && hp->vert) | |||
tbl_char(tp, (outer ? '-' : '+'), hp->vert); | |||
tbl_char(tp, '-', tbl_rulewidth(tp, hp)); | |||
} | } | ||
term_word(tp, "+"); | |||
term_flushln(tp); | |||
} | } | ||
static void | static void | ||
|
|
||
const struct roffcol *col) | const struct roffcol *col) | ||
{ | { | ||
if (NULL == dp) { | if (dp == NULL) { | ||
tbl_char(tp, ASCII_NBRSP, col->width); | tbl_char(tp, ASCII_NBRSP, col->width); | ||
return; | return; | ||
} | } | ||
assert(dp->layout); | |||
switch (dp->pos) { | switch (dp->pos) { | ||
case TBL_DATA_NONE: | case TBL_DATA_NONE: | ||
tbl_char(tp, ASCII_NBRSP, col->width); | 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; | ||
|
|
||
tbl_char(tp, '=', col->width); | tbl_char(tp, '=', col->width); | ||
break; | 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; | ||
|
|
||
break; | break; | ||
default: | default: | ||
abort(); | abort(); | ||
/* NOTREACHED */ | |||
} | } | ||
} | } | ||
static void | static void | ||
tbl_vrule(struct termp *tp, const struct tbl_head *hp) | |||
{ | |||
tbl_char(tp, ASCII_NBRSP, 1); | |||
if (0 < hp->vert) | |||
tbl_char(tp, '|', hp->vert); | |||
if (2 > hp->vert) | |||
tbl_char(tp, ASCII_NBRSP, 2 - hp->vert); | |||
} | |||
static void | |||
tbl_char(struct termp *tp, char c, size_t len) | tbl_char(struct termp *tp, char c, size_t len) | ||
{ | { | ||
size_t i, sz; | size_t i, sz; | ||
|
|
||
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; | ||
|
|
||
} | } | ||
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); | ||
} | } | ||
|
|
||
psz = term_strlen(tp, buf); | psz = term_strlen(tp, buf); | ||
if (NULL != (cp = strrchr(dp->string, opts->decimal))) { | if ((cp = strrchr(dp->string, opts->decimal)) != NULL) { | ||
buf[1] = '\0'; | |||
for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { | for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { | ||
buf[0] = dp->string[i]; | buf[0] = dp->string[i]; | ||
ssz += term_strlen(tp, buf); | ssz += term_strlen(tp, buf); | ||
|
|
||
} else | } else | ||
d = sz + psz; | d = sz + psz; | ||
padl = col->decimal - d; | if (col->decimal > d && col->width > sz) { | ||
padl = col->decimal - d; | |||
tbl_char(tp, ASCII_NBRSP, padl); | if (padl + sz > col->width) | ||
term_word(tp, dp->string); | padl = col->width - sz; | ||
tbl_char(tp, ASCII_NBRSP, padl); | |||
} else | |||
padl = 0; | |||
tbl_word(tp, dp); | |||
if (col->width > sz + padl) | if (col->width > sz + padl) | ||
tbl_char(tp, ASCII_NBRSP, col->width - sz - padl); | tbl_char(tp, ASCII_NBRSP, col->width - sz - padl); | ||
} | } | ||
static void | |||
tbl_word(struct termp *tp, const struct tbl_dat *dp) | |||
{ | |||
int prev_font; | |||
prev_font = tp->fonti; | |||
if (dp->layout->flags & TBL_CELL_BOLD) | |||
term_fontpush(tp, TERMFONT_BOLD); | |||
else if (dp->layout->flags & TBL_CELL_ITALIC) | |||
term_fontpush(tp, TERMFONT_UNDER); | |||
term_word(tp, dp->string); | |||
term_fontpopq(tp, prev_font); | |||
} |