diff options
Diffstat (limited to 'usr.bin/mandoc')
| -rw-r--r-- | usr.bin/mandoc/out.c | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/tbl_term.c | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/usr.bin/mandoc/out.c b/usr.bin/mandoc/out.c index ffa06345be7..24f215792ff 100644 --- a/usr.bin/mandoc/out.c +++ b/usr.bin/mandoc/out.c @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.10 2011/01/16 01:11:50 schwarze Exp $ */ +/* $Id: out.c,v 1.11 2011/01/25 12:07:26 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -481,7 +481,7 @@ tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, case (TBL_CELL_LONG): /* FALLTHROUGH */ case (TBL_CELL_CENTRE): - bufsz = (*tbl->len)(2, tbl->arg); + bufsz = (*tbl->len)(1, tbl->arg); break; default: bufsz = (*tbl->len)(1, tbl->arg); diff --git a/usr.bin/mandoc/tbl_term.c b/usr.bin/mandoc/tbl_term.c index 53556e5ff24..c481e50fe60 100644 --- a/usr.bin/mandoc/tbl_term.c +++ b/usr.bin/mandoc/tbl_term.c @@ -1,6 +1,7 @@ -/* $Id: tbl_term.c,v 1.7 2011/01/16 01:11:50 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.8 2011/01/25 12:07:26 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@kth.se> + * Copyright (c) 2011 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 @@ -193,6 +194,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp) width = tp->tbl.cols[hp->ident].width; switch (hp->pos) { case (TBL_HEAD_DATA): + if (hp->next) + width += 2; tbl_char(tp, c, width); break; case (TBL_HEAD_DVERT): @@ -367,11 +370,11 @@ tbl_literal(struct termp *tp, const struct tbl_dat *dp, padr = col->width - term_strlen(tp, dp->string) - ssz; break; case (TBL_CELL_CENTRE): - padl = col->width - term_strlen(tp, dp->string); - if (padl % 2) - padr++; - padl /= 2; - padr += padl; + padr = col->width - term_strlen(tp, dp->string); + if (3 > padr) + break; + padl = (padr - 1) / 2; + padr -= padl; break; case (TBL_CELL_RIGHT): padl = col->width - term_strlen(tp, dp->string); @@ -383,7 +386,7 @@ tbl_literal(struct termp *tp, const struct tbl_dat *dp, tbl_char(tp, ASCII_NBRSP, padl); term_word(tp, dp->string); - tbl_char(tp, ASCII_NBRSP, padr); + tbl_char(tp, ASCII_NBRSP, padr + 2); } static void |