This enables variable glyph-width output. The checkin will be followed

by a [functionless] clean-up in term_ps.c, but this makes the
appropriate changes to "enable" initial proportional-width functionality
in term.c and fixes some areas of term_ps.c that were causing errors.

2 files changed, 29 insertions, 28 deletions

diff --git a/term.c b/term.c
index 2dbe73b5..31e91e92 100644
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.152 2010/06/28 09:48:44 kristaps Exp $ */
+/*	$Id: term.c,v 1.153 2010/06/28 22:46:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -195,9 +195,11 @@ term_flushln(struct termp *p)
 				if (vend > vis && vend < bp &&
 				    ASCII_HYPH == p->buf[j])
 					jhy = j;
-				vend++;
-			} else
-				vend--;
+				vend += (*p->width)(p, p->buf[j]);
+			} else {
+				assert(j);
+				vend -= (*p->width)(p, p->buf[j - 1]);
+			}
 		}
 
 		/*
@@ -237,13 +239,13 @@ term_flushln(struct termp *p)
 				break;
 			if (' ' == p->buf[i]) {
 				while (' ' == p->buf[i]) {
-					vbl++;
+					vbl += (*p->width)(p, p->buf[i]);
 					i++;
 				}
 				break;
 			}
 			if (ASCII_NBRSP == p->buf[i]) {
-				vbl++;
+				vbl += (*p->width)(p, ' ');
 				continue;
 			}
 
@@ -258,12 +260,13 @@ term_flushln(struct termp *p)
 				vbl = 0;
 			}
 
-			if (ASCII_HYPH == p->buf[i])
+			if (ASCII_HYPH == p->buf[i]) {
 				(*p->letter)(p, '-');
-			else
+				p->viscol += (*p->width)(p, '-');
+			} else {
 				(*p->letter)(p, p->buf[i]);
-
-			p->viscol += 1;
+				p->viscol += (*p->width)(p, p->buf[i]);
+			}
 		}
 		vend += vbl;
 		vis = vend;
@@ -281,7 +284,7 @@ term_flushln(struct termp *p)
 	if (TERMP_HANG & p->flags) {
 		/* We need one blank after the tag. */
 		p->overstep = /* LINTED */
-			vis - maxvis + 1;
+			vis - maxvis + (*p->width)(p, ' ');
 
 		/*
 		 * Behave exactly the same way as groff:
@@ -305,7 +308,7 @@ term_flushln(struct termp *p)
 
 	/* Right-pad. */
 	if (maxvis > vis + /* LINTED */
-			((TERMP_TWOSPACE & p->flags) ? 1 : 0)) {
+			((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {
 		p->viscol += maxvis - vis;
 		(*p->advance)(p, maxvis - vis);
 		vis += (maxvis - vis);
diff --git a/term_ps.c b/term_ps.c
index fbe4d0c5..00bede51 100644
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.13 2010/06/28 13:45:28 kristaps Exp $ */
+/*	$Id: term_ps.c,v 1.14 2010/06/28 22:46:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -387,9 +387,7 @@ ps_alloc(void)
 	if (NULL == (p = term_alloc(TERMENC_ASCII)))
 		return(NULL);
 
-	p->defrmargin = 78;
-	p->tabwidth = 5;
-
+	p->defrmargin = 612 - (PS_CHAR_LEFT * 2);
 	p->type = TERMTYPE_PS;
 	p->letter = ps_letter;
 	p->begin = ps_begin;
@@ -551,6 +549,7 @@ ps_begin(struct termp *p)
 static void
 ps_pletter(struct termp *p, int c)
 {
+	int		 f;
 	
 	/*
 	 * If we're not in a PostScript "word" context, then open one
@@ -585,21 +584,17 @@ ps_pletter(struct termp *p, int c)
 
 	/* Write the character and adjust where we are on the page. */
 
-	/* 
-	 * FIXME: at this time we emit only blacnks on non-ASCII
-	 * letters.
-	 */
+	f = (int)p->engine.ps.lastf;
 
-	if (c < 32 || (c - 32 > MAXCHAR)) {
+	if (c <= 32 || (c - 32 > MAXCHAR)) {
 		ps_putchar(p, ' ');
-		p->engine.ps.pscol += 
-			(fonts[p->engine.ps.lastf].gly[32].wx / 100);
+		p->engine.ps.pscol += (fonts[f].gly[0].wx / 100);
 		return;
 	} 
 
 	ps_putchar(p, c);
-	p->engine.ps.pscol += 
-		(fonts[p->engine.ps.lastf].gly[(int)c - 32].wx / 100);
+	c -= 32;
+	p->engine.ps.pscol += (fonts[f].gly[c].wx / 100);
 }
 
 
@@ -709,8 +704,7 @@ ps_advance(struct termp *p, size_t len)
 	 */
 
 	ps_fclose(p);
-	p->engine.ps.pscol += 0 == len ? 0 :
-		len * (fonts[p->engine.ps.lastf].gly[0].wx / 100);
+	p->engine.ps.pscol += len;
 }
 
 
@@ -763,5 +757,9 @@ static size_t
 ps_width(const struct termp *p, char c)
 {
 
-	return(1);
+	if (c <= 32 || c - 32 >= MAXCHAR)
+		return(fonts[(int)TERMFONT_NONE].gly[0].wx / 100);
+
+	c -= 32;
+	return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx / 100);
 }