===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/out.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -c -r1.43 -r1.44
*** src/usr.bin/mandoc/out.c	2018/08/18 16:44:52	1.43
--- src/usr.bin/mandoc/out.c	2018/08/18 20:17:58	1.44
***************
*** 1,4 ****
! /*	$OpenBSD: out.c,v 1.43 2018/08/18 16:44:52 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: out.c,v 1.44 2018/08/18 20:17:58 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 166,171 ****
--- 166,172 ----
  	}
  
  	/*
+ 	 * 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.
***************
*** 175,180 ****
--- 176,185 ----
  	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) {
***************
*** 356,365 ****
  		sz += col->decimal - d;
  		d = col->decimal;
  	} else
! 		col->width += d - col->decimal;
  
! 	if (sz > col->width)
! 		col->width = sz;
  	if (d > col->decimal)
  		col->decimal = d;
  }
--- 361,370 ----
  		sz += col->decimal - d;
  		d = col->decimal;
  	} else
! 		col->nwidth += d - col->decimal;
  
! 	if (sz > col->nwidth)
! 		col->nwidth = sz;
  	if (d > col->decimal)
  		col->decimal = d;
  }