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.74

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

version 1.74, 2018/11/25 19:24:20

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 <ctype.h>

#include <stdint.h>

#include <stdlib.h>

#include <string.h>

#include <time.h>

Line 29

Line 31

#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 87 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 105 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;

size_t ewidth, xwidth;

int spans;

int hspans;

int icol, maxcol, necol, nxcol, quirkcol;

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

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

for (maxcol = -1; sp; sp = sp->next) {

if (TBL_SPAN_DATA != sp->pos)

continue;

spans = 1;

hspans = 1;

* Account for the data cells in the layout, matching it

* to data cells in the data section.

for (dp = sp->first; dp; dp = dp->next) {

/* Do not used spanned cells in the calculation. */

if (0 < --spans)

if (0 < --hspans)

continue;

spans = dp->spans;

hspans = dp->hspans;

if (1 < spans)

if (1 < hspans)

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

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

Line 208 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 220 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 259 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 276 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 290 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

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

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

{

int i;

const char *cp, *lastdigit, *lastpoint;

size_t sz, psz, ssz, d;

size_t intsz, totsz;

const char *str;

char *cp;

char buf[2];

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

return;

* First calculate number width and decimal place (last + 1 for

* Find the last digit and

* non-decimal numbers). If the stored decimal is subsequent to

* the last decimal point that is adjacent to a digit.

* ours, make our size longer by that difference

* The alignment indicator "\&" overrides everything.

* (right-"shifting"); similarly, if ours is subsequent the

* stored, then extend the stored size by the difference.

* Finally, re-assign the stored values.

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

lastdigit = lastpoint = NULL;

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

for (cp = dp->string; cp[0] != '\0'; cp++) {

if (cp[0] == '\\' && cp[1] == '&') {

lastdigit = lastpoint = cp;

break;

} else if (cp[0] == opts->decimal &&

(isdigit((unsigned char)cp[1]) ||

(cp > dp->string && isdigit((unsigned char)cp[-1]))))

lastpoint = cp;

else if (isdigit((unsigned char)cp[0]))

lastdigit = cp;

}

/* FIXME: TBL_DATA_HORIZ et al.? */

/* Not a number, treat as a literal string. */

buf[0] = opts->decimal;

totsz = (*tbl->slen)(dp->string, tbl->arg);

buf[1] = '\0';

if (lastdigit == NULL) {

if (col->width < totsz)

col->width = totsz;

return;

}

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

/* Measure the width of the integer part. */

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

if (lastpoint == NULL)

buf[1] = '\0';

lastpoint = lastdigit + 1;

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

intsz = 0;

buf[0] = str[i];

buf[1] = '\0';

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

for (cp = dp->string; cp < lastpoint; cp++) {

}

buf[0] = cp[0];

d = ssz + psz;

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

} else

}

d = sz + psz;

/* Adjust the settings for this column. */

* If this number has more integer digits than all numbers

* seen on earlier lines, shift them all to the right.

* If it has fewer, shift this number to the right.

if (col->decimal > d) {

if (intsz > col->decimal) {

sz += col->decimal - d;

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

d = col->decimal;

col->decimal = intsz;

} else

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

totsz += col->decimal - intsz;

if (sz > col->width)

/* Update the maximum total width seen so far. */

col->width = sz;

if (d > col->decimal)

if (totsz > col->nwidth)

col->decimal = d;

col->nwidth = totsz;

}

CVSweb