diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-18 20:18:14 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-18 20:18:14 +0000 |
commit | b0f03aa71b675bbbe273d5709814222be5db036c (patch) | |
tree | e6c521b6e1e6136cb551e2dbfb85b957aafea9c0 | |
parent | a69bc577f294a785b78f0998ce3733c0f7442f09 (diff) | |
download | mandoc-b0f03aa71b675bbbe273d5709814222be5db036c.tar.gz mandoc-b0f03aa71b675bbbe273d5709814222be5db036c.tar.zst mandoc-b0f03aa71b675bbbe273d5709814222be5db036c.zip |
If a tbl(7) column contains both text cells and numeric cells,
horizontally align the numbers in the same way as groff does.
-rw-r--r-- | out.c | 13 | ||||
-rw-r--r-- | out.h | 5 |
2 files changed, 12 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.71 2018/08/18 16:44:55 schwarze Exp $ */ +/* $Id: out.c,v 1.72 2018/08/18 20:18:14 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> @@ -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; } @@ -1,7 +1,7 @@ -/* $Id: out.h,v 1.32 2018/06/25 16:54:59 schwarze Exp $ */ +/* $Id: out.h,v 1.33 2018/08/18 20:18:14 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2014, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> * * 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 */ |