aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2015-03-06 11:03:03 +0000
committerIngo Schwarze <schwarze@openbsd.org>2015-03-06 11:03:03 +0000
commita8c51a7fd89f55b9f88e7f100138381d0e99e5b9 (patch)
treeaa0a3dd907686b1e409ae273f29d0c80070c9b88
parent9b1e1a0a8be9129fdf6fcb1a222a78db07fd59e5 (diff)
downloadmandoc-a8c51a7fd89f55b9f88e7f100138381d0e99e5b9.tar.gz
mandoc-a8c51a7fd89f55b9f88e7f100138381d0e99e5b9.tar.zst
mandoc-a8c51a7fd89f55b9f88e7f100138381d0e99e5b9.zip
Flush the line preceding a table before clearing the right margin,
such that that line isn't output with unlimited width. Problem reported and fix OK by kristaps@.
-rw-r--r--tbl_term.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tbl_term.c b/tbl_term.c
index a6354b51..c4702a16 100644
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -1,4 +1,4 @@
-/* $Id: tbl_term.c,v 1.38 2015/01/31 00:12:41 schwarze Exp $ */
+/* $Id: tbl_term.c,v 1.39 2015/03/06 11:03:03 schwarze Exp $ */
/*
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -66,6 +66,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
size_t rmargin, maxrmargin, tsz;
int ic, horiz, spans, vert;
+ if (tp->tbl.cols == NULL)
+ term_flushln(tp);
+
rmargin = tp->rmargin;
maxrmargin = tp->maxrmargin;
@@ -82,8 +85,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;