version 1.21, 2011/09/20 23:05:49 |
version 1.25, 2013/05/31 21:37:17 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2012 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 |
|
|
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 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 size_t tbl_rulewidth(struct termp *, const struct tbl_head *); |
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_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 *, |
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 *); |
Line 96 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 96 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
/* Horizontal frame at the start of boxed tables. */ |
/* Horizontal frame at the start of boxed tables. */ |
|
|
if (TBL_SPAN_FIRST & sp->flags) { |
if (TBL_SPAN_FIRST & sp->flags) { |
if (TBL_OPT_DBOX & sp->tbl->opts) |
if (TBL_OPT_DBOX & sp->opts->opts) |
tbl_hframe(tp, sp, 1); |
tbl_hframe(tp, sp, 1); |
if (TBL_OPT_DBOX & sp->tbl->opts || |
if (TBL_OPT_DBOX & sp->opts->opts || |
TBL_OPT_BOX & sp->tbl->opts) |
TBL_OPT_BOX & sp->opts->opts) |
tbl_hframe(tp, sp, 0); |
tbl_hframe(tp, sp, 0); |
} |
} |
|
|
/* Vertical frame at the start of each row. */ |
/* Vertical frame at the start of each row. */ |
|
|
if (TBL_OPT_BOX & sp->tbl->opts || TBL_OPT_DBOX & sp->tbl->opts) |
if (TBL_OPT_BOX & sp->opts->opts || TBL_OPT_DBOX & sp->opts->opts) |
term_word(tp, TBL_SPAN_HORIZ == sp->pos || |
term_word(tp, TBL_SPAN_HORIZ == sp->pos || |
TBL_SPAN_DHORIZ == sp->pos ? "+" : "|"); |
TBL_SPAN_DHORIZ == sp->pos ? "+" : "|"); |
|
|
Line 126 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 126 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
dp = sp->first; |
dp = sp->first; |
spans = 0; |
spans = 0; |
for (hp = sp->head; hp; hp = hp->next) { |
for (hp = sp->head; hp; hp = hp->next) { |
|
|
/* |
/* |
* If the current data header is invoked during |
* If the current data header is invoked during |
* a spanner ("spans" > 0), don't emit anything |
* a spanner ("spans" > 0), don't emit anything |
* at all. |
* at all. |
*/ |
*/ |
switch (hp->pos) { |
|
case (TBL_HEAD_VERT): |
|
/* FALLTHROUGH */ |
|
case (TBL_HEAD_DVERT): |
|
if (spans <= 0) |
|
tbl_vrule(tp, hp); |
|
continue; |
|
case (TBL_HEAD_DATA): |
|
break; |
|
} |
|
|
|
if (--spans >= 0) |
if (--spans >= 0) |
continue; |
continue; |
|
|
/* |
/* Separate columns. */ |
* All cells get a leading blank, except the |
|
* first one and those after double rulers. |
|
*/ |
|
|
|
if (hp->prev && TBL_HEAD_DVERT != hp->prev->pos) |
if (NULL != hp->prev) |
tbl_char(tp, ASCII_NBRSP, 1); |
tbl_vrule(tp, hp); |
|
|
col = &tp->tbl.cols[hp->ident]; |
col = &tp->tbl.cols[hp->ident]; |
tbl_data(tp, sp->tbl, dp, col); |
tbl_data(tp, sp->opts, dp, col); |
|
|
/* No trailing blanks. */ |
|
|
|
if (NULL == hp->next) |
|
break; |
|
|
|
/* |
|
* Add another blank between cells, |
|
* or two when there is no vertical ruler. |
|
*/ |
|
|
|
tbl_char(tp, ASCII_NBRSP, |
|
TBL_HEAD_VERT == hp->next->pos || |
|
TBL_HEAD_DVERT == hp->next->pos ? 1 : 2); |
|
|
|
/* |
/* |
* Go to the next data cell and assign the |
* Go to the next data cell and assign the |
* number of subsequent spans, if applicable. |
* number of subsequent spans, if applicable. |
Line 185 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 159 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
|
|
/* Vertical frame at the end of each row. */ |
/* Vertical frame at the end of each row. */ |
|
|
if (TBL_OPT_BOX & sp->tbl->opts || TBL_OPT_DBOX & sp->tbl->opts) |
if (TBL_OPT_BOX & sp->opts->opts || TBL_OPT_DBOX & sp->opts->opts) |
term_word(tp, TBL_SPAN_HORIZ == sp->pos || |
term_word(tp, TBL_SPAN_HORIZ == sp->pos || |
TBL_SPAN_DHORIZ == sp->pos ? "+" : " |"); |
TBL_SPAN_DHORIZ == sp->pos ? "+" : " |"); |
term_flushln(tp); |
term_flushln(tp); |
Line 196 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 170 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
*/ |
*/ |
|
|
if (TBL_SPAN_LAST & sp->flags) { |
if (TBL_SPAN_LAST & sp->flags) { |
if (TBL_OPT_DBOX & sp->tbl->opts || |
if (TBL_OPT_DBOX & sp->opts->opts || |
TBL_OPT_BOX & sp->tbl->opts) |
TBL_OPT_BOX & sp->opts->opts) { |
tbl_hframe(tp, sp, 0); |
tbl_hframe(tp, sp, 0); |
if (TBL_OPT_DBOX & sp->tbl->opts) |
tp->skipvsp = 1; |
|
} |
|
if (TBL_OPT_DBOX & sp->opts->opts) { |
tbl_hframe(tp, sp, 1); |
tbl_hframe(tp, sp, 1); |
|
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; |
Line 222 tbl_rulewidth(struct termp *tp, const struct tbl_head |
|
Line 200 tbl_rulewidth(struct termp *tp, const struct tbl_head |
|
size_t width; |
size_t width; |
|
|
width = tp->tbl.cols[hp->ident].width; |
width = tp->tbl.cols[hp->ident].width; |
if (TBL_HEAD_DATA == hp->pos) { |
|
/* Account for leading blanks. */ |
/* Account for leading blanks. */ |
if (hp->prev && TBL_HEAD_DVERT != hp->prev->pos) |
if (hp->prev) |
width++; |
width += 2 - hp->vert; |
/* Account for trailing blanks. */ |
|
width++; |
/* Account for trailing blank. */ |
if (hp->next && |
width++; |
TBL_HEAD_VERT != hp->next->pos && |
|
TBL_HEAD_DVERT != hp->next->pos) |
|
width++; |
|
} |
|
return(width); |
return(width); |
} |
} |
|
|
Line 250 tbl_hrule(struct termp *tp, const struct tbl_span *sp) |
|
Line 225 tbl_hrule(struct termp *tp, const struct tbl_span *sp) |
|
if (TBL_SPAN_DHORIZ == sp->pos) |
if (TBL_SPAN_DHORIZ == sp->pos) |
c = '='; |
c = '='; |
|
|
for (hp = sp->head; hp; hp = hp->next) |
for (hp = sp->head; hp; hp = hp->next) { |
tbl_char(tp, |
if (hp->prev && hp->vert) |
TBL_HEAD_DATA == hp->pos ? c : '+', |
tbl_char(tp, '+', hp->vert); |
tbl_rulewidth(tp, hp)); |
tbl_char(tp, c, tbl_rulewidth(tp, hp)); |
|
} |
} |
} |
|
|
/* |
/* |
Line 268 tbl_hframe(struct termp *tp, const struct tbl_span *sp |
|
Line 244 tbl_hframe(struct termp *tp, const struct tbl_span *sp |
|
const struct tbl_head *hp; |
const struct tbl_head *hp; |
|
|
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, |
if (hp->prev && hp->vert) |
outer || TBL_HEAD_DATA == hp->pos ? '-' : '+', |
tbl_char(tp, (outer ? '-' : '+'), hp->vert); |
tbl_rulewidth(tp, hp)); |
tbl_char(tp, '-', tbl_rulewidth(tp, hp)); |
|
} |
term_word(tp, "+"); |
term_word(tp, "+"); |
term_flushln(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) |
{ |
{ |
Line 323 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
Line 300 tbl_data(struct termp *tp, const struct tbl *tbl, |
|
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): |
case (TBL_CELL_DOWN): |
tbl_char(tp, ASCII_NBRSP, col->width); |
tbl_char(tp, ASCII_NBRSP, col->width); |
|
|
tbl_vrule(struct termp *tp, const struct tbl_head *hp) |
tbl_vrule(struct termp *tp, const struct tbl_head *hp) |
{ |
{ |
|
|
switch (hp->pos) { |
tbl_char(tp, ASCII_NBRSP, 1); |
case (TBL_HEAD_VERT): |
if (0 < hp->vert) |
term_word(tp, "|"); |
tbl_char(tp, '|', hp->vert); |
break; |
if (2 > hp->vert) |
case (TBL_HEAD_DVERT): |
tbl_char(tp, ASCII_NBRSP, 2 - hp->vert); |
term_word(tp, "||"); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
} |
|
|
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 len, padl, padr; |
struct tbl_head *hp; |
|
size_t width, len, padl, padr; |
|
int spans; |
|
|
assert(dp->string); |
assert(dp->string); |
len = term_strlen(tp, dp->string); |
len = term_strlen(tp, dp->string); |
padr = col->width > len ? col->width - len : 0; |
|
|
hp = dp->layout->head->next; |
|
width = col->width; |
|
for (spans = dp->spans; spans--; hp = hp->next) |
|
width += tp->tbl.cols[hp->ident].width + 3; |
|
|
|
padr = width > len ? width - len : 0; |
padl = 0; |
padl = 0; |
|
|
switch (dp->layout->pos) { |
switch (dp->layout->pos) { |
Line 401 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
Line 381 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
} |
} |
|
|
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) |
{ |
{ |
Line 419 tbl_number(struct termp *tp, const struct tbl *tbl, |
|
Line 399 tbl_number(struct termp *tp, const struct tbl *tbl, |
|
|
|
sz = term_strlen(tp, dp->string); |
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 = strrchr(dp->string, tbl->decimal))) { |
if (NULL != (cp = strrchr(dp->string, opts->decimal))) { |
buf[1] = '\0'; |
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]; |