From d7293bc22cd91ff63e04800adfed0982252d8574 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Fri, 25 Jun 2010 18:53:14 +0000 Subject: Initial chunks for variable-width fonts. Pushes all width calculations in mdoc_term.c and man_term.c down into term.c. This is still not implemented in term.c, although stubs for width calculations are in place. From now on, offset, rmargin, and other layout variables are abstract screen widths. They will resolve to the the familiar values for -Tascii but -Tps will eventually use points instead of chars. --- term_ascii.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'term_ascii.c') diff --git a/term_ascii.c b/term_ascii.c index 84d94648..5dbb196c 100644 --- a/term_ascii.c +++ b/term_ascii.c @@ -1,4 +1,4 @@ -/* $Id: term_ascii.c,v 1.4 2010/06/19 20:46:28 kristaps Exp $ */ +/* $Id: term_ascii.c,v 1.5 2010/06/25 18:53:14 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -35,6 +35,7 @@ static void ascii_letter(struct termp *, char); static void ascii_begin(struct termp *); static void ascii_advance(struct termp *, size_t); static void ascii_end(struct termp *); +static size_t ascii_width(const struct termp *, char); void * @@ -47,12 +48,16 @@ ascii_alloc(char *outopts) if (NULL == (p = term_alloc(TERMENC_ASCII))) return(NULL); + p->tabwidth = 5; + p->defrmargin = 78; + p->type = TERMTYPE_CHAR; p->letter = ascii_letter; p->begin = ascii_begin; p->end = ascii_end; p->endline = ascii_endline; p->advance = ascii_advance; + p->width = ascii_width; toks[0] = "width"; toks[1] = NULL; @@ -74,6 +79,14 @@ ascii_alloc(char *outopts) } +static size_t +ascii_width(const struct termp *p, char c) +{ + + return(1); +} + + void ascii_free(void *arg) { -- cgit v1.2.3