version 1.78, 2019/03/29 21:27:06 |
version 1.81, 2021/09/07 14:56:35 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021 |
|
* Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <stdint.h> |
#include <stdint.h> |
|
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
|
#include "mandoc.h" |
#include "tbl.h" |
#include "tbl.h" |
#include "out.h" |
#include "out.h" |
|
|
Line 209 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 212 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
} |
} |
|
|
/* |
/* |
* Column spacings are needed for span width calculations, |
* The minimum width of columns explicitly specified |
* so set the default values now. |
* in the layout is 1n. |
*/ |
*/ |
|
|
for (icol = 0; icol <= maxcol; icol++) |
if (maxcol < sp_first->opts->cols - 1) |
if (tbl->cols[icol].spacing == SIZE_MAX || icol == maxcol) |
maxcol = sp_first->opts->cols - 1; |
tbl->cols[icol].spacing = 3; |
for (icol = 0; icol <= maxcol; icol++) { |
|
col = tbl->cols + icol; |
|
if (col->width < 1) |
|
col->width = 1; |
|
|
|
/* |
|
* Column spacings are needed for span width |
|
* calculations, so set the default values now. |
|
*/ |
|
|
|
if (col->spacing == SIZE_MAX || icol == maxcol) |
|
col->spacing = 3; |
|
} |
|
|
/* |
/* |
* Replace the minimum widths with the missing widths, |
* Replace the minimum widths with the missing widths, |
* and dismiss groups that are already wide enough. |
* and dismiss groups that are already wide enough. |
Line 340 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 355 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
col = tbl->cols + icol; |
col = tbl->cols + icol; |
if (col->width > col->nwidth) |
if (col->width > col->nwidth) |
col->decimal += (col->width - col->nwidth) / 2; |
col->decimal += (col->width - col->nwidth) / 2; |
else |
|
col->width = col->nwidth; |
|
if (col->flags & TBL_CELL_EQUAL) { |
if (col->flags & TBL_CELL_EQUAL) { |
necol++; |
necol++; |
if (ewidth < col->width) |
if (ewidth < col->width) |
Line 549 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
Line 562 tblcalc_number(struct rofftbl *tbl, struct roffcol *co |
|
|
|
if (totsz > col->nwidth) |
if (totsz > col->nwidth) |
col->nwidth = totsz; |
col->nwidth = totsz; |
|
if (col->nwidth > col->width) |
|
col->width = col->nwidth; |
return totsz; |
return totsz; |
} |
} |