===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.260
retrieving revision 1.262
diff -u -p -r1.260 -r1.262
--- mandoc/term.c	2017/05/07 17:31:45	1.260
+++ mandoc/term.c	2017/06/02 19:21:23	1.262
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.260 2017/05/07 17:31:45 schwarze Exp $ */
+/*	$Id: term.c,v 1.262 2017/06/02 19:21:23 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -400,10 +400,11 @@ term_fontpop(struct termp *p)
 void
 term_word(struct termp *p, const char *word)
 {
+	struct roffsu	 su;
 	const char	 nbrsp[2] = { ASCII_NBRSP, 0 };
 	const char	*seq, *cp;
 	int		 sz, uc;
-	size_t		 ssz;
+	size_t		 csz, lsz, ssz;
 	enum mandoc_esc	 esc;
 
 	if ( ! (TERMP_NOSPACE & p->flags)) {
@@ -487,6 +488,83 @@ term_word(struct termp *p, const char *word)
 				p->flags &= ~TERMP_BACKAFTER;
 			else if (*word == '\0')
 				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)
+				while (uc-- > 0)
+					bufferc(p, ASCII_NBRSP);
+			else if (p->col > (size_t)(-uc))
+				p->col += uc;
+			else {
+				uc += p->col;
+				p->col = 0;
+				if (p->offset > (size_t)(-uc)) {
+					p->ti += uc;
+					p->offset += uc;
+				} else {
+					p->ti -= p->offset;
+					p->offset = 0;
+				}
+			}
+			continue;
+		case ESCAPE_HLINE:
+			if (a2roffsu(seq, &su, SCALE_EM) == 0)
+				continue;
+			uc = term_hspan(p, &su) / 24;
+			if (uc <= 0) {
+				if (p->rmargin <= p->offset)
+					continue;
+				lsz = p->rmargin - p->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++;
+				esc = mandoc_escape(&seq, &cp, &sz);
+				switch (esc) {
+				case ESCAPE_UNICODE:
+					uc = mchars_num2uc(cp + 1, sz - 1);
+					break;
+				case ESCAPE_NUMBERED:
+					uc = mchars_num2char(cp, sz);
+					break;
+				case ESCAPE_SPECIAL:
+					uc = mchars_spec2cp(cp, sz);
+					break;
+				default:
+					uc = -1;
+					break;
+				}
+			} else
+				uc = *seq;
+			if (uc < 0x20 || (uc > 0x7E && uc < 0xA0))
+				uc = '_';
+			if (p->enc == TERMENC_ASCII) {
+				cp = ascii_uc2str(uc);
+				csz = term_strlen(p, cp);
+				ssz = strlen(cp);
+			} else
+				csz = (*p->width)(p, uc);
+			while (lsz >= csz) {
+				if (p->enc == TERMENC_ASCII)
+					encode(p, cp, ssz);
+				else
+					encode1(p, uc);
+				lsz -= csz;
+			}
 			continue;
 		case ESCAPE_SKIPCHAR:
 			p->flags |= TERMP_BACKAFTER;