version 1.153, 2010/06/13 21:02:49 |
version 1.154, 2010/06/13 21:41:58 |
|
|
void (*post)(DECL_ARGS); |
void (*post)(DECL_ARGS); |
}; |
}; |
|
|
static size_t a2width(const struct mdoc_argv *, int); |
static size_t a2width(const char *); |
static size_t a2height(const struct mdoc_node *); |
static size_t a2height(const struct mdoc_node *); |
static size_t a2offs(const char *); |
static size_t a2offs(const char *); |
|
|
Line 476 a2height(const struct mdoc_node *n) |
|
Line 476 a2height(const struct mdoc_node *n) |
|
|
|
|
|
static size_t |
static size_t |
a2width(const struct mdoc_argv *arg, int pos) |
a2width(const char *v) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
assert(arg->value[pos]); |
assert(v); |
if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX)) |
if ( ! a2roffsu(v, &su, SCALE_MAX)) |
SCALE_HS_INIT(&su, strlen(arg->value[pos])); |
SCALE_HS_INIT(&su, strlen(v)); |
|
|
return(term_hspan(&su)); |
return(term_hspan(&su)); |
} |
} |
Line 703 termp_it_pre(DECL_ARGS) |
|
Line 703 termp_it_pre(DECL_ARGS) |
|
nn->prev && i < (int)ncols; |
nn->prev && i < (int)ncols; |
nn = nn->prev, i++) |
nn = nn->prev, i++) |
offset += dcol + a2width |
offset += dcol + a2width |
(&bl->args->argv[vals[1]], i); |
(bl->args->argv[vals[1]].value[i]); |
|
|
|
|
/* |
/* |
Line 719 termp_it_pre(DECL_ARGS) |
|
Line 719 termp_it_pre(DECL_ARGS) |
|
* Use the declared column widths, extended as explained |
* Use the declared column widths, extended as explained |
* in the preceding paragraph. |
* in the preceding paragraph. |
*/ |
*/ |
width = a2width(&bl->args->argv[vals[1]], i) + dcol; |
width = a2width |
|
(bl->args->argv[vals[1]].value[i]) + dcol; |
break; |
break; |
default: |
default: |
if (vals[0] < 0) |
if (NULL == bl->data.Bl.width) |
break; |
break; |
|
|
/* |
/* |
Line 730 termp_it_pre(DECL_ARGS) |
|
Line 731 termp_it_pre(DECL_ARGS) |
|
* number for buffering single arguments. See the above |
* number for buffering single arguments. See the above |
* handling for column for how this changes. |
* handling for column for how this changes. |
*/ |
*/ |
width = a2width(&bl->args->argv[vals[0]], 0) + 2; |
|
assert(bl->data.Bl.width); |
assert(bl->data.Bl.width); |
|
width = a2width(bl->data.Bl.width) + 2; |
break; |
break; |
} |
} |
|
|