mandoc/out.c - diff

Return to out.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/out.c between version 1.44 and 1.45

version 1.44, 2012/05/27 17:54:54

version 1.45, 2013/05/31 21:37:17

Line 32

#include "out.h"

static void tblcalc_data(struct rofftbl *, struct roffcol *,

const struct tbl *, const struct tbl_dat *);

const struct tbl_opts *, const struct tbl_dat *);

static void tblcalc_literal(struct rofftbl *, struct roffcol *,

const struct tbl_dat *);

static void tblcalc_number(struct rofftbl *, struct roffcol *,

const struct tbl *, const struct tbl_dat *);

const struct tbl_opts *, const struct tbl_dat *);

* Convert a `scaling unit' to a consistent form, or fail. Scaling

Line 154 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp

assert(NULL == tbl->cols);

tbl->cols = mandoc_calloc

((size_t)sp->tbl->cols, sizeof(struct roffcol));

((size_t)sp->opts->cols, sizeof(struct roffcol));

hp = sp->head;

Line 175 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp

continue;

assert(dp->layout);

col = &tbl->cols[dp->layout->head->ident];

tblcalc_data(tbl, col, sp->tbl, dp);

tblcalc_data(tbl, col, sp->opts, dp);

}

static void

tblcalc_data(struct rofftbl *tbl, struct roffcol *col,

const struct tbl *tp, const struct tbl_dat *dp)

const struct tbl_opts *opts, const struct tbl_dat *dp)

{

size_t sz;

Line 206 tblcalc_data(struct rofftbl *tbl, struct roffcol *col,

tblcalc_literal(tbl, col, dp);

break;

case (TBL_CELL_NUMBER):

tblcalc_number(tbl, col, tp, dp);

tblcalc_number(tbl, col, opts, dp);

break;

case (TBL_CELL_DOWN):

break;

Line 232 tblcalc_literal(struct rofftbl *tbl, struct roffcol *c

static void

tblcalc_number(struct rofftbl *tbl, struct roffcol *col,

const struct tbl *tp, const struct tbl_dat *dp)

const struct tbl_opts *opts, const struct tbl_dat *dp)

{

int i;

size_t sz, psz, ssz, d;

Line 254 tblcalc_number(struct rofftbl *tbl, struct roffcol *co

/* FIXME: TBL_DATA_HORIZ et al.? */

buf[0] = tp->decimal;

buf[0] = opts->decimal;

buf[1] = '\0';

psz = (*tbl->slen)(buf, tbl->arg);

if (NULL != (cp = strrchr(str, tp->decimal))) {

if (NULL != (cp = strrchr(str, opts->decimal))) {

buf[1] = '\0';

for (ssz = 0, i = 0; cp != &str[i]; i++) {

buf[0] = str[i];

CVSweb