--- ray/src/cv/mgflib/context.c	1994/06/24 17:15:47	1.6
+++ ray/src/cv/mgflib/context.c	2003/07/27 22:12:02	1.28
@@ -1,15 +1,13 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: context.c,v 1.28 2003/07/27 22:12:02 schorsch Exp $";
 #endif
-
 /*
  * Context handlers
  */
 
 #include <stdio.h>
 #include <math.h>
+#include <stdlib.h>
 #include <string.h>
 #include "parser.h"
 #include "lookup.h"
@@ -26,19 +24,63 @@ static C_VERTEX		c_unvertex = C_DEFVERTEX;
 
 				/* the current contexts */
 C_COLOR		*c_ccolor = &c_uncolor;
+char		*c_ccname = NULL;
 C_MATERIAL	*c_cmaterial = &c_unmaterial;
+char		*c_cmname = NULL;
 C_VERTEX	*c_cvertex = &c_unvertex;
+char		*c_cvname = NULL;
 
 static LUTAB	clr_tab = LU_SINIT(free,free);	/* color lookup table */
 static LUTAB	mat_tab = LU_SINIT(free,free);	/* material lookup table */
 static LUTAB	vtx_tab = LU_SINIT(free,free);	/* vertex lookup table */
 
-				/* CIE 1931 Standard Observer */
-static C_COLOR	cie_xf = C_CIEX;
-static C_COLOR	cie_yf = C_CIEY;
-static C_COLOR	cie_zf = C_CIEZ;
+				/* CIE 1931 Standard Observer curves */
+static C_COLOR	cie_xf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,
+			{14,42,143,435,1344,2839,3483,3362,2908,1954,956,
+			320,49,93,633,1655,2904,4334,5945,7621,9163,10263,
+			10622,10026,8544,6424,4479,2835,1649,874,468,227,
+			114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230
+			};
+static C_COLOR	cie_yf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,
+			{0,1,4,12,40,116,230,380,600,910,1390,2080,3230,
+			5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,
+			5030,3810,2650,1750,1070,610,320,170,82,41,21,10,
+			5,2,1,1,0,0}, 106856L, .398, .542, 493.525
+			};
+static C_COLOR	cie_zf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,
+			{65,201,679,2074,6456,13856,17471,17721,16692,
+			12876,8130,4652,2720,1582,782,422,203,87,39,21,17,
+			11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+			106770L, .147, .077, 54.363
+			};
+				/* Derived CIE 1931 Primaries (imaginary) */
+static C_COLOR	cie_xp = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY,
+			{-174,-198,-195,-197,-202,-213,-235,-272,-333,
+			-444,-688,-1232,-2393,-4497,-6876,-6758,-5256,
+			-3100,-815,1320,3200,4782,5998,6861,7408,7754,
+			7980,8120,8199,8240,8271,8292,8309,8283,8469,
+			8336,8336,8336,8336,8336,8336},
+			127424L, 1., .0,
+			};
+static C_COLOR	cie_yp = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY,
+			{-451,-431,-431,-430,-427,-417,-399,-366,-312,
+			-204,57,691,2142,4990,8810,9871,9122,7321,5145,
+			3023,1123,-473,-1704,-2572,-3127,-3474,-3704,
+			-3846,-3927,-3968,-3999,-4021,-4038,-4012,-4201,
+			-4066,-4066,-4066,-4066,-4066,-4066},
+			-23035L, .0, 1.,
+			};
+static C_COLOR	cie_zp = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY,
+			{4051,4054,4052,4053,4054,4056,4059,4064,4071,
+			4074,4056,3967,3677,2933,1492,313,-440,-795,
+			-904,-918,-898,-884,-869,-863,-855,-855,-851,
+			-848,-847,-846,-846,-846,-845,-846,-843,-845,
+			-845,-845,-845,-845,-845},
+			36057L, .0, .0,
+			};
 
 static int	setspectrum();
+static int	setbbtemp();
 static void	mixcolors();
 
 
@@ -58,20 +100,24 @@ register char	**av;
 		if (ac == 1) {		/* set unnamed color context */
 			c_uncolor = c_dfcolor;
 			c_ccolor = &c_uncolor;
+			c_ccname = NULL;
 			return(MG_OK);
 		}
+		if (!isname(av[1]))
+			return(MG_EILL);
 		lp = lu_find(&clr_tab, av[1]);	/* lookup context */
 		if (lp == NULL)
 			return(MG_EMEM);
+		c_ccname = lp->key;
+		c_ccolor = (C_COLOR *)lp->data;
 		if (ac == 2) {		/* reestablish previous context */
-			if (lp->data == NULL)
+			if (c_ccolor == NULL)
 				return(MG_EUNDEF);
-			c_ccolor = (C_COLOR *)lp->data;
 			return(MG_OK);
 		}
 		if (av[2][0] != '=' || av[2][1])
 			return(MG_ETYPE);
-		if (lp->key == NULL) {	/* create new color context */
+		if (c_ccolor == NULL) {	/* create new color context */
 			lp->key = (char *)malloc(strlen(av[1])+1);
 			if (lp->key == NULL)
 				return(MG_EMEM);
@@ -79,10 +125,15 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_COLOR));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_ccname = lp->key;
+			c_ccolor = (C_COLOR *)lp->data;
+			c_ccolor->clock = 0;
+			c_ccolor->client_data = NULL;
 		}
-		c_ccolor = (C_COLOR *)lp->data;
+		i = c_ccolor->clock;
 		if (ac == 3) {		/* use default template */
 			*c_ccolor = c_dfcolor;
+			c_ccolor->clock = i + 1;
 			return(MG_OK);
 		}
 		lp = lu_find(&clr_tab, av[3]);	/* lookup template */
@@ -91,36 +142,40 @@ register char	**av;
 		if (lp->data == NULL)
 			return(MG_EUNDEF);
 		*c_ccolor = *(C_COLOR *)lp->data;
-		if (ac > 4)
-			return(MG_EARGC);
+		c_ccolor->clock = i + 1;
 		return(MG_OK);
 	case MG_E_CXY:		/* assign CIE XY value */
 		if (ac != 3)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]))
+		if (!isflt(av[1]) | !isflt(av[2]))
 			return(MG_ETYPE);
 		c_ccolor->cx = atof(av[1]);
 		c_ccolor->cy = atof(av[2]);
 		c_ccolor->flags = C_CDXY|C_CSXY;
-		if (c_ccolor->cx < 0. | c_ccolor->cy < 0. |
-				c_ccolor->cx + c_ccolor->cy > 1.)
+		if ((c_ccolor->cx < 0.) | (c_ccolor->cy < 0.) |
+				(c_ccolor->cx + c_ccolor->cy > 1.))
 			return(MG_EILL);
+		c_ccolor->clock++;
 		return(MG_OK);
 	case MG_E_CSPEC:	/* assign spectral values */
 		if (ac < 5)
 			return(MG_EARGC);
-		if (!isint(av[1]) || !isint(av[2]))
+		if (!isflt(av[1]) | !isflt(av[2]))
 			return(MG_ETYPE);
-		return(setspectrum(c_ccolor, atoi(av[1]), atoi(av[2]),
+		return(setspectrum(c_ccolor, atof(av[1]), atof(av[2]),
 				ac-3, av+3));
+	case MG_E_CCT:		/* assign black body spectrum */
+		if (ac != 2)
+			return(MG_EARGC);
+		if (!isflt(av[1]))
+			return(MG_ETYPE);
+		return(setbbtemp(c_ccolor, atof(av[1])));
 	case MG_E_CMIX:		/* mix colors */
 		if (ac < 5 || (ac-1)%2)
 			return(MG_EARGC);
 		if (!isflt(av[1]))
 			return(MG_ETYPE);
 		wsum = atof(av[1]);
-		if (wsum < 0.)
-			return(MG_EILL);
 		if ((lp = lu_find(&clr_tab, av[2])) == NULL)
 			return(MG_EMEM);
 		if (lp->data == NULL)
@@ -130,8 +185,6 @@ register char	**av;
 			if (!isflt(av[i]))
 				return(MG_ETYPE);
 			w = atof(av[i]);
-			if (w < 0.)
-				return(MG_EILL);
 			if ((lp = lu_find(&clr_tab, av[i+1])) == NULL)
 				return(MG_EMEM);
 			if (lp->data == NULL)
@@ -140,6 +193,9 @@ register char	**av;
 					w, (C_COLOR *)lp->data);
 			wsum += w;
 		}
+		if (wsum <= 0.)
+			return(MG_EILL);
+		c_ccolor->clock++;
 		return(MG_OK);
 	}
 	return(MG_EUNK);
@@ -151,6 +207,7 @@ c_hmaterial(ac, av)		/* handle material entity */
 int	ac;
 register char	**av;
 {
+	int	i;
 	register LUENT	*lp;
 
 	switch (mg_entity(av[0])) {
@@ -160,20 +217,24 @@ register char	**av;
 		if (ac == 1) {		/* set unnamed material context */
 			c_unmaterial = c_dfmaterial;
 			c_cmaterial = &c_unmaterial;
+			c_cmname = NULL;
 			return(MG_OK);
 		}
+		if (!isname(av[1]))
+			return(MG_EILL);
 		lp = lu_find(&mat_tab, av[1]);	/* lookup context */
 		if (lp == NULL)
 			return(MG_EMEM);
+		c_cmname = lp->key;
+		c_cmaterial = (C_MATERIAL *)lp->data;
 		if (ac == 2) {		/* reestablish previous context */
-			if (lp->data == NULL)
+			if (c_cmaterial == NULL)
 				return(MG_EUNDEF);
-			c_cmaterial = (C_MATERIAL *)lp->data;
 			return(MG_OK);
 		}
 		if (av[2][0] != '=' || av[2][1])
 			return(MG_ETYPE);
-		if (lp->key == NULL) {	/* create new material context */
+		if (c_cmaterial == NULL) {	/* create new material */
 			lp->key = (char *)malloc(strlen(av[1])+1);
 			if (lp->key == NULL)
 				return(MG_EMEM);
@@ -181,11 +242,15 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_MATERIAL));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_cmname = lp->key;
+			c_cmaterial = (C_MATERIAL *)lp->data;
+			c_cmaterial->clock = 0;
+			c_cmaterial->client_data = NULL;
 		}
-		c_cmaterial = (C_MATERIAL *)lp->data;
+		i = c_cmaterial->clock;
 		if (ac == 3) {		/* use default template */
 			*c_cmaterial = c_dfmaterial;
-			c_cmaterial->name = lp->key;
+			c_cmaterial->clock = i + 1;
 			return(MG_OK);
 		}
 		lp = lu_find(&mat_tab, av[3]);	/* lookup template */
@@ -194,10 +259,18 @@ register char	**av;
 		if (lp->data == NULL)
 			return(MG_EUNDEF);
 		*c_cmaterial = *(C_MATERIAL *)lp->data;
-		c_cmaterial->name = lp->key;
-		c_cmaterial->clock = 1;
-		if (ac > 4)
+		c_cmaterial->clock = i + 1;
+		return(MG_OK);
+	case MG_E_IR:		/* set index of refraction */
+		if (ac != 3)
 			return(MG_EARGC);
+		if (!isflt(av[1]) | !isflt(av[2]))
+			return(MG_ETYPE);
+		c_cmaterial->nr = atof(av[1]);
+		c_cmaterial->ni = atof(av[2]);
+		if (c_cmaterial->nr <= FTINY)
+			return(MG_EILL);
+		c_cmaterial->clock++;
 		return(MG_OK);
 	case MG_E_RD:		/* set diffuse reflectance */
 		if (ac != 2)
@@ -205,7 +278,7 @@ register char	**av;
 		if (!isflt(av[1]))
 			return(MG_ETYPE);
 		c_cmaterial->rd = atof(av[1]);
-		if (c_cmaterial->rd < 0. | c_cmaterial->rd > 1.)
+		if ((c_cmaterial->rd < 0.) | (c_cmaterial->rd > 1.))
 			return(MG_EILL);
 		c_cmaterial->rd_c = *c_ccolor;
 		c_cmaterial->clock++;
@@ -227,19 +300,20 @@ register char	**av;
 		if (!isflt(av[1]))
 			return(MG_ETYPE);
 		c_cmaterial->td = atof(av[1]);
-		if (c_cmaterial->td < 0. | c_cmaterial->td > 1.)
+		if ((c_cmaterial->td < 0.) | (c_cmaterial->td > 1.))
 			return(MG_EILL);
 		c_cmaterial->td_c = *c_ccolor;
+		c_cmaterial->clock++;
 		return(MG_OK);
 	case MG_E_RS:		/* set specular reflectance */
 		if (ac != 3)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]))
+		if (!isflt(av[1]) | !isflt(av[2]))
 			return(MG_ETYPE);
 		c_cmaterial->rs = atof(av[1]);
 		c_cmaterial->rs_a = atof(av[2]);
-		if (c_cmaterial->rs < 0. | c_cmaterial->rs > 1. |
-				c_cmaterial->rs_a < 0.)
+		if ((c_cmaterial->rs < 0.) | (c_cmaterial->rs > 1.) |
+				(c_cmaterial->rs_a < 0.))
 			return(MG_EILL);
 		c_cmaterial->rs_c = *c_ccolor;
 		c_cmaterial->clock++;
@@ -247,16 +321,30 @@ register char	**av;
 	case MG_E_TS:		/* set specular transmittance */
 		if (ac != 3)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]))
+		if (!isflt(av[1]) | !isflt(av[2]))
 			return(MG_ETYPE);
 		c_cmaterial->ts = atof(av[1]);
 		c_cmaterial->ts_a = atof(av[2]);
-		if (c_cmaterial->ts < 0. | c_cmaterial->ts > 1. |
-				c_cmaterial->ts_a < 0.)
+		if ((c_cmaterial->ts < 0.) | (c_cmaterial->ts > 1.) |
+				(c_cmaterial->ts_a < 0.))
 			return(MG_EILL);
 		c_cmaterial->ts_c = *c_ccolor;
 		c_cmaterial->clock++;
 		return(MG_OK);
+	case MG_E_SIDES:	/* set number of sides */
+		if (ac != 2)
+			return(MG_EARGC);
+		if (!isint(av[1]))
+			return(MG_ETYPE);
+		i = atoi(av[1]);
+		if (i == 1)
+			c_cmaterial->sided = 1;
+		else if (i == 2)
+			c_cmaterial->sided = 0;
+		else
+			return(MG_EILL);
+		c_cmaterial->clock++;
+		return(MG_OK);
 	}
 	return(MG_EUNK);
 }
@@ -267,6 +355,7 @@ c_hvertex(ac, av)		/* handle a vertex entity */
 int	ac;
 register char	**av;
 {
+	int	i;
 	register LUENT	*lp;
 
 	switch (mg_entity(av[0])) {
@@ -276,20 +365,24 @@ register char	**av;
 		if (ac == 1) {		/* set unnamed vertex context */
 			c_unvertex = c_dfvertex;
 			c_cvertex = &c_unvertex;
+			c_cvname = NULL;
 			return(MG_OK);
 		}
+		if (!isname(av[1]))
+			return(MG_EILL);
 		lp = lu_find(&vtx_tab, av[1]);	/* lookup context */
 		if (lp == NULL)
 			return(MG_EMEM);
+		c_cvname = lp->key;
+		c_cvertex = (C_VERTEX *)lp->data;
 		if (ac == 2) {		/* reestablish previous context */
-			if (lp->data == NULL)
+			if (c_cvertex == NULL)
 				return(MG_EUNDEF);
-			c_cvertex = (C_VERTEX *)lp->data;
 			return(MG_OK);
 		}
 		if (av[2][0] != '=' || av[2][1])
 			return(MG_ETYPE);
-		if (lp->key == NULL) {	/* create new vertex context */
+		if (c_cvertex == NULL) {	/* create new vertex context */
 			lp->key = (char *)malloc(strlen(av[1])+1);
 			if (lp->key == NULL)
 				return(MG_EMEM);
@@ -297,10 +390,15 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_VERTEX));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_cvname = lp->key;
+			c_cvertex = (C_VERTEX *)lp->data;
+			c_cvertex->clock = 0;
+			c_cvertex->client_data = NULL;
 		}
-		c_cvertex = (C_VERTEX *)lp->data;
+		i = c_cvertex->clock;
 		if (ac == 3) {		/* use default template */
 			*c_cvertex = c_dfvertex;
+			c_cvertex->clock = i + 1;
 			return(MG_OK);
 		}
 		lp = lu_find(&vtx_tab, av[3]);	/* lookup template */
@@ -309,27 +407,28 @@ register char	**av;
 		if (lp->data == NULL)
 			return(MG_EUNDEF);
 		*c_cvertex = *(C_VERTEX *)lp->data;
-		if (ac > 4)
-			return(MG_EARGC);
+		c_cvertex->clock = i + 1;
 		return(MG_OK);
 	case MG_E_POINT:	/* set point */
 		if (ac != 4)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]) || !isflt(av[3]))
+		if (!isflt(av[1]) | !isflt(av[2]) | !isflt(av[3]))
 			return(MG_ETYPE);
 		c_cvertex->p[0] = atof(av[1]);
 		c_cvertex->p[1] = atof(av[2]);
 		c_cvertex->p[2] = atof(av[3]);
+		c_cvertex->clock++;
 		return(MG_OK);
 	case MG_E_NORMAL:	/* set normal */
 		if (ac != 4)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]) || !isflt(av[3]))
+		if (!isflt(av[1]) | !isflt(av[2]) | !isflt(av[3]))
 			return(MG_ETYPE);
 		c_cvertex->n[0] = atof(av[1]);
 		c_cvertex->n[1] = atof(av[2]);
 		c_cvertex->n[2] = atof(av[3]);
 		(void)normalize(c_cvertex->n);
+		c_cvertex->clock++;
 		return(MG_OK);
 	}
 	return(MG_EUNK);
@@ -341,16 +440,31 @@ c_clearall()			/* empty context tables */
 {
 	c_uncolor = c_dfcolor;
 	c_ccolor = &c_uncolor;
+	c_ccname = NULL;
 	lu_done(&clr_tab);
 	c_unmaterial = c_dfmaterial;
 	c_cmaterial = &c_unmaterial;
+	c_cmname = NULL;
 	lu_done(&mat_tab);
 	c_unvertex = c_dfvertex;
 	c_cvertex = &c_unvertex;
+	c_cvname = NULL;
 	lu_done(&vtx_tab);
 }
 
 
+C_MATERIAL *
+c_getmaterial(name)		/* get a named material */
+char	*name;
+{
+	register LUENT	*lp;
+
+	if ((lp = lu_find(&mat_tab, name)) == NULL)
+		return(NULL);
+	return((C_MATERIAL *)lp->data);
+}
+
+
 C_VERTEX *
 c_getvert(name)			/* get a named vertex */
 char	*name;
@@ -363,11 +477,23 @@ char	*name;
 }
 
 
+C_COLOR *
+c_getcolor(name)		/* get a named color */
+char	*name;
+{
+	register LUENT	*lp;
+
+	if ((lp = lu_find(&clr_tab, name)) == NULL)
+		return(NULL);
+	return((C_COLOR *)lp->data);
+}
+
+
 int
 c_isgrey(clr)			/* check if color is grey */
 register C_COLOR	*clr;
 {
-	if (!clr->flags)
+	if (!(clr->flags & (C_CSXY|C_CSSPEC)))
 		return(1);		/* no settings == grey */
 	c_ccvt(clr, C_CSXY);
 	return(clr->cx >= .323 && clr->cx <= .343 &&
@@ -383,89 +509,132 @@ int	fl;
 	double	x, y, z;
 	register int	i;
 
-	if (clr->flags & fl)		/* already done */
+	fl &= ~clr->flags;			/* ignore what's done */
+	if (!fl)				/* everything's done! */
 		return;
-	if (!(clr->flags & (C_CSXY|C_CSSPEC)))	/* nothing set */
+	if (!(clr->flags & (C_CSXY|C_CSSPEC)))	/* nothing set! */
 		*clr = c_dfcolor;
-	else if (fl & C_CSXY) {		/* cspec -> cxy */
+	if (fl & C_CSXY) {		/* cspec -> cxy */
 		x = y = z = 0.;
 		for (i = 0; i < C_CNSS; i++) {
 			x += cie_xf.ssamp[i] * clr->ssamp[i];
 			y += cie_yf.ssamp[i] * clr->ssamp[i];
 			z += cie_zf.ssamp[i] * clr->ssamp[i];
 		}
+		x /= (double)cie_xf.ssum;
+		y /= (double)cie_yf.ssum;
+		z /= (double)cie_zf.ssum;
 		z += x + y;
 		clr->cx = x / z;
 		clr->cy = y / z;
 		clr->flags |= C_CSXY;
-	} else {			/* cxy -> cspec */
-		z = (cie_xf.ssum + cie_yf.ssum + cie_zf.ssum) / 3.;
-		x = clr->cx * z / cie_xf.ssum;
-		y = clr->cy * z / cie_yf.ssum;
-		z = (1. - clr->cx - clr->cy) * z / cie_zf.ssum;
+	} else if (fl & C_CSSPEC) {	/* cxy -> cspec */
+		x = clr->cx;
+		y = clr->cy;
+		z = 1. - x - y;
 		clr->ssum = 0;
-		for (i = 0; i < C_CNSS; i++)
-			clr->ssum += clr->ssamp[i] =
-					x * cie_xf.ssamp[i] +
-					y * cie_yf.ssamp[i] +
-					z * cie_zf.ssamp[i] ;
+		for (i = 0; i < C_CNSS; i++) {
+			clr->ssamp[i] = x*cie_xp.ssamp[i] + y*cie_yp.ssamp[i]
+					+ z*cie_zp.ssamp[i] + .5;
+			if (clr->ssamp[i] < 0)		/* out of gamut! */
+				clr->ssamp[i] = 0;
+			else
+				clr->ssum += clr->ssamp[i];
+		}
 		clr->flags |= C_CSSPEC;
 	}
+	if (fl & C_CSEFF) {		/* compute efficacy */
+		if (clr->flags & C_CSSPEC) {		/* from spectrum */
+			y = 0.;
+			for (i = 0; i < C_CNSS; i++)
+				y += cie_yf.ssamp[i] * clr->ssamp[i];
+			clr->eff = C_CLPWM * y / clr->ssum;
+		} else /* clr->flags & C_CSXY */ {	/* from (x,y) */
+			clr->eff = clr->cx*cie_xf.eff + clr->cy*cie_yf.eff +
+					(1. - clr->cx - clr->cy)*cie_zf.eff;
+		}
+		clr->flags |= C_CSEFF;
+	}
 }
 
 
 static int
 setspectrum(clr, wlmin, wlmax, ac, av)	/* convert a spectrum */
 register C_COLOR	*clr;
-int	wlmin, wlmax;
+double	wlmin, wlmax;
 int	ac;
 char	**av;
 {
 	double	scale;
-	float	*va;
-	register int	i;
-	int	wl, pos;
+	float	va[C_CNSS];
+	register int	i, pos;
+	int	n, imax;
+	int	wl;
 	double	wl0, wlstep;
-
-	if (wlmin < C_CMINWL || wlmin >= wlmax || wlmax > C_CMAXWL)
+	double	boxpos, boxstep;
+					/* check bounds */
+	if ((wlmax <= C_CMINWL) | (wlmax <= wlmin) | (wlmin >= C_CMAXWL))
 		return(MG_EILL);
-	if ((va = (float *)malloc(ac*sizeof(float))) == NULL)
-		return(MG_EMEM);
+	wlstep = (wlmax - wlmin)/(ac-1);
+	while (wlmin < C_CMINWL) {
+		wlmin += wlstep;
+		ac--; av++;
+	}
+	while (wlmax > C_CMAXWL) {
+		wlmax -= wlstep;
+		ac--;
+	}
+	imax = ac;			/* box filter if necessary */
+	boxpos = 0;
+	boxstep = 1;
+	if (wlstep < C_CWLI) {
+		imax = (wlmax - wlmin)/C_CWLI + (1-FTINY);
+		boxpos = (wlmin - C_CMINWL)/C_CWLI;
+		boxstep = wlstep/C_CWLI;
+		wlstep = C_CWLI;
+	}
 	scale = 0.;			/* get values and maximum */
-	for (i = 0; i < ac; i++) {
-		if (!isflt(av[i]))
-			return(MG_ETYPE);
-		va[i] = atof(av[i]);
-		if (va[i] < 0.)
-			return(MG_EILL);
+	pos = 0;
+	for (i = 0; i < imax; i++) {
+		va[i] = 0.; n = 0;
+		while (boxpos < i+.5 && pos < ac) {
+			if (!isflt(av[pos]))
+				return(MG_ETYPE);
+			va[i] += atof(av[pos++]);
+			n++;
+			boxpos += boxstep;
+		}
+		if (n > 1)
+			va[i] /= (double)n;
 		if (va[i] > scale)
 			scale = va[i];
+		else if (va[i] < -scale)
+			scale = -va[i];
 	}
-	if (scale == 0.)
+	if (scale <= FTINY)
 		return(MG_EILL);
 	scale = C_CMAXV / scale;
 	clr->ssum = 0;			/* convert to our spacing */
 	wl0 = wlmin;
-	wlstep = (double)(wlmax - wlmin)/(ac-1);
 	pos = 0;
 	for (i = 0, wl = C_CMINWL; i < C_CNSS; i++, wl += C_CWLI)
-		if (wl < wlmin || wl > wlmax)
+		if ((wl < wlmin) | (wl > wlmax))
 			clr->ssamp[i] = 0;
 		else {
 			while (wl0 + wlstep < wl+FTINY) {
 				wl0 += wlstep;
 				pos++;
 			}
-			if (wl+FTINY >= wl0 && wl-FTINY <= wl0)
-				clr->ssamp[i] = scale*va[pos];
+			if ((wl+FTINY >= wl0) & (wl-FTINY <= wl0))
+				clr->ssamp[i] = scale*va[pos] + .5;
 			else		/* interpolate if necessary */
-				clr->ssamp[i] = scale / wlstep *
+				clr->ssamp[i] = .5 + scale / wlstep *
 						( va[pos]*(wl0+wlstep - wl) +
 							va[pos+1]*(wl - wl0) );
 			clr->ssum += clr->ssamp[i];
 		}
 	clr->flags = C_CDSPEC|C_CSSPEC;
-	free((MEM_PTR)va);
+	clr->clock++;
 	return(MG_OK);
 }
 
@@ -480,10 +649,10 @@ double	w1, w2;
 	register int	i;
 
 	if ((c1->flags|c2->flags) & C_CDSPEC) {		/* spectral mixing */
-		c_ccvt(c1, C_CSSPEC);
-		c_ccvt(c2, C_CSSPEC);
-		w1 /= (double)c1->ssum;
-		w2 /= (double)c2->ssum;
+		c_ccvt(c1, C_CSSPEC|C_CSEFF);
+		c_ccvt(c2, C_CSSPEC|C_CSEFF);
+		w1 /= c1->eff*c1->ssum;
+		w2 /= c2->eff*c2->ssum;
 		scale = 0.;
 		for (i = 0; i < C_CNSS; i++) {
 			cmix[i] = w1*c1->ssamp[i] + w2*c2->ssamp[i];
@@ -498,9 +667,50 @@ double	w1, w2;
 	} else {					/* CIE xy mixing */
 		c_ccvt(c1, C_CSXY);
 		c_ccvt(c2, C_CSXY);
-		scale = 1. / (w1/c1->cy + w2/c2->cy);
+		scale = w1/c1->cy + w2/c2->cy;
+		if (scale == 0.)
+			return;
+		scale = 1. / scale;
 		cres->cx = (c1->cx*w1/c1->cy + c2->cx*w2/c2->cy) * scale;
 		cres->cy = (w1 + w2) * scale;
 		cres->flags = C_CDXY|C_CSXY;
 	}
 }
+
+
+#define	C1		3.741832e-16	/* W-m^2 */
+#define C2		1.4388e-2	/* m-K */
+
+#define bbsp(l,t)	(C1/((l)*(l)*(l)*(l)*(l)*(exp(C2/((t)*(l)))-1.)))
+#define bblm(t)		(C2/5./(t))
+
+static int
+setbbtemp(clr, tk)		/* set black body spectrum */
+register C_COLOR	*clr;
+double	tk;
+{
+	double	sf, wl;
+	register int	i;
+
+	if (tk < 1000)
+		return(MG_EILL);
+	wl = bblm(tk);			/* scalefactor based on peak */
+	if (wl < C_CMINWL*1e-9)
+		wl = C_CMINWL*1e-9;
+	else if (wl > C_CMAXWL*1e-9)
+		wl = C_CMAXWL*1e-9;
+	sf = C_CMAXV/bbsp(wl,tk);
+	clr->ssum = 0;
+	for (i = 0; i < C_CNSS; i++) {
+		wl = (C_CMINWL + i*C_CWLI)*1e-9;
+		clr->ssum += clr->ssamp[i] = sf*bbsp(wl,tk) + .5;
+	}
+	clr->flags = C_CDSPEC|C_CSSPEC;
+	clr->clock++;
+	return(MG_OK);
+}
+
+#undef	C1
+#undef	C2
+#undef	bbsp
+#undef	bblm