diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-19 23:10:28 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-19 23:10:28 +0000 |
commit | f59d346a3550ec74fef122b653ac3bc9c55cef50 (patch) | |
tree | 5f11aee5532babf3346ac2df8decfdc4435ae871 /tbl_term.c | |
parent | a57333df2a2739b9ad427724c7d2178219cdd0b4 (diff) | |
download | mandoc-f59d346a3550ec74fef122b653ac3bc9c55cef50.tar.gz mandoc-f59d346a3550ec74fef122b653ac3bc9c55cef50.tar.zst mandoc-f59d346a3550ec74fef122b653ac3bc9c55cef50.zip |
Do alignment of non-numeric strings in numeric cells the same way
as groff, and also honour the explicit alignment indicator "\&".
This required an almost complete rewrite of both the measurement
function and the formatter function for numeric cells.
Diffstat (limited to 'tbl_term.c')
-rw-r--r-- | tbl_term.c | 77 |
1 files changed, 51 insertions, 26 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.59 2018/08/19 19:32:21 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.60 2018/08/19 23:10:28 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org> @@ -20,6 +20,7 @@ #include <sys/types.h> #include <assert.h> +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -633,42 +634,66 @@ tbl_number(struct termp *tp, const struct tbl_opts *opts, const struct tbl_dat *dp, const struct roffcol *col) { - char *cp; + const char *cp, *lastdigit, *lastpoint; + size_t intsz, padl, totsz; char buf[2]; - size_t sz, ssz, d, padl; - int i; /* - * See calc_data_number(). Left-pad by taking the offset of our - * and the maximum decimal; right-pad by the remaining amount. + * Almost the same code as in tblcalc_number(): + * First find the position of the decimal point. */ assert(dp->string); + lastdigit = lastpoint = NULL; + for (cp = dp->string; cp[0] != '\0'; cp++) { + if (cp[0] == '\\' && cp[1] == '&') { + lastdigit = lastpoint = cp; + break; + } else if (cp[0] == opts->decimal && + (isdigit((unsigned char)cp[1]) || + (cp > dp->string && isdigit((unsigned char)cp[-1])))) + lastpoint = cp; + else if (isdigit((unsigned char)cp[0])) + lastdigit = cp; + } + + /* Then measure both widths. */ - sz = term_strlen(tp, dp->string); + padl = 0; + totsz = term_strlen(tp, dp->string); + if (lastdigit != NULL) { + if (lastpoint == NULL) + lastpoint = lastdigit + 1; + intsz = 0; + buf[1] = '\0'; + for (cp = dp->string; cp < lastpoint; cp++) { + buf[0] = cp[0]; + intsz += term_strlen(tp, buf); + } - buf[0] = opts->decimal; - buf[1] = '\0'; + /* + * Pad left to match the decimal position, + * but avoid exceeding the total column width. + */ - if ((cp = strrchr(dp->string, opts->decimal)) != NULL) { - for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { - buf[0] = dp->string[i]; - ssz += term_strlen(tp, buf); + if (col->decimal > intsz && col->width > totsz) { + padl = col->decimal - intsz; + if (padl + totsz > col->width) + padl = col->width - totsz; } - d = ssz; - } else - d = sz; - - if (col->decimal > d && col->width > sz) { - padl = col->decimal - d; - if (padl + sz > col->width) - padl = col->width - sz; - tbl_char(tp, ASCII_NBRSP, padl); - } else - padl = 0; + + /* If it is not a number, simply center the string. */ + + } else if (col->width > totsz) + padl = (col->width - totsz) / 2; + + tbl_char(tp, ASCII_NBRSP, padl); tbl_word(tp, dp); - if (col->width > sz + padl) - tbl_char(tp, ASCII_NBRSP, col->width - sz - padl); + + /* Pad right to fill the column. */ + + if (col->width > padl + totsz) + tbl_char(tp, ASCII_NBRSP, col->width - padl - totsz); } static void |