--- ray/src/gen/xform.c	1991/07/19 09:43:40	1.14
+++ ray/src/gen/xform.c	2003/10/22 02:06:34	2.33
@@ -1,9 +1,6 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: xform.c,v 2.33 2003/10/22 02:06:34 greg Exp $";
 #endif
-
 /*
  *  xform.c - program to transform object files.
  *		Transformations must preserve aspect ratio.
@@ -12,12 +9,12 @@ static char SCCSid[] = "$SunId$ LBL";
  *     11/6/86		Finally added error checking!
  */
 
-#include  "standard.h"
-
 #include  <ctype.h>
 
+#include  "platform.h"
+#include  "standard.h"
+#include  "paths.h"
 #include  "object.h"
-
 #include  "otypes.h"
 
 int  xac;				/* global xform argument count */
@@ -25,57 +22,96 @@ char  **xav;				/* global xform argument pointer */
 int  xfa;				/* start of xf arguments */
 
 XF  tot;				/* total transformation */
-int  reverse;				/* boolean true if scene inverted */
+int  reverse;				/* boolean true if scene mirrored */
 
-int  expand = 0;			/* boolean true to expand commands */
+int  invert;				/* boolean true to invert surfaces */
 
-char  *newmod = NULL;			/* new modifier for surfaces */
+int  expand;				/* boolean true to expand commands */
 
-char  *idprefix = NULL;			/* prefix for object identifiers */
+char  *newmod;				/* new modifier for surfaces */
 
-#define  ALIAS		NUMOTYPE	/* put alias at end of array */
+char  *idprefix;			/* prefix for object identifiers */
 
-#define  NUMTYPES	(NUMOTYPE+1)	/* total number of object types */
+FUN  ofun[NUMOTYPE] = INIT_OTYPE;	/* default types and actions */
 
-FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and actions */
+short  tinvers[NUMOTYPE];		/* inverse types for surfaces */
 
-extern char  *malloc();
+int  nrept = 1;				/* number of array repetitions */
 
-#define  progname  (xav[0])
+int stdinused = 0;			/* stdin has been used by -f option? */
 
+char  mainfn[PATH_MAX];			/* 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;
+	int  mal_prefix = 0;
+	char  *fname;
 	int  a;
-					/* check for array */
+					/* 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));
 
-	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((void *)idprefix);
+					idprefix = newp;
+				}
 				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 = !invert;
+				continue;
 			}
 		break;
 	}
@@ -85,8 +121,10 @@ char  *argv[];
 
 	a += xf(&tot, argc-a, argv+a);
 
-	if (reverse = tot.sca < 0.0)
+	if ( (reverse = tot.sca < 0.0) )
 		tot.sca = -tot.sca;
+	if (invert)
+		reverse = !reverse;
 
 	if (a < argc && argv[a][0] == '-') {
 		fprintf(stderr, "%s: command line error at '%s'\n",
@@ -101,23 +139,135 @@ char  *argv[];
 		printf(" %s", xav[a]);
 	putchar('\n');
 					/* transform input */
-	if (xac == argc)
-		xform("standard input", stdin);
-	else
+	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++) {
-			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);
 		}
 
+	if (mal_prefix)
+		free((void *)idprefix);
 	return(0);
 }
 
 
+doargf(ac, av, fi)			/* take argument list from file */
+char  **av;
+int  ac, fi;
+{
+	int  inquote;
+	char  *newav[256], **avp;
+	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] == '-' && 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 (fgetline(argbuf,sizeof(argbuf),argfp) != NULL)
+			n += argbuf[0] && 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 (fgetline(argbuf,sizeof(argbuf),argfp) != NULL) {
+		if (!argbuf[0] || 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;
+		inquote = 0;
+		for ( ; ; ) {
+		skipspaces:
+			while (isspace(*cp))	/* nullify spaces */
+				*cp++ = '\0';
+			if ((*cp == '"') | (*cp == '\''))
+				inquote = *cp++;
+			if (!*cp)		/* all done? */
+				break;
+			if (cp[0] == '\\' && cp[1])
+				if (*++cp == '\n')
+					goto skipspaces;
+			avp[newac++] = cp;	/* add argument to list */
+			if (inquote) {
+				while (*++cp)
+					if (*cp == inquote) {
+						*cp++ = '\0';
+						break;
+					}
+			} else {
+				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;
+			}
+		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);
+}
+
+
 doarray(ac, av, ai)			/* make array */
 char  **av;
 int  ac, ai;
@@ -125,8 +275,13 @@ int  ac, ai;
 	char  *newav[256], **avp;
 	char  newid[128], repts[32];
 	char  *oldid = NULL;
-	int  i, err;
+	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++)
@@ -146,7 +301,7 @@ int  ac, ai;
 		ac += 2;
 	}
 	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
@@ -162,6 +317,7 @@ xform(name, fin)			/* transform stream by tot.xfm */
 char  *name;
 register FILE  *fin;
 {
+	int  nobjs = 0;
 	register int  c;
 
 	while ((c = getc(fin)) != EOF) {
@@ -177,44 +333,43 @@ register FILE  *fin;
 		} else if (c == '!') {			/* command */
 			ungetc(c, fin);
 			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)			/* transform a command */
+char  *fname;
 FILE  *fin;
 {
-	FILE  *popen();
-	char  *fgetline();
 	FILE  *pin;
 	char  buf[512];
 	int  i;
 
 	fgetline(buf, sizeof(buf), fin);
 	if (expand) {
-		if (xac > 2) {
-			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 {
-			fflush(stdout);
-			system(buf+1);
+		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 -e", 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');
 	}
@@ -228,19 +383,25 @@ FILE  *fin;
 	char  typ[16], nam[MAXSTR];
 	int  fn;
 						/* modifier and type */
-	fscanf(fin, "%s %s", nam, typ);
+	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, typ);
 		exit(1);
 	}
-	printf("\n%s %s ", newmod!=NULL && issurface(fn) ? newmod : nam, typ);
-						/* object name */
-	fscanf(fin, "%s", nam);
-	if (idprefix != NULL && issurface(fn))
-		printf("%s.%s\n", idprefix, nam);
+	if (ismodifier(fn))
+		printf("\n%s %s ", nam, typ);
 	else
+		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",
@@ -254,21 +415,25 @@ o_default(fin)			/* pass on arguments unchanged */
 FILE  *fin;
 {
 	register int  i;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	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]);
+	for (i = 0; i < fa.nsargs; i++) {
+		fputc(' ', stdout);
+		fputword(fa.sarg[i], stdout);
+	}
 	printf("\n");
-#ifdef  IARGS
+#ifdef	IARGS
 					/* integer arguments */
 	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);
@@ -284,23 +449,32 @@ addxform(fin)			/* add xf arguments to strings */
 FILE  *fin;
 {
 	register int  i;
-	FUNARGS  fa;
+	int  resetarr = 0;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	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++) {
+		fputc(' ', stdout);
+		fputword(fa.sarg[i], stdout);
+	}
+	if (resetarr)
+		printf(" -i 1");
 	for (i = xfa; i < xac; i++)	/* add xf arguments */
 		printf(" %s", xav[i]);
 	printf("\n");
-#ifdef  IARGS
+#ifdef	IARGS
 					/* integer arguments */
 	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);
@@ -312,26 +486,12 @@ FILE  *fin;
 }
 
 
-int
-otype(ofname)			/* get object function number from its name */
-register char  *ofname;
-{
-	register int  i;
-
-	for (i = 0; i < NUMTYPES; i++)
-		if (!strcmp(ofun[i].funame, ofname))
-			return(i);
-
-	return(-1);		/* not found */
-}
-
-
 alias(fin)			/* transfer alias */
 FILE  *fin;
 {
 	char  aliasnm[MAXSTR];
 
-	if (fscanf(fin, "%s", aliasnm) != 1)
+	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
 		return(-1);
 	printf("\t%s\n", aliasnm);
 	return(0);
@@ -341,9 +501,9 @@ FILE  *fin;
 m_glow(fin)			/* transform arguments for proximity light */
 FILE  *fin;
 {
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
@@ -359,10 +519,10 @@ FILE  *fin;
 m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
-	double  v[3];
-	FUNARGS  fa;
+	FVECT  v;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
@@ -376,22 +536,63 @@ FILE  *fin;
 }
 
 
+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();
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	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);
 }
@@ -400,24 +601,23 @@ FILE  *fin;
 m_interface(fin)		/* transform arguments for interface */
 FILE  *fin;
 {
-	double  pow();
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	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);
 }
@@ -427,17 +627,19 @@ text(fin)			/* transform text arguments */
 FILE  *fin;
 {
 	int  i;
-	double  v[3];
-	FUNARGS  fa;
+	FVECT  v;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (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]);
+	for (i = 0; i < fa.nsargs; i++) {
+		fputc(' ', stdout);
+		fputword(fa.sarg[i], stdout);
+	}
 	printf("\n0\n%d\n", fa.nfargs);
 					/* anchor point */
 	multp3(v, fa.farg, tot.xfm);
@@ -447,16 +649,14 @@ FILE  *fin;
 	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
 					/* down vector */
 	multv3(v, fa.farg+6, tot.xfm);
-	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]);
+	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]);
 	}
+	putchar('\n');
 	freefargs(&fa);
 	return(0);
 }
@@ -465,10 +665,10 @@ FILE  *fin;
 o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
-	double  dv[3];
-	FUNARGS  fa;
+	FVECT  dv;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
@@ -486,15 +686,16 @@ FILE  *fin;
 o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
-	double  cent[3], rad;
-	FUNARGS  fa;
+	FVECT  cent;
+	double	rad;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
 	
-	multp3(cent, fa.farg, tot.xfm);	/* transform center */
+	multp3(cent, fa.farg, tot.xfm); /* transform center */
 	
 	rad = fa.farg[3] * tot.sca;		/* scale radius */
 	
@@ -509,11 +710,11 @@ FILE  *fin;
 o_face(fin)			/* transform face arguments */
 FILE  *fin;
 {
-	double  p[3];
+	FVECT  p;
 	register int  i;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs % 3)
 		return(-1);
@@ -535,10 +736,11 @@ FILE  *fin;
 o_cone(fin)			/* transform cone and cup arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], r0, r1;
-	FUNARGS  fa;
+	FVECT  p0, p1;
+	double	r0, r1;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
@@ -561,10 +763,11 @@ FILE  *fin;
 o_cylinder(fin)			/* transform cylinder and tube arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], rad;
-	FUNARGS  fa;
+	FVECT  p0, p1;
+	double	rad;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 7)
 		return(-1);
@@ -585,10 +788,11 @@ FILE  *fin;
 o_ring(fin)			/* transform ring arguments */
 FILE  *fin;
 {
-	double  p0[3], pd[3], r0, r1;
-	FUNARGS  fa;
+	FVECT  p0, pd;
+	double	r0, r1;
+	FUNARGS	 fa;
 
-	if (readfargs(&fa, fin) <= 0)
+	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 8)
 		return(-1);
@@ -597,6 +801,11 @@ FILE  *fin;
 
 	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]);
@@ -609,29 +818,12 @@ FILE  *fin;
 
 initotypes()			/* initialize ofun[] array */
 {
-	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();
 	register int  i;
 
 	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++)
+	for (i = 0; i < NUMOTYPE; i++)
 		if (hasfunc(i))
 			ofun[i].funp = addxform;
 					/* special cases */
@@ -644,13 +836,138 @@ initotypes()			/* initialize ofun[] array */
 	ofun[OBJ_CYLINDER].funp =
 	ofun[OBJ_TUBE].funp = o_cylinder;
 	ofun[OBJ_RING].funp = o_ring;
-	ofun[OBJ_INSTANCE].funp = addxform;
+	ofun[OBJ_INSTANCE].funp =
+	ofun[OBJ_MESH].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;
+	ofun[MOD_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 */
 }
+
+
+#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(iname)		/* open input, changing directory for file */
+char  *iname;
+{
+	static char  origdir[PATH_MAX];
+	static char  curfn[PATH_MAX];
+	static int  diffdir;
+	register char  *fpath;
+
+	if (iname == 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);
+		}
+		rewind(mainfp);			/* rewind copy */
+		return;
+	}
+	if (mainfp == NULL) {			/* first call, initialize */
+		getcwd(origdir, sizeof(origdir));
+	} else if (!strcmp(iname, curfn)) {	/* just need to rewind? */
+		rewind(mainfp);
+		return;
+	} else {				/* else close old stream */
+		fclose(mainfp);
+		mainfp = NULL;
+		if (diffdir) {			/* return to our directory */
+			chdir(origdir);
+			diffdir = 0;
+		}
+	}
+	strcpy(curfn, iname);			/* remember input name */
+						/* get full path for file */
+	if ((fpath = getpath(iname, getrlibpath(), R_OK)) == NULL) {
+		fprintf(stderr, "%s: cannot find file \"%s\"\n",
+				progname, iname);
+		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 = iname+strlen(iname);
+				fpath > iname && !ISDIRSEP(fpath[-1]); fpath--)
+			;
+	}
+						/* finally, open the file */
+	if ((mainfp = fopen(fpath, "r")) == NULL) {
+		fprintf(stderr, "%s: cannot open file \"%s\"\n",
+				progname, mainfn);
+		exit(1);
+	}
+}
+#endif