version 1.30, 2011/01/05 15:37:23 |
version 1.40, 2011/04/09 15:29:40 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2011 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 |
Line 173 time2a(time_t t, char *dst, size_t sz) |
|
Line 174 time2a(time_t t, char *dst, size_t sz) |
|
(void)strftime(p, sz, "%Y", &tm); |
(void)strftime(p, sz, "%Y", &tm); |
} |
} |
|
|
|
|
int |
|
a2roffdeco(enum roffdeco *d, const char **word, size_t *sz) |
|
{ |
|
int i, j, lim; |
|
char term, c; |
|
const char *wp; |
|
enum roffdeco dd; |
|
|
|
*d = DECO_NONE; |
|
lim = i = 0; |
|
term = '\0'; |
|
wp = *word; |
|
|
|
switch ((c = wp[i++])) { |
|
case ('('): |
|
*d = DECO_SPECIAL; |
|
lim = 2; |
|
break; |
|
case ('F'): |
|
/* FALLTHROUGH */ |
|
case ('f'): |
|
*d = 'F' == c ? DECO_FFONT : DECO_FONT; |
|
|
|
switch (wp[i++]) { |
|
case ('('): |
|
lim = 2; |
|
break; |
|
case ('['): |
|
term = ']'; |
|
break; |
|
case ('3'): |
|
/* FALLTHROUGH */ |
|
case ('B'): |
|
*d = DECO_BOLD; |
|
return(i); |
|
case ('2'): |
|
/* FALLTHROUGH */ |
|
case ('I'): |
|
*d = DECO_ITALIC; |
|
return(i); |
|
case ('P'): |
|
*d = DECO_PREVIOUS; |
|
return(i); |
|
case ('1'): |
|
/* FALLTHROUGH */ |
|
case ('R'): |
|
*d = DECO_ROMAN; |
|
return(i); |
|
default: |
|
i--; |
|
lim = 1; |
|
break; |
|
} |
|
break; |
|
case ('k'): |
|
/* FALLTHROUGH */ |
|
case ('M'): |
|
/* FALLTHROUGH */ |
|
case ('m'): |
|
/* FALLTHROUGH */ |
|
case ('*'): |
|
if ('*' == c) |
|
*d = DECO_RESERVED; |
|
|
|
switch (wp[i++]) { |
|
case ('('): |
|
lim = 2; |
|
break; |
|
case ('['): |
|
term = ']'; |
|
break; |
|
default: |
|
i--; |
|
lim = 1; |
|
break; |
|
} |
|
break; |
|
case ('h'): |
|
/* FALLTHROUGH */ |
|
case ('v'): |
|
/* FALLTHROUGH */ |
|
case ('s'): |
|
j = 0; |
|
if ('+' == wp[i] || '-' == wp[i]) { |
|
i++; |
|
j = 1; |
|
} |
|
|
|
switch (wp[i++]) { |
|
case ('('): |
|
lim = 2; |
|
break; |
|
case ('['): |
|
term = ']'; |
|
break; |
|
case ('\''): |
|
term = '\''; |
|
break; |
|
case ('0'): |
|
j = 1; |
|
/* FALLTHROUGH */ |
|
default: |
|
i--; |
|
lim = 1; |
|
break; |
|
} |
|
|
|
if ('+' == wp[i] || '-' == wp[i]) { |
|
if (j) |
|
return(i); |
|
i++; |
|
} |
|
|
|
/* Handle embedded numerical subexp or escape. */ |
|
|
|
if ('(' == wp[i]) { |
|
while (wp[i] && ')' != wp[i]) |
|
if ('\\' == wp[i++]) { |
|
/* Handle embedded escape. */ |
|
*word = &wp[i]; |
|
i += a2roffdeco(&dd, word, sz); |
|
} |
|
|
|
if (')' == wp[i++]) |
|
break; |
|
|
|
*d = DECO_NONE; |
|
return(i - 1); |
|
} else if ('\\' == wp[i]) { |
|
*word = &wp[++i]; |
|
i += a2roffdeco(&dd, word, sz); |
|
} |
|
|
|
break; |
|
case ('['): |
|
*d = DECO_SPECIAL; |
|
term = ']'; |
|
break; |
|
case ('c'): |
|
*d = DECO_NOSPACE; |
|
return(i); |
|
case ('z'): |
|
*d = DECO_NONE; |
|
if ('\\' == wp[i]) { |
|
*word = &wp[++i]; |
|
return(i + a2roffdeco(&dd, word, sz)); |
|
} else |
|
lim = 1; |
|
break; |
|
case ('o'): |
|
/* FALLTHROUGH */ |
|
case ('w'): |
|
if ('\'' == wp[i++]) { |
|
term = '\''; |
|
break; |
|
} |
|
/* FALLTHROUGH */ |
|
default: |
|
*d = DECO_SSPECIAL; |
|
i--; |
|
lim = 1; |
|
break; |
|
} |
|
|
|
assert(term || lim); |
|
*word = &wp[i]; |
|
|
|
if (term) { |
|
j = i; |
|
while (wp[i] && wp[i] != term) |
|
i++; |
|
if ('\0' == wp[i]) { |
|
*d = DECO_NONE; |
|
return(i); |
|
} |
|
|
|
assert(i >= j); |
|
*sz = (size_t)(i - j); |
|
|
|
return(i + 1); |
|
} |
|
|
|
assert(lim > 0); |
|
*sz = (size_t)lim; |
|
|
|
for (j = 0; wp[i] && j < lim; j++) |
|
i++; |
|
if (j < lim) |
|
*d = DECO_NONE; |
|
|
|
return(i); |
|
} |
|
|
|
/* |
/* |
* Calculate the abstract widths and decimal positions of columns in a |
* Calculate the abstract widths and decimal positions of columns in a |
* table. This routine allocates the columns structures then runs over |
* table. This routine allocates the columns structures then runs over |
Line 387 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 194 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
*/ |
*/ |
|
|
assert(NULL == tbl->cols); |
assert(NULL == tbl->cols); |
tbl->cols = calloc(sp->tbl->cols, sizeof(struct roffcol)); |
tbl->cols = mandoc_calloc |
|
((size_t)sp->tbl->cols, sizeof(struct roffcol)); |
|
|
hp = sp->head; |
hp = sp->head; |
|
|
Line 399 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 207 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
* to data cells in the data section. |
* to data cells in the data section. |
*/ |
*/ |
for (dp = sp->first; dp; dp = dp->next) { |
for (dp = sp->first; dp; dp = dp->next) { |
if (NULL == dp->layout) |
assert(dp->layout); |
continue; |
|
col = &tbl->cols[dp->layout->head->ident]; |
col = &tbl->cols[dp->layout->head->ident]; |
tblcalc_data(tbl, col, sp->tbl, dp); |
tblcalc_data(tbl, col, sp->tbl, dp); |
} |
} |
Line 454 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
Line 261 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
case (TBL_CELL_NUMBER): |
case (TBL_CELL_NUMBER): |
tblcalc_number(tbl, col, tp, dp); |
tblcalc_number(tbl, col, tp, dp); |
break; |
break; |
|
case (TBL_CELL_DOWN): |
|
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
Line 465 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
Line 274 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
const struct tbl_dat *dp) |
const struct tbl_dat *dp) |
{ |
{ |
size_t sz, bufsz, spsz; |
size_t sz, bufsz, spsz; |
|
const char *str; |
|
|
/* |
/* |
* Calculate our width and use the spacing, with a minimum |
* Calculate our width and use the spacing, with a minimum |
Line 472 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
Line 282 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c |
|
* either side, while right/left get a single adjacent space). |
* either side, while right/left get a single adjacent space). |
*/ |
*/ |
|
|
sz = bufsz = spsz = 0; |
bufsz = spsz = 0; |
if (dp->string) |
str = dp->string ? dp->string : ""; |
sz = (*tbl->slen)(dp->string, tbl->arg); |
sz = (*tbl->slen)(str, tbl->arg); |
|
|
|
/* FIXME: TBL_DATA_HORIZ et al.? */ |
|
|
assert(dp->layout); |
assert(dp->layout); |
switch (dp->layout->pos) { |
switch (dp->layout->pos) { |
case (TBL_CELL_LONG): |
case (TBL_CELL_LONG): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (TBL_CELL_CENTRE): |
case (TBL_CELL_CENTRE): |
bufsz = (*tbl->len)(2, tbl->arg); |
bufsz = (*tbl->len)(1, tbl->arg); |
break; |
break; |
default: |
default: |
bufsz = (*tbl->len)(1, tbl->arg); |
bufsz = (*tbl->len)(1, tbl->arg); |
Line 504 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 316 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
{ |
{ |
int i; |
int i; |
size_t sz, psz, ssz, d; |
size_t sz, psz, ssz, d; |
char *cp; |
|
const char *str; |
const char *str; |
|
char *cp; |
char buf[2]; |
char buf[2]; |
|
|
/* TODO: use spacing modifier. */ |
|
|
|
/* |
/* |
* First calculate number width and decimal place (last + 1 for |
* First calculate number width and decimal place (last + 1 for |
* no-decimal numbers). If the stored decimal is subsequent |
* no-decimal numbers). If the stored decimal is subsequent |
Line 519 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 329 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
* Finally, re-assign the stored values. |
* Finally, re-assign the stored values. |
*/ |
*/ |
|
|
str = ""; |
str = dp->string ? dp->string : ""; |
if (dp->string) |
|
str = dp->string; |
|
|
|
sz = (*tbl->slen)(str, tbl->arg); |
sz = (*tbl->slen)(str, tbl->arg); |
|
|
|
/* FIXME: TBL_DATA_HORIZ et al.? */ |
|
|
buf[0] = tp->decimal; |
buf[0] = tp->decimal; |
buf[1] = '\0'; |
buf[1] = '\0'; |
|
|
psz = (*tbl->slen)(buf, tbl->arg); |
psz = (*tbl->slen)(buf, tbl->arg); |
|
|
if (NULL != (cp = strchr(str, tp->decimal))) { |
if (NULL != (cp = strrchr(str, tp->decimal))) { |
buf[1] = '\0'; |
buf[1] = '\0'; |
for (ssz = 0, i = 0; cp != &str[i]; i++) { |
for (ssz = 0, i = 0; cp != &str[i]; i++) { |
buf[0] = str[i]; |
buf[0] = str[i]; |
Line 557 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 366 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
col->width = sz; |
col->width = sz; |
if (d > col->decimal) |
if (d > col->decimal) |
col->decimal = d; |
col->decimal = d; |
|
|
|
/* Adjust for stipulated width. */ |
|
|
|
if (col->width < dp->layout->spacing) |
|
col->width = dp->layout->spacing; |
} |
} |
|
|
|
|