aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/out.c
diff options
context:
space:
mode:
Diffstat (limited to 'out.c')
-rw-r--r--out.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/out.c b/out.c
index aff35583..22cdfbba 100644
--- a/out.c
+++ b/out.c
@@ -1,7 +1,7 @@
-/* $Id: out.c,v 1.62 2015/10/12 00:08:16 schwarze Exp $ */
+/* $Id: out.c,v 1.63 2017/05/01 20:54:59 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -197,9 +197,12 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
*/
if (nxcol && totalwidth) {
- xwidth = totalwidth - xwidth - 3*maxcol -
+ xwidth += 3*maxcol +
(opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?
2 : !!opts->lvert + !!opts->rvert);
+ if (xwidth >= totalwidth)
+ return;
+ xwidth = totalwidth - xwidth;
/*
* Emulate a bug in GNU tbl width calculation that