From 350cdb47d01784c4292587eea70d900793da8943 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 18 Aug 2018 20:18:14 +0000 Subject: If a tbl(7) column contains both text cells and numeric cells, horizontally align the numbers in the same way as groff does. --- out.c | 11 ++++++++--- out.h | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/out.c b/out.c index 1364d8d4..bbe352b1 100644 --- a/out.c +++ b/out.c @@ -168,6 +168,7 @@ 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. @@ -177,6 +178,10 @@ 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) { @@ -358,10 +363,10 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col, sz += col->decimal - d; d = col->decimal; } else - col->width += d - col->decimal; + col->nwidth += d - col->decimal; - if (sz > col->width) - col->width = sz; + if (sz > col->nwidth) + col->nwidth = sz; if (d > col->decimal) col->decimal = d; } diff --git a/out.h b/out.h index c9042641..95224e0c 100644 --- a/out.h +++ b/out.h @@ -1,7 +1,7 @@ /* $Id$ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2014, 2017 Ingo Schwarze + * Copyright (c) 2014, 2017, 2018 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -32,6 +32,7 @@ enum roffscale { struct roffcol { size_t width; /* width of cell */ + size_t nwidth; /* max. width of number in cell */ size_t decimal; /* decimal position in cell */ size_t spacing; /* spacing after the column */ int flags; /* layout flags, see tbl_cell */ -- cgit