From d1c3ec497dc257f0664a7be13ae195dc58b4e49a Mon Sep 17 00:00:00 2001 From: schwarze Date: Mon, 12 Jun 2017 20:14:03 +0000 Subject: [PATCH] fix column width calculation for text block cells --- usr.bin/mandoc/out.c | 31 +++++++++++++++++++------------ usr.bin/mandoc/out.h | 4 ++-- usr.bin/mandoc/tbl_html.c | 4 ++-- usr.bin/mandoc/tbl_term.c | 4 ++-- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/usr.bin/mandoc/out.c b/usr.bin/mandoc/out.c index e9d6e873843..6c67d777884 100644 --- a/usr.bin/mandoc/out.c +++ b/usr.bin/mandoc/out.c @@ -1,4 +1,4 @@ -/* $OpenBSD: out.c,v 1.37 2017/06/08 18:11:15 schwarze Exp $ */ +/* $OpenBSD: out.c,v 1.38 2017/06/12 20:14:03 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze @@ -103,7 +103,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) */ void tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, - size_t totalwidth) + size_t offset, size_t rmargin) { struct roffsu su; const struct tbl_opts *opts; @@ -154,8 +154,9 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, (*tbl->sulen)(&su, tbl->arg); if (col->width < dp->layout->width) col->width = dp->layout->width; - tblcalc_data(tbl, col, opts, dp, dp->block ? - totalwidth / (sp->opts->cols + 1) : 0); + tblcalc_data(tbl, col, opts, dp, + rmargin && dp->block ? + rmargin / (sp->opts->cols + 1) : 0); } } @@ -192,7 +193,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, continue; if (col->width == ewidth) continue; - if (nxcol && totalwidth) + if (nxcol && rmargin) xwidth += ewidth - col->width; col->width = ewidth; } @@ -204,13 +205,13 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, * Distribute the available width evenly. */ - if (nxcol && totalwidth) { + if (nxcol && rmargin) { xwidth += 3*maxcol + (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? 2 : !!opts->lvert + !!opts->rvert); - if (xwidth >= totalwidth) + if (rmargin <= offset + xwidth) return; - xwidth = totalwidth - xwidth; + xwidth = rmargin - offset - xwidth; /* * Emulate a bug in GNU tbl width calculation that @@ -279,11 +280,13 @@ tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, const char *str; /* Beginning of the first line. */ const char *beg; /* Beginning of the current line. */ char *end; /* End of the current line. */ - size_t sz; /* Length of the current line. */ + size_t lsz; /* Length of the current line. */ + size_t wsz; /* Length of the current word. */ if (dp->string == NULL || *dp->string == '\0') return; str = mw ? mandoc_strdup(dp->string) : dp->string; + lsz = 0; for (beg = str; beg != NULL && *beg != '\0'; beg = end) { end = mw ? strchr(beg, ' ') : NULL; if (end != NULL) { @@ -291,9 +294,13 @@ tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, while (*end == ' ') end++; } - sz = (*tbl->slen)(beg, tbl->arg); - if (col->width < sz) - col->width = sz; + wsz = (*tbl->slen)(beg, tbl->arg); + if (mw && lsz && lsz + 1 + wsz <= mw) + lsz += 1 + wsz; + else + lsz = wsz; + if (col->width < lsz) + col->width = lsz; } if (mw) free((void *)str); diff --git a/usr.bin/mandoc/out.h b/usr.bin/mandoc/out.h index 7e93f1c0700..a0170d97332 100644 --- a/usr.bin/mandoc/out.h +++ b/usr.bin/mandoc/out.h @@ -1,4 +1,4 @@ -/* $OpenBSD: out.h,v 1.20 2017/06/08 18:11:15 schwarze Exp $ */ +/* $OpenBSD: out.h,v 1.21 2017/06/12 20:14:03 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014, 2017 Ingo Schwarze @@ -68,4 +68,4 @@ struct tbl_span; const char *a2roffsu(const char *, struct roffsu *, enum roffscale); void tblcalc(struct rofftbl *tbl, - const struct tbl_span *, size_t); + const struct tbl_span *, size_t, size_t); diff --git a/usr.bin/mandoc/tbl_html.c b/usr.bin/mandoc/tbl_html.c index c839d510ef9..b753fbabfa5 100644 --- a/usr.bin/mandoc/tbl_html.c +++ b/usr.bin/mandoc/tbl_html.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tbl_html.c,v 1.16 2017/06/08 18:11:15 schwarze Exp $ */ +/* $OpenBSD: tbl_html.c,v 1.17 2017/06/12 20:14:03 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2017 Ingo Schwarze @@ -81,7 +81,7 @@ html_tblopen(struct html *h, const struct tbl_span *sp) h->tbl.len = html_tbl_len; h->tbl.slen = html_tbl_strlen; h->tbl.sulen = html_tbl_sulen; - tblcalc(&h->tbl, sp, 0); + tblcalc(&h->tbl, sp, 0, 0); } assert(NULL == h->tblt); diff --git a/usr.bin/mandoc/tbl_term.c b/usr.bin/mandoc/tbl_term.c index fdd0e4732b0..f8679b3fb10 100644 --- a/usr.bin/mandoc/tbl_term.c +++ b/usr.bin/mandoc/tbl_term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tbl_term.c,v 1.35 2017/06/12 18:55:42 schwarze Exp $ */ +/* $OpenBSD: tbl_term.c,v 1.36 2017/06/12 20:14:03 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze @@ -85,7 +85,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) tp->tbl.sulen = term_tbl_sulen; tp->tbl.arg = tp; - tblcalc(&tp->tbl, sp, tp->tcol->rmargin - tp->tcol->offset); + tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin); /* Center the table as a whole. */ -- 2.20.1