Do not mistreat empty arguments to font alternating macros

[mandoc.git] / tbl_term.c

diff --git a/tbl_term.c b/tbl_term.c
index 455a158d5aa83130b8bfe93e8cede50983e52ac6..1276776668c988227cc09093b1191f0a958f0de7 100644 (file)
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -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.40 2015/03/06 15:48:53 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -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;
@@ -414,9 +412,9 @@ tbl_number(struct termp *tp, const struct tbl_opts *opts,
 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)