mandoc/out.c - diff

Return to out.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/out.c between version 1.64 and 1.69

version 1.64, 2017/06/08 12:54:58

version 1.69, 2017/06/15 00:27:52

Line 29

#include "out.h"

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

const struct tbl_opts *, const struct tbl_dat *);

const struct tbl_opts *, const struct tbl_dat *,

size_t);

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

const struct tbl_dat *);

const struct tbl_dat *, size_t);

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

const struct tbl_opts *, const struct tbl_dat *);

Line 84 a2roffsu(const char *src, struct roffsu *dst, enum rof

Line 85 a2roffsu(const char *src, struct roffsu *dst, enum rof

case 'v':

dst->unit = SCALE_VS;

break;

case '\0':

endptr--;

/* FALLTHROUGH */

default:

endptr--;

if (SCALE_MAX == def)

return NULL;

dst->unit = def;

Line 104 a2roffsu(const char *src, struct roffsu *dst, enum rof

Line 103 a2roffsu(const char *src, struct roffsu *dst, enum rof

void

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

size_t totalwidth)

size_t offset, size_t rmargin)

{

struct roffsu su;

const struct tbl_opts *opts;

const struct tbl_dat *dp;

struct roffcol *col;

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

col->flags |= dp->layout->flags;

if (dp->layout->flags & TBL_CELL_WIGN)

continue;

tblcalc_data(tbl, col, opts, dp);

if (dp->layout->wstr != NULL &&

dp->layout->width == 0 &&

a2roffsu(dp->layout->wstr, &su, SCALE_EN)

!= NULL)

dp->layout->width =

(*tbl->sulen)(&su, tbl->arg);

if (col->width < dp->layout->width)

col->width = dp->layout->width;

tblcalc_data(tbl, col, opts, dp,

dp->block == 0 ? 0 :

dp->layout->width ? dp->layout->width :

rmargin ? (rmargin + sp->opts->cols / 2)

/ (sp->opts->cols + 1) : 0);

}

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

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

continue;

if (col->width == ewidth)

continue;

if (nxcol && totalwidth)

if (nxcol && rmargin)

xwidth += ewidth - col->width;

col->width = ewidth;

}

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

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

* Distribute the available width evenly.

if (nxcol && totalwidth) {

if (nxcol && rmargin) {

xwidth += 3*maxcol +

(opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?

2 : !!opts->lvert + !!opts->rvert);

if (xwidth >= totalwidth)

if (rmargin <= offset + xwidth)

return;

xwidth = totalwidth - xwidth;

xwidth = rmargin - offset - xwidth;

* Emulate a bug in GNU tbl width calculation that

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

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

static void

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

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

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

{

size_t sz;

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

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

case TBL_CELL_CENTRE:

case TBL_CELL_LEFT:

case TBL_CELL_RIGHT:

tblcalc_literal(tbl, col, dp);

tblcalc_literal(tbl, col, dp, mw);

break;

case TBL_CELL_NUMBER:

tblcalc_number(tbl, col, opts, dp);

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

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

static void

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

const struct tbl_dat *dp)

const struct tbl_dat *dp, size_t mw)

{

size_t sz;

const char *str; /* Beginning of the first line. */

const char *str;

const char *beg; /* Beginning of the current line. */

char *end; /* End of the current line. */

size_t lsz; /* Length of the current line. */

size_t wsz; /* Length of the current word. */

str = dp->string ? dp->string : "";

if (dp->string == NULL || *dp->string == '\0')

sz = (*tbl->slen)(str, tbl->arg);

return;

str = mw ? mandoc_strdup(dp->string) : dp->string;

if (col->width < sz)

lsz = 0;

col->width = sz;

for (beg = str; beg != NULL && *beg != '\0'; beg = end) {

end = mw ? strchr(beg, ' ') : NULL;

if (end != NULL) {

*end++ = '\0';

while (*end == ' ')

end++;

}

wsz = (*tbl->slen)(beg, tbl->arg);

if (mw && lsz && lsz + 1 + wsz <= mw)

lsz += 1 + wsz;

else

lsz = wsz;

if (col->width < lsz)

col->width = lsz;

}

if (mw)

free((void *)str);

}

static void

CVSweb