--- ray/src/gen/xform.c	1999/06/03 14:15:01	2.16
+++ ray/src/gen/xform.c	1999/06/04 17:24:56	2.22
@@ -29,13 +29,13 @@ int  xfa;				/* start of xf arguments */
 XF  tot;				/* total transformation */
 int  reverse;				/* boolean true if scene mirrored */
 
-int  invert = 0;			/* boolean true to invert surfaces */
+int  invert;				/* boolean true to invert surfaces */
 
-int  expand = 1;			/* boolean true to expand commands */
+int  expand;				/* boolean true to expand commands */
 
-char  *newmod = NULL;			/* new modifier for surfaces */
+char  *newmod;				/* new modifier for surfaces */
 
-char  *idprefix = NULL;			/* prefix for object identifiers */
+char  *idprefix;			/* prefix for object identifiers */
 
 #define	 ALIAS		NUMOTYPE	/* put alias at end of array */
 
@@ -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 */
@@ -59,6 +61,7 @@ main(argc, argv)		/* get transform options and transfo
 int  argc;
 char  *argv[];
 {
+	int  mal_prefix = 0;
 	char  *fname;
 	int  a;
 					/* check for argument list file */
@@ -70,20 +73,40 @@ char  *argv[];
 		if (!strcmp(argv[a], "-a"))
 			return(doarray(argc, argv, a));
 
-	initotypes();
+	initotypes();			/* initialize */
+	invert = 0;
+	expand = 1;
+	newmod = NULL;
+	idprefix = NULL;
 
 	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'm':
-				if (argv[a][2] || a+1 >= argc)
+				if (argv[a][2] | a+1 >= argc)
 					break;
-				newmod = argv[++a];
+				a++;
+				if (newmod == NULL)
+					newmod = argv[a];
 				continue;
 			case 'n':
-				if (argv[a][2] || a+1 >= argc)
+				if (argv[a][2] | a+1 >= argc)
 					break;
-				idprefix = argv[++a];
+				a++;
+				if (idprefix == NULL)
+					idprefix = argv[a];
+				else {
+					register char	*newp;
+					newp = (char *)malloc(strlen(idprefix)+
+							strlen(argv[a])+2);
+					if (newp == NULL)
+						exit(2);
+					sprintf(newp, "%s.%s",
+							idprefix, argv[a]);
+					if (mal_prefix++)
+						free((char *)idprefix);
+					idprefix = newp;
+				}
 				continue;
 			case 'c':
 				if (argv[a][2])
@@ -98,7 +121,7 @@ char  *argv[];
 			case 'I':
 				if (argv[a][2])
 					break;
-				invert = 1;
+				invert = !invert;
 				continue;
 			}
 		break;
@@ -128,6 +151,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
@@ -136,6 +164,8 @@ char  *argv[];
 			xform(mainfn, mainfp);
 		}
 
+	if (mal_prefix)
+		free((char *)idprefix);
 	return(0);
 }
 
@@ -145,41 +175,54 @@ char  **av;
 int  ac, fi;
 {
 	char  *newav[256], **avp;
-	char  argbuf[2048];
+	char  argbuf[1024];
 	char  newid[128];
 	char  *oldid;
 	register char	*cp;
 	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 +254,7 @@ int  ac, fi;
 		else
 			sprintf(newid, "%s.%d", oldid, k);
 		err |= main(newac, avp);
+		k++;
 	}
 	fclose(argfp);
 	return(err);
@@ -317,9 +361,10 @@ FILE  *fin;
 	} else {
 		printf("\n%s", buf);
 		if (xac > 1) {
-			printf(" | %s", xav[0]);
+			printf(" | %s -e", xav[0]);	/* expand next time */
 			for (i = 1; i < xac; i++)
-				printf(" %s", xav[i]);
+				if (i >= xfa || strcmp(xav[i], "-c"))
+					printf(" %s", xav[i]);
 		}
 		putchar('\n');
 	}