=================================================================== RCS file: /cvs/mandoc/out.c,v retrieving revision 1.66 retrieving revision 1.69 diff -u -p -r1.66 -r1.69 --- mandoc/out.c 2017/06/12 20:14:18 1.66 +++ mandoc/out.c 2017/06/15 00:27:52 1.69 @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.66 2017/06/12 20:14:18 schwarze Exp $ */ +/* $Id: out.c,v 1.69 2017/06/15 00:27:52 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze @@ -85,10 +85,8 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof case 'v': dst->unit = SCALE_VS; break; - case '\0': - endptr--; - /* FALLTHROUGH */ default: + endptr--; if (SCALE_MAX == def) return NULL; dst->unit = def; @@ -157,8 +155,10 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp if (col->width < dp->layout->width) col->width = dp->layout->width; tblcalc_data(tbl, col, opts, dp, - rmargin && dp->block ? - rmargin / (sp->opts->cols + 1) : 0); + dp->block == 0 ? 0 : + dp->layout->width ? dp->layout->width : + rmargin ? (rmargin + sp->opts->cols / 2) + / (sp->opts->cols + 1) : 0); } }