diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-06-30 12:27:55 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-06-30 12:27:55 +0000 |
| commit | 7124f05f10769bae30b3b76cc9d89f104c9e2f0c (patch) | |
| tree | a5ce0023a6e63236e0551aaddbf4312638683d82 /term_ascii.c | |
| parent | 66db27cbc1171f6264ee87392d5a74841a0eae40 (diff) | |
| download | mandoc-7124f05f10769bae30b3b76cc9d89f104c9e2f0c.tar.gz mandoc-7124f05f10769bae30b3b76cc9d89f104c9e2f0c.tar.zst mandoc-7124f05f10769bae30b3b76cc9d89f104c9e2f0c.zip | |
Move term_hspan() calculation into the output devices, where it belongs.
Diffstat (limited to 'term_ascii.c')
| -rw-r--r-- | term_ascii.c | 65 |
1 files changed, 57 insertions, 8 deletions
diff --git a/term_ascii.c b/term_ascii.c index 3ab625a2..7c263cda 100644 --- a/term_ascii.c +++ b/term_ascii.c @@ -1,4 +1,4 @@ -/* $Id: term_ascii.c,v 1.6 2010/06/25 19:50:23 kristaps Exp $ */ +/* $Id: term_ascii.c,v 1.7 2010/06/30 12:27:55 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -30,12 +30,14 @@ #include "term.h" #include "main.h" -static void ascii_endline(struct termp *); -static void ascii_letter(struct termp *, char); -static void ascii_begin(struct termp *); +static size_t ascii_hspan(const struct termp *, + const struct roffsu *); +static size_t ascii_width(const struct termp *, char); static void ascii_advance(struct termp *, size_t); +static void ascii_begin(struct termp *); static void ascii_end(struct termp *); -static size_t ascii_width(const struct termp *, char); +static void ascii_endline(struct termp *); +static void ascii_letter(struct termp *, char); void * @@ -51,12 +53,13 @@ ascii_alloc(char *outopts) p->tabwidth = 5; p->defrmargin = 78; - p->type = TERMTYPE_CHAR; - p->letter = ascii_letter; + p->advance = ascii_advance; p->begin = ascii_begin; p->end = ascii_end; p->endline = ascii_endline; - p->advance = ascii_advance; + p->hspan = ascii_hspan; + p->letter = ascii_letter; + p->type = TERMTYPE_CHAR; p->width = ascii_width; toks[0] = "width"; @@ -140,3 +143,49 @@ ascii_advance(struct termp *p, size_t len) for (i = 0; i < len; i++) putchar(' '); } + + +/* ARGSUSED */ +static size_t +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. + */ + + switch (su->unit) { + case (SCALE_CM): + r = 4 * su->scale; + break; + case (SCALE_IN): + r = 10 * su->scale; + break; + case (SCALE_PC): + r = (10 * su->scale) / 6; + break; + case (SCALE_PT): + r = (10 * su->scale) / 72; + break; + case (SCALE_MM): + r = su->scale / 1000; + break; + case (SCALE_VS): + r = su->scale * 2 - 1; + break; + default: + r = su->scale; + break; + } + + /* Explicitly disallow negative values. */ + + if (r < 0.0) + r = 0.0; + + return((size_t)/* LINTED */ + r); +} + |