--- ray/src/gen/xform.c	1991/10/22 13:32:58	1.16
+++ ray/src/gen/xform.c	1992/06/25 11:49:46	2.5
@@ -207,19 +207,13 @@ FILE  *fin;
 
 	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) {
@@ -248,17 +242,17 @@ FILE  *fin;
 				progname, fname, typ);
 		exit(1);
 	}
-	if (issurface(fn))
+	if (ismodifier(fn))
+		printf("\n%s %s ", nam, typ);
+	else
 		printf("\n%s %s ", newmod != NULL ? newmod : nam,
 				invert ? ofun[tinvers[fn]].funame : typ);
-	else
-		printf("\n%s %s ", nam, typ);
 						/* object name */
 	fgetword(nam, sizeof(nam), fin);
-	if (idprefix != NULL && issurface(fn))
-		printf("%s.%s\n", idprefix, nam);
-	else
+	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",
@@ -304,14 +298,19 @@ addxform(fin)			/* add xf arguments to strings */
 FILE  *fin;
 {
 	register int  i;
+	int  resetarr = 0;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
 					/* string arguments */
-	printf("%d", fa.nsargs + xac-xfa);
+	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");
@@ -381,7 +380,7 @@ FILE  *fin;
 m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
-	double  v[3];
+	FVECT  v;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -449,12 +448,12 @@ text(fin)			/* transform text arguments */
 FILE  *fin;
 {
 	int  i;
-	double  v[3];
+	FVECT  v;
 	FUNARGS  fa;
 
 	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);
@@ -469,16 +468,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);
 }
@@ -487,7 +484,7 @@ FILE  *fin;
 o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
-	double  dv[3];
+	FVECT  dv;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -508,7 +505,8 @@ FILE  *fin;
 o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
-	double  cent[3], rad;
+	FVECT  cent;
+	double  rad;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -531,7 +529,7 @@ FILE  *fin;
 o_face(fin)			/* transform face arguments */
 FILE  *fin;
 {
-	double  p[3];
+	FVECT  p;
 	register int  i;
 	FUNARGS  fa;
 
@@ -557,7 +555,8 @@ FILE  *fin;
 o_cone(fin)			/* transform cone and cup arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], r0, r1;
+	FVECT  p0, p1;
+	double  r0, r1;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -583,7 +582,8 @@ FILE  *fin;
 o_cylinder(fin)			/* transform cylinder and tube arguments */
 FILE  *fin;
 {
-	double  p0[3], p1[3], rad;
+	FVECT  p0, p1;
+	double  rad;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)
@@ -607,7 +607,8 @@ FILE  *fin;
 o_ring(fin)			/* transform ring arguments */
 FILE  *fin;
 {
-	double  p0[3], pd[3], r0, r1;
+	FVECT  p0, pd;
+	double  r0, r1;
 	FUNARGS  fa;
 
 	if (readfargs(&fa, fin) != 1)