--- ray/src/rt/text.c	1995/05/25 15:13:43	2.14
+++ ray/src/rt/text.c	2004/03/30 16:13:01	2.25
@@ -1,19 +1,16 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: text.c,v 2.25 2004/03/30 16:13:01 schorsch Exp $";
 #endif
-
 /*
  *  text.c - functions for text patterns and mixtures.
- *
- *     11/12/86
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
+#include  "ray.h"
+#include  "paths.h"
 #include  "otypes.h"
-
+#include  "rtotypes.h"
 #include  "font.h"
 
 /*
@@ -45,8 +42,10 @@ static char SCCSid[] = "$SunId$ LBL";
  *		[spacing]
  *
  *  Colortext is identical, except colors are given rather than
- *  brightnesses.  Mixtext has foreground and background modifiers:
+ *  brightnesses.
  *
+ *  Mixtext has foreground and background modifiers:
+ *
  *	modifier mixtext id
  *	4+ foremod backmod fontfile text..
  *	0
@@ -77,18 +76,17 @@ typedef struct {
 	TLINE  tl;			/* line list */
 }  TEXT;
 
-extern char  *getlibpath();
+static TLINE * tlalloc(char *s);
+static TEXT * gettext(OBJREC *tm);
+static int intext(FVECT p, OBJREC *m);
+static int inglyph(double x, double y, GLYPH *gl);
 
-extern char  *fgetword();
 
-TEXT  *gettext();
-
-TLINE  *tlalloc();
-
-
-text(m, r)
-register OBJREC  *m;
-RAY  *r;
+extern int
+do_text(
+	register OBJREC  *m,
+	RAY  *r
+)
 {
 	FVECT  v;
 	int  foreground;
@@ -105,7 +103,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);
 		}
@@ -114,8 +112,7 @@ RAY  *r;
 				objerror(m, USER, "inappropriate modifier");
 			return(1);
 		}
-	}
-	if (m->otype == PAT_BTEXT) {
+	} else if (m->otype == PAT_BTEXT) {
 		if (foreground)
 			scalecolor(r->pcol, m->oargs.farg[9]);
 		else
@@ -136,11 +133,11 @@ RAY  *r;
 }
 
 
-TLINE *
-tlalloc(s)			/* allocate and assign text line */
-char  *s;
+static TLINE *
+tlalloc(			/* allocate and assign text line */
+	char  *s
+)
 {
-	extern char  *strcpy();
 	register int  siz;
 	register TLINE  *tl;
 
@@ -154,13 +151,13 @@ char  *s;
 }
 
 
-TEXT *
-gettext(tm)			/* get text structure for material */
-register OBJREC  *tm;
+static TEXT *
+gettext(			/* get text structure for material */
+	register OBJREC  *tm
+)
 {
 #define  R	(tm->oargs.farg+3)
 #define  D	(tm->oargs.farg+6)
-	extern char  *strcpy();
 	FVECT  DxR;
 	double  d;
 	FILE  *fp;
@@ -180,7 +177,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);
@@ -201,7 +201,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);
@@ -245,8 +245,10 @@ register OBJREC  *tm;
 }
 
 
-freetext(m)			/* free text structures associated with m */
-OBJREC  *m;
+extern void
+freetext(			/* free text structures associated with m */
+	OBJREC  *m
+)
 {
 	register TEXT  *tp;
 	register TLINE  *tlp;
@@ -256,17 +258,20 @@ 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;
 }
 
 
-intext(p, m)			/* check to see if p is in text glyph */
-FVECT  p;
-OBJREC  *m;
+static int
+intext(			/* check to see if p is in text glyph */
+	FVECT  p,
+	OBJREC  *m
+)
 {
 	register TEXT  *tp;
 	register TLINE  *tlp;
@@ -304,9 +309,12 @@ OBJREC  *m;
 }
 
 
-inglyph(x, y, gl)		/* (x,y) within font glyph gl? */
-double  x, y;		/* real coordinates in range [0,255) */
-register GLYPH  *gl;
+static int
+inglyph(		/* (x,y) within font glyph gl? */
+	double  x,		/* real coordinates in range [0,255) */
+	double  y,
+	register GLYPH  *gl
+)
 {
 	int  n, ncross;
 	int  xlb, ylb;
@@ -329,7 +337,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)