===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_term.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -c -r1.45 -r1.46
*** src/usr.bin/mandoc/tbl_term.c	2017/07/31 16:14:04	1.45
--- src/usr.bin/mandoc/tbl_term.c	2018/08/18 16:44:52	1.46
***************
*** 1,7 ****
! /*	$OpenBSD: tbl_term.c,v 1.45 2017/07/31 16:14:04 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2011,2012,2014,2015,2017 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: tbl_term.c,v 1.46 2018/08/18 16:44:52 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2011-2018 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
***************
*** 619,625 ****
  {
  	char		*cp;
  	char		 buf[2];
! 	size_t		 sz, psz, ssz, d, padl;
  	int		 i;
  
  	/*
--- 619,625 ----
  {
  	char		*cp;
  	char		 buf[2];
! 	size_t		 sz, ssz, d, padl;
  	int		 i;
  
  	/*
***************
*** 634,649 ****
  	buf[0] = opts->decimal;
  	buf[1] = '\0';
  
- 	psz = term_strlen(tp, buf);
- 
  	if ((cp = strrchr(dp->string, opts->decimal)) != NULL) {
  		for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
  			buf[0] = dp->string[i];
  			ssz += term_strlen(tp, buf);
  		}
! 		d = ssz + psz;
  	} else
! 		d = sz + psz;
  
  	if (col->decimal > d && col->width > sz) {
  		padl = col->decimal - d;
--- 634,647 ----
  	buf[0] = opts->decimal;
  	buf[1] = '\0';
  
  	if ((cp = strrchr(dp->string, opts->decimal)) != NULL) {
  		for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
  			buf[0] = dp->string[i];
  			ssz += term_strlen(tp, buf);
  		}
! 		d = ssz;
  	} else
! 		d = sz;
  
  	if (col->decimal > d && col->width > sz) {
  		padl = col->decimal - d;