diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-04 13:14:26 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-04 13:14:26 +0000 |
| commit | e1e53a5041474d08cef466b93f70aa52c798a0ae (patch) | |
| tree | 19eaa1a9c8064fbb87c05e5b832814f02ef9d1d0 /tbl_term.c | |
| parent | 543980ff972d5b50a51593a306420bb65fbf6b61 (diff) | |
| download | mandoc-e1e53a5041474d08cef466b93f70aa52c798a0ae.tar.gz mandoc-e1e53a5041474d08cef466b93f70aa52c798a0ae.tar.zst mandoc-e1e53a5041474d08cef466b93f70aa52c798a0ae.zip | |
Fix spacing for tables to use term_len(). Also make term.c properly
recode ASCII_HYPHEN and ASCII_NBRSP before passing back for widths.
Diffstat (limited to 'tbl_term.c')
| -rw-r--r-- | tbl_term.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.7 2011/01/04 12:06:21 kristaps Exp $ */ +/* $Id: tbl_term.c,v 1.8 2011/01/04 13:14:26 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -206,9 +206,6 @@ tbl_hframe(struct termp *tp, const struct tbl_span *sp) TBL_OPT_DBOX & sp->tbl->opts)) return; - tp->flags |= TERMP_NONOSPACE; - tp->flags |= TERMP_NOSPACE; - /* * Print out the horizontal part of a frame or double frame. A * double frame has an unbroken `-' outer line the width of the @@ -465,7 +462,7 @@ tbl_calc_data(struct termp *tp, const struct tbl *tbl, case (TBL_CELL_HORIZ): /* FALLTHROUGH */ case (TBL_CELL_DHORIZ): - tblp->width = 1; + tblp->width = term_len(tp, 1); break; case (TBL_CELL_LONG): /* FALLTHROUGH */ @@ -536,7 +533,7 @@ tbl_calc_data_literal(struct termp *tp, const struct tbl_dat *dp, struct termp_tbl *tblp) { - int sz, bufsz; + int sz, bufsz, spsz; /* * Calculate our width and use the spacing, with a minimum @@ -551,16 +548,19 @@ tbl_calc_data_literal(struct termp *tp, case (TBL_CELL_LONG): /* FALLTHROUGH */ case (TBL_CELL_CENTRE): - bufsz = 2; + bufsz = term_len(tp, 2); break; default: - bufsz = 1; + bufsz = term_len(tp, 1); break; } + spsz = 0; if (dp->layout->spacing) - bufsz = bufsz > dp->layout->spacing ? - bufsz : dp->layout->spacing; + spsz = term_len(tp, dp->layout->spacing); + + if (spsz) + bufsz = bufsz > spsz ? bufsz : spsz; sz += bufsz; if (tblp->width < sz) |