mandoc/out.c - diff

Return to out.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/out.c between version 1.60 and 1.72

version 1.60, 2015/09/26 00:54:04

version 1.72, 2018/08/18 20:18:14

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

Line 20

#include <sys/types.h>

#include <assert.h>

#include <stdint.h>

#include <stdlib.h>

#include <string.h>

#include <time.h>

Line 29

Line 30

#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 40 static void tblcalc_number(struct rofftbl *, struct ro

Line 42 static void tblcalc_number(struct rofftbl *, struct ro

* Parse the *src string and store a scaling unit into *dst.

* If the string doesn't specify the unit, use the default.

* If no default is specified, fail.

* Return 2 on complete success, 1 when a conversion was done,

* Return a pointer to the byte after the last byte used,

* but there was trailing garbage, and 0 on total failure.

* or NULL on total failure.

int

const char *

a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)

{

char *endptr;

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

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

dst->unit = def == SCALE_MAX ? SCALE_BU : def;

dst->scale = strtod(src, &endptr);

if (endptr == src)

return(0);

return NULL;

switch (*endptr++) {

case 'c':

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

Line 86 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(0);

return NULL;

dst->unit = def;

break;

}

return endptr;

return(*endptr == '\0' ? 2 : 1);

}

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

Line 104 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 141 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp

if (1 < spans)

continue;

icol = dp->layout->col;

if (maxcol < icol)

while (maxcol < icol)

maxcol = icol;

tbl->cols[++maxcol].spacing = SIZE_MAX;

col = tbl->cols + icol;

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;

if (dp->layout->spacing != SIZE_MAX &&

(col->spacing == SIZE_MAX ||

col->spacing < dp->layout->spacing))

col->spacing = dp->layout->spacing;

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);

}

* Align numbers with text.

* Count columns to equalize and columns to maximize.

* Find maximum width of the columns to equalize.

* Find total width of the columns *not* to maximize.

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

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

ewidth = xwidth = 0;

for (icol = 0; icol <= maxcol; icol++) {

col = tbl->cols + icol;

if (col->width > col->nwidth)

col->decimal += (col->width - col->nwidth) / 2;

else

col->width = col->nwidth;

if (col->spacing == SIZE_MAX || icol == maxcol)

col->spacing = 3;

if (col->flags & TBL_CELL_EQUAL) {

necol++;

if (ewidth < col->width)

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

Line 207 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 196 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp

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

* Distribute the available width evenly.

if (nxcol && totalwidth) {

if (nxcol && rmargin) {

xwidth = totalwidth - xwidth - 3*maxcol -

xwidth += 3*maxcol +

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

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

if (rmargin <= offset + xwidth)

return;

xwidth = rmargin - offset - xwidth;

* Emulate a bug in GNU tbl width calculation that

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

Line 258 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 240 tblcalc_data(struct rofftbl *tbl, struct roffcol *col,

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

switch (dp->layout->pos) {

case TBL_CELL_HORIZ:

/* FALLTHROUGH */

case TBL_CELL_DHORIZ:

sz = (*tbl->len)(1, tbl->arg);

if (col->width < sz)

col->width = sz;

break;

case TBL_CELL_LONG:

/* FALLTHROUGH */

case TBL_CELL_CENTRE:

/* FALLTHROUGH */

case TBL_CELL_LEFT:

/* FALLTHROUGH */

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 267 tblcalc_data(struct rofftbl *tbl, struct roffcol *col,

Line 289 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

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

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

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

{

int i;

size_t sz, psz, ssz, d;

size_t sz, ssz, d;

const char *str;

char *cp;

char buf[2];

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

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

buf[0] = opts->decimal;

buf[1] = '\0';

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

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

buf[1] = '\0';

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

buf[0] = str[i];

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

}

d = ssz + psz;

d = ssz;

} else

d = sz + psz;

d = sz;

/* Adjust the settings for this column. */

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

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

sz += col->decimal - d;

d = col->decimal;

} else

col->width += d - col->decimal;

col->nwidth += d - col->decimal;

if (sz > col->width)

if (sz > col->nwidth)

col->width = sz;

col->nwidth = sz;

if (d > col->decimal)

col->decimal = d;

}

CVSweb