--- ray/src/rt/text.c	1995/05/25 15:13:43	2.14
+++ 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