--- ray/src/rt/text.c	1999/05/20 13:51:19	2.19
+++ ray/src/rt/text.c	2004/03/30 16:13:01	2.25
@@ -1,17 +1,16 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+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.
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
+#include  "ray.h"
+#include  "paths.h"
 #include  "otypes.h"
-
+#include  "rtotypes.h"
 #include  "font.h"
 
 /*
@@ -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();
-
-
-do_text(m, r)
-register OBJREC  *m;
-RAY  *r;
+extern int
+do_text(
+	register OBJREC  *m,
+	RAY  *r
+)
 {
 	FVECT  v;
 	int  foreground;
@@ -135,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;
 
@@ -153,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;
@@ -203,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);
@@ -247,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;
@@ -258,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;
@@ -306,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;
@@ -331,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)