Re: tbl(7) and preceding line boundaries

[Ingo Schwarze <schwarze@usta.de>]

Hi Kristaps,

Kristaps Dzonsons wrote on Fri, Mar 06, 2015 at 10:43:43AM +0100:

> I'm able to fool mandoc(1) into arbitrarily stretching its page boundary
> by the enclosed graph.  In short, it seems that tbl(7) code directly
> following free-form text causes a flush of the text after the right
> margin is relieved.

Looking at the history of tbl_term.c, that seems to be broken since
basically forever, at least since 2011.

> Ideas?

Do you agree with the following simple fix?

It doesn't seem important enough to make the OpenBSD 5.7 release,
though.  If you agree, i would commit to bsd.lv now and to OpenBSD
after unlock.

Yours,
  Ingo


Index: tbl_term.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/tbl_term.c,v
retrieving revision 1.26
diff -u -p -r1.26 tbl_term.c
--- tbl_term.c	31 Jan 2015 00:11:52 -0000	1.26
+++ tbl_term.c	6 Mar 2015 10:46:19 -0000
@@ -64,6 +64,9 @@ term_tbl(struct termp *tp, const struct 
 	size_t			 rmargin, maxrmargin, tsz;
 	int			 ic, horiz, spans, vert;
 
+	if (tp->tbl.cols == NULL)
+		term_flushln(tp);
+
 	rmargin = tp->rmargin;
 	maxrmargin = tp->maxrmargin;
 
@@ -80,8 +83,6 @@ term_tbl(struct termp *tp, const struct 
 	 */
 
 	if (tp->tbl.cols == NULL) {
-		term_flushln(tp);
-
 		tp->tbl.len = term_tbl_len;
 		tp->tbl.slen = term_tbl_strlen;
 		tp->tbl.arg = tp;
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv