--- ray/src/util/rad.c	1993/11/23 09:26:38	2.35
+++ ray/src/util/rad.c	1994/01/01 09:16:50	2.37
@@ -1,4 +1,4 @@
-/* Copyright (c) 1993 Regents of the University of California */
+/* Copyright (c) 1994 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -114,6 +114,7 @@ time_t	oct0date;		/* date of pre-mkillum octree */
 char	*oct1name;		/* name of post-mkillum octree */
 time_t	oct1date;		/* date of post-mkillum octree (>= matdate) */
 
+int	nowarn = 0;		/* no warnings */
 int	explicate = 0;		/* explicate variables */
 int	silent = 0;		/* do work silently */
 int	noaction = 0;		/* don't do anything */
@@ -158,6 +159,9 @@ char	*argv[];
 		case 'v':
 			viewselect = argv[++i];
 			break;
+		case 'w':
+			nowarn++;
+			break;
 		default:
 			goto userr;
 		}
@@ -273,7 +277,7 @@ register char	*ass;
 	for (n = strlen(ass); n > 0; n--)
 		if (!isspace(ass[n-1]))
 			break;
-	if (!n) {
+	if (!n && !nowarn) {
 		fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
 				progname, varname);
 		return;
@@ -359,7 +363,9 @@ register VARIABLE	*vp;
 {
 	if (vp->nass < 2)
 		return;
-	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
+	if (!nowarn)
+		fprintf(stderr,
+		"%s: warning - multiple assignment of variable '%s'\n",
 			progname, vp->name);
 	do
 		vp->value += strlen(vp->value)+1;
@@ -641,11 +647,32 @@ setdefaults()			/* set default values for unassigned v
 
 printvals()			/* print variable values */
 {
-	register int	i, j;
+	int	i, j, clipline;
+	register char	*cp;
+	register int	k;
 
-	for (i = 0; i < NVARS; i++)
-		for (j = 0; j < vdef(i); j++)
-			printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
+	for (i = 0; i < NVARS; i++)		/* print each variable */
+	    for (j = 0; j < vdef(i); j++) {	/* print each assignment */
+		fputs(vnam(i), stdout);
+		fputs("= ", stdout);
+		k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 )
+				- strlen(vnam(i)) ;
+		cp = nvalue(vv+i, j);
+		while (*cp) {
+		    putchar(*cp++);
+		    if (--k <= 0) {		/* line too long */
+			while (*cp && !isspace(*cp))
+			    putchar(*cp++);	/* finish this word */
+			if (*cp) {		/* start new line */
+			    putchar('\n');
+			    fputs(vnam(i), stdout);
+			    putchar('=');
+			    k = clipline;
+			}
+		    }
+		}
+	        putchar('\n');
+	    }
 	fflush(stdout);
 }