diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2014-08-13 20:34:29 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2014-08-13 20:34:29 +0000 |
| commit | bafbe43e726d9ae496298a955d858961da9e8ba4 (patch) | |
| tree | 4fe5bcd60931d948647fc4ccaaaf881845e51b33 /term_ascii.c | |
| parent | 08b7f86267663883d71e98c502652ec334c232bc (diff) | |
| download | mandoc-bafbe43e726d9ae496298a955d858961da9e8ba4.tar.gz mandoc-bafbe43e726d9ae496298a955d858961da9e8ba4.tar.zst mandoc-bafbe43e726d9ae496298a955d858961da9e8ba4.zip | |
Begin cleaning up scaling units.
Start with the horizontal terminal specifiers, making sure that they match
up with troff.
Then move on to PS, PDF, and HTML, noting that we stick to the terminal
default width for "u".
Lastly, fix some completely-wrong documentation and note that we diverge
from troff w/r/t "u".
Diffstat (limited to 'term_ascii.c')
| -rw-r--r-- | term_ascii.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/term_ascii.c b/term_ascii.c index eeea9dbb..a1b445d2 100644 --- a/term_ascii.c +++ b/term_ascii.c @@ -1,4 +1,4 @@ -/* $Id: term_ascii.c,v 1.28 2014/08/10 23:54:41 schwarze Exp $ */ +/* $Id: term_ascii.c,v 1.29 2014/08/13 20:34:29 kristaps Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -230,32 +230,42 @@ ascii_hspan(const struct termp *p, const struct roffsu *su) double r; /* - * Approximate based on character width. These are generated - * entirely by eyeballing the screen, but appear to be correct. + * Approximate based on character width. + * None of these will be actually correct given that an inch on + * the screen depends on character size, terminal, etc., etc. */ - switch (su->unit) { + case SCALE_BU: + r = su->scale * 10.0 / 240.0; + break; case SCALE_CM: - r = su->scale * 4.0; + r = su->scale * 10.0 / 2.54; + break; + case SCALE_FS: + r = su->scale * 2730.666; break; case SCALE_IN: r = su->scale * 10.0; break; + case SCALE_MM: + r = su->scale / 100.0; + break; case SCALE_PC: - r = (su->scale * 10.0) / 6.0; + r = su->scale * 10.0 / 6.0; break; case SCALE_PT: - r = (su->scale * 10.0) / 72.0; - break; - case SCALE_MM: - r = su->scale / 1000.0; + r = su->scale * 10.0 / 72.0; break; case SCALE_VS: r = su->scale * 2.0 - 1.0; break; - default: + case SCALE_EN: + case SCALE_EM: r = su->scale; break; + case SCALE_MAX: + abort(); + break; } return(r); |