version 1.1, 2011/01/02 12:21:07 |
version 1.9, 2011/01/04 13:21:45 |
Line 35 static void tbl_hframe(struct termp *, |
|
Line 35 static void tbl_hframe(struct termp *, |
|
const struct tbl_span *); |
const struct tbl_span *); |
static void tbl_data_number(struct termp *, |
static void tbl_data_number(struct termp *, |
const struct tbl *, |
const struct tbl *, |
const struct tbl_dat *, int); |
const struct tbl_dat *, |
|
const struct termp_tbl *); |
static void tbl_data_literal(struct termp *, |
static void tbl_data_literal(struct termp *, |
const struct tbl_dat *, int); |
const struct tbl_dat *, |
static void tbl_data_spanner(struct termp *, |
const struct termp_tbl *); |
const struct tbl_dat *, int); |
|
static void tbl_data(struct termp *, const struct tbl *, |
static void tbl_data(struct termp *, const struct tbl *, |
const struct tbl_dat *, int); |
const struct tbl_dat *, |
|
const struct termp_tbl *); |
static void tbl_spanner(struct termp *, |
static void tbl_spanner(struct termp *, |
const struct tbl_head *); |
const struct tbl_head *); |
static void tbl_hrule(struct termp *, |
static void tbl_hrule(struct termp *, |
const struct tbl_span *); |
const struct tbl_span *); |
static void tbl_vframe(struct termp *, const struct tbl *); |
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 *); |
|
|
void |
void |
term_tbl(struct termp *tp, const struct tbl_span *sp) |
term_tbl(struct termp *tp, const struct tbl_span *sp) |
Line 54 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 69 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
const struct tbl_head *hp; |
const struct tbl_head *hp; |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
|
|
if (TBL_SPAN_FIRST & sp->flags) |
/* Inhibit printing of spaces: we do padding ourselves. */ |
|
|
|
tp->flags |= TERMP_NONOSPACE; |
|
tp->flags |= TERMP_NOSPACE; |
|
|
|
/* |
|
* The first time we're invoked for a given table block, create |
|
* the termp_tbl structure. This contains the column |
|
* configuration for the entire table, e.g., table-wide column |
|
* width, decimal point, etc. |
|
*/ |
|
|
|
if (TBL_SPAN_FIRST & sp->flags) { |
|
assert(NULL == tp->tbl); |
|
tp->tbl = calloc |
|
(sp->tbl->cols, sizeof(struct termp_tbl)); |
|
if (NULL == tp->tbl) { |
|
perror(NULL); |
|
exit(EXIT_FAILURE); |
|
} |
|
tbl_calc(tp, sp); |
|
|
|
/* Flush out any preceding data. */ |
term_flushln(tp); |
term_flushln(tp); |
|
} |
|
|
|
/* Horizontal frame at the start of boxed tables. */ |
|
|
if (TBL_SPAN_FIRST & sp->flags) |
if (TBL_SPAN_FIRST & sp->flags) |
tbl_hframe(tp, sp); |
tbl_hframe(tp, sp); |
|
|
tp->flags |= TERMP_NONOSPACE; |
/* Vertical frame at the start of each row. */ |
tp->flags |= TERMP_NOSPACE; |
|
|
|
tbl_vframe(tp, sp->tbl); |
tbl_vframe(tp, sp->tbl); |
|
|
|
/* |
|
* 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. |
|
*/ |
|
|
switch (sp->pos) { |
switch (sp->pos) { |
case (TBL_SPAN_HORIZ): |
case (TBL_SPAN_HORIZ): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_SPAN_DHORIZ): |
case (TBL_SPAN_DHORIZ): |
tbl_hrule(tp, sp); |
tbl_hrule(tp, sp); |
tbl_vframe(tp, sp->tbl); |
|
term_newln(tp); |
|
tp->flags &= ~TERMP_NONOSPACE; |
|
return; |
|
default: |
|
break; |
break; |
} |
case (TBL_SPAN_DATA): |
|
/* Iterate over template headers. */ |
|
dp = sp->first; |
|
for (hp = sp->head; hp; hp = hp->next) { |
|
switch (hp->pos) { |
|
case (TBL_HEAD_VERT): |
|
/* FALLTHROUGH */ |
|
case (TBL_HEAD_DVERT): |
|
tbl_spanner(tp, hp); |
|
continue; |
|
case (TBL_HEAD_DATA): |
|
break; |
|
} |
|
tbl_data(tp, sp->tbl, dp, |
|
&tp->tbl[hp->ident]); |
|
|
dp = sp->first; |
/* Go to the next data cell. */ |
for (hp = sp->head; hp; hp = hp->next) { |
|
switch (hp->pos) { |
|
case (TBL_HEAD_VERT): |
|
/* FALLTHROUGH */ |
|
case (TBL_HEAD_DVERT): |
|
tbl_spanner(tp, hp); |
|
break; |
|
case (TBL_HEAD_DATA): |
|
tbl_data(tp, sp->tbl, dp, hp->width); |
|
if (dp) |
if (dp) |
dp = dp->next; |
dp = dp->next; |
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
} |
|
break; |
} |
} |
|
|
tbl_vframe(tp, sp->tbl); |
tbl_vframe(tp, sp->tbl); |
term_flushln(tp); |
term_flushln(tp); |
|
|
if (TBL_SPAN_LAST & sp->flags) |
/* |
|
* If we're the last row, clean up after ourselves: clear the |
|
* existing table configuration and set it to NULL. |
|
*/ |
|
|
|
if (TBL_SPAN_LAST & sp->flags) { |
tbl_hframe(tp, sp); |
tbl_hframe(tp, sp); |
|
assert(tp->tbl); |
|
free(tp->tbl); |
|
tp->tbl = NULL; |
|
} |
|
|
tp->flags &= ~TERMP_NONOSPACE; |
tp->flags &= ~TERMP_NONOSPACE; |
|
|
Line 112 tbl_hrule(struct termp *tp, const struct tbl_span *sp) |
|
Line 163 tbl_hrule(struct termp *tp, const struct tbl_span *sp) |
|
{ |
{ |
const struct tbl_head *hp; |
const struct tbl_head *hp; |
char c; |
char c; |
|
int width; |
|
|
/* |
/* |
* An hrule extends across the entire table and is demarked by a |
* An hrule extends across the entire table and is demarked by a |
Line 126 tbl_hrule(struct termp *tp, const struct tbl_span *sp) |
|
Line 178 tbl_hrule(struct termp *tp, const struct tbl_span *sp) |
|
/* FIXME: don't use `+' between data and a spanner! */ |
/* FIXME: don't use `+' between data and a spanner! */ |
|
|
for (hp = sp->head; hp; hp = hp->next) { |
for (hp = sp->head; hp; hp = hp->next) { |
|
width = tp->tbl[hp->ident].width; |
switch (hp->pos) { |
switch (hp->pos) { |
case (TBL_HEAD_DATA): |
case (TBL_HEAD_DATA): |
tbl_char(tp, c, hp->width); |
tbl_char(tp, c, width); |
break; |
break; |
case (TBL_HEAD_DVERT): |
case (TBL_HEAD_DVERT): |
tbl_char(tp, '+', hp->width); |
tbl_char(tp, '+', width); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_HEAD_VERT): |
case (TBL_HEAD_VERT): |
tbl_char(tp, '+', hp->width); |
tbl_char(tp, '+', width); |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
|
|
tbl_hframe(struct termp *tp, const struct tbl_span *sp) |
tbl_hframe(struct termp *tp, const struct tbl_span *sp) |
{ |
{ |
const struct tbl_head *hp; |
const struct tbl_head *hp; |
|
int width; |
|
|
if ( ! (TBL_OPT_BOX & sp->tbl->opts || |
if ( ! (TBL_OPT_BOX & sp->tbl->opts || |
TBL_OPT_DBOX & sp->tbl->opts)) |
TBL_OPT_DBOX & sp->tbl->opts)) |
return; |
return; |
|
|
tp->flags |= TERMP_NONOSPACE; |
|
tp->flags |= TERMP_NOSPACE; |
|
|
|
/* |
/* |
* Print out the horizontal part of a frame or double frame. A |
* Print out the horizontal part of a frame or double frame. A |
* double frame has an unbroken `-' outer line the width of the |
* double frame has an unbroken `-' outer line the width of the |
Line 165 tbl_hframe(struct termp *tp, const struct tbl_span *sp |
|
Line 216 tbl_hframe(struct termp *tp, const struct tbl_span *sp |
|
|
|
if (TBL_OPT_DBOX & sp->tbl->opts) { |
if (TBL_OPT_DBOX & sp->tbl->opts) { |
term_word(tp, "+"); |
term_word(tp, "+"); |
for (hp = sp->head; hp; hp = hp->next) |
for (hp = sp->head; hp; hp = hp->next) { |
tbl_char(tp, '-', hp->width); |
width = tp->tbl[hp->ident].width; |
|
tbl_char(tp, '-', width); |
|
} |
term_word(tp, "+"); |
term_word(tp, "+"); |
term_flushln(tp); |
term_flushln(tp); |
} |
} |
|
|
term_word(tp, "+"); |
term_word(tp, "+"); |
for (hp = sp->head; hp; hp = hp->next) { |
for (hp = sp->head; hp; hp = hp->next) { |
|
width = tp->tbl[hp->ident].width; |
switch (hp->pos) { |
switch (hp->pos) { |
case (TBL_HEAD_DATA): |
case (TBL_HEAD_DATA): |
tbl_char(tp, '-', hp->width); |
tbl_char(tp, '-', width); |
break; |
break; |
default: |
default: |
tbl_char(tp, '+', hp->width); |
tbl_char(tp, '+', width); |
break; |
break; |
} |
} |
} |
} |
Line 188 tbl_hframe(struct termp *tp, const struct tbl_span *sp |
|
Line 242 tbl_hframe(struct termp *tp, const struct tbl_span *sp |
|
|
|
static void |
static void |
tbl_data(struct termp *tp, const struct tbl *tbl, |
tbl_data(struct termp *tp, const struct tbl *tbl, |
const struct tbl_dat *dp, int width) |
const struct tbl_dat *dp, |
|
const struct termp_tbl *tbp) |
{ |
{ |
enum tbl_cellt pos; |
enum tbl_cellt pos; |
|
|
if (NULL == dp) { |
if (NULL == dp) { |
tbl_char(tp, ASCII_NBRSP, width); |
tbl_char(tp, ASCII_NBRSP, tbp->width); |
return; |
return; |
} |
} |
|
|
switch (dp->pos) { |
switch (dp->pos) { |
case (TBL_DATA_HORIZ): |
case (TBL_DATA_HORIZ): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (TBL_DATA_NHORIZ): |
|
tbl_char(tp, '-', tbp->width); |
|
return; |
|
case (TBL_DATA_NDHORIZ): |
|
/* FALLTHROUGH */ |
case (TBL_DATA_DHORIZ): |
case (TBL_DATA_DHORIZ): |
tbl_data_spanner(tp, dp, width); |
tbl_char(tp, '=', tbp->width); |
return; |
return; |
default: |
default: |
break; |
break; |
Line 211 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
Line 271 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
|
|
switch (pos) { |
switch (pos) { |
case (TBL_CELL_HORIZ): |
case (TBL_CELL_HORIZ): |
/* FALLTHROUGH */ |
tbl_char(tp, '-', tbp->width); |
|
break; |
case (TBL_CELL_DHORIZ): |
case (TBL_CELL_DHORIZ): |
tbl_data_spanner(tp, dp, width); |
tbl_char(tp, '=', tbp->width); |
break; |
break; |
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 222 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
Line 283 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
case (TBL_CELL_LEFT): |
case (TBL_CELL_LEFT): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_CELL_RIGHT): |
case (TBL_CELL_RIGHT): |
tbl_data_literal(tp, dp, width); |
tbl_data_literal(tp, dp, tbp); |
break; |
break; |
case (TBL_CELL_NUMBER): |
case (TBL_CELL_NUMBER): |
tbl_data_number(tp, tbl, dp, width); |
tbl_data_number(tp, tbl, dp, tbp); |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 257 tbl_vframe(struct termp *tp, const struct tbl *tbl) |
|
Line 318 tbl_vframe(struct termp *tp, const struct tbl *tbl) |
|
term_word(tp, "|"); |
term_word(tp, "|"); |
} |
} |
|
|
|
|
static inline void |
static inline void |
tbl_char(struct termp *tp, char c, int len) |
tbl_char(struct termp *tp, char c, int len) |
{ |
{ |
int i; |
int i, sz; |
char cp[2]; |
char cp[2]; |
|
|
cp[0] = c; |
cp[0] = c; |
cp[1] = '\0'; |
cp[1] = '\0'; |
|
|
for (i = 0; i < len; i++) |
sz = term_strlen(tp, cp); |
|
|
|
for (i = 0; i < len; i += sz) |
term_word(tp, cp); |
term_word(tp, cp); |
} |
} |
|
|
static void |
static void |
tbl_data_spanner(struct termp *tp, const struct tbl_dat *dp, int width) |
tbl_data_literal(struct termp *tp, |
|
const struct tbl_dat *dp, |
|
const struct termp_tbl *tblp) |
{ |
{ |
|
int padl, padr, ssz; |
switch (dp->pos) { |
|
case (TBL_DATA_HORIZ): |
|
case (TBL_DATA_NHORIZ): |
|
tbl_char(tp, '-', width); |
|
break; |
|
case (TBL_DATA_DHORIZ): |
|
case (TBL_DATA_NDHORIZ): |
|
tbl_char(tp, '=', width); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
static void |
|
tbl_data_literal(struct termp *tp, const struct tbl_dat *dp, int width) |
|
{ |
|
int padl, padr; |
|
enum tbl_cellt pos; |
enum tbl_cellt pos; |
|
|
padl = padr = 0; |
padl = padr = 0; |
|
|
pos = dp->layout ? dp->layout->pos : TBL_CELL_LEFT; |
pos = dp->layout ? dp->layout->pos : TBL_CELL_LEFT; |
|
ssz = term_len(tp, 1); |
|
|
switch (pos) { |
switch (pos) { |
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
padl = 1; |
padl = ssz; |
padr = width - (int)strlen(dp->string) - 1; |
padr = tblp->width - term_strlen(tp, dp->string) - ssz; |
break; |
break; |
case (TBL_CELL_CENTRE): |
case (TBL_CELL_CENTRE): |
padl = width - (int)strlen(dp->string); |
padl = tblp->width - term_strlen(tp, dp->string); |
if (padl % 2) |
if (padl % 2) |
padr++; |
padr++; |
padl /= 2; |
padl /= 2; |
padr += padl; |
padr += padl; |
break; |
break; |
case (TBL_CELL_RIGHT): |
case (TBL_CELL_RIGHT): |
padl = width - (int)strlen(dp->string); |
padl = tblp->width - term_strlen(tp, dp->string); |
break; |
break; |
default: |
default: |
padr = width - (int)strlen(dp->string); |
padr = tblp->width - term_strlen(tp, dp->string); |
break; |
break; |
} |
} |
|
|
Line 326 tbl_data_literal(struct termp *tp, const struct tbl_da |
|
Line 373 tbl_data_literal(struct termp *tp, const struct tbl_da |
|
|
|
static void |
static void |
tbl_data_number(struct termp *tp, const struct tbl *tbl, |
tbl_data_number(struct termp *tp, const struct tbl *tbl, |
const struct tbl_dat *dp, int width) |
const struct tbl_dat *dp, |
|
const struct termp_tbl *tblp) |
{ |
{ |
char *decp, pnt; |
char *decp, buf[2]; |
int d, padl, sz; |
int d, padl, sz, psz, ssz, i; |
|
|
/* |
/* |
* See calc_data_number(). Left-pad by taking the offset of our |
* See calc_data_number(). Left-pad by taking the offset of our |
* and the maximum decimal; right-pad by the remaining amount. |
* and the maximum decimal; right-pad by the remaining amount. |
*/ |
*/ |
|
|
sz = (int)strlen(dp->string); |
sz = term_strlen(tp, dp->string); |
pnt = tbl->decimal; |
psz = term_strlen(tp, "."); |
|
|
if (NULL == (decp = strchr(dp->string, pnt))) { |
if (NULL != (decp = strchr(dp->string, tbl->decimal))) { |
d = sz + 1; |
buf[1] = '\0'; |
} else { |
for (ssz = i = 0; decp != &dp->string[i]; i++) { |
d = (int)(decp - dp->string) + 1; |
buf[0] = dp->string[i]; |
} |
ssz += term_strlen(tp, buf); |
|
} |
|
d = ssz + psz; |
|
} else |
|
d = sz + psz; |
|
|
assert(d <= dp->layout->head->decimal); |
assert(d <= tblp->decimal); |
assert(sz - d <= dp->layout->head->width - |
assert(sz - d <= tblp->width - tblp->decimal); |
dp->layout->head->decimal); |
|
|
|
padl = dp->layout->head->decimal - d + 1; |
padl = tblp->decimal - d + term_len(tp, 1); |
assert(width - sz - padl); |
assert(tblp->width - sz - padl); |
|
|
tbl_char(tp, ASCII_NBRSP, padl); |
tbl_char(tp, ASCII_NBRSP, padl); |
term_word(tp, dp->string); |
term_word(tp, dp->string); |
tbl_char(tp, ASCII_NBRSP, width - sz - padl); |
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; |
|
} |
|
for (dp = sp->first; dp; dp = dp->next) { |
|
if (NULL == dp->layout) |
|
continue; |
|
p = &tp->tbl[dp->layout->head->ident]; |
|
tbl_calc_data(tp, sp->tbl, dp, p); |
|
} |
|
} |
|
|
|
/* Calculate width as the simple spanner value. */ |
|
|
|
for ( ; hp; hp = hp->next) |
|
switch (hp->pos) { |
|
case (TBL_HEAD_VERT): |
|
tp->tbl[hp->ident].width = term_len(tp, 1); |
|
break; |
|
case (TBL_HEAD_DVERT): |
|
tp->tbl[hp->ident].width = term_len(tp, 2); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
static void |
|
tbl_calc_data(struct termp *tp, const struct tbl *tbl, |
|
const struct tbl_dat *dp, struct termp_tbl *tblp) |
|
{ |
|
int sz; |
|
|
|
/* Branch down into data sub-types. */ |
|
|
|
switch (dp->layout->pos) { |
|
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 |
|
tbl_calc_data_number(struct termp *tp, const struct tbl *tbl, |
|
const struct tbl_dat *dp, struct termp_tbl *tblp) |
|
{ |
|
int sz, d, psz, i, ssz; |
|
char *cp, buf[2]; |
|
|
|
/* |
|
* First calculate number width and decimal place (last + 1 for |
|
* 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. */ |
|
|
|
assert(dp->string); |
|
sz = term_strlen(tp, dp->string); |
|
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 |
|
tbl_calc_data_literal(struct termp *tp, |
|
const struct tbl_dat *dp, |
|
struct termp_tbl *tblp) |
|
{ |
|
int sz, bufsz, spsz; |
|
|
|
/* |
|
* Calculate our width and use the spacing, with a minimum |
|
* spacing dictated by position (centre, e.g,. gets a space on |
|
* either side, while right/left get a single adjacent space). |
|
*/ |
|
|
|
assert(dp->string); |
|
sz = term_strlen(tp, dp->string); |
|
|
|
switch (dp->layout->pos) { |
|
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; |
} |
} |