--- ray/src/gen/xform.c	1991/11/12 17:04:57	2.1
+++ ray/src/gen/xform.c	1992/03/12 11:43:58	2.3
@@ -248,17 +248,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 +304,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");