--- ray/src/gen/xform.c	1995/12/08 18:29:06	2.10
+++ ray/src/gen/xform.c	1997/05/30 18:24:32	2.15
@@ -1,4 +1,4 @@
-/* Copyright (c) 1995 Regents of the University of California */
+/* Copyright (c) 1996 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -14,6 +14,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "standard.h"
 
+#include  "paths.h"
+
 #include  <ctype.h>
 
 #include  "object.h"
@@ -29,7 +31,7 @@ int  reverse;				/* boolean true if scene mirrored */
 
 int  invert = 0;			/* boolean true to invert surfaces */
 
-int  expand = 0;			/* boolean true to expand commands */
+int  expand = 1;			/* boolean true to expand commands */
 
 char  *newmod = NULL;			/* new modifier for surfaces */
 
@@ -43,8 +45,13 @@ FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and
 
 short  tinvers[NUMOTYPE];		/* inverse types for surfaces */
 
+int  nrept = 1;				/* number of array repetitions */
+
 extern char  *malloc(), *fgetword();
 
+char  mainfn[MAXPATH];			/* main file name */
+FILE  *mainfp = NULL;			/* main file pointer */
+
 #define	 progname  (xav[0])
 
 
@@ -52,8 +59,7 @@ main(argc, argv)		/* get transform options and transfo
 int  argc;
 char  *argv[];
 {
-	FILE  *fopen();
-	FILE  *fp;
+	char  *fname;
 	int  a;
 					/* check for array */
 	for (a = 1; a < argc; a++)
@@ -75,6 +81,11 @@ char  *argv[];
 					break;
 				idprefix = argv[++a];
 				continue;
+			case 'c':
+				if (argv[a][2])
+					break;
+				expand = 0;
+				continue;
 			case 'e':
 				if (argv[a][2])
 					break;
@@ -112,17 +123,13 @@ char  *argv[];
 		printf(" %s", xav[a]);
 	putchar('\n');
 					/* transform input */
-	if (xac == argc)
-		xform("standard input", stdin);
-	else
+	if (xac == argc) {
+		openmain(NULL);
+		xform(mainfn, mainfp);
+	} else
 		for (a = xac; a < argc; a++) {
-			if ((fp = fopen(argv[a], "r")) == NULL) {
-				fprintf(stderr, "%s: cannot open \"%s\"\n",
-						progname, argv[a]);
-				exit(1);
-			}
-			xform(argv[a], fp);
-			fclose(fp);
+			openmain(argv[a]);
+			xform(mainfn, mainfp);
 		}
 
 	return(0);
@@ -136,7 +143,7 @@ int  ac, ai;
 	char  *newav[256], **avp;
 	char  newid[128], repts[32];
 	char  *oldid = NULL;
-	int  i, err;
+	int  n, i, err;
 	
 	avp = newav+2;
 	avp[0] = av[0];
@@ -156,8 +163,9 @@ int  ac, ai;
 		avp = newav;
 		ac += 2;
 	}
+	nrept *= n = atoi(av[ai+1]);
 	err = 0;
-	for (i = 0; i < atoi(av[ai+1]); i++) {
+	for (i = 0; i < n; i++) {
 		if (oldid == NULL)
 			sprintf(newid, "a%d", i);
 		else
@@ -206,8 +214,8 @@ xfcomm(fname, fin)			/* transform a command */
 char  *fname;
 FILE  *fin;
 {
-	FILE  *popen();
-	char  *fgetline();
+	extern FILE  *popen();
+	extern char  *fgetline();
 	FILE  *pin;
 	char  buf[512];
 	int  i;
@@ -224,7 +232,7 @@ FILE  *fin;
 	} else {
 		printf("\n%s", buf);
 		if (xac > 1) {
-			printf(" | %s -e", xav[0]);
+			printf(" | %s", xav[0]);
 			for (i = 1; i < xac; i++)
 				printf(" %s", xav[i]);
 		}
@@ -408,15 +416,39 @@ m_mist(fin)		/* transform arguments for mist */
 FILE  *fin;
 {
 	FUNARGS	 fa;
+	int	i;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa.nsargs != 0  || fa.nfargs != 4)
+	if (fa.nfargs > 7)
 		return(-1);
-	printf("0\n0\n4");
-	printf(" %18.12g %18.12g %18.12g", fa.farg[0]/tot.sca,
-			fa.farg[1]/tot.sca, fa.farg[2]/tot.sca);
-	printf(" %18.12g\n", fa.farg[3]);
+	printf("%d", fa.nsargs);
+	if (idprefix == NULL)
+		for (i = 0; i < fa.nsargs; i++)
+			printf(" %s", fa.sarg[i]);
+	else
+		for (i = 0; i < fa.nsargs; i++) {
+			char	sname[256], *sp;
+			register char	*cp1, *cp2 = sname;
+							/* add idprefix */
+			for (sp = fa.sarg[i]; *sp; sp = cp1) {
+				for (cp1 = idprefix; *cp1; )
+					*cp2++ = *cp1++;
+				*cp2++ = '.';
+				for (cp1 = sp; *cp1 &&
+						(*cp2++ = *cp1++) != '>'; )
+					;
+			}
+			*cp2 = '\0';
+			printf(" %s", sname);
+		}
+	printf("\n0\n%d", fa.nfargs);
+	if (fa.nfargs > 2)
+		printf(" %12.6g %12.6g %12.6g", fa.farg[0]/tot.sca,
+				fa.farg[1]/tot.sca, fa.farg[2]/tot.sca);
+	for (i = 3; i < fa.nfargs; i++)
+		printf(" %12.6g", fa.farg[i]);
+	printf("\n");
 	freefargs(&fa);
 	return(0);
 }
@@ -432,11 +464,11 @@ FILE  *fin;
 	if (fa.nsargs != 0  || fa.nfargs != 5)
 		return(-1);
 	printf("0\n0\n5");
-	printf(" %18.12g %18.12g %18.12g",
+	printf(" %12.6g %12.6g %12.6g",
 		pow(fa.farg[0], 1.0/tot.sca),
 		pow(fa.farg[1], 1.0/tot.sca),
 		pow(fa.farg[2], 1.0/tot.sca));
-	printf(" %18.12g %18.12g\n", fa.farg[3], fa.farg[4]);
+	printf(" %12.6g %12.6g\n", fa.farg[3], fa.farg[4]);
 	freefargs(&fa);
 	return(0);
 }
@@ -452,16 +484,16 @@ FILE  *fin;
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
 	printf("0\n0\n8\n");
-	printf("%18.12g %18.12g %18.12g",
+	printf("%12.6g %12.6g %12.6g",
 		pow(fa.farg[0], 1.0/tot.sca),
 		pow(fa.farg[1], 1.0/tot.sca),
 		pow(fa.farg[2], 1.0/tot.sca));
-	printf(" %18.12g\n", fa.farg[3]);
-	printf("%18.12g %18.12g %18.12g",
+	printf(" %12.6g\n", fa.farg[3]);
+	printf("%12.6g %12.6g %12.6g",
 		pow(fa.farg[4], 1.0/tot.sca),
 		pow(fa.farg[5], 1.0/tot.sca),
 		pow(fa.farg[6], 1.0/tot.sca));
-	printf(" %18.12g\n", fa.farg[7]);
+	printf(" %12.6g\n", fa.farg[7]);
 	freefargs(&fa);
 	return(0);
 }
@@ -703,3 +735,117 @@ initotypes()			/* initialize ofun[] array */
 	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
 	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE;	/* oh, well */
 }
+
+
+#ifdef  OLDXFORM
+openmain(fname)
+char  *fname;
+{
+	if (fname == NULL) {
+		strcpy(mainfn, "standard input");
+		mainfp = stdin;
+		return;
+	}
+	if (mainfp != NULL) {
+		if (!strcmp(fname, mainfn)) {
+			rewind(mainfp);
+			return;
+		}
+		fclose(mainfp);
+	}
+	if ((mainfp = fopen(fname, "r")) == NULL) {
+		fprintf(stderr, "%s: cannot open file \"%s\"\n",
+				progname, fname);
+		exit(1);
+	}
+	strcpy(mainfn, fname);
+}
+#else
+openmain(fname)		/* open fname for input, changing to its directory */
+char  *fname;
+{
+	extern FILE  *tmpfile();
+	extern char  *getlibpath(), *getpath();
+	static char  origdir[MAXPATH];
+	static char  curfn[MAXPATH];
+	static int  diffdir;
+	register char  *fpath;
+
+	if (fname == NULL) {			/* standard input */
+		if (mainfp == NULL) {
+			register int  c;
+			strcpy(mainfn, "standard input");
+			if (nrept <= 1) {
+				mainfp = stdin;
+				return;			/* just read once */
+			}
+							/* else copy */
+			if ((mainfp = tmpfile()) == NULL) {
+				fprintf(stderr,
+					"%s: cannot create temporary file\n",
+						progname);
+				exit(1);
+			}
+			while ((c = getc(stdin)) != EOF)
+				putc(c, mainfp);
+			fclose(stdin);
+		}
+		rewind(mainfp);			/* rewind copy */
+		return;
+	}
+	if (mainfp == NULL) {			/* first call, initialize */
+		getwd(origdir);
+	} else if (!strcmp(fname, curfn)) {	/* just need to rewind? */
+		rewind(mainfp);
+		return;
+	} else {				/* else close old stream */
+		fclose(mainfp);
+		if (diffdir) {
+			chdir(origdir);
+			diffdir = 0;
+		}
+	}
+	strcpy(curfn, fname);			/* remember file name */
+						/* get full path */
+	if ((fpath = getpath(fname, getlibpath(), R_OK)) == NULL) {
+		fprintf(stderr, "%s: cannot find file \"%s\"\n",
+				progname, fname);
+		exit(1);
+	}
+	if (fpath[0] == '.' && ISDIRSEP(fpath[1]))	/* remove leading ./ */
+		fpath += 2;
+						/* record path name */
+	strcpy(mainfn, fpath);
+	if (expand) {				/* change to local directory */
+		register char  *cp = fpath + strlen(fpath);	/* get dir. */
+		while (cp > fpath) {
+			cp--;
+			if (ISDIRSEP(*cp)) {
+				if (cp == fpath)
+					cp++;	/* root special case */
+				break;
+			}
+		}
+		*cp = '\0';
+		if (fpath[0]) {			/* change to new directory? */
+			if (chdir(fpath) < 0) {
+				fprintf(stderr,
+				"%s: cannot change directory to \"%s\"\n",
+						progname, fpath);
+				exit(1);
+			}
+			diffdir++;
+		}
+						/* get final path component */
+		for (fpath = fname+strlen(fname);
+				fpath > fname && !ISDIRSEP(fpath[-1]); fpath--)
+			;
+	}
+						/* open the file */
+	if ((mainfp = fopen(fpath, "r")) == NULL) {
+		fprintf(stderr, "%s: cannot open file \"%s\"\n",
+				progname, mainfn);
+		exit(1);
+	}
+}
+#endif