--- ray/src/rt/text.c	1994/04/14 04:50:37	2.13
+++ ray/src/rt/text.c	1996/06/22 09:48:52	2.16
@@ -1,4 +1,4 @@
-/* Copyright (c) 1992 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -6,8 +6,6 @@ static char SCCSid[] = "$SunId$ LBL";
 
 /*
  *  text.c - functions for text patterns and mixtures.
- *
- *     11/12/86
  */
 
 #include  "ray.h"
@@ -45,8 +43,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
@@ -86,7 +86,7 @@ TEXT  *gettext();
 TLINE  *tlalloc();
 
 
-text(m, r)
+do_text(m, r)
 register OBJREC  *m;
 RAY  *r;
 {
@@ -114,8 +114,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
@@ -225,7 +224,7 @@ register OBJREC  *tm;
 						/* compute character spacing */
 	i = sndx(tm);
 	d = i < tm->oargs.nfargs ? tm->oargs.farg[i] : 0.0;
-	i = d * 256.0;
+	i = d * 255.0;
 	t->tl.width = 0;
 	for (tlp = t->tl.next; tlp != NULL; tlp = tlp->next) {
 		if (i < 0)
@@ -281,15 +280,15 @@ OBJREC  *m;
 	x = DOT(v, tp->right);
 	i = sndx(m);
 	if (i < m->oargs.nfargs)
-		x *= tp->f->mwidth + 256.*fabs(m->oargs.farg[i]);
+		x *= tp->f->mwidth + 255.*fabs(m->oargs.farg[i]);
 	else
-		x *= 256.;
+		x *= 255.;
 	h = x;
 	i = y = DOT(v, tp->down);
 	if (x < 0.0 || y < 0.0)
 		return(0);
 	x -= (double)h;
-	y = ((i+1) - y)*256.;
+	y = ((i+1) - y)*255.;
 				/* find the line position */
 	for (tlp = tp->tl.next; tlp != NULL; tlp = tlp->next)
 		if (--i < 0)
@@ -297,7 +296,7 @@ OBJREC  *m;
 	if (tlp == NULL || h >= tlp->width)
 		return(0);
 	for (i = 0; (h -= tlp->spc[i]) >= 0; i++)
-		if (h < 256 && inglyph(h+x, y,
+		if (h < 255 && inglyph(h+x, y,
 				tp->f->fg[TLSTR(tlp)[i]&0xff]))
 			return(1);
 	return(0);
@@ -305,7 +304,7 @@ OBJREC  *m;
 
 
 inglyph(x, y, gl)		/* (x,y) within font glyph gl? */
-double  x, y;		/* real coordinates in range [0,256) */
+double  x, y;		/* real coordinates in range [0,255) */
 register GLYPH  *gl;
 {
 	int  n, ncross;