mandoc/out.c - diff

Return to out.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

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

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

version 1.73, 2018/08/19 23:10:28

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

Line 142 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)

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

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

(*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 :

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

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

}

* 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 172 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 312 static void

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