--- ray/src/rt/rtrace.c	2005/04/19 01:15:06	2.40
+++ ray/src/rt/rtrace.c	2005/05/26 06:55:22	2.42
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtrace.c,v 2.40 2005/04/19 01:15:06 greg Exp $";
+static const char	RCSid[] = "$Id: rtrace.c,v 2.42 2005/05/26 06:55:22 greg Exp $";
 #endif
 /*
  *  rtrace.c - program and variables for individual ray tracing.
@@ -97,7 +97,7 @@ static putf_t puta, putd, putf;
 
 typedef void oputf_t(RAY *r);
 static oputf_t  oputo, oputd, oputv, oputl, oputL, oputc, oputp,
-		oputn, oputN, oputs, oputw, oputW, oputm, oputM;
+		oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde;
 
 static void setoutput(char *vs);
 static void tranotify(OBJECT obj);
@@ -213,7 +213,7 @@ rtrace(				/* trace rays from file */
 	}
 	fflush(stdout);
 	if (vcount > 0)
-		error(USER, "read error");
+		error(USER, "unexpected EOF on input");
 	if (fname != NULL)
 		fclose(fp);
 }
@@ -240,9 +240,11 @@ setoutput(				/* set up output tables */
 	while (*vs)
 		switch (*vs++) {
 		case 'T':				/* trace sources */
+			if (!*vs) break;
 			trace_sources();
 			/* fall through */
 		case 't':				/* trace */
+			if (!*vs) break;
 			*table = NULL;
 			table = every_out;
 			trace = ourtrace;
@@ -288,7 +290,7 @@ setoutput(				/* set up output tables */
 			*table++ = oputW;
 			if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
 				error(WARNING,
-					"-otW accuracy requires -aa 0 -as 0");
+					"-otW accuracy depends on -aa 0 -as 0");
 			break;
 		case 'm':				/* modifier */
 			*table++ = oputm;
@@ -296,6 +298,9 @@ setoutput(				/* set up output tables */
 		case 'M':				/* material */
 			*table++ = oputM;
 			break;
+		case '~':				/* tilde */
+			*table++ = oputtilde;
+			break;
 		}
 	*table = NULL;
 }
@@ -463,7 +468,8 @@ ourtrace(				/* print ray values */
 	tabin(r);
 	for (tp = every_out; *tp != NULL; tp++)
 		(**tp)(r);
-	putchar('\n');
+	if (outform == 'a')
+		putchar('\n');
 }
 
 
@@ -506,9 +512,8 @@ oputv(				/* print value */
 	RAY  *r
 )
 {
-	COLR  cout;
-	
 	if (outform == 'c') {
+		COLR  cout;
 		setcolr(cout,	colval(r->rcol,RED),
 				colval(r->rcol,GRN),
 				colval(r->rcol,BLU));
@@ -631,16 +636,8 @@ oputW(				/* print contribution */
 )
 {
 	COLOR	contr;
-	COLR	cout;
 
 	raycontrib(contr, r, PRIMARY);
-	if (outform == 'c') {
-		setcolr(cout,	colval(contr,RED),
-				colval(contr,GRN),
-				colval(contr,BLU));
-		fwrite((char *)cout, sizeof(cout), 1, stdout);
-		return;
-	}
 	(*putreal)(colval(contr,RED));
 	(*putreal)(colval(contr,GRN));
 	(*putreal)(colval(contr,BLU));
@@ -678,6 +675,15 @@ oputM(				/* print material */
 	} else
 		putchar('*');
 	putchar('\t');
+}
+
+
+static void
+oputtilde(			/* output tilde (spacer) */
+	RAY  *r
+)
+{
+	fputs("~\t", stdout);
 }