--- ray/src/gen/xform.c	1989/06/07 10:09:07	1.5
+++ ray/src/gen/xform.c	1999/06/04 16:00:27	2.19
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1996 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -12,161 +12,282 @@ static char SCCSid[] = "$SunId$ LBL";
  *     11/6/86		Finally added error checking!
  */
 
-#include  <stdio.h>
+#include  "standard.h"
 
+#include  "paths.h"
+
 #include  <ctype.h>
 
+#include  "object.h"
 
-typedef struct {
-	char  *funame;			/* function name */
-	int  (*funp)();			/* pointer to function */
-}  FUN;
+#include  "otypes.h"
 
 int  xac;				/* global xform argument count */
 char  **xav;				/* global xform argument pointer */
 int  xfa;				/* start of xf arguments */
 
-double  totxform[4][4];			/* total transformation matrix */
-double  totscale;			/* total scale factor */
-int  reverse;				/* boolean true if scene inverted */
+XF  tot;				/* total transformation */
+int  reverse;				/* boolean true if scene mirrored */
 
-int  expand = 0;			/* boolean true to expand commands */
+int  invert = 0;			/* boolean true to invert surfaces */
 
+int  expand = 1;			/* boolean true to expand commands */
+
+char  *newmod = NULL;			/* new modifier for surfaces */
+
 char  *idprefix = NULL;			/* prefix for object identifiers */
 
-extern int  o_source();
-extern int  o_sphere();
-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();
-extern int  alias();
-extern int  passargs();
-extern int  addxform();
+#define	 ALIAS		NUMOTYPE	/* put alias at end of array */
 
-FUN  ofun[] = {
-	{ "source", o_source },
-	{ "sphere", o_sphere },
-	{ "bubble", o_sphere },
-	{ "polygon", o_face },
-	{ "cone", o_cone },
-	{ "cup", o_cone },
-	{ "cylinder", o_cylinder },
-	{ "tube", o_cylinder },
-	{ "ring", o_ring },
-	{ "instance", addxform },
-	{ "alias", alias },
-	{ "antimatter", passargs },
-	{ "glow", m_glow },
-	{ "spotlight", m_spot },
-	{ "dielectric", m_dielectric },
-	{ "interface", m_interface },
-	{ "colortext", text },
-	{ "brighttext", text },
-	{ "texfunc", addxform },
-	{ "texdata", addxform },
-	{ "colorfunc", addxform },
-	{ "brightfunc", addxform },
-	{ "colorpict", addxform },
-	{ "colordata", addxform },
-	{ "brightdata", addxform },
-	{ "mixfunc", addxform },
-	{ "mixdata", addxform },
-	{ "mixtext", text },
-	{ "light", passargs },
-	{ "illum", passargs },
-	{ "plastic", passargs },
-	{ "metal", passargs },
-	{ "trans", passargs },
-	{ "glass", passargs },
-	{ 0 }					/* terminator */
-};
+#define	 NUMTYPES	(NUMOTYPE+1)	/* total number of object types */
 
-#define  issurface(t)		((t)<=9)
+FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and actions */
 
-typedef struct {
-	short  nsargs;			/* # of string arguments */
-	char  **sarg;			/* string arguments */
-	short  niargs;			/* # of integer arguments */
-	int  *iarg;			/* integer arguments */
-	short  nfargs;			/* # of float arguments */
-	double  *farg;			/* float arguments */
-}  FUNARGS;
+short  tinvers[NUMOTYPE];		/* inverse types for surfaces */
 
-#define  MAXSTR		512		/* maximum string length */
+int  nrept = 1;				/* number of array repetitions */
 
-FUNARGS  *getfargs();
-char  *malloc();
+int stdinused = 0;			/* stdin has been used by -f option? */
 
-#define  progname  (xav[0])
+extern char  *malloc(), *fgets(), *fgetword();
 
+char  mainfn[MAXPATH];			/* main file name */
+FILE  *mainfp = NULL;			/* main file pointer */
 
+#define	 progname  (xav[0])
+
+
 main(argc, argv)		/* get transform options and transform file */
 int  argc;
 char  *argv[];
 {
-	FILE  *fopen();
-	FILE  *fp;
+	char  *fname;
 	int  a;
+					/* check for argument list file */
+	for (a = 1; a < argc; a++)
+		if (!strcmp(argv[a], "-f"))
+			return(doargf(argc, argv, a));
+					/* check for regular array */
+	for (a = 1; a < argc; a++)
+		if (!strcmp(argv[a], "-a"))
+			return(doarray(argc, argv, a));
 
-	xav = argv;
+	initotypes();
 
 	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
+			case 'm':
+				if (argv[a][2] || a+1 >= argc)
+					break;
+				newmod = argv[++a];
+				continue;
 			case 'n':
+				if (argv[a][2] || a+1 >= argc)
+					break;
 				idprefix = argv[++a];
 				continue;
+			case 'c':
+				if (argv[a][2])
+					break;
+				expand = 0;
+				continue;
 			case 'e':
+				if (argv[a][2])
+					break;
 				expand = 1;
 				continue;
+			case 'I':
+				if (argv[a][2])
+					break;
+				invert = 1;
+				continue;
 			}
 		break;
 	}
 
+	xav = argv;
 	xfa = a;
 
-	totscale = 1.0;
-	setident4(totxform);
+	a += xf(&tot, argc-a, argv+a);
 
-	a += xf(totxform, &totscale, argc-a, argv+a);
+	if (reverse = tot.sca < 0.0)
+		tot.sca = -tot.sca;
+	if (invert)
+		reverse = !reverse;
 
-	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 */
+					/* simple header */
+	putchar('#');
 	for (a = 0; a < xac; a++)
 		printf(" %s", xav[a]);
 	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
+		for (a = xac; a < argc; a++) {
+			openmain(argv[a]);
+			xform(mainfn, mainfp);
+		}
 
-	if (a == argc)
-		xform("standard input", stdin);
-	else
-		for ( ; a < argc; a++) {
-			if ((fp = fopen(argv[a], "r")) == NULL) {
-				fprintf(stderr, "%s: cannot open \"%s\"\n",
-						progname, argv[a]);
-				exit(1);
+	return(0);
+}
+
+
+doargf(ac, av, fi)			/* take argument list from file */
+char  **av;
+int  ac, fi;
+{
+	char  *newav[256], **avp;
+	char  argbuf[2048];
+	char  newid[128];
+	char  *oldid;
+	register char	*cp;
+	FILE	*argfp;
+	int  n, i, k, newac, err;
+	
+	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 (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);
+	}
+	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 */
+		if (*cp == '!') cp++;
+		if (!strncmp(cp, "xform ", 6)) cp += 6;
+		for ( ; ; ) {
+			while (isspace(*cp))	/* nullify spaces */
+				*cp++ = '\0';
+			if (!*cp)		/* all done? */
+				break;
+			avp[newac++] = cp;	/* add argument to list */
+			while (*++cp && !isspace(*cp))
+				;
+		}
+		for (i = fi+2; i < ac; i++)
+			avp[newac++] = av[i];
+		avp[newac] = NULL;
+		oldid = NULL;
+		for (i = 2; i < newac; i++)
+			if (!strcmp(avp[i-1], "-n")) {
+				oldid = avp[i];
+				avp[i] = newid;
+				break;
 			}
-			xform(argv[a], fp);
-			fclose(fp);
+		if (oldid == NULL) {
+			newav[0] = av[0];
+			newav[1] = "-n";
+			newav[2] = newid;
+			avp = newav;
+			newac += 2;
 		}
+		if (oldid == NULL)
+			sprintf(newid, "i%d", k);
+		else
+			sprintf(newid, "%s.%d", oldid, k);
+		err |= main(newac, avp);
+		k++;
+	}
+	fclose(argfp);
+	return(err);
+}
 
-	exit(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  n, i, err;
+	
+	if (ai >= ac-1 || (n = atoi(av[ai+1])) <= 0) {
+		fprintf(stderr, "%s: missing count for -a option\n", av[0]);
+		exit(1);
+	}
+	nrept *= n;
+	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 < n; 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 */
+xform(name, fin)			/* transform stream by tot.xfm */
 char  *name;
 register FILE  *fin;
 {
+	int  nobjs = 0;
 	register int  c;
 
 	while ((c = getc(fin)) != EOF) {
@@ -181,43 +302,48 @@ 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);
+			nobjs++;
 		} else {				/* object */
 			ungetc(c, fin);
 			xfobject(name, fin);
+			nobjs++;
 		}
 	}
+	if (nobjs == 0)
+		fprintf(stderr, "%s: (%s): warning - empty file\n",
+				progname, name);
 }
 
 
-xfcomm(fname, fin)				/* expand a command */
+xfcomm(fname, fin)			/* transform a command */
+char  *fname;
 FILE  *fin;
 {
-	FILE  *popen();
-	char  *fgets();
+	extern FILE  *popen();
+	extern 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", buf);
+		if (xac > 1) {
+			printf(" | %s", xav[0]);
+			for (i = 1; i < xac; i++)
+				printf(" %s", xav[i]);
+		}
+		putchar('\n');
 	}
-	xform(buf, pin);
-	pclose(pin);
 }
 
 
@@ -225,56 +351,66 @@ xfobject(fname, fin)				/* transform an object */
 char  *fname;
 FILE  *fin;
 {
-	char  stmp[MAXSTR];
+	extern char  *strcpy();
+	char  typ[16], nam[MAXSTR];
 	int  fn;
-	
-	fscanf(fin, "%s", stmp);	/* modifier */
-	printf("\n%s ", stmp);
-	fscanf(fin, "%s", stmp);	/* object type */
-	if ((fn = otype(stmp)) < 0) {
+						/* modifier and type */
+	strcpy(typ, "EOF");
+	fgetword(nam, sizeof(nam), fin);
+	fgetword(typ, sizeof(typ), fin);
+	if ((fn = otype(typ)) < 0) {
 		fprintf(stderr, "%s: (%s): unknown object type \"%s\"\n",
-				progname, fname, stmp);
+				progname, fname, typ);
 		exit(1);
 	}
-	printf("%s ", stmp);
-	fscanf(fin, "%s", stmp);	/* object name */
-	if (idprefix != NULL && issurface(fn))
-		printf("%s.%s\n", idprefix, stmp);
+	if (ismodifier(fn))
+		printf("\n%s %s ", nam, typ);
 	else
-		printf("%s\n", stmp);
-					/* transform arguments */
+		printf("\n%s %s ", newmod != NULL ? newmod : nam,
+				invert ? ofun[tinvers[fn]].funame : typ);
+						/* object name */
+	fgetword(nam, sizeof(nam), fin);
+	if (idprefix == NULL || ismodifier(fn))
+		printf("%s\n", nam);
+	else
+		printf("%s.%s\n", idprefix, nam);
+						/* transform arguments */
 	if ((*ofun[fn].funp)(fin) < 0) {
 		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
-				progname, fname, ofun[fn].funame, stmp);
+				progname, fname, ofun[fn].funame, nam);
 		exit(1);
 	}
 }
 
 
-passargs(fin)			/* pass on arguments unchanged */
+o_default(fin)			/* pass on arguments unchanged */
 FILE  *fin;
 {
 	register int  i;
-	register FUNARGS  *fa;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 					/* string arguments */
-	printf("%d", fa->nsargs);
-	for (i = 0; i < fa->nsargs; i++)
-		printf(" %s", fa->sarg[i]);
+	printf("%d", fa.nsargs);
+	for (i = 0; i < fa.nsargs; i++)
+		printf(" %s", fa.sarg[i]);
 	printf("\n");
+#ifdef	IARGS
 					/* integer arguments */
-	printf("%d", fa->niargs);
-	for (i = 0; i < fa->niargs; i++)
-		printf(" %d", fa->iarg[i]);
+	printf("%d", fa.niargs);
+	for (i = 0; i < fa.niargs; i++)
+		printf(" %d", fa.iarg[i]);
 	printf("\n");
+#else
+	printf("0\n");
+#endif
 					/* float arguments */
-	printf("%d", fa->nfargs);
-	for (i = 0; i < fa->nfargs; i++)
-		printf(" %18.12g", fa->farg[i]);
+	printf("%d", fa.nfargs);
+	for (i = 0; i < fa.nfargs; i++)
+		printf(" %18.12g", fa.farg[i]);
 	printf("\n");
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -283,28 +419,37 @@ addxform(fin)			/* add xf arguments to strings */
 FILE  *fin;
 {
 	register int  i;
-	register FUNARGS  *fa;
+	int  resetarr = 0;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 					/* string arguments */
-	printf("%d", fa->nsargs + xac-xfa);
-	for (i = 0; i < fa->nsargs; i++)
-		printf(" %s", fa->sarg[i]);
+	if (xac > xfa && strcmp(xav[xfa], "-i"))
+		resetarr = 2;
+	printf("%d", fa.nsargs + resetarr + xac-xfa);
+	for (i = 0; i < fa.nsargs; i++)
+		printf(" %s", fa.sarg[i]);
+	if (resetarr)
+		printf(" -i 1");
 	for (i = xfa; i < xac; i++)	/* add xf arguments */
 		printf(" %s", xav[i]);
 	printf("\n");
+#ifdef	IARGS
 					/* integer arguments */
-	printf("%d", fa->niargs);
-	for (i = 0; i < fa->niargs; i++)
-		printf(" %d", fa->iarg[i]);
+	printf("%d", fa.niargs);
+	for (i = 0; i < fa.niargs; i++)
+		printf(" %d", fa.iarg[i]);
 	printf("\n");
+#else
+	printf("0\n");
+#endif
 					/* float arguments */
-	printf("%d", fa->nfargs);
-	for (i = 0; i < fa->nfargs; i++)
-		printf(" %18.12g", fa->farg[i]);
+	printf("%d", fa.nfargs);
+	for (i = 0; i < fa.nfargs; i++)
+		printf(" %18.12g", fa.farg[i]);
 	printf("\n");
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -315,7 +460,7 @@ register char  *ofname;
 {
 	register int  i;
 
-	for (i = 0; ofun[i].funame != NULL; i++)
+	for (i = 0; i < NUMTYPES; i++)
 		if (!strcmp(ofun[i].funame, ofname))
 			return(i);
 
@@ -326,11 +471,11 @@ register char  *ofname;
 alias(fin)			/* transfer alias */
 FILE  *fin;
 {
-	char  alias[MAXSTR];
+	char  aliasnm[MAXSTR];
 
-	if (fscanf(fin, "%s", alias) != 1)
+	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
 		return(-1);
-	printf("\t%s\n", alias);
+	printf("\t%s\n", aliasnm);
 	return(0);
 }
 
@@ -338,17 +483,17 @@ FILE  *fin;
 m_glow(fin)			/* transform arguments for proximity light */
 FILE  *fin;
 {
-	register FUNARGS  *fa;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
+	if (fa.nsargs != 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);
+			fa.farg[0], fa.farg[1], fa.farg[2]);
+	printf(" %18.12g\n", fa.farg[3] * tot.sca);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -356,40 +501,81 @@ FILE  *fin;
 m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
-	double  v[3];
-	register FUNARGS  *fa;
+	FVECT  v;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 7)
+	if (fa.nsargs != 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);
+			fa.farg[0], fa.farg[1], fa.farg[2], fa.farg[3]);
+	multv3(v, fa.farg+4, tot.xfm);
 	printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
 
+m_mist(fin)		/* transform arguments for mist */
+FILE  *fin;
+{
+	FUNARGS	 fa;
+	int	i;
+
+	if (readfargs(&fa, fin) != 1)
+		return(-1);
+	if (fa.nfargs > 7)
+		return(-1);
+	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);
+}
+
+
 m_dielectric(fin)		/* transform arguments for dielectric */
 FILE  *fin;
 {
-	double  pow();
-	register FUNARGS  *fa;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 5)
+	if (fa.nsargs != 0  || fa.nfargs != 5)
 		return(-1);
 	printf("0\n0\n5");
-	printf(" %18.12g %18.12g %18.12g",
-		pow(fa->farg[0], 1.0/totscale),
-		pow(fa->farg[1], 1.0/totscale),
-		pow(fa->farg[2], 1.0/totscale));
-	printf(" %18.12g %18.12g\n", fa->farg[3], fa->farg[4]);
-	freefargs(fa);
+	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(" %12.6g %12.6g\n", fa.farg[3], fa.farg[4]);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -397,25 +583,24 @@ FILE  *fin;
 m_interface(fin)		/* transform arguments for interface */
 FILE  *fin;
 {
-	double  pow();
-	register FUNARGS  *fa;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
+	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
 	printf("0\n0\n8\n");
-	printf("%18.12g %18.12g %18.12g",
-		pow(fa->farg[0], 1.0/totscale),
-		pow(fa->farg[1], 1.0/totscale),
-		pow(fa->farg[2], 1.0/totscale));
-	printf(" %18.12g\n", fa->farg[3]);
-	printf("%18.12g %18.12g %18.12g",
-		pow(fa->farg[4], 1.0/totscale),
-		pow(fa->farg[5], 1.0/totscale),
-		pow(fa->farg[6], 1.0/totscale));
-	printf(" %18.12g\n", fa->farg[7]);
-	freefargs(fa);
+	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(" %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(" %12.6g\n", fa.farg[7]);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -424,38 +609,35 @@ text(fin)			/* transform text arguments */
 FILE  *fin;
 {
 	int  i;
-	double  v[3];
-	register FUNARGS  *fa;
+	FVECT  v;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->niargs != 0 || (fa->nfargs != 9 &&
-			fa->nfargs != 11 && fa->nfargs != 15))
+	if (fa.nfargs < 9)
 		return(-1);
 					/* string arguments */
-	printf("%d", fa->nsargs);
-	for (i = 0; i < fa->nsargs; i++)
-		printf(" %s", fa->sarg[i]);
-	printf("\n0\n%d\n", fa->nfargs);
+	printf("%d", fa.nsargs);
+	for (i = 0; i < fa.nsargs; i++)
+		printf(" %s", fa.sarg[i]);
+	printf("\n0\n%d\n", fa.nfargs);
 					/* anchor point */
-	multp3(v, fa->farg, totxform);
+	multp3(v, fa.farg, tot.xfm);
 	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
 					/* right vector */
-	multv3(v, fa->farg+3, totxform);
+	multv3(v, fa.farg+3, tot.xfm);
 	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
 					/* down vector */
-	multv3(v, fa->farg+6, totxform);
-	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
-					/* forground and background */
-	if (fa->nfargs == 11)
-		printf(" %18.12g %18.12g\n", fa->farg[9], fa->farg[10]);
-	else if (fa->nfargs == 15) {
-		printf(" %18.12g %18.12g %18.12g\n",
-				fa->farg[9], fa->farg[10], fa->farg[11]);
-		printf(" %18.12g %18.12g %18.12g\n",
-				fa->farg[12], fa->farg[13], fa->farg[14]);
+	multv3(v, fa.farg+6, tot.xfm);
+	printf(" %18.12g %18.12g %18.12g", v[0], v[1], v[2]);
+					/* remaining arguments */
+	for (i = 9; i < fa.nfargs; i++) {
+		if (i%3 == 0)
+			putchar('\n');
+		printf(" %18.12g", fa.farg[i]);
 	}
-	freefargs(fa);
+	putchar('\n');
+	freefargs(&fa);
 	return(0);
 }
 
@@ -463,20 +645,20 @@ FILE  *fin;
 o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
-	double  dv[3];
-	register FUNARGS  *fa;
+	FVECT  dv;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
+	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
 					/* transform direction vector */
-	multv3(dv, fa->farg, totxform);
+	multv3(dv, fa.farg, tot.xfm);
 					/* output */
 	printf("0\n0\n4");
 	printf(" %18.12g %18.12g %18.12g %18.12g\n",
-			dv[0], dv[1], dv[2], fa->farg[3]);
-	freefargs(fa);
+			dv[0], dv[1], dv[2], fa.farg[3]);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -484,22 +666,23 @@ FILE  *fin;
 o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
-	double  cent[3], rad;
-	register FUNARGS  *fa;
+	FVECT  cent;
+	double	rad;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
+	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
 	
-	multp3(cent, fa->farg, totxform);	/* transform center */
+	multp3(cent, fa.farg, tot.xfm); /* transform center */
 	
-	rad = fa->farg[3] * totscale;		/* scale radius */
+	rad = fa.farg[3] * tot.sca;		/* scale radius */
 	
 	printf("0\n0\n4");
 	printf(" %18.12g %18.12g %18.12g %18.12g\n",
 			cent[0], cent[1], cent[2], rad);
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -507,25 +690,25 @@ FILE  *fin;
 o_face(fin)			/* transform face arguments */
 FILE  *fin;
 {
-	double  p[3];
+	FVECT  p;
 	register int  i;
-	register FUNARGS  *fa;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs % 3)
+	if (fa.nsargs != 0  || fa.nfargs % 3)
 		return(-1);
 	
-	printf("0\n0\n%d\n", fa->nfargs);
+	printf("0\n0\n%d\n", fa.nfargs);
 	
-	for (i = 0; i < fa->nfargs; i += 3) {
+	for (i = 0; i < fa.nfargs; i += 3) {
 		if (reverse)
-			multp3(p, fa->farg+(fa->nfargs-i-3), totxform);
+			multp3(p, fa.farg+(fa.nfargs-i-3), tot.xfm);
 		else
-			multp3(p, fa->farg+i, totxform);
+			multp3(p, fa.farg+i, tot.xfm);
 		printf(" %18.12g %18.12g %18.12g\n", p[0], p[1], p[2]);
 	}
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -533,25 +716,26 @@ FILE  *fin;
 o_cone(fin)			/* transform cone and cup arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], r0, r1;
-	register FUNARGS  *fa;
+	FVECT  p0, p1;
+	double	r0, r1;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
+	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
 
 	printf("0\n0\n8\n");
 
-	multp3(p0, fa->farg, totxform);
-	multp3(p1, fa->farg+3, totxform);
-	r0 = fa->farg[6] * totscale;
-	r1 = fa->farg[7] * totscale;
+	multp3(p0, fa.farg, tot.xfm);
+	multp3(p1, fa.farg+3, tot.xfm);
+	r0 = fa.farg[6] * tot.sca;
+	r1 = fa.farg[7] * tot.sca;
 	printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
 	printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
 	printf(" %18.12g %18.12g\n", r0, r1);
 
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -559,23 +743,24 @@ FILE  *fin;
 o_cylinder(fin)			/* transform cylinder and tube arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], rad;
-	register FUNARGS  *fa;
+	FVECT  p0, p1;
+	double	rad;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 7)
+	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
 
 	printf("0\n0\n7\n");
 
-	multp3(p0, fa->farg, totxform);
-	multp3(p1, fa->farg+3, totxform);
-	rad = fa->farg[6] * totscale;
+	multp3(p0, fa.farg, tot.xfm);
+	multp3(p1, fa.farg+3, tot.xfm);
+	rad = fa.farg[6] * tot.sca;
 	printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
 	printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
 	printf(" %18.12g\n", rad);
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
@@ -583,96 +768,190 @@ FILE  *fin;
 o_ring(fin)			/* transform ring arguments */
 FILE  *fin;
 {
-	double  p0[3], pd[3], r0, r1;
-	register FUNARGS  *fa;
+	FVECT  p0, pd;
+	double	r0, r1;
+	FUNARGS	 fa;
 
-	if ((fa = getfargs(fin)) == NULL)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
+	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
 
 	printf("0\n0\n8\n");
 
-	multp3(p0, fa->farg, totxform);
-	multv3(pd, fa->farg+3, totxform);
-	r0 = fa->farg[6] * totscale;
-	r1 = fa->farg[7] * totscale;
+	multp3(p0, fa.farg, tot.xfm);
+	multv3(pd, fa.farg+3, tot.xfm);
+	if (invert) {
+		pd[0] = -pd[0];
+		pd[1] = -pd[1];
+		pd[2] = -pd[2];
+	}
+	r0 = fa.farg[6] * tot.sca;
+	r1 = fa.farg[7] * tot.sca;
 	printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
 	printf(" %18.12g %18.12g %18.12g\n", pd[0], pd[1], pd[2]);
 	printf(" %18.12g %18.12g\n", r0, r1);
-	freefargs(fa);
+	freefargs(&fa);
 	return(0);
 }
 
 
-FUNARGS *
-getfargs(fp)		/* get function arguments from stream */
-FILE  *fp;
+initotypes()			/* initialize ofun[] array */
 {
-	char  *strcpy();
-	char  sbuf[MAXSTR];
-	int  n;
-	register FUNARGS  *fa;
 	register int  i;
 
-	if ((fa = (FUNARGS *)malloc((unsigned)sizeof(FUNARGS))) == NULL)
-		goto memerr;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(NULL);
-	if (fa->nsargs = n) {
-		fa->sarg = (char **)malloc((unsigned)fa->nsargs*sizeof(char *));
-		if (fa->sarg == NULL)
-			goto memerr;
-		for (i = 0; i < fa->nsargs; i++) {
-			if (fscanf(fp, "%s", sbuf) != 1)
-				return(NULL);
-			if ((fa->sarg[i] = malloc((unsigned)strlen(sbuf)+1)) == NULL)
-				goto memerr;
-			strcpy(fa->sarg[i], sbuf);
-		}
-	} else
-		fa->sarg = NULL;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(NULL);
-	if (fa->niargs = n) {
-		fa->iarg = (int *)malloc((unsigned)fa->niargs*sizeof(int));
-		if (fa->iarg == NULL)
-			goto memerr;
-		for (i = 0; i < fa->niargs; i++)
-			if (fscanf(fp, "%d", &fa->iarg[i]) != 1)
-				return(NULL);
-	} else
-		fa->iarg = NULL;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(NULL);
-	if (fa->nfargs = n) {
-		fa->farg = (double *)malloc((unsigned)fa->nfargs*sizeof(double));
-		if (fa->farg == NULL)
-			goto memerr;
-		for (i = 0; i < fa->nfargs; i++)
-			if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
-				return(NULL);
-	} else
-		fa->farg = NULL;
-	return(fa);
-memerr:
-	fprintf(stderr, "%s: out of memory in getfargs\n", progname);
-	exit(1);
+	if (ofun[OBJ_SOURCE].funp == o_source)
+		return;			/* done already */
+					/* alias is additional */
+	ofun[ALIAS].funame = ALIASID;
+	ofun[ALIAS].flags = 0;
+					/* functions get new transform */
+	for (i = 0; i < NUMTYPES; i++)
+		if (hasfunc(i))
+			ofun[i].funp = addxform;
+					/* special cases */
+	ofun[OBJ_SOURCE].funp = o_source;
+	ofun[OBJ_SPHERE].funp =
+	ofun[OBJ_BUBBLE].funp = o_sphere;
+	ofun[OBJ_FACE].funp = o_face;
+	ofun[OBJ_CONE].funp =
+	ofun[OBJ_CUP].funp = o_cone;
+	ofun[OBJ_CYLINDER].funp =
+	ofun[OBJ_TUBE].funp = o_cylinder;
+	ofun[OBJ_RING].funp = o_ring;
+	ofun[OBJ_INSTANCE].funp = addxform;
+	ofun[MAT_GLOW].funp = m_glow;
+	ofun[MAT_SPOT].funp = m_spot;
+	ofun[MAT_DIELECTRIC].funp = m_dielectric;
+	ofun[MAT_INTERFACE].funp = m_interface;
+	ofun[MAT_MIST].funp = m_mist;
+	ofun[PAT_CTEXT].funp =
+	ofun[PAT_BTEXT].funp =
+	ofun[MIX_TEXT].funp = text;
+	ofun[ALIAS].funp = alias;
+					/* surface inverses */
+	tinvers[OBJ_FACE] = OBJ_FACE;
+	tinvers[OBJ_SOURCE] = OBJ_SOURCE;
+	tinvers[OBJ_CONE] = OBJ_CUP;
+	tinvers[OBJ_CUP] = OBJ_CONE;
+	tinvers[OBJ_SPHERE] = OBJ_BUBBLE;
+	tinvers[OBJ_BUBBLE] = OBJ_SPHERE;
+	tinvers[OBJ_RING] = OBJ_RING;
+	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
+	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
+	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE;	/* oh, well */
 }
 
 
-freefargs(fa)			/* free memory associated with fa */
-register FUNARGS  *fa;
+#ifdef  OLDXFORM
+openmain(fname)
+char  *fname;
 {
-	register int  i;
+	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;
 
-	for (i = 0; i < fa->nsargs; i++)
-		free(fa->sarg[i]);
-	if (fa->nsargs)
-		free(fa->sarg);
-	if (fa->niargs)
-		free(fa->iarg);
-	if (fa->nfargs)
-		free(fa->farg);
-	free(fa);
+	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