===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/out.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -c -r1.23 -r1.24
*** src/usr.bin/mandoc/out.c	2014/08/12 19:27:57	1.23
--- src/usr.bin/mandoc/out.c	2014/10/14 02:16:02	1.24
***************
*** 1,7 ****
! /*	$Id: out.c,v 1.23 2014/08/12 19:27:57 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2011 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
--- 1,7 ----
! /*	$OpenBSD: out.c,v 1.24 2014/10/14 02:16:02 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2011, 2014 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
***************
*** 137,147 ****
   * used for the actual width calculations.
   */
  void
! tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
  {
  	const struct tbl_dat	*dp;
  	struct roffcol		*col;
  	int			 spans;
  
  	/*
  	 * Allocate the master column specifiers.  These will hold the
--- 137,150 ----
   * used for the actual width calculations.
   */
  void
! tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
! 	size_t totalwidth)
  {
  	const struct tbl_dat	*dp;
  	struct roffcol		*col;
+ 	size_t			 ewidth, xwidth;
  	int			 spans;
+ 	int			 icol, maxcol, necol, nxcol;
  
  	/*
  	 * Allocate the master column specifiers.  These will hold the
***************
*** 153,159 ****
  	tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
  	    sizeof(struct roffcol));
  
! 	for ( ; sp; sp = sp->next) {
  		if (TBL_SPAN_DATA != sp->pos)
  			continue;
  		spans = 1;
--- 156,162 ----
  	tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
  	    sizeof(struct roffcol));
  
! 	for (maxcol = 0; sp; sp = sp->next) {
  		if (TBL_SPAN_DATA != sp->pos)
  			continue;
  		spans = 1;
***************
*** 168,176 ****
  			spans = dp->spans;
  			if (1 < spans)
  				continue;
! 			assert(dp->layout);
! 			col = &tbl->cols[dp->layout->head->ident];
  			tblcalc_data(tbl, col, sp->opts, dp);
  		}
  	}
  }
--- 171,240 ----
  			spans = dp->spans;
  			if (1 < spans)
  				continue;
! 			icol = dp->layout->head->ident;
! 			if (maxcol < icol)
! 				maxcol = icol;
! 			col = tbl->cols + icol;
! 			col->flags |= dp->layout->flags;
! 			if (dp->layout->flags & TBL_CELL_WIGN)
! 				continue;
  			tblcalc_data(tbl, col, sp->opts, dp);
+ 		}
+ 	}
+ 
+ 	/*
+ 	 * 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.
+ 	 */
+ 
+ 	necol = nxcol = 0;
+ 	ewidth = xwidth = 0;
+ 	for (icol = 0; icol <= maxcol; icol++) {
+ 		col = tbl->cols + icol;
+ 		if (col->flags & TBL_CELL_EQUAL) {
+ 			necol++;
+ 			if (ewidth < col->width)
+ 				ewidth = col->width;
+ 		}
+ 		if (col->flags & TBL_CELL_WMAX)
+ 			nxcol++;
+ 		else
+ 			xwidth += col->width;
+ 	}
+ 
+ 	/*
+ 	 * Equalize columns, if requested for any of them.
+ 	 * Update total width of the columns not to maximize.
+ 	 */
+ 
+ 	if (necol) {
+ 		for (icol = 0; icol <= maxcol; icol++) {
+ 			col = tbl->cols + icol;
+ 			if ( ! (col->flags & TBL_CELL_EQUAL))
+ 				continue;
+ 			if (col->width == ewidth)
+ 				continue;
+ 			if (nxcol && totalwidth)
+ 				xwidth += ewidth - col->width;
+ 			col->width = ewidth;
+ 		}
+ 	}
+ 
+ 	/*
+ 	 * If there are any columns to maximize, find the total
+ 	 * available width, deducting 3n margins between columns.
+ 	 * Distribute the available width evenly.
+ 	 */
+ 
+ 	if (nxcol && totalwidth) {
+ 		xwidth = totalwidth - 3*maxcol - xwidth;
+ 		for (icol = 0; icol <= maxcol; icol++) {
+ 			col = tbl->cols + icol;
+ 			if ( ! (col->flags & TBL_CELL_WMAX))
+ 				continue;
+ 			col->width = xwidth / nxcol--;
+ 			xwidth -= col->width;
  		}
  	}
  }