version 1.30, 2011/01/05 15:37:23 |
version 1.37, 2011/01/30 16:05:37 |
|
|
/* $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 251 a2roffdeco(enum roffdeco *d, const char **word, size_t |
|
Line 252 a2roffdeco(enum roffdeco *d, const char **word, size_t |
|
break; |
break; |
} |
} |
break; |
break; |
|
|
|
case ('N'): |
|
|
|
/* |
|
* Sequence of characters: backslash, 'N' (i = 0), |
|
* starting delimiter (i = 1), character number (i = 2). |
|
*/ |
|
|
|
*word = wp + 2; |
|
*sz = 0; |
|
|
|
/* |
|
* Cannot use a digit as a starting delimiter; |
|
* but skip the digit anyway. |
|
*/ |
|
|
|
if (isdigit((int)wp[1])) |
|
return(2); |
|
|
|
/* |
|
* Any non-digit terminates the character number. |
|
* That is, the terminating delimiter need not |
|
* match the starting delimiter. |
|
*/ |
|
|
|
for (i = 2; isdigit((int)wp[i]); i++) |
|
(*sz)++; |
|
|
|
/* |
|
* This is only a numbered character |
|
* if the character number has at least one digit. |
|
*/ |
|
|
|
if (*sz) |
|
*d = DECO_NUMBERED; |
|
|
|
/* |
|
* Skip the terminating delimiter, even if it does not |
|
* match, and even if there is no character number. |
|
*/ |
|
|
|
return(++i); |
|
|
case ('h'): |
case ('h'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('v'): |
case ('v'): |
Line 399 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 443 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 497 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 510 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 518 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 552 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 565 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 602 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; |
} |
} |
|
|
|
|