===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -c -r1.131 -r1.132
*** src/usr.bin/mandoc/term.c	2017/06/14 17:50:43	1.131
--- src/usr.bin/mandoc/term.c	2017/06/14 18:23:26	1.132
***************
*** 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>
--- 1,4 ----
! /*	$OpenBSD: term.c,v 1.132 2017/06/14 18:23:26 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 545,551 ****
  			}
  			continue;
  		case ESCAPE_HLINE:
! 			if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL)
  				continue;
  			uc = term_hen(p, &su);
  			if (uc <= 0) {
--- 545,551 ----
  			}
  			continue;
  		case ESCAPE_HLINE:
! 			if ((cp = a2roffsu(seq, &su, SCALE_EM)) == NULL)
  				continue;
  			uc = term_hen(p, &su);
  			if (uc <= 0) {
***************
*** 554,563 ****
  				lsz = p->tcol->rmargin - p->tcol->offset;
  			} else
  				lsz = uc;
! 			if (*seq == '\0')
  				uc = -1;
! 			else if (*seq == '\\') {
! 				seq++;
  				esc = mandoc_escape(&seq, &cp, &sz);
  				switch (esc) {
  				case ESCAPE_UNICODE:
--- 554,563 ----
  				lsz = p->tcol->rmargin - p->tcol->offset;
  			} else
  				lsz = uc;
! 			if (*cp == seq[-1])
  				uc = -1;
! 			else if (*cp == '\\') {
! 				seq = cp + 1;
  				esc = mandoc_escape(&seq, &cp, &sz);
  				switch (esc) {
  				case ESCAPE_UNICODE:
***************
*** 574,580 ****
  					break;
  				}
  			} else
! 				uc = *seq;
  			if (uc < 0x20 || (uc > 0x7E && uc < 0xA0))
  				uc = '_';
  			if (p->enc == TERMENC_ASCII) {
--- 574,580 ----
  					break;
  				}
  			} else
! 				uc = *cp;
  			if (uc < 0x20 || (uc > 0x7E && uc < 0xA0))
  				uc = '_';
  			if (p->enc == TERMENC_ASCII) {