From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (fantadrom.bsd.lv [local]) by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id d00f40af for ; Sat, 18 Aug 2018 15:18:45 -0500 (EST) Date: Sat, 18 Aug 2018 15:18:45 -0500 (EST) X-Mailinglist: mandoc-source Reply-To: source@mandoc.bsd.lv MIME-Version: 1.0 From: schwarze@mandoc.bsd.lv To: source@mandoc.bsd.lv Subject: mandoc: If a tbl(7) column contains both text cells and numeric cells, X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-Id: Log Message: ----------- If a tbl(7) column contains both text cells and numeric cells, horizontally align the numbers in the same way as groff does. Modified Files: -------------- mandoc: out.c out.h Revision Data ------------- Index: out.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/out.c,v retrieving revision 1.71 retrieving revision 1.72 diff -Lout.c -Lout.c -u -p -r1.71 -r1.72 --- out.c +++ out.c @@ -168,6 +168,7 @@ tblcalc(struct rofftbl *tbl, const struc } /* + * 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 struc 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, stru 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; } Index: out.h =================================================================== RCS file: /home/cvs/mandoc/mandoc/out.h,v retrieving revision 1.32 retrieving revision 1.33 diff -Lout.h -Lout.h -u -p -r1.32 -r1.33 --- out.h +++ 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 */ -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv