diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-05-14 17:54:42 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-05-14 17:54:42 +0000 |
| commit | 46b6fb73529e79de5452e9d25e26a7c8b83bd79f (patch) | |
| tree | 9fdb49fd81c23696e74be71a6af9c0ad9db52d88 /term_ps.c | |
| parent | e3ef897e17cf74a686ec213e362a869d4a9b77f0 (diff) | |
| download | mandoc-46b6fb73529e79de5452e9d25e26a7c8b83bd79f.tar.gz mandoc-46b6fb73529e79de5452e9d25e26a7c8b83bd79f.tar.zst mandoc-46b6fb73529e79de5452e9d25e26a7c8b83bd79f.zip | |
Make character engine (-Tascii, -Tpdf, -Tps) ready for Unicode: make buffer
consist of type "int". This will take more work (especially in encode and
friends), but this is a strong start. This commit also consists of some
harmless lint fixes.
Diffstat (limited to 'term_ps.c')
| -rw-r--r-- | term_ps.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.48 2011/03/17 08:49:34 kristaps Exp $ */ +/* $Id: term_ps.c,v 1.49 2011/05/14 17:54:42 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -373,14 +373,14 @@ ps_growbuf(struct termp *p, size_t sz) static double ps_hspan(const struct termp *, const struct roffsu *); -static size_t ps_width(const struct termp *, char); +static size_t ps_width(const struct termp *, int); static void ps_advance(struct termp *, size_t); static void ps_begin(struct termp *); static void ps_closepage(struct termp *); static void ps_end(struct termp *); static void ps_endline(struct termp *); static void ps_fclose(struct termp *); -static void ps_letter(struct termp *, char); +static void ps_letter(struct termp *, int); static void ps_pclose(struct termp *); static void ps_pletter(struct termp *, int); static void ps_printf(struct termp *, const char *, ...); @@ -963,9 +963,12 @@ ps_fclose(struct termp *p) static void -ps_letter(struct termp *p, char c) +ps_letter(struct termp *p, int arg) { - char cc; + char cc, c; + + /* LINTED */ + c = arg >= 128 || arg <= 0 ? '?' : arg; /* * State machine dictates whether to buffer the last character @@ -1095,14 +1098,14 @@ ps_setfont(struct termp *p, enum termfont f) /* ARGSUSED */ static size_t -ps_width(const struct termp *p, char c) +ps_width(const struct termp *p, int c) { if (c <= 32 || c - 32 >= MAXCHAR) return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx); c -= 32; - return((size_t)fonts[(int)TERMFONT_NONE].gly[(int)c].wx); + return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx); } |