--- ray/src/cv/rad2mgf.c	1994/07/07 17:30:33	2.1
+++ ray/src/cv/rad2mgf.c	2003/06/08 12:03:09	2.17
@@ -1,36 +1,59 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: rad2mgf.c,v 2.17 2003/06/08 12:03:09 schorsch Exp $";
 #endif
-
 /*
  * Convert Radiance scene description to MGF
  */
 
-#include <stdio.h>
+#include "standard.h"
+#include <ctype.h>
 #include <string.h>
-#include "fvect.h"
+#include <stdio.h>
+
+#include "platform.h"
 #include "object.h"
 #include "color.h"
 #include "lookup.h"
 
+#define C_1SIDEDTHICK	0.005
+
 int	o_face(), o_cone(), o_sphere(), o_ring(), o_cylinder();
-int	o_instance(), o_source(), o_illum();
-int	o_plastic(), o_metal(), o_glass(), o_mirror(), o_trans(), o_light();
+int	o_instance(), o_illum();
+int	o_plastic(), o_metal(), o_glass(), o_dielectric(),
+	o_mirror(), o_trans(), o_light();
 
-extern void	free();
-extern char	*malloc();
-
 LUTAB	rmats = LU_SINIT(free,NULL);		/* defined material table */
 
 LUTAB	rdispatch = LU_SINIT(NULL,NULL);	/* function dispatch table */
 
-char	curmat[80];		/* current material */
+char	curmat[80];				/* current material */
+char	curobj[128] = "Untitled";		/* current object name */
 
-double	unit_mult = 1.;		/* units multiplier */
+double	unit_mult = 1.;				/* units multiplier */
 
+#define hasmult		(unit_mult < .999 || unit_mult > 1.001)
 
+/*
+ * Stuff for tracking and reusing vertices:
+ */
+
+char	VKFMT[] = "%+16.9e %+16.9e %+16.9e";
+#define VKLEN		64
+
+#define mkvkey(k,v)	sprintf(k, VKFMT, (v)[0], (v)[1], (v)[2])
+
+#define NVERTS		256
+
+long	vclock;		/* incremented at each vertex request */
+
+struct vert {
+	long	lused;		/* when last used (0 if unassigned) */
+	FVECT	p;		/* track point position only */
+} vert[NVERTS];		/* our vertex cache */
+
+LUTAB	vertab = LU_SINIT(free,NULL);	/* our vertex lookup table */
+
+
 main(argc, argv)
 int	argc;
 char	**argv;
@@ -57,6 +80,8 @@ char	**argv;
 				goto unkopt;
 			}
 			break;
+		default:
+			goto unkopt;
 		}
 	init();
 	if (i >= argc)
@@ -85,7 +110,7 @@ char	*inp;
 	register int	c;
 
 	if (inp == NULL) {
-		inp = "the standard input";
+		inp = "standard input";
 		fp = stdin;
 	} else if (inp[0] == '!') {
 		if ((fp = popen(inp+1, "r")) == NULL) {
@@ -163,8 +188,11 @@ FUNARGS	*fa;
 			fprintf(stderr, "%s: bad %s \"%s\"\n", typ, id);
 			exit(1);
 		}
-	} else if (lu_find(&rmats, mod)->data != NULL)	/* make alias */
-		newmat(id, mod);
+	} else {					/* unsupported */
+		o_unsupported(mod, typ, id, fa);
+		if (lu_find(&rmats, mod)->data != NULL)	/* make alias */
+			newmat(id, mod);
+	}
 }
 
 
@@ -209,13 +237,47 @@ char	*id;
 {
 	if (!strcmp(id, curmat))	/* already set? */
 		return;
+	if (!strcmp(id, VOIDID))	/* cannot set */
+		return;
 	printf("m %s\n", id);
 	strcpy(curmat, id);
 }
 
 
+setobj(id)			/* set object name to this one */
+char	*id;
+{
+	register char	*cp, *cp2;
+	char	*end = NULL;
+	int	diff = 0;
+				/* use all but final suffix */
+	for (cp = id; *cp; cp++)
+		if (*cp == '.')
+			end = cp;
+	if (end == NULL)
+		end = cp;
+				/* copy to current object */
+	cp2 = curobj;
+	if (!isalpha(*id)) {	/* start with letter */
+		diff = *cp2 != 'O';
+		*cp2++ = 'O';
+	}
+	for (cp = id; cp < end; *cp2++ = *cp++) {
+		if (*cp < '!' | *cp > '~')	/* limit to visible chars */
+			*cp = '?';
+		diff += *cp != *cp2;
+	}
+	if (!diff && !*cp2)
+		return;
+	*cp2 = '\0';
+	fputs("o\no ", stdout);
+	puts(curobj);
+}
+
+
 init()			/* initialize dispatch table and output */
 {
+	lu_init(&vertab, NVERTS);
 	lu_init(&rdispatch, 22);
 	add2dispatch("polygon", o_face);
 	add2dispatch("cone", o_cone);
@@ -231,6 +293,7 @@ init()			/* initialize dispatch table and output */
 	add2dispatch("metal", o_metal);
 	add2dispatch("metal2", o_metal);
 	add2dispatch("glass", o_glass);
+	add2dispatch("dielectric", o_dielectric);
 	add2dispatch("trans", o_trans);
 	add2dispatch("trans2", o_trans);
 	add2dispatch("mirror", o_mirror);
@@ -238,22 +301,36 @@ init()			/* initialize dispatch table and output */
 	add2dispatch("spotlight", o_light);
 	add2dispatch("glow", o_light);
 	add2dispatch("illum", o_illum);
-	puts("# The following was converted from Radiance scene input");
-	if (unit_mult < .999 || unit_mult > 1.001)
+	puts("# The following was converted from RADIANCE scene input");
+	if (hasmult)
 		printf("xf -s %.4e\n", unit_mult);
+	printf("o %s\n", curobj);
 }
 
 
 uninit()			/* mark end of MGF file */
 {
-	if (unit_mult < .999 || unit_mult > 1.001)
+	puts("o");
+	if (hasmult)
 		puts("xf");
-	puts("# End of data converted from Radiance scene input");
+	puts("# End of data converted from RADIANCE scene input");
 	lu_done(&rdispatch);
 	lu_done(&rmats);
+	lu_done(&vertab);
 }
 
 
+clrverts()			/* clear vertex table */
+{
+	register int	i;
+
+	lu_done(&vertab);
+	for (i = 0; i < NVERTS; i++)
+		vert[i].lused = 0;
+	lu_init(&vertab, NVERTS);
+}
+
+
 add2dispatch(name, func)	/* add function to dispatch table */
 char	*name;
 int	(*func)();
@@ -271,35 +348,16 @@ int	(*func)();
 }
 
 
-char	VKFMT[] = "%+1.9e %+1.9e %+1.9e";
-#define VKLEN		64
-
-#define mkvkey(k,v)	sprintf(k, VKFMT, (v)[0], (v)[1], (v)[2])
-
-#define NVERTS		256
-
-long	clock;		/* incremented at each vertex request */
-
-struct vert {
-	long	lused;		/* when last used (0 if unassigned) */
-	FVECT	p;		/* track point position only */
-} vert[NVERTS];
-
-LUTAB	vertab = LU_SINIT(free,NULL);	/* our vertex lookup table */
-
-
 char *
-getvertid(vp)			/* get/set vertex ID for this point */
+getvertid(vname, vp)		/* get/set vertex ID for this point */
+char	*vname;
 FVECT	vp;
 {
-	static char	vname[6];
-	char	vkey[VKLEN];
+	static char	vkey[VKLEN];
 	register LUENT	*lp;
 	register int	i, vndx;
 
-	if (!vertab.tsiz && !lu_init(&vertab, NVERTS))
-		goto memerr;
-	clock++;			/* increment counter */
+	vclock++;			/* increment counter */
 	mkvkey(vkey, vp);
 	if ((lp = lu_find(&vertab, vkey)) == NULL)
 		goto memerr;
@@ -319,13 +377,13 @@ FVECT	vp;
 			mkvkey(vkey, vert[vndx].p);
 			lu_delete(&vertab, vkey);
 		}
-		vert[vndx].lused = clock;			/* assign it */
-		VCOPY(vert[vndx].p, vp);
-		printf("v v%d =\np %.15g %.15g %.15g\n",	/* print it */
+		VCOPY(vert[vndx].p, vp);			/* assign it */
+		printf("v v%d =\n\tp %.15g %.15g %.15g\n",	/* print it */
 				vndx, vp[0], vp[1], vp[2]);
 		lp->data = (char *)&vert[vndx];			/* set it */
 	} else
 		vndx = (struct vert *)lp->data - vert;
+	vert[vndx].lused = vclock;		/* record this use */
 	sprintf(vname, "v%d", vndx);
 	return(vname);
 memerr:
@@ -335,28 +393,59 @@ memerr:
 
 
 int
+o_unsupported(mod, typ, id, fa)		/* mark unsupported primitive */
+char	*mod, *typ, *id;
+FUNARGS	*fa;
+{
+	register int	i;
+
+	fputs("\n# Unsupported RADIANCE primitive:\n", stdout);
+	printf("# %s %s %s", mod, typ, id);
+	printf("\n# %d", fa->nsargs);
+	for (i = 0; i < fa->nsargs; i++)
+		printf(" %s", fa->sarg[i]);
+#ifdef IARGS
+	printf("\n# %d", fa->niargs);
+	for (i = 0; i < fa->niargs; i++)
+		printf(" %ld", fa->iarg[i]);
+#else
+	fputs("\n# 0", stdout);
+#endif
+	printf("\n# %d", fa->nfargs);
+	for (i = 0; i < fa->nfargs; i++)
+		printf(" %g", fa->farg[i]);
+	fputs("\n\n", stdout);
+	return(0);
+}
+
+
+int
 o_face(mod, typ, id, fa)		/* print out a polygon */
 char	*mod, *typ, *id;
 FUNARGS	*fa;
 {
-	char	entbuf[512];
-	register char	*cp1, *cp2;
+	char	entbuf[2048], *linestart;
+	register char	*cp;
 	register int	i;
 
 	if (fa->nfargs < 9 | fa->nfargs % 3)
 		return(-1);
 	setmat(mod);
-	printf("o %s\n", id);
-	cp1 = entbuf;
-	*cp1++ = 'f';
+	setobj(id);
+	cp = linestart = entbuf;
+	*cp++ = 'f';
 	for (i = 0; i < fa->nfargs; i += 3) {
-		cp2 = getvertid(fa->farg + i);
-		*cp1++ = ' ';
-		while ((*cp1 = *cp2++))
-			cp1++;
+		*cp++ = ' ';
+		if (cp - linestart > 72) {
+			*cp++ = '\\'; *cp++ = '\n';
+			linestart = cp;
+			*cp++ = ' '; *cp++ = ' ';
+		}
+		getvertid(cp, fa->farg + i);
+		while (*cp)
+			cp++;
 	}
 	puts(entbuf);
-	puts("o");
 	return(0);
 }
 
@@ -366,21 +455,20 @@ o_cone(mod, typ, id, fa)	/* print out a cone */
 char	*mod, *typ, *id;
 register FUNARGS	*fa;
 {
+	char	v1[6], v2[6];
+
 	if (fa->nfargs != 8)
 		return(-1);
 	setmat(mod);
-	printf("o %s\n", id);
-	printf("v cv1 =\np %.12g %.12g %.12g\n",
-			fa->farg[0], fa->farg[1], fa->farg[2]);
-	printf("v cv2 =\np %.12g %.12g %.12g\n",
-			fa->farg[3], fa->farg[4], fa->farg[5]);
+	setobj(id);
+	getvertid(v1, fa->farg);
+	getvertid(v2, fa->farg + 3);
 	if (typ[1] == 'u')			/* cup -> inverted cone */
-		printf("cone cv1 %.12g cv2 %.12g\n",
-				-fa->farg[6], -fa->farg[7]);
+		printf("cone %s %.12g %s %.12g\n",
+				v1, -fa->farg[6], v2, -fa->farg[7]);
 	else
-		printf("cone cv1 %.12g cv2 %.12g\n",
-				fa->farg[6], fa->farg[7]);
-	puts("o");
+		printf("cone %s %.12g %s %.12g\n",
+				v1, fa->farg[6], v2, fa->farg[7]);
 	return(0);
 }
 
@@ -390,14 +478,14 @@ o_sphere(mod, typ, id, fa)	/* print out a sphere */
 char	*mod, *typ, *id;
 register FUNARGS	*fa;
 {
+	char	cent[6];
+
 	if (fa->nfargs != 4)
 		return(-1);
 	setmat(mod);
-	printf("o %s\n", id);
-	printf("v cent =\np %.12g %.12g %.12g\n",
-			fa->farg[0], fa->farg[1], fa->farg[2]);
-	printf("sph cent %.12g\n", typ[0]=='b' ? -fa->farg[3] : fa->farg[3]);
-	puts("o");
+	setobj(id);
+	printf("sph %s %.12g\n", getvertid(cent, fa->farg),
+			typ[0]=='b' ? -fa->farg[3] : fa->farg[3]);
 	return(0);
 }
 
@@ -407,17 +495,16 @@ o_cylinder(mod, typ, id, fa)	/* print out a cylinder *
 char	*mod, *typ, *id;
 register FUNARGS	*fa;
 {
+	char	v1[6], v2[6];
+
 	if (fa->nfargs != 7)
 		return(-1);
 	setmat(mod);
-	printf("o %s\n", id);
-	printf("v cv1 =\np %.12g %.12g %.12g\n",
-			fa->farg[0], fa->farg[1], fa->farg[2]);
-	printf("v cv2 =\np %.12g %.12g %.12g\n",
-			fa->farg[3], fa->farg[4], fa->farg[5]);
-	printf("cyl cv1 %.12g cv2\n",
-			typ[0]=='t' ? -fa->farg[6] : fa->farg[6]);
-	puts("o");
+	setobj(id);
+	getvertid(v1, fa->farg);
+	getvertid(v2, fa->farg + 3);
+	printf("cyl %s %.12g %s\n", v1,
+			typ[0]=='t' ? -fa->farg[6] : fa->farg[6], v2);
 	return(0);
 }
 
@@ -430,10 +517,10 @@ register FUNARGS	*fa;
 	if (fa->nfargs != 8)
 		return(-1);
 	setmat(mod);
-	printf("o %s\n", id);
-	printf("v cent =\np %.12g %.12g %.12g\n",
+	setobj(id);
+	printf("v cent =\n\tp %.12g %.12g %.12g\n",
 			fa->farg[0], fa->farg[1], fa->farg[2]);
-	printf("n %.12g %.12g %.12g\n",
+	printf("\tn %.12g %.12g %.12g\n",
 			fa->farg[3], fa->farg[4], fa->farg[5]);
 	if (fa->farg[6] < fa->farg[7])
 		printf("ring cent %.12g %.12g\n",
@@ -441,7 +528,6 @@ register FUNARGS	*fa;
 	else
 		printf("ring cent %.12g %.12g\n",
 				fa->farg[7], fa->farg[6]);
-	puts("o");
 	return(0);
 }
 
@@ -451,20 +537,43 @@ o_instance(mod, typ, id, fa)	/* convert an instance */
 char	*mod, *typ, *id;
 FUNARGS	*fa;
 {
-	return(0);		/* this is too damned difficult! */
+	register int	i;
+	register char	*cp;
+	char	*start = NULL, *end = NULL;
+	/*
+	 * We don't really know how to do this, so we just create
+	 * a reference to an undefined MGF file and it's the user's
+	 * responsibility to create this file and put the appropriate
+	 * stuff into it.
+	 */
+	if (fa->nsargs < 1)
+		return(-1);
+	setmat(mod);			/* only works if surfaces are void */
+	setobj(id);
+	for (cp = fa->sarg[0]; *cp; cp++)	/* construct MGF file name */
+		if (*cp == '/')
+			start = cp+1;
+		else if (*cp == '.')
+			end = cp;
+	if (start == NULL)
+		start = fa->sarg[0];
+	if (end == NULL || start >= end)
+		end = cp;
+	fputs("i ", stdout);			/* print include entity */
+	for (cp = start; cp < end; cp++)
+		putchar(*cp);
+	fputs(".mgf", stdout);			/* add MGF suffix */
+	for (i = 1; i < fa->nsargs; i++) {	/* add transform */
+		putchar(' ');
+		fputs(fa->sarg[i], stdout);
+	}
+	putchar('\n');
+	clrverts();			/* vertex id's no longer reliable */
+	return(0);
 }
 
 
 int
-o_source(mod, typ, id, fa)	/* convert a source */
-char	*mod, *typ, *id;
-FUNARGS	*fa;
-{
-	return(0);		/* there is no MGF equivalent! */
-}
-
-
-int
 o_illum(mod, typ, id, fa)	/* convert an illum material */
 char	*mod, *typ, *id;
 FUNARGS	*fa;
@@ -475,7 +584,7 @@ FUNARGS	*fa;
 	}
 					/* else create invisible material */
 	newmat(id, NULL);
-	puts("ts 1 0");
+	puts("\tts 1 0");
 	return(0);
 }
 
@@ -493,15 +602,17 @@ register FUNARGS	*fa;
 	newmat(id, NULL);
 	rrgb[0] = fa->farg[0]; rrgb[1] = fa->farg[1]; rrgb[2] = fa->farg[2];
 	rgb_cie(cxyz, rrgb);
-	puts("c");				/* put diffuse component */
+	puts("\tc");				/* put diffuse component */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("cxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("rd %.4f\n", cxyz[1]*(1. - fa->farg[3]));
-	puts("c");				/* put specular component */
-	printf("rs %.4f %.4f\n", fa->farg[3],
-			typ[7]=='2' ? .5*(fa->farg[4] + fa->farg[5]) :
-					fa->farg[4]);
+		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\trd %.4f\n", cxyz[1]*(1. - fa->farg[3]));
+	if (fa->farg[3] > FTINY) {		/* put specular component */
+		puts("\tc");
+		printf("\trs %.4f %.4f\n", fa->farg[3],
+				typ[7]=='2' ? .5*(fa->farg[4] + fa->farg[5]) :
+						fa->farg[4]);
+	}
 	return(0);
 }
 
@@ -519,13 +630,13 @@ register FUNARGS	*fa;
 	newmat(id, NULL);
 	rrgb[0] = fa->farg[0]; rrgb[1] = fa->farg[1]; rrgb[2] = fa->farg[2];
 	rgb_cie(cxyz, rrgb);
-	puts("c");				/* put diffuse component */
+	puts("\tc");				/* put diffuse component */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("cxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("rd %.4f\n", cxyz[1]*(1. - fa->farg[3]));
+		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\trd %.4f\n", cxyz[1]*(1. - fa->farg[3]));
 						/* put specular component */
-	printf("rs %.4f %.4f\n", cxyz[1]*fa->farg[3],
+	printf("\trs %.4f %.4f\n", cxyz[1]*fa->farg[3],
 			typ[5]=='2' ? .5*(fa->farg[4] + fa->farg[5]) :
 					fa->farg[4]);
 	return(0);
@@ -546,30 +657,62 @@ register FUNARGS	*fa;
 	newmat(id, NULL);
 	if (fa->nfargs == 4)
 		nrfr = fa->farg[3];
+	printf("\tir %f 0\n", nrfr);
 	F = (1. - nrfr)/(1. + nrfr);		/* use normal incidence */
 	F *= F;
 	for (i = 0; i < 3; i++) {
-		rrgb[i] = (1. - F)*(1. - F)/(1. - F*F*fa->farg[i]*fa->farg[i]);
-		trgb[i] = F * (1. + (1. - 2.*F)*fa->farg[i]) /
+		trgb[i] = fa->farg[i] * (1. - F)*(1. - F) /
 				(1. - F*F*fa->farg[i]*fa->farg[i]);
+		rrgb[i] = F * (1. + (1. - 2.*F)*fa->farg[i]) /
+				(1. - F*F*fa->farg[i]*fa->farg[i]);
 	}
 	rgb_cie(cxyz, rrgb);			/* put reflected component */
-	puts("c");
+	puts("\tc");
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("cxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("rs %.4f 0\n", cxyz[1]);
+		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\trs %.4f 0\n", cxyz[1]);
 	rgb_cie(cxyz, trgb);			/* put transmitted component */
-	puts("c");
+	puts("\tc");
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("cxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("ts %.4f 0\n", cxyz[1]);
+		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\tts %.4f 0\n", cxyz[1]);
 	return(0);
 }
 
 
 int
+o_dielectric(mod, typ, id, fa)	/* convert a dielectric material */
+char	*mod, *typ, *id;
+register FUNARGS	*fa;
+{
+	COLOR	cxyz, trgb;
+	double	F, d;
+	register int	i;
+
+	if (fa->nfargs != 5)
+		return(-1);
+	newmat(id, NULL);
+	F = (1. - fa->farg[3])/(1. + fa->farg[3]);	/* normal incidence */
+	F *= F;
+	for (i = 0; i < 3; i++)
+		trgb[i] = (1. - F)*pow(fa->farg[i], C_1SIDEDTHICK/unit_mult);
+	printf("\tir %f 0\n", fa->farg[3]);	/* put index of refraction */
+	printf("\tsides 1\n");
+	puts("\tc");				/* put reflected component */
+	printf("\trs %.4f 0\n", F);
+	rgb_cie(cxyz, trgb);			/* put transmitted component */
+	puts("\tc");
+	d = cxyz[0] + cxyz[1] + cxyz[2];
+	if (d > FTINY)
+		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\tts %.4f 0\n", cxyz[1]);
+	return(0);
+}
+
+
+int
 o_mirror(mod, typ, id, fa)	/* convert a mirror material */
 char	*mod, *typ, *id;
 register FUNARGS	*fa;
@@ -586,11 +729,11 @@ register FUNARGS	*fa;
 	newmat(id, NULL);
 	rrgb[0] = fa->farg[0]; rrgb[1] = fa->farg[1]; rrgb[2] = fa->farg[2];
 	rgb_cie(cxyz, rrgb);
-	puts("c");				/* put specular component */
+	puts("\tc");				/* put specular component */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("cxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("rs %.4f 0\n", cxyz[1]);
+		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\trs %.4f 0\n", cxyz[1]);
 	return(0);
 }
 
@@ -619,17 +762,17 @@ register FUNARGS	*fa;
 	newmat(id, NULL);
 	rrgb[0] = fa->farg[0]; rrgb[1] = fa->farg[1]; rrgb[2] = fa->farg[2];
 	rgb_cie(cxyz, rrgb);
-	puts("c");				/* put transmitted diffuse */
+	puts("\tc");				/* put transmitted diffuse */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("cxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("td %.4f\n", cxyz[1]*trans*(1. - fa->farg[3])*(1. - tspec));
+		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\ttd %.4f\n", cxyz[1]*trans*(1. - fa->farg[3])*(1. - tspec));
 						/* put transmitted specular */
-	printf("ts %.4f %.4f\n", cxyz[1]*trans*tspec*(1. - fa->farg[3]), rough);
+	printf("\tts %.4f %.4f\n", cxyz[1]*trans*tspec*(1. - fa->farg[3]), rough);
 						/* put reflected diffuse */
-	printf("rd %.4f\n", cxyz[1]*(1. - fa->farg[3])*(1. - trans));
-	puts("c");				/* put reflected specular */
-	printf("rs %.4f %.4f\n", fa->farg[3], rough);
+	printf("\trd %.4f\n", cxyz[1]*(1. - fa->farg[3])*(1. - trans));
+	puts("\tc");				/* put reflected specular */
+	printf("\trs %.4f %.4f\n", fa->farg[3], rough);
 	return(0);
 }
 
@@ -648,9 +791,9 @@ register FUNARGS	*fa;
 	rrgb[0] = fa->farg[0]; rrgb[1] = fa->farg[1]; rrgb[2] = fa->farg[2];
 	rgb_cie(cxyz, rrgb);
 	d = cxyz[0] + cxyz[1] + cxyz[2];
-	puts("c");
+	puts("\tc");
 	if (d > FTINY)
-		printf("cxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("ed %.4g\n", cxyz[1]);
+		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\ted %.4g\n", cxyz[1]*(PI*WHTEFFICACY));
 	return(0);
 }