--- ray/src/util/wrapBSDF.c	2015/02/17 02:44:54	2.8
+++ ray/src/util/wrapBSDF.c	2015/05/29 07:16:49	2.15
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.8 2015/02/17 02:44:54 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.15 2015/05/29 07:16:49 greg Exp $";
 #endif
 /*
  * Wrap BSDF data in valid WINDOW XML file
@@ -66,7 +66,8 @@ int		nfield_assign = 0;
 					/* data file(s) & spectra */
 enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward };
 
-enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5 };
+enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5,
+	DSuprime=-6, DSvprime=-7 };
 
 #define MAXFILES	20
 
@@ -159,6 +160,7 @@ input2str(const char *inpspec)
 			fprintf(stderr, "%s: cannot open\n", inpspec);
 			return "";
 		}
+#ifndef _WIN32				/* XXX somehow broken on Windows */
 		len = lseek(fd, 0L, SEEK_END);
 		if (len > 0) {
 			lseek(fd, 0L, SEEK_SET);
@@ -177,6 +179,7 @@ input2str(const char *inpspec)
 			close(fd);
 			return str;
 		}
+#endif
 		fp = fdopen(fd, "r");		/* not a regular file */
 	}
 						/* reading from stream */
@@ -294,14 +297,12 @@ mat_assignments(const char *caller, const char *fn, ez
 	if (xml_input == win6_template)
 	    for (i = 0; XMLfieldID[i].nickName[0]; i++)
 		if (XMLfieldID[i].win_need &&
-			!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0]) {
+			!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0])
 			fprintf(stderr,
-			"%s: missing required '%s' assignment for WINDOW <%s>\n",
+			"%s: warning - missing '%s' assignment for WINDOW <%s>\n",
 					caller, XMLfieldID[i].nickName,
 					XMLfieldID[i].fullName);
-			return 0;
-		}
-	return 1;		/* no errors */
+	return 1;
 }
 
 /* Complete angle basis specification */
@@ -444,22 +445,30 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
 		break;
 	case DSxbar31:
 		puts("\t\t<Wavelength unit=\"Integral\">CIE-X</Wavelength>");
-		puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
+		puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
 		puts("\t\t<DetectorSpectrum>ASTM E308 1931 X.dsp</DetectorSpectrum>");
 		break;
 	case DSzbar31:
 		puts("\t\t<Wavelength unit=\"Integral\">CIE-Z</Wavelength>");
-		puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
+		puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
 		puts("\t\t<DetectorSpectrum>ASTM E308 1931 Z.dsp</DetectorSpectrum>");
 		break;
+	case DSuprime:
+		puts("\t\t<Wavelength unit=\"Integral\">CIE-u</Wavelength>");
+		puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
+		break;
+	case DSvprime:
+		puts("\t\t<Wavelength unit=\"Integral\">CIE-v</Wavelength>");
+		puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
+		break;
 	case DSsolar:
 		puts("\t\t<Wavelength unit=\"Integral\">Solar</Wavelength>");
-		puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
+		puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
 		puts("\t\t<DetectorSpectrum>None</DetectorSpectrum>");
 		break;
 	case DSnir:
 		puts("\t\t<Wavelength unit=\"Integral\">NIR</Wavelength>");
-		puts("\t\tSourceSpectrum>PLACE_HOLDER</SourceSpectrum>");
+		puts("\t\t<SourceSpectrum>PLACE_HOLDER</SourceSpectrum>");
 		puts("\t\t<DetectorSpectrum>PLACE_HOLDER</DetectorSpectrum>");
 		break;
 	default:
@@ -470,7 +479,7 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
 				spectr_file[df->spectrum]);
 		if (cp != NULL)
 			*cp = '.';
-		puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
+		puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
 		printf("\t\t<DetectorSpectrum>%s</DetectorSpectrum>\n",
 				spectr_file[df->spectrum]);
 		break;
@@ -576,6 +585,7 @@ writeBSDF(const char *caller, ezxml_t fl)
 		free(xml);
 		return 0;
 	}
+	puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 	fflush(stdout);				/* write previous XML info. */
 	if (write(fileno(stdout), xml, ei) != ei) {
 		free(xml);
@@ -707,7 +717,7 @@ UsageExit(const char *pname)
 {
 	fputs("Usage: ", stderr);
 	fputs(pname, stderr);
-	fputs(" [-W][-a {kf|kh|kq|t3|t4}][-u unit][-g geom][-f 'x=string;y=string']", 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(" [input.xml]\n", stderr);
 	exit(1);
@@ -775,7 +785,7 @@ main(int argc, char *argv[])
 				UsageExit(argv[0]);
 			continue;
 		case 'c':		/* correct solid angle */
-			correct_solid_angle ^= 1;
+			correct_solid_angle = 1;
 			continue;
 		case 't':		/* transmission */
 			if (i >= argc-1)
@@ -833,6 +843,10 @@ main(int argc, char *argv[])
 				cur_spectrum = DSxbar31;
 			else if (!strcasecmp(argv[i], "CIE-Z"))
 				cur_spectrum = DSzbar31;
+			else if (!strcasecmp(argv[i], "CIE-u"))
+				cur_spectrum = DSuprime;
+			else if (!strcasecmp(argv[i], "CIE-v"))
+				cur_spectrum = DSvprime;
 			else if (!strcasecmp(argv[i], "NIR"))
 				cur_spectrum = DSnir;
 			else {