--- ray/src/util/wrapBSDF.c	2015/04/02 16:40:32	2.14
+++ ray/src/util/wrapBSDF.c	2016/02/03 00:22:55	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.14 2015/04/02 16:40:32 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.19 2016/02/03 00:22:55 greg Exp $";
 #endif
 /*
  * Wrap BSDF data in valid WINDOW XML file
@@ -9,7 +9,7 @@ static const char RCSid[] = "$Id: wrapBSDF.c,v 2.14 20
 
 #include <ctype.h>
 #include "rtio.h"
-#include "rtprocess.h"
+#include "paths.h"
 #include "ezxml.h"
 #include "bsdf.h"
 #include "bsdf_m.h"
@@ -25,7 +25,10 @@ const char	*attr_unit = "meter";
 const char	legal_units[] = "meter|foot|inch|centimeter|millimeter";
 					/* system materials & geometry */
 const char	*mgf_geometry = NULL;
-
+					/* comment list */
+#define MAXCOMM		30
+const char	*commlist[MAXCOMM];
+int		ncomm = 0;
 					/* angle bases */
 enum { ABdefault=-1, ABklemsFull=0, ABklemsHalf, ABklemsQuarter,
 		ABtensorTree3, ABtensorTree4, ABend };
@@ -79,6 +82,8 @@ struct s_dfile {
 
 int		ndataf = 0;		/* number of data files */
 
+int		unlink_datafiles = 0;	/* unlink data files when done */
+
 const char	*spectr_file[MAXFILES];	/* custom spectral curve input */
 
 const char	top_level_name[] = "WindowElement";
@@ -585,6 +590,9 @@ writeBSDF(const char *caller, ezxml_t fl)
 		free(xml);
 		return 0;
 	}
+	puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+	for (i = 0; i < ncomm; i++)
+		printf("<!-- %s -->\n", commlist[i]);
 	fflush(stdout);				/* write previous XML info. */
 	if (write(fileno(stdout), xml, ei) != ei) {
 		free(xml);
@@ -598,7 +606,18 @@ writeBSDF(const char *caller, ezxml_t fl)
 	fputs(xml+ei, stdout);			/* write trailer */
 	free(xml);				/* free string */
 	fputc('\n', stdout);
-	return (fflush(stdout) == 0);
+	if (fflush(stdout) != 0)
+		return 0;
+						/* unlink data files if req. */
+	for (i = ndataf*(unlink_datafiles != 0); i--; )
+		if (data_file[i].fname != stdin_name &&
+				data_file[i].fname[0] != '!')
+			unlink(data_file[i].fname);
+	if (unlink_datafiles > 1 && mgf_geometry != NULL &&
+			mgf_geometry != stdin_name &&
+			mgf_geometry[0] != '!')
+		unlink(mgf_geometry);
+	return 1;
 }
 
 /* Insert BSDF data into XML wrapper */
@@ -717,7 +736,7 @@ UsageExit(const char *pname)
 	fputs("Usage: ", stderr);
 	fputs(pname, stderr);
 	fputs(" [-W][-c][-a {kf|kh|kq|t3|t4}][-u unit][-g geom][-f 'x=string;y=string']", stderr);
-	fputs(" [-s spectr][-tb inp][-tf inp][-rb inp][-rf inp]", stderr);
+	fputs(" [-s spectr][-tb inp][-tf inp][-rb inp][-rf inp][-C comm]", stderr);
 	fputs(" [input.xml]\n", stderr);
 	exit(1);
 }
@@ -762,6 +781,9 @@ main(int argc, char *argv[])
 			}
 			attr_unit = argv[i];
 			continue;
+		case 'U':		/* unlink data files when done */
+			unlink_datafiles = 1 + (argv[i][2] == 'U');
+			continue;
 		case 'a':		/* angle basis */
 			if (++i >= argc)
 				UsageExit(argv[0]);
@@ -785,6 +807,19 @@ main(int argc, char *argv[])
 			continue;
 		case 'c':		/* correct solid angle */
 			correct_solid_angle = 1;
+			continue;
+		case 'C':		/* comment */
+			if (ncomm >= MAXCOMM) {
+				fprintf(stderr, "%s: too many comments\n",
+						argv[0]);
+				return 1;
+			}
+			if (strchr(argv[++i], '>') != NULL) {
+				fprintf(stderr, "%s: illegal character in comment\n",
+						argv[0]);
+				return 1;
+			}
+			commlist[ncomm++] = argv[i];
 			continue;
 		case 't':		/* transmission */
 			if (i >= argc-1)