--- ray/src/rt/text.c	1995/12/05 20:21:39	2.15
+++ ray/src/rt/text.c	2004/02/12 18:55:50	2.24
@@ -1,15 +1,16 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: text.c,v 2.24 2004/02/12 18:55:50 greg Exp $";
 #endif
-
 /*
  *  text.c - functions for text patterns and mixtures.
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
+#include  "paths.h"
+
 #include  "otypes.h"
 
 #include  "font.h"
@@ -77,16 +78,12 @@ typedef struct {
 	TLINE  tl;			/* line list */
 }  TEXT;
 
-extern char  *getlibpath();
-
-extern char  *fgetword();
-
 TEXT  *gettext();
 
 TLINE  *tlalloc();
 
 
-text(m, r)
+do_text(m, r)
 register OBJREC  *m;
 RAY  *r;
 {
@@ -105,7 +102,7 @@ RAY  *r;
 		char  *modname = m->oargs.sarg[foreground ? 0 : 1];
 		if (!strcmp(modname, VOIDID))
 			omod = OVOID;
-		else if ((omod = modifier(modname)) == OVOID) {
+		else if ((omod = lastmod(objndx(m), modname)) == OVOID) {
 			sprintf(errmsg, "undefined modifier \"%s\"", modname);
 			objerror(m, USER, errmsg);
 		}
@@ -139,7 +136,6 @@ TLINE *
 tlalloc(s)			/* allocate and assign text line */
 char  *s;
 {
-	extern char  *strcpy();
 	register int  siz;
 	register TLINE  *tl;
 
@@ -159,7 +155,6 @@ register OBJREC  *tm;
 {
 #define  R	(tm->oargs.farg+3)
 #define  D	(tm->oargs.farg+6)
-	extern char  *strcpy();
 	FVECT  DxR;
 	double  d;
 	FILE  *fp;
@@ -179,7 +174,10 @@ 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(t->right,t->right);
+	if (d <= FTINY*FTINY*FTINY*FTINY)
+		objerror(tm, USER, "illegal motion vector");
+	d = DOT(D,D)/d;
 	for (i = 0; i < 3; i++)
 		t->right[i] *= d;
 	fcross(t->down, R, DxR);
@@ -200,7 +198,7 @@ register OBJREC  *tm;
 		tlp = tlp->next;
 	} else {				/* text file */
 		if ((s = getpath(tm->oargs.sarg[tndx(tm)],
-				getlibpath(), R_OK)) == NULL) {
+				getrlibpath(), R_OK)) == NULL) {
 			sprintf(errmsg, "cannot find text file \"%s\"",
 					tm->oargs.sarg[tndx(tm)]);
 			error(USER, errmsg);
@@ -255,10 +253,11 @@ OBJREC  *m;
 		return;
 	while ((tlp = tp->tl.next) != NULL) {
 		tp->tl.next = tlp->next;
-		free((char *)tlp->spc);
-		free((char *)tlp);
+		free((void *)tlp->spc);
+		free((void *)tlp);
 	}
-	free((char *)tp);
+	freefont(tp->f);	/* release font reference */
+	free((void *)tp);
 	m->os = NULL;
 }
 
@@ -328,7 +327,7 @@ register GLYPH  *gl;
 					/* positive x axis cross test */
 	while (n--) {
 		if ((p0[1]<<1 > ylb) ^ (p1[1]<<1 > ylb)) {
-			tv = p0[0]<<1 > xlb | (p1[0]<<1 > xlb) << 1;
+			tv = (p0[0]<<1 > xlb) | ((p1[0]<<1 > xlb) << 1);
 			if (tv == 03)
 				ncross++;
 			else if (tv)