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 5bc09503; for ; Tue, 27 Jan 2015 21:24:19 -0500 (EST) Date: Tue, 27 Jan 2015 21:24:19 -0500 (EST) Message-Id: <14973528668151018310.enqueue@fantadrom.bsd.lv> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: schwarze@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: adjust formatting for the tbl(7) layout 'x' modifier (maximize X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- adjust formatting for the tbl(7) layout 'x' modifier (maximize column) to match groff for up to six maximized columns Modified Files: -------------- mdocml: out.c Revision Data ------------- Index: out.c =================================================================== RCS file: /home/cvs/mdocml/mdocml/out.c,v retrieving revision 1.57 retrieving revision 1.58 diff -Lout.c -Lout.c -u -p -r1.57 -r1.58 --- out.c +++ out.c @@ -1,7 +1,7 @@ /* $Id$ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2014 Ingo Schwarze + * Copyright (c) 2011, 2014, 2015 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 @@ -107,11 +107,12 @@ void tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, size_t totalwidth) { + const struct tbl_opts *opts; const struct tbl_dat *dp; struct roffcol *col; size_t ewidth, xwidth; int spans; - int icol, maxcol, necol, nxcol; + int icol, maxcol, necol, nxcol, quirkcol; /* * Allocate the master column specifiers. These will hold the @@ -122,6 +123,7 @@ tblcalc(struct rofftbl *tbl, const struc assert(NULL == tbl->cols); tbl->cols = mandoc_calloc((size_t)sp->opts->cols, sizeof(struct roffcol)); + opts = sp->opts; for (maxcol = -1; sp; sp = sp->next) { if (TBL_SPAN_DATA != sp->pos) @@ -145,7 +147,7 @@ tblcalc(struct rofftbl *tbl, const struc col->flags |= dp->layout->flags; if (dp->layout->flags & TBL_CELL_WIGN) continue; - tblcalc_data(tbl, col, sp->opts, dp); + tblcalc_data(tbl, col, opts, dp); } } @@ -195,13 +197,35 @@ tblcalc(struct rofftbl *tbl, const struc */ if (nxcol && totalwidth) { - xwidth = totalwidth - 3*maxcol - xwidth; + xwidth = totalwidth - xwidth - 3*maxcol - + (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? + 2 : !!opts->lvert + !!opts->rvert); + + /* + * Emulate a bug in GNU tbl width calculation that + * manifests itself for large numbers of x-columns. + * Emulating it for 5 x-columns gives identical + * behaviour for up to 6 x-columns. + */ + + if (nxcol == 5) { + quirkcol = xwidth % nxcol + 2; + if (quirkcol != 3 && quirkcol != 4) + quirkcol = -1; + } else + quirkcol = -1; + + necol = 0; + ewidth = 0; for (icol = 0; icol <= maxcol; icol++) { col = tbl->cols + icol; if ( ! (col->flags & TBL_CELL_WMAX)) continue; - col->width = xwidth / nxcol--; - xwidth -= col->width; + col->width = (double)xwidth * ++necol / nxcol + - ewidth + 0.4995; + if (necol == quirkcol) + col->width--; + ewidth += col->width; } } } -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv