===================================================================
RCS file: /cvs/mandoc/tbl_term.c,v
retrieving revision 1.37
retrieving revision 1.42
diff -u -p -r1.37 -r1.42
--- mandoc/tbl_term.c	2015/01/30 17:32:16	1.37
+++ mandoc/tbl_term.c	2015/10/06 18:32:20	1.42
@@ -1,4 +1,4 @@
-/*	$Id: tbl_term.c,v 1.37 2015/01/30 17:32:16 schwarze Exp $ */
+/*	$Id: tbl_term.c,v 1.42 2015/10/06 18:32:20 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -47,14 +47,14 @@ static size_t
 term_tbl_strlen(const char *p, void *arg)
 {
 
-	return(term_strlen((const struct termp *)arg, p));
+	return term_strlen((const struct termp *)arg, p);
 }
 
 static size_t
 term_tbl_len(size_t sz, void *arg)
 {
 
-	return(term_len((const struct termp *)arg, sz));
+	return term_len((const struct termp *)arg, sz);
 }
 
 void
@@ -82,8 +82,6 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 	 */
 
 	if (tp->tbl.cols == NULL) {
-		term_flushln(tp);
-
 		tp->tbl.len = term_tbl_len;
 		tp->tbl.slen = term_tbl_strlen;
 		tp->tbl.arg = tp;
@@ -305,7 +303,6 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 }
 
@@ -414,9 +411,9 @@ tbl_number(struct termp *tp, const struct tbl_opts *op
 static void
 tbl_word(struct termp *tp, const struct tbl_dat *dp)
 {
-	const void	*prev_font;
+	int		 prev_font;
 
-	prev_font = term_fontq(tp);
+	prev_font = tp->fonti;
 	if (dp->layout->flags & TBL_CELL_BOLD)
 		term_fontpush(tp, TERMFONT_BOLD);
 	else if (dp->layout->flags & TBL_CELL_ITALIC)