===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -c -r1.127 -r1.128
*** src/usr.bin/mandoc/term.c	2017/06/07 20:01:07	1.127
--- src/usr.bin/mandoc/term.c	2017/06/08 12:54:40	1.128
***************
*** 1,4 ****
! /*	$OpenBSD: term.c,v 1.127 2017/06/07 20:01:07 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.128 2017/06/08 12:54:40 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 477,483 ****
  				p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE);
  			continue;
  		case ESCAPE_HORIZ:
! 			if (a2roffsu(seq, &su, SCALE_EM) == 0)
  				continue;
  			uc = term_hspan(p, &su) / 24;
  			if (uc > 0)
--- 477,483 ----
  				p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE);
  			continue;
  		case ESCAPE_HORIZ:
! 			if (a2roffsu(seq, &su, SCALE_EM) == NULL)
  				continue;
  			uc = term_hspan(p, &su) / 24;
  			if (uc > 0)
***************
*** 498,504 ****
  			}
  			continue;
  		case ESCAPE_HLINE:
! 			if (a2roffsu(seq, &su, SCALE_EM) == 0)
  				continue;
  			uc = term_hspan(p, &su) / 24;
  			if (uc <= 0) {
--- 498,504 ----
  			}
  			continue;
  		case ESCAPE_HLINE:
! 			if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL)
  				continue;
  			uc = term_hspan(p, &su) / 24;
  			if (uc <= 0) {
***************
*** 507,522 ****
  				lsz = p->tcol->rmargin - p->tcol->offset;
  			} else
  				lsz = uc;
! 			while (sz &&
! 			    strchr(" %&()*+-./0123456789:<=>", *seq)) {
! 				seq++;
! 				sz--;
! 			}
! 			if (sz && strchr("cifMmnPpuv", *seq)) {
! 				seq++;
! 				sz--;
! 			}
! 			if (sz == 0)
  				uc = -1;
  			else if (*seq == '\\') {
  				seq++;
--- 507,513 ----
  				lsz = p->tcol->rmargin - p->tcol->offset;
  			} else
  				lsz = uc;
! 			if (*seq == '\0')
  				uc = -1;
  			else if (*seq == '\\') {
  				seq++;
***************
*** 737,743 ****
  		default:
  			break;
  		}
! 		if (a2roffsu(wstr, &su, SCALE_MAX))
  			width = term_hspan(p, &su);
  		else
  			iop = 0;
--- 728,734 ----
  		default:
  			break;
  		}
! 		if (a2roffsu(wstr, &su, SCALE_MAX) != NULL)
  			width = term_hspan(p, &su);
  		else
  			iop = 0;