--- ray/src/gen/xform.c	1999/06/03 14:15:01	2.16
+++ ray/src/gen/xform.c	1999/06/04 16:00:27	2.19
@@ -47,6 +47,8 @@ short  tinvers[NUMOTYPE];		/* inverse types for surfac
 
 int  nrept = 1;				/* number of array repetitions */
 
+int stdinused = 0;			/* stdin has been used by -f option? */
+
 extern char  *malloc(), *fgets(), *fgetword();
 
 char  mainfn[MAXPATH];			/* main file name */
@@ -128,6 +130,11 @@ char  *argv[];
 	putchar('\n');
 					/* transform input */
 	if (xac == argc) {
+		if (stdinused) {
+			fprintf(stderr, "%s: cannot use stdin more than once\n",
+					argv[0]);
+			exit(1);
+		}
 		openmain(NULL);
 		xform(mainfn, mainfp);
 	} else
@@ -152,34 +159,47 @@ int  ac, fi;
 	FILE	*argfp;
 	int  n, i, k, newac, err;
 	
-	if (fi >= ac-1 || av[fi+1][0] == '-') {
+	if (fi >= ac-1 || (av[fi+1][0] == '-' && av[fi+1][1] != '\0')) {
 		fprintf(stderr, "%s: missing file for -f option\n", av[0]);
 		exit(1);
 	}
-	if ((argfp = fopen(av[fi+1], "r")) == NULL) {
-		fprintf(stderr, "%s: cannot open argument file \"%s\"\n",
-				av[0], av[fi+1]);
-		exit(1);
+	if (av[fi+1][0] == '-' && av[fi+1][1] == '\0') {
+		if (stdinused++) {
+			fprintf(stderr, "%s: cannot use stdin more than once\n",
+					av[0]);
+			exit(1);
+		}
+		argfp = stdin;
+		n = 100;		/* we just don't know! */
+	} else {
+		if ((argfp = fopen(av[fi+1], "r")) == NULL) {
+			fprintf(stderr, "%s: cannot open argument file \"%s\"\n",
+					av[0], av[fi+1]);
+			exit(1);
+		}
+		n = 0;			/* count number of lines in file */
+		while (fgets(argbuf,sizeof(argbuf),argfp) != NULL)
+			n += argbuf[0] != '\n' & argbuf[0] != '#';
+		if (!n) {
+			fprintf(stderr, "%s: empty argument file \"%s\"\n",
+					av[0], av[fi+1]);
+			exit(1);
+		}
+		nrept *= n;
+		rewind(argfp);
 	}
-	n = 0;			/* count number of lines in file */
-	while (fgets(argbuf, sizeof(argbuf), argfp) != NULL)
-		n++;
-	if (!n) {
-		fprintf(stderr, "%s: empty argument file \"%s\"\n",
-				av[0], av[fi+1]);
-		exit(1);
-	}
-	rewind(argfp);
-	nrept *= n;
-	err = 0;			/* read each arg list and call main */
-	for (k = 0; k < n; k++) {
-		fgets(argbuf, sizeof(argbuf), argfp);
+	err = 0; k = 0;			/* read each arg list and call main */
+	while (fgets(argbuf,sizeof(argbuf),argfp) != NULL) {
+		if (argbuf[0] == '\n' | argbuf[0] == '#')
+			continue;
 		avp = newav+2;
 		avp[0] = av[0];
 		for (i = 1; i < fi; i++)
 			avp[i] = av[i];
 		newac = i;
-		cp = argbuf;			/* parse new words */
+		cp = argbuf;		/* parse new words */
+		if (*cp == '!') cp++;
+		if (!strncmp(cp, "xform ", 6)) cp += 6;
 		for ( ; ; ) {
 			while (isspace(*cp))	/* nullify spaces */
 				*cp++ = '\0';
@@ -211,6 +231,7 @@ int  ac, fi;
 		else
 			sprintf(newid, "%s.%d", oldid, k);
 		err |= main(newac, avp);
+		k++;
 	}
 	fclose(argfp);
 	return(err);