version 1.13, 2011/01/07 14:59:52 |
version 1.50, 2017/06/12 22:49:16 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* 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> |
|
|
#include "out.h" |
#include "out.h" |
#include "term.h" |
#include "term.h" |
|
|
/* FIXME: `n' modifier doesn't always do the right thing. */ |
|
/* FIXME: `n' modifier doesn't use the cell-spacing buffer. */ |
|
|
|
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 *, |
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 void tbl_hframe(struct termp *, const struct tbl_span *); |
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 *, |
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_vframe(struct termp *, const struct tbl *); |
static void tbl_word(struct termp *, const struct tbl_dat *); |
static void tbl_vrule(struct termp *, const struct tbl_head *); |
|
|
|
|
|
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; |
size_t rmargin, maxrmargin; |
size_t coloff, tsz; |
|
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; |
tbl_hframe(tp, sp); |
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 < sp->opts->cols; ic++) |
|
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. */ |
|
|
tbl_vframe(tp, sp->tbl); |
if (sp->opts->opts & TBL_OPT_DBOX) |
|
tbl_hrule(tp, sp, 2); |
|
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) |
|
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): |
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_vrule(tp, hp); |
} |
|
coloff += tp->tbl.cols[ic].width; |
|
tp->tcol->rmargin = coloff; |
|
coloff++; |
|
if (ic + 1 < sp->opts->cols) |
|
coloff += 2; |
|
if (spans) { |
|
spans--; |
continue; |
continue; |
case (TBL_HEAD_DATA): |
|
break; |
|
} |
} |
|
if (dp == NULL) |
|
continue; |
|
spans = dp->spans; |
|
dp = dp->next; |
|
} |
|
|
col = &tp->tbl.cols[hp->ident]; |
/* Set up a column for a right vertical frame. */ |
tbl_data(tp, sp->tbl, dp, col); |
|
|
|
/* Go to the next data cell. */ |
tp->tcol++; |
if (dp) |
tp->tcol->offset = coloff; |
dp = dp->next; |
if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) || |
|
sp->opts->rvert) |
|
coloff++; |
|
tp->tcol->rmargin = coloff; |
|
|
|
/* 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; |
|
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; |
} |
} |
|
|
tbl_vframe(tp, sp->tbl); |
do { |
term_flushln(tp); |
/* Print the vertical frame at the start of each row. */ |
|
|
|
tp->tcol = tp->tcols; |
|
fc = '\0'; |
|
if (sp->layout->vert || |
|
(sp->prev != NULL && sp->prev->layout->vert) || |
|
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 (vert == 0 && |
|
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); |
tbl_hframe(tp, sp); |
tp->flags &= ~TERMP_MULTICOL; |
|
tp->tcol->rmargin = tp->maxrmargin; |
|
if (sp->next == NULL) { |
|
if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { |
|
tbl_hrule(tp, sp, 1); |
|
tp->skipvsp = 1; |
|
} |
|
if (sp->opts->opts & TBL_OPT_DBOX) { |
|
tbl_hrule(tp, sp, 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 && |
|
(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: |
|
* 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 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; |
size_t width; |
char line, cross; |
|
|
/* |
line = (kind == 0 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-'; |
* An hrule extends across the entire table and is demarked by a |
cross = (kind < 2) ? '+' : '-'; |
* standalone `_' or whatnot in lieu of a table row. Spanning |
|
* headers are marked by a `+', as are table boundaries. |
|
*/ |
|
|
|
c = '-'; |
if (kind) |
if (TBL_SPAN_DHORIZ == sp->pos) |
term_word(tp, "+"); |
c = '='; |
c1 = sp->layout->first; |
|
c2 = sp->prev == NULL ? NULL : sp->prev->layout->first; |
/* FIXME: don't use `+' between data and a spanner! */ |
if (c2 == c1) |
|
c2 = NULL; |
for (hp = sp->head; hp; hp = hp->next) { |
for (;;) { |
width = tp->tbl.cols[hp->ident].width; |
tbl_char(tp, line, tp->tbl.cols[c1->col].width + 1); |
switch (hp->pos) { |
vert = c1->vert; |
case (TBL_HEAD_DATA): |
if ((c1 = c1->next) == NULL) |
tbl_char(tp, c, width); |
break; |
break; |
if (c2 != NULL) { |
case (TBL_HEAD_DVERT): |
if (vert < c2->vert) |
tbl_char(tp, '+', width); |
vert = c2->vert; |
/* FALLTHROUGH */ |
c2 = c2->next; |
case (TBL_HEAD_VERT): |
|
tbl_char(tp, '+', width); |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
} |
|
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) { |
|
|
static void |
|
tbl_hframe(struct termp *tp, const struct tbl_span *sp) |
|
{ |
|
const struct tbl_head *hp; |
|
size_t width; |
|
|
|
if ( ! (TBL_OPT_BOX & sp->tbl->opts || |
|
TBL_OPT_DBOX & sp->tbl->opts)) |
|
return; |
|
|
|
/* |
|
* Print out the horizontal part of a frame or double frame. A |
|
* double frame has an unbroken `-' outer line the width of the |
|
* table, bordered by `+'. The frame (or inner frame, in the |
|
* 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_word(tp, "+"); |
term_word(tp, "+"); |
for (hp = sp->head; hp; hp = hp->next) { |
|
width = tp->tbl.cols[hp->ident].width; |
|
tbl_char(tp, '-', width); |
|
} |
|
term_word(tp, "+"); |
|
term_flushln(tp); |
term_flushln(tp); |
} |
} |
|
|
term_word(tp, "+"); |
|
for (hp = sp->head; hp; hp = hp->next) { |
|
width = tp->tbl.cols[hp->ident].width; |
|
switch (hp->pos) { |
|
case (TBL_HEAD_DATA): |
|
tbl_char(tp, '-', width); |
|
break; |
|
default: |
|
tbl_char(tp, '+', width); |
|
break; |
|
} |
|
} |
|
term_word(tp, "+"); |
|
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_dat *dp, |
const struct roffcol *col) |
const struct roffcol *col) |
{ |
{ |
enum tbl_cellt pos; |
|
|
|
if (NULL == dp) { |
if (dp == NULL) { |
tbl_char(tp, ASCII_NBRSP, col->width); |
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); |
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; |
default: |
default: |
break; |
break; |
} |
} |
|
|
pos = dp && dp->layout ? dp->layout->pos : TBL_CELL_LEFT; |
|
|
|
switch (pos) { |
switch (dp->layout->pos) { |
case (TBL_CELL_HORIZ): |
case TBL_CELL_HORIZ: |
tbl_char(tp, '-', col->width); |
tbl_char(tp, '-', col->width); |
break; |
break; |
case (TBL_CELL_DHORIZ): |
case TBL_CELL_DHORIZ: |
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): |
case TBL_CELL_LEFT: |
/* FALLTHROUGH */ |
case TBL_CELL_RIGHT: |
case (TBL_CELL_LEFT): |
|
/* FALLTHROUGH */ |
|
case (TBL_CELL_RIGHT): |
|
tbl_literal(tp, dp, col); |
tbl_literal(tp, dp, col); |
break; |
break; |
case (TBL_CELL_NUMBER): |
case TBL_CELL_NUMBER: |
tbl_number(tp, tbl, dp, col); |
tbl_number(tp, opts, dp, col); |
break; |
break; |
|
case TBL_CELL_DOWN: |
|
tbl_char(tp, ASCII_NBRSP, col->width); |
|
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
} |
} |
|
|
static void |
static void |
tbl_vrule(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 |
|
tbl_vframe(struct termp *tp, const struct tbl *tbl) |
|
{ |
|
|
|
if (TBL_OPT_BOX & tbl->opts || TBL_OPT_DBOX & tbl->opts) |
|
term_word(tp, "|"); |
|
} |
|
|
|
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; |
Line 339 tbl_char(struct termp *tp, char c, size_t len) |
|
Line 423 tbl_char(struct termp *tp, char c, size_t len) |
|
} |
} |
|
|
static void |
static void |
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) |
{ |
{ |
size_t padl, padr, ssz; |
size_t len, padl, padr, width; |
enum tbl_cellt pos; |
int ic, spans; |
const char *str; |
|
|
|
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 && dp->layout ? dp->layout->pos : TBL_CELL_LEFT; |
padr = width > len ? width - len : 0; |
str = dp && dp->string ? dp->string : ""; |
padl = 0; |
|
|
ssz = term_len(tp, 1); |
switch (dp->layout->pos) { |
|
case TBL_CELL_LONG: |
switch (pos) { |
padl = term_len(tp, 1); |
case (TBL_CELL_LONG): |
padr = padr > padl ? padr - padl : 0; |
padl = ssz; |
|
padr = col->width - term_strlen(tp, str) - ssz; |
|
break; |
break; |
case (TBL_CELL_CENTRE): |
case TBL_CELL_CENTRE: |
padl = col->width - term_strlen(tp, str); |
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 = col->width - term_strlen(tp, str); |
padl = padr; |
|
padr = 0; |
break; |
break; |
default: |
default: |
padr = col->width - term_strlen(tp, str); |
|
break; |
break; |
} |
} |
|
|
tbl_char(tp, ASCII_NBRSP, padl); |
tbl_char(tp, ASCII_NBRSP, padl); |
term_word(tp, str); |
tbl_word(tp, dp); |
tbl_char(tp, ASCII_NBRSP, padr); |
tbl_char(tp, ASCII_NBRSP, padr); |
} |
} |
|
|
static void |
static void |
tbl_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 roffcol *col) |
const struct roffcol *col) |
{ |
{ |
char *cp; |
char *cp; |
char buf[2]; |
char buf[2]; |
const char *str; |
|
size_t sz, psz, ssz, d, padl; |
size_t sz, psz, ssz, d, padl; |
int i; |
int i; |
|
|
Line 394 tbl_number(struct termp *tp, const struct tbl *tbl, |
|
Line 479 tbl_number(struct termp *tp, const struct tbl *tbl, |
|
* and the maximum decimal; right-pad by the remaining amount. |
* and the maximum decimal; right-pad by the remaining amount. |
*/ |
*/ |
|
|
str = dp && dp->string ? dp->string : ""; |
assert(dp->string); |
|
|
sz = term_strlen(tp, str); |
sz = term_strlen(tp, dp->string); |
|
|
buf[0] = tbl->decimal; |
buf[0] = opts->decimal; |
buf[1] = '\0'; |
buf[1] = '\0'; |
|
|
psz = term_strlen(tp, buf); |
psz = term_strlen(tp, buf); |
|
|
if (NULL != (cp = strchr(str, tbl->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 != &str[i]; i++) { |
buf[0] = dp->string[i]; |
buf[0] = str[i]; |
|
ssz += term_strlen(tp, buf); |
ssz += term_strlen(tp, buf); |
} |
} |
d = ssz + psz; |
d = ssz + psz; |
} else |
} else |
d = sz + psz; |
d = sz + psz; |
|
|
sz += term_len(tp, 2); |
if (col->decimal > d && col->width > sz) { |
d += term_len(tp, 1); |
padl = col->decimal - d; |
|
if (padl + sz > col->width) |
|
padl = col->width - sz; |
|
tbl_char(tp, ASCII_NBRSP, padl); |
|
} else |
|
padl = 0; |
|
tbl_word(tp, dp); |
|
if (col->width > sz + padl) |
|
tbl_char(tp, ASCII_NBRSP, col->width - sz - padl); |
|
} |
|
|
padl = col->decimal - d; |
static void |
|
tbl_word(struct termp *tp, const struct tbl_dat *dp) |
|
{ |
|
int prev_font; |
|
|
tbl_char(tp, ASCII_NBRSP, padl); |
prev_font = tp->fonti; |
term_word(tp, str); |
if (dp->layout->flags & TBL_CELL_BOLD) |
tbl_char(tp, ASCII_NBRSP, col->width - sz - padl); |
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); |
|
} |