--- ray/src/gen/xform.c	1989/06/07 08:40:59	1.4
+++ ray/src/gen/xform.c	1989/10/13 19:34:17	1.9
@@ -40,6 +40,8 @@ extern int  o_face();
 extern int  o_cone();
 extern int  o_cylinder();
 extern int  o_ring();
+extern int  m_glow();
+extern int  m_spot();
 extern int  m_dielectric();
 extern int  m_interface();
 extern int  text();
@@ -60,6 +62,8 @@ FUN  ofun[] = {
 	{ "instance", addxform },
 	{ "alias", alias },
 	{ "antimatter", passargs },
+	{ "glow", m_glow },
+	{ "spotlight", m_spot },
 	{ "dielectric", m_dielectric },
 	{ "interface", m_interface },
 	{ "colortext", text },
@@ -76,7 +80,6 @@ FUN  ofun[] = {
 	{ "mixtext", text },
 	{ "light", passargs },
 	{ "illum", passargs },
-	{ "glow", passargs },
 	{ "plastic", passargs },
 	{ "metal", passargs },
 	{ "trans", passargs },
@@ -110,22 +113,29 @@ char  *argv[];
 	FILE  *fopen();
 	FILE  *fp;
 	int  a;
+					/* check for array */
+	for (a = 1; a < argc; a++)
+		if (!strcmp(argv[a], "-a"))
+			return(doarray(argc, argv, a));
 
-	xav = argv;
-
 	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'n':
+				if (argv[a][2] || a+1 >= argc)
+					break;
 				idprefix = argv[++a];
 				continue;
 			case 'e':
+				if (argv[a][2])
+					break;
 				expand = 1;
 				continue;
 			}
 		break;
 	}
 
+	xav = argv;
 	xfa = a;
 
 	totscale = 1.0;
@@ -136,6 +146,11 @@ char  *argv[];
 	if (reverse = totscale < 0.0)
 		totscale = -totscale;
 
+	if (a < argc && argv[a][0] == '-') {
+		fprintf(stderr, "%s: command line error at '%s'\n",
+				argv[0], argv[a]);
+		exit(1);
+	}
 	xac = a;
 
 	putchar('#');				/* simple header */
@@ -156,10 +171,50 @@ char  *argv[];
 			fclose(fp);
 		}
 
-	exit(0);
+	return(0);
 }
 
 
+doarray(ac, av, ai)			/* make array */
+char  **av;
+int  ac, ai;
+{
+	char  *newav[256], **avp;
+	char  newid[128], repts[32];
+	char  *oldid = NULL;
+	int  i, err;
+	
+	avp = newav+2;
+	avp[0] = av[0];
+	for (i = 1; i < ac; i++)
+		if (!strcmp(av[i-1], "-n")) {
+			oldid = av[i];
+			avp[i] = newid;
+		} else
+			avp[i] = av[i];
+	avp[ai] = "-i";
+	avp[ai+1] = repts;
+	avp[i] = NULL;
+	if (oldid == NULL) {
+		newav[0] = av[0];
+		newav[1] = "-n";
+		newav[2] = newid;
+		avp = newav;
+		ac += 2;
+	}
+	err = 0;
+	for (i = 0; i < atoi(av[ai+1]); i++) {
+		if (oldid == NULL)
+			sprintf(newid, "a%d", i);
+		else
+			sprintf(newid, "%s.%d", oldid, i);
+		sprintf(repts, "%d", i);
+		err |= main(ac, avp);
+	}
+	return(err);
+}
+
+
 xform(name, fin)			/* transform stream by totxform */
 char  *name;
 register FILE  *fin;
@@ -178,17 +233,7 @@ register FILE  *fin;
 			} while (c != '\n');
 		} else if (c == '!') {			/* command */
 			ungetc(c, fin);
-			if (expand)
-				xfcomm(name, fin);
-			else {
-				putchar('\n');
-				while ((c = getc(fin)) != EOF && c != '\n')
-					putchar(c);
-				printf(" |");
-				for (c = 0; c < xac; c++)
-					printf(" %s", xav[c]);
-				putchar('\n');
-			}
+			xfcomm(name, fin);
 		} else {				/* object */
 			ungetc(c, fin);
 			xfobject(name, fin);
@@ -197,24 +242,30 @@ register FILE  *fin;
 }
 
 
-xfcomm(fname, fin)				/* expand a command */
+xfcomm(fname, fin)			/* transform a command */
 FILE  *fin;
 {
 	FILE  *popen();
-	char  *fgets();
+	char  *fgetline();
 	FILE  *pin;
 	char  buf[512];
+	int  i;
 
-	fgets(buf, sizeof(buf), fin);
-	if (buf[strlen(buf)-1] == '\n')
-		buf[strlen(buf)-1] = '\0';
-	if ((pin = popen(buf+1, "r")) == NULL) {
-		fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
-				progname, fname, buf);
-		exit(1);
+	fgetline(buf, sizeof(buf), fin);
+	if (expand) {
+		if ((pin = popen(buf+1, "r")) == NULL) {
+			fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
+					progname, fname, buf);
+			exit(1);
+		}
+		xform(buf, pin);
+		pclose(pin);
+	} else {
+		printf("\n%s | %s -e", buf, xav[0]);
+		for (i = 1; i < xac; i++)
+			printf(" %s", xav[i]);
+		putchar('\n');
 	}
-	xform(buf, pin);
-	pclose(pin);
 }
 
 
@@ -328,6 +379,44 @@ FILE  *fin;
 	if (fscanf(fin, "%s", alias) != 1)
 		return(-1);
 	printf("\t%s\n", alias);
+	return(0);
+}
+
+
+m_glow(fin)			/* transform arguments for proximity light */
+FILE  *fin;
+{
+	register FUNARGS  *fa;
+
+	if ((fa = getfargs(fin)) == NULL)
+		return(-1);
+	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
+		return(-1);
+	printf("0\n0\n4");
+	printf(" %18.12g %18.12g %18.12g",
+			fa->farg[0], fa->farg[1], fa->farg[2]);
+	printf(" %18.12g\n", fa->farg[3] * totscale);
+	freefargs(fa);
+	return(0);
+}
+
+
+m_spot(fin)			/* transform arguments for spotlight */
+FILE  *fin;
+{
+	double  v[3];
+	register FUNARGS  *fa;
+
+	if ((fa = getfargs(fin)) == NULL)
+		return(-1);
+	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 7)
+		return(-1);
+	printf("0\n0\n7");
+	printf(" %18.12g %18.12g %18.12g %18.12g\n",
+			fa->farg[0], fa->farg[1], fa->farg[2], fa->farg[3]);
+	multv3(v, fa->farg+4, totxform);
+	printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
+	freefargs(fa);
 	return(0);
 }