===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/out.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/mandoc/out.c	2017/06/27 18:23:29	1.42
--- src/usr.bin/mandoc/out.c	2018/08/18 16:44:52	1.43
***************
*** 1,7 ****
! /*	$OpenBSD: out.c,v 1.42 2017/06/27 18:23:29 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2011, 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: 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>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 318,324 ****
  		const struct tbl_opts *opts, const struct tbl_dat *dp)
  {
  	int		 i;
! 	size_t		 sz, psz, ssz, d;
  	const char	*str;
  	char		*cp;
  	char		 buf[2];
--- 318,324 ----
  		const struct tbl_opts *opts, const struct tbl_dat *dp)
  {
  	int		 i;
! 	size_t		 sz, ssz, d;
  	const char	*str;
  	char		*cp;
  	char		 buf[2];
***************
*** 340,356 ****
  	buf[0] = opts->decimal;
  	buf[1] = '\0';
  
- 	psz = (*tbl->slen)(buf, tbl->arg);
- 
  	if (NULL != (cp = strrchr(str, opts->decimal))) {
  		buf[1] = '\0';
  		for (ssz = 0, i = 0; cp != &str[i]; i++) {
  			buf[0] = str[i];
  			ssz += (*tbl->slen)(buf, tbl->arg);
  		}
! 		d = ssz + psz;
  	} else
! 		d = sz + psz;
  
  	/* Adjust the settings for this column. */
  
--- 340,354 ----
  	buf[0] = opts->decimal;
  	buf[1] = '\0';
  
  	if (NULL != (cp = strrchr(str, opts->decimal))) {
  		buf[1] = '\0';
  		for (ssz = 0, i = 0; cp != &str[i]; i++) {
  			buf[0] = str[i];
  			ssz += (*tbl->slen)(buf, tbl->arg);
  		}
! 		d = ssz;
  	} else
! 		d = sz;
  
  	/* Adjust the settings for this column. */