===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.250
retrieving revision 1.256
diff -u -p -r1.250 -r1.256
--- mandoc/term.c	2015/09/21 13:25:00	1.250
+++ mandoc/term.c	2016/01/07 21:03:54	1.256
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.250 2015/09/21 13:25:00 schwarze Exp $ */
+/*	$Id: term.c,v 1.256 2016/01/07 21:03:54 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -365,7 +365,7 @@ term_fontpush(struct termp *p, enum termfont f)
 	if (++p->fonti == p->fontsz) {
 		p->fontsz += 8;
 		p->fontq = mandoc_reallocarray(p->fontq,
-		    p->fontsz, sizeof(enum termfont *));
+		    p->fontsz, sizeof(*p->fontq));
 	}
 	p->fontq[p->fonti] = f;
 }
@@ -454,12 +454,11 @@ term_word(struct termp *p, const char *word)
 			break;
 		case ESCAPE_SPECIAL:
 			if (p->enc == TERMENC_ASCII) {
-				cp = mchars_spec2str(p->symtab,
-				    seq, sz, &ssz);
+				cp = mchars_spec2str(seq, sz, &ssz);
 				if (cp != NULL)
 					encode(p, cp, ssz);
 			} else {
-				uc = mchars_spec2cp(p->symtab, seq, sz);
+				uc = mchars_spec2cp(seq, sz);
 				if (uc > 0)
 					encode1(p, uc);
 			}
@@ -474,7 +473,6 @@ term_word(struct termp *p, const char *word)
 			term_fontrepl(p, TERMFONT_BI);
 			continue;
 		case ESCAPE_FONT:
-			/* FALLTHROUGH */
 		case ESCAPE_FONTROMAN:
 			term_fontrepl(p, TERMFONT_NONE);
 			continue;
@@ -566,7 +564,7 @@ encode1(struct termp *p, int c)
 	if (p->col + 7 >= p->maxcols)
 		adjbuf(p, p->col + 7);
 
-	f = (c == ASCII_HYPH || isgraph(c)) ?
+	f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ?
 	    p->fontq[p->fonti] : TERMFONT_NONE;
 
 	if (p->flags & TERMP_BACKBEFORE) {
@@ -644,7 +642,7 @@ size_t
 term_len(const struct termp *p, size_t sz)
 {
 
-	return((*p->width)(p, ' ') * sz);
+	return (*p->width)(p, ' ') * sz;
 }
 
 static size_t
@@ -653,9 +651,9 @@ cond_width(const struct termp *p, int c, int *skip)
 
 	if (*skip) {
 		(*skip) = 0;
-		return(0);
+		return 0;
 	} else
-		return((*p->width)(p, c));
+		return (*p->width)(p, c);
 }
 
 size_t
@@ -701,13 +699,11 @@ term_strlen(const struct termp *p, const char *cp)
 				break;
 			case ESCAPE_SPECIAL:
 				if (p->enc == TERMENC_ASCII) {
-					rhs = mchars_spec2str(p->symtab,
-					    seq, ssz, &rsz);
+					rhs = mchars_spec2str(seq, ssz, &rsz);
 					if (rhs != NULL)
 						break;
 				} else {
-					uc = mchars_spec2cp(p->symtab,
-					    seq, ssz);
+					uc = mchars_spec2cp(seq, ssz);
 					if (uc > 0)
 						sz += cond_width(p, uc, &skip);
 				}
@@ -771,15 +767,13 @@ term_strlen(const struct termp *p, const char *cp)
 		case ASCII_HYPH:
 			sz += cond_width(p, '-', &skip);
 			cp++;
-			/* FALLTHROUGH */
-		case ASCII_BREAK:
 			break;
 		default:
 			break;
 		}
 	}
 
-	return(sz);
+	return sz;
 }
 
 int
@@ -811,7 +805,6 @@ term_vspan(const struct termp *p, const struct roffsu 
 		r = su->scale / 12.0;
 		break;
 	case SCALE_EN:
-		/* FALLTHROUGH */
 	case SCALE_EM:
 		r = su->scale * 0.6;
 		break;
@@ -820,10 +813,9 @@ term_vspan(const struct termp *p, const struct roffsu 
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 	ri = r > 0.0 ? r + 0.4995 : r - 0.4995;
-	return(ri < 66 ? ri : 1);
+	return ri < 66 ? ri : 1;
 }
 
 /*
@@ -833,5 +825,5 @@ int
 term_hspan(const struct termp *p, const struct roffsu *su)
 {
 
-	return((*p->hspan)(p, su));
+	return (*p->hspan)(p, su);
 }