===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -c -r1.130 -r1.131
*** src/usr.bin/mandoc/term.c	2017/06/14 01:31:19	1.130
--- src/usr.bin/mandoc/term.c	2017/06/14 17:50:43	1.131
***************
*** 1,4 ****
! /*	$OpenBSD: term.c,v 1.130 2017/06/14 01:31:19 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: term.c,v 1.131 2017/06/14 17:50:43 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 526,532 ****
  		case ESCAPE_HORIZ:
  			if (a2roffsu(seq, &su, SCALE_EM) == NULL)
  				continue;
! 			uc = term_hspan(p, &su) / 24;
  			if (uc > 0)
  				while (uc-- > 0)
  					bufferc(p, ASCII_NBRSP);
--- 526,532 ----
  		case ESCAPE_HORIZ:
  			if (a2roffsu(seq, &su, SCALE_EM) == NULL)
  				continue;
! 			uc = term_hen(p, &su);
  			if (uc > 0)
  				while (uc-- > 0)
  					bufferc(p, ASCII_NBRSP);
***************
*** 547,553 ****
  		case ESCAPE_HLINE:
  			if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL)
  				continue;
! 			uc = term_hspan(p, &su) / 24;
  			if (uc <= 0) {
  				if (p->tcol->rmargin <= p->tcol->offset)
  					continue;
--- 547,553 ----
  		case ESCAPE_HLINE:
  			if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL)
  				continue;
! 			uc = term_hen(p, &su);
  			if (uc <= 0) {
  				if (p->tcol->rmargin <= p->tcol->offset)
  					continue;
***************
*** 964,974 ****
  }
  
  /*
!  * Convert a scaling width to basic units, rounding down.
   */
  int
  term_hspan(const struct termp *p, const struct roffsu *su)
  {
  
  	return (*p->hspan)(p, su);
  }
--- 964,988 ----
  }
  
  /*
!  * Convert a scaling width to basic units, rounding towards 0.
   */
  int
  term_hspan(const struct termp *p, const struct roffsu *su)
  {
  
  	return (*p->hspan)(p, su);
+ }
+ 
+ /*
+  * Convert a scaling width to basic units, rounding to closest.
+  */
+ int
+ term_hen(const struct termp *p, const struct roffsu *su)
+ {
+ 	int bu;
+ 
+ 	if ((bu = (*p->hspan)(p, su)) >= 0)
+ 		return (bu + 11) / 24;
+ 	else
+ 		return -((-bu + 11) / 24);
  }