--- ray/src/cv/mgflib/parser.h	1994/07/21 14:56:36	1.14
+++ ray/src/cv/mgflib/parser.h	1995/02/24 16:50:05	1.17
@@ -84,13 +84,13 @@ extern char	*mg_err[MG_NERRS];
  * the mg_handle function rather than the mg_ehand routines directly.
  * (The first argument to mg_handle is the entity #, or -1.)
  * To free any data structures and clear the parser, use mg_clear.
- * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
- * will return an error from the list above.  In addition, mg_load
- * will report the error to stderr.  The mg_read routine returns 0
- * when the end of file has been reached.
+ * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
+ * mg_rewind will return an error from the list above.  In addition,
+ * mg_load will report the error to stderr.  The mg_read routine
+ * returns 0 when the end of file has been reached.
  */
 
-#define MG_MAXLINE	512		/* maximum input line length */
+#define MG_MAXLINE	4096		/* maximum input line length */
 #define MG_MAXARGC	(MG_MAXLINE/4)	/* maximum argument count */
 
 typedef struct mg_fctxt {
@@ -195,21 +195,24 @@ extern double	normalize(FVECT);	/* normalize a vector 
 #define C_CNSS		41		/* number of spectral samples */
 #define C_CWLI		((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
 #define C_CMAXV		10000		/* nominal maximum sample value */
+#define C_CLPWM		(683./C_CMAXV)	/* peak lumens/watt multiplier */
 
 #define C_CSSPEC	01		/* flag if spectrum is set */
 #define C_CDSPEC	02		/* flag if defined w/ spectrum */
 #define C_CSXY		04		/* flag if xy is set */
 #define C_CDXY		010		/* flag if defined w/ xy */
+#define C_CSEFF		020		/* flag if efficacy set */
 
 typedef struct {
 	int	clock;			/* incremented each change */
-	short	flags;			/* what's been set */
-	short	ssamp[C_CNSS];		/* spectral samples, min wl to max */
-	long	ssum;			/* straight sum of spectral values */
+	unsigned short	flags;		/* what's been set */
+	unsigned short	ssamp[C_CNSS];	/* spectral samples, min wl to max */
+	unsigned long	ssum;		/* straight sum of spectral values */
 	float	cx, cy;			/* xy chromaticity value */
+	float	eff;			/* efficacy (lumens/watt) */
 } C_COLOR;
 
-#define C_DEFCOLOR	{ 1, C_CDXY|C_CSXY|C_CSSPEC,\
+#define C_DEFCOLOR	{ 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
 			{C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
@@ -217,27 +220,27 @@ typedef struct {
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
-			(long)C_CNSS*C_CMAXV, 1./3., 1./3. }
+			(long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
 
-#define C_CIEX		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
+#define C_CIEX		{ 1, 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, .735, .265 }
+			114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 }
 
-#define C_CIEY		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
+#define C_CIEY		{ 1, 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, .274, .717 }
+			5,2,1,1,0,0}, 106856L, .398, .542, 493.525 }
 
-#define C_CIEZ		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
+#define C_CIEZ		{ 1, 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, .167, .009 }
+			106770L, .147, .077, 54.363 }
 
-#define c_cval(c,l)	((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum)
+#define c_cval(c,l)	((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
 
 typedef struct {
 	int	clock;		/* incremented each change -- resettable */