--- ray/src/rt/text.c	1991/08/06 09:04:41	1.8
+++ ray/src/rt/text.c	1992/06/16 13:24:23	2.3
@@ -14,6 +14,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "otypes.h"
 
+#include  "font.h"
+
 /*
  *	A text pattern is specified as the text (a file or line),
  *  the upper left anchor point, the right motion vector, the down
@@ -55,22 +57,12 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  fndx(m)	((m)->otype==MIX_TEXT ? 2 : 0)
 #define  tndx(m)	((m)->otype==MIX_TEXT ? 3 : 1)
 
-extern char  *libpath;			/* library search path */
-
-typedef unsigned char  GLYPH;
-
-typedef struct font {
-	GLYPH  *fg[256];		/* font glyphs */
-	char  *name;			/* font file name */
-	struct font  *next;		/* next font in list */
-}  FONT;
-
 typedef struct tline {
 	struct tline  *next;		/* pointer to next line */
 					/* followed by the string */
 }  TLINE;
 
-#define  TLSTR(l)	((char *)(l+1))
+#define  TLSTR(l)	((char *)((l)+1))
 
 typedef struct {
 	FVECT  right, down;		/* right and down unit vectors */
@@ -78,22 +70,20 @@ typedef struct {
 	TLINE  tl;			/* line list */
 }  TEXT;
 
+extern char  *libpath;
+
 extern char  *fgetword();
 
 TEXT  *gettext();
 
 TLINE  *tlalloc();
 
-FONT  *getfont();
 
-static FONT  *fontlist = NULL;		/* our font list */
-
-
 text(m, r)
 register OBJREC  *m;
 RAY  *r;
 {
-	double  v[3];
+	FVECT  v;
 	int  foreground;
 				/* get transformed position */
 	if (r->rox != NULL)
@@ -177,11 +167,11 @@ register OBJREC  *tm;
 						/* compute vectors */
 	fcross(DxR, D, R);
 	fcross(t->right, DxR, D);
-	d = DOT(D,D) / DOT(t->right,t->right);
+	d = DOT(D,D)/DOT(t->right,t->right);
 	for (i = 0; i < 3; i++)
 		t->right[i] *= d;
 	fcross(t->down, R, DxR);
-	d = DOT(R,R) / DOT(t->down,t->down);
+	d = DOT(R,R)/DOT(t->down,t->down);
 	for (i = 0; i < 3; i++)
 		t->down[i] *= d;
 						/* get text */
@@ -238,7 +228,7 @@ OBJREC  *m;
 	if (tp == NULL)
 		return;
 	for (tlp = tp->tl.next; tlp != NULL; tlp = tlp->next);
-		free(TLSTR(tlp));
+		free((char *)tlp);
 	free((char *)tp);
 	m->os = NULL;
 }
@@ -250,10 +240,12 @@ OBJREC  *m;
 {
 	register TEXT  *tp;
 	register TLINE  *tlp;
-	double  v[3], y, x;
+	FVECT  v;
+	double  y, x;
 	int  col;
 	register int  lno;
 				/* first, compute position in text */
+	tp = gettext(m);
 	v[0] = p[0] - m->oargs.farg[0];
 	v[1] = p[1] - m->oargs.farg[1];
 	v[2] = p[2] - m->oargs.farg[2];
@@ -264,99 +256,22 @@ OBJREC  *m;
 	x -= (double)col;
 	y = (lno+1) - y;
 				/* get the font character */
-	tp = gettext(m);
 	for (tlp = tp->tl.next; tlp != NULL; tlp = tlp->next)
 		if (--lno < 0)
 			break;
 	if (tlp == NULL || col >= strlen(TLSTR(tlp)))
 		return(0);
-	return(inglyph(x, y, tp->f->fg[TLSTR(tlp)[col]]));
+	return(inglyph(x, y, tp->f->fg[TLSTR(tlp)[col]&0xff]));
 }
 
 
-FONT *
-getfont(fname)				/* return font fname */
-char  *fname;
-{
-	char  buf[16];
-	FILE  *fp;
-	char  *pathname, *err;
-	int  gn, ngv, gv;
-	register GLYPH  *g;
-	register FONT  *f;
-
-	for (f = fontlist; f != NULL; f = f->next)
-		if (!strcmp(f->name, fname))
-			return(f);
-						/* load the font file */
-	if ((pathname = getpath(fname, libpath, R_OK)) == NULL) {
-		sprintf(errmsg, "cannot find font file \"%s\"", fname);
-		error(USER, errmsg);
-	}
-	f = (FONT *)calloc(1, sizeof(FONT));
-	if (f == NULL)
-		goto memerr;
-	f->name = savestr(fname);
-	if ((fp = fopen(pathname, "r")) == NULL) {
-		sprintf(errmsg, "cannot open font file \"%s\"",
-				pathname);
-		error(SYSTEM, errmsg);
-	}
-	while (fgetword(buf,sizeof(buf),fp) != NULL) {	/* get each glyph */
-		if (!isint(buf))
-			goto nonint;
-		gn = atoi(buf);
-		if (gn < 0 || gn > 255) {
-			err = "illegal";
-			goto fonterr;
-		}
-		if (f->fg[gn] != NULL) {
-			err = "duplicate";
-			goto fonterr;
-		}
-		if (fgetword(buf,sizeof(buf),fp) == NULL || !isint(buf) ||
-				(ngv = atoi(buf)) < 0 || ngv > 255) {
-			err = "bad # vertices for";
-			goto fonterr;
-		}
-		g = (GLYPH *)malloc((2*ngv+1)*sizeof(GLYPH));
-		if (g == NULL)
-			goto memerr;
-		f->fg[gn] = g;
-		*g++ = ngv;
-		ngv *= 2;
-		while (ngv--) {
-			if (fgetword(buf,sizeof(buf),fp) == NULL ||
-					!isint(buf) ||
-					(gv = atoi(buf)) < 0 || gv > 255) {
-				err = "bad vertex for";
-				goto fonterr;
-			}
-			*g++ = gv;
-		}
-	}
-	fclose(fp);
-	f->next = fontlist;
-	return(fontlist = f);
-nonint:
-	sprintf(errmsg, "non-integer in font file \"%s\"", pathname);
-	error(USER, errmsg);
-fonterr:
-	sprintf(errmsg, "%s character (%d) in font file \"%s\"",
-			err, gn, pathname);
-	error(USER, errmsg);
-memerr:
-	error(SYSTEM, "out of memory in fontglyph");
-}
-
-
 inglyph(x, y, gl)		/* (x,y) within font glyph gl? */
 double  x, y;
-GLYPH  *gl;
+register GLYPH  *gl;
 {
 	int  n, ncross;
 	int  xlb, ylb;
-	register GLYPH  *p0, *p1;
+	register GORD  *p0, *p1;
 
 	if (gl == NULL)
 		return(0);
@@ -364,9 +279,12 @@ GLYPH  *gl;
 	y *= 256.0;
 	xlb = x + 0.5;
 	ylb = y + 0.5;
-	n = *gl++;			/* get # of vertices */
-	p0 = gl + 2*(n-1);		/* connect last to first */
-	p1 = gl;
+	if (gl->left > xlb || gl->right <= xlb ||
+			gl->bottom > ylb || gl->top <= ylb)
+		return(0);	/* outside extent */
+	n = gl->nverts;			/* get # of vertices */
+	p0 = gvlist(gl) + 2*(n-1);	/* connect last to first */
+	p1 = gvlist(gl);
 	ncross = 0;
 					/* positive x axis cross test */
 	while (n--) {